[pkgsrc/trunk]: pkgsrc/graphics/php-gd graphics/gd is built against libpthrea...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/efd936cfdecd
branches:  trunk
changeset: 484057:efd936cfdecd
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Tue Nov 23 19:46:14 2004 +0000

description:
graphics/gd is built against libpthread, which causes PHP crashes
when the gd.so module is loaded into non-threaded base program
(Apache 1.x or CLI/CGI PHP). Avoid this by switching back to bundled
GD. XPM stays disabled.

Bump PKGREVISION

diffstat:

 graphics/php-gd/Makefile |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 055fd8172d74 -r efd936cfdecd graphics/php-gd/Makefile
--- a/graphics/php-gd/Makefile  Tue Nov 23 19:44:02 2004 +0000
+++ b/graphics/php-gd/Makefile  Tue Nov 23 19:46:14 2004 +0000
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2004/11/14 11:42:48 adam Exp $
+# $NetBSD: Makefile,v 1.6 2004/11/23 19:46:14 jdolecek Exp $
 
 MODNAME=               gd
+PKGREVISION=           1
 CATEGORIES+=           graphics
 COMMENT=               PHP extension for GD graphics library
 
 USE_BUILDLINK3=                YES
 
-CONFIGURE_ARGS+=       --with-${MODNAME}=${BUILDLINK_DIR}
+# XXX we use bundled GD so that extension is usable also by non-threaded
+# PHP, such as CLI/CGI version or ap-php on Apache 1.x.
+
+CONFIGURE_ARGS+=       --with-${MODNAME}
 CONFIGURE_ARGS+=       --with-jpeg-dir=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=       --with-png-dir=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=       --with-zlib-dir=${BUILDLINK_DIR}
@@ -15,6 +19,9 @@
 CONFIGURE_ARGS+=       --enable-${MODNAME}-jis-conv
 CONFIGURE_ARGS+=       --without-t1lib
 
-.include "../../graphics/gd/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"