network/ntpclient: Updated for version 2015_365.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 42 insertions, 28 deletions

diff --git a/network/ntpclient/ntpclient.SlackBuild b/network/ntpclient/ntpclient.SlackBuild
index 7392c0804e..a5ccfbfe13 100644
--- a/network/ntpclient/ntpclient.SlackBuild
+++ b/network/ntpclient/ntpclient.SlackBuild
@@ -2,16 +2,34 @@
 
 # Slackware build script for ntpclient
 
-# Written by Andrzej Telszewski <atelszewski@gmail.com>
+# Copyright 2017 Andrzej Telszewski, Banie
+# 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=ntpclient
-VERSION=${VERSION:-2007_365}
+VERSION=${VERSION:-2015_365}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -42,34 +60,30 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
-mv $PRGNAM-$(echo $VERSION | cut -f1 -d'_') $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
+mv $PRGNAM-$(echo $VERSION | cut -f1 -d_) $PRGNAM-$VERSION
 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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -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 {} \;
 
-CFLAGS="$SLKCFLAGS"
-CFLAGS="$SLKCFLAGS\
-  -std=c99 -W -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow \
-  -Waggregate-return -Wnested-externs -Winline -Wwrite-strings\
-  -Wstrict-prototypes -DENABLE_DEBUG -DENABLE_REPLAY"
-make CFLAGS="$CFLAGS"
+sed -i "/^CFLAGS += -O2$/d" Makefile
+CFLAGS="$SLKCFLAGS" \
+make
+strip --strip-unneeded ntpclient
 
-mkdir $PKG/sbin
-mkdir -p $PKG/usr/man/man1
+mkdir -p $PKG/sbin
 cp -a ntpclient $PKG/sbin
+
+mkdir -p $PKG/usr/man/man1
 cp -a ntpclient.1 $PKG/usr/man/man1
-strip --strip-unneeded ntpclient $PKG/sbin/ntpclient
 gzip -9 $PKG/usr/man/man1/ntpclient.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  envelope HOWTO log2date.pl rate.awk rate2.awk README \
-  test.dat todo \
+cp -a HOWTO README envelope log2date.pl rate{,2}.awk test.dat todo \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/ntpclient/ntpclient.info b/network/ntpclient/ntpclient.info
index a7f8d8d283..19a283c3ff 100644
--- a/network/ntpclient/ntpclient.info
+++ b/network/ntpclient/ntpclient.info
@@ -1,8 +1,8 @@
 PRGNAM="ntpclient"
-VERSION="2007_365"
+VERSION="2015_365"
 HOMEPAGE="http://doolittle.icarus.com/ntpclient/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/ntpclient_2007_365.tar.gz"
-MD5SUM="cb98711f11769cdd22fc592844cef414"
+DOWNLOAD="http://doolittle.icarus.com/ntpclient/ntpclient_2015_365.tar.gz"
+MD5SUM="e0d0e6089dd3300b6958055340a7796f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/ntpclient/slack-desc b/network/ntpclient/slack-desc
index 0063e3dedf..90328514fa 100644
--- a/network/ntpclient/slack-desc
+++ b/network/ntpclient/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-ntpclient: ntpclient (NTP (RFC-1305)
+ntpclient: ntpclient (NTP client for unix-alike computers)
 ntpclient:
 ntpclient: ntpclient is an NTP (RFC-1305) client for unix-alike computers.
 ntpclient:
-ntpclient: Homepage: http://doolittle.icarus.com/ntpclient
+ntpclient: Homepage: http://doolittle.icarus.com/ntpclient/
 ntpclient:
 ntpclient:
 ntpclient: