diff options
-rw-r--r-- | databases/postgresql82-client/PLIST | 4 | ||||
-rw-r--r-- | databases/postgresql82-client/buildlink3.mk | 6 | ||||
-rw-r--r-- | databases/postgresql82-server/PLIST | 4 | ||||
-rw-r--r-- | databases/postgresql82/Makefile.common | 16 | ||||
-rw-r--r-- | databases/postgresql82/distinfo | 9 | ||||
-rw-r--r-- | databases/postgresql82/patches/patch-ad | 15 |
6 files changed, 40 insertions, 14 deletions
diff --git a/databases/postgresql82-client/PLIST b/databases/postgresql82-client/PLIST index eaaef7f8804..0258a873c38 100644 --- a/databases/postgresql82-client/PLIST +++ b/databases/postgresql82-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17.4.1 2010/05/12 21:20:05 tron Exp $ +@comment $NetBSD: PLIST,v 1.17.4.2 2010/05/22 11:22:53 tron Exp $ ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/af/LC_MESSAGES/libpq.mo ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/initdb.mo ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libpq.mo @@ -1544,7 +1544,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/wal-intro.html ${PG_SUBPREFIX}share/doc/postgresql/html/wal-reliability.html ${PG_SUBPREFIX}share/doc/postgresql/html/wal.html ${PG_SUBPREFIX}share/doc/postgresql/html/warm-standby.html -${PG_SUBPREFIX}share/doc/postgresql/html/x71236.html +${PG_SUBPREFIX}share/doc/postgresql/html/x71234.html ${PG_SUBPREFIX}share/doc/postgresql/html/xaggr.html ${PG_SUBPREFIX}share/doc/postgresql/html/xfunc-c.html ${PG_SUBPREFIX}share/doc/postgresql/html/xfunc-internal.html diff --git a/databases/postgresql82-client/buildlink3.mk b/databases/postgresql82-client/buildlink3.mk index b2c6233925a..c363aa46680 100644 --- a/databases/postgresql82-client/buildlink3.mk +++ b/databases/postgresql82-client/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2010/01/17 12:02:10 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6.2.1 2010/05/22 11:22:54 tron Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -11,10 +11,10 @@ BUILDLINK_API_DEPENDS.postgresql82-client+= postgresql82-client>=8.2.0 BUILDLINK_ABI_DEPENDS.postgresql82-client?= postgresql82-client>=8.2.15nb1 BUILDLINK_PKGSRCDIR.postgresql82-client?= ../../databases/postgresql82-client -. if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX) +.if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX) BUILDLINK_INCDIRS.postgresql82-client?= ${PG_SUBPREFIX}/include BUILDLINK_LIBDIRS.postgresql82-client?= ${PG_SUBPREFIX}/lib -. endif +.endif # This variable contains the libraries need to link most clients. BUILDLINK_LDADD.postgresql82-client= -lpq ${BUILDLINK_LDADD.gettext} diff --git a/databases/postgresql82-server/PLIST b/databases/postgresql82-server/PLIST index 991510dc813..67af984b679 100644 --- a/databases/postgresql82-server/PLIST +++ b/databases/postgresql82-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11.4.1 2010/05/12 21:20:05 tron Exp $ +@comment $NetBSD: PLIST,v 1.11.4.2 2010/05/22 11:22:54 tron Exp $ ${PG_SUBPREFIX}bin/postgres ${PG_SUBPREFIX}bin/postmaster ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la @@ -132,6 +132,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Asuncion ${PG_SUBPREFIX}share/postgresql/timezone/America/Atka ${PG_SUBPREFIX}share/postgresql/timezone/America/Atikokan ${PG_SUBPREFIX}share/postgresql/timezone/America/Bahia +${PG_SUBPREFIX}share/postgresql/timezone/America/Bahia_Banderas ${PG_SUBPREFIX}share/postgresql/timezone/America/Barbados ${PG_SUBPREFIX}share/postgresql/timezone/America/Belem ${PG_SUBPREFIX}share/postgresql/timezone/America/Belize @@ -269,6 +270,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Yellowknife ${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Casey ${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Davis ${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/DumontDUrville +${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Macquarie ${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Mawson ${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/McMurdo ${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Palmer diff --git a/databases/postgresql82/Makefile.common b/databases/postgresql82/Makefile.common index 493f1f58de3..7180a20b3b6 100644 --- a/databases/postgresql82/Makefile.common +++ b/databases/postgresql82/Makefile.common @@ -1,4 +1,12 @@ -# $NetBSD: Makefile.common,v 1.18.4.1 2010/05/12 21:20:05 tron Exp $ +# $NetBSD: Makefile.common,v 1.18.4.2 2010/05/22 11:22:53 tron Exp $ +# +# used by databases/postgresql82-adminpack/Makefile +# used by databases/postgresql82-client/Makefile +# used by databases/postgresql82-plperl/Makefile +# used by databases/postgresql82-plpython/Makefile +# used by databases/postgresql82-pltcl/Makefile +# used by databases/postgresql82-server/Makefile +# used by databases/postgresql82-tsearch2/Makefile # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -35,7 +43,7 @@ PATCHDIR?= ${.CURDIR}/../postgresql82/patches # DIST_VERS version number on the postgresql distfile # BASE_VERS pkgsrc-mangled version number (convert pl -> .) # Note: Do not forget jdbc-postgresql82 when updating version -DIST_VERS?= 8.2.16 +DIST_VERS?= 8.2.17 BASE_VERS?= ${DIST_VERS} BUILDLINK_API_DEPENDS.postgresql82-client+= postgresql82-client>=${BASE_VERS} @@ -111,12 +119,12 @@ FILES_SUBST+= PG_PREFIX=${PG_PREFIX:Q} post-extract: cp -f ${COMMON_FILESDIR}/Makefile.custom ${WRKSRC}/src/Makefile.custom cp -f ${COMMON_FILESDIR}/Makefile.libtool ${WRKSRC}/src/Makefile.shlib -.if !empty(USE_LIBLTDL:M[yY][eE][sS]) +. if !empty(USE_LIBLTDL:M[yY][eE][sS]) cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \ ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.h ${ECHO} "static int dummy = 0;" \ > ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.c -.endif +. endif touch ${WRKSRC}/src/template/dragonfly cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ ${WRKSRC}/src/backend/port/dynloader/dragonfly.c diff --git a/databases/postgresql82/distinfo b/databases/postgresql82/distinfo index dff8ea7e895..750f210d871 100644 --- a/databases/postgresql82/distinfo +++ b/databases/postgresql82/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.18.4.1 2010/05/12 21:20:05 tron Exp $ +$NetBSD: distinfo,v 1.18.4.2 2010/05/22 11:22:53 tron Exp $ -SHA1 (postgresql-8.2.16.tar.bz2) = 092e95438b6db24b65469433439c05dc6435d335 -RMD160 (postgresql-8.2.16.tar.bz2) = 5d3fe8ab522f3f0d744f902b3d31b2eab514e0f4 -Size (postgresql-8.2.16.tar.bz2) = 12637799 bytes +SHA1 (postgresql-8.2.17.tar.bz2) = 6387d14cc875b9217d89d52d842a1fbdd61ca66d +RMD160 (postgresql-8.2.17.tar.bz2) = 0e78ae8015c61c9538b7de45703a2b050d99bb50 +Size (postgresql-8.2.17.tar.bz2) = 12714721 bytes SHA1 (patch-aa) = 850a02acbd718a01d3597a99e929e3b3f663f07c SHA1 (patch-ab) = d09e44921e9dd005e1b1dfbb5da4e56737ea05ab SHA1 (patch-ac) = cbd302a60d43171854c37171b57ee7bbf1194ad9 +SHA1 (patch-ad) = fb75df841bbcc25e840ed9c2fed59232d7189200 SHA1 (patch-af) = 89cb9318946cb7c34ad79dbae107ce66bd1c5022 SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b diff --git a/databases/postgresql82/patches/patch-ad b/databases/postgresql82/patches/patch-ad new file mode 100644 index 00000000000..b7e2a7fa0d5 --- /dev/null +++ b/databases/postgresql82/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.2.20.2 2010/05/22 11:22:53 tron Exp $ + +--- src/pl/plperl/GNUmakefile.orig 2010-05-20 07:51:50.000000000 +0000 ++++ src/pl/plperl/GNUmakefile +@@ -53,9 +53,7 @@ PSQLDIR = $(bindir) + include $(top_srcdir)/src/Makefile.shlib + + +-all: all-lib +- +-plperl.o: plperl_opmask.h ++all: plperl_opmask.h all-lib + + plperl_opmask.h: plperl_opmask.pl + $(PERL) $< $@ |