Date: Wed, 16 Dec 2009 17:44:15 GMT From: "Philip M. Gollucci" <pgollucci@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: apache@FreeBSD.org Subject: ports/141688: Mk/bsd.apache.mk: several changes [patch] Message-ID: <200912161744.nBGHiF6S039010@frieza.p6m7g8.net> Resent-Message-ID: <200912161750.nBGHo3SY058227@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141688 >Category: ports >Synopsis: Mk/bsd.apache.mk: several changes [patch] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Dec 16 17:50:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 9.0-CURRENT amd64 >Organization: RideCharge Inc. >Environment: System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Tue Dec 8 02:25:55 UTC 2009 root@frieza.p6m7g8.net:/usr/obj/usr/src/sys/FRIEZA amd64 >Description: o) ports/115461 pgollucci [patch] bsd.apache.mk - Create packages for apache modules with unique names o) ports/133197 pgollucci [bsd.apache.mk] Rephrase IGNORE statement, kill EOL spaces, reformat o) Remove USE_APACHE=yes, USE_APACHE=apr, and APR_DEPS=foo o) Remove APACHE_COMPAT=X o) Drop support for 21 [dev only release, not in tree for years now] P6 TB Test: ------------ http://tb.p6m7g8.net/index.php [despite its name, apache22's only delta is the below diff] 9-CURRENT-amd64-apache 9-CURRENT (amd64)/apache: lrdeps:=www/apache* 974 - 22 5 - - 1001 9-CURRENT-amd64-apache22 9-CURRENT (amd64)/apache22: bsd.apache.mk mods, WITH_APACHE=yes 968 - 26 7 - - 1001 Thats 4 failures by my count. Please queue for a -exp run. Once this is worked out, the next step will be to change the default apache version from 1.3 to 2.2 It'll be just in time for 2.4.x release which is getting closer (2.3.4 alphas are out) >How-To-Repeat: >Fix: --- bsd.apache.mk.diff begins here --- Index: bsd.apache.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.apache.mk,v retrieving revision 1.20 diff -u -r1.20 bsd.apache.mk --- bsd.apache.mk 14 Dec 2009 00:16:25 -0000 1.20 +++ bsd.apache.mk 16 Dec 2009 02:22:55 -0000 @@ -12,46 +12,20 @@ # # Variables definition # USE_APACHE: Call this script. Values can be: -# <version>: 1.3/13/2.0/20/2.1/2.2/1.3+/2.0+/2.1+/2.2+ -# common*: common13, common20, common21 and common22 -# -# Note: Setting USE_APACHE to "yes" is deprecated. It will set -# APACHE_PORT to www/apache13 and if WITH_APACHE2 (deprecated too) -# is defined, APACHE_PORT will be set to www/apache20 -# +# <version>: 1.3/13/2.0/20/2.2/1.3+/2.0+/2.2+ +# common*: common13, common20, and common22 .if !defined(Apache_Pre_Include) || defined(PORT_IS_MODULE) Apache_Pre_Include= bsd.apache.mk -.if defined(APACHE_COMPAT) -USE_APACHE=yes -.endif - # Print warnings _ERROR_MSG= : Error from bsd.apache.mk. -APACHE_SUPPORTED_VERSION= 13 20 21 22 +APACHE_SUPPORTED_VERSION= 13 20 22 .if ${USE_APACHE:Mcommon*} != "" AP_PORT_IS_SERVER= YES -.elif ${USE_APACHE:L} == apr -APR_DEPS= YES -.elif ${USE_APACHE:C/\.//:C/\+//:M[12][3210]} != "" +.elif ${USE_APACHE:C/\.//:C/\+//:M[12][320]} != "" AP_PORT_IS_MODULE= YES - -#### for backward compatibility -.elif ${USE_APACHE:L} == yes -. if defined(WITH_APACHE2) -APACHE_PORT?= www/apache20 -. else -APACHE_PORT?= www/apache13 -. endif -APXS?= ${LOCALBASE}/sbin/apxs -.if !defined(APACHE_COMPAT) -BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} -.endif -#### End of backward compatibility - .else IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE .endif @@ -94,20 +68,6 @@ --disable-asis --disable-cgid --disable-cgi \ --disable-negotiation --disable-dir --disable-imap \ --disable-actions --disable-userdir --disable-alias -.elif ${USE_APACHE} == common21 -CONFIGURE_ARGS+= --disable-authn-file --disable-authn-default \ - --disable-authz-host --disable-authz-groupfile \ - --disable-authz-user --disable-authz-default \ - --disable-auth-basic --disable-charset-lite \ - --disable-include --disable-log-config --disable-env \ - --disable-setenvif --disable-mime --disable-status \ - --disable-autoindex --disable-asis --disable-cgid \ - --disable-cgi --disable-negotiation --disable-dir \ - --disable-imagemap --disable-actions --disable-userdir \ - --disable-alias --disable-filter \ - --disable-proxy --disable-proxy-connect \ - --disable-proxy-ftp --disable-proxy-http \ - --disable-proxy-ajp --disable-proxy-balancer .elif ${USE_APACHE} == common22 CONFIGURE_ARGS+= --disable-authn-file --disable-authn-default \ --disable-authz-host --disable-authz-groupfile \ @@ -267,9 +227,6 @@ .endfor ####End of PORT_IS_SERVER #### -.elif defined(APR_DEPS) -IGNORE= ${_ERROR_MSG} apr support is not yet implemented - .elif defined(AP_PORT_IS_MODULE) AP_VERSION= ${USE_APACHE:C/\.//} @@ -321,7 +278,7 @@ APACHEINCLUDEDIR=include/apache2 APACHEETCDIR= etc/apache2 APACHE_PORT?= www/apache${APACHE_VERSION} -.elif ${APACHE_VERSION} >= 21 +.elif ${APACHE_VERSION} >= 22 AP_BUILDEXT= la APACHEMODDIR= libexec/apache${APACHE_VERSION} APACHEINCLUDEDIR=include/apache${APACHE_VERSION} @@ -345,6 +302,8 @@ . endif .endfor +PKGNAMEPREFIX?= ap${APACHE_VERSION}- + BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} PLIST_SUB+= AP_NAME="${SHORTMODNAME}" --- bsd.apache.mk.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912161744.nBGHiF6S039010>