Date: Mon, 24 Sep 2012 20:55:01 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304797 - in head: Mk www/mod_amazon_proxy www/mod_asn www/mod_dnssd www/mod_fcgid www/mod_log_mysql www/mod_pagespeed www/mod_perl2 www/mod_spdy www/mod_vhost_ldap www/mod_whatkilledus... Message-ID: <201209242055.q8OKt1wT097078@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Mon Sep 24 20:55:01 2012 New Revision: 304797 URL: http://svn.freebsd.org/changeset/ports/304797 Log: - USE_APACHE s/22+/22/ some additional cleanups/fixes - adopt new Makefile header - convert to optionsNG - use BROKEN instead IGNORE in bsd.apache.mk with hat apache@ Modified: head/Mk/bsd.apache.mk head/www/mod_amazon_proxy/Makefile head/www/mod_asn/Makefile head/www/mod_dnssd/Makefile head/www/mod_fcgid/Makefile head/www/mod_log_mysql/Makefile head/www/mod_pagespeed/Makefile head/www/mod_perl2/Makefile head/www/mod_spdy/Makefile head/www/mod_vhost_ldap/Makefile head/www/mod_whatkilledus/Makefile head/www/mod_xml2enc/Makefile head/www/p5-CGI-SpeedyCGI/Makefile Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Mon Sep 24 19:41:11 2012 (r304796) +++ head/Mk/bsd.apache.mk Mon Sep 24 20:55:01 2012 (r304797) @@ -310,7 +310,7 @@ _APACHE_VERSION_NONSUPPORTED= ${_APACHE_ . endif . if defined(_APACHE_VERSION_NONSUPPORTED) && !defined(AP_IGNORE_VERSION_CHECK) -IGNORE= ${_ERROR_MSG} apache${_APACHE_VERSION} is installed (or APACHE_PORT is defined) and port requires apache${_APACHE_VERSION_NONSUPPORTED} +BROKEN= ${_ERROR_MSG} apache${_APACHE_VERSION} is installed (or APACHE_PORT is defined) and port requires apache${_APACHE_VERSION_NONSUPPORTED} . endif .else # defined(_APACHE_VERSION) . for ver in ${APACHE_SUPPORTED_VERSION} Modified: head/www/mod_amazon_proxy/Makefile ============================================================================== --- head/www/mod_amazon_proxy/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_amazon_proxy/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_amazon_proxy -# Date created: 2011-09-24 -# Whom: TAKATSU Tomonari <tota@FreeBSD.org> -# +# Created by: TAKATSU Tomonari <tota@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mod_amazon_proxy PORTVERSION= 20100913 @@ -16,7 +12,7 @@ COMMENT= Amazon Auth Proxy for Product A LIB_DEPENDS= apreq2:${PORTSDIR}/www/libapreq2 -USE_APACHE= 22+ +USE_APACHE= 22 CONFFILE= httpd-amazon-proxy.conf CONFDIR= ${PREFIX}/${APACHEETCDIR}/Includes Modified: head/www/mod_asn/Makefile ============================================================================== --- head/www/mod_asn/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_asn/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_asn -# Date created: 24 Apr 2011 -# Whom: Jun Kuriyama <kuriyama@FreeBSD.org> -# +# Created by: Jun Kuriyama <kuriyama@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mod_asn PORTVERSION= 1.5 @@ -17,7 +13,7 @@ COMMENT= Look up the AS and network pref LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1 -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes MANUAL_PACKAGE_BUILD= devel/apr1 with pgsql option required Modified: head/www/mod_dnssd/Makefile ============================================================================== --- head/www/mod_dnssd/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_dnssd/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -20,7 +20,7 @@ LIB_DEPENDS= avahi-client.3:${PORTSDIR}/ MAKE_JOBS_SAFE= yes USE_GMAKE= yes -USE_APACHE= 22+ +USE_APACHE= 22 GNU_CONFIGURE= yes CONFIGURE_ENV= APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \ APR_LIBS="`${LOCALBASE}/bin/apr-1-config --ldflags`" Modified: head/www/mod_fcgid/Makefile ============================================================================== --- head/www/mod_fcgid/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_fcgid/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_fcgid for Apache2 -# Date created: 13 August 2004 -# Whom: Akinori MUSHA aka knu <knu@idaemons.org> -# +# Created by: Akinori MUSHA aka knu <knu@idaemons.org> # $FreeBSD$ -# PORTNAME= mod_fcgid PORTVERSION= 2.3.6 @@ -32,7 +28,7 @@ PLIST_SUB+= APACHEMODDIR=${APACHEMODDIR} MAKE_ARGS+= top_dir="${LOCALBASE}/share/apache${APACHE_VERSION}" MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/apache${APACHE_VERSION} -I${LOCALBASE}/include/apr-1" INSTALL_TARGET= install-modules-yes -DOCSDIR= ${PREFIX}/share/doc/apache22/mod +DOCSDIR= ${PREFIX}/share/doc/apache${APACHE_VERSION}/mod post-install: .if !defined(NOPORTDOCS) Modified: head/www/mod_log_mysql/Makefile ============================================================================== --- head/www/mod_log_mysql/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_log_mysql/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_mod_mysql -# Date created: Sun May 2 2004 -# Whom: Clement Laforet <clement@FreeBSD.org> -# +# Created by: Clement Laforet <clement@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mod_log_mysql PORTVERSION= 1.0 @@ -25,7 +21,7 @@ RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDI MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes USE_MYSQL= yes Modified: head/www/mod_pagespeed/Makefile ============================================================================== --- head/www/mod_pagespeed/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_pagespeed/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_pagespeed -# Date created: 2011-09-27 -# Whom: Steve Wills <swills@FreeBSD.org> -# +# Created by: Steve Wills <swills@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mod_pagespeed PORTVERSION= 0.10.22.6 @@ -29,7 +25,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/ USE_XZ= yes USE_BINUTILS= yes -USE_APACHE= 22+ +USE_APACHE= 22 USE_PYTHON= 2.6+ USE_GMAKE= yes MAKE_JOBS_SAFE= yes Modified: head/www/mod_perl2/Makefile ============================================================================== --- head/www/mod_perl2/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_perl2/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -65,10 +65,13 @@ MAN3= APR.3 APR::Base64.3 APR::Brigade. .include <bsd.port.pre.mk> +.if ${APACHE_VERSION} > 22 +BROKEN= Does not build with apache24 +.endif + # Using apxs in this way is problematic if apache2 is installed under a # different PREFIX than mod_perl2, because the mod_perl2 installation will # use paths returned by apxs to install some components. Fixes welcome. -#CONFIGURE_ARGS= MP_APXS=${LOCALBASE}/sbin/apxs PREFIX=${PREFIX} CONFIGURE_ARGS= PREFIX=${PREFIX} MP_APXS=${APXS} MP_APR_CONFIG=${LOCALBASE}/bin/apr-1-config .if exists(${LOCALBASE}/include/apr-1/apr.h) Modified: head/www/mod_spdy/Makefile ============================================================================== --- head/www/mod_spdy/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_spdy/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_spdy -# Date created: 1 April 2012 -# Whom: Masaki TAGAWA -# +# Created by: Masaki TAGAWA # $FreeBSD$ -# PORTNAME= mod_spdy PORTVERSION= 0.9.3.2 @@ -28,7 +24,7 @@ BUILD_DEPENDS= greadlink:${PORTSDIR}/sys LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo USE_XZ= yes -USE_APACHE= 22+ +USE_APACHE= 22 USE_PYTHON= 2.6+ USE_GMAKE= yes ONLY_FOR_ARCHS= amd64 i386 Modified: head/www/mod_vhost_ldap/Makefile ============================================================================== --- head/www/mod_vhost_ldap/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_vhost_ldap/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_vhost_ldap -# Date created: Sep 10 2005 -# Whom: Clement Laforet <clement@FreeBSD.org> -# +# Created by: Clement Laforet <clement@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mod_vhost_ldap PORTVERSION= 1.0 @@ -21,7 +17,7 @@ MAKE_JOBS_SAFE= yes USE_BZIP2= yes USE_OPENLDAP= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes AP_LIB+= ${LOCALBASE}/lib -lldap Modified: head/www/mod_whatkilledus/Makefile ============================================================================== --- head/www/mod_whatkilledus/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_whatkilledus/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_whatkilledus -# Date created: Thu Nov 4 10:08:27 CET 2010 -# Whom: Frank Wall <fw@moov.de> -# +# Created by: Frank Wall <fw@moov.de> # $FreeBSD$ -# PORTNAME= mod_whatkilledus PORTVERSION= 2.0 @@ -19,7 +15,7 @@ COMMENT= Logs a report when a child proc MAKE_JOBS_SAFE= yes MANUAL_PACKAGE_BUILD= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes SHORTMODNAME= whatkilledus Modified: head/www/mod_xml2enc/Makefile ============================================================================== --- head/www/mod_xml2enc/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/mod_xml2enc/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_xml2enc -# Date created: 02 March 2011 -# Whom: Marin Atanasov Nikolov <dnaeon@gmail.com> -# +# Created by: Marin Atanasov Nikolov <dnaeon@gmail.com> # $FreeBSD$ -# PORTNAME= mod_xml2enc PORTVERSION= 1.0.3 @@ -17,7 +13,9 @@ COMMENT= Apache module for converting en MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +# included in apache24 +# http://httpd.apache.org/docs/2.4/mod/mod_xml2enc.html +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes SHORTMODNAME= xml2enc Modified: head/www/p5-CGI-SpeedyCGI/Makefile ============================================================================== --- head/www/p5-CGI-SpeedyCGI/Makefile Mon Sep 24 19:41:11 2012 (r304796) +++ head/www/p5-CGI-SpeedyCGI/Makefile Mon Sep 24 20:55:01 2012 (r304797) @@ -1,9 +1,5 @@ -# New ports collection makefile for: CGI-SpeedyCGI -# Date created: Sun Mar 10 16:44:06 CET 2002 -# Whom: Lars Thegler <lars@thegler.dk> -# +# Created by: Lars Thegler <lars@thegler.dk> # $FreeBSD$ -# PORTNAME= CGI-SpeedyCGI PORTVERSION= 2.22 @@ -18,18 +14,22 @@ COMMENT= Speed up perl CGI scripts by ru MAKE_JOBS_UNSAFE= yes PERL_CONFIGURE= yes -OPTIONS= APACHE "Enable mod_speedycgi" On +OPTIONS_DEFINE= APACHE +OPTIONS_DEFAULT=APACHE +APACHE_DESC= Build mod_speedycgi -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_APACHE) -USE_APACHE= 22+ +.if ${PORT_OPTIONS:MAPACHE} +USE_APACHE= 22 PLIST_SUB+= APACHE="" .else PLIST_SUB+= APACHE="@comment " CONFIGURE_ENV+= WITHOUT_APACHE=yes .endif +.include <bsd.port.pre.mk> + post-patch: @${PERL} -pi -e 's,apxs -q,${APXS} -q,;' \ ${WRKSRC}/src/SpeedyMake.pl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209242055.q8OKt1wT097078>