postfix: use pkgconfig instead of icu-config to find icu cflags

and ldflags. should help PR pkg/51354: mail/postfix eai option does not
work because of test in makedef.

bump PKGREVISION

3 files changed, 23 insertions, 11 deletions

diff --git a/mail/postfix/Makefile.common b/mail/postfix/Makefile.common
index 00abfede130..0a8ebefe259 100644
--- a/mail/postfix/Makefile.common
+++ b/mail/postfix/Makefile.common
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.5 2016/10/28 16:10:51 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.6 2016/10/31 04:19:07 maya Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
 
 DISTNAME=	postfix-3.1.3
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 MASTER_SITES+=	http://postfix.it-austria.net/releases/official/
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 9becefc8dbd..72889e99eca 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.165 2016/10/09 12:28:19 taca Exp $
+$NetBSD: distinfo,v 1.166 2016/10/31 04:19:07 maya Exp $
 
 SHA1 (postfix-3.1.3.tar.gz) = 0c1d57a929c66fe57e6cd9d25bb7d05fc72363d0
 RMD160 (postfix-3.1.3.tar.gz) = d974c821d39ff273bafeba06e69aca57cb56d374
@@ -6,5 +6,5 @@ SHA512 (postfix-3.1.3.tar.gz) = 00e2b0974e59420cabfddc92597a99b42c8a8c9cd9a0c279
 Size (postfix-3.1.3.tar.gz) = 4338730 bytes
 SHA1 (patch-aa) = f2c418a2fd34da7325ea2823ddd14043768f0111
 SHA1 (patch-ag) = e3d818cd75225c5b50960659827c6e27767cbd58
-SHA1 (patch-ai) = 17b29cceadba3055ae198e1802a786468ecc9eff
+SHA1 (patch-ai) = c5b9e395586e03ede5e4d6e7763f1d18a725fc08
 SHA1 (patch-src_dns_dns__lookup.c) = b04d35b1df1b60409c903d2fb5bafb16b848523d
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index a6346857fa6..4860a9ab860 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.35 2016/03/23 12:55:18 gdt Exp $
+$NetBSD: patch-ai,v 1.36 2016/10/31 04:19:07 maya Exp $
 
 1) Add shlib definitions for NetBSD 5; the build system must be
 hard-coded per OS per version.  Not yet reported upstream.
 
 2) Make this pkgsrc friendly.
 
---- makedefs.orig	2015-07-19 14:24:25.000000000 +0000
+--- makedefs.orig	2016-08-20 00:08:42.000000000 +0000
 +++ makedefs
-@@ -292,6 +292,12 @@ case "$SYSTEM.$RELEASE" in
+@@ -309,6 +309,12 @@ case "$SYSTEM.$RELEASE" in
     NetBSD.4*)	SYSTYPE=NETBSD4
  		;;
     NetBSD.5*)	SYSTYPE=NETBSD5
@@ -20,7 +20,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		;;
     NetBSD.6*)	SYSTYPE=NETBSD6
  		: ${SHLIB_SUFFIX=.so}
-@@ -372,13 +378,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -389,13 +395,6 @@ case "$SYSTEM.$RELEASE" in
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -34,7 +34,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -416,33 +415,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -437,33 +436,8 @@ case "$SYSTEM.$RELEASE" in
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -68,7 +68,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -503,25 +477,6 @@ EOF
+@@ -524,25 +498,6 @@ EOF
  		: ${PLUGIN_LD="${CC-gcc} -shared"}
  		;;
    Linux.[34].*)	SYSTYPE=LINUX$RELEASE_MAJOR
@@ -94,7 +94,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
-@@ -542,24 +497,6 @@ EOF
+@@ -563,24 +518,6 @@ EOF
  		;;
       GNU.0*|GNU/kFreeBSD.[567]*)
  		SYSTYPE=GNU0
@@ -119,7 +119,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -590,25 +527,13 @@ EOF
+@@ -611,25 +548,13 @@ EOF
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"
@@ -145,3 +145,14 @@ hard-coded per OS per version.  Not yet reported upstream.
  		;;
  ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
  		RANLIB=echo
+@@ -757,8 +682,8 @@ esac
+ #
+ case "$CCARGS" in
+ *-DNO_EAI*) ;;
+-	 *) icu_cppflags=`(icu-config --cppflags) 2>/dev/null` && {
+-		icu_ldflags=`(icu-config --ldflags) 2>/dev/null` && {
++	 *) icu_cppflags=`(pkg-config --cflags icu-i18n) 2>/dev/null` && {
++		icu_ldflags=`(pkg-config --libs icu-i18n) 2>/dev/null` && {
+ 		    trap 'rm -f makedefs.test makedefs.test.[co]' 1 2 3 15
+ 		    cat >makedefs.test.c <<'EOF'
+ #include <unicode/uidna.h>