1 files changed, 27 insertions, 30 deletions
diff --git a/network/openntpd/openntpd.SlackBuild b/network/openntpd/openntpd.SlackBuild
index 4af2139e31..76965be29a 100644
--- a/network/openntpd/openntpd.SlackBuild
+++ b/network/openntpd/openntpd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for openntpd
 
-# Copyright 2006,2007,2008  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -33,33 +33,28 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+make_user() {
+  printf "  You must have a _ntp user and group to use this package.
+  \t# groupadd -g 217 _ntp
+  \t# useradd -u 217 -d /var/empty -s /bin/false -g _ntp _ntp \n\n"
+  exit 1
+}
+  
+if ! grep -q ^_ntp: /etc/passwd ; then
+  make_user
+elif ! grep -q ^_ntp: /etc/group ; then
+  make_user
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-fi
-
-if ! grep -q ^_ntp: /etc/passwd ; then
-  cat << EOF
-  
-  You must have a _ntp user and group to use this package.
-  # groupadd -g 217 _ntp
-  # useradd -u 217 -d /var/empty -s /bin/false -g _ntp _ntp 
-  
-EOF
-  exit 1
-fi
-if ! grep -q ^_ntp: /etc/group ; then
-  cat << EOF
-  
-  You must have a _ntp user and group to use this package.
-  # groupadd -g 217 _ntp
-  # useradd -u 217 -d /var/empty -s /bin/false -g _ntp _ntp 
-
-EOF
-  exit 1
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -76,6 +71,7 @@ chmod -R a-s,u+w,go+r-w .
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --build=$ARCH-slackware-linux
@@ -91,26 +87,27 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CREDITS ChangeLog INSTALL LICENCE README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Don't clobber config file
+mv $PKG/etc/ntpd.conf $PKG/etc/ntpd.conf.new
 
 # Add an init script that works with OpenNTPD (see the README)
 mkdir -p $PKG/etc/rc.d
 install -m 0755 $CWD/rc.ntpd $PKG/etc/rc.d/rc.ntpd.new
 
-# Don't clobber config file
-mv $PKG/etc/ntpd.conf $PKG/etc/ntpd.conf.new
-
 # Make sure the chroot directory exists with correct ownership/mode
 mkdir -p $PKG/var/empty
 chown root:root $PKG/var/empty
 chmod 0755 $PKG/var/empty
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CREDITS ChangeLog INSTALL LICENCE README \
+    $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}