Fix installation on Darwin:

LD_LIBRARY_PATH is not propagated when set with env, e.g.:
env LD_LIBRARY_PATH=path/to/lib ./script.sh
will not work (other variable names work correctly).

4 files changed, 34 insertions, 11 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index f9584c88ae0..e0b86ae629d 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.293 2016/10/28 16:10:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.294 2017/04/11 09:33:30 adam Exp $
 
 .include "../../mail/postfix/Makefile.common"
 
@@ -67,8 +67,7 @@ do-install:
 .if !empty(PKG_OPTIONS:Msasl)
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${DESTDIR}${EXAMPLEDIR}
 .endif
-	cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC}/lib sh		\
-		./postfix-install -non-interactive				\
+	cd ${WRKSRC} && ${SH} ./postfix-install -non-interactive \
 		${DESTDIR_INSTALLOPTIONS} config_directory="${EXAMPLEDIR}"
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
 		${DESTDIR}${EXAMPLEDIR}/mailer.conf
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index aa969930238..5f3680fecbe 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.168 2017/03/04 06:26:24 taca Exp $
+$NetBSD: distinfo,v 1.169 2017/04/11 09:33:30 adam Exp $
 
 SHA1 (postfix-3.1.4.tar.gz) = 2889744044d85209563dc0b5388eb32c8b1f93f0
 RMD160 (postfix-3.1.4.tar.gz) = 9f7777096a76952aa9270977d1618ea5e95c329f
 SHA512 (postfix-3.1.4.tar.gz) = 4cf8aa8d0cf6d99defa32c2907705370d6f8d047d7e938c84a20a62c68ae07a2bec304f28c178d1072b9610f2969420f83fe2066821ad34c0f95e62bbb5b8c05
 Size (postfix-3.1.4.tar.gz) = 4340102 bytes
-SHA1 (patch-aa) = f2c418a2fd34da7325ea2823ddd14043768f0111
+SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c
 SHA1 (patch-ag) = 1288ac987056f5c93a05e46148ce2ef1c50ade38
-SHA1 (patch-ai) = 2564f27b83afaa06770066976983b4a0bfed3d79
+SHA1 (patch-ai) = 35724ffff90ca0832e027c623e80f619420c4e0f
 SHA1 (patch-src_dns_dns__lookup.c) = b04d35b1df1b60409c903d2fb5bafb16b848523d
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index e65d2b68ab1..3ad66c3597e 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,10 +1,19 @@
-$NetBSD: patch-aa,v 1.24 2015/09/07 09:47:01 fhajny Exp $
+$NetBSD: patch-aa,v 1.25 2017/04/11 09:33:30 adam Exp $
 
+Define LD_LIBRARY_PATH in this script as it is not propagated from outside.
 Make this pkgsrc friendly.
 
---- postfix-install.orig	2015-01-29 22:15:30.000000000 +0000
+--- postfix-install.orig	2016-01-03 00:25:23.000000000 +0000
 +++ postfix-install
-@@ -436,26 +436,6 @@ template files main.cf.proto and master.
+@@ -199,6 +199,7 @@ SHELL=/bin/sh
+ IFS=" 	
+ "
+ BACKUP_IFS="$IFS"
++LD_LIBRARY_PATH=`pwd`/lib; export LD_LIBRARY_PATH
+ 
+ # This script uses outputs from Postfix and non-Postfix commands.
+ # Override all LC_* settings and LANG for robustness.
+@@ -447,26 +448,6 @@ template files main.cf.proto and master.
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -c conf -h -d config_directory`}
  
@@ -31,7 +40,7 @@ Make this pkgsrc friendly.
  # In case some systems special-case pathnames beginning with //.
  
  case $install_root in
-@@ -847,13 +827,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+@@ -869,13 +850,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
      "shlib_directory = $shlib_directory" \
      "meta_directory = $meta_directory" \
  || exit 1
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 0b4fa1a05a2..c078e41b149 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.37 2016/11/04 17:10:10 sevan Exp $
+$NetBSD: patch-ai,v 1.38 2017/04/11 09:33:30 adam Exp $
 
 1) Add shlib definitions for NetBSD 5; the build system must be
 hard-coded per OS per version.  Not yet reported upstream.
@@ -172,6 +172,21 @@ hard-coded per OS per version.  Not yet reported upstream.
  		;;
  ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
  		RANLIB=echo
+@@ -671,12 +614,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
+ 		esac
+ 		: ${SHLIB_CFLAGS=-fPIC}
+ 		: ${SHLIB_SUFFIX=.dylib}
+-		: ${SHLIB_LD='cc -shared -Wl,-flat_namespace -Wl,-undefined,dynamic_lookup -Wl,-install_name,@rpath/${LIB}'}
++		: ${SHLIB_LD='${CC} -shared -Wl,-flat_namespace -Wl,-undefined,dynamic_lookup -Wl,-install_name,@rpath/${LIB}'}
+ 		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
+                 # In MacOS/X 10.11.x /bin/sh unsets DYLD_LIBRARY_PATH, so we
+                 # have export it into postfix-install indirectly!
+ 		: ${SHLIB_ENV="DYLD_LIBRARY_PATH=`pwd`/lib SHLIB_ENV_VAR=DYLD_LIBRARY_PATH SHLIB_ENV_VAL=`pwd`/lib"}
+-		: ${PLUGIN_LD='cc -shared -Wl,-flat_namespace -Wl,-undefined,dynamic_lookup'}
++		: ${PLUGIN_LD='${CC} -shared -Wl,-flat_namespace -Wl,-undefined,dynamic_lookup'}
+ 		;;
+     dcosx.1*)	SYSTYPE=DCOSX1
+ 		RANLIB=echo
 @@ -757,8 +700,8 @@ esac
  #
  case "$CCARGS" in