Add 'www' to common CATEGORIES.

Patches to find imap-uw headers and libraries in correct location.

5 files changed, 20 insertions, 10 deletions

diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile
index 21123834549..4629a29f32c 100644
--- a/www/ap-php4/Makefile
+++ b/www/ap-php4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2000/12/17 09:26:08 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2000/12/17 17:18:01 jlam Exp $
 
 .include "../../www/php4/Makefile.common"
 
 PKGNAME=		ap-${DISTNAME}nb1
-CATEGORIES+=		www lang
+CATEGORIES+=		lang
 
 MAINTAINER=		jdolecek@netbsd.org
 HOMEPAGE=		http://www.php.net/
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 806ad800868..ed0f1a64d67 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/12/17 17:18:02 jlam Exp $
 
 .include "../../www/php4/Makefile.common"
 
-CATEGORIES+=		www lang
+CATEGORIES+=		lang
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.php.net/
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index c39dcc373f6..91f4521a5fb 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2000/12/17 17:18:02 jlam Exp $
 
 DISTNAME=		php-${PHP_VERS}
 PHP_VERS=		4.0.3pl1
-CATEGORIES+=		php4
+CATEGORIES+=		www php4
 
 # Note the http address is written this way by purpose, so that bsd.pkg.mk DTRT
 MASTER_SITES=		http://www.php.net/do_download.php?source_site=www.php.net&download_file= \
diff --git a/www/php4/files/patch-sum b/www/php4/files/patch-sum
index d919b266912..74d467f4f73 100644
--- a/www/php4/files/patch-sum
+++ b/www/php4/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/17 17:18:02 jlam Exp $
 
-MD5 (patch-aa) = e482b233021c7a3efc82e0ee4c1a3973
+MD5 (patch-aa) = bb987cfec61be0c240bbb97903ac201f
 MD5 (patch-ab) = 5f23b48e9a5a14d282b458831f6769f7
+MD5 (patch-ac) = b33a7b6413fb5c850ebbb4c21f04b4d4
diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa
index 67de5eb2a05..f5844594781 100644
--- a/www/php4/patches/patch-aa
+++ b/www/php4/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2000/12/17 17:18:02 jlam Exp $
 
---- configure.orig	Sun Oct 15 13:47:10 2000
+--- configure.orig	Sun Oct 15 07:47:10 2000
 +++ configure
+@@ -17706,7 +17706,7 @@
+       ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
+     fi
+ 
+-    for lib in imap c-client4 c-client; do
++    for lib in imapuw imap c-client4 c-client; do
+       IMAP_LIB=$lib
+       
+ 		str="$IMAP_DIR/lib/lib$lib.*"
 @@ -37830,6 +37830,7 @@
  fi