Date: Thu, 6 Feb 2003 02:39:39 +0100 (CET) From: Palle Girgensohn <girgen@pingpong.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: seanc@FreeBSD.org Subject: ports/47983: Update postgresql to 7.3.2 Message-ID: <200302060139.h161ddu5056499@palle.girgensohn.se>
next in thread | raw e-mail | index | archive | help
>Number: 47983 >Category: ports >Synopsis: Update postgresql to 7.3.2 >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 05 17:40:13 PST 2003 >Closed-Date: >Last-Modified: >Originator: Palle Girgensohn <girgen@pingpong.net> >Release: FreeBSD 4.7-PRERELEASE i386 >Organization: PING PONG >Environment: System: FreeBSD palle.girgensohn.se 4.7-RC FreeBSD 4.7-RC #0: Sun Sep 29 17:21:22 CEST 2002 root@palle.girgensohn.se:/usr/local/obj/usr/src/sys/STORDATAN i386 >Description: This patch updates the postgresql port to 7.3.2 It also handles the problems described in PRs ports/46894 & ports/47284 The check target is courtesy of Sean Chittenden <sean@chittenden.org> >How-To-Repeat: >Fix: cvs remove files/patch-src::include::port::freebsd.h and apply this patch Index: Makefile =================================================================== RCS file: /home/ncvs/ports/databases/postgresql7/Makefile,v retrieving revision 1.105 diff -u -u -r1.105 Makefile --- Makefile 14 Jan 2003 17:00:24 -0000 1.105 +++ Makefile 5 Feb 2003 23:36:48 -0000 @@ -6,7 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 7.3.1 +PORTVERSION?= 7.3.2 CATEGORIES?= databases MASTER_SITES= ftp://ftp3.us.postgresql.org/pub/postgresql/%SUBDIR%/ \ ftp://ftp5.us.postgresql.org/pub/PostgreSQL/%SUBDIR%/ \ @@ -24,9 +24,7 @@ ftp://ftp.postgresql.org/pub/%SUBDIR%/ MASTER_SITE_SUBDIR= source/v${PORTVERSION} DISTFILES= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-test-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} + postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@pingpong.net @@ -65,17 +63,10 @@ CFLAGS+= -O3 -funroll-loops .endif -.if defined(WITH_DEBUG) && defined(WITH_STRIPBIN) - @${ECHO} "WITH_DEBUG and WITH_STRIPBIN are mutually exclusive tunables." - @${ECHO} "Please choose one or the other." - @exit ${FALSE} -.endif - .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug -.endif - -.if defined(WITH_STRIPBIN) +INSTALL_TARGET= install +.else INSTALL_TARGET= install-strip .endif @@ -89,35 +80,18 @@ PLIST_SUB+= SERVER="@comment " PKGNAMESUFFIX= -client .else -SERVERBINARIES+= postgres PLIST_SUB+= SERVER="" -INSTALL_TARGET= install install-all-headers -.endif - -.if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5) - @${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive." - @${ECHO} "Please choose one or the other." - @exit 1 +INSTALL_TARGET+= install-all-headers +MAKEFILE= GNUmakefile .endif .if defined(WITH_MIT_KRB5) KRB5CONF= ${LOCALBASE}/bin/krb5-config -.if !exists(${KRB5CONFIG}) - @${ECHO} "Unable to find krb5-config in your local base, please verify that" - @${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable." - @exit 1 -.endif WITH_KRB5= yes .endif .if defined(WITH_HEIMDAL_KRB5) KRB5CONF= /usr/bin/krb5-config -.if !exists(${KRB5CONFIG}) - @${ECHO} "Unable to find krb5-config in the base system. Undefine" - @${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf" - @${ECHO} "and remake world (or undefine the WITH_HEIMDAL_KRB5 tunable)." - @exit 1 -.endif LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 WITH_KRB5= yes .endif @@ -131,6 +105,10 @@ CFLAGS+= -O3 -funroll-loops .endif +.if defined(WITH_TESTS) +DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} +.endif + MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \ droplang.1 dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 \ pg_config.1 pg_controldata.1 pg_ctl.1 pg_dump.1 pg_dumpall.1 \ @@ -175,8 +153,25 @@ @${ECHO} " WITH_HEIMDAL_KRB5 Builds with Heimdal's kerberos support" @${ECHO} " WITH_OPTIMIZED_CFLAGS Builds with compiler optimizations (-O3)" @${ECHO} " WITH_DEBUG Builds with debugging symbols" - @${ECHO} " WITH_STRIPBIN Installs stripped binaries" + @${ECHO} " WITH_TESTS Allows the use of a \"check\" target" + @${ECHO} " building the module" @${ECHO} "" +.if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5) + @${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive." + @${ECHO} "Please choose one or the other." + @exit 1 +.endif +.if defined(WITH_MIT_KRB5) && !exists(${KRB5CONFIG}) + @${ECHO} "Unable to find krb5-config in your local base, please verify that" + @${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable." + @exit 1 +.endif +.if defined(WITH_HEIMDAL_KRB5) && !exists(${KRB5CONFIG}) + @${ECHO} "Unable to find krb5-config in the base system. Undefine" + @${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf" + @${ECHO} "and remake world (or undefine the WITH_HEIMDAL_KRB5 tunable)." + @exit 1 +.endif .if defined(WITHOUT_SERVER) do-install: @@ -196,14 +191,7 @@ ${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\ ${SED} "s|/usr/local|${PREFIX}|g" |\ tee ${PREFIX}/share/postgresql/post-install-notes -.if !defined(DEBUG_FLAGS) -.for file in ecpg pg_dump pg_id pg_restore psql ${SERVERBINARIES} - @ strip ${PREFIX}/bin/${file} -.endfor -.endif .if !defined(WITHOUT_SERVER) -# install shell defaults for pgsql user - @ strip ${PREFIX}/bin/postgres .for i in profile cshrc @ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \ < ${FILESDIR}/dot.$i.in \ @@ -222,6 +210,17 @@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\ ${INSTALL_DATA} ${FILESDIR}/502.pgsql \ ${PREFIX}/share/postgresql +.endif + +.if defined(WITH_TESTS) +check: + @if [ `id -u` != 0 ] ; then \ + ${ECHO} "Running postgresql regressions tests" ;\ + cd ${WRKSRC}; ${GMAKE} check ;\ + else \ + ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ + ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ + fi .endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/databases/postgresql7/distinfo,v retrieving revision 1.26 diff -u -u -r1.26 distinfo --- distinfo 4 Jan 2003 08:47:23 -0000 1.26 +++ distinfo 5 Feb 2003 23:39:35 -0000 @@ -1,4 +1,4 @@ -MD5 (postgresql/postgresql-base-7.3.1.tar.gz) = d31f4be7ada55e4914d1a9134e4441c7 -MD5 (postgresql/postgresql-opt-7.3.1.tar.gz) = 65e3db9df55b71b504a2f385da231de8 -MD5 (postgresql/postgresql-docs-7.3.1.tar.gz) = 42384cb2ded505243878231acb779bd6 -MD5 (postgresql/postgresql-test-7.3.1.tar.gz) = 8f231ca3470f3be6b33e1def77dcf7fc +MD5 (postgresql/postgresql-base-7.3.2.tar.gz) = 2cd99c2d455c653fdfe74f5dd658d15c +MD5 (postgresql/postgresql-opt-7.3.2.tar.gz) = c54a5b0be96b60259bd37f6a5b60abb9 +MD5 (postgresql/postgresql-test-7.3.2.tar.gz) = 9818eb4c50a2fe9057c7df5ae270972c +MD5 (postgresql/postgresql-docs-7.3.2.tar.gz) = e91131aeed6919a00ab231db2298bd0b Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/databases/postgresql7/pkg-plist,v retrieving revision 1.36 diff -u -u -r1.36 pkg-plist --- pkg-plist 4 Jan 2003 01:10:13 -0000 1.36 +++ pkg-plist 6 Feb 2003 00:38:53 -0000 @@ -85,52 +85,54 @@ %%SERVER%%share/postgresql/conversion_create.sql share/postgresql/post-install-notes @unexec rmdir %D/share/postgresql 2>/dev/null || true -%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo -%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo -%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo -%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo -%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo -%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo -%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo -%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo -%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo -%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo -%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo -%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo -%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo -%%SERVER%%%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo -%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo -%%SERVER%%%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo +%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo +%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo +%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo +%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo +%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo +%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo +%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo +%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo +%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo +%%SERVER%%%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo +%%SERVER%%%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo %%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true %%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true %%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302060139.h161ddu5056499>