From 35a165e306ace9ed64fd38606876e9b5554e84bf Mon Sep 17 00:00:00 2001
From: avsm <avsm@openbsd.org>
Date: Fri, 12 Jul 2002 10:13:56 +0000
Subject: [PATCH] - move bundled extensions to core/ to save build time -
 MACHINE_ARCH is predefined; jcs@

---
 www/php4/Makefile.inc  | 15 ++-------------
 www/php4/core/Makefile | 29 +++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/www/php4/Makefile.inc b/www/php4/Makefile.inc
index e8cdaa0f9ca..b4d6a34ae88 100644
--- a/www/php4/Makefile.inc
+++ b/www/php4/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2002/06/24 19:36:07 avsm Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2002/07/12 10:13:56 avsm Exp $
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
@@ -44,17 +44,6 @@ CONFIGURE_ARGS+=	--enable-shared \
 # default included extensions
 CONFIGURE_ARGS+= \
 			--with-openssl \
-			--with-zlib \
-			--enable-bcmath \
-			--enable-calendar \
-			--enable-ctype \
-			--enable-ftp \
-			--with-pcre-regex \
-			--with-posix \
-			--enable-session --enable-trans-sid \
-			--enable-sockets \
-			--enable-sysvsem \
-			--enable-sysvshm \
-			--enable-yp
+			--with-zlib 
 
 USE_LIBTOOL=	Yes
diff --git a/www/php4/core/Makefile b/www/php4/core/Makefile
index c1a68bfda70..8f8fab1005b 100644
--- a/www/php4/core/Makefile
+++ b/www/php4/core/Makefile
@@ -1,12 +1,28 @@
-# $OpenBSD: Makefile,v 1.3 2002/07/09 19:47:43 avsm Exp $
+# $OpenBSD: Makefile,v 1.4 2002/07/12 10:13:56 avsm Exp $
 
 COMMENT=	"server-side HTML-embedded scripting language"
 PKGNAME=	php4-core-${V}
 
 CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
-		--without-mysql --without-xml --enable-cli \
-		--with-iconv=${LOCALBASE} --with-gettext=${LOCALBASE} \
-		--enable-dio --without-pear
+		--without-mysql \
+		--without-xml \
+		--enable-cli \
+		--with-iconv=${LOCALBASE} \
+		--with-gettext=${LOCALBASE} \
+		--enable-dio \
+		--without-pear \
+		--enable-bcmath \
+		--enable-session \
+		--enable-trans-sid \
+		--enable-calendar \
+		--enable-ctype \
+		--enable-ftp \
+		--with-pcre-regex \
+		--with-posix \
+		--enable-sockets \
+		--enable-sysvsem \
+		--enable-sysvshm \
+		--enable-yp
 
 MODULES=	gettext iconv
 
@@ -25,9 +41,10 @@ do-install:
 	@chown ${BINOWN}:${BINGRP} ${PREFIX}/sbin/php4-enable
 	@chmod ${BINMODE} ${PREFIX}/sbin/php4-enable
 
-.include <bsd.port.mk>
-
 .if ${MACHINE_ARCH} == "i386"
 LIB_DEPENDS+=	recode.0::converters/recode
 CONFIGURE_ARGS+= --with-recode=${LOCALBASE}
 .endif
+
+.include <bsd.port.mk>
+