Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Dec 2011 22:59:39 +0100
From:      Grzegorz Blach <magik@roorback.net>
To:        FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/157544: Updates for databases/linux-oracle-instantclient-*
Message-ID:  <4EF4F9CB.90900@roorback.net>
In-Reply-To: <201106022110.p52LA93a066836@freefall.freebsd.org>
References:  <201106022110.p52LA93a066836@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------090906090908080404040002
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

- databases/linux-oracle-instantclient-*: Updated to 11.2.0.3.0
- Mk/bsd.linux-apps.mk: Merged patch from nick@physics.umn.edu
- emulators/linux-f10-libaio: Merged patch from nick@physics.umn.edu, 
changed maintainer to me

--------------090906090908080404040002
Content-Type: text/plain;
 name="oracle.diff.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="oracle.diff.txt"

diff -ruN Mk/bsd.linux-apps.mk Mk/bsd.linux-apps.mk
--- Mk/bsd.linux-apps.mk    2011-09-23 21:28:06.000000000 +0200
+++ Mk/bsd.linux-apps.mk    2011-12-23 21:24:40.769303148 +0100
@@ -58,7 +58,7 @@

 # Non-version specific components
 _LINUX_APPS_ALL=   allegro alsalib arts aspell atk cairo cups-libs curl dri esound expat fontconfig \
-                   freealut gdkpixbuf gnutls gtk gtk2 hicontheme imlib jpeg libaudiofile \
+                   freealut gdkpixbuf gnutls gtk gtk2 hicontheme imlib jpeg libaio libaudiofile \
                    libg2c libgcrypt libglade libglade2 libglu libgpg-error libmng libogg \
                    libsigcpp20 libtasn1 libtheora  libvorbis libxml libxml2 mikmod naslibs \
                    openal openmotif openssl pango png png10 qt33 scimgtk scimlibs sdl12 \
@@ -236,6 +236,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}/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 databases/linux-oracle-instantclient-basic/Makefile databases/linux-oracle-instantclient-basic/Makefile
--- databases/linux-oracle-instantclient-basic/Makefile 2010-10-28 23:00:07.000000000 +0200
+++ databases/linux-oracle-instantclient-basic/Makefile 2011-12-23 19:34:41.942302391 +0100
@@ -6,56 +6,49 @@
 #

 PORTNAME=      instantclient
-PORTVERSION=       ${ORACLEVERSION}.${DISTDATE}
-PORTREVISION=      2
+PORTVERSION=       11.2.0.3.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@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=     linux

-ORACLEVERSION=     10.2.0.3
+BINS_LIST=     adrci genezi uidrvci

-BINS_LIST=     genezi
-
-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 databases/linux-oracle-instantclient-basic/distinfo.amd64 databases/linux-oracle-instantclient-basic/distinfo.amd64
--- databases/linux-oracle-instantclient-basic/distinfo.amd64   2011-03-20 13:47:11.000000000 +0100
+++ 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 databases/linux-oracle-instantclient-basic/distinfo.i386 databases/linux-oracle-instantclient-basic/distinfo.i386
--- databases/linux-oracle-instantclient-basic/distinfo.i386    2011-03-20 13:47:11.000000000 +0100
+++ databases/linux-oracle-instantclient-basic/distinfo.i386    2011-12-23 19:34:41.943302031 +0100
@@ -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-linux-11.2.0.3.0.zip) = 1d5f9a3db6cdf91c332e75aa42995729e499f794bea6c5806ecba357c1258239
+SIZE (oracle/instantclient-basic-linux-11.2.0.3.0.zip) = 58502865
diff -ruN databases/linux-oracle-instantclient-basic/pkg-plist databases/linux-oracle-instantclient-basic/pkg-plist
--- databases/linux-oracle-instantclient-basic/pkg-plist    2007-02-11 16:05:20.000000000 +0100
+++ databases/linux-oracle-instantclient-basic/pkg-plist    2011-10-21 17:42:08.479053438 +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
-@exec %D/sbin/ldconfig
diff -ruN databases/linux-oracle-instantclient-sdk/Makefile databases/linux-oracle-instantclient-sdk/Makefile
--- databases/linux-oracle-instantclient-sdk/Makefile   2010-10-28 23:00:07.000000000 +0200
+++ databases/linux-oracle-instantclient-sdk/Makefile   2011-12-23 19:34:41.945301351 +0100
@@ -6,31 +6,30 @@
 #

 PORTNAME=      instantclient
-PORTVERSION=       ${ORACLEVERSION}.${DISTDATE}
+PORTVERSION=       11.2.0.3.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@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=     linux

