Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id BB0C77A295 for ; Sun, 30 Oct 2016 08:57:13 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 63D0F855B0; Sun, 30 Oct 2016 08:57:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E4D1C855A0 for ; Sun, 30 Oct 2016 08:57:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Kdf0LuveOCTi for ; Sun, 30 Oct 2016 08:57:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7358C84CEC for ; Sun, 30 Oct 2016 08:57:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 49CD1FB87; Sun, 30 Oct 2016 08:57:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1477817832180960" MIME-Version: 1.0 Date: Sun, 30 Oct 2016 08:57:12 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20161030085712.49CD1FB87@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1477817832180960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sun Oct 30 08:57:12 UTC 2016 Modified Files: pkgsrc/mk: pgsql.buildlink3.mk Log Message: Added postgresql96 support To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 pkgsrc/mk/pgsql.buildlink3.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1477817832180960 Content-Disposition: inline Content-Length: 1722 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/pgsql.buildlink3.mk diff -u pkgsrc/mk/pgsql.buildlink3.mk:1.42 pkgsrc/mk/pgsql.buildlink3.mk:1.43 --- pkgsrc/mk/pgsql.buildlink3.mk:1.42 Sun Oct 9 21:08:18 2016 +++ pkgsrc/mk/pgsql.buildlink3.mk Sun Oct 30 08:57:12 2016 @@ -1,4 +1,4 @@ -# $NetBSD: pgsql.buildlink3.mk,v 1.42 2016/10/09 21:08:18 wiz Exp $ +# $NetBSD: pgsql.buildlink3.mk,v 1.43 2016/10/30 08:57:12 adam Exp $ # # User-settable variables: # @@ -25,7 +25,7 @@ _SYS_VARS.pgsql= PG_LIB_EXT PGSQL_TYPE P .include "../../mk/bsd.prefs.mk" PGSQL_VERSION_DEFAULT?= 95 -PGSQL_VERSIONS_ACCEPTED?= 95 94 93 92 91 +PGSQL_VERSIONS_ACCEPTED?= 96 95 94 93 92 91 # transform the list into individual variables .for pv in ${PGSQL_VERSIONS_ACCEPTED} @@ -40,6 +40,9 @@ PG_LIB_EXT=so # check what is installed .if ${OPSYS} == "Darwin" +. if exists(${LOCALBASE}/lib/libecpg.6.8.dylib) +_PGSQL_VERSION_96_INSTALLED= yes +. endif . if exists(${LOCALBASE}/lib/libecpg.6.7.dylib) _PGSQL_VERSION_95_INSTALLED= yes . endif @@ -62,6 +65,9 @@ _PGSQL_VERSION_90_INSTALLED= yes _PGSQL_VERSION_84_INSTALLED= yes . endif .else +. if exists(${LOCALBASE}/lib/libecpg.so.6.8) +_PGSQL_VERSION_96_INSTALLED= yes +. endif . if exists(${LOCALBASE}/lib/libecpg.so.6.7) _PGSQL_VERSION_95_INSTALLED= yes . endif @@ -120,7 +126,10 @@ _PGSQL_VERSION= ${_PGSQL_VERSION_FIRSTAC .endif # set variables for the version we decided to use: -.if ${_PGSQL_VERSION} == "95" +.if ${_PGSQL_VERSION} == "96" +PGSQL_TYPE= postgresql96-client +PGPKGSRCDIR= ../../databases/postgresql96-client +.elif ${_PGSQL_VERSION} == "95" PGSQL_TYPE= postgresql95-client PGPKGSRCDIR= ../../databases/postgresql95-client .elif ${_PGSQL_VERSION} == "94" --_----------=_1477817832180960--