# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1249645215 -7200
# Node ID b7ffe250e6291a7f0f04226cc8e722f84270c2d4
# Parent  ae8b3644d73df4e8365aa7391148372e6cba087f
Up: postfix (2.6.3)

diff -r ae8b3644d73d -r b7ffe250e629 postfix/receipt
--- a/postfix/receipt	Fri Aug 07 17:00:32 2009 +0000
+++ b/postfix/receipt	Fri Aug 07 13:40:15 2009 +0200
@@ -1,13 +1,13 @@
 # SliTaz package receipt.
 
 PACKAGE="postfix"
-VERSION="2.5.5"
+VERSION="2.6.3"
 CATEGORY="network"
 SHORT_DESC="fast, easy to administer, and secure mailer."
 MAINTAINER="pascal.bellard@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.postfix.org/"
-WGET_URL="ftp://mir1.ovh.net/ftp.postfix.org/postfix-release/official/$TARBALL"
+WGET_URL="ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/$TARBALL"
 BUILD_DEPENDS="db-dev openldap-dev pcre-dev openssl-dev"
 DEPENDS="libdb libldap pcre openssl slitaz-base-files cyrus-sasl"
 CONFIG_FILES="/etc/postfix"
@@ -15,11 +15,14 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-
 	cd $src
-	make makefiles CCARGS="-DHAS_DB -DHAS_LDAP" AUXLIBS="-ldb -lldap -llber"
+	make makefiles \
+	CCARGS='-DHAS_DB -DHAS_LDAP \
+		-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \
+		-DDEF_MANPAGE_DIR=\"/usr/share/man\"' \
+	AUXLIBS="-ldb -lldap -llber" &&
 	make
-	install_root=/home/slitaz/wok/postfix/postfix-$VERSION/_pkg \
+	install_root=$PWD/_pkg \
 		sh postfix-install -non-interactive
 }
 
@@ -27,10 +30,11 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/licenses/
-	cp -a $_pkg/usr/libexec $fs/usr
+	cp -a $_pkg/usr/lib $fs/usr
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/sbin $fs/usr
 	cp -a $_pkg/etc $fs
+
 	awk 'BEGIN {n=0} /MUST/ {n++} /ALIASES/ {n++} { if (n==1) print }' \
 		< $_pkg/etc/postfix/aliases > $fs/etc/postfix/aliases
 	while read keyword data; do
@@ -51,22 +55,18 @@
 	mv $fs/etc/postfix/TLS_LICENSE $fs/usr/share/licenses/POSTFIX_TLS_LICENSE
 	mv $fs/etc/postfix/LICENSE $fs/usr/share/licenses/POSTFIX_LICENSE
 	cp -a stuff/etc/init.d $fs/etc
-	rm -f $fs/etc/postfix/post*
+	rm -f $fs/usr/lib/postfix/post* $fs/usr/lib/postfix/*.cf
+	strip -s $fs/usr/lib/postfix/*
 }
 
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-        # adduser postfix if needed
+    # adduser postfix if needed
 	if ! grep -q postfix $1/etc/passwd; then
-		echo -n "Adding user postfix..."
-		chroot $1/ adduser postfix -D -H -S -h /dev/null
-		status
-	fi
-	# addgroup postfix if needed
-	if ! grep -q postfix $1/etc/group; then
-		echo -n "Adding group postfix..."
-		chroot $1/ sh -c 'addgroup postfix && addgroup postfix postfix'
+		echo -n "Adding user Postfix..."
+		chroot $1/ adduser -s /bin/false -h /dev/null \
+			-g "Postfix Daemon user" -H -D -S postfix
 		status
 	fi
 	# addgroup postdrop if needed
@@ -100,6 +100,5 @@
 post_remove()
 {
 	deluser postfix
-	delgroup postfix
 	delgroup postdrop
 }