ports/157544: Updates for databases/linux-oracle-instantclient-*

Grzegorz Blach magik at roorback.net
Thu Jun 2 21:10:09 UTC 2011


>Number:         157544
>Category:       ports
>Synopsis:       Updates for databases/linux-oracle-instantclient-*
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 02 21:10:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Grzegorz Blach
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:


System: FreeBSD 8.2-RELEASE #8 r218743: Wed Feb 16 19:24:02 CET 2011
    magik at silver.nine:/usr/obj/usr/src/sys/SILVER



>Description:


Updated to 11.2.0.2.0:
databases/linux-oracle-instantclient-basic
databases/linux-oracle-instantclient-sdk
databases/linux-oracle-instantclient-sqlplus

This ports works not only on i386, but on amd64 too.

New port added emulators/linux-f10-libaio, on which instantclient depend.

And finally, added dependency record
for linux-libaio / linux-f10-libaio in Mk/bsd.linux-apps.mk



>How-To-Repeat:





>Fix:


--- oracle.diff.txt begins here ---
diff -ruN orig/Mk/bsd.linux-apps.mk new/Mk/bsd.linux-apps.mk
--- orig/Mk/bsd.linux-apps.mk	2011-06-02 22:00:04.147519676 +0200
+++ new/Mk/bsd.linux-apps.mk	2011-06-02 22:00:55.268348276 +0200
@@ -58,7 +58,7 @@
 
 # Non-version specific components
 _LINUX_APPS_ALL=	allegro alsalib arts aspell atk cairo curl dri esound expat fontconfig \
-					freealut gdkpixbuf gtk gtk2 hicontheme imlib jpeg libaudiofile \
+					freealut gdkpixbuf gtk gtk2 hicontheme imlib jpeg libaio libaudiofile \
 					libg2c libglade libglade2 libglu libmng libogg libsigcpp20 libtheora \
 					libvorbis libxml libxml2 mikmod naslibs openal openmotif openssl pango png png10 qt33 \
 					scimgtk scimlibs sdl12 sdlimage sdlmixer tiff xorglibs ucl ungif upx webauth
