aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2004-11-13 14:56:45 +0000
committerClement Laforet <clement@FreeBSD.org>2004-11-13 14:56:45 +0000
commitd9e2716c45e36202bf63ae079373f78e41a4b1ca (patch)
treea05cd507b6cba26b99121e4f11418a9f20582adb
parent31c97d3b6bdb6f8fb49dfcadf725905b52e1eb8d (diff)
downloadports-d9e2716c45e36202bf63ae079373f78e41a4b1ca.tar.gz
ports-d9e2716c45e36202bf63ae079373f78e41a4b1ca.zip
Notes
-rw-r--r--www/apache-contrib/Makefile2
-rw-r--r--www/apache-contrib/files/patch-Makefile24
-rw-r--r--www/apache-contrib/pkg-descr6
3 files changed, 15 insertions, 17 deletions
diff --git a/www/apache-contrib/Makefile b/www/apache-contrib/Makefile
index 1953ce5936fa..0441b0757ac5 100644
--- a/www/apache-contrib/Makefile
+++ b/www/apache-contrib/Makefile
@@ -34,7 +34,7 @@ MAKE_ENV+= NO_PORTS=YES
PLIST_SUB+= PORTS=""
CONFLICTS= mod_auth_external-2.* mod_bandwidth-2.* mod_put-1.* \
mod_ticket-1.* mod_fastcgi-2.* mod_cvs-0.* mod_roaming-1.* \
- mod_layout-3.*
+ mod_layout-3.* mod_macro-1.*
.endif
.if exists(${APXS})
diff --git a/www/apache-contrib/files/patch-Makefile b/www/apache-contrib/files/patch-Makefile
index a2d155ed588b..a59bdd4afbcf 100644
--- a/www/apache-contrib/files/patch-Makefile
+++ b/www/apache-contrib/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig Thu Dec 18 15:03:49 2003
-+++ Makefile Thu Dec 18 15:06:29 2003
+--- Makefile.orig Fri Mar 3 17:25:33 2000
++++ Makefile Sat Nov 13 15:52:58 2004
@@ -9,28 +9,32 @@
mod_allowdev \
mod_auth_cookie \
@@ -19,13 +19,8 @@
- mod_put \
mod_qs2ssi \
mod_session \
-- mod_ticket \
-- mod_fastcgi \
-- mod_cvs \
- mod_random \
-- mod_roaming \
- mod_ip_forwarding \
- mod_macro
++ mod_random \
++ mod_ip_forwarding
+
+.if defined(NO_PORTS)
+SUBDIRS+= \
@@ -33,9 +28,14 @@
+ mod_bandwidth \
+ mod_layout \
+ mod_put \
-+ mod_ticket \
-+ mod_fastcgi \
-+ mod_cvs \
+ mod_ticket \
+ mod_fastcgi \
+ mod_cvs \
+- mod_random \
+- mod_roaming \
+- mod_ip_forwarding \
+- mod_macro
++ mod_macro \
+ mod_roaming
+.endif
diff --git a/www/apache-contrib/pkg-descr b/www/apache-contrib/pkg-descr
index 691b06cf3f52..95671f6651a4 100644
--- a/www/apache-contrib/pkg-descr
+++ b/www/apache-contrib/pkg-descr
@@ -4,10 +4,8 @@ server project (http://www.apache.org/).
The modules are:
mod_allowdev, mod_auth_cookie, mod_auth_cookie_file, mod_auth_external,
-mod_auth_inst, mod_auth_system mod_eaccess mod_bandwidth mod_cache,
-mod_cgisock, mod_urlcounti, mod_disallow_id, mod_layout, mod_lock,
+mod_auth_inst, mod_auth_systemm, mod_eaccess, mod_bandwidth, mod_cache,
+mod_cgisock, mod_urlcount, mod_disallow_id, mod_layout, mod_lock,
mod_peephole, mod_put, mod_qs2ssi, mod_session, mod_fastcgi, mod_cvs,
mod_macro, mod_random, mod_roaming, mod_ip_forwarding, mod_ticket, mod_define
and mod_monitor.
-
-WWW: http://modules.apache.org/