Make php4 and ap-php4 actually use our libtool again.

5 files changed, 25 insertions, 19 deletions

diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile
index f24ac1de4d4..bc06d6e4d41 100644
--- a/www/ap-php4/Makefile
+++ b/www/ap-php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/09/05 12:39:41 zuntum Exp $
+# $NetBSD: Makefile,v 1.25 2003/01/08 01:52:41 jlam Exp $
 
 PKGNAME=		ap-php-${PHP_BASE_VERS}
 PKGREVISION=		# empty
@@ -8,6 +8,7 @@ DEPENDS+=		php>=${PHP_BASE_VERS}:../../www/php4
 
 USE_BUILDLINK2=		YES
 APACHE_MODULE=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../www/php4/Makefile.php"
 
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 7d3f7db8e5f..3c7da7cdb70 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/10/14 06:21:18 martti Exp $
+# $NetBSD: Makefile,v 1.29 2003/01/08 01:52:43 jlam Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
 CATEGORIES+=		lang
@@ -7,6 +7,7 @@ COMMENT=		HTML-embedded scripting language
 CONFLICTS+=		ap-php-4.0.3pl1
 
 USE_BUILDLINK2=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "Makefile.php"
 
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 441d9e53e83..0f4870ae716 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.6 2002/10/14 06:21:18 martti Exp $
+# $NetBSD: Makefile.php,v 1.7 2003/01/08 01:52:43 jlam Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -6,8 +6,6 @@ DISTINFO_FILE=		${.CURDIR}/../../www/php4/distinfo
 PATCHDIR=		${.CURDIR}/../../www/php4/patches
 
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--without-mysql
@@ -43,8 +41,3 @@ CONFIGURE_ARGS+=	${PHP4_CONFIGURE_ARGS}
 
 CONFIGURE_ENV+=		ac_cv_lib_pam_pam_start=no
 CONFIGURE_ENV+=		EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
-
-post-configure: create-shlibtool
-
-create-shlibtool:
-	cd ${WRKSRC}; ${RM} -f shlibtool; ${LN} -sf libtool shlibtool
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 6ddebd446f5..5d37eaefb83 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2002/10/14 06:21:19 martti Exp $
+$NetBSD: distinfo,v 1.15 2003/01/08 01:52:44 jlam Exp $
 
 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-ac) = f3a3a4a5af6f03a6274aa4875a922b838f1bde1b
-SHA1 (patch-ad) = 75288e1a09a12f9ff0ad962282caece245dda942
+SHA1 (patch-ad) = f746990667b3ec74ba373fee9c823b1cc3f92d67
 SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78
 SHA1 (patch-ag) = a1948af6361e898880e4598654a8ac15fd193b7d
 SHA1 (patch-ah) = 27ac564d2d378852ba328fbc0458d222a4bfdb22
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
index 856d6bd3f17..322eaa865d0 100644
--- a/www/php4/patches/patch-ad
+++ b/www/php4/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.11 2002/10/14 06:21:19 martti Exp $
+$NetBSD: patch-ad,v 1.12 2003/01/08 01:52:44 jlam Exp $
 
---- configure.orig	Thu Sep  5 23:40:53 2002
-+++ configure	Sat Oct 12 09:27:49 2002
-@@ -5396,10 +5396,6 @@
+--- configure.orig	Thu Sep  5 16:40:53 2002
++++ configure
+@@ -5396,10 +5396,6 @@ EOF
  
    fi
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.11 2002/10/14 06:21:19 martti Exp $
  INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
  test -d /usr/ucblib && 
    if test "/usr/ucblib" != "/usr/lib"; then
-@@ -26847,19 +26843,10 @@
+@@ -26847,19 +26843,10 @@ EOF
  
  
    else
@@ -33,7 +33,18 @@ $NetBSD: patch-ad,v 1.11 2002/10/14 06:21:19 martti Exp $
    echo "$ac_t""no" 1>&6
  
  fi
-@@ -72831,7 +72818,7 @@
+@@ -67729,8 +67716,8 @@ program|static)
+     if test "$lib_build_shared" != "yes"; then
+         enable_shared=no
+     fi
+-    PHP_COMPILE='$(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -c $< && touch $@'
+-    CXX_PHP_COMPILE='$(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c $< && touch $@'
++    PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
++    CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'
+ ;;
+ shared)
+     enable_static=no
+@@ -72831,7 +72818,7 @@ esac
  
  TSRM_LIB='TSRM/libtsrm.la'
  TSRM_DIR=TSRM
@@ -42,7 +53,7 @@ $NetBSD: patch-ad,v 1.11 2002/10/14 06:21:19 martti Exp $
  
  if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
    cat >> confdefs.h <<\EOF
-@@ -73625,7 +73612,7 @@
+@@ -73625,7 +73612,7 @@ fi
  
  if test "$enable_debug" != "yes"; then