1 files changed, 10 insertions, 15 deletions
diff --git a/network/courier-imap/courier-imap.SlackBuild b/network/courier-imap/courier-imap.SlackBuild
index 0836a6492b..0ddc66edaf 100644
--- a/network/courier-imap/courier-imap.SlackBuild
+++ b/network/courier-imap/courier-imap.SlackBuild
@@ -3,17 +3,17 @@
 # Slackware build script for courier IMAP
 
 # Written by Derek Noonburg (derekn@foolabs.com)
-# 2012-03-20
+# 2012-03-20, last updated 2019-08-26
 # Released into the public domain.
 
 PRGNAM=courier-imap
-VERSION=${VERSION:-4.16.0}
+VERSION=${VERSION:-5.0.7}
 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
@@ -24,8 +24,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"
@@ -46,13 +46,10 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-chown -R operator .
+chown -R root:root .
 
-# courier-imap refuses to build as root, so we do "su operator ..."
-# on the "configure" and "make" commands
-
-#su operator -c "\
-#CFLAGS=\"$SLKCFLAGS\" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -61,10 +58,9 @@ chown -R operator .
   --mandir=/usr/man \
   --enable-root-check=no \
   --build=$ARCH-slackware-linux \
-#"
-make
-#su operator -c "make"
+  --with-notice=unicode
 
+make
 make install DESTDIR=$PKG
 make install-configure DESTDIR=$PKG
 
@@ -81,7 +77,6 @@ done
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING COPYING.GPL INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install