From 7fee6bb1cf924b136f2dce03a46fbffcc762f626 Mon Sep 17 00:00:00 2001
From: jdolecek <jdolecek>
Date: Sun, 31 Aug 2003 19:55:21 +0000
Subject: Update PHP to final 4.3.3

Some highlights of changes since 4.2.3:
* PCRE updated to 4.3, GD to 2.0.15
* improved Apache2 support
* much improved stream & URL wrapper support, output compression support
* added CLI (Command Line Interface) SAPI
* debug_backtrace() backported from ZendEngine2
* faster build system
* huge number of other bug fixes and improvements

Packaging changes:
* 'pcre', 'xml', and 'session' modules folded back into main package -
  'pcre' and 'xml' is required by PEAR, and 'session' is just too essential
  to be separate
* 'gd' module now uses bundled PHP GD library, which is better integrated
* PHP modules use shared distinfo when possible to ease future PHP updates
* ${PREFIX}/bin/php is now CLI version, ${PREFIX}/libexec/cgi-big/php
  remains CGI version
---
 converters/php4-iconv/Makefile | 12 +++++++++---
 converters/php4-iconv/distinfo |  4 ----
 2 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 converters/php4-iconv/distinfo

(limited to 'converters')

diff --git a/converters/php4-iconv/Makefile b/converters/php4-iconv/Makefile
index 0dfb229e269..65a2b831b45 100644
--- a/converters/php4-iconv/Makefile
+++ b/converters/php4-iconv/Makefile
@@ -1,15 +1,21 @@
-# $NetBSD: Makefile,v 1.2 2003/07/13 13:50:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/08/31 19:55:26 jdolecek Exp $
 
 MODNAME=		iconv
 CATEGORIES+=		devel
-PKGREVISION=		1
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for character set conversion
 
 USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
-CONFIGURE_ARGS+=	--with-iconv=shared,${BUILDLINK_PREFIX.iconv}
+# this is necessary so that PHP would find either the libc iconv
+# or use the packaged iconv, as appropriate; using
+# --with-iconv=shared,${BUILDLINK_PREFIX.iconv} assumes libiconv exists
+# the PHP_ICONV in environment is to make configure find alternative
+# libiconv
+CONFIGURE_ARGS+=	--with-iconv
+CONFIGURE_ENV+=		PHP_ICONV=${BUILDLINK_PREFIX.iconv:Q}
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/php4-iconv/distinfo b/converters/php4-iconv/distinfo
deleted file mode 100644
index 74398e499c4..00000000000
--- a/converters/php4-iconv/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/02/13 19:11:52 jdolecek Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
-- 
cgit v1.2.3