aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/unison/README16
-rw-r--r--system/unison/unison.SlackBuild7
-rw-r--r--system/unison/unison.info12
3 files changed, 20 insertions, 15 deletions
diff --git a/system/unison/README b/system/unison/README
index 04dbd755bb370..add1c32378684 100644
--- a/system/unison/README
+++ b/system/unison/README
@@ -3,15 +3,19 @@ replicas of a collection of files and directories to be stored on different
hosts (or different disks on the same host), modified separately, and then
brought up to date by propagating the changes in each replica to the other.
-Unlike simple mirroring or backup utilities, Unison can deal with updates to
-both replicas of a distributed directory structure. Updates that do not
+Unlike simple mirroring or backup utilities, Unison can deal with updates
+to both replicas of a distributed directory structure. Updates that do not
conflict are propagated automatically. Conflicting updates are detected and
displayed.
Unison allows you to either build a text only binary or a binary that will
-use a graphical user interface. To build the gtk2 graphical inteface binary,
-which is the default option, do this:
-"FLAVOR=gtk2 ./unison.SlackBuild" or just "./unison.SlackBuild"
-To build a textonly binary, do this: "FLAVOR=text ./unison.SlackBuild"
+use a graphical user interface. To build the gtk2 graphical inteface
+binary, which is the default option, do this:
+
+ "FLAVOR=gtk2 ./unison.SlackBuild" or just "./unison.SlackBuild"
+
+To build a textonly binary, do this:
+
+ "FLAVOR=text ./unison.SlackBuild"
ocaml and lablgtk are build requirements, but neither are runtime deps.
diff --git a/system/unison/unison.SlackBuild b/system/unison/unison.SlackBuild
index 3e15d9edc9e7a..b4cdac7a8954c 100644
--- a/system/unison/unison.SlackBuild
+++ b/system/unison/unison.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for unison
-# Copyright 2007-2009 Ferenc Deak <ferenc.deak@gmail.com>
+# Copyright 2007-2011 Ferenc Deak <ferenc.deak@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,16 +23,14 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=unison
-VERSION=2.32.52
+VERSION=2.40.63
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -81,6 +79,7 @@ cp $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a COPYING NEWS README BUGS.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/unison-$VERSION-manual.html > $PKG/usr/doc/$PRGNAM-$VERSION/unison-manual.html
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/system/unison/unison.info b/system/unison/unison.info
index e42f57f62dc09..3361dc17a23b4 100644
--- a/system/unison/unison.info
+++ b/system/unison/unison.info
@@ -1,10 +1,12 @@
PRGNAM="unison"
-VERSION="2.32.52"
+VERSION="2.40.63"
HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
-DOWNLOAD="http://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.32.52/unison-2.32.52.tar.gz"
-MD5SUM="0701f095c1721776a0454b94607eda48"
+DOWNLOAD="http://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.40.63/unison-2.40.63.tar.gz \
+ http://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.40.63/unison-2.40.63-manual.html"
+MD5SUM="3281207850cf6f0a17fe73f371893bd3 \
+ 41941d0ee465cbae5a802b189fe20138"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="fdeak"
+MAINTAINER="Ferenc Deak"
EMAIL="ferenc.deak@gmail.com"
-APPROVED="rworkman"
+APPROVED="rworkman,Niels Horn"