From e7a1bc76f7f3044178a7a370189e9186ff835887 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Wed, 30 Oct 2002 15:28:12 +0000
Subject: Update to 4.2.3. Simplify logic to find libiconv.

---
 textproc/php4-xslt/Makefile | 16 +++++-----------
 textproc/php4-xslt/distinfo |  6 +++---
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'textproc')

diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile
index b9454be920f..d484f9f1b8b 100644
--- a/textproc/php4-xslt/Makefile
+++ b/textproc/php4-xslt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/09/10 16:06:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/30 15:28:12 wiz Exp $
 
 MODNAME=		xslt
 CATEGORIES+=		textproc
-PKGREVISION=		1
 COMMENT=		PHP4 extension for XSLT functions (Sablotron backend)
 
 USE_BUILDLINK2=		YES
@@ -10,15 +9,10 @@ USE_BUILDLINK2=		YES
 .include "../../www/php4/Makefile.module"
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}
-CONFIGURE_ARGS+=	--with-${MODNAME}-sablot=shared,${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-expat-dir=shared,${BUILDLINK_DIR}
-
-# libsablot.so depends on libiconv.so, so just force the configure script
-# to find it.
-#
-CONFIGURE_ENV+=		ac_cv_lib_c_iconv_open=yes
-CONFIGURE_ENV+=		XSLT_SHARED_LIBADD="-liconv"
-LIBS+=			-liconv
+CONFIGURE_ARGS+=	--with-${MODNAME}-sablot=shared,${BUILDLINK_PREFIX.sablotron}
+CONFIGURE_ARGS+=	--with-expat-dir=shared,${BUILDLINK_PREFIX.expat}
+# to make configure find libiconv
+CONFIGURE_ENV+=		PHP_ICONV=${BUILDLINK_PREFIX.iconv:Q}
 
 PLIST_SRC+=		${.CURDIR}/PLIST.extras
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
diff --git a/textproc/php4-xslt/distinfo b/textproc/php4-xslt/distinfo
index 4488388625e..a083876a1df 100644
--- a/textproc/php4-xslt/distinfo
+++ b/textproc/php4-xslt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/02/28 09:50:07 tron Exp $
+$NetBSD: distinfo,v 1.4 2002/10/30 15:28:12 wiz Exp $
 
-SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466
-Size (php-4.1.2.tar.gz) = 3359964 bytes
+SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
+Size (php-4.2.3.tar.gz) = 3413829 bytes
-- 
cgit v1.2.3