aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/mod_php4/Makefile6
-rw-r--r--www/mod_php4/pkg-plist6
-rw-r--r--www/mod_php5/Makefile6
-rw-r--r--www/mod_php5/pkg-plist6
4 files changed, 8 insertions, 16 deletions
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index b767a45d23d..9d57f311498 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -47,12 +47,10 @@ IS_INTERACTIVE= yes
.if defined(WITH_APACHE2)
CONFIGURE_ARGS= --with-apxs2=${PREFIX}/sbin/apxs \
--with-tsrm-pth
-PLIST_SUB= MOD_DIR=libexec/apache2 \
- NON=
+PLIST_SUB= MOD_DIR=libexec/apache2
.else
CONFIGURE_ARGS= --with-apxs=${PREFIX}/sbin/apxs
-PLIST_SUB= MOD_DIR=libexec/apache \
- NON=non-
+PLIST_SUB= MOD_DIR=libexec/apache
.endif
CONFIGURE_ARGS+=--with-config-file-path=${PREFIX}/etc \
--enable-versioning \
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index 627e63bdd1a..b4ff74b61f6 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -355,7 +355,6 @@ lib/php/tests/XML_Parser/tests/test3.xml
@dirrm lib/php/Archive
@dirrm lib/php/Console
@dirrm lib/php/DB
-@dirrm lib/php/Image
@dirrm lib/php/Mail
@dirrm lib/php/Net
@dirrm lib/php/OS
@@ -372,7 +371,7 @@ lib/php/tests/XML_Parser/tests/test3.xml
@dirrm lib/php/docs/DB/DB
@dirrm lib/php/docs/DB
@dirrm lib/php/docs
-@dirrm lib/php/extensions/no-debug-%%NON%%zts-20020429
+@dirrm lib/php/extensions/no-debug-non-zts-20020429
@dirrm lib/php/extensions
@dirrm lib/php/tests/DB/tests/driver
@dirrm lib/php/tests/DB/tests/ibase
@@ -386,5 +385,4 @@ lib/php/tests/XML_Parser/tests/test3.xml
@dirrm lib/php/tests/XML_Parser
@dirrm lib/php/tests
@dirrm lib/php
-@exec mkdir -p %D/lib/php/extensions/no-debug-%%NON%%zts-20020429
-@exec mkdir -p %D/lib/php/Image
+@exec mkdir -p %D/lib/php/extensions/no-debug-non-zts-20020429
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index b767a45d23d..9d57f311498 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -47,12 +47,10 @@ IS_INTERACTIVE= yes
.if defined(WITH_APACHE2)
CONFIGURE_ARGS= --with-apxs2=${PREFIX}/sbin/apxs \
--with-tsrm-pth
-PLIST_SUB= MOD_DIR=libexec/apache2 \
- NON=
+PLIST_SUB= MOD_DIR=libexec/apache2
.else
CONFIGURE_ARGS= --with-apxs=${PREFIX}/sbin/apxs
-PLIST_SUB= MOD_DIR=libexec/apache \
- NON=non-
+PLIST_SUB= MOD_DIR=libexec/apache
.endif
CONFIGURE_ARGS+=--with-config-file-path=${PREFIX}/etc \
--enable-versioning \
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index 627e63bdd1a..b4ff74b61f6 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -355,7 +355,6 @@ lib/php/tests/XML_Parser/tests/test3.xml
@dirrm lib/php/Archive
@dirrm lib/php/Console
@dirrm lib/php/DB
-@dirrm lib/php/Image
@dirrm lib/php/Mail
@dirrm lib/php/Net
@dirrm lib/php/OS
@@ -372,7 +371,7 @@ lib/php/tests/XML_Parser/tests/test3.xml
@dirrm lib/php/docs/DB/DB
@dirrm lib/php/docs/DB
@dirrm lib/php/docs
-@dirrm lib/php/extensions/no-debug-%%NON%%zts-20020429
+@dirrm lib/php/extensions/no-debug-non-zts-20020429
@dirrm lib/php/extensions
@dirrm lib/php/tests/DB/tests/driver
@dirrm lib/php/tests/DB/tests/ibase
@@ -386,5 +385,4 @@ lib/php/tests/XML_Parser/tests/test3.xml
@dirrm lib/php/tests/XML_Parser
@dirrm lib/php/tests
@dirrm lib/php
-@exec mkdir -p %D/lib/php/extensions/no-debug-%%NON%%zts-20020429
-@exec mkdir -p %D/lib/php/Image
+@exec mkdir -p %D/lib/php/extensions/no-debug-non-zts-20020429