From owner-freebsd-ports  Thu Jun  1 18:51:39 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 280DC37B63A
	for <freebsd-ports@FreeBSD.org>; Thu,  1 Jun 2000 18:50:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id SAA68918;
	Thu, 1 Jun 2000 18:50:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from wbiw01.westbend.net (wbiw01.westbend.net [209.224.254.246])
	by hub.freebsd.org (Postfix) with ESMTP id 4447137B5E2
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Jun 2000 18:47:04 -0700 (PDT)
	(envelope-from hetzels@wbiw01.westbend.net)
Received: (from root@localhost)
	by wbiw01.westbend.net (8.9.3/8.9.3) id UAA85221;
	Thu, 1 Jun 2000 20:48:11 -0500 (CDT)
	(envelope-from hetzels)
Message-Id: <200006020148.UAA85221@wbiw01.westbend.net>
Date: Thu, 1 Jun 2000 20:48:11 -0500 (CDT)
From: hetzels@westbend.net
Reply-To: hetzels@westbend.net
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/18960: Add USE_APACHE ito bsd.port.mk for Apache module ports
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         18960
>Category:       ports
>Synopsis:       Add USE_APACHE to bsd.port.mk for Apache module ports
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 01 18:50:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Scot W. Hetzel
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
West Bend Internet
>Environment:


>Description:

	The apache module ports will be needing to depend on different
	Apache ports (apache13, apache13+ipv6, apache13-ssl).  In order for
	them to accomplish this, they will need to have their dependancies
	very depending on which Apache port is installed.

>How-To-Repeat:

>Fix:
	USE_APACHE defines some common variables and build, run dependancies
	used by the Apache module ports.

--- bsd.port.mk.orig	Sat May  6 20:09:14 2000
+++ bsd.port.mk	Thu Jun  1 20:35:53 2000
@@ -118,6 +118,15 @@
 #
 # Use these if your port uses some of the common software packages.
 #
+# USE_APACHE	- Says that the port uses Apache for building and running.
+# AP_PORT	- Set to the name of the apache port (default: apache13)
+# AP_TARGET	- Set to the name of the apache server (default: httpd)
+# AP_SBINDIR	- Set to the location of the apache sbin directory
+# AP_INCLUDE	- Set to the location of the apache include directory
+# AP_LIBEXEC	- Set to the location of the apache libexec directory
+# AP_SYSCONF	- Set to the location of the apache config directory
+# AP_PREFIX	- Set to the apache prefix (default: ${PREFIX})
+#
 # USE_BZIP2		- Says that the port tarballs use bzip2, not gzip, for
 #				  compression.
 # USE_ZIP		- Says that the port distfile uses zip, not tar w/[bg]zip
@@ -698,6 +707,40 @@
 .if defined(USE_QT2)
 LIB_DEPENDS+=	qt2.3:${PORTSDIR}/x11-toolkits/qt21
 USE_NEWGCC=	yes
+.endif
+
+.if defined(USE_APACHE)
+APXS=		${PREFIX}/sbin/apxs
+
+.if exists(${APXS})
+AP_PORT!=	if ${APXS} -q AP_PORT > /dev/null 2>&1 ; then \
+			${APXS} -q AP_PORT ; \
+		else \
+			echo "apache13" ; \
+		fi
+AP_TARGET!=	${APXS} -q TARGET
+AP_SBINDIR!=	${APXS} -q SBINDIR
+AP_INCLUDE!=	${APXS} -q INCLUDEDIR
+AP_LIBEXEC!=	${APXS} -q LIBEXECDIR
+AP_SYSCONF!=	${APXS} -q SYSCONFDIR
+AP_PREFIX!=	${APXS} -q PREFIX
+.else
+AP_PORT?=	apache13
+AP_TARGET?=	httpd
+AP_SBINDIR?=	${PREFIX}/sbin
+AP_INCLUDE?=	${PREFIX}/include/apache
+AP_LIBEXEC?=	${PREFIX}/libexec/apache
+AP_SYSCONF?=	${PREFIX}/etc/apache
+AP_PREFIX?=	${PREFIX}
+.endif
+
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/www/${AP_PORT}
+RUN_DEPENDS+=	${PREFIX}/sbin/${AP_TARGET}:${PORTSDIR}/www/${AP_PORT}
+
+PLIST_SUB+=	AP_SBINDIR=${AP_SBINDIR:S/^${PREFIX}\///} \
+		AP_INCLUDE=${AP_INCLUDE:S/^${PREFIX}\///} \
+		AP_LIBEXEC=${AP_LIBEXEC:S/^${PREFIX}\///} \
+		AP_SYSCONF=${AP_SYSCONF:S/^${PREFIX}\///}
 .endif
 
 .if defined(USE_BZIP2)

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


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message