share MESSAGE.module and PLIST.module between php4 and php5 packages, moving

them to lang/php/

7 files changed, 10 insertions, 23 deletions

diff --git a/lang/php5/MESSAGE.module b/lang/php/MESSAGE.module
index a6cf472ebe2..f1be9d75663 100644
--- a/lang/php5/MESSAGE.module
+++ b/lang/php/MESSAGE.module
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE.module,v 1.1.1.1 2004/10/29 20:31:54 jdolecek Exp $
+$NetBSD: MESSAGE.module,v 1.1 2004/11/05 21:40:25 jdolecek Exp $
 
 To enable this module, add the following to ${PKG_SYSCONFDIR}/php.ini:
 
@@ -7,5 +7,5 @@ To enable this module, add the following to ${PKG_SYSCONFDIR}/php.ini:
 
 and make sure extension_dir points to the dir where ${MODNAME}.so is.
 
-Then restart your PHP5-enabled HTTP server to load this module.
+Then restart your PHP${PKG_PHP_VERSION}-enabled HTTP server to load this module.
 ===========================================================================
diff --git a/lang/php/PLIST.module b/lang/php/PLIST.module
new file mode 100644
index 00000000000..7a79f615f9d
--- /dev/null
+++ b/lang/php/PLIST.module
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.module,v 1.1 2004/11/05 21:40:25 jdolecek Exp $
+${PHP_EXTENSION_DIR}/${MODNAME}.so
diff --git a/lang/php5/Makefile.module b/lang/php5/Makefile.module
index 18035f94780..613bd170a61 100644
--- a/lang/php5/Makefile.module
+++ b/lang/php5/Makefile.module
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.module,v 1.4 2004/11/02 21:03:03 jdolecek Exp $
+# $NetBSD: Makefile.module,v 1.5 2004/11/05 21:40:25 jdolecek Exp $
 
 .include "../../lang/php5/Makefile.common"
 
@@ -28,8 +28,8 @@ USE_LIBTOOL=		YES
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
 
-PLIST_SRC=		${.CURDIR}/../../lang/php5/PLIST.module
-MESSAGE_SRC=		${.CURDIR}/../../lang/php5/MESSAGE.module
+PLIST_SRC=		${.CURDIR}/../../lang/php/PLIST.module
+MESSAGE_SRC=		${.CURDIR}/../../lang/php/MESSAGE.module
 MESSAGE_SUBST+=		MODNAME=${PKGMODNAME}
 MESSAGE_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 
diff --git a/lang/php5/PLIST.module b/lang/php5/PLIST.module
deleted file mode 100644
index a2dfad3c02f..00000000000
--- a/lang/php5/PLIST.module
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.module,v 1.1.1.1 2004/10/29 20:31:54 jdolecek Exp $
-${PHP_EXTENSION_DIR}/${MODNAME}.so
diff --git a/www/php4/MESSAGE.module b/www/php4/MESSAGE.module
deleted file mode 100644
index d50e5cdfae0..00000000000
--- a/www/php4/MESSAGE.module
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.module,v 1.4 2002/12/21 13:39:25 wiz Exp $
-
-To enable this module, add the following to ${PKG_SYSCONFDIR}/php.ini:
-
-    extension=${MODNAME}.so
-
-and make sure extension_dir points to the dir where ${MODNAME}.so is.
-
-Then restart your PHP4-enabled HTTP server to load this module.
-===========================================================================
diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module
index 66cda682187..310882014a3 100644
--- a/www/php4/Makefile.module
+++ b/www/php4/Makefile.module
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.module,v 1.28 2004/10/31 17:43:02 jdolecek Exp $
+# $NetBSD: Makefile.module,v 1.29 2004/11/05 21:40:25 jdolecek Exp $
 #
 # This Makefile is provided to ease creating PHP4 packages for the extension
 # modules distributed in the PHP4 sources.
@@ -35,8 +35,8 @@ USE_LIBTOOL=		YES
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
 
-PLIST_SRC=		${.CURDIR}/../../www/php4/PLIST.module
-MESSAGE_SRC=		${.CURDIR}/../../www/php4/MESSAGE.module
+PLIST_SRC=		${.CURDIR}/../../lang/php/PLIST.module
+MESSAGE_SRC=		${.CURDIR}/../../lang/php/MESSAGE.module
 MESSAGE_SUBST+=		MODNAME=${PKGMODNAME}
 MESSAGE_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 
diff --git a/www/php4/PLIST.module b/www/php4/PLIST.module
deleted file mode 100644
index e9340b1efd3..00000000000
--- a/www/php4/PLIST.module
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.module,v 1.1 2001/11/01 02:26:11 zuntum Exp $
-${PHP_EXTENSION_DIR}/${MODNAME}.so