Date: Tue, 22 Jul 2014 20:51:49 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362578 - head/databases/linux-oracle-instantclient-basic Message-ID: <201407222051.s6MKpn4o097250@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Tue Jul 22 20:51:49 2014 New Revision: 362578 URL: http://svnweb.freebsd.org/changeset/ports/362578 QAT: https://qat.redports.org/buildarchive/r362578/ Log: - Stage support - Enable usage on amd64 - Clean up Makefile (especially the IGNORE message) PR: 191993 Submitted by: papowell@astart.com Modified: head/databases/linux-oracle-instantclient-basic/Makefile head/databases/linux-oracle-instantclient-basic/pkg-plist Modified: head/databases/linux-oracle-instantclient-basic/Makefile ============================================================================== --- head/databases/linux-oracle-instantclient-basic/Makefile Tue Jul 22 20:27:54 2014 (r362577) +++ head/databases/linux-oracle-instantclient-basic/Makefile Tue Jul 22 20:51:49 2014 (r362578) @@ -3,7 +3,7 @@ PORTNAME= instantclient PORTVERSION= ${ORACLEVERSION}.${DISTDATE} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= #http://www.oracle.com/technology/software/tech/oci/instantclient/ PKGNAMEPREFIX= linux-oracle- @@ -12,11 +12,11 @@ DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-$ DIST_SUBDIR= oracle MAINTAINER= ports@FreeBSD.org -COMMENT= Oracle 10 InstantClient basics. Works with Oracle RDBMS 8.1.2+ +COMMENT= Oracle 10 32Bit Linux InstantClient basics for RDBMS 8.1.2+ -ONLY_FOR_ARCHS= i386 # amd64(not yet on own) +ONLY_FOR_ARCHS= i386 amd64 NO_BUILD= yes -DISTINFO_FILE= ${MASTERDIR}/distinfo.${ARCH} +DISTINFO_FILE= ${MASTERDIR}/distinfo.i386 RESTRICTED= Packaging prohibited by Oracle license @@ -37,50 +37,35 @@ LIBS_LIST= libclntsh.so.10.1 \ WRKSRC= ${WRKDIR}/instantclient_10_2 -INSTBINSDIR= ${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/bin -INSTLIBSDIR= ${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib +INSTBINSDIR= ${STAGEDIR}${PREFIX}/usr/bin +INSTLIBSDIR= ${STAGEDIR}${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib + +USE_LDCONFIG=${INSTLIBSDIR} PLIST_SUB= ORACLEVERSION=${ORACLEVERSION} -NO_STAGE= yes .include <bsd.port.pre.mk> -.if ${ARCH} == "i386" +#.if ${ARCH} == "i386" LINUXARCH= linux32 DISTDATE= 20061115 -.elif ${ARCH} == "amd64" -LINUXARCH= linux-x86-64 -DISTDATE= 20070103 -.endif +#.elif ${ARCH} == "amd64" +#LINUXARCH= linux-x86-64 +#DISTDATE= 20070103 +#.endif .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}) -ECHO_MSG= ${PRINTF} %b - -IGNORE+= \n\n-=< MARKED AS IGNORED: >=-\n -IGNORE+= \n -IGNORE+= Due to Oracle license restrictions, you must fetch the source \n -IGNORE+= distribution manually. Please access \n -IGNORE+= http://www.oracle.com/technology/software/tech/oci/instantclient/index.html \n -IGNORE+= with a web browser and follow the link for the \n -IGNORE+= "${DISTFILES}". \n -IGNORE+= You will be required to register and log in, \n -IGNORE+= but you can create an account on that page. \n -IGNORE+= After registration and accepting the Oracle License, \n -IGNORE+= download the distribution file, \n ${DISTFILES}, \n -IGNORE+= into ${DISTDIR}/${DIST_SUBDIR}/ \n -IGNORE+= and then restart this installation\n\n +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}/ .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_DATA} ${WRKSRC}/${i} ${INSTBINSDIR}/${i} + ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${INSTBINSDIR}/${i} .endfor .for i in ${LIBS_LIST} - ${INSTALL_DATA} ${WRKSRC}/${i} ${INSTLIBSDIR}/${i} + ${INSTALL_DATA} ${WRKSRC}/${i} ${INSTLIBSDIR}/${i} .endfor - ${ECHO_CMD} "${INSTLIBSDIR:S,${PREFIX},,}" >> ${PREFIX}/etc/ld.so.conf - ${PREFIX}/sbin/ldconfig .include <bsd.port.post.mk> Modified: head/databases/linux-oracle-instantclient-basic/pkg-plist ============================================================================== --- head/databases/linux-oracle-instantclient-basic/pkg-plist Tue Jul 22 20:27:54 2014 (r362577) +++ head/databases/linux-oracle-instantclient-basic/pkg-plist Tue Jul 22 20:51:49 2014 (r362578) @@ -1,17 +1,11 @@ -usr/lib/oracle/%%ORACLEVERSION%%/client/bin/genezi +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 usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libociei.so usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocijdbc10.so usr/lib/oracle/%%ORACLEVERSION%%/client/lib/ojdbc14.jar -@dirrm usr/lib/oracle/%%ORACLEVERSION%%/client/bin -@dirrm usr/lib/oracle/%%ORACLEVERSION%%/client/lib -@dirrm usr/lib/oracle/%%ORACLEVERSION%%/client -@dirrm usr/lib/oracle/%%ORACLEVERSION%% -@dirrm usr/lib/oracle -@dirrmtry usr/lib -@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 +@dirrmtry usr/lib/oracle/%%ORACLEVERSION%%/client/lib +@dirrmtry usr/lib/oracle/%%ORACLEVERSION%%/client +@dirrmtry usr/lib/oracle/%%ORACLEVERSION%% +@dirrmtry usr/lib/oracle
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407222051.s6MKpn4o097250>