Attachment 91170 Details for Bug 128468 – file.diff

[patch] file.diff

file.diff (text/plain), 3.83 KB, created by Scot Hetzel on 2008-10-29 23:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scot Hetzel

Created: 2008-10-29 23:30:01 UTC

Size: 3.83 KB

patch

obsolete

>Index: databases/php5-dba/files/patch-config.m4
>===================================================================
>RCS file: /home/ncvs/ports/databases/php5-dba/files/patch-config.m4,v
>retrieving revision 1.7
>diff -u -r1.7 patch-config.m4
>--- databases/php5-dba/files/patch-config.m4	2 May 2008 08:52:07 -0000	1.7
>+++ databases/php5-dba/files/patch-config.m4	29 Oct 2008 17:03:34 -0000
>@@ -1,33 +1,23 @@
>---- config.m4.orig	2007-12-06 15:17:43.000000000 +0100
>-+++ config.m4	2008-05-02 10:05:06.000000000 +0200
>-@@ -280,6 +280,30 @@
>+--- config.m4.orig	2007-12-06 08:17:43.000000000 -0600
>++++ config.m4	2008-10-29 11:58:50.000000000 -0500
>+@@ -276,9 +276,9 @@
>+   PHP_DBA_STD_BEGIN
>+   dbdp="/usr/local/BerkeleyDB.4."
>+   for i in $PHP_DB4 ${dbdp}6 ${dbdp}5 ${dbdp}4 ${dbdp}3  ${dbdp}2 ${dbdp}1 ${dbdp}0 /usr/local /usr; do
>+-    if test -f "$i/db4/db.h"; then
>++    if test -f "BDB_INCLUDE_DIR/db.h"; then
>        THIS_PREFIX=$i
>-       THIS_INCLUDE=$i/db4/db.h
>+-      THIS_INCLUDE=$i/db4/db.h
>++      THIS_INCLUDE=BDB_INCLUDE_DIR/db.h
>        break
>-+    elif test -f "$i/include/db46/db.h"; then
>-+      THIS_PREFIX=$i
>-+      THIS_INCLUDE=$i/include/db46/db.h
>-+      break
>-+    elif test -f "$i/include/db45/db.h"; then
>-+      THIS_PREFIX=$i
>-+      THIS_INCLUDE=$i/include/db45/db.h
>-+      break
>-+    elif test -f "$i/include/db44/db.h"; then
>-+      THIS_PREFIX=$i
>-+      THIS_INCLUDE=$i/include/db44/db.h
>-+      break
>-+    elif test -f "$i/include/db43/db.h"; then
>-+      THIS_PREFIX=$i
>-+      THIS_INCLUDE=$i/include/db43/db.h
>-+      break
>-+    elif test -f "$i/include/db42/db.h"; then
>-+      THIS_PREFIX=$i
>-+      THIS_INCLUDE=$i/include/db42/db.h
>-+      break
>-+    elif test -f "$i/include/db41/db.h"; then
>-+      THIS_PREFIX=$i
>-+      THIS_INCLUDE=$i/include/db41/db.h
>-+      break
>      elif test -f "$i/include/db4.6/db.h"; then
>        THIS_PREFIX=$i
>-       THIS_INCLUDE=$i/include/db4.6/db.h
>+@@ -306,7 +306,7 @@
>+       break
>+     fi
>+   done
>+-  PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
>++  PHP_DBA_DB_CHECK(4, BDB_LIB_NAME, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
>+ fi
>+ PHP_DBA_STD_RESULT(db4,Berkeley DB4)
>+ 
>Index: lang/php5/Makefile.ext
>===================================================================
>RCS file: /home/ncvs/ports/lang/php5/Makefile.ext,v
>retrieving revision 1.56
>diff -u -r1.56 Makefile.ext
>--- lang/php5/Makefile.ext	23 Sep 2008 05:41:43 -0000	1.56
>+++ lang/php5/Makefile.ext	29 Oct 2008 16:53:33 -0000
>@@ -310,7 +310,7 @@
> 
> USE_PHP=	pdo
> USE_PHP_BUILD=	yes
>-PHP_HEADER_DIRS=sqlite/src
>+#PHP_HEADER_DIRS=sqlite/src
> .endif
> 
> 
>@@ -502,32 +502,10 @@
> CONFIGURE_ARGS+=--without-cdb
> .	endif
> .	if defined(WITH_DB4)
>-WITH_DB4_VER?=	46
>-.		if ${WITH_DB4_VER} == 45
>-LIB_DEPENDS+=	db-4.5.0:${PORTSDIR}/databases/db45
>-.		else
>-.		if ${WITH_DB4_VER} == 44
>-LIB_DEPENDS+=	db-4.4.0:${PORTSDIR}/databases/db44
>-.		else
>-.		if ${WITH_DB4_VER} == 43
>-LIB_DEPENDS+=	db-4.3.0:${PORTSDIR}/databases/db43
>-.		else
>-.		if ${WITH_DB4_VER} == 42
>-LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
>-.		else
>-.		if ${WITH_DB4_VER} == 41
>-LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
>-.		else
>-.		if ${WITH_DB4_VER} == 4
>-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
>-.		else
>-LIB_DEPENDS+=	db-4.6.0:${PORTSDIR}/databases/db46
>-.		endif
>-.		endif
>-.		endif
>-.		endif
>-.		endif
>-.		endif
>+USE_BDB=		yes
>+INVALID_BDB_VER=	2 3
>+OBSOLETE_BDB_VAR=	WITH_DB4_VER
>+#WITH_BDB_VER?=		46+
> CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
> .	endif
> .	if defined(WITH_GDBM)
>@@ -546,6 +524,13 @@
> .	if defined(WITHOUT_FLATFILE)
> CONFIGURE_ARGS+=--without-flatfile
> .	endif
>+
>+. if defined(WITH_DB4)
>+post-patch:
>+	${REINPLACE_CMD} -e "s!BDB_LIB_NAME!${BDB_LIB_NAME}!g" \
>+		-e "s!BDB_INCLUDE_DIR!${BDB_INCLUDE_DIR:S,^${PREFIX}/,,}!g" \
>+		${WRKSRC}/config.m4
>+. endif
> .endif
> 
> .if ${PHP_MODNAME} == "gd"

Actions: View | Diff

Attachments on bug 128468: 91170