12 files changed, 78 insertions, 92 deletions

diff --git a/LEGAL b/LEGAL
index 80aae99717bd..1036d6b9f6b0 100644
--- a/LEGAL
+++ b/LEGAL
@@ -98,8 +98,6 @@ citrix_ica-*.tar.gz	net/citrix_ica		License prohibits redistribution
 cfs-*			security/cfs		Crypto; export-controlled
 clibpdf*.tar.gz		print/clibpdf		Needs a license to bundle with
 						other products
-classes111_01.zip	databases/jdbc-oracle816 This software is under license
-						and export controls
 CODE2000.ZIP		x11-fonts/code2000	Only unmodified original
 						package can be distributed
 collections*.zip	java/collections	See the license
@@ -446,6 +444,8 @@ oneko-*.tar.gz		games/oneko-sakura	Including derivatives from
 openssl-*		security/openssl	Crypto; export/import-controlled
 opera-*			www/linux-opera		No redistribution, commercial
 						software
+oracle/*		databases/jdbc-oracle*	This software is under license
+						and export controls
 orion-*			java/orion		Redistribution of binaries is not
 						permitted
 otojiro*.txt		japanese/otojiro-fpw	The original dictionary is not free
diff --git a/MOVED b/MOVED
index dfa359d60517..b487eef9952d 100644
--- a/MOVED
+++ b/MOVED
@@ -1512,3 +1512,4 @@ editors/gxedit||2005-06-03|project no longer exists
 misc/yaucg||2005-06-03|master site disappeared, script probably broken
 net/archie.el||2005-06-03|master site disappeared
 deskutils/menueditor|deskutils/smeg|2005-06-05|project renamed
+databases/jdbc-oracle816|databases/jdbc-oracle8i|2005-06-05|Obsolete version
diff --git a/databases/Makefile b/databases/Makefile
index c71833beea35..334cff379163 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -68,7 +68,8 @@
     SUBDIR += hs-hsql
     SUBDIR += java-sqlrelay
     SUBDIR += jdb
-    SUBDIR += jdbc-oracle816
+    SUBDIR += jdbc-oracle8i
+    SUBDIR += jdbc-oracle9i
     SUBDIR += kinterbasdb
     SUBDIR += knoda
     SUBDIR += libdbi
diff --git a/databases/jdbc-oracle816/Makefile b/databases/jdbc-oracle816/Makefile
deleted file mode 100644
index 17a03df648b6..000000000000
--- a/databases/jdbc-oracle816/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:	The Oracle 8.1.6 JDBC Drivers
-# Date created:		2 January 2000
-# Whom:			Patrick Gardella <patrick@freebsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	oracle816
-PORTVERSION=	1.11
-CATEGORIES=	databases java
-MASTER_SITES=	# none
-PKGNAMEPREFIX=	jdbc-
-DISTNAME=	classes111_01.
-EXTRACT_SUFX=	zip
-EXTRACT_ONLY=	# none
-
-MAINTAINER=	ports@FreeBSD.Org
-COMMENT=	The JDBC drivers for Oracle 8.1.6
-
-RUN_DEPENDS=	${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk11
-
-ALL_TARGET=	jar
-
-RESTRICTED=	'Must be downloaded direct from Oracle via www interface'
-NO_CDROM=	'Must be downloaded direct from Oracle via www interface'
-NO_PACKAGE=	'Must be downloaded direct from Oracle via www interface'
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-PLIST_FILES=	share/java/classes/classes111_01.zip
-
-.include <bsd.port.pre.mk>
-
-.if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://technet.oracle.com/software/tech/java/sqlj_jdbc/software_index.htm Oracle8i 8.1.6.0.1 JDBC Drivers for use with JDK 1.1.x, JDBC-Thin 100% Java. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again."
-.endif
-
-do-install:
-	@${MKDIR} ${PREFIX}/share/java/classes
-	@${INSTALL_DATA} ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${LOCALBASE}/share/java/classes
-
-.include <bsd.port.post.mk>
diff --git a/databases/jdbc-oracle816/distinfo b/databases/jdbc-oracle816/distinfo
deleted file mode 100644
index 54ca3e0cf475..000000000000
--- a/databases/jdbc-oracle816/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (classes111_01.zip) = ca3c45844a5d6f05841fa28f6320374c
diff --git a/databases/jdbc-oracle816/pkg-descr b/databases/jdbc-oracle816/pkg-descr
deleted file mode 100644
index 9b7c7c510daf..000000000000
--- a/databases/jdbc-oracle816/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a port of the JDBC driver which is used to access Oracle
-databases using a database-independant API in Java.
-
-WWW: http://technet.oracle.com/tech/java/sqlj_jdbc/content.html
-
-patrick@freebsd.org
diff --git a/databases/jdbc-oracle8i/Makefile b/databases/jdbc-oracle8i/Makefile
index 17a03df648b6..e452d9585ff4 100644
--- a/databases/jdbc-oracle8i/Makefile
+++ b/databases/jdbc-oracle8i/Makefile
@@ -5,37 +5,55 @@
 # $FreeBSD$
 #
 
-PORTNAME=	oracle816
-PORTVERSION=	1.11
+PORTNAME=	oracle8i
+PORTVERSION=	8.1.7.1
 CATEGORIES=	databases java
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	jdbc-
-DISTNAME=	classes111_01.
-EXTRACT_SUFX=	zip
-EXTRACT_ONLY=	# none
+DISTFILES=	${CLASSES}${EXTRACT_SUFX} ${PATCH_FILE}${EXTRACT_SUFX}	\
+		${NLS_CHARSET}${EXTRACT_SUFX}
+DIST_SUBDIR=	oracle
+EXTRACT_ONLY=	${CLASSES}${EXTRACT_SUFX} ${PATCH_FILE}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.Org
-COMMENT=	The JDBC drivers for Oracle 8.1.6
+MAINTAINER=	thierry@FreeBSD.Org
+COMMENT=	The JDBC drivers for Oracle 8i
 
-RUN_DEPENDS=	${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk11
-
-ALL_TARGET=	jar
+PATCH_DEPENDS=	${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip
 
 RESTRICTED=	'Must be downloaded direct from Oracle via www interface'
-NO_CDROM=	'Must be downloaded direct from Oracle via www interface'
-NO_PACKAGE=	'Must be downloaded direct from Oracle via www interface'
+NO_CDROM=	${RESTRICTED}
+NO_PACKAGE=	${RESTRICTED}
+
+USE_ZIP=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+	# Should be "1.2 1.3" but tested OK with 1.4
+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-PLIST_FILES=	share/java/classes/classes111_01.zip
+
+JDKVER=		12
+CLASSES=	classes${JDKVER}
+PATCH_FILE=	1725012_${JDKVER}
+NLS_CHARSET=	nls_charset${JDKVER}
+
+PLIST_FILES=	%%JAVAJARDIR%%/${CLASSES}${EXTRACT_SUFX}	\
+		%%JAVAJARDIR%%/${NLS_CHARSET}${EXTRACT_SUFX}
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://technet.oracle.com/software/tech/java/sqlj_jdbc/software_index.htm Oracle8i 8.1.6.0.1 JDBC Drivers for use with JDK 1.1.x, JDBC-Thin 100% Java. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again."
+.if !exists(${CLASSES:S|^|${_DISTDIR}/|}${EXTRACT_SUFX})	\
+ && !exists(${PATCH_FILE:S|^|${_DISTDIR}/|}${EXTRACT_SUFX})	\
+ && !exists(${NLS_CHARSET:S|^|${_DISTDIR}/|}${EXTRACT_SUFX})
+IGNORE="Please manually download ${DISTFILES} from http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html Oracle8i 8.1.7 JDBC Drivers for use with JDK 1.2 \(JDBC classes + Oracle8i ${PORTVERSION} Patch + nls_charset12.zip\). Put ${DISTFILES} into the directory ${_DISTDIR} and run make again."
 .endif
 
+pre-patch:
+	@${MV} ${WRKDIR}/v8TTIoac.class ${WRKDIR}/oracle/jdbc/ttc7/v8TTIoac.class
+	@(cd ${WRKDIR}; ${LOCALBASE}/bin/zip -rq ${WRKDIR}/${CLASSES}${EXTRACT_SUFX}	\
+		javax oracle)
+
 do-install:
-	@${MKDIR} ${PREFIX}/share/java/classes
-	@${INSTALL_DATA} ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${LOCALBASE}/share/java/classes
+	${INSTALL_DATA} ${WRKDIR}/${CLASSES}${EXTRACT_SUFX} ${JAVAJARDIR}
+	${INSTALL_DATA} ${_DISTDIR}/${NLS_CHARSET}${EXTRACT_SUFX} ${JAVAJARDIR}
 
 .include <bsd.port.post.mk>
diff --git a/databases/jdbc-oracle8i/distinfo b/databases/jdbc-oracle8i/distinfo
index 54ca3e0cf475..b47258c87aa1 100644
--- a/databases/jdbc-oracle8i/distinfo
+++ b/databases/jdbc-oracle8i/distinfo
@@ -1 +1,6 @@
-MD5 (classes111_01.zip) = ca3c45844a5d6f05841fa28f6320374c
+MD5 (oracle/classes12.zip) = b4fe69568d11e1a8d4c5359b55a0ffba
+SIZE (oracle/classes12.zip) = 1936596
+MD5 (oracle/1725012_12.zip) = 4954a395bf33524f34983300674bb391
+SIZE (oracle/1725012_12.zip) = 2262
+MD5 (oracle/nls_charset12.zip) = 48bcf4649fe6612ec3dbad7900fd4254
+SIZE (oracle/nls_charset12.zip) = 12097171
diff --git a/databases/jdbc-oracle8i/pkg-descr b/databases/jdbc-oracle8i/pkg-descr
index 9b7c7c510daf..7c86d74d52ea 100644
--- a/databases/jdbc-oracle8i/pkg-descr
+++ b/databases/jdbc-oracle8i/pkg-descr
@@ -1,6 +1,7 @@
-This is a port of the JDBC driver which is used to access Oracle
-databases using a database-independant API in Java.
+This is a port of the JDBC driver which is used to access Oracle 8i
+databases using a database-independant API in Java for use with JDK 1.2 and
+JDK 1.3.
 
-WWW: http://technet.oracle.com/tech/java/sqlj_jdbc/content.html
+WWW: http://www.oracle.com/technology/tech/java/sqlj_jdbc/index.html
 
 patrick@freebsd.org
diff --git a/databases/jdbc-oracle9i/Makefile b/databases/jdbc-oracle9i/Makefile
index 17a03df648b6..023e5bd54d96 100644
--- a/databases/jdbc-oracle9i/Makefile
+++ b/databases/jdbc-oracle9i/Makefile
@@ -5,37 +5,42 @@
 # $FreeBSD$
 #
 
-PORTNAME=	oracle816
-PORTVERSION=	1.11
+PORTNAME=	oracle9i
+PORTVERSION=	9.2.0.5
 CATEGORIES=	databases java
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	jdbc-
-DISTNAME=	classes111_01.
-EXTRACT_SUFX=	zip
+DISTFILES=	${CLASSES} ${OCRS_FILE}
+DIST_SUBDIR=	oracle
 EXTRACT_ONLY=	# none
 
-MAINTAINER=	ports@FreeBSD.Org
-COMMENT=	The JDBC drivers for Oracle 8.1.6
+MAINTAINER=	thierry@FreeBSD.Org
+COMMENT=	The JDBC drivers for Oracle 9i
 
-RUN_DEPENDS=	${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk11
+RESTRICTED=	'Must be downloaded direct from Oracle via www interface'
+NO_CDROM=	${RESTRICTED}
+NO_PACKAGE=	${RESTRICTED}
 
-ALL_TARGET=	jar
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 
-RESTRICTED=	'Must be downloaded direct from Oracle via www interface'
-NO_CDROM=	'Must be downloaded direct from Oracle via www interface'
-NO_PACKAGE=	'Must be downloaded direct from Oracle via www interface'
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-PLIST_FILES=	share/java/classes/classes111_01.zip
+
+CLASSES=	ojdbc14.jar
+OCRS_FILE=	ocrs12.zip
+
+PLIST_FILES=	%%JAVAJARDIR%%/${CLASSES}	\
+		%%JAVAJARDIR%%/${OCRS_FILE}
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://technet.oracle.com/software/tech/java/sqlj_jdbc/software_index.htm Oracle8i 8.1.6.0.1 JDBC Drivers for use with JDK 1.1.x, JDBC-Thin 100% Java. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again."
+.if !exists(${CLASSES:S|^|${_DISTDIR}/|}})	\
+ && !exists(${OCRS_FILE:S|^|${_DISTDIR}/|})
+IGNORE="Please manually download ${DISTFILES} from http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html Oracle9i ${PORTVERSION} JDBC Drivers for use with JDK 1.4 \(JDBC classes + Additional RowSet support\). Put ${DISTFILES} into the directory ${_DISTDIR} and run make again."
 .endif
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/java/classes
-	@${INSTALL_DATA} ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${LOCALBASE}/share/java/classes
+	${INSTALL_DATA} ${DISTFILES:S|^|${_DISTDIR}/|} ${JAVAJARDIR}
 
 .include <bsd.port.post.mk>
diff --git a/databases/jdbc-oracle9i/distinfo b/databases/jdbc-oracle9i/distinfo
index 54ca3e0cf475..ad00b6d246d5 100644
--- a/databases/jdbc-oracle9i/distinfo
+++ b/databases/jdbc-oracle9i/distinfo
@@ -1 +1,4 @@
-MD5 (classes111_01.zip) = ca3c45844a5d6f05841fa28f6320374c
+MD5 (oracle/ojdbc14.jar) = da6c3a4718acf5253c2fd7fd02150319
+SIZE (oracle/ojdbc14.jar) = 1200046
+MD5 (oracle/ocrs12.zip) = d9407f784d0e0b56313f229d74b7c147
+SIZE (oracle/ocrs12.zip) = 37194
diff --git a/databases/jdbc-oracle9i/pkg-descr b/databases/jdbc-oracle9i/pkg-descr
index 9b7c7c510daf..c2dffc9dc9a6 100644
--- a/databases/jdbc-oracle9i/pkg-descr
+++ b/databases/jdbc-oracle9i/pkg-descr
@@ -1,6 +1,6 @@
-This is a port of the JDBC driver which is used to access Oracle
-databases using a database-independant API in Java.
+This is a port of the JDBC driver which is used to access Oracle 9i
+databases using a database-independant API in Java for use with JDK 1.4.
 
-WWW: http://technet.oracle.com/tech/java/sqlj_jdbc/content.html
+WWW: http://www.oracle.com/technology/tech/java/sqlj_jdbc/index.html
 
 patrick@freebsd.org