network/cicb: Updated for version 5.2.0b1+git20170501.

Signed-off-by: B. Watson <yalhcru@gmail.com>

1 files changed, 23 insertions, 15 deletions

diff --git a/network/cicb/cicb.SlackBuild b/network/cicb/cicb.SlackBuild
index 3bb53b5889..30349a9a5f 100644
--- a/network/cicb/cicb.SlackBuild
+++ b/network/cicb/cicb.SlackBuild
@@ -6,8 +6,24 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20180623 bkw:
+# There's a new upstream, and development is happening
+# again, using 5.1.1b3 as a basis. Sourceforge project is gone, moved
+# to github. So here's the latest git...
+# - updated for 5.2.0b1+git20170501.
+# - re-add the missing man page source (icb.pod). hope it doesn't go
+#   AWOL again.
+# - edit the man page a bit, regenerate it.
+# - install system.icbrc and icbserverdb as config (.new) files,
+#   add doinst.sh to support this.
+# - add git2targz.sh script to generate source tarball from git.
+
+# Note to self, or anyone else wanting to update this: use the
+# git2targz.sh script, it should be smart enough to pull the latest
+# code and create a tarball with the correct VERSION.
+
 PRGNAM=cicb
-VERSION=${VERSION:-5.1.1b3}
+VERSION=${VERSION:-5.2.0b1+git20170501}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,29 +60,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Recent stdio.h defines a getline(), cicb's internal getline() conflicts.
-# There's probably a way to fix this more elegantly with some combination
-# of gcc feature macros, but my attempt led to a maze of twisty compile errors.
-# Renaming cicb's getline() to get_line() works fine and seems more
-# future-proof.
-sed -i 's/getline *(/get_line(/g' icb/*.[ch]
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Need this for recent tcl, to allow deprecated features. Someday this will
 # probably stop working and upstream will have to fix it.
 SLKCFLAGS="$SLKCFLAGS -DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT"
 
-# Another tcl fix (from upstream's CVS repo)
-patch -p1 < $CWD/tcl_continue_error.diff
-
 # library autodetection is broken on 64-bit, hence the
 # --with-(readline|ssl)* and the LDFLAGS below. They don't do any harm
 # on 32-bit.
@@ -99,7 +105,8 @@ make
 mkdir -p $PKG/usr/bin $PKG/usr/share/$PRGNAM
 ln -s icb $PKG/usr/bin/$PRGNAM
 install -s -m0755 icb/icb $PKG/usr/bin
-install -m0644 $CWD/icbserverdb system.icbrc $PKG/usr/share/$PRGNAM
+cat $CWD/icbserverdb > $PKG/usr/share/$PRGNAM/icbserverdb.new
+cat system.icbrc > $PKG/usr/share/$PRGNAM/system.icbrc.new
 
 # man page written for this SlackBuild
 mkdir -p $PKG/usr/man/man1
@@ -112,6 +119,7 @@ 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.${PKGTYPE:-tgz}