diff options
Diffstat (limited to 'mail/postfix/patches')
| -rw-r--r-- | mail/postfix/patches/patch-aa | 15 | ||||
| -rw-r--r-- | mail/postfix/patches/patch-ag | 16 | ||||
| -rw-r--r-- | mail/postfix/patches/patch-ai | 25 |
3 files changed, 21 insertions, 35 deletions
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa index 0daf889935e..e65d2b68ab1 100644 --- a/mail/postfix/patches/patch-aa +++ b/mail/postfix/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.23 2014/02/09 05:34:13 taca Exp $ +$NetBSD: patch-aa,v 1.24 2015/09/07 09:47:01 fhajny Exp $ Make this pkgsrc friendly. ---- postfix-install.orig 2012-05-22 19:40:29.000000000 +0000 +--- postfix-install.orig 2015-01-29 22:15:30.000000000 +0000 +++ postfix-install -@@ -370,26 +370,6 @@ HTML files. Specify \"no\" if you do not +@@ -436,26 +436,6 @@ template files main.cf.proto and master. : ${tempdir=`pwd`} : ${config_directory=`bin/postconf -c conf -h -d config_directory`} @@ -31,14 +31,17 @@ Make this pkgsrc friendly. # In case some systems special-case pathnames beginning with //. case $install_root in -@@ -744,10 +724,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \ - "sample_directory = $sample_directory" \ - "readme_directory = $readme_directory" \ +@@ -847,13 +827,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \ + "shlib_directory = $shlib_directory" \ + "meta_directory = $meta_directory" \ || exit 1 - -# If Postfix is being installed locally from source code, do the -# post-install processing now. - +-# The unexpansion above may have side effects on exported variables. +-# It does not matter because bin/postfix below will override them. +- -test -n "$install_root" || { - bin/postfix post-install $post_install_options || exit 1 -} diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag index 4042eca9534..b9b83dc9ade 100644 --- a/mail/postfix/patches/patch-ag +++ b/mail/postfix/patches/patch-ag @@ -1,19 +1,11 @@ -$NetBSD: patch-ag,v 1.35 2014/08/25 16:00:54 taca Exp $ +$NetBSD: patch-ag,v 1.36 2015/09/07 09:47:01 fhajny Exp $ * Add support for NetBSD 7. * Only define HAS_DB if it hasn't been defined. ---- src/util/sys_defs.h.orig 2013-09-29 20:51:55.000000000 +0000 +--- src/util/sys_defs.h.orig 2015-07-18 13:28:17.000000000 +0000 +++ src/util/sys_defs.h -@@ -31,6 +31,7 @@ - || defined(OPENBSD5) \ - || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ - || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \ -+ || defined(NETBSD7) \ - || defined(EKKOBSD1) || defined(DRAGONFLY) - #define SUPPORTED - #include <sys/types.h> -@@ -44,7 +45,9 @@ +@@ -45,7 +45,9 @@ #define DEF_MAILBOX_LOCK "flock, dotlock" #define HAS_SUN_LEN #define HAS_FSYNC @@ -23,7 +15,7 @@ $NetBSD: patch-ag,v 1.35 2014/08/25 16:00:54 taca Exp $ #define HAS_SA_LEN #define NATIVE_DB_TYPE "hash" #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000) -@@ -1265,6 +1268,8 @@ extern int h_errno; +@@ -1267,6 +1269,8 @@ extern int h_errno; #define DEF_SMTP_CACHE_DEMAND 0 #endif diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai index c4ffd0723d4..fb1916b24f2 100644 --- a/mail/postfix/patches/patch-ai +++ b/mail/postfix/patches/patch-ai @@ -1,19 +1,10 @@ -$NetBSD: patch-ai,v 1.33 2015/07/22 00:25:37 taca Exp $ +$NetBSD: patch-ai,v 1.34 2015/09/07 09:47:01 fhajny Exp $ Make this pkgsrc friendly. ---- makedefs.orig 2015-07-19 14:24:10.000000000 +0000 +--- makedefs.orig 2015-07-19 14:24:25.000000000 +0000 +++ makedefs -@@ -187,6 +187,8 @@ case "$SYSTEM.$RELEASE" in - ;; - NetBSD.6*) SYSTYPE=NETBSD6 - ;; -+ NetBSD.7*) SYSTYPE=NETBSD7 -+ ;; - BSD/OS.2*) SYSTYPE=BSDI2 - ;; - BSD/OS.3*) SYSTYPE=BSDI3 -@@ -244,13 +246,6 @@ case "$SYSTEM.$RELEASE" in +@@ -372,13 +372,6 @@ case "$SYSTEM.$RELEASE" in esac ;; ULTRIX.4*) SYSTYPE=ULTRIX4 @@ -27,7 +18,7 @@ Make this pkgsrc friendly. for l in syslog resolv; do if [ -f /usr/local/lib/lib$l.a ]; then SYSLIBS="$SYSLIBS -l$l" -@@ -288,33 +283,8 @@ case "$SYSTEM.$RELEASE" in +@@ -416,33 +409,8 @@ case "$SYSTEM.$RELEASE" in esac;; # Tested with RedHat 3.03 on 20020729. Linux.1*) SYSTYPE=LINUX1 @@ -61,8 +52,8 @@ Make this pkgsrc friendly. for name in nsl resolv $GDBM_LIBS do for lib in /usr/lib64 /lib64 /usr/lib /lib -@@ -368,25 +338,6 @@ EOF - esac +@@ -503,25 +471,6 @@ EOF + : ${PLUGIN_LD="${CC-gcc} -shared"} ;; Linux.[34].*) SYSTYPE=LINUX$RELEASE_MAJOR - case "$CCARGS" in @@ -87,7 +78,7 @@ Make this pkgsrc friendly. for name in nsl resolv do for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/* -@@ -400,24 +351,6 @@ EOF +@@ -542,24 +491,6 @@ EOF ;; GNU.0*|GNU/kFreeBSD.[567]*) SYSTYPE=GNU0 @@ -112,7 +103,7 @@ Make this pkgsrc friendly. for name in nsl resolv do for lib in /usr/lib64 /lib64 /usr/lib /lib -@@ -448,25 +381,13 @@ EOF +@@ -590,25 +521,13 @@ EOF HP-UX.A.09.*) SYSTYPE=HPUX9 SYSLIBS=-ldbm CCARGS="$CCARGS -DMISSING_USLEEP" |