From 9dbcc91a85a616e0f6ce3332eb6e0145f9ac27bb Mon Sep 17 00:00:00 2001 From: sevan Date: Fri, 4 Nov 2016 17:10:10 +0000 Subject: Add support for FreeBSD 11 & 12 via FreeBSD ports. --- mail/postfix/distinfo | 6 +++--- mail/postfix/patches/patch-ag | 17 +++++++++++++---- mail/postfix/patches/patch-ai | 43 +++++++++++++++++++++++++++++++++++-------- 3 files changed, 51 insertions(+), 15 deletions(-) diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 72889e99eca..18a2ad4bab1 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.166 2016/10/31 04:19:07 maya Exp $ +$NetBSD: distinfo,v 1.167 2016/11/04 17:10:10 sevan Exp $ SHA1 (postfix-3.1.3.tar.gz) = 0c1d57a929c66fe57e6cd9d25bb7d05fc72363d0 RMD160 (postfix-3.1.3.tar.gz) = d974c821d39ff273bafeba06e69aca57cb56d374 SHA512 (postfix-3.1.3.tar.gz) = 00e2b0974e59420cabfddc92597a99b42c8a8c9cd9a0c279c63ba6be9f40b15400f37dc16d0b1312130e72b5ba82b56fc7d579ee9ef975a957c0931b0401213c Size (postfix-3.1.3.tar.gz) = 4338730 bytes SHA1 (patch-aa) = f2c418a2fd34da7325ea2823ddd14043768f0111 -SHA1 (patch-ag) = e3d818cd75225c5b50960659827c6e27767cbd58 -SHA1 (patch-ai) = c5b9e395586e03ede5e4d6e7763f1d18a725fc08 +SHA1 (patch-ag) = 1288ac987056f5c93a05e46148ce2ef1c50ade38 +SHA1 (patch-ai) = 2564f27b83afaa06770066976983b4a0bfed3d79 SHA1 (patch-src_dns_dns__lookup.c) = b04d35b1df1b60409c903d2fb5bafb16b848523d diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag index b9b83dc9ade..797fc5a2354 100644 --- a/mail/postfix/patches/patch-ag +++ b/mail/postfix/patches/patch-ag @@ -1,11 +1,20 @@ -$NetBSD: patch-ag,v 1.36 2015/09/07 09:47:01 fhajny Exp $ +$NetBSD: patch-ag,v 1.37 2016/11/04 17:10:10 sevan Exp $ * Add support for NetBSD 7. * Only define HAS_DB if it hasn't been defined. +* Add support for FreeBSD 11 and 12. ---- src/util/sys_defs.h.orig 2015-07-18 13:28:17.000000000 +0000 +--- src/util/sys_defs.h.orig 2016-05-15 16:39:11.000000000 +0000 +++ src/util/sys_defs.h -@@ -45,7 +45,9 @@ +@@ -26,6 +26,7 @@ + #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ + || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ + || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ ++ || defined(FREEBSD11) || defined(FREEBSD12) \ + || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ + || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ + || defined(OPENBSD5) || defined(OPENBSD6) \ +@@ -45,7 +46,9 @@ #define DEF_MAILBOX_LOCK "flock, dotlock" #define HAS_SUN_LEN #define HAS_FSYNC @@ -15,7 +24,7 @@ $NetBSD: patch-ag,v 1.36 2015/09/07 09:47:01 fhajny Exp $ #define HAS_SA_LEN #define NATIVE_DB_TYPE "hash" #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000) -@@ -1267,6 +1269,8 @@ extern int h_errno; +@@ -1268,6 +1271,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 4860a9ab860..0b4fa1a05a2 100644 --- a/mail/postfix/patches/patch-ai +++ b/mail/postfix/patches/patch-ai @@ -1,13 +1,40 @@ -$NetBSD: patch-ai,v 1.36 2016/10/31 04:19:07 maya Exp $ +$NetBSD: patch-ai,v 1.37 2016/11/04 17:10:10 sevan 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. +3) Add support for FreeBSD 11 & 12. + --- makedefs.orig 2016-08-20 00:08:42.000000000 +0000 +++ makedefs -@@ -309,6 +309,12 @@ case "$SYSTEM.$RELEASE" in +@@ -272,6 +272,24 @@ case "$SYSTEM.$RELEASE" in + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC} -shared"} + ;; ++ FreeBSD.11*) SYSTYPE=FREEBSD11 ++ : ${CC=cc} ++ : ${SHLIB_SUFFIX=.so} ++ : ${SHLIB_CFLAGS=-fPIC} ++ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} ++ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} ++ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} ++ : ${PLUGIN_LD="${CC} -shared"} ++ ;; ++ FreeBSD.12*) SYSTYPE=FREEBSD12 ++ : ${CC=cc} ++ : ${SHLIB_SUFFIX=.so} ++ : ${SHLIB_CFLAGS=-fPIC} ++ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} ++ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} ++ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} ++ : ${PLUGIN_LD="${CC} -shared"} ++ ;; + DragonFly.*) SYSTYPE=DRAGONFLY + ;; + OpenBSD.2*) SYSTYPE=OPENBSD2 +@@ -309,6 +327,12 @@ case "$SYSTEM.$RELEASE" in NetBSD.4*) SYSTYPE=NETBSD4 ;; NetBSD.5*) SYSTYPE=NETBSD5 @@ -20,7 +47,7 @@ hard-coded per OS per version. Not yet reported upstream. ;; NetBSD.6*) SYSTYPE=NETBSD6 : ${SHLIB_SUFFIX=.so} -@@ -389,13 +395,6 @@ case "$SYSTEM.$RELEASE" in +@@ -389,13 +413,6 @@ case "$SYSTEM.$RELEASE" in esac ;; ULTRIX.4*) SYSTYPE=ULTRIX4 @@ -34,7 +61,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" -@@ -437,33 +436,8 @@ case "$SYSTEM.$RELEASE" in +@@ -437,33 +454,8 @@ case "$SYSTEM.$RELEASE" in esac;; # Tested with RedHat 3.03 on 20020729. Linux.1*) SYSTYPE=LINUX1 @@ -68,7 +95,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 -@@ -524,25 +498,6 @@ EOF +@@ -524,25 +516,6 @@ EOF : ${PLUGIN_LD="${CC-gcc} -shared"} ;; Linux.[34].*) SYSTYPE=LINUX$RELEASE_MAJOR @@ -94,7 +121,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/* -@@ -563,24 +518,6 @@ EOF +@@ -563,24 +536,6 @@ EOF ;; GNU.0*|GNU/kFreeBSD.[567]*) SYSTYPE=GNU0 @@ -119,7 +146,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 -@@ -611,25 +548,13 @@ EOF +@@ -611,25 +566,13 @@ EOF HP-UX.A.09.*) SYSTYPE=HPUX9 SYSLIBS=-ldbm CCARGS="$CCARGS -DMISSING_USLEEP" @@ -145,7 +172,7 @@ hard-coded per OS per version. Not yet reported upstream. ;; ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543 RANLIB=echo -@@ -757,8 +682,8 @@ esac +@@ -757,8 +700,8 @@ esac # case "$CCARGS" in *-DNO_EAI*) ;; -- cgit v1.2.3