From girgen@partitur.se  Wed Apr 10 16:26:40 2002
Return-Path: <girgen@partitur.se>
Received: from bastuba.partitur.se (bastuba.partitur.se [212.209.169.194])
	by hub.freebsd.org (Postfix) with ESMTP id 8570D37B404
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Apr 2002 16:26:39 -0700 (PDT)
Received: (from root@localhost)
	by bastuba.partitur.se (8.11.6/8.11.6) id g3ANQcw67599
	for FreeBSD-gnats-submit@freebsd.org.AVP; Thu, 11 Apr 2002 01:26:38 +0200 (CEST)
	(envelope-from girgen@partitur.se)
Received: from elbas.partitur.se (elbas.partitur.se [212.209.169.222])
	by bastuba.partitur.se (8.11.6/8.11.6) with ESMTP id g3ANQc367591
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Apr 2002 01:26:38 +0200 (CEST)
	(envelope-from girgen@partitur.se)
Received: (from girgen@localhost)
	by elbas.partitur.se (8.11.6/8.11.6) id g3ANQc121826;
	Thu, 11 Apr 2002 01:26:38 +0200 (CEST)
	(envelope-from girgen)
Message-Id: <200204102326.g3ANQc121826@elbas.partitur.se>
Date: Thu, 11 Apr 2002 01:26:38 +0200 (CEST)
From: Palle Girgensohn <girgen@partitur.se>
Reply-To: Palle Girgensohn <girgen@partitur.se>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update of postgresql subports
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         36980
>Category:       ports
>Synopsis:       update of postgresql subports
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 10 16:30:01 PDT 2002
>Closed-Date:    Wed Apr 10 22:14:38 PDT 2002
>Last-Modified:  Wed Apr 10 22:14:38 PDT 2002
>Originator:     Palle Girgensohn <girgen@partitur.se>
>Release:        FreeBSD 4.5-PRERELEASE i386
>Organization:
Partitur
>Environment:
System: FreeBSD palle.girgensohn.se 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #11: Fri Dec 28 17:22:10 CET 2001 root@palle.girgensohn.se:/usr/obj/usr/src/sys/STORDATAN i386


	
>Description:
This patch updates the ports

  postgresql-jdbc
  postgresql-odbc
  postgresql-pltcl
  p5-postgresql-plperl

to use the latest postgresql7 port.

Also, postgresql-jdbc now uses the great new USE_JAVA stuff.

>How-To-Repeat:
	
>Fix:
Index: postgresql-jdbc/Makefile
===================================================================
RCS file: /net/elbas/opt/ncvs/ports/databases/postgresql-jdbc/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postgresql-jdbc/Makefile	19 Feb 2002 08:35:58 -0000	1.1
+++ postgresql-jdbc/Makefile	10 Apr 2002 20:12:02 -0000
@@ -6,39 +6,25 @@
 #
 
 PORTNAME=	postgresql-jdbc
-PORTVERSION=	7.2
 CATEGORIES=	databases java
 
 MAINTAINER=	girgen@partitur.se
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
-# Since we cannot distribute JVMs in binary format yet, don't set this
-# to allow bento to build something useful
-#RUN_DEPENDS=	${JAVA_HOME}/bin/java:${PORTSDIR}/java/jdk13
 
 POSTGRESQL_SUBPORT=YES
 .include <${.CURDIR}/../postgresql7/Makefile>
 
 CONFIGURE_ARGS=	--with-java
 
-# Honour JAVA_HOME if it is set
-JAVA_HOME?=	${LOCALBASE}/jdk1.3.1
+USE_JAVA=	1.2+
 
 CONFIGURE_ENV=	JAVA_HOME="${JAVA_HOME}"
 MAKE_ENV+=	JAVA_HOME="${JAVA_HOME}"
 MAKE_ARGS+=	-C src/interfaces/jdbc
 
-pre-everything::
-	@ ${ECHO} ;\
-	  ${ECHO} "Building PostgreSQL JDBC using the JVM in ${JAVA_HOME}." ;\
-	  ${ECHO} "You can instruct this port to use your favourite JVM by typing:" ;\
-	  ${ECHO} "      make JAVA_HOME=${LOCALBASE}/jdk1.1.8" ;\
-	  ${ECHO} "or similar." ;\
-	  ${ECHO}
-
 post-build:
-# will fail for java 1.1, so ignore errors
-	-@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C contrib/retep
+	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C contrib/retep
 
 post-install:
 	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes ;\
Index: postgresql-odbc/Makefile
===================================================================
RCS file: /net/elbas/opt/ncvs/ports/databases/postgresql-odbc/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postgresql-odbc/Makefile	19 Feb 2002 08:37:32 -0000	1.1
+++ postgresql-odbc/Makefile	10 Apr 2002 20:12:02 -0000
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	postgresql-odbc
-PORTVERSION=	7.2
 CATEGORIES=	databases
 
 MAINTAINER=	girgen@partitur.se
Index: p5-postgresql-plperl/Makefile
===================================================================
RCS file: /net/elbas/opt/ncvs/ports/databases/p5-postgresql-plperl/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- p5-postgresql-plperl/Makefile	19 Feb 2002 08:34:40 -0000	1.1
+++ p5-postgresql-plperl/Makefile	10 Apr 2002 20:12:02 -0000
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	postgresql-plperl
-PORTVERSION=	7.2
 CATEGORIES=	databases perl5
 PKGNAMEPREFIX=	p5-
 
Index: postgresql-pltcl/Makefile
===================================================================
RCS file: /net/elbas/opt/ncvs/ports/databases/postgresql-pltcl/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- postgresql-pltcl/Makefile	19 Feb 2002 08:39:03 -0000	1.1
+++ postgresql-pltcl/Makefile	10 Apr 2002 22:38:38 -0000
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	postgresql-pltcl
-PORTVERSION=	7.2
 CATEGORIES=	databases tcl83
 
 MAINTAINER=	girgen@partitur.se
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Wed Apr 10 22:14:29 PDT 2002 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36980 
>Unformatted:
