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 1992D7A2CC for ; Mon, 21 Nov 2016 01:42:56 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id BC3FA855B5; Mon, 21 Nov 2016 01:42:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 49A4A85589 for ; Mon, 21 Nov 2016 01:42:55 +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 Dat8bMALBjm1 for ; Mon, 21 Nov 2016 01:42:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C01DD85585 for ; Mon, 21 Nov 2016 01:42:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BAD82FBA6; Mon, 21 Nov 2016 01:42:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1479692574101420" MIME-Version: 1.0 Date: Mon, 21 Nov 2016 01:42:54 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/databases To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20161121014254.BAD82FBA6@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. --_----------=_1479692574101420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Mon Nov 21 01:42:54 UTC 2016 Modified Files: pkgsrc/databases/postgresql95: distinfo pkgsrc/databases/postgresql95-contrib: Makefile Removed Files: pkgsrc/databases/postgresql95/patches: patch-contrib_uuid-ossp_uuid-ossp.c Log Message: postgresql95-contrib: Drop uuid-ossp dependency on BSD. (Use --with-uuid=bsd as per documentation section F.43.2) Also probably fix the UUID extension on Solaris and Linux, but untested. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql95/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql95-contrib/Makefile cvs rdiff -u -r1.1 -r0 \ pkgsrc/databases/postgresql95/patches/patch-contrib_uuid-ossp_uuid-ossp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1479692574101420 Content-Disposition: inline Content-Length: 2830 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/postgresql95/distinfo diff -u pkgsrc/databases/postgresql95/distinfo:1.5 pkgsrc/databases/postgresql95/distinfo:1.6 --- pkgsrc/databases/postgresql95/distinfo:1.5 Sat Oct 29 19:41:54 2016 +++ pkgsrc/databases/postgresql95/distinfo Mon Nov 21 01:42:54 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2016/10/29 19:41:54 adam Exp $ +$NetBSD: distinfo,v 1.6 2016/11/21 01:42:54 tnn Exp $ SHA1 (postgresql-9.5.5.tar.bz2) = daf67622692f066d78150a2c4ffae1ec6568ced8 RMD160 (postgresql-9.5.5.tar.bz2) = 87a90023bdae604f1356e9f0e5a9b7f4c333c847 @@ -8,7 +8,6 @@ SHA1 (patch-config_missing) = c2d7d74292 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921 -SHA1 (patch-contrib_uuid-ossp_uuid-ossp.c) = efaffec2f51de70823430ca162d499b2886a9190 SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a SHA1 (patch-src_Makefile.shlib) = 46b3a8591678f92892d3837cd31fa44e8a7e21b3 SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca Index: pkgsrc/databases/postgresql95-contrib/Makefile diff -u pkgsrc/databases/postgresql95-contrib/Makefile:1.1 pkgsrc/databases/postgresql95-contrib/Makefile:1.2 --- pkgsrc/databases/postgresql95-contrib/Makefile:1.1 Sun Jun 19 20:48:29 2016 +++ pkgsrc/databases/postgresql95-contrib/Makefile Mon Nov 21 01:42:54 2016 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2016/06/19 20:48:29 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2016/11/21 01:42:54 tnn Exp $ PKGNAME= ${DISTNAME:C/-/95-contrib-/} +PKGREVISION= 1 COMMENT= Contrib subtree of tools and plug-ins .include "../../databases/postgresql95/Makefile.common" @@ -57,13 +58,21 @@ BUILD_DIRS+= contrib/vacuumlo CONFIGURE_ARGS+= --with-openssl PLIST_VARS+= uuid -.if ${OPSYS} != "Darwin" +.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" PLIST.uuid= yes -CONFIGURE_ARGS+= --with-uuid=ossp BUILD_DIRS+= contrib/uuid-ossp -# because global pg_config.h is included, we have to define this -BUILD_MAKE_FLAGS+= PG_CPPFLAGS=-DHAVE_UUID_H -.include "../../devel/ossp-uuid/buildlink3.mk" +. if ${OPSYS:M*BSD} +BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_BSD -DSHA1_RESULTLEN=20" +CONFIGURE_ARGS+= --with-uuid=bsd +. elif ${OPSYS} == "Linux" +BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_UUID_H -DHAVE_UUID_E2FS" +CONFIGURE_ARGS+= --with-uuid=e2fs +. elif ${OPSYS} == "SunOS" +BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_OSSP" +CONFIGURE_ARGS+= --with-uuid=ossp +BUILD_MAKE_FLAGS+= UUID_LIBS=-lossp-uuid +. include "../../devel/ossp-uuid/buildlink3.mk" +. endif .endif PRINT_PLIST_AWK+= {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}} --_----------=_1479692574101420--