diff options
| -rw-r--r-- | system/unison/README | 20 | ||||
| -rw-r--r-- | system/unison/doinst.sh | 5 | ||||
| -rw-r--r-- | system/unison/slack-desc | 2 | ||||
| -rw-r--r-- | system/unison/unison.SlackBuild | 45 | ||||
| -rw-r--r-- | system/unison/unison.desktop | 5 | ||||
| -rw-r--r-- | system/unison/unison.info | 10 |
6 files changed, 49 insertions, 38 deletions
diff --git a/system/unison/README b/system/unison/README index a47a304dc2c52..04dbd755bb370 100644 --- a/system/unison/README +++ b/system/unison/README @@ -8,20 +8,10 @@ both replicas of a distributed directory structure. Updates that do not conflict are propagated automatically. Conflicting updates are detected and displayed. -You need ocaml and lablgtk to compile unison (all of them are provided by -the slackbuilds project), however none of them are needed to run unison. - 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 (the default option): - - FLAVOR=gtk2 ./unison.SlackBuild - or - ./unison.SlackBuild - -To build a textonly binary: +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" - FLAVOR=text ./unison.SlackBuild - -
\ No newline at end of file +ocaml and lablgtk are build requirements, but neither are runtime deps. diff --git a/system/unison/doinst.sh b/system/unison/doinst.sh index 37f8fcb218431..4e8ba7071dea7 100644 --- a/system/unison/doinst.sh +++ b/system/unison/doinst.sh @@ -1,3 +1,4 @@ -if [ -x usr/bin/update-desktop-database ]; then - ./usr/bin/update-desktop-database ./usr/share/applications > /dev/null 2>&1 +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/slack-desc b/system/unison/slack-desc index 66d26e156a39b..3b400a7062f1d 100644 --- a/system/unison/slack-desc +++ b/system/unison/slack-desc @@ -7,7 +7,7 @@ |-----handy-ruler------------------------------------------------------| unison: Unison (file-synchronization tool) -unison: +unison: unison: Unison is a file-synchronization tool for Unix and Windows. It allows unison: two replicas of a collection of files and directories to be stored on unison: different hosts (or different disks on the same host), modified diff --git a/system/unison/unison.SlackBuild b/system/unison/unison.SlackBuild index ed3d1f37c8be9..77cadfc2bfaf9 100644 --- a/system/unison/unison.SlackBuild +++ b/system/unison/unison.SlackBuild @@ -1,10 +1,29 @@ #!/bin/sh # Slackware build script for unison -# Written by fdeak <ferenc.deak@gmail.com> + +# Copyright 2007-2009 Ferenc Deak <ferenc.deak@gmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 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. PRGNAM=unison -VERSION=2.27.57 +VERSION=2.32.52 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -20,7 +39,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xzf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -41,27 +60,27 @@ fi make UISTYLE=$FLAVOR DEBUGGING=false THREADS=true NATIVE=true mkdir -p $PKG/usr/bin -install -m 755 $PRGNAM $PKG/usr/bin +install -m 0755 $PRGNAM $PKG/usr/bin ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true ) -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING NEWS README BUGS.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - 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 +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING NEWS README BUGS.txt $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz - +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/unison/unison.desktop b/system/unison/unison.desktop index 4c8beb9c7cf01..17b4f28025d4f 100644 --- a/system/unison/unison.desktop +++ b/system/unison/unison.desktop @@ -2,8 +2,7 @@ Name=Unison Comment=file-synchronization tool Exec=unison -Icon=/usr/share/pixmaps/unison.png +Icon=unison Terminal=false Type=Application -Categories=Application;Utility; -Encoding=UTF-8 +Categories=System;Utility; diff --git a/system/unison/unison.info b/system/unison/unison.info index 8cfb587fe5314..e42f57f62dc09 100644 --- a/system/unison/unison.info +++ b/system/unison/unison.info @@ -1,8 +1,10 @@ PRGNAM="unison" -VERSION="2.27.57" +VERSION="2.32.52" HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/" -DOWNLOAD="http://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.27.57/unison-2.27.57.tar.gz" -MD5SUM="4ba0a3e4bf4b4ad0c063f86391371f78" +DOWNLOAD="http://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.32.52/unison-2.32.52.tar.gz" +MD5SUM="0701f095c1721776a0454b94607eda48" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="fdeak" EMAIL="ferenc.deak@gmail.com" -APPROVED="Michiel" +APPROVED="rworkman" |