summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing-Chieh Liao <ijliao@FreeBSD.org>2002-04-11 05:08:34 +0000
committerYing-Chieh Liao <ijliao@FreeBSD.org>2002-04-11 05:08:34 +0000
commitc082ec23b091bfad3611025453d6f0213974e866 (patch)
treec6092e1fa63d8ff9e26e9dff10538830cee87152
parenttake over maintainership (diff)
use the latest postgresql7
postgresql-jdbc now uses the great new USE_JAVA stuff PR: 36980 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=57558
-rw-r--r--databases/p5-postgresql-plperl/Makefile1
-rw-r--r--databases/postgresql-jdbc/Makefile18
-rw-r--r--databases/postgresql-odbc/Makefile1
-rw-r--r--databases/postgresql-pltcl/Makefile1
4 files changed, 2 insertions, 19 deletions
diff --git a/databases/p5-postgresql-plperl/Makefile b/databases/p5-postgresql-plperl/Makefile
index 977e0b4955cd..6130294398f0 100644
--- a/databases/p5-postgresql-plperl/Makefile
+++ b/databases/p5-postgresql-plperl/Makefile
@@ -6,7 +6,6 @@
#
PORTNAME= postgresql-plperl
-PORTVERSION= 7.2
CATEGORIES= databases perl5
PKGNAMEPREFIX= p5-
diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile
index 5b1dadfc4472..1b524dadc2eb 100644
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@@ -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 ;\
diff --git a/databases/postgresql-odbc/Makefile b/databases/postgresql-odbc/Makefile
index f258f181d5b7..47af052a083c 100644
--- a/databases/postgresql-odbc/Makefile
+++ b/databases/postgresql-odbc/Makefile
@@ -6,7 +6,6 @@
#
PORTNAME= postgresql-odbc
-PORTVERSION= 7.2
CATEGORIES= databases
MAINTAINER= girgen@partitur.se
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index ce86fac80abb..d1a07bad2d74 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -6,7 +6,6 @@
#
PORTNAME= postgresql-pltcl
-PORTVERSION= 7.2
CATEGORIES= databases tcl83
MAINTAINER= girgen@partitur.se