From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 27 20:00:15 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A834A16A41F for ; Fri, 27 May 2005 20:00:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2958543D1D for ; Fri, 27 May 2005 20:00:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4RK0EXq068511 for ; Fri, 27 May 2005 20:00:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4RK0EB6068510; Fri, 27 May 2005 20:00:14 GMT (envelope-from gnats) Resent-Date: Fri, 27 May 2005 20:00:14 GMT Resent-Message-Id: <200505272000.j4RK0EB6068510@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thierry Thomas Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5735816A41C for ; Fri, 27 May 2005 19:58:20 +0000 (GMT) (envelope-from thierry@pompo.net) Received: from ws90bj.pompo.net (graf.pompo.net [81.56.186.139]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49DAA43D1D for ; Fri, 27 May 2005 19:58:18 +0000 (GMT) (envelope-from thierry@pompo.net) Received: by ws90bj.pompo.net (Postfix, from userid 1001) id D2F4422B8CB; Fri, 27 May 2005 21:57:54 +0200 (CEST) Message-Id: <20050527195754.D2F4422B8CB@ws90bj.pompo.net> Date: Fri, 27 May 2005 21:57:54 +0200 (CEST) From: Thierry Thomas To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/81567: Replace databases/jdbc-oracle816 by databases/jdbc-oracle8i and databases/jdbc-oracle9i. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Thierry Thomas List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2005 20:00:15 -0000 >Number: 81567 >Category: ports >Synopsis: Replace databases/jdbc-oracle816 by databases/jdbc-oracle8i and databases/jdbc-oracle9i. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri May 27 20:00:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 5.4-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD ws90bj.pompo.net 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun May 22 14:07:39 CEST 2005 thierry@ws90bj.pompo.net:/usr/obj/usr/src/sys/WS90BJ-050222 i386 >Description: - databases/jdbc-oracle816 has been removed from Oracle's site, remove it; - replace it by two new ports: databases/jdbc-oracle8i and databases/jdbc-oracle9i. Notes: - databases/jdbc-oracle8i is intended for JDK 1.2 & 1.3, but it runs fine with JDK 1.4; - databases/jdbc-oracle9i is intended for JDK 1.4, and it can be used to access Oracle 8i & 9i databases; - there is another driver for Oracle 10g, but I have no 10g to test it; could be added later. >How-To-Repeat: Check >Fix: After a repocopy of databases/jdbc-oracle816 to databases/jdbc-oracle8i and databases/jdbc-oracle9i, I shall remove databases/jdbc-oracle816 and then apply the following patches: --- jdbc-oracle8i.diff begins here --- diff -urN databases/jdbc-oracle816/Makefile databases/jdbc-oracle8i/Makefile --- databases/jdbc-oracle816/Makefile Sat Jun 5 07:48:31 2004 +++ databases/jdbc-oracle8i/Makefile Fri May 27 10:53:05 2005 @@ -5,37 +5,56 @@ # $FreeBSD: ports/databases/jdbc-oracle816/Makefile,v 1.6 2004/06/02 22:17:12 patrick Exp $ # -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 +JAVA_RUN= jre + 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 -.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 diff -urN databases/jdbc-oracle816/distinfo databases/jdbc-oracle8i/distinfo --- databases/jdbc-oracle816/distinfo Thu Oct 26 15:06:18 2000 +++ databases/jdbc-oracle8i/distinfo Thu May 26 22:46:26 2005 @@ -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 -urN databases/jdbc-oracle816/pkg-descr databases/jdbc-oracle8i/pkg-descr --- databases/jdbc-oracle816/pkg-descr Sun Jul 14 09:30:41 2002 +++ databases/jdbc-oracle8i/pkg-descr Thu May 26 23:52:33 2005 @@ -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 --- jdbc-oracle8i.diff ends here --- --- jdbc-oracle9i.diff begins here --- diff -urN databases/jdbc-oracle816/Makefile databases/jdbc-oracle9i/Makefile --- databases/jdbc-oracle816/Makefile Sat Jun 5 07:48:31 2004 +++ databases/jdbc-oracle9i/Makefile Fri May 27 10:53:50 2005 @@ -5,37 +5,43 @@ # $FreeBSD: ports/databases/jdbc-oracle816/Makefile,v 1.6 2004/06/02 22:17:12 patrick Exp $ # -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+ +JAVA_RUN= jre -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 -.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 diff -urN databases/jdbc-oracle816/distinfo databases/jdbc-oracle9i/distinfo --- databases/jdbc-oracle816/distinfo Thu Oct 26 15:06:18 2000 +++ databases/jdbc-oracle9i/distinfo Thu May 26 23:49:04 2005 @@ -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 -urN databases/jdbc-oracle816/pkg-descr databases/jdbc-oracle9i/pkg-descr --- databases/jdbc-oracle816/pkg-descr Sun Jul 14 09:30:41 2002 +++ databases/jdbc-oracle9i/pkg-descr Thu May 26 23:51:40 2005 @@ -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 --- jdbc-oracle9i.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: