system/unison: Updated for version 2.51.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 104 insertions, 75 deletions

diff --git a/system/unison/01-change-ocamllibdir-for-ocaml-40.patch b/system/unison/01-change-ocamllibdir-for-ocaml-40.patch
deleted file mode 100644
index b200ff87a5..0000000000
--- a/system/unison/01-change-ocamllibdir-for-ocaml-40.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.OCaml	2011-04-16 17:35:38.000000000 -0300
-+++ b/Makefile.OCaml	2014-09-25 13:18:43.239151396 -0300
-@@ -71,8 +71,8 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1
- #
- # This should be set to an appropriate value automatically, depending
- # on whether the lablgtk library is available
--LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
--LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk2
-+LABLGTKLIB=$(OCAMLLIBDIR)/site-lib/lablgtk
-+LABLGTK2LIB=$(OCAMLLIBDIR)/site-lib/lablgtk2
- ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well 
- ## at the moment and we don't want to confuse people by building it by default
- ifeq ($(OSARCH),osx)
-@@ -92,7 +92,7 @@ buildexecutable::
- 
- INCLFLAGS=-I lwt -I ubase -I system
- CAMLFLAGS+=$(INCLFLAGS)
--CAMLFLAGS+=-I system/$(SYSTEM) -I lwt/$(SYSTEM)
-+CAMLFLAGS+=-I system/$(SYSTEM) -I lwt/$(SYSTEM) -I $(LABLGTK2LIB)
- 
- ifeq ($(OSARCH),win32)
-   # Win32 system
diff --git a/system/unison/README b/system/unison/README
index 7ce7830b8d..2e50f0190d 100644
--- a/system/unison/README
+++ b/system/unison/README
@@ -8,12 +8,21 @@ 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:
+Unison allows you to either build a text-only binary or a binary that will
+use a graphical user interface.
 
-  "FLAVOR=gtk2 ./unison.SlackBuild" or just "./unison.SlackBuild"
+By default this slackbuild will, similar to Slackware's own emacs package,
+build both a text-only and a gui binary. To do this (which is the default):
 
-To build a textonly binary, do this:
+  "FLAVOUR='gtk2 text' ./unison.SlackBuild" or just "./unison.SlackBuild"
 
-  "FLAVOR=text ./unison.SlackBuild"
+To only build a text only binary, do this:
+
+  "FLAVOUR=text ./unison.SlackBuild"
+
+To only build a gui only binary, do this:
+
+  "FLAVOUR=gtk2 ./unison.SlackBuild"
+
+hevea is an optional dependency which allows building the HTML documentation.
+Otherwise only a version as PDF will be built.
diff --git a/system/unison/doinst.sh b/system/unison/doinst.sh
index 4e8ba7071d..5fb28930db 100644
--- a/system/unison/doinst.sh
+++ b/system/unison/doinst.sh
@@ -1,4 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-
diff --git a/system/unison/unison.SlackBuild b/system/unison/unison.SlackBuild
index 8f9fc18d4f..6d43f2fab0 100644
--- a/system/unison/unison.SlackBuild
+++ b/system/unison/unison.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for unison
 
 # Copyright 2007-2011 Ferenc Deak <ferenc.deak@gmail.com>
