Attachment 148203 Details for Bug 157544 – patch for update to 12.1.0.2.0

[patch] patch for update to 12.1.0.2.0

linux-oracle-instantclient.patch (text/plain), 30.16 KB, created by Jean-François BOEUF on 2014-10-11 20:13:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-François BOEUF

Created: 2014-10-11 20:13:35 UTC

Size: 30.16 KB

patch

obsolete

>Index: Mk/bsd.linux-apps.mk
>===================================================================
>--- Mk/bsd.linux-apps.mk	(révision 370662)
>+++ Mk/bsd.linux-apps.mk	(copie de travail)
>@@ -60,10 +60,10 @@
> # Non-version specific components
> _LINUX_APPS_ALL=	allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
> 					arts aspell atk avahi-libs cairo cups-libs curl dri devtools esound expat \
>-					flac fontconfig freealut gdkpixbuf gnutls gtk2 hicontheme imlib jpeg libaudiofile \
>-					libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \
>-					libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 mikmod \
>-					naslibs ncurses-base openal openmotif openssl openssl-compat pango png \
>+					flac fontconfig freealut gdkpixbuf gnutls gtk2 hicontheme imlib jpeg libaio \
>+					libaudiofile libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng \
>+					libogg libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 \
>+					mikmod naslibs ncurses-base openal openmotif openssl openssl-compat pango png \
> 					pulseaudio-libs scimgtk scimlibs sdl12 sdlimage sdlmixer sdlttf tiff \
> 					tcp_wrappers-libs xorglibs ucl ungif upx webauth
> 
>@@ -231,6 +231,11 @@
> jpeg_DETECT=		${jpeg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> jpeg_PORT=			${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-jpeg
> 
>+libaio_FILE=		${LINUXBASE}/usr/lib/libaio.so.1.0.1
>+libaio_c6_FILE=		${LINUXBASE}/lib/libaio.so.1.0.1
>+libaio_DETECT=		${libaio${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
>+libaio_PORT=		${PORTSDIR}/emulators/linux${LINUX_DIST_SUFFIX}-libaio
>+
> libasyncns_f10_FILE=	${LINUXBASE}/usr/lib/libasyncns.so.0.3.1
> libasyncns_c6_FILE=	${LINUXBASE}/usr/lib/libasyncns.so.0.3.1
> libasyncns_DETECT=	${libasyncns${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
>Index: databases/linux-oracle-instantclient-basic/Makefile
>===================================================================
>--- databases/linux-oracle-instantclient-basic/Makefile	(révision 370662)
>+++ databases/linux-oracle-instantclient-basic/Makefile	(copie de travail)
>@@ -1,66 +1,55 @@
> # Created by: Alexander Novitsky
> # $FreeBSD$
> 
>-PORTNAME=		instantclient
>-PORTVERSION=		${ORACLEVERSION}.${DISTDATE}
>-PORTREVISION=		4
>-CATEGORIES=		databases
>-MASTER_SITES=		#http://www.oracle.com/technology/software/tech/oci/instantclient/
>-PKGNAMEPREFIX=		linux-oracle-
>-PKGNAMESUFFIX=		-basic
>-DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${ORACLEVERSION}-${DISTDATE}
>-DIST_SUBDIR=		oracle
>+PORTNAME=	instantclient
>+PORTVERSION=	12.1.0.2.0
>+CATEGORIES=	databases
>+MASTER_SITES=	#http://www.oracle.com/technetwork/topics/linuxsoft-082809.html
>+PKGNAMEPREFIX=	linux-oracle-
>+PKGNAMESUFFIX=	-basic
>+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${PORTVERSION}
>+DIST_SUBDIR=	oracle
> 
>-MAINTAINER=		ports@FreeBSD.org
>-COMMENT=		Oracle 10 32Bit Linux InstantClient basics for RDBMS 8.1.2+
>+MAINTAINER=	JeanFrancois.Boeuf@gmail.com
>+COMMENT=	Oracle 12c 32Bit Linux InstantClient basics.
> 
>-ONLY_FOR_ARCHS=		i386 amd64
>-NO_BUILD=		yes
>-DISTINFO_FILE=		${MASTERDIR}/distinfo.i386
>+ONLY_FOR_ARCHS=	i386 amd64
>+NO_BUILD=	yes
>+USE_LDCONFIG=	yes	
> 
>-RESTRICTED=		Packaging prohibited by Oracle license
>+RESTRICTED=	Packaging prohibited by Oracle license
> 
>-USES=			zip
>-USE_LINUX=		yes
>-USE_LINUX_PREFIX=	yes
>+USES=		zip
>+USE_LINUX=	c6
>+USE_LINUX_PREFIX=  yes
>+USE_LINUX_APPS=	libaio 
> 
>-ORACLEVERSION=		10.2.0.3
>+BINS_LIST=	adrci genezi uidrvci
> 
>-BINS_LIST=		genezi
>+LIBS_LIST=	libclntsh.so.12.1 libclntshcore.so.12.1	\
>+		libnnz12.so libocci.so.12.1 libociei.so	\
>+		libocijdbc12.so libons.so liboramysql12.so	\
>+		ojdbc6.jar ojdbc7.jar xstreams.jar
> 
>-LIBS_LIST=		libclntsh.so.10.1	\
>-			libnnz10.so		\
>-			libocci.so.10.1		\
>-			libociei.so		\
>-			libocijdbc10.so		\
>-			ojdbc14.jar
>+WRKSRC=			${WRKDIR}/instantclient_12_1
> 
>-WRKSRC=			${WRKDIR}/instantclient_10_2
>+INSTBINSDIR=		${STAGEDIR}${PREFIX}/usr/lib/oracle/${PORTVERSION}/client/bin
>+INSTLIBSDIR=		${STAGEDIR}${PREFIX}/usr/lib/oracle/${PORTVERSION}/client/lib
>+INSTCONFDIR=		${STAGEDIR}${PREFIX}/etc/ld.so.conf.d/
> 
>-INSTBINSDIR=		${STAGEDIR}${PREFIX}/usr/bin
>-INSTLIBSDIR=		${STAGEDIR}${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib
>+PLIST_SUB=     ORACLEVERSION=${PORTVERSION}
> 
>-USE_LDCONFIG=		${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib
>-
>-PLIST_SUB=		ORACLEVERSION=${ORACLEVERSION}
>-
> .include <bsd.port.pre.mk>
> 
>-#.if ${ARCH} == "i386"
>-LINUXARCH=		linux32
>-DISTDATE=		20061115
>-#.elif ${ARCH} == "amd64"
>-#LINUXARCH=		linux-x86-64
>-#DISTDATE=		20070103
>-#.endif
>+LINUXARCH=		linux
> 
> .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
>-IGNORE+=	due to Oracle license restrictions, you must fetch the source distribution manually from http://www.oracle.com/technology/software/tech/oci/instantclient/index.html , follow the link for ${DISTFILES} and place them in ${DISTDIR}/${DIST_SUBDIR}/
>+IGNORE+=	due to Oracle license restrictions, you must fetch the source distribution manually from http://www.oracle.com/technetwork/topics/linuxsoft-082809.html, follow the link for ${DISTFILES} and place them in ${DISTDIR}/${DIST_SUBDIR}/
> .endif
> 
> do-install:
>-	@${MKDIR} -m 0755 ${INSTBINSDIR}
>-	@${MKDIR} -m 0755 ${INSTLIBSDIR}
>+	@${MKDIR} -m 0755 ${INSTBINSDIR} ${INSTLIBSDIR} ${INSTCONFDIR}
>+	${ECHO_CMD} "${INSTLIBSDIR:S,${STAGEDIR}${PREFIX},,}" > ${INSTCONFDIR}/oracle-instantclient.conf
> .for i in ${BINS_LIST}
> 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${INSTBINSDIR}/${i}
> .endfor
>@@ -68,4 +57,5 @@
> 	${INSTALL_DATA} ${WRKSRC}/${i} ${INSTLIBSDIR}/${i}
> .endfor
> 
>+
> .include <bsd.port.post.mk>
>Index: databases/linux-oracle-instantclient-basic/distinfo
>===================================================================
>--- databases/linux-oracle-instantclient-basic/distinfo	(révision 0)
>+++ databases/linux-oracle-instantclient-basic/distinfo	(copie de travail)
>@@ -0,0 +1,2 @@
>+SHA256 (oracle/instantclient-basic-linux-12.1.0.2.0.zip) = 96d210d1ff9575022644a8817696ed9e90374d98cabd2631b7b458689ca7511d
>+SIZE (oracle/instantclient-basic-linux-12.1.0.2.0.zip) = 59727331
>
>Modification de propriétés sur databases/linux-oracle-instantclient-basic/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/linux-oracle-instantclient-basic/distinfo.amd64
>===================================================================
>--- databases/linux-oracle-instantclient-basic/distinfo.amd64	(révision 370662)
>+++ databases/linux-oracle-instantclient-basic/distinfo.amd64	(copie de travail)
>@@ -1,2 +0,0 @@
>-SHA256 (oracle/instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip) = 9195ab13e59365bfef6b2b43732a652d77d7ef8b93019f31104bc13832c6a491
>-SIZE (oracle/instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip) = 36454483
>Index: databases/linux-oracle-instantclient-basic/distinfo.i386
>===================================================================
>--- databases/linux-oracle-instantclient-basic/distinfo.i386	(révision 370662)
>+++ databases/linux-oracle-instantclient-basic/distinfo.i386	(copie de travail)
>@@ -1,2 +0,0 @@
>-SHA256 (oracle/instantclient-basic-linux32-10.2.0.3-20061115.zip) = 11fce485c405afa4a30f34eba36ad0d566a599617f80dfc565bd08d8c421e1ae
>-SIZE (oracle/instantclient-basic-linux32-10.2.0.3-20061115.zip) = 34556803
>Index: databases/linux-oracle-instantclient-basic/pkg-descr
>===================================================================
>--- databases/linux-oracle-instantclient-basic/pkg-descr	(révision 370662)
>+++ databases/linux-oracle-instantclient-basic/pkg-descr	(copie de travail)
>@@ -6,4 +6,4 @@
> significantly less disk space than before.  Even SQL*Plus can be used
> with Instant Client.  No recompile, no hassle.
> 
>-WWW: http://www.oracle.com/technology/tech/oci/instantclient/instantclient.html
>+WWW: http://www.oracle.com/technetwork/database/features/instant-client/index.html
>Index: databases/linux-oracle-instantclient-basic/pkg-plist
>===================================================================
>--- databases/linux-oracle-instantclient-basic/pkg-plist	(révision 370662)
>+++ databases/linux-oracle-instantclient-basic/pkg-plist	(copie de travail)
>@@ -1,11 +1,24 @@
>-usr/bin/genezi
>-usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libclntsh.so.10.1
>-usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libnnz10.so
>-usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocci.so.10.1
>+etc/ld.so.conf.d/oracle-instantclient.conf
>+usr/lib/oracle/%%ORACLEVERSION%%/client/bin/adrci
>+usr/lib/oracle/%%ORACLEVERSION%%/client/bin/genezi
>+usr/lib/oracle/%%ORACLEVERSION%%/client/bin/uidrvci
>+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libclntsh.so.12.1
>+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libclntshcore.so.12.1
>+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libnnz12.so
>+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocci.so.12.1
> usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libociei.so
>-usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocijdbc10.so
>-usr/lib/oracle/%%ORACLEVERSION%%/client/lib/ojdbc14.jar
>-@dirrmtry usr/lib/oracle/%%ORACLEVERSION%%/client/lib
>-@dirrmtry usr/lib/oracle/%%ORACLEVERSION%%/client
>-@dirrmtry usr/lib/oracle/%%ORACLEVERSION%%
>-@dirrmtry usr/lib/oracle
>+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocijdbc12.so
>+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libons.so
>+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/liboramysql12.so
>+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/ojdbc6.jar
>+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/ojdbc7.jar
>+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/xstreams.jar
>+@dir etc/ld.so.conf.d
>+@dir etc
>+@dir usr/lib/oracle/%%ORACLEVERSION%%/client/bin
>+@dir usr/lib/oracle/%%ORACLEVERSION%%/client/lib
>+@dir usr/lib/oracle/%%ORACLEVERSION%%/client
>+@dir usr/lib/oracle/%%ORACLEVERSION%%
>+@dir usr/lib/oracle
>+@dir usr/lib
>+@dir usr
>Index: databases/linux-oracle-instantclient-sdk/Makefile
>===================================================================
>--- databases/linux-oracle-instantclient-sdk/Makefile	(révision 370662)
>+++ databases/linux-oracle-instantclient-sdk/Makefile	(copie de travail)
>@@ -2,24 +2,21 @@
> # $FreeBSD$
> 
> PORTNAME=	instantclient
>-PORTVERSION=	${ORACLEVERSION}.${DISTDATE}
>-PORTEPOCH=  	1
>+PORTVERSION=	12.1.0.2.0
> CATEGORIES=	databases
>-MASTER_SITES=	#http://www.oracle.com/technology/software/tech/oci/instantclient/
>+MASTER_SITES=	#http://www.oracle.com/technetwork/topics/linuxsoft-082809.html
> PKGNAMEPREFIX=	linux-oracle-
> PKGNAMESUFFIX=	-sdk
>-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${ORACLEVERSION}-${DISTDATE}
>+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${PORTVERSION} 
> DIST_SUBDIR=	oracle
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Oracle 10 InstantClient SDK. Works with Oracle RDBMS 8.1.2+
>+MAINTAINER=	JeanFrancois.Boeuf@gmail.com
>+COMMENT=	Oracle 12c 32Bits Linux InstantClient SDK.
> 
>-RUN_DEPENDS=	${LINUXBASE}/usr/lib/oracle/${ORACLEVERSION}/client/lib/libocci.so.10.1:${PORTSDIR}/databases/linux-oracle-instantclient-basic
>+RUN_DEPENDS=	${LINUXBASE}/usr/lib/oracle/${PORTVERSION}/client/lib/libocci.so.12.1:${PORTSDIR}/databases/linux-oracle-instantclient-basic
> 
>-NOFETCHFILES=	${DISTNAME}${EXTRACT_SUFX}
> ONLY_FOR_ARCHS=	i386 amd64
> NO_BUILD=	yes
>-DISTINFO_FILE=	${MASTERDIR}/distinfo.${ARCH}
> 
> RESTRICTED=	Packaging prohibited by Oracle license
> 
>@@ -26,70 +23,31 @@
> USES=		zip
> USE_LINUX_PREFIX=	yes
> 
>-ORACLEVERSION=	10.2.0.3
>+INCS_LIST=	ldap.h nzerror.h nzt.h occi.h occiAQ.h occiCommon.h	\
>+			occiControl.h occiData.h occiObjects.h oci.h oci1.h	\
>+			oci8dp.h ociap.h ociapr.h ocidef.h ocidem.h ocidfn.h\
>+			ociextp.h
> 
>-INCS_LIST=	nzerror.h \
>-		nzt.h \
>-		occi.h \
>-		occiAQ.h \
>-		occiCommon.h \
>-		occiControl.h \
>-		occiData.h \
>-		occiObjects.h \
>-		oci.h \
>-		oci1.h \
>-		oci8dp.h \
>-		ociap.h \
>-		ociapr.h \
>-		ocidef.h \
>-		ocidem.h \
>-		ocidfn.h \
>-		ociextp.h \
>-		ocikpr.h \
>-		ocixmldb.h \
>-		odci.h \
>-		oratypes.h \
>-		ori.h \
>-		orid.h \
>-		orl.h \
>-		oro.h \
>-		ort.h \
>-		xa.h
>+DEMO_LIST=	cdemo81.c demo.mk occidemo.sql occidemod.sql occidml.cpp \
>+			occiobj.cpp occiobj.typ oraaccess.xml setuporamysql.sh
> 
>-DEMO_LIST=	cdemo81.c	\
>-		demo.mk		\
>-		occidemo.sql	\
>-		occidemod.sql	\
>-		occidml.cpp	\
>-		occiobj.cpp	\
>-		occiobj.typ
>+WRKSRC=		${WRKDIR}/instantclient_12_1/sdk
> 
>-WRKSRC=		${WRKDIR}/instantclient_10_2/sdk
>+INSTINCSDIR=	${STAGEDIR}${PREFIX}/usr/include/oracle/${PORTVERSION}/client
>+INSTDEMODIR=	${STAGEDIR}${PREFIX}/usr/share/oracle/${PORTVERSION}/client
> 
>-INSTLIBSDIR=	${STAGEDIR}${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib
>-INSTINCSDIR=	${STAGEDIR}${PREFIX}/usr/include/oracle/${ORACLEVERSION}/client
>-INSTDEMODIR=	${STAGEDIR}${PREFIX}/usr/share/oracle/${ORACLEVERSION}/client
>+PLIST_SUB=	ORACLEVERSION=${PORTVERSION}
> 
>-PLIST_SUB=	PORTVERSION=${PORTVERSION}
>-
> .include <bsd.port.pre.mk>
> 
>-LINUXARCH=	linux32
>-DISTDATE=	20061115
>+LINUXARCH=	linux
> 
> .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
>-IGNORE+=	due to Oracle license restrictions, you must fetch the source\
>-		distribution manually. Please do a network search for\
>-		${DISTFILES} and find the current Oracle Downloads Web site.\
>-		After registration and accepting the Oracle License, download\
>-		the distribution files and place them in\
>-		${DISTDIR}/${DIST_SUBDIR}/
>+IGNORE+=	due to Oracle license restrictions, you must fetch the source distribution manually from http://www.oracle.com/technetwork/topics/linuxsoft-082809.html, follow the link for ${DISTFILES} and place them in ${DISTDIR}/${DIST_SUBDIR}/
> .endif
> 
> do-install:
>-	${MKDIR} -m 0755 ${INSTINCSDIR} ${INSTDEMODIR} ${INSTLIBSDIR}
>-	${LN} -s libclntsh.so.10.1 ${INSTLIBSDIR}/libclntsh.so
>-	${LN} -s libocci.so.10.1 ${INSTLIBSDIR}/libocci.so
>+	${MKDIR} -m 0755 ${INSTINCSDIR} ${INSTDEMODIR}
> .for i in ${INCS_LIST}
> 	${INSTALL_DATA} ${WRKSRC}/include/${i} ${INSTINCSDIR}/${i}
> .endfor
>@@ -97,4 +55,6 @@
> 	${INSTALL_DATA} ${WRKSRC}/demo/${i} ${INSTDEMODIR}/${i}
> .endfor
> 
>+DESCR=      ${.CURDIR}/../${PKGNAMEPREFIX}${PORTNAME}-basic/pkg-descr
>+
> .include <bsd.port.post.mk>
>Index: databases/linux-oracle-instantclient-sdk/distinfo
>===================================================================
>--- databases/linux-oracle-instantclient-sdk/distinfo	(révision 0)
>+++ databases/linux-oracle-instantclient-sdk/distinfo	(copie de travail)
>@@ -0,0 +1,2 @@
>+SHA256 (oracle/instantclient-sdk-linux-12.1.0.2.0.zip) = 8a3d609230f02186c85cd39bef1e8b974a239254c5b12ba7e482c5a7c35ffb4a
>+SIZE (oracle/instantclient-sdk-linux-12.1.0.2.0.zip) = 667183
>
>Modification de propriétés sur databases/linux-oracle-instantclient-sdk/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/linux-oracle-instantclient-sdk/distinfo.amd64
>===================================================================
>--- databases/linux-oracle-instantclient-sdk/distinfo.amd64	(révision 370662)
>+++ databases/linux-oracle-instantclient-sdk/distinfo.amd64	(copie de travail)
>@@ -1,2 +0,0 @@
>-SHA256 (oracle/instantclient-sdk-linux32-10.2.0.3-20061115.zip) = 6893a784e1802e18300230dcac1ed2ecd6dc68a7060c02717f73bf268d43f6a5
>-SIZE (oracle/instantclient-sdk-linux32-10.2.0.3-20061115.zip) = 602897
>Index: databases/linux-oracle-instantclient-sdk/distinfo.i386
>===================================================================
>--- databases/linux-oracle-instantclient-sdk/distinfo.i386	(révision 370662)
>+++ databases/linux-oracle-instantclient-sdk/distinfo.i386	(copie de travail)
>@@ -1,2 +0,0 @@
>-SHA256 (oracle/instantclient-sdk-linux32-10.2.0.3-20061115.zip) = 6893a784e1802e18300230dcac1ed2ecd6dc68a7060c02717f73bf268d43f6a5
>-SIZE (oracle/instantclient-sdk-linux32-10.2.0.3-20061115.zip) = 602897
>Index: databases/linux-oracle-instantclient-sdk/pkg-descr
>===================================================================
>--- databases/linux-oracle-instantclient-sdk/pkg-descr	(révision 370662)
>+++ databases/linux-oracle-instantclient-sdk/pkg-descr	(copie de travail)
>@@ -1,9 +0,0 @@
>-Oracle instant client - Software Development Kit  distribution
>-
>-Instant Client allows you to run your applications without installing
>-the standard Oracle client or having an ORACLE_HOME.  OCI, OCCI, ODBC,
>-and JDBC applications work without modification, while using
>-significantly less disk space than before.  Even SQL*Plus can be used
>-with Instant Client.  No recompile, no hassle.
>-
>-WWW: http://www.oracle.com/technology/tech/oci/instantclient/instantclient.html
>Index: databases/linux-oracle-instantclient-sdk/pkg-plist
>===================================================================
>--- databases/linux-oracle-instantclient-sdk/pkg-plist	(révision 370662)
>+++ databases/linux-oracle-instantclient-sdk/pkg-plist	(copie de travail)
>@@ -1,42 +1,36 @@
>-usr/include/oracle/10.2.0.3/client/nzerror.h
>-usr/include/oracle/10.2.0.3/client/nzt.h
>-usr/include/oracle/10.2.0.3/client/occi.h
>-usr/include/oracle/10.2.0.3/client/occiAQ.h
>-usr/include/oracle/10.2.0.3/client/occiCommon.h
>-usr/include/oracle/10.2.0.3/client/occiControl.h
>-usr/include/oracle/10.2.0.3/client/occiData.h
>-usr/include/oracle/10.2.0.3/client/occiObjects.h
>-usr/include/oracle/10.2.0.3/client/oci.h
>-usr/include/oracle/10.2.0.3/client/oci1.h
>-usr/include/oracle/10.2.0.3/client/oci8dp.h
>-usr/include/oracle/10.2.0.3/client/ociap.h
>-usr/include/oracle/10.2.0.3/client/ociapr.h
>-usr/include/oracle/10.2.0.3/client/ocidef.h
>-usr/include/oracle/10.2.0.3/client/ocidem.h
>-usr/include/oracle/10.2.0.3/client/ocidfn.h
>-usr/include/oracle/10.2.0.3/client/ociextp.h
>-usr/include/oracle/10.2.0.3/client/ocikpr.h
>-usr/include/oracle/10.2.0.3/client/ocixmldb.h
>-usr/include/oracle/10.2.0.3/client/odci.h
>-usr/include/oracle/10.2.0.3/client/oratypes.h
>-usr/include/oracle/10.2.0.3/client/ori.h
>-usr/include/oracle/10.2.0.3/client/orid.h
>-usr/include/oracle/10.2.0.3/client/orl.h
>-usr/include/oracle/10.2.0.3/client/oro.h
>-usr/include/oracle/10.2.0.3/client/ort.h
>-usr/include/oracle/10.2.0.3/client/xa.h
>-usr/lib/oracle/10.2.0.3/client/lib/libclntsh.so
>-usr/lib/oracle/10.2.0.3/client/lib/libocci.so
>-usr/share/oracle/10.2.0.3/client/cdemo81.c
>-usr/share/oracle/10.2.0.3/client/demo.mk
>-usr/share/oracle/10.2.0.3/client/occidemo.sql
>-usr/share/oracle/10.2.0.3/client/occidemod.sql
>-usr/share/oracle/10.2.0.3/client/occidml.cpp
>-usr/share/oracle/10.2.0.3/client/occiobj.cpp
>-usr/share/oracle/10.2.0.3/client/occiobj.typ
>-@dirrmtry usr/include/oracle/10.2.0.3/client
>-@dirrmtry usr/include/oracle/10.2.0.3
>-@dirrmtry usr/include/oracle
>-@dirrmtry usr/share/oracle/10.2.0.3/client
>-@dirrmtry usr/share/oracle/10.2.0.3
>-@dirrmtry usr/share/oracle
>+usr/include/oracle/%%ORACLEVERSION%%/client/ldap.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/nzerror.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/nzt.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occi.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occiAQ.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occiCommon.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occiControl.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occiData.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occiObjects.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/oci.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/oci1.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/oci8dp.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ociap.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ociapr.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ocidef.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ocidem.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ocidfn.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ociextp.h
>+usr/share/oracle/%%ORACLEVERSION%%/client/cdemo81.c
>+usr/share/oracle/%%ORACLEVERSION%%/client/demo.mk
>+usr/share/oracle/%%ORACLEVERSION%%/client/occidemo.sql
>+usr/share/oracle/%%ORACLEVERSION%%/client/occidemod.sql
>+usr/share/oracle/%%ORACLEVERSION%%/client/occidml.cpp
>+usr/share/oracle/%%ORACLEVERSION%%/client/occiobj.cpp
>+usr/share/oracle/%%ORACLEVERSION%%/client/occiobj.typ
>+usr/share/oracle/%%ORACLEVERSION%%/client/oraaccess.xml
>+usr/share/oracle/%%ORACLEVERSION%%/client/setuporamysql.sh
>+@dir usr/include/oracle/%%ORACLEVERSION%%/client
>+@dir usr/include/oracle/%%ORACLEVERSION%%
>+@dir usr/include/oracle
>+@dir usr/include
>+@dir usr/share/oracle/%%ORACLEVERSION%%/client
>+@dir usr/share/oracle/%%ORACLEVERSION%%
>+@dir usr/share/oracle
>+@dir usr/share
>+@dir usr
>Index: databases/linux-oracle-instantclient-sqlplus/Makefile
>===================================================================
>--- databases/linux-oracle-instantclient-sqlplus/Makefile	(révision 370662)
>+++ databases/linux-oracle-instantclient-sqlplus/Makefile	(copie de travail)
>@@ -2,62 +2,50 @@
> # $FreeBSD$
> 
> PORTNAME=		instantclient
>-PORTVERSION=		${ORACLEVERSION}.${DISTDATE}
>-PORTREVISION=		3
>+PORTVERSION=		12.1.0.2.0
> CATEGORIES=		databases
>-MASTER_SITES=		#http://www.oracle.com/technology/software/tech/oci/instantclient/
>+MASTER_SITES=		#http://www.oracle.com/technetwork/topics/linuxsoft-082809.html
> PKGNAMEPREFIX=		linux-oracle-
> PKGNAMESUFFIX=		-sqlplus
>-DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${ORACLEVERSION}-${DISTDATE}
>+DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${PORTVERSION}
> DIST_SUBDIR=		oracle
> 
>-MAINTAINER=		ports@FreeBSD.org
>-COMMENT=		Oracle 10 32 Bit Linux InstantClient SQLPlus for RDBMS 8.1.2+
>+MAINTAINER=		JeanFrancois.Boeuf@gmail.com
>+COMMENT=		Oracle 12c 32 Bit Linux InstantClient SQLPlus
> 
>+RUN_DEPENDS=	${LINUXBASE}/usr/lib/oracle/${PORTVERSION}/client/lib/libocci.so.12.1:${PORTSDIR}/databases/linux-oracle-instantclient-basic
>+
> ONLY_FOR_ARCHS=		i386 amd64
>-NO_BUILD=		yes
>-DISTINFO_FILE=		${MASTERDIR}/distinfo.i386
>+NO_BUILD=	yes
>+USE_LDCONFIG=   yes
> 
> RESTRICTED=		Packaging prohibited by Oracle license
> 
>-USES=			zip
>-USE_LINUX=		yes
>+USES=	zip
>+USE_LINUX=	c6
> USE_LINUX_PREFIX=	yes
> 
>-ORACLEVERSION=		10.2.0.3
>-
> BINS_LIST=		sqlplus
> 
>-LIBS_LIST=		glogin.sql	\
>-			libsqlplus.so	\
>-			libsqlplusic.so
>+LIBS_LIST=		glogin.sql libsqlplus.so libsqlplusic.so
> 
>-WRKSRC=			${WRKDIR}/instantclient_10_2
>+WRKSRC=			${WRKDIR}/instantclient_12_1
> 
>-INSTBINSDIR=		${STAGEDIR}${PREFIX}/usr/bin
>-INSTLIBSDIR=		${STAGEDIR}${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib
>+INSTBINSDIR=		${STAGEDIR}${PREFIX}/usr/lib/oracle/${PORTVERSION}/client/bin
>+INSTLIBSDIR=		${STAGEDIR}${PREFIX}/usr/lib/oracle/${PORTVERSION}/client/lib
> 
>-USE_LDCONFIG=		${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib
>+PLIST_SUB=     ORACLEVERSION=${PORTVERSION}
> 
>-PLIST_SUB=		ORACLEVERSION=${ORACLEVERSION}
>-
> .include <bsd.port.pre.mk>
> 
>-#.if ${ARCH} == "i386"
>-LINUXARCH=		linux32
>-DISTDATE=		20061115
>-#.elif ${ARCH} == "amd64"
>-#LINUXARCH=		linux-x86-64
>-#DISTDATE=		20070103
>-#.endif
>+LINUXARCH=		linux
> 
> .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
>-IGNORE+=	due to Oracle license restrictions, you must fetch the source distribution manually from http://www.oracle.com/technology/software/tech/oci/instantclient/index.html , follow the link for ${DISTFILES} and place them in ${DISTDIR}/${DIST_SUBDIR}/
>+IGNORE+=	due to Oracle license restrictions, you must fetch the source distribution manually from http://www.oracle.com/technetwork/topics/linuxsoft-082809.html, follow the link for ${DISTFILES} and place them in ${DISTDIR}/${DIST_SUBDIR}/
> .endif
> 
> do-install:
>-	@${MKDIR} -m 0755 ${INSTBINSDIR}
>-	@${MKDIR} -m 0755 ${INSTLIBSDIR}
>+	@${MKDIR} -m 0755 ${INSTBINSDIR} ${INSTLIBSDIR}
> .for i in ${BINS_LIST}
> 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${INSTBINSDIR}/${i}
> .endfor
>@@ -65,4 +53,6 @@
> 	${INSTALL_DATA} ${WRKSRC}/${i} ${INSTLIBSDIR}/${i}
> .endfor
> 
>+DESCR=      ${.CURDIR}/../${PKGNAMEPREFIX}${PORTNAME}-basic/pkg-descr
>+
> .include <bsd.port.post.mk>
>Index: databases/linux-oracle-instantclient-sqlplus/distinfo
>===================================================================
>--- databases/linux-oracle-instantclient-sqlplus/distinfo	(révision 0)
>+++ databases/linux-oracle-instantclient-sqlplus/distinfo	(copie de travail)
>@@ -0,0 +1,2 @@
>+SHA256 (oracle/instantclient-sqlplus-linux-12.1.0.2.0.zip) = 03062efdb88423342657a679760581af14d936a897647bddcf248453bb01105f
>+SIZE (oracle/instantclient-sqlplus-linux-12.1.0.2.0.zip) = 828190
>
>Modification de propriétés sur databases/linux-oracle-instantclient-sqlplus/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/linux-oracle-instantclient-sqlplus/distinfo.amd64
>===================================================================
>--- databases/linux-oracle-instantclient-sqlplus/distinfo.amd64	(révision 370662)
>+++ databases/linux-oracle-instantclient-sqlplus/distinfo.amd64	(copie de travail)
>@@ -1,2 +0,0 @@
>-SHA256 (oracle/instantclient-sqlplus-linux-x86-64-10.2.0.3-20070103.zip) = 8dcc95e3bf5723a7b1d6deccce049490bc70d99c0b9ac6ef13320b6b426303f6
>-SIZE (oracle/instantclient-sqlplus-linux-x86-64-10.2.0.3-20070103.zip) = 789884
>Index: databases/linux-oracle-instantclient-sqlplus/distinfo.i386
>===================================================================
>--- databases/linux-oracle-instantclient-sqlplus/distinfo.i386	(révision 370662)
>+++ databases/linux-oracle-instantclient-sqlplus/distinfo.i386	(copie de travail)
>@@ -1,2 +0,0 @@
>-SHA256 (oracle/instantclient-sqlplus-linux32-10.2.0.3-20061115.zip) = aad12fd25a234fec76d672f7993911b9f267732b7bf244d76f44bc212edbd76a
>-SIZE (oracle/instantclient-sqlplus-linux32-10.2.0.3-20061115.zip) = 741699
>Index: databases/linux-oracle-instantclient-sqlplus/pkg-descr
>===================================================================
>--- databases/linux-oracle-instantclient-sqlplus/pkg-descr	(révision 370662)
>+++ databases/linux-oracle-instantclient-sqlplus/pkg-descr	(copie de travail)
>@@ -1,9 +0,0 @@
>-Oracle instant client - SQLPlus distribution
>-
>-Instant Client allows you to run your applications without installing
>-the standard Oracle client or having an ORACLE_HOME.  OCI, OCCI, ODBC,
>-and JDBC applications work without modification, while using
>-significantly less disk space than before.  Even SQL*Plus can be used
>-with Instant Client.  No recompile, no hassle.
>-
>-WWW: http://www.oracle.com/technology/tech/oci/instantclient/instantclient.html
>Index: databases/linux-oracle-instantclient-sqlplus/pkg-plist
>===================================================================
>--- databases/linux-oracle-instantclient-sqlplus/pkg-plist	(révision 370662)
>+++ databases/linux-oracle-instantclient-sqlplus/pkg-plist	(copie de travail)
>@@ -1,8 +1,11 @@
>-usr/bin/sqlplus
>+usr/lib/oracle/%%ORACLEVERSION%%/client/bin/sqlplus
> usr/lib/oracle/%%ORACLEVERSION%%/client/lib/glogin.sql
> usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libsqlplus.so
> usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libsqlplusic.so
>-@dirrmtry usr/lib/oracle/%%ORACLEVERSION%%/client/lib
>-@dirrmtry usr/lib/oracle/%%ORACLEVERSION%%/client
>-@dirrmtry usr/lib/oracle/%%ORACLEVERSION%%
>-@dirrmtry usr/lib/oracle
>+@dir usr/lib/oracle/%%ORACLEVERSION%%/client/bin
>+@dir usr/lib/oracle/%%ORACLEVERSION%%/client/lib
>+@dir usr/lib/oracle/%%ORACLEVERSION%%/client
>+@dir usr/lib/oracle/%%ORACLEVERSION%%
>+@dir usr/lib/oracle
>+@dir usr/lib
>+@dir usr
>Index: emulators/linux-c6-libaio/Makefile
>===================================================================
>--- emulators/linux-c6-libaio/Makefile	(révision 0)
>+++ emulators/linux-c6-libaio/Makefile	(copie de travail)
>@@ -0,0 +1,25 @@
>+PORTNAME=	libaio
>+PORTVERSION=	0.3.107
>+CATEGORIES=	emulators linux
>+PKGNAMEPREFIX=	linux-${USE_LINUX}-
>+
>+MAINTAINER=	JeanFrancois.Boeuf@gmail.com
>+COMMENT= 	Linux-native asynchronous I/O access library
>+
>+ONLY_FOR_ARCHS=	i386 amd64
>+USE_LINUX=	c6
>+USE_LINUX_PREFIX= yes
>+RPMVERSION=	10.el6
>+USE_LINUX_RPM=	yes
>+USE_LDCONFIG=	yes
>+
>+PLIST_FILES=	lib/libaio.so.1	\
>+		lib/libaio.so.1.0.0	\
>+		lib/libaio.so.1.0.1
>+DOCSDIR=${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
>+PORTDOCS=COPYING TODO
>+
>+post-install:
>+	${LN} -sf libaio.so.1.0.1 ${STAGEDIR}${PREFIX}/lib/libaio.so.1
>+
>+.include <bsd.port.mk>
>
>Modification de propriétés sur emulators/linux-c6-libaio/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Index: emulators/linux-c6-libaio/distinfo.i686
>===================================================================
>--- emulators/linux-c6-libaio/distinfo.i686	(révision 0)
>+++ emulators/linux-c6-libaio/distinfo.i686	(copie de travail)
>@@ -0,0 +1,4 @@
>+SHA256 (rpm/i686/centos/6.5/libaio-0.3.107-10.el6.i686.rpm) = 11dec8cf40933ba70831ae5922c314cbf4e6b17afa0da8c2206f9555e7db8a4e
>+SIZE (rpm/i686/centos/6.5/libaio-0.3.107-10.el6.i686.rpm) = 21616
>+SHA256 (rpm/i686/centos/6.5/libaio-0.3.107-10.el6.src.rpm) = aa9d19c8a6ad7e08e317b08a2cddd50b1956b73ee4f46da55572d1adeca706df
>+SIZE (rpm/i686/centos/6.5/libaio-0.3.107-10.el6.src.rpm) = 63867
>
>Modification de propriétés sur emulators/linux-c6-libaio/distinfo.i686
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: emulators/linux-c6-libaio/pkg-descr
>===================================================================
>--- emulators/linux-c6-libaio/pkg-descr	(révision 0)
>+++ emulators/linux-c6-libaio/pkg-descr	(copie de travail)
>@@ -0,0 +1,6 @@
>+The Linux-native asynchronous I/O facility (\"async I/O\", or \"aio\") has a
>+richer API and capability set than the simple POSIX async I/O facility.
>+This library, libaio, provides the Linux-native API for async I/O.
>+The POSIX async I/O facility requires this library in order to provide
>+kernel-accelerated async I/O capabilities, as do applications which
>+require the Linux-native async I/O API.)
>
>Modification de propriétés sur emulators/linux-c6-libaio/pkg-descr
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 157544: 115737 | 115738 | 148203