4 files changed, 13 insertions, 58 deletions

diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile
index c3a5211ec50f..d825fca4e3d7 100644
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases java
 PKGNAMESUFFIX=	-jdbc
@@ -14,33 +15,33 @@ COMMENT=	The Java JDBC implementation for PostgreSQL
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 
-POSTGRESQL_PORT?=	databases/postgresql7
-POSTGRESQL_SUBPORT=YES
-.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
+MASTERDIR=	${.CURDIR}/../../databases/postgresql74-server
+
+CONFLICTS=	${PORTNAME}${PKGNAMESUFFIX}-7.[0-3]* \
+		${PORTNAME}${PKGNAMESUFFIX}-[1-689]*
 
 CONFIGURE_ARGS=	--with-java
 
-USE_JAVA=	1.1+
+USE_JAVA=	yes
+JAVA_VERSION?=	"1.1+"
 
 CONFIGURE_ENV=	JAVA_HOME="${JAVA_HOME}"
 MAKE_ENV+=	JAVA_HOME="${JAVA_HOME}"
-MAKE_ARGS+=	-C src/interfaces/jdbc
+BUILD_DIRS=	src/interfaces/jdbc
+SLAVE_ONLY=	yes
 
 post-install:
-	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes ;\
+	@- ${MKDIR} -m 0555 ${PREFIX}/share/java/classes ;\
 	  ${INSTALL_DATA} ${WRKSRC}/src/interfaces/jdbc/jars/postgresql.jar \
 			  ${PREFIX}/share/java/classes/postgresql.jar
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} -m 0555 ${EXAMPLESDIR} ;\
+	@- ${MKDIR} -m 0555 ${EXAMPLESDIR} ;\
 	  cd ${WRKSRC}/src/interfaces/jdbc/example ;\
 	  ${PAX} -rw . ${EXAMPLESDIR}
 .for i in README
-	@ ${INSTALL_DATA} ${WRKSRC}/src/interfaces/jdbc/$i \
+	@- ${INSTALL_DATA} ${WRKSRC}/src/interfaces/jdbc/$i \
 			  ${EXAMPLESDIR}
 .endfor
 .endif
-	@ ${ECHO} ==================================== ;\
-	  ${SED} -e "s,/usr/local,${PREFIX},g"  ${PKGDIR}/pkg-message ;\
-	  ${ECHO} ====================================
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql-jdbc/files/patch-aa b/databases/postgresql-jdbc/files/patch-aa
deleted file mode 100644
index 89806a159665..000000000000
--- a/databases/postgresql-jdbc/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/interfaces/jdbc/build.xml.orig	Thu Jun 24 11:51:44 2004
-+++ src/interfaces/jdbc/build.xml	Thu Sep  2 01:51:36 2004
-@@ -113,10 +113,7 @@
- 
-   <target name="compile" depends="prepare,check_versions,driver">
- 
--    <available classname="org.postgresql.Driver" property="old.driver.present" />
--    <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
--
--    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-+    <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-       <!-- This is the core of the driver.  It is common for all three versions. -->
-        <include name="${package}/*.java" />
-        <include name="${package}/core/**" />
diff --git a/databases/postgresql-jdbc/pkg-message b/databases/postgresql-jdbc/pkg-message
deleted file mode 100644
index d00982c26c05..000000000000
--- a/databases/postgresql-jdbc/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-PostgreSQL JDBC support installed!
-
-postgresql.jar resides in
-/usr/local/share/java/classes/postgresql.jar
-Add this to your CLASSPATH!
-
-java examples reside in
-/usr/local/share/examples/postgresql
diff --git a/databases/postgresql-jdbc/pkg-plist b/databases/postgresql-jdbc/pkg-plist
deleted file mode 100644
index 7f92494f27c0..000000000000
--- a/databases/postgresql-jdbc/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/Unicode.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/basic.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/blobtest.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockClient.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDB.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDispenserImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockItemImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockServer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/readme
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/datestyle.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/metadata.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/psql.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/threadsafe.java
-share/java/classes/postgresql.jar
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/corba
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
-share/postgresql/java/postgresql-examples.jar
-share/postgresql/java/postgresql.jar
-@dirrm share/postgresql/java
-@unexec rmdir %D/share/postgresql 2>/dev/null || true