From 589d71ee7b818906f18bfa4a777eb31761142c22 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Sun, 19 Apr 2015 18:30:44 +0200
Subject: [PATCH] postfix: update to 3.0.1.

- unbreak build
- enable EAI using icu (for cross-compile too)
- ship empty /etc/postfix/postfix-files.d
- build with debugging info for -dbg
- simplify runit sv to use "postfix check"
- build on Linux 4.0+
- drop obsolete sample_dir
---
 srcpkgs/postfix/files/postfix/run      | 11 +----------
 srcpkgs/postfix/patches/makedefs.patch | 23 +++++++++++++++++++++++
 srcpkgs/postfix/template               | 21 ++++++++++++---------
 3 files changed, 36 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/postfix/patches/makedefs.patch

diff --git a/srcpkgs/postfix/files/postfix/run b/srcpkgs/postfix/files/postfix/run
index 02fd26c8fb..38688bb5f4 100755
--- a/srcpkgs/postfix/files/postfix/run
+++ b/srcpkgs/postfix/files/postfix/run
@@ -1,12 +1,3 @@
 #!/bin/sh
-
-daemon_directory=/usr/libexec/postfix \
-data_directory=/var/lib/postfix \
-command_directory=/usr/bin \
-config_directory=/etc/postfix \
-queue_directory=/var/spool/postfix \
-mail_owner=postfix \
-setgid_group=postdrop \
-/usr/libexec/postfix/postfix-script check || exit 1
-
+postfix check || exit 1
 exec /usr/libexec/postfix/master -d
diff --git a/srcpkgs/postfix/patches/makedefs.patch b/srcpkgs/postfix/patches/makedefs.patch
new file mode 100644
index 0000000000..6c1edb2533
--- /dev/null
+++ b/srcpkgs/postfix/patches/makedefs.patch
@@ -0,0 +1,23 @@
+--- makedefs.orig	2015-04-19 18:16:51.880377535 +0200
++++ makedefs	2015-04-19 18:18:09.413982443 +0200
+@@ -500,11 +500,11 @@
+ 		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
+ 		: ${PLUGIN_LD="${CC-gcc} -shared"}
+ 		;;
+-    Linux.3*)	SYSTYPE=LINUX3
++    Linux.*)	SYSTYPE=LINUX3
+ 		case "$CCARGS" in
+ 		 *-DNO_DB*) ;;
+ 		 *-DHAS_DB*) ;;
+ 		 *) if [ -f /usr/include/db.h ]
+ 		    then
+ 			: we are all set
+ 		    elif [ -f /usr/include/db/db.h ]
+@@ -731,6 +731,7 @@
+ # Look for the ICU library and enable unicode email if available.
+ #
+ case "$CCARGS" in
++ *-DHAS_EAI*)	;;
+  *-DNO_EAI*) ;;
+           *) trap 'rm -f makedefs.test makedefs.test.[co]' 1 2 3 15
+              cat >makedefs.test.c <<'EOF'
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index c88a5c2a20..b2b8730cb2 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,17 +1,18 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.0.0
+version=3.0.1
 revision=1
 short_desc="High-performance mail transport agent"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="IBM Public License 1.0, BSD-alike"
 homepage="http://www.postfix.org/"
 distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/$pkgname-$version.tar.gz"
-checksum=c2f2f10aa3e6b7090ba979e9c515e42b3140c5c1c17a33d58787569df7ae0955
+checksum=cd2bd6447fe3368bb1a39f482f8dd1eec87c63067a0eb75f9aec8e4eadd21328
 
 hostmakedepends="perl"
 makedepends="libressl-devel db-devel pcre-devel libsasl-devel
- libldap-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel"
+ libldap-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel
+ icu-devel"
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX postfix-install needs native binaries.
@@ -37,6 +38,7 @@ conf_files="
 	/etc/postfix/transport
 	/etc/postfix/virtual"
 make_dirs="
+	/etc/postfix/postfix-files.d	0755	root	root
 	/var/lib/postfix		0700	postfix	root
 	/var/spool/postfix/active	0700	postfix	root
 	/var/spool/postfix/bounce	0700	postfix	root
@@ -56,18 +58,18 @@ make_dirs="
 do_build() {
 	sed -e "s,\(/usr/include/db.h\),${XBPS_CROSS_BASE}/\1,g" -i makedefs
 
-	make makefiles DEBUG='' CCARGS=" \
+	make makefiles CCARGS=" \
 		-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${XBPS_CROSS_BASE}/usr/include/sasl \
 		-DHAS_LDAP \
 		-DUSE_TLS \
+		-DHAS_EAI -I${XBPS_CROSS_BASE}/usr/include \
 		-DHAS_MYSQL -I${XBPS_CROSS_BASE}/usr/include/mysql \
 		-DHAS_PGSQL -I${XBPS_CROSS_BASE}/usr/include/postgresql \
 		-DHAS_SQLITE \
-		-DDEF_COMMAND_DIR=\'/usr/bin\' \
-		-DDEF_SENDMAIL_PATH=\'/usr/bin/sendmail\' \
-		-DDEF_README_DIR=\'/usr/share/doc/postfix\' \
-		-DDEF_SAMPLE_DIR=\'/usr/share/examples/postfix/\' \
-		-DDEF_MANPAGE_DIR=\'/usr/share/man\' \
+		-DDEF_COMMAND_DIR=\\\"/usr/bin\\\" \
+		-DDEF_SENDMAIL_PATH=\\\"/usr/bin/sendmail\\\" \
+		-DDEF_README_DIR=\\\"/usr/share/doc/postfix\\\" \
+		-DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\" \
 	" AUXLIBS=' \
 		-lsasl2 \
 		-lldap -llber \
@@ -75,6 +77,7 @@ do_build() {
 		-lmysqlclient -lz -lm \
 		-lpq \
 		-lsqlite3 -lpthread \
+		-licuuc \
 	' OPT="${CFLAGS} ${LDFLAGS}"
 
 	make ${makejobs}