From 3f697e029af48aacf82f75e2d94976f762ec622d 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
---
 graphics/php4-gd/Makefile | 27 +++++++++++++++------------
 graphics/php4-gd/distinfo |  6 ------
 2 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 graphics/php4-gd/distinfo

(limited to 'graphics')

diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile
index b28c2dd4b97..cd356c1387e 100644
--- a/graphics/php4-gd/Makefile
+++ b/graphics/php4-gd/Makefile
@@ -1,27 +1,30 @@
-# $NetBSD: Makefile,v 1.13 2003/06/23 10:01:34 adam Exp $
+# $NetBSD: Makefile,v 1.14 2003/08/31 19:55:46 jdolecek Exp $
 
 MODNAME=		gd
 CATEGORIES+=		graphics
-PKGREVISION=		1
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for GD graphics library
 
-PATCHFILES+=		php-4.2.3-gd-2.0.8.patch
-PATCH_DIST_STRIP=	-p3
-SITES_php-4.2.3-gd-2.0.8.patch=	http://www.boutell.com/gd/
-
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 
 .include "../../www/php4/Makefile.module"
 
-CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.gd}
-CONFIGURE_ARGS+=	--with-jpeg-dir=shared,${BUILDLINK_PREFIX.jpeg}
-CONFIGURE_ARGS+=	--with-png-dir=shared,${BUILDLINK_PREFIX.png}
-CONFIGURE_ARGS+=	--with-xpm-dir=shared,${BUILDLINK_PREFIX.xpm}
-CONFIGURE_ARGS+=	--with-ttf=shared,${BUILDLINK_PREFIX.freetype}
+CONFIGURE_ARGS+=	--with-${MODNAME}	# use bundled libgd
+CONFIGURE_ARGS+=	--with-jpeg-dir=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-png-dir=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-zlib-dir=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-xpm-dir=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-ttf=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--enable-${MODNAME}-native-ttf
+CONFIGURE_ARGS+=	--enable-${MODNAME}-jis-conv
 CONFIGURE_ARGS+=	--without-freetype-dir
 CONFIGURE_ARGS+=	--without-t1lib
 
-.include "../../graphics/gd/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php4-gd/distinfo b/graphics/php4-gd/distinfo
deleted file mode 100644
index 004485b1090..00000000000
--- a/graphics/php4-gd/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.7 2003/06/23 10:01:35 adam Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
-SHA1 (php-4.2.3-gd-2.0.8.patch) = 6c907c8e3ce5ad75845e25f5de8714d9a006a4bf
-Size (php-4.2.3-gd-2.0.8.patch) = 4439 bytes
-- 
cgit v1.2.3