Attachment 147141 Details for Bug 193320 – diff h

[patch] diff h

diff (text/plain), 7.94 KB, created by papowell on 2014-09-09 20:28:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: papowell

Created: 2014-09-09 20:28:32 UTC

Size: 7.94 KB

patch

obsolete

>diff -ur linux-oracle-instantclient-sdk/Makefile /tmp/linux-oracle-instantclient-sdk/Makefile
>--- linux-oracle-instantclient-sdk/Makefile	2014-09-09 13:24:46.000000000 -0700
>+++ /tmp/linux-oracle-instantclient-sdk/Makefile	2014-09-02 08:06:36.000000000 -0700
>@@ -3,7 +3,6 @@
> 
> PORTNAME=		instantclient
> PORTVERSION=		${ORACLEVERSION}.${DISTDATE}
>-PORTEPOCH=  1
> CATEGORIES=		databases
> MASTER_SITES=		#http://www.oracle.com/technology/software/tech/oci/instantclient/
> PKGNAMEPREFIX=		linux-oracle-
>@@ -16,8 +15,7 @@
> 
> RUN_DEPENDS=		${LINUXBASE}/usr/lib/oracle/${ORACLEVERSION}/client/lib/libocci.so.10.1:${PORTSDIR}/databases/linux-oracle-instantclient-basic
> 
>-NOFETCHFILES= ${DISTNAME}${EXTRACT_SUFX}
>-ONLY_FOR_ARCHS=		i386 amd64
>+ONLY_FOR_ARCHS=		i386	# amd64(not yet on own)
> NO_BUILD=		yes
> DISTINFO_FILE=		${MASTERDIR}/distinfo.${ARCH}
> 
>@@ -66,28 +64,43 @@
> 
> WRKSRC=			${WRKDIR}/instantclient_10_2/sdk
> 
>-INSTLIBSDIR=		${STAGEDIR}${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib
>-INSTINCSDIR=		${STAGEDIR}${PREFIX}/usr/include/oracle/${ORACLEVERSION}/client
>-INSTDEMODIR=		${STAGEDIR}${PREFIX}/usr/share/oracle/${ORACLEVERSION}/client
>+INSTLIBSDIR=		${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/client/lib
>+INSTINCSDIR=		${PREFIX}/usr/include/oracle/${ORACLEVERSION}/client
>+INSTDEMODIR=		${PREFIX}/usr/share/oracle/${ORACLEVERSION}/client
> 
> PLIST_SUB=		PORTVERSION=${PORTVERSION}
> 
>+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})
>-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}/
>+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
> .endif
> 
> do-install:
>-			${MKDIR} -m 0755 ${INSTINCSDIR} ${INSTDEMODIR} ${INSTLIBSDIR}
>+			${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}
>diff -ur linux-oracle-instantclient-sdk/distinfo.amd64 /tmp/linux-oracle-instantclient-sdk/distinfo.amd64
>--- linux-oracle-instantclient-sdk/distinfo.amd64	2014-09-09 13:25:28.000000000 -0700
>+++ /tmp/linux-oracle-instantclient-sdk/distinfo.amd64	2014-01-22 07:30:13.000000000 -0800
>@@ -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-x86-64-10.2.0.3-20070103.zip) = d9da1494a9d19e96bff79c3ff77d079633d18c7d9b462a37eacc9a2a40641912
>+SIZE (oracle/instantclient-sdk-linux-x86-64-10.2.0.3-20070103.zip) = 603137
>Only in /tmp/linux-oracle-instantclient-sdk: distinfo.linux32
>diff -ur linux-oracle-instantclient-sdk/pkg-plist /tmp/linux-oracle-instantclient-sdk/pkg-plist
>--- linux-oracle-instantclient-sdk/pkg-plist	2014-09-02 08:41:47.000000000 -0700
>+++ /tmp/linux-oracle-instantclient-sdk/pkg-plist	2014-09-02 08:40:51.000000000 -0700
>@@ -1,42 +1,42 @@
>-usr/include/oracle/10.2.0.3/client/nzerror.h
>-usr/include/oracle/10.2.0.3/client/nzt.h
>-usr/include/oracle/10.2.0.3/client/occi.h
>-usr/include/oracle/10.2.0.3/client/occiAQ.h
>-usr/include/oracle/10.2.0.3/client/occiCommon.h
>-usr/include/oracle/10.2.0.3/client/occiControl.h
>-usr/include/oracle/10.2.0.3/client/occiData.h
>-usr/include/oracle/10.2.0.3/client/occiObjects.h
>-usr/include/oracle/10.2.0.3/client/oci.h
>-usr/include/oracle/10.2.0.3/client/oci1.h
>-usr/include/oracle/10.2.0.3/client/oci8dp.h
>-usr/include/oracle/10.2.0.3/client/ociap.h
>-usr/include/oracle/10.2.0.3/client/ociapr.h
>-usr/include/oracle/10.2.0.3/client/ocidef.h
>-usr/include/oracle/10.2.0.3/client/ocidem.h
>-usr/include/oracle/10.2.0.3/client/ocidfn.h
>-usr/include/oracle/10.2.0.3/client/ociextp.h
>-usr/include/oracle/10.2.0.3/client/ocikpr.h
>-usr/include/oracle/10.2.0.3/client/ocixmldb.h
>-usr/include/oracle/10.2.0.3/client/odci.h
>-usr/include/oracle/10.2.0.3/client/oratypes.h
>-usr/include/oracle/10.2.0.3/client/ori.h
>-usr/include/oracle/10.2.0.3/client/orid.h
>-usr/include/oracle/10.2.0.3/client/orl.h
>-usr/include/oracle/10.2.0.3/client/oro.h
>-usr/include/oracle/10.2.0.3/client/ort.h
>-usr/include/oracle/10.2.0.3/client/xa.h
>-usr/lib/oracle/10.2.0.3/client/lib/libclntsh.so
>-usr/lib/oracle/10.2.0.3/client/lib/libocci.so
>-usr/share/oracle/10.2.0.3/client/cdemo81.c
>-usr/share/oracle/10.2.0.3/client/demo.mk
>-usr/share/oracle/10.2.0.3/client/occidemo.sql
>-usr/share/oracle/10.2.0.3/client/occidemod.sql
>-usr/share/oracle/10.2.0.3/client/occidml.cpp
>-usr/share/oracle/10.2.0.3/client/occiobj.cpp
>-usr/share/oracle/10.2.0.3/client/occiobj.typ
>-@dirrmtry usr/include/oracle/10.2.0.3/client
>-@dirrmtry usr/include/oracle/10.2.0.3
>-@dirrmtry usr/include/oracle
>-@dirrmtry usr/share/oracle/10.2.0.3/client
>-@dirrmtry usr/share/oracle/10.2.0.3
>-@dirrmtry usr/share/oracle
>+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/include/oracle/%%ORACLEVERSION%%/client/nzerror.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/nzt.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occi.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occiAQ.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occiCommon.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occiControl.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occiData.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/occiObjects.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/oci.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/oci1.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/oci8dp.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ociap.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ociapr.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ocidef.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ocidem.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ocidfn.h
>+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/odci.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/oratypes.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ori.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/orid.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/orl.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/oro.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/ort.h
>+usr/include/oracle/%%ORACLEVERSION%%/client/xa.h
>+@dirrm usr/include/oracle/%%ORACLEVERSION%%/client
>+@dirrm usr/include/oracle/%%ORACLEVERSION%%
>+@dirrm usr/include/oracle
>+@dirrm usr/share/oracle/%%ORACLEVERSION%%/client
>+@dirrm usr/share/oracle/%%ORACLEVERSION%%
>+@dirrm usr/share/oracle
>+@dirrmtry usr/include
>+@dirrmtry usr/share

Actions: View | Diff

Attachments on bug 193320: 146810 | 146951 | 147141