+# Copyright 2018 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,19 +12,19 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unison
-VERSION=${VERSION:-2.48.4}
+VERSION=${VERSION:-2.51.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,16 +41,28 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd src
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -57,28 +70,49 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Apply patches
-for _p in $(ls $CWD/*.patch); do
-	patch -p1 -i $_p
-done
+# FLAVOUR lets the user enable their choice of interfaces. Defaults to 'gtk2 text'
+# If you want to enable specifically for gtk2 or text simply pass this
+# variable to the script: $ FLAVOUR=text ./unison.SlackBuild
+FLAVOUR=${FLAVOUR:-}
 
-# no need to set CFLAGS
+if [ -z "$FLAVOUR" ] ; then
+  # also support US spelling
+  FLAVOUR=${FLAVOR:-}
+fi
 
-# FLAVOR lets the user enable their choice of interfaces. Defaults to gtk2
-# If you want to enable specifically for gtk2 or text simply pass this
-# variable to the script: $ FLAVOR=text ./unison.SlackBuild
-FLAVOR=${FLAVOR:-gtk2}
-
-# Fixes for poor values of FLAVOR
-if [ "$FLAVOR" = "gtk2" -o "$FLAVOR" = "GTK2" -o "$FLAVOR" = "GTK" -o "$FLAVOR" = "gtk" ]; then
-    FLAVOR=gtk2
-elif [ "$FLAVOR" = "text" -o "$FLAVOR" = "TEXT" -o "$FLAVOR" = "TXT" -o "$FLAVOR" = "txt" ]; then
-    FLAVOR=text
+if [ -z "$FLAVOUR" ] ; then
+  FLAVOURS="gtk2 text" # default
+else
+  FLAVOURS="$FLAVOUR"
 fi
 
-make UISTYLE=$FLAVOR DEBUGGING=false THREADS=true NATIVE=true
+for flavour in $FLAVOURS ; do
+  # Fixes for poor values of flavour
+  if [ "$flavour" = "gtk2" ] || [ "$flavour" = "GTK2" ] || [ "$flavour" = "GTK" ] || [ "$flavour" = "gtk" ]; then
+    flavour="gtk2"
+  elif [ "$flavour" = "text" ] || [ "$flavour" = "TEXT" ] || [ "$flavour" = "TXT" ] || [ "$flavour" = "txt" ]; then
+    flavour="text"
+  fi
+
+  cp -a . ../work
+  mv ../work .
+  (
+    cd work
+
+    make -C src UISTYLE="$flavour" DEBUGGING=false THREADS=true NATIVE=true
+    mv src/unison ../unison-"$flavour"
+    mv src/unison-fsmonitor ../
+  )
+
+  rm -rf work
+done
+
 mkdir -p $PKG/usr/bin
-install -m 0755 $PRGNAM $PKG/usr/bin
+install -m 0755 $PRGNAM-* $PKG/usr/bin
+
+if [ -e $PKG/usr/bin/unison-text ] ; then
+  ln -s unison-text $PKG/usr/bin/unison
+fi
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -86,11 +120,19 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 mkdir -p $PKG/usr/share/pixmaps
-cp $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+install -m 0644 icons/U.32x32x16m.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+yes '' | make -C doc real
 
 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
+cp -a src/{BUGS.txt,CONTRIB,COPYING,INSTALL*,NEWS,README,ROADMAP.txt,TODO.txt} $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 0644 doc/unison-manual.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+
+# html manual only built if hevea installed
+if [ -e doc/unison-manual.html ] ; then
+  install -m 0644 doc/unison-manual.html $PKG/usr/doc/$PRGNAM-$VERSION
+fi
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/unison/unison.desktop b/system/unison/unison.desktop
index 17b4f28025..4a4b347f8f 100644
--- a/system/unison/unison.desktop
+++ b/system/unison/unison.desktop
@@ -1,8 +1,11 @@
 [Desktop Entry]
-Name=Unison
-Comment=file-synchronization tool
-Exec=unison
-Icon=unison
+Encoding=UTF-8
+Name=unison
+Comment=File synchronisation tool for X11
+TryExec=unison-gtk2
+Exec=unison-gtk2
 Terminal=false
 Type=Application
-Categories=System;Utility;
+Categories=GTK;Application;Network;
+Icon=unison.png
+StartupNotify=true
diff --git a/system/unison/unison.info b/system/unison/unison.info
index 987a8596de..ec88247672 100644
--- a/system/unison/unison.info
+++ b/system/unison/unison.info
@@ -1,12 +1,10 @@
 PRGNAM="unison"
-VERSION="2.48.4"
+VERSION="2.51.2"
 HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
-DOWNLOAD="http://www.seas.upenn.edu/~bcpierce/unison//download/releases/unison-2.48.4/unison-2.48.4.tar.gz \
-          http://www.seas.upenn.edu/~bcpierce/unison//download/releases/unison-2.48.4/unison-2.48.4-manual.html"
-MD5SUM="5334b78c7e68169df7de95f4c6c4b60f \
-        3dc5de6c0609ae2e3019d22f76345b91"
+DOWNLOAD="https://github.com/bcpierce00/unison/archive/v2.51.2/unison-2.51.2.tar.gz"
+MD5SUM="11991eddcf6fdd8b50041eefe44bad61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lablgtk"
-MAINTAINER="Ferenc Deak"
-EMAIL="ferenc.deak@gmail.com"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"