-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 databases/linux-oracle-instantclient-sdk/distinfo.amd64 databases/linux-oracle-instantclient-sdk/distinfo.amd64
--- databases/linux-oracle-instantclient-sdk/distinfo.amd64 2011-03-20 13:47:11.000000000 +0100
+++ 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 databases/linux-oracle-instantclient-sdk/distinfo.i386 databases/linux-oracle-instantclient-sdk/distinfo.i386
--- databases/linux-oracle-instantclient-sdk/distinfo.i386  2011-03-20 13:47:11.000000000 +0100
+++ databases/linux-oracle-instantclient-sdk/distinfo.i386  2011-12-23 19:34:41.945301351 +0100
@@ -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-linux-11.2.0.3.0.zip) = f51b3c91a63f176443a681881fb15281c4487dde637c9c6e5b0703462a330bee
+SIZE (oracle/instantclient-sdk-linux-11.2.0.3.0.zip) = 639306
diff -ruN databases/linux-oracle-instantclient-sdk/pkg-plist databases/linux-oracle-instantclient-sdk/pkg-plist
--- databases/linux-oracle-instantclient-sdk/pkg-plist  2007-02-11 16:24:15.000000000 +0100
+++ databases/linux-oracle-instantclient-sdk/pkg-plist  2011-10-21 17:42:08.479053438 +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 databases/linux-oracle-instantclient-sqlplus/Makefile databases/linux-oracle-instantclient-sqlplus/Makefile
--- databases/linux-oracle-instantclient-sqlplus/Makefile   2010-10-28 23:00:08.000000000 +0200
+++ databases/linux-oracle-instantclient-sqlplus/Makefile   2011-12-23 19:34:41.948302071 +0100
@@ -6,30 +6,29 @@
 #

 PORTNAME=      instantclient
-PORTVERSION=       ${ORACLEVERSION}.${DISTDATE}
-PORTREVISION=      1
+PORTVERSION=       11.2.0.3.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@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=     linux

 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 databases/linux-oracle-instantclient-sqlplus/distinfo.amd64 databases/linux-oracle-instantclient-sqlplus/distinfo.amd64
--- databases/linux-oracle-instantclient-sqlplus/distinfo.amd64 2011-03-20 13:47:12.000000000 +0100
+++ 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 databases/linux-oracle-instantclient-sqlplus/distinfo.i386 databases/linux-oracle-instantclient-sqlplus/distinfo.i386
--- databases/linux-oracle-instantclient-sqlplus/distinfo.i386  2011-03-20 13:47:12.000000000 +0100
+++ databases/linux-oracle-instantclient-sqlplus/distinfo.i386  2011-12-23 19:34:41.948302071 +0100
@@ -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-linux-11.2.0.3.0.zip) = 338de20fb4b52359c53969e8d6c5441629a0ddaf676ab98edb19206f21edce43
+SIZE (oracle/instantclient-sqlplus-linux-11.2.0.3.0.zip) = 796570
diff -ruN databases/linux-oracle-instantclient-sqlplus/pkg-plist databases/linux-oracle-instantclient-sqlplus/pkg-plist
--- databases/linux-oracle-instantclient-sqlplus/pkg-plist  2007-02-18 18:17:50.000000000 +0100
+++ databases/linux-oracle-instantclient-sqlplus/pkg-plist  2011-10-21 17:42:08.480052878 +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
-@dirrm usr/lib/oracle/%%ORACLEVERSION%%/client/bin
 @dirrmtry usr/bin
-@exec %D/sbin/ldconfig
diff -ruN new/emulators/linux-f10-libaio/Makefile emulators/linux-f10-libaio/Makefile
--- new/emulators/linux-f10-libaio/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ emulators/linux-f10-libaio/Makefile 2011-12-23 21:15:05.494303948 +0100
@@ -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=    magik@roorback.net
+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 new/emulators/linux-f10-libaio/distinfo.i386 emulators/linux-f10-libaio/distinfo.i386
--- new/emulators/linux-f10-libaio/distinfo.i386    1970-01-01 01:00:00.000000000 +0100
+++ emulators/linux-f10-libaio/distinfo.i386    2011-12-23 19:19:19.794303632 +0100
@@ -0,0 +1,4 @@
+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
+SHA256 (rpm/i386/fedora/10/libaio-0.3.107-4.fc10.src.rpm) = 57dfdc58488ed84e1d4a85a73c91be9ba18809cee1b95df2f2c1f001f7bc420a
+SIZE (rpm/i386/fedora/10/libaio-0.3.107-4.fc10.src.rpm) = 61893
diff -ruN new/emulators/linux-f10-libaio/pkg-descr emulators/linux-f10-libaio/pkg-descr
--- new/emulators/linux-f10-libaio/pkg-descr    1970-01-01 01:00:00.000000000 +0100
+++ emulators/linux-f10-libaio/pkg-descr    2011-06-26 21:39:51.000000000 +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 new/emulators/linux-f10-libaio/pkg-plist emulators/linux-f10-libaio/pkg-plist
--- new/emulators/linux-f10-libaio/pkg-plist    1970-01-01 01:00:00.000000000 +0100
+++ emulators/linux-f10-libaio/pkg-plist    2011-06-26 21:39:51.000000000 +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
+@dirrm usr/share/doc/libaio-%%VERSION%%

--------------090906090908080404040002--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4EF4F9CB.90900>