3 files changed, 77 insertions, 9 deletions

diff --git a/www/apache-contrib/Makefile b/www/apache-contrib/Makefile
index 84fdde251919..49af10c6ae20 100644
--- a/www/apache-contrib/Makefile
+++ b/www/apache-contrib/Makefile
@@ -7,8 +7,9 @@
 
 PORTNAME=	apache-contrib
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
+MASTER_SITES=	http://archive.apache.org/dist/httpd/%SUBDIR%/
 MASTER_SITE_SUBDIR=	contrib/modules/1.3
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,6 +17,24 @@ COMMENT=	Third-party modules contributed to the Apache HTTP server project
 
 USE_APACHE=	yes
 
+.if defined(WITH_MODULES_PORTS)
+PLIST_SUB+=	PORTS="@comment "
+MODS_DIR=	${LOCALBASE}/libexec/apache
+RUN_DEPENDS+=	${MODS_DIR}/mod_auth_external.so:${PORTSDIR}/www/mod_auth_external \
+		${MODS_DIR}/mod_bandwidth.so:${PORTSDIR}/www/mod_bandwidth \
+		${MODS_DIR}/mod_put.so:${PORTSDIR}/www/mod_put \
+		${MODS_DIR}/mod_ticket.so:${PORTSDIR}/www/mod_ticket \
+		${MODS_DIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \
+		${MODS_DIR}/mod_cvs.so:${PORTSDIR}/www/mod_cvs \
+		${MODS_DIR}/mod_roaming.so:${PORTSDIR}/www/mod_roaming
+PKGNAMESUFFIX+=	-lite
+.else
+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.*
+.endif
+
 .if exists(${APXS})
 APXS_WORKS!=	${APXS} -q TARGET 2>/dev/null || echo no
 .endif
@@ -34,4 +53,9 @@ AP_LIBEXEC?=	${PREFIX}/libexec/apache
 ALL_TARGET=	APXS=${APXS} all
 INSTALL_TARGET=	APXS=${APXS} install
 
+pre-everything::
+	@${ECHO_MSG} " ${PORTNAME} contains obsolete modules."
+	@${ECHO_MSG} " If you want to install their latest version from ports"
+	@${ECHO_MSG} " just define WITH_MODULES_PORTS."
+
 .include <bsd.port.mk>
diff --git a/www/apache-contrib/files/patch-Makefile b/www/apache-contrib/files/patch-Makefile
new file mode 100644
index 000000000000..a2d155ed588b
--- /dev/null
+++ b/www/apache-contrib/files/patch-Makefile
@@ -0,0 +1,43 @@
+--- Makefile.orig	Thu Dec 18 15:03:49 2003
++++ Makefile	Thu Dec 18 15:06:29 2003
+@@ -9,28 +9,32 @@
+     mod_allowdev         \
+     mod_auth_cookie      \
+     mod_auth_cookie_file \
+-    mod_auth_external    \
+     mod_auth_inst        \
+     mod_auth_system      \
+     mod_eaccess          \
+-    mod_bandwidth        \
+     mod_cgisock          \
+     mod_cache            \
+     mod_urlcount         \
+     mod_disallow_id      \
+-    mod_layout           \
+     mod_lock             \
+     mod_peephole         \
+-    mod_put              \
+     mod_qs2ssi           \
+     mod_session          \
+-    mod_ticket           \
+-    mod_fastcgi          \
+-    mod_cvs              \
+     mod_random           \
+-    mod_roaming          \
+     mod_ip_forwarding    \
+     mod_macro
++
++.if defined(NO_PORTS)
++SUBDIRS+= \
++    mod_auth_external    \
++    mod_bandwidth        \
++    mod_layout           \
++    mod_put              \
++    mod_ticket           \
++    mod_fastcgi          \
++    mod_cvs              \
++    mod_roaming
++.endif
+ 
+ EXTRA_SUBDIRS= \
+     mod_monitor          \
diff --git a/www/apache-contrib/pkg-plist b/www/apache-contrib/pkg-plist
index af2cd0fd5ff9..8fb765f93c1a 100644
--- a/www/apache-contrib/pkg-plist
+++ b/www/apache-contrib/pkg-plist
@@ -1,25 +1,26 @@
+@comment $FreeBSD$
 libexec/apache/mod_allowdev.so
 libexec/apache/mod_auth_cookie.so
 libexec/apache/mod_auth_cookie_file.so
-libexec/apache/mod_auth_external.so
+%%PORTS%%libexec/apache/mod_auth_external.so
 libexec/apache/mod_auth_inst.so
 libexec/apache/mod_auth_system.so
 libexec/apache/mod_eaccess.so
-libexec/apache/mod_bandwidth.so
+%%PORTS%%libexec/apache/mod_bandwidth.so
 libexec/apache/mod_cgisock.so
 libexec/apache/libcache.so
 libexec/apache/mod_urlcount.so
 libexec/apache/mod_disallow_id.so
-libexec/apache/mod_layout.so
+%%PORTS%%libexec/apache/mod_layout.so
 libexec/apache/mod_lock.so
 libexec/apache/mod_peephole.so
-libexec/apache/mod_put.so
+%%PORTS%%libexec/apache/mod_put.so
 libexec/apache/mod_qs2ssi.so
 libexec/apache/mod_session.so
-libexec/apache/mod_ticket.so
-libexec/apache/mod_fastcgi.so
-libexec/apache/mod_cvs.so
+%%PORTS%%libexec/apache/mod_ticket.so
+%%PORTS%%libexec/apache/mod_fastcgi.so
+%%PORTS%%libexec/apache/mod_cvs.so
 libexec/apache/mod_random.so
-libexec/apache/mod_roaming.so
+%%PORTS%%libexec/apache/mod_roaming.so
 libexec/apache/mod_ip_forwarding.so
 libexec/apache/mod_macro.so