diff options
| author | jdolecek <jdolecek@pkgsrc.org> | 2003-11-29 12:12:10 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@pkgsrc.org> | 2003-11-29 12:12:10 +0000 |
| commit | aacea0e98d4f568023a334d7f1398e34c9f8bcf8 (patch) | |
| tree | f91c332fcd2cf3329f6fa2d6142a7ab716aedace | |
| parent | 26cdcc62c08de06def1ee01a23a0f2562671e233 (diff) | |
| download | pkgsrc-aacea0e98d4f568023a334d7f1398e34c9f8bcf8.tar.gz | |
apparently the local patch to add --with-expat-dir not needed, remove
it and switch to shared PHP4 distinfo
| -rw-r--r-- | textproc/php4-wddx/Makefile | 4 | ||||
| -rw-r--r-- | textproc/php4-wddx/distinfo | 5 | ||||
| -rw-r--r-- | textproc/php4-wddx/patches/patch-ab | 32 |
3 files changed, 1 insertions, 40 deletions
diff --git a/textproc/php4-wddx/Makefile b/textproc/php4-wddx/Makefile index 66d4b1e2077..6c2497ebbe7 100644 --- a/textproc/php4-wddx/Makefile +++ b/textproc/php4-wddx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/11/08 06:58:10 jdolecek Exp $ +# $NetBSD: Makefile,v 1.11 2003/11/29 12:12:10 jdolecek Exp $ MODNAME= wddx CATEGORIES+= textproc @@ -6,12 +6,10 @@ PKGREVISION= # empty COMMENT= PHP4 extension for WDDX support USE_BUILDLINK2= YES -DISTINFO_FILE= ${.CURDIR}/distinfo .include "../../www/php4/Makefile.module" CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_PREFIX.expat} -CONFIGURE_ARGS+= --with-expat-dir=shared,${BUILDLINK_PREFIX.expat} .include "../../textproc/expat/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/php4-wddx/distinfo b/textproc/php4-wddx/distinfo deleted file mode 100644 index 6f95adda495..00000000000 --- a/textproc/php4-wddx/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.8 2003/11/08 06:58:10 jdolecek Exp $ - -SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3 -Size (php-4.3.4.tar.bz2) = 3774324 bytes -SHA1 (patch-ab) = 5c89db466aeeb6986eee3269c36df47cf2372da1 diff --git a/textproc/php4-wddx/patches/patch-ab b/textproc/php4-wddx/patches/patch-ab deleted file mode 100644 index 1194c126c35..00000000000 --- a/textproc/php4-wddx/patches/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2003/08/31 19:56:01 jdolecek Exp $ - ---- config.m4.orig 2003-08-31 19:07:34.000000000 +0200 -+++ config.m4 2003-08-31 19:06:32.000000000 +0200 -@@ -5,6 +5,9 @@ - PHP_ARG_ENABLE(wddx,whether to enable WDDX support, - [ --enable-wddx Enable WDDX support.]) - -+PHP_ARG_WITH(expat-dir, libexpat dir for WDDX, -+[ --with-expat-dir=DIR libexpat dir for WDDX]) -+ - if test "$PHP_WDDX" != "no"; then - if test "$ext_shared" != "yes" && test "$enable_xml" = "no"; then - AC_MSG_WARN(Activating XML) -@@ -12,4 +15,17 @@ - fi - AC_DEFINE(HAVE_WDDX, 1, [ ]) - PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared) -+ -+ if test "$PHP_EXPAT_DIR" != "no"; then -+ if test -f $PHP_EXPAT_DIR/lib/libexpat.a -o -f $PHP_EXPAT_DIR/lib/libexpat.s?; then -+ AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) -+ PHP_ADD_LIBRARY_WITH_PATH(expat, $PHP_EXPAT_DIR/lib, WDDX_SHARED_LIBADD) -+ PHP_ADD_INCLUDE($PHP_EXPAT_DIR/include) -+ else -+ PHP_ADD_LIBRARY_WITH_PATH(xmlparse, $PHP_EXPAT_DIR/lib, WDDX_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(xmltok, $PHP_EXPAT_DIR/lib, WDDX_SHARED_LIBADD) -+ PHP_ADD_INCLUDE($PHP_EXPAT_DIR/include) -+ fi -+ fi -+ - fi |