network/postfix: Updated for version 2.4.1

3 files changed, 14 insertions, 9 deletions

diff --git a/network/postfix/README b/network/postfix/README
index 4ff3c1a399..fd9bcf5d7b 100644
--- a/network/postfix/README
+++ b/network/postfix/README
@@ -29,9 +29,5 @@ A couple things to remember about postfix:
       postconf(5) and postconf(8).  Use man -k to find them.
     - subscribe to the postfix-users mailing list
 
-If you are upgrading a previous release of postfix, be sure to update
-all references to earlier versions main.cf.
-
 If you have any questions or comments about this script, you are free
 to contact me via e-mail at <alan@lizella.net>.  Thanks!
-
diff --git a/network/postfix/postfix.SlackBuild b/network/postfix/postfix.SlackBuild
index 1202678173..bb481e1c10 100644
--- a/network/postfix/postfix.SlackBuild
+++ b/network/postfix/postfix.SlackBuild
@@ -26,7 +26,7 @@ VERSION="2.4.1"
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=$(pwd)
+CWD=`pwd`
 TMP=${TMP:-/tmp/SBo}
 PKG="$TMP/pkg-$PRGNAM"
 OUTPUT=${OUTPUT:-/tmp}
@@ -109,7 +109,7 @@ if echo $line | grep -v "^#" 2>&1 > /dev/null; then
   GROUP="$(echo $line | awk -F: '{ print $4 }')"
   PERMS="$(echo $line | awk -F: '{ print $5 }')"
 
-  # skip this iteration if the line we're fed is no good
+  # skip this interation if the line we're fed is no good
   if [ "$TYPE" = "h" ]; then
     continue
   elif [ "$TYPE" = "l" ]; then
@@ -215,7 +215,8 @@ install -m 0755 $CWD/rc.postfix  $PKG/etc/rc.d/rc.postfix.new
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Strip binaries and libraries
+# Strip binaries and libraries - this can be done with 'make install-strip'
+# in many source trees, and that's preferable if so, but if not, use this
 find $PKG -type f | (while read LINE; do
 if file $LINE | egrep "ELF.*(executable|shared object).*not stripped" &> /dev/null; then
   strip $LINE
diff --git a/network/postfix/slack-desc b/network/postfix/slack-desc
index 16c8f075c5..5f9a865c39 100644
--- a/network/postfix/slack-desc
+++ b/network/postfix/slack-desc
@@ -1,5 +1,12 @@
-postfix: What is Postfix? It is Wietse Venema's mailer that started life as an
-postfix: alternative to the widely-used Sendmail program.
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+postfix: postfix (alternative to the widely-used Sendmail program)
 postfix: 
 postfix: Postfix attempts to be fast, easy to administer, and secure, while at
 postfix: the same time being sendmail compatible enough to not upset existing
@@ -9,3 +16,4 @@ postfix:
 postfix: Packaging script written by Alan Hicks <alan@lizella.net>
 postfix: and the SlackBuilds.org Team http://www.slackbuilds.org
 postfix: 
+postfix: