From 32b6aa68a4b2a4baf6ece6dd1a631d96deb63bee Mon Sep 17 00:00:00 2001 From: Ruben Schuller Date: Fri, 19 Dec 2014 13:00:09 +0700 Subject: system/heirloom-doctools: Updated for version 141217. Signed-off-by: Willy Sudiarto Raharjo --- system/heirloom-doctools/doinst.sh | 15 ++++++++++ .../heirloom-doctools/heirloom-doctools.SlackBuild | 15 ++++------ system/heirloom-doctools/heirloom-doctools.info | 6 ++-- .../patches/mk.config.patch-141217 | 32 ++++++++++++++++++++++ 4 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 system/heirloom-doctools/doinst.sh create mode 100644 system/heirloom-doctools/patches/mk.config.patch-141217 (limited to 'system/heirloom-doctools') diff --git a/system/heirloom-doctools/doinst.sh b/system/heirloom-doctools/doinst.sh new file mode 100644 index 0000000000..6cb38e49e7 --- /dev/null +++ b/system/heirloom-doctools/doinst.sh @@ -0,0 +1,15 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/profile.d/heirloom.sh.new +config etc/profile.d/heirloom.csh.new diff --git a/system/heirloom-doctools/heirloom-doctools.SlackBuild b/system/heirloom-doctools/heirloom-doctools.SlackBuild index cb77cb258a..5b2e73a1b2 100644 --- a/system/heirloom-doctools/heirloom-doctools.SlackBuild +++ b/system/heirloom-doctools/heirloom-doctools.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=heirloom-doctools -VERSION=${VERSION:-141029} +VERSION=${VERSION:-141217} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,7 +62,6 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-${VERSION}.tar.bz2 cd $PRGNAM-$VERSION - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -85,21 +84,17 @@ cp -ar \ $CWD/$PRGNAM/LICENSE \ $PKG/usr/doc/$PRGNAM-$VERSION else -cp -ar \ - README \ - LICENSE \ - LICENSE.d \ - CHANGES \ - CHANGES_GR \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -ar README LICENSE LICENSE.d CHANGES CHANGES_GR $PKG/usr/doc/$PRGNAM-$VERSION fi cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/etc/profile.d -cp $CWD/profile.d/heirloom.{csh,sh} $PKG/etc/profile.d +cp $CWD/profile.d/heirloom.csh $PKG/etc/profile.d/heirloom.csh.new +cp $CWD/profile.d/heirloom.sh $PKG/etc/profile.d/heirloom.sh.new 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.${PKGTYPE:-tgz} diff --git a/system/heirloom-doctools/heirloom-doctools.info b/system/heirloom-doctools/heirloom-doctools.info index 51ffe76b12..75e35ab342 100644 --- a/system/heirloom-doctools/heirloom-doctools.info +++ b/system/heirloom-doctools/heirloom-doctools.info @@ -1,8 +1,8 @@ PRGNAM="heirloom-doctools" -VERSION="141029" +VERSION="141217" HOMEPAGE="http://n-t-roff.github.io/heirloom/doctools.html" -DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/releases/download/141029/heirloom-doctools-141029.tar.bz2" -MD5SUM="023125f064b3093d24b46f10080c0bbb" +DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/releases/download/141217/heirloom-doctools-141217.tar.bz2" +MD5SUM="fe85e4e295ae1223cbf100886a5d0742" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/heirloom-doctools/patches/mk.config.patch-141217 b/system/heirloom-doctools/patches/mk.config.patch-141217 new file mode 100644 index 0000000000..493eef5be7 --- /dev/null +++ b/system/heirloom-doctools/patches/mk.config.patch-141217 @@ -0,0 +1,32 @@ +--- mk.config 2014-12-18 11:47:38.598721584 +0100 ++++ mk.config.new 2014-12-18 11:54:05.831880503 +0100 +@@ -6,17 +6,17 @@ + # + # Packaging prefix. + # +-PREFIX=/usr/local ++PREFIX=/opt/heirloom + + # + # Where to place binaries. + # +-BINDIR=$(PREFIX)/ucb ++BINDIR=$(PREFIX)/bin + + # + # Where to place libraries. + # +-LIBDIR=$(PREFIX)/ucblib ++LIBDIR=$(PREFIX)/lib + + # + # Where to place ASCII charts and the like. +@@ -26,7 +26,7 @@ + # + # Where to place manual pages. + # +-MANDIR=$(PREFIX)/share/heirloom-doctools/man ++MANDIR=$(PREFIX)/man + + # + # Where to place the troff macro packages. -- cgit v1.2.3