Link c-client object files directly into PHP4 IMAP shared module. This gets

php4-imap working on my Apache 1.3.17 + mod_ssl 2.8.0 + PHP4 installation.

5 files changed, 40 insertions, 30 deletions

diff --git a/www/php4-imap/Makefile b/www/php4-imap/Makefile
index ad28425547a..b831f37bc6a 100644
--- a/www/php4-imap/Makefile
+++ b/www/php4-imap/Makefile
@@ -1,16 +1,36 @@
-# $NetBSD: Makefile,v 1.2 2001/02/01 22:20:23 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/12 04:14:29 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		imap
 CATEGORIES+=		mail
 
-DEPENDS+=		imap-uw-2000*:../../mail/imap-uw
+# We want something like:
+# BUILD_DEPENDS+=	imap-uw>=2000.0.3nb1:../../mail/imap-uw
+#
+BUILD_DEPENDS+=		${CCLIENT_PIC_LIB}:../../mail/imap-uw
 
-EVAL_PREFIX+=		IMAPDIR=imap-uw
-CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${IMAPDIR}
+CCLIENT_PIC_LIB=	${LOCALBASE}/lib/libc-client_pic.a
+
+CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${LOCALBASE}
 CONFIGURE_ARGS+=	--with-${MODNAME}-ssl=shared,${SSLBASE}
 
 USE_SSL=		# defined
 
+MAKE_ENV+=		LTLIBRARY_OBJECTS_X="${CCLIENT_PIC_LOBJS}"
+
+pre-build:
+	cd ${WRKSRC}/ext/imap;						\
+	${AR} x ${CCLIENT_PIC_LIB};					\
+	for file in ${CCLIENT_PIC_OBJS}; do				\
+		base=`basename $${file} .o`;				\
+		${LN} -sf $${file} $${base}.lo;				\
+		${LN} -sf $${file} $${base}.slo;			\
+	done
+
 .include "../../mk/bsd.pkg.mk"
+
+.if exists(${CCLIENT_PIC_LIB}) && !defined(CCLIENT_PIC_OBJS)
+CCLIENT_PIC_OBJS!=	${AR} t ${CCLIENT_PIC_LIB}
+CCLIENT_PIC_LOBJS=	${CCLIENT_PIC_OBJS:S/.o/.lo/g}
+.endif
diff --git a/www/php4/files/patch-sum b/www/php4/files/patch-sum
index 8911e9118ed..2ff44930b40 100644
--- a/www/php4/files/patch-sum
+++ b/www/php4/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.7 2001/01/25 17:18:07 jlam Exp $
+$NetBSD: patch-sum,v 1.8 2001/02/12 04:14:28 jlam Exp $
 
 MD5 (patch-aa) = 511e161c09ffe0d7935026e72d9ab4a7
-MD5 (patch-ab) = 890bb3a2222ae5295d5f4ea01d2cfd5d
-MD5 (patch-ac) = b33a7b6413fb5c850ebbb4c21f04b4d4
+MD5 (patch-ab) = a3f5c28ef7a4b2df351ab4f22e78762c
 MD5 (patch-ad) = bef4f5e16a927892db85ba59aa860163
 MD5 (patch-ae) = 496c420d0067a985139375ee634cbbd4
 MD5 (patch-af) = cb061c65724b0f99f4bf588ea6c42c8a
+MD5 (patch-ag) = cfdb5d217d14800be1c4f603f062f919
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
index 0b3439a7f57..92e1433a93a 100644
--- a/www/php4/patches/patch-ab
+++ b/www/php4/patches/patch-ab
@@ -1,16 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2001/01/15 16:32:28 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2001/02/12 04:14:28 jlam Exp $
 
 --- configure.orig	Thu Jan 11 13:39:29 2001
 +++ configure
-@@ -18750,7 +18750,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.*"
 @@ -40176,6 +40176,7 @@
  fi
  
diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac
deleted file mode 100644
index c4f63bdda37..00000000000
--- a/www/php4/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/12/25 21:03:47 jlam Exp $
-
---- ext/imap/config.m4.orig	Mon Oct  2 18:16:53 2000
-+++ ext/imap/config.m4
-@@ -61,7 +61,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
-       IMAP_LIB_CHK(lib)
-       IMAP_LIB_CHK(c-client)
diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag
new file mode 100644
index 00000000000..30c4274b09c
--- /dev/null
+++ b/www/php4/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2001/02/12 04:14:29 jlam Exp $
+
+--- ext/imap/Makefile.in.orig	Tue May 23 19:36:44 2000
++++ ext/imap/Makefile.in
+@@ -2,6 +2,6 @@
+ LTLIBRARY_NAME    = libimap.la
+ LTLIBRARY_SOURCES = php_imap.c
+ LTLIBRARY_SHARED_NAME = imap.la
+-LTLIBRARY_SHARED_LIBADD = $(IMAP_SHARED_LIBADD)
++LTLIBRARY_SHARED_LIBADD =
+ 
+ include $(top_srcdir)/build/dynlib.mk