diff options
| -rw-r--r-- | graphics/php4-gd/Makefile | 3 | ||||
| -rw-r--r-- | graphics/php4-gd/distinfo | 4 | ||||
| -rw-r--r-- | graphics/php4-gd/patches/patch-aa | 17 | ||||
| -rw-r--r-- | graphics/php4-gd/patches/patch-ab | 13 |
4 files changed, 35 insertions, 2 deletions
diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile index 39717840ac4..0de63c52f61 100644 --- a/graphics/php4-gd/Makefile +++ b/graphics/php4-gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:33 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2001/10/19 07:05:28 kei Exp $ .include "../../www/php4/Makefile.module" @@ -14,6 +14,7 @@ CONFIGURE_ARGS+= --with-jpeg-dir=shared,${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-png-dir=shared,${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-xpm-dir=shared,${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-ttf=shared,${BUILDLINK_DIR} +CONFIGURE_ARGS+= --enable-${MODNAME}-native-ttf CONFIGURE_ARGS+= --without-freetype-dir CONFIGURE_ARGS+= --without-t1lib diff --git a/graphics/php4-gd/distinfo b/graphics/php4-gd/distinfo index 7aa113d11fd..4f7d65d08da 100644 --- a/graphics/php4-gd/distinfo +++ b/graphics/php4-gd/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/10/16 05:29:53 jlam Exp $ +$NetBSD: distinfo,v 1.2 2001/10/19 07:05:28 kei Exp $ SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03 Size (php-4.0.6.tar.gz) = 3157346 bytes +SHA1 (patch-aa) = 3ce0b8f9d4a6c297c0bd3c1196a92391c7efa210 +SHA1 (patch-ab) = efe78dd6a9a680d9e91202d0f3fd9516be059f85 diff --git a/graphics/php4-gd/patches/patch-aa b/graphics/php4-gd/patches/patch-aa new file mode 100644 index 00000000000..6cb20d57618 --- /dev/null +++ b/graphics/php4-gd/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.1 2001/10/19 07:05:29 kei Exp $ + +--- config.m4.orig Mon Jun 4 10:36:47 2001 ++++ config.m4 Thu Oct 18 18:39:47 2001 +@@ -162,10 +162,10 @@ + ]) + + AC_DEFUN(PHP_GD_TTSTR,[ +- PHP_ARG_ENABLE(gd-native-tt, whether to enable truetype string function in gd, ++ PHP_ARG_ENABLE(gd-native-ttf, whether to enable truetype string function in gd, + [ --enable-gd-native-ttf GD: Enable TrueType string function in gd]) + +- if test "$PHP_GD_NATIVE_TT" = "yes"; then ++ if test "$PHP_GD_NATIVE_TTF" = "yes"; then + AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) + fi + ]) diff --git a/graphics/php4-gd/patches/patch-ab b/graphics/php4-gd/patches/patch-ab new file mode 100644 index 00000000000..c44a310df93 --- /dev/null +++ b/graphics/php4-gd/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2001/10/19 07:05:29 kei Exp $ + +--- gd.c.orig Thu Oct 18 18:49:42 2001 ++++ gd.c Thu Oct 18 18:51:51 2001 +@@ -2662,7 +2662,7 @@ + fontname = (unsigned char *) Z_STRVAL_PP(FONTNAME); + + #ifdef USE_GD_IMGSTRTTF +-# if HAVE_LIBGD20 & HAVE_LIBFREETYPE ++# if HAVE_LIBGD20 && HAVE_LIBFREETYPE + error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str); + # else + error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str); |