Date: Sun, 23 Nov 2014 16:55:32 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373168 - in head/databases: linux-oracle-instantclient-basic linux-oracle-instantclient-sdk linux-oracle-instantclient-sqlplus Message-ID: <201411231655.sANGtWFY065087@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sun Nov 23 16:55:31 2014 New Revision: 373168 URL: https://svnweb.freebsd.org/changeset/ports/373168 QAT: https://qat.redports.org/buildarchive/r373168/ Log: databases/linux-oracle-instantclient-*: fix download link, take maintainer - The download link given in the IGNORE message was out-dated. - ldconfig was not invoked so the shared libraries were not found - taking maintainer Modified: head/databases/linux-oracle-instantclient-basic/Makefile head/databases/linux-oracle-instantclient-basic/pkg-plist head/databases/linux-oracle-instantclient-sdk/Makefile head/databases/linux-oracle-instantclient-sqlplus/Makefile Modified: head/databases/linux-oracle-instantclient-basic/Makefile ============================================================================== --- head/databases/linux-oracle-instantclient-basic/Makefile Sun Nov 23 16:47:53 2014 (r373167) +++ head/databases/linux-oracle-instantclient-basic/Makefile Sun Nov 23 16:55:31 2014 (r373168) @@ -3,7 +3,7 @@ PORTNAME= instantclient PORTVERSION= ${ORACLEVERSION}.${DISTDATE} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases MASTER_SITES= #http://www.oracle.com/technology/software/tech/oci/instantclient/ PKGNAMEPREFIX= linux-oracle- @@ -11,7 +11,7 @@ PKGNAMESUFFIX= -basic DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${ORACLEVERSION}-${DISTDATE} DIST_SUBDIR= oracle -MAINTAINER= ports@FreeBSD.org +MAINTAINER= pi@FreeBSD.org COMMENT= Oracle 10 32Bit Linux InstantClient basics for RDBMS 8.1.2+ ONLY_FOR_ARCHS= i386 amd64 @@ -40,7 +40,7 @@ WRKSRC= ${WRKDIR}/instantclient_10_2 INSTBINSDIR= ${STAGEDIR}${PREFIX}/usr/bin INSTLIBSDIR= ${STAGEDIR}${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib -USE_LDCONFIG= ${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib +USE_LDCONFIG= yes PLIST_SUB= ORACLEVERSION=${ORACLEVERSION} @@ -48,6 +48,7 @@ PLIST_SUB= ORACLEVERSION=${ORACLEVERSIO #.if ${ARCH} == "i386" LINUXARCH= linux32 +LINUXXVAL= x86 DISTDATE= 20061115 #.elif ${ARCH} == "amd64" #LINUXARCH= linux-x86-64 @@ -55,12 +56,19 @@ DISTDATE= 20061115 #.endif .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/database/features/instant-client/index-097480.html\ + , follow the link for Linux ${LINUXXVAL}, download ${DISTFILES}\ + and place it in ${DISTDIR}/${DIST_SUBDIR}/ .endif do-install: - @${MKDIR} -m 0755 ${INSTBINSDIR} - @${MKDIR} -m 0755 ${INSTLIBSDIR} + ${MKDIR} -m 0755 ${INSTBINSDIR} + ${MKDIR} -m 0755 ${INSTLIBSDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ld.so.conf.d + ${ECHO} /usr/lib/oracle/${ORACLEVERSION}/client/lib > ${STAGEDIR}${PREFIX}/etc/ld.so.conf.d/oracle10.conf .for i in ${BINS_LIST} ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${INSTBINSDIR}/${i} .endfor Modified: head/databases/linux-oracle-instantclient-basic/pkg-plist ============================================================================== --- head/databases/linux-oracle-instantclient-basic/pkg-plist Sun Nov 23 16:47:53 2014 (r373167) +++ head/databases/linux-oracle-instantclient-basic/pkg-plist Sun Nov 23 16:55:31 2014 (r373168) @@ -1,3 +1,4 @@ +etc/ld.so.conf.d/oracle10.conf usr/bin/genezi usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libclntsh.so.10.1 usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libnnz10.so Modified: head/databases/linux-oracle-instantclient-sdk/Makefile ============================================================================== --- head/databases/linux-oracle-instantclient-sdk/Makefile Sun Nov 23 16:47:53 2014 (r373167) +++ head/databases/linux-oracle-instantclient-sdk/Makefile Sun Nov 23 16:55:31 2014 (r373168) @@ -3,7 +3,7 @@ PORTNAME= instantclient PORTVERSION= ${ORACLEVERSION}.${DISTDATE} -PORTEPOCH= 1 +PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= #http://www.oracle.com/technology/software/tech/oci/instantclient/ PKGNAMEPREFIX= linux-oracle- @@ -11,7 +11,7 @@ PKGNAMESUFFIX= -sdk DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${ORACLEVERSION}-${DISTDATE} DIST_SUBDIR= oracle -MAINTAINER= ports@FreeBSD.org +MAINTAINER= pi@FreeBSD.org COMMENT= Oracle 10 InstantClient SDK. Works with Oracle RDBMS 8.1.2+ RUN_DEPENDS= ${LINUXBASE}/usr/lib/oracle/${ORACLEVERSION}/client/lib/libocci.so.10.1:${PORTSDIR}/databases/linux-oracle-instantclient-basic @@ -75,15 +75,16 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} .include <bsd.port.pre.mk> LINUXARCH= linux32 +LINUXXVAL= x86 DISTDATE= 20061115 .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/database/features/instant-client/index-097480.html\ + , follow the link for Linux ${LINUXXVAL}, download ${DISTFILES}\ + and place it in ${DISTDIR}/${DIST_SUBDIR}/ .endif do-install: Modified: head/databases/linux-oracle-instantclient-sqlplus/Makefile ============================================================================== --- head/databases/linux-oracle-instantclient-sqlplus/Makefile Sun Nov 23 16:47:53 2014 (r373167) +++ head/databases/linux-oracle-instantclient-sqlplus/Makefile Sun Nov 23 16:55:31 2014 (r373168) @@ -11,7 +11,7 @@ PKGNAMESUFFIX= -sqlplus DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${ORACLEVERSION}-${DISTDATE} DIST_SUBDIR= oracle -MAINTAINER= ports@FreeBSD.org +MAINTAINER= pi@FreeBSD.org COMMENT= Oracle 10 32 Bit Linux InstantClient SQLPlus for RDBMS 8.1.2+ ONLY_FOR_ARCHS= i386 amd64 @@ -20,8 +20,11 @@ DISTINFO_FILE= ${MASTERDIR}/distinfo.i3 RESTRICTED= Packaging prohibited by Oracle license +# base +RUN_DEPENDS+= linux-oracle-instantclient-basic>0:${PORTSDIR}/databases/linux-oracle-instantclient-basic + USES= zip -USE_LINUX= yes +USE_LINUX= c6 USE_LINUX_PREFIX= yes ORACLEVERSION= 10.2.0.3 @@ -37,14 +40,17 @@ WRKSRC= ${WRKDIR}/instantclient_10_2 INSTBINSDIR= ${STAGEDIR}${PREFIX}/usr/bin INSTLIBSDIR= ${STAGEDIR}${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib -USE_LDCONFIG= ${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib +#USE_LDCONFIG= ${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib +USE_LDCONFIG= yes PLIST_SUB= ORACLEVERSION=${ORACLEVERSION} .include <bsd.port.pre.mk> +#LINUXXVAL= x86-64 #.if ${ARCH} == "i386" LINUXARCH= linux32 +LINUXXVAL= x86 DISTDATE= 20061115 #.elif ${ARCH} == "amd64" #LINUXARCH= linux-x86-64 @@ -52,12 +58,17 @@ DISTDATE= 20061115 #.endif .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/database/features/instant-client/index-097480.html\ + , follow the link for Linux ${LINUXXVAL} and ${DISTFILES}\ + and place them in ${DISTDIR}/${DIST_SUBDIR}/ .endif do-install: - @${MKDIR} -m 0755 ${INSTBINSDIR} - @${MKDIR} -m 0755 ${INSTLIBSDIR} + ${MKDIR} -m 0755 ${INSTBINSDIR} + ${MKDIR} -m 0755 ${INSTLIBSDIR} .for i in ${BINS_LIST} ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${INSTBINSDIR}/${i} .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411231655.sANGtWFY065087>