ports/57652: [patch] www/apache-contrib: Let the user choose if he/she wants to install latest version from modules which have a port

[Clement Laforet]

>Number:         57652
>Category:       ports
>Synopsis:       [patch] www/apache-contrib: Let the user choose if he/she wants to install latest version from modules which have a port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 06 10:30:06 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Sep 22 08:20:10 CEST 2003 clement at lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386


	
>Description:
	If user defines WITH_MODULES_PORTS, apache-contrib will install latest version of modules 
	available in ports tree.

>How-To-Repeat:
	N/A.
>Fix:

	

--- apache-contrin.diff begins here ---
Index: apache-contrib/Makefile
===================================================================
RCS file: /WORK/REPO/ports/www/apache-contrib/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- apache-contrib/Makefile	20 Feb 2003 19:15:22 -0000	1.12
+++ apache-contrib/Makefile	6 Oct 2003 13:26:22 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	apache-contrib
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=	contrib/modules/1.3
@@ -17,6 +18,21 @@
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 
+.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
+.else
+MAKE_ENV+=	NO_PORTS=YES
+PLIST_SUB+=	PORTS=""
+.endif
+
 APXS=		${LOCALBASE}/sbin/apxs
 
 AP_PORT?=	apache13
@@ -37,5 +53,10 @@
 
 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>
Index: apache-contrib/pkg-plist
===================================================================
RCS file: /WORK/REPO/ports/www/apache-contrib/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- apache-contrib/pkg-plist	23 Oct 2000 02:04:10 -0000	1.1
+++ apache-contrib/pkg-plist	6 Oct 2003 13:25:34 -0000
@@ -1,25 +1,25 @@
 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
--- apache-contrin.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: