Received: by mail.netbsd.org (Postfix, from userid 605) id 1FA2484D8A; Fri, 23 Jun 2017 19:18:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A47C684D7F for ; Fri, 23 Jun 2017 19:18:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id jkXk4wUnOwfC for ; Fri, 23 Jun 2017 19:18:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D5DFC84CDD for ; Fri, 23 Jun 2017 19:18:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D3CD7FAE8; Fri, 23 Jun 2017 19:18:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1498245487113460" MIME-Version: 1.0 Date: Fri, 23 Jun 2017 19:18:07 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/mail/postfix To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20170623191807.D3CD7FAE8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1498245487113460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Fri Jun 23 19:18:07 UTC 2017 Modified Files: pkgsrc/mail/postfix: distinfo pkgsrc/mail/postfix/patches: patch-ag patch-ai Log Message: Make NetBSD support version agnostic. Checks are against __NetBSD__Version__ anyway. Fixes NetBSD 8.99.1 build To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 pkgsrc/mail/postfix/distinfo cvs rdiff -u -r1.38 -r1.39 pkgsrc/mail/postfix/patches/patch-ag cvs rdiff -u -r1.39 -r1.40 pkgsrc/mail/postfix/patches/patch-ai Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1498245487113460 Content-Disposition: inline Content-Length: 7057 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/postfix/distinfo diff -u pkgsrc/mail/postfix/distinfo:1.171 pkgsrc/mail/postfix/distinfo:1.172 --- pkgsrc/mail/postfix/distinfo:1.171 Sat Jun 17 08:02:22 2017 +++ pkgsrc/mail/postfix/distinfo Fri Jun 23 19:18:07 2017 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.171 2017/06/17 08:02:22 taca Exp $ +$NetBSD: distinfo,v 1.172 2017/06/23 19:18:07 maya Exp $ SHA1 (postfix-3.2.2.tar.gz) = 1a0d01e79ced46b38e8bd5b7a726a1622cf1bc07 RMD160 (postfix-3.2.2.tar.gz) = 9509e48da474d214771d96c2aa8563ea5ccd13a1 SHA512 (postfix-3.2.2.tar.gz) = 9432fa8b181db99b8e2d72b2a0f640d1456b10c42615f0a002638f7f788d748b8bb55cd36409a368ac4f6d22033d1d059728fa33980fb93d465b6dfd5ae26418 Size (postfix-3.2.2.tar.gz) = 4390318 bytes SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c -SHA1 (patch-ag) = 88a1534b56dd51edcd7a5bde2172beaf0d6a0e70 -SHA1 (patch-ai) = b909daf44016b8ee4e258791b5e0193879871aaa +SHA1 (patch-ag) = 10e7c6ec4ca9e05ba8a37eeb4910b784fb9a5e34 +SHA1 (patch-ai) = 464da0a53bc9cac1f4e932e9735b75f4a33c7aa7 SHA1 (patch-src_dns_dns__lookup.c) = b04d35b1df1b60409c903d2fb5bafb16b848523d Index: pkgsrc/mail/postfix/patches/patch-ag diff -u pkgsrc/mail/postfix/patches/patch-ag:1.38 pkgsrc/mail/postfix/patches/patch-ag:1.39 --- pkgsrc/mail/postfix/patches/patch-ag:1.38 Sat Jun 17 08:02:22 2017 +++ pkgsrc/mail/postfix/patches/patch-ag Fri Jun 23 19:18:07 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.38 2017/06/17 08:02:22 taca Exp $ +$NetBSD: patch-ag,v 1.39 2017/06/23 19:18:07 maya Exp $ * Add support for NetBSD 8. * Only define HAS_DB if it hasn't been defined. @@ -6,7 +6,7 @@ $NetBSD: patch-ag,v 1.38 2017/06/17 08:0 --- src/util/sys_defs.h.orig 2017-02-02 01:31:15.000000000 +0000 +++ src/util/sys_defs.h -@@ -30,12 +30,13 @@ +@@ -30,13 +30,11 @@ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ @@ -14,14 +14,15 @@ $NetBSD: patch-ag,v 1.38 2017/06/17 08:0 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ || defined(OPENBSD5) || defined(OPENBSD6) \ - || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ - || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \ +- || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ +- || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \ - || defined(NETBSD7) \ -+ || defined(NETBSD7) || defined(NETBSD8) \ - || defined(EKKOBSD1) || defined(DRAGONFLY) +- || defined(EKKOBSD1) || defined(DRAGONFLY) ++ || defined(NETBSD) || defined(EKKOBSD1) || defined(DRAGONFLY) #define SUPPORTED #include -@@ -48,7 +49,9 @@ + #define UINT32_TYPE unsigned int +@@ -48,7 +46,9 @@ #define DEF_MAILBOX_LOCK "flock, dotlock" #define HAS_SUN_LEN #define HAS_FSYNC @@ -31,7 +32,7 @@ $NetBSD: patch-ag,v 1.38 2017/06/17 08:0 #define HAS_SA_LEN #define NATIVE_DB_TYPE "hash" #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000) -@@ -1250,6 +1253,8 @@ extern int h_errno; +@@ -1250,6 +1250,8 @@ extern int h_errno; #define DEF_SMTP_CACHE_DEMAND 0 #endif Index: pkgsrc/mail/postfix/patches/patch-ai diff -u pkgsrc/mail/postfix/patches/patch-ai:1.39 pkgsrc/mail/postfix/patches/patch-ai:1.40 --- pkgsrc/mail/postfix/patches/patch-ai:1.39 Mon Apr 24 20:11:40 2017 +++ pkgsrc/mail/postfix/patches/patch-ai Fri Jun 23 19:18:07 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.39 2017/04/24 20:11:40 fhajny Exp $ +$NetBSD: patch-ai,v 1.40 2017/06/23 19:18: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. @@ -34,20 +34,34 @@ hard-coded per OS per version. Not yet DragonFly.*) SYSTYPE=DRAGONFLY ;; OpenBSD.2*) SYSTYPE=OPENBSD2 -@@ -321,6 +339,12 @@ case "$SYSTEM.$RELEASE" in - NetBSD.4*) SYSTYPE=NETBSD4 +@@ -312,25 +330,7 @@ case "$SYSTEM.$RELEASE" in ;; - NetBSD.5*) SYSTYPE=NETBSD5 -+ : ${SHLIB_SUFFIX=.so} -+ : ${SHLIB_CFLAGS=-fPIC} -+ : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'} -+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} -+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} -+ : ${PLUGIN_LD="${CC-gcc} -shared"} + ekkoBSD.1*) SYSTYPE=EKKOBSD1 ;; - NetBSD.6*) SYSTYPE=NETBSD6 +- NetBSD.1*) SYSTYPE=NETBSD1 +- ;; +- NetBSD.2*) SYSTYPE=NETBSD2 +- ;; +- NetBSD.3*) SYSTYPE=NETBSD3 +- ;; +- NetBSD.4*) SYSTYPE=NETBSD4 +- ;; +- NetBSD.5*) SYSTYPE=NETBSD5 +- ;; +- NetBSD.6*) SYSTYPE=NETBSD6 +- : ${SHLIB_SUFFIX=.so} +- : ${SHLIB_CFLAGS=-fPIC} +- : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'} +- : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} +- : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} +- : ${PLUGIN_LD="${CC-gcc} -shared"} +- ;; +- NetBSD.7*) SYSTYPE=NETBSD7 ++ NetBSD*) SYSTYPE=NETBSD : ${SHLIB_SUFFIX=.so} -@@ -409,13 +433,6 @@ case "$SYSTEM.$RELEASE" in + : ${SHLIB_CFLAGS=-fPIC} + : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'} +@@ -409,13 +409,6 @@ case "$SYSTEM.$RELEASE" in esac ;; ULTRIX.4*) SYSTYPE=ULTRIX4 @@ -61,7 +75,7 @@ hard-coded per OS per version. Not yet for l in syslog resolv; do if [ -f /usr/local/lib/lib$l.a ]; then SYSLIBS="$SYSLIBS -l$l" -@@ -457,33 +474,8 @@ case "$SYSTEM.$RELEASE" in +@@ -457,33 +450,8 @@ case "$SYSTEM.$RELEASE" in esac;; # Tested with RedHat 3.03 on 20020729. Linux.1*) SYSTYPE=LINUX1 @@ -95,7 +109,7 @@ hard-coded per OS per version. Not yet for name in nsl resolv $GDBM_LIBS do for lib in /usr/lib64 /lib64 /usr/lib /lib -@@ -544,25 +536,6 @@ EOF +@@ -544,25 +512,6 @@ EOF : ${PLUGIN_LD="${CC-gcc} -shared"} ;; Linux.[34].*) SYSTYPE=LINUX$RELEASE_MAJOR @@ -121,7 +135,7 @@ hard-coded per OS per version. Not yet for name in nsl resolv do for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/* -@@ -583,24 +556,6 @@ EOF +@@ -583,24 +532,6 @@ EOF ;; GNU.0*|GNU/kFreeBSD.[567]*) SYSTYPE=GNU0 @@ -146,7 +160,7 @@ hard-coded per OS per version. Not yet for name in nsl resolv do for lib in /usr/lib64 /lib64 /usr/lib /lib -@@ -631,26 +586,14 @@ EOF +@@ -631,26 +562,14 @@ EOF HP-UX.A.09.*) SYSTYPE=HPUX9 SYSLIBS=-ldbm CCARGS="$CCARGS -DMISSING_USLEEP -DNO_SNPRINTF" @@ -173,7 +187,7 @@ hard-coded per OS per version. Not yet ;; ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543 RANLIB=echo -@@ -692,12 +635,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5 +@@ -692,12 +611,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5 esac : ${SHLIB_CFLAGS=-fPIC} : ${SHLIB_SUFFIX=.dylib} @@ -188,7 +202,7 @@ hard-coded per OS per version. Not yet ;; dcosx.1*) SYSTYPE=DCOSX1 RANLIB=echo -@@ -778,8 +721,8 @@ esac +@@ -778,8 +697,8 @@ esac # case "$CCARGS" in *-DNO_EAI*) CCARGS="$CCARGS "'-DDEF_SMTPUTF8_ENABLE=\"no\"';; --_----------=_1498245487113460--