@@ -224,6 +224,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_f10_FILE=	${LINUXBASE}/usr/lib/libaio.so.1.0.1
+libaio_DETECT=		${libaio${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+libaio_PORT=		${PORTSDIR}/emulators/linux${LINUX_DIST_SUFFIX}-libaio
+
 # no libasyncns_FILE (there is no libasyncns port for Fedora 4 distribution)
 libasyncns_f10_FILE=	${LINUXBASE}/usr/lib/libasyncns.so.0.3.1
 libasyncns_DETECT=	${libasyncns${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
diff -ruN orig/databases/linux-oracle-instantclient-basic/Makefile new/databases/linux-oracle-instantclient-basic/Makefile
--- orig/databases/linux-oracle-instantclient-basic/Makefile	2010-10-28 23:00:07.000000000 +0200
+++ new/databases/linux-oracle-instantclient-basic/Makefile	2011-06-02 22:58:28.843773000 +0200
@@ -6,56 +6,49 @@
 #
 
 PORTNAME=		instantclient
-PORTVERSION=		${ORACLEVERSION}.${DISTDATE}
-PORTREVISION=		2
+PORTVERSION=		11.2.0.2.0
 CATEGORIES=		databases
 MASTER_SITES=		#http://www.oracle.com/technology/software/tech/oci/instantclient/
 PKGNAMEPREFIX=		linux-oracle-
 PKGNAMESUFFIX=		-basic
-DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${ORACLEVERSION}-${DISTDATE}
+DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${PORTVERSION}
 DIST_SUBDIR=		oracle
 
 MAINTAINER=		nork at FreeBSD.org
-COMMENT=		Oracle 10 InstantClient basics. Works with Oracle RDBMS 8.1.2+
+COMMENT=		Oracle 11g InstantClient basics. Works with Oracle RDBMS 9.2+
 
-ONLY_FOR_ARCHS=		i386	# amd64(not yet on own)
+ONLY_FOR_ARCHS=		i386 amd64
 NO_BUILD=		yes
-DISTINFO_FILE=		${MASTERDIR}/distinfo.${ARCH}
+USE_LDCONFIG=		yes
 
 RESTRICTED=		Packaging prohibited by Oracle license
 
 USE_ZIP=		yes
 USE_LINUX=		yes
+USE_LINUX_APPS=		libaio
 USE_LINUX_PREFIX=	yes
+LINUXARCH=		linux32
 
-ORACLEVERSION=		10.2.0.3
-
-BINS_LIST=		genezi
+BINS_LIST=		adrci genezi uidrvci
 
-LIBS_LIST=		libclntsh.so.10.1	\
-			libnnz10.so		\
-			libocci.so.10.1		\
+LIBS_LIST=		libclntsh.so.11.1	\
+			libnnz11.so		\
+			libocci.so.11.1		\
 			libociei.so		\
-			libocijdbc10.so		\
-			ojdbc14.jar
+			libocijdbc11.so		\
+			ojdbc5.jar		\
+			ojdbc6.jar              \
+			xstreams.jar
 
-WRKSRC=			${WRKDIR}/instantclient_10_2
+WRKSRC=			${WRKDIR}/instantclient_11_2
 
-INSTBINSDIR=		${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/bin
-INSTLIBSDIR=		${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib
+INSTBINSDIR=		${PREFIX}/usr/lib/oracle/${PORTVERSION}/client/bin
+INSTLIBSDIR=		${PREFIX}/usr/lib/oracle/${PORTVERSION}/client/lib
 
-PLIST_SUB=		ORACLEVERSION=${ORACLEVERSION}
+PLIST_SUB=		ORACLEVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if		${ARCH} == "i386"
-LINUXARCH=		linux32
-DISTDATE=		20061115
-.elif		${ARCH} == "amd64"
-LINUXARCH=		linux-x86-64
-DISTDATE=		20070103
-.endif
-
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
 ECHO_MSG=		${PRINTF} %b
 
@@ -75,15 +68,15 @@
 .endif
 
 do-install:
-			@${MKDIR} -m 0755 ${INSTBINSDIR}
-			@${MKDIR} -m 0755 ${INSTLIBSDIR}
+			@${MKDIR} -m 0755 ${INSTBINSDIR} ${INSTLIBSDIR}
 .for i in ${BINS_LIST}
-			${INSTALL_DATA} ${WRKSRC}/${i} ${INSTBINSDIR}/${i}
+			${INSTALL_SCRIPT} ${WRKSRC}/${i} ${INSTBINSDIR}/${i}
 .endfor
 .for i in ${LIBS_LIST}
-			${INSTALL_DATA} ${WRKSRC}/${i} ${INSTLIBSDIR}/${i}
+			${INSTALL_DATA}   ${WRKSRC}/${i} ${INSTLIBSDIR}/${i}
 .endfor
+			${LN} -s libclntsh.so.11.1 ${INSTLIBSDIR}/libclntsh.so
+			${LN} -s libocci.so.11.1   ${INSTLIBSDIR}/libocci.so
 			${ECHO_CMD} "${INSTLIBSDIR:S,${PREFIX},,}" >> ${PREFIX}/etc/ld.so.conf
-			${PREFIX}/sbin/ldconfig
 
 .include <bsd.port.post.mk>
diff -ruN orig/databases/linux-oracle-instantclient-basic/distinfo.amd64 new/databases/linux-oracle-instantclient-basic/distinfo.amd64
--- orig/databases/linux-oracle-instantclient-basic/distinfo.amd64	2011-03-20 13:47:11.000000000 +0100
+++ new/databases/linux-oracle-instantclient-basic/distinfo.amd64	1970-01-01 01:00:00.000000000 +0100
@@ -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
diff -ruN orig/databases/linux-oracle-instantclient-basic/distinfo.i386 new/databases/linux-oracle-instantclient-basic/distinfo.i386
--- orig/databases/linux-oracle-instantclient-basic/distinfo.i386	2011-03-20 13:47:11.000000000 +0100
+++ new/databases/linux-oracle-instantclient-basic/distinfo.i386	2011-05-24 19:45:19.136070000 +0200
@@ -1,2 +1,2 @@
-SHA256 (oracle/instantclient-basic-linux32-10.2.0.3-20061115.zip) = 11fce485c405afa4a30f34eba36ad0d566a599617f80dfc565bd08d8c421e1ae
-SIZE (oracle/instantclient-basic-linux32-10.2.0.3-20061115.zip) = 34556803
+SHA256 (oracle/instantclient-basic-linux32-11.2.0.2.0.zip) = 53f97a73991b2380e987f7cf4e1ba650a866044892c378b9340dc2e695160c14
+SIZE (oracle/instantclient-basic-linux32-11.2.0.2.0.zip) = 57278802
diff -ruN orig/databases/linux-oracle-instantclient-basic/pkg-plist new/databases/linux-oracle-instantclient-basic/pkg-plist
--- orig/databases/linux-oracle-instantclient-basic/pkg-plist	2007-02-11 16:05:20.000000000 +0100
+++ new/databases/linux-oracle-instantclient-basic/pkg-plist	2011-05-24 23:19:17.750775000 +0200
@@ -1,10 +1,16 @@
+usr/lib/oracle/%%ORACLEVERSION%%/client/bin/adrci
 usr/lib/oracle/%%ORACLEVERSION%%/client/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
+usr/lib/oracle/%%ORACLEVERSION%%/client/bin/uidrvci
+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libclntsh.so
+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libclntsh.so.11.1
+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libnnz11.so
+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocci.so
+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocci.so.11.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
+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocijdbc11.so
+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/ojdbc5.jar
+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/ojdbc6.jar
+usr/lib/oracle/%%ORACLEVERSION%%/client/lib/xstreams.jar
 @dirrm usr/lib/oracle/%%ORACLEVERSION%%/client/bin
 @dirrm usr/lib/oracle/%%ORACLEVERSION%%/client/lib
 @dirrm usr/lib/oracle/%%ORACLEVERSION%%/client
@@ -14,4 +20,3 @@
 @dirrmtry usr
 @unexec cp %D/etc/ld.so.conf %D/etc/ld.so.conf.bak && sed "/\/usr\/lib\/oracle\/%%ORACLEVERSION%%\/client\/lib/d" %D/etc/ld.so.conf.bak > %D/etc/ld.so.conf && rm %D/etc/ld.so.conf.bak
 @exec echo /usr/lib/oracle/%%ORACLEVERSION%%/client/lib >> %D/etc/ld.so.conf
- at exec %D/sbin/ldconfig
diff -ruN orig/databases/linux-oracle-instantclient-sdk/Makefile new/databases/linux-oracle-instantclient-sdk/Makefile
--- orig/databases/linux-oracle-instantclient-sdk/Makefile	2010-10-28 23:00:07.000000000 +0200
+++ new/databases/linux-oracle-instantclient-sdk/Makefile	2011-06-02 22:59:12.201624000 +0200
@@ -6,31 +6,30 @@
 #
 
 PORTNAME=		instantclient
-PORTVERSION=		${ORACLEVERSION}.${DISTDATE}
+PORTVERSION=		11.2.0.2.0
 CATEGORIES=		databases
 MASTER_SITES=		#http://www.oracle.com/technology/software/tech/oci/instantclient/
 PKGNAMEPREFIX=		linux-oracle-
 PKGNAMESUFFIX=		-sdk
-DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${ORACLEVERSION}-${DISTDATE}
+DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${PORTVERSION}
 DIST_SUBDIR=		oracle
 
 MAINTAINER=		nork at FreeBSD.org
-COMMENT=		Oracle 10 InstantClient SDK. Works with Oracle RDBMS 8.1.2+
+COMMENT=		Oracle 11g InstantClient SDK. Works with Oracle RDBMS 9.2+
 
-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.11.1:${PORTSDIR}/databases/linux-oracle-instantclient-basic
 
-ONLY_FOR_ARCHS=		i386	# amd64(not yet on own)
+ONLY_FOR_ARCHS=		i386 amd64
 NO_BUILD=		yes
-DISTINFO_FILE=		${MASTERDIR}/distinfo.${ARCH}
 
 RESTRICTED=		Packaging prohibited by Oracle license
 
 USE_ZIP=		yes
 USE_LINUX_PREFIX=	yes
+LINUXARCH=		linux32
 
-ORACLEVERSION=		10.2.0.3
-
-INCS_LIST=		nzerror.h \
+INCS_LIST=		ldap.h \
+			nzerror.h \
 			nzt.h \
 			occi.h \
 			occiAQ.h \
@@ -49,6 +48,7 @@
 			ociextp.h \
 			ocikpr.h \
 			ocixmldb.h \
+			ocixstream.h \
 			odci.h \
 			oratypes.h \
 			ori.h \
@@ -66,24 +66,16 @@
 			occiobj.cpp	\
 			occiobj.typ
 
-WRKSRC=			${WRKDIR}/instantclient_10_2/sdk
+WRKSRC=			${WRKDIR}/instantclient_11_2/sdk
 
-INSTLIBSDIR=		${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib
-INSTINCSDIR=		${PREFIX}/usr/include/oracle/${ORACLEVERSION}/client
-INSTDEMODIR=		${PREFIX}/usr/share/oracle/${ORACLEVERSION}/client
+INSTLIBSDIR=		${PREFIX}/usr/lib/oracle/${PORTVERSION}/client/lib
+INSTINCSDIR=		${PREFIX}/usr/include/oracle/${PORTVERSION}/client
+INSTDEMODIR=		${PREFIX}/usr/share/oracle/${PORTVERSION}/client
 
-PLIST_SUB=		PORTVERSION=${PORTVERSION}
+PLIST_SUB=		ORACLEVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if		${ARCH} == "i386"
-LINUXARCH=		linux32
-DISTDATE=		20061115
-.elif		${ARCH} == "amd64"
-LINUXARCH=		linux-x86-64
-DISTDATE=		20070103
-.endif
-
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
 ECHO_MSG=		${PRINTF} %b
 
@@ -104,8 +96,6 @@
 
 do-install:
 			${MKDIR} -m 0755 ${INSTINCSDIR} ${INSTDEMODIR}
-			${LN} -s libclntsh.so.10.1 ${INSTLIBSDIR}/libclntsh.so
-			${LN} -s libocci.so.10.1 ${INSTLIBSDIR}/libocci.so
 .for i in ${INCS_LIST}
 			${INSTALL_DATA} ${WRKSRC}/include/${i} ${INSTINCSDIR}/${i}
 .endfor
diff -ruN orig/databases/linux-oracle-instantclient-sdk/distinfo.amd64 new/databases/linux-oracle-instantclient-sdk/distinfo.amd64
--- orig/databases/linux-oracle-instantclient-sdk/distinfo.amd64	2011-03-20 13:47:11.000000000 +0100
+++ new/databases/linux-oracle-instantclient-sdk/distinfo.amd64	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-SHA256 (oracle/instantclient-sdk-linux-x86-64-10.2.0.3-20070103.zip) = d9da1494a9d19e96bff79c3ff77d079633d18c7d9b462a37eacc9a2a40641912
-SIZE (oracle/instantclient-sdk-linux-x86-64-10.2.0.3-20070103.zip) = 603137
diff -ruN orig/databases/linux-oracle-instantclient-sdk/distinfo.i386 new/databases/linux-oracle-instantclient-sdk/distinfo.i386
--- orig/databases/linux-oracle-instantclient-sdk/distinfo.i386	2011-03-20 13:47:11.000000000 +0100
+++ new/databases/linux-oracle-instantclient-sdk/distinfo.i386	2011-05-24 20:37:16.491449000 +0200
@@ -1,2 +1,2 @@
-SHA256 (oracle/instantclient-sdk-linux32-10.2.0.3-20061115.zip) = 6893a784e1802e18300230dcac1ed2ecd6dc68a7060c02717f73bf268d43f6a5
-SIZE (oracle/instantclient-sdk-linux32-10.2.0.3-20061115.zip) = 602897
+SHA256 (oracle/instantclient-sdk-linux32-11.2.0.2.0.zip) = 172c0116de16f55abd775aaf4dd1666d0e64eb1226b43388974ccf83235c8b18
+SIZE (oracle/instantclient-sdk-linux32-11.2.0.2.0.zip) = 638200
diff -ruN orig/databases/linux-oracle-instantclient-sdk/pkg-plist new/databases/linux-oracle-instantclient-sdk/pkg-plist
--- orig/databases/linux-oracle-instantclient-sdk/pkg-plist	2007-02-11 16:24:15.000000000 +0100
+++ new/databases/linux-oracle-instantclient-sdk/pkg-plist	2011-05-24 23:18:12.190671000 +0200
@@ -1,10 +1,11 @@
-usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libclntsh.so
-usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocci.so
 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/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
@@ -24,6 +25,7 @@
 usr/include/oracle/%%ORACLEVERSION%%/client/ociextp.h
 usr/include/oracle/%%ORACLEVERSION%%/client/ocikpr.h
 usr/include/oracle/%%ORACLEVERSION%%/client/ocixmldb.h
+usr/include/oracle/%%ORACLEVERSION%%/client/ocixstream.h
 usr/include/oracle/%%ORACLEVERSION%%/client/odci.h
 usr/include/oracle/%%ORACLEVERSION%%/client/oratypes.h
 usr/include/oracle/%%ORACLEVERSION%%/client/ori.h
diff -ruN orig/databases/linux-oracle-instantclient-sqlplus/Makefile new/databases/linux-oracle-instantclient-sqlplus/Makefile
--- orig/databases/linux-oracle-instantclient-sqlplus/Makefile	2010-10-28 23:00:08.000000000 +0200
+++ new/databases/linux-oracle-instantclient-sqlplus/Makefile	2011-06-02 22:59:30.201563000 +0200
@@ -6,30 +6,29 @@
 #
 
 PORTNAME=		instantclient
-PORTVERSION=		${ORACLEVERSION}.${DISTDATE}
-PORTREVISION=		1
+PORTVERSION=		11.2.0.2.0
 CATEGORIES=		databases
 MASTER_SITES=		#http://www.oracle.com/technology/software/tech/oci/instantclient/
 PKGNAMEPREFIX=		linux-oracle-
 PKGNAMESUFFIX=		-sqlplus
-DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${ORACLEVERSION}-${DISTDATE}
+DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${PORTVERSION}
 DIST_SUBDIR=		oracle
 
 MAINTAINER=		nork at FreeBSD.org
-COMMENT=		Oracle 10 InstantClient SQLPlus. Works with Oracle RDBMS 8.1.2+
+COMMENT=		Oracle 11g InstantClient SQLPlus. Works with Oracle RDBMS 9.2+
 
-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.11.1:${PORTSDIR}/databases/linux-oracle-instantclient-basic
 
-ONLY_FOR_ARCHS=		i386	# amd64(not yet on own)
+ONLY_FOR_ARCHS=		i386 amd64
 NO_BUILD=		yes
-DISTINFO_FILE=		${MASTERDIR}/distinfo.${ARCH}
+USE_LDCONFIG=		yes
 
 RESTRICTED=		Packaging prohibited by Oracle license
 
 USE_ZIP=		yes
+USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
-
-ORACLEVERSION=		10.2.0.3
+LINUXARCH=		linux32
 
 BINS_LIST=		sqlplus
 
@@ -37,23 +36,15 @@
 			libsqlplus.so	\
 			libsqlplusic.so
 
-WRKSRC=			${WRKDIR}/instantclient_10_2
+WRKSRC=			${WRKDIR}/instantclient_11_2
 
-INSTBINSDIR=		${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/bin
-INSTLIBSDIR=		${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib
+INSTBINSDIR=		${PREFIX}/usr/lib/oracle/${PORTVERSION}/client/bin
+INSTLIBSDIR=		${PREFIX}/usr/lib/oracle/${PORTVERSION}/client/lib
 
-PLIST_SUB=		ORACLEVERSION=${ORACLEVERSION}
+PLIST_SUB=		ORACLEVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if		${ARCH} == "i386"
-LINUXARCH=		linux32
-DISTDATE=		20061115
-.elif		${ARCH} == "amd64"
-LINUXARCH=		linux-x86-64
-DISTDATE=		20070103
-.endif
-
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
 ECHO_MSG=		${PRINTF} %b
 
@@ -73,15 +64,13 @@
 .endif
 
 do-install:
-			${MKDIR} -m 0755 ${INSTBINSDIR}
-			${MKDIR} -m 0755 ${INSTLIBSDIR}
-			${LN} -s ../lib/oracle/${ORACLEVERSION}/client/bin/sqlplus ${PREFIX}/usr/bin/sqlplus
+			${MKDIR} -m 0755 ${INSTBINSDIR} ${INSTLIBSDIR}
 .for i in ${BINS_LIST}
 			${INSTALL_SCRIPT} ${WRKSRC}/${i} ${INSTBINSDIR}/${i}
 .endfor
 .for i in ${LIBS_LIST}
 			${INSTALL_DATA}   ${WRKSRC}/${i} ${INSTLIBSDIR}/${i}
 .endfor
-			${PREFIX}/sbin/ldconfig
+			${LN} -s ../lib/oracle/${PORTVERSION}/client/bin/sqlplus ${PREFIX}/usr/bin/sqlplus
 
 .include <bsd.port.post.mk>
diff -ruN orig/databases/linux-oracle-instantclient-sqlplus/distinfo.amd64 new/databases/linux-oracle-instantclient-sqlplus/distinfo.amd64
--- orig/databases/linux-oracle-instantclient-sqlplus/distinfo.amd64	2011-03-20 13:47:12.000000000 +0100
+++ new/databases/linux-oracle-instantclient-sqlplus/distinfo.amd64	1970-01-01 01:00:00.000000000 +0100
@@ -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
diff -ruN orig/databases/linux-oracle-instantclient-sqlplus/distinfo.i386 new/databases/linux-oracle-instantclient-sqlplus/distinfo.i386
--- orig/databases/linux-oracle-instantclient-sqlplus/distinfo.i386	2011-03-20 13:47:12.000000000 +0100
+++ new/databases/linux-oracle-instantclient-sqlplus/distinfo.i386	2011-05-24 19:56:41.876530000 +0200
@@ -1,2 +1,2 @@
-SHA256 (oracle/instantclient-sqlplus-linux32-10.2.0.3-20061115.zip) = aad12fd25a234fec76d672f7993911b9f267732b7bf244d76f44bc212edbd76a
-SIZE (oracle/instantclient-sqlplus-linux32-10.2.0.3-20061115.zip) = 741699
+SHA256 (oracle/instantclient-sqlplus-linux32-11.2.0.2.0.zip) = 35f1d447b0b368bcafd4fcff6bb04139e568176f0081a60aea1939099754ea0a
+SIZE (oracle/instantclient-sqlplus-linux32-11.2.0.2.0.zip) = 795691
diff -ruN orig/databases/linux-oracle-instantclient-sqlplus/pkg-plist new/databases/linux-oracle-instantclient-sqlplus/pkg-plist
--- orig/databases/linux-oracle-instantclient-sqlplus/pkg-plist	2007-02-18 18:17:50.000000000 +0100
+++ new/databases/linux-oracle-instantclient-sqlplus/pkg-plist	2011-05-24 23:18:43.415196000 +0200
@@ -3,6 +3,4 @@
 usr/lib/oracle/%%ORACLEVERSION%%/client/lib/glogin.sql
 usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libsqlplus.so
 usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libsqlplusic.so
- at dirrm usr/lib/oracle/%%ORACLEVERSION%%/client/bin
 @dirrmtry usr/bin
- at exec %D/sbin/ldconfig
diff -ruN orig/emulators/linux-f10-libaio/Makefile new/emulators/linux-f10-libaio/Makefile
--- orig/emulators/linux-f10-libaio/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ new/emulators/linux-f10-libaio/Makefile	2011-05-28 12:28:39.375579000 +0200
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	linux-libaio
+# Date created:				2006-12-02
+# Whom:					Simun Mikecin <numisemis at yahoo dot com>
+#
+# $FreeBSD: ports/emulators/linux-libaio/Makefile,v 1.1 2006/12/20 23:02:59 bsam Exp $
+#
+
+PORTNAME=	libaio
+PORTVERSION=	0.3.107
+CATEGORIES=	emulators linux
+PKGNAMEPREFIX=  linux-f10-
+DISTNAME=       ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
+
+MAINTAINER=	numisemis at yahoo.com
+COMMENT=	Linux-native asynchronous I/O access library, Linux binary
+
+ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	10
+RPMVERSION=	4.fc10
+USE_LDCONFIG=	yes
+
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+.include <bsd.port.mk>
diff -ruN orig/emulators/linux-f10-libaio/distinfo.i386 new/emulators/linux-f10-libaio/distinfo.i386
--- orig/emulators/linux-f10-libaio/distinfo.i386	1970-01-01 01:00:00.000000000 +0100
+++ new/emulators/linux-f10-libaio/distinfo.i386	2011-05-28 12:28:39.375579000 +0200
@@ -0,0 +1,2 @@
+SHA256 (rpm/i386/fedora/10/libaio-0.3.107-4.fc10.i386.rpm) = 8e2aa1dde4550bb00b0ef4b5fb93417c1e701bd8095a44191d10016fdcf349e1
+SIZE (rpm/i386/fedora/10/libaio-0.3.107-4.fc10.i386.rpm) = 19970
diff -ruN orig/emulators/linux-f10-libaio/pkg-descr new/emulators/linux-f10-libaio/pkg-descr
--- orig/emulators/linux-f10-libaio/pkg-descr	1970-01-01 01:00:00.000000000 +0100
+++ new/emulators/linux-f10-libaio/pkg-descr	2011-05-28 12:28:39.375579000 +0200
@@ -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.
diff -ruN orig/emulators/linux-f10-libaio/pkg-plist new/emulators/linux-f10-libaio/pkg-plist
--- orig/emulators/linux-f10-libaio/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ new/emulators/linux-f10-libaio/pkg-plist	2011-05-28 12:28:39.375579000 +0200
@@ -0,0 +1,6 @@
+lib/libaio.so.1
+lib/libaio.so.1.0.0
+lib/libaio.so.1.0.1
+usr/share/doc/libaio-%%VERSION%%/COPYING
+usr/share/doc/libaio-%%VERSION%%/TODO
+ at dirrm usr/share/doc/libaio-%%VERSION%%
--- oracle.diff.txt ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list