Subject: Re: phpize/libtoolize & existing libtool
To: David Brownlee <abs@netbsd.org>
From: Johnny C. Lam <jlam@netbsd.org>
List: tech-pkg
Date: 01/28/2003 12:46:41
--BXVAT5kNtrzKuDFl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

I'm sorry, but I misread your mail the first time through.  Of course we
want to call ${LOCALBASE}/bin/libtoolize, as it's not supposed to be
wrapped by buildlink2 wrappers.  The following patch should fix the problem
you're experiencing.

	Cheers,

	-- Johnny Lam <jlam@netbsd.org>

--BXVAT5kNtrzKuDFl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

? diff
Index: Makefile.module
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/Makefile.module,v
retrieving revision 1.21
diff -u -r1.21 Makefile.module
--- Makefile.module	2002/10/14 06:21:18	1.21
+++ Makefile.module	2003/01/28 20:42:53
@@ -50,6 +50,7 @@
 	if [ ! -f $${cookie} ]; then					\
 		( cd ${WRKSRC} && ${SETENV} AUTOCONF=${AUTOCONF}	\
 			AUTOHEADER=${AUTOHEADER} ACLOCAL=${ACLOCAL}	\
+			LIBTOOLIZE=${LOCALBASE}/bin/libtoolize		\
 			${PHPIZE} );					\
 		${TOUCH} ${TOUCH_FLAGS} $${cookie};			\
 	fi
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo	2003/01/14 21:39:54	1.17
+++ distinfo	2003/01/28 20:42:53
@@ -3,7 +3,7 @@
 SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
 Size (php-4.2.3.tar.gz) = 3413829 bytes
 SHA1 (patch-aa) = 09fb15fde09bf866d9be016839f33c889d9cefb9
-SHA1 (patch-ab) = f385cce407fed6fc1ed705a4507015684bebb1b5
+SHA1 (patch-ab) = daac6888e758b39bc40abed41eba9e55a0fa30e5
 SHA1 (patch-ac) = f3a3a4a5af6f03a6274aa4875a922b838f1bde1b
 SHA1 (patch-ad) = f1d129a8f0ef45f274a42033c5494e4a0a516f66
 SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/patches/patch-ab,v
retrieving revision 1.10
diff -u -r1.10 patch-ab
--- patches/patch-ab	2002/10/02 23:48:07	1.10
+++ patches/patch-ab	2003/01/28 20:42:53
@@ -1,19 +1,21 @@
-$NetBSD: patch-ab,v 1.10 2002/10/02 23:48:07 wiz Exp $
+$NetBSD$
 
---- pear/scripts/phpize.in.orig	Wed Jan 10 02:01:59 2001
+--- pear/scripts/phpize.in.orig	Wed Apr 17 06:35:59 2002
 +++ pear/scripts/phpize.in
-@@ -25,7 +25,11 @@ sed \
+@@ -25,7 +25,12 @@ sed \
  
  touch install-sh mkinstalldirs missing
  
 -aclocal
 -autoconf
 -autoheader
+-libtoolize -f -c
 +if [ -z "$ACLOCAL" ]; then ACLOCAL=aclocal; fi
 +if [ -z "$AUTOCONF" ]; then AUTOCONF=autoconf; fi
 +if [ -z "$AUTOHEADER" ]; then AUTOHEADER=autoheader; fi
++if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=libtoolize; fi
 +
 +$ACLOCAL
 +$AUTOCONF
 +$AUTOHEADER
- libtoolize -f -c
++$LIBTOOLIZE -f -c

--BXVAT5kNtrzKuDFl--