Attachment 53792 Details for Bug 81382 – file.diff

[patch] file.diff

file.diff (text/plain), 3.75 KB, created by Simun Mikecin on 2005-05-23 08:00:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simun Mikecin

Created: 2005-05-23 08:00:20 UTC

Size: 3.75 KB

patch

obsolete

>--- lang/php5/Makefile.ext.orig	Wed May 18 09:56:15 2005
>+++ lang/php5/Makefile.ext	Sun May 22 00:10:02 2005
>@@ -237,6 +237,7 @@
> .endif
> 
> .if ${PHP_MODNAME} == "oracle"
>+USE_REINPLACE=	yes
> BUILD_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
> RUN_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
> 
>@@ -481,4 +482,16 @@
> .if ${PHP_MODNAME} == "zlib"
> post-extract:
> 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
>+.endif
>+
>+.if ${PHP_MODNAME} == "oracle"
>+post-patch:
>+	@${REINPLACE_CMD} -e "s|LIBORACLE7_DIR|${WRKDIR}|" ${WRKSRC}/config.m4
>+
>+pre-configure:
>+	@cd ${WRKDIR}; \
>+	for lib in c3v6 client common core3 epc generic ncr nlsrtl3 sqlnet wrap; do \
>+		/usr/bin/ar x ${LOCALBASE}/oracle7/lib/lib$${lib}.a; \
>+	done; \
>+	/usr/bin/ar rcs liboracle7.a *.o
> .endif
>--- databases/php5-oracle/files/patch-config.m4.orig	Mon Jul 19 10:57:06 2004
>+++ databases/php5-oracle/files/patch-config.m4	Sat May 21 23:25:34 2005
>@@ -1,8 +1,8 @@
>---- config.m4.orig	Thu Jul  8 10:22:35 2004
>-+++ config.m4	Thu Jul  8 10:30:31 2004
>+--- config.m4.orig	Thu Dec 30 08:04:11 2004
>++++ config.m4	Sat May 21 23:06:02 2005
> @@ -4,8 +4,8 @@
>  
>- AC_DEFUN(AC_ORACLE_VERSION,[
>+ AC_DEFUN([AC_ORACLE_VERSION],[
>    AC_MSG_CHECKING([Oracle version])
> -  if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
> -  	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
>@@ -11,11 +11,30 @@
>  	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
>    elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
>      ORACLE_VERSION=9.0
>-@@ -113,6 +113,7 @@
>+@@ -112,25 +112,7 @@
>+ 	  if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then
>  	    PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>  	  else
>- 	    PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>-+	    PHP_ADD_LIBRARY_WITH_PATH(wrap, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>- 	    PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>- 	    PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>- 	    PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(epc, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>+-	    PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
>++	    PHP_ADD_LIBRARY_WITH_PATH(oracle7, LIBORACLE7_DIR, ORACLE_SHARED_LIBADD)
>+ 	  fi
>+ 	  ;;
>+

Actions: View | Diff

Attachments on bug 81382: 53792