Received: by mail.netbsd.org (Postfix, from userid 605) id 437A384DB6; Mon, 23 Oct 2017 20:34:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C1C9084D9A for ; Mon, 23 Oct 2017 20:34:27 +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 5bR_d3PqBpny for ; Mon, 23 Oct 2017 20:34:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5505284D52 for ; Mon, 23 Oct 2017 20:34:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 53311FBDE; Mon, 23 Oct 2017 20:34:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1508790867296140" MIME-Version: 1.0 Date: Mon, 23 Oct 2017 20:34:27 +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: <20171023203427.53311FBDE@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. --_----------=_1508790867296140 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Oct 23 20:34:27 UTC 2017 Modified Files: pkgsrc/mk: pgsql.buildlink3.mk Log Message: Added support for PostgreSQL 10.0 To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 pkgsrc/mk/pgsql.buildlink3.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1508790867296140 Content-Disposition: inline Content-Length: 1725 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.45 pkgsrc/mk/pgsql.buildlink3.mk:1.46 --- pkgsrc/mk/pgsql.buildlink3.mk:1.45 Thu Jun 1 13:30:26 2017 +++ pkgsrc/mk/pgsql.buildlink3.mk Mon Oct 23 20:34:27 2017 @@ -1,4 +1,4 @@ -# $NetBSD: pgsql.buildlink3.mk,v 1.45 2017/06/01 13:30:26 jlam Exp $ +# $NetBSD: pgsql.buildlink3.mk,v 1.46 2017/10/23 20:34:27 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?= 96 95 94 93 92 +PGSQL_VERSIONS_ACCEPTED?= 10 96 95 94 93 92 # 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.10.dylib) +_PGSQL_VERSION_10_INSTALLED= yes +. endif . if exists(${LOCALBASE}/lib/libecpg.6.8.dylib) _PGSQL_VERSION_96_INSTALLED= yes . endif @@ -56,6 +59,9 @@ _PGSQL_VERSION_93_INSTALLED= yes _PGSQL_VERSION_92_INSTALLED= yes . endif .else +. if exists(${LOCALBASE}/lib/libecpg.so.6.10) +_PGSQL_VERSION_10_INSTALLED= yes +. endif . if exists(${LOCALBASE}/lib/libecpg.so.6.8) _PGSQL_VERSION_96_INSTALLED= yes . endif @@ -108,7 +114,10 @@ _PGSQL_VERSION= ${_PGSQL_VERSION_FIRSTAC .endif # set variables for the version we decided to use: -.if ${_PGSQL_VERSION} == "96" +.if ${_PGSQL_VERSION} == "10" +PGSQL_TYPE= postgresql10-client +PGPKGSRCDIR= ../../databases/postgresql10-client +.elif ${_PGSQL_VERSION} == "96" PGSQL_TYPE= postgresql96-client PGPKGSRCDIR= ../../databases/postgresql96-client .elif ${_PGSQL_VERSION} == "95" --_----------=_1508790867296140--