svn commit: r362582 - head/databases/linux-oracle-instantclient-sqlplus
Antoine Brodin
antoine at FreeBSD.org
Tue Jul 22 21:15:22 UTC 2014
On Tue, Jul 22, 2014 at 11:09 PM, Rene Ladan <rene at freebsd.org> wrote:
> Author: rene
> Date: Tue Jul 22 21:09:51 2014
> New Revision: 362582
> URL: http://svnweb.freebsd.org/changeset/ports/362582
> QAT: https://qat.redports.org/buildarchive/r362582/
>
> Log:
> - Stage support
> - Enable usage on amd64
> - Clean up Makefile (especially IGNORE message)
>
> PR: 191993
> Submitted by: papowell at astart.com
>
> Modified:
> head/databases/linux-oracle-instantclient-sqlplus/Makefile
> head/databases/linux-oracle-instantclient-sqlplus/pkg-plist
>
> Modified: head/databases/linux-oracle-instantclient-sqlplus/Makefile
> ==============================================================================
> --- head/databases/linux-oracle-instantclient-sqlplus/Makefile Tue Jul 22 21:08:01 2014 (r362581)
> +++ head/databases/linux-oracle-instantclient-sqlplus/Makefile Tue Jul 22 21:09:51 2014 (r362582)
> @@ -3,7 +3,7 @@
>
> PORTNAME= instantclient
> PORTVERSION= ${ORACLEVERSION}.${DISTDATE}
> -PORTREVISION= 1
> +PORTREVISION= 2
> CATEGORIES= databases
> MASTER_SITES= #http://www.oracle.com/technology/software/tech/oci/instantclient/
> PKGNAMEPREFIX= linux-oracle-
> @@ -12,17 +12,16 @@ DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-$
> DIST_SUBDIR= oracle
>
> MAINTAINER= ports at FreeBSD.org
> -COMMENT= Oracle 10 InstantClient SQLPlus. Works with Oracle RDBMS 8.1.2+
> +COMMENT= Oracle 10 32 Bit Linux InstantClient SQLPlus for RDBMS 8.1.2+
>
> -RUN_DEPENDS= ${LINUXBASE}/usr/lib/oracle/${ORACLEVERSION}/client/lib/libocci.so.10.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}
> +DISTINFO_FILE= ${MASTERDIR}/distinfo.i386
>
> RESTRICTED= Packaging prohibited by Oracle license
>
> USES= zip
> +USE_LINUX= yes
> USE_LINUX_PREFIX= yes
>
> ORACLEVERSION= 10.2.0.3
> @@ -35,50 +34,35 @@ LIBS_LIST= glogin.sql \
>
> 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}
Looks wrong again, you should have a QA error looking like
Error: 'libdata/ldconfig/linux-oracle-instantclient' is referring to
/path/to/work/stage
>
> 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}
> - ${LN} -s ../lib/oracle/${ORACLEVERSION}/client/bin/sqlplus ${PREFIX}/usr/bin/sqlplus
> + @${MKDIR} -m 0755 ${INSTBINSDIR}
> + @${MKDIR} -m 0755 ${INSTLIBSDIR}
> .for i in ${BINS_LIST}
> - ${INSTALL_SCRIPT} ${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
> - ${PREFIX}/sbin/ldconfig
>
> .include <bsd.port.post.mk>
>
> Modified: head/databases/linux-oracle-instantclient-sqlplus/pkg-plist
> ==============================================================================
> --- head/databases/linux-oracle-instantclient-sqlplus/pkg-plist Tue Jul 22 21:08:01 2014 (r362581)
> +++ head/databases/linux-oracle-instantclient-sqlplus/pkg-plist Tue Jul 22 21:09:51 2014 (r362582)
> @@ -1,8 +1,8 @@
> 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
> - at dirrm usr/lib/oracle/%%ORACLEVERSION%%/client/bin
> - at dirrmtry usr/bin
> - at exec %D/sbin/ldconfig
> + at dirrmtry usr/lib/oracle/%%ORACLEVERSION%%/client/lib
> + at dirrmtry usr/lib/oracle/%%ORACLEVERSION%%/client
> + at dirrmtry usr/lib/oracle/%%ORACLEVERSION%%
> + at dirrmtry usr/lib/oracle
>
More information about the svn-ports-head
mailing list