From 3a276858f03e7923920261ea0f09e05d22399ba3 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Thu, 11 May 2006 06:50:39 +0000
Subject: Libtoolize link commands on Darwin.  Previously, pakcages providing
 php-* modules failed on Darwin because gcc was used to link them. Thanks to
 John Klos for testing.

Bump PKGREVISION.
---
 www/php4/Makefile         |  4 ++--
 www/php4/distinfo         |  3 ++-
 www/php4/patches/patch-ab | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 www/php4/patches/patch-ab

(limited to 'www')

diff --git a/www/php4/Makefile b/www/php4/Makefile
index d1186b254e2..b71b018375c 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2006/04/14 13:47:30 cube Exp $
+# $NetBSD: Makefile,v 1.64 2006/05/11 06:50:39 minskim Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES+=		lang
 COMMENT=		HTML-embedded scripting language
 
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 28b4ed06f1e..ef5f83e539b 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.53 2006/04/22 10:27:06 jdolecek Exp $
+$NetBSD: distinfo,v 1.54 2006/05/11 06:50:39 minskim Exp $
 
 SHA1 (php-4.4.2.tar.bz2) = 88f2e9efff0add8d8e3034d4ce3a948429b88756
 RMD160 (php-4.4.2.tar.bz2) = cbef0fa4e233529422bc0944dcfb79d866013f5e
 Size (php-4.4.2.tar.bz2) = 4371185 bytes
 SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
+SHA1 (patch-ab) = 38a4bcd0d65b26c5d8e54e22b552f60831188469
 SHA1 (patch-ad) = 9ca5d2f59bfeea77a98cd0e727546d11669114cd
 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
new file mode 100644
index 00000000000..4f4c1a4c2b5
--- /dev/null
+++ b/www/php4/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.22 2006/05/11 06:50:39 minskim Exp $
+
+--- acinclude.m4.orig	2005-12-19 14:29:11.000000000 -0800
++++ acinclude.m4
+@@ -1195,10 +1195,6 @@ AC_DEFUN([PHP_SHARED_MODULE],[
+   install_modules="install-modules"
+ 
+   case $host_alias in
+-    *darwin*[)]
+-      suffix=so
+-      link_cmd='ifelse($4,,[$(CC)],[$(CXX)]) -dynamic -flat_namespace -bundle -undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+-      ;;
+     *netware*[)]
+       suffix=nlm
+       link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php4lib, , -L$(top_builddir)/netware -lphp4lib) $(translit(ifelse($1, php4lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)'
-- 
cgit v1.2.3