5 files changed, 83 insertions, 22 deletions

diff --git a/databases/php4-oracle/files/patch-config.m4 b/databases/php4-oracle/files/patch-config.m4
index 550d803dd3d7..9f1d12d59af8 100644
--- a/databases/php4-oracle/files/patch-config.m4
+++ b/databases/php4-oracle/files/patch-config.m4
@@ -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	Tue Jun 14 15:48:05 2005
++++ config.m4	Tue Jun 14 15:48:08 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(oracle, ., ORACLE_SHARED_LIBADD)
+ 	  fi
+ 	  ;;
+ 	  
diff --git a/databases/php5-oracle/files/patch-config.m4 b/databases/php5-oracle/files/patch-config.m4
index 550d803dd3d7..9f1d12d59af8 100644
--- a/databases/php5-oracle/files/patch-config.m4
+++ b/databases/php5-oracle/files/patch-config.m4
@@ -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	Tue Jun 14 15:48:05 2005
++++ config.m4	Tue Jun 14 15:48:08 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(oracle, ., ORACLE_SHARED_LIBADD)
+ 	  fi
+ 	  ;;
+ 	  
diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext
index 002a91252647..75c153c20bee 100644
--- a/lang/php4/Makefile.ext
+++ b/lang/php4/Makefile.ext
@@ -32,7 +32,6 @@ CONFIGURE_ARGS+=--enable-calendar
 
 .if ${PHP_MODNAME} == "crack"
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
-RUN_DEPENDS+=	${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
 
 CONFIGURE_ARGS+=--with-crack=${LOCALBASE}
 .endif
@@ -242,7 +241,6 @@ USE_OPENSSL=	yes
 
 .if ${PHP_MODNAME} == "oracle"
 BUILD_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
-RUN_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
 
 CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7
 .endif
@@ -450,6 +448,15 @@ post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
+.if ${PHP_MODNAME} == "oracle"
+post-patch:
+	@cd ${WRKSRC}; \
+	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 liboracle.a *.o
+.endif
+
 .if ${PHP_MODNAME} == "snmp"
 .	if defined(WITH_SNMP4) || exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=   snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index d627640750fe..c3774d39f8fb 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -238,7 +238,6 @@ USE_OPENSSL=	yes
 
 .if ${PHP_MODNAME} == "oracle"
 BUILD_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
-RUN_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
 
 CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7
 .endif
@@ -458,6 +457,15 @@ post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
+.if ${PHP_MODNAME} == "oracle"
+post-patch:
+	@cd ${WRKSRC}; \
+	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 liboracle.a *.o
+.endif
+
 .if ${PHP_MODNAME} == "snmp"
 .	if defined(WITH_SNMP4) || exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=   snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index d627640750fe..c3774d39f8fb 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -238,7 +238,6 @@ USE_OPENSSL=	yes
 
 .if ${PHP_MODNAME} == "oracle"
 BUILD_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
-RUN_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
 
 CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7
 .endif
@@ -458,6 +457,15 @@ post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
+.if ${PHP_MODNAME} == "oracle"
+post-patch:
+	@cd ${WRKSRC}; \
+	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 liboracle.a *.o
+.endif
+
 .if ${PHP_MODNAME} == "snmp"
 .	if defined(WITH_SNMP4) || exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=   snmp.4:${PORTSDIR}/net-mgmt/net-snmp4