ports/52851: postgresql update to 7.3.3

[Palle Girgensohn]

>Number:         52851
>Category:       ports
>Synopsis:       postgresql update to 7.3.3
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 01 18:00:22 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Palle Girgensohn <girgen at pingpong.net>
>Release:        FreeBSD 4.8-RELEASE 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 at palle.girgensohn.se:/usr/local/obj/usr/src/sys/STORDATAN  i386


	
>Description:
Update postgresql to 7.3.3
and add a few small thingys:

1. optionally link with libc_r to get plpython working
   Thanks to Mike Meyer <mwm at mired.org>

2. fix kerberos build, reported in ports/51080
   Thanks to Andy Gerweck <andy at tacnode.com>

3. Mike Harding <mvh at ix.netcom.com> pointed out that there was a
   duplication of some declarations.

This PR includes the fixes from ports/51080
>How-To-Repeat:
	
>Fix:
cvs remove files/patch-src::backend::utils::adt::numutils.c

apply this patch. Please note that it includes removal of PORTREVISION
for the postgresql-jdbc port, which really has do be done "atomically"
to avoid confusion.

Index: postgresql-jdbc/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql-jdbc/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- postgresql-jdbc/Makefile	28 Mar 2003 13:45:16 -0000	1.5
+++ postgresql-jdbc/Makefile	2 Jun 2003 00:04:08 -0000
@@ -7,7 +7,6 @@
 
 PORTNAME=	postgresql-jdbc
 CATEGORIES=	databases java
-PORTREVISION=	1
 
 MAINTAINER=	girgen at pingpong.net
 COMMENT=	The Java JDBC implementation for PostgreSQL
Index: postgresql7/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql7/Makefile,v
retrieving revision 1.107
diff -u -u -r1.107 Makefile
--- postgresql7/Makefile	20 Feb 2003 01:14:11 -0000	1.107
+++ postgresql7/Makefile	29 May 2003 03:31:45 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.2
-PORTREVISION=	1
+PORTVERSION?=	7.3.3
 CATEGORIES?=	databases
 MASTER_SITES=	ftp://ftp3.us.postgresql.org/pub/postgresql/%SUBDIR%/ \
 		ftp://ftp5.us.postgresql.org/pub/PostgreSQL/%SUBDIR%/ \
@@ -47,6 +46,7 @@
 
 CONFIGURE_ARGS=	--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 .if !defined(WITHOUT_GNUGETOPT)
 LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
@@ -98,19 +98,21 @@
 WITH_KRB5=	yes
 .endif
 
+.include <bsd.port.pre.mk>
 .if defined(WITH_KRB5)
 CONFIGURE_ARGS+=	--with-krb5="`${KRB5CONF} --prefix krb5`"
 LDFLAGS+=	`${KRB5CONF} --libs krb5`
-.endif
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CONFIGURE_ENV=  LDFLAGS="${LDFLAGS}"
 .endif
 
 .if defined(WITH_TESTS)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 
+.if defined(WITH_LIBC_R)
+CFLAGS+= -pthread -D_THREAD_SAFE
+.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 \
@@ -140,7 +142,7 @@
 		truncate.7 unlisten.7 update.7 vacuum.7
 
 pre-everything::
-	@${SH} ${PKGDIR}/pkg-install ${PORTNAME} BACKUPWARNING
+	@${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING
 	@${ECHO} ""
 	@${ECHO} "${PORTNAME} has several tunables that can be used to configure PostgreSQL:"
 	@${ECHO} ""
@@ -157,6 +159,8 @@
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
 	@${ECHO} "				building the module"
+	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
+	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
 .if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
 	@${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive."
@@ -185,7 +189,7 @@
 .else
 pre-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
+		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 post-install:
@@ -225,5 +229,5 @@
 	 fi
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
 .endif
Index: postgresql7/distinfo
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql7/distinfo,v
retrieving revision 1.27
diff -u -u -r1.27 distinfo
--- postgresql7/distinfo	6 Feb 2003 20:46:51 -0000	1.27
+++ postgresql7/distinfo	29 May 2003 03:22:47 -0000
@@ -1,4 +1,4 @@
-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
+MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
+MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
+MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
+MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
>Release-Note:
>Audit-Trail:
>Unformatted: