From owner-svn-ports-all@FreeBSD.ORG Sat Sep 22 21:15:52 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 377571065676; Sat, 22 Sep 2012 21:15:52 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1F3958FC14; Sat, 22 Sep 2012 21:15:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8MLFqQB043992; Sat, 22 Sep 2012 21:15:52 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8MLFpeZ043949; Sat, 22 Sep 2012 21:15:51 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201209222115.q8MLFpeZ043949@svn.freebsd.org> From: Olli Hauer Date: Sat, 22 Sep 2012 21:15:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304723 - in head/www: cas gnome-user-share mod_antiloris mod_auth_cookie_mysql2 mod_auth_external2 mod_auth_form mod_auth_kerb2 mod_auth_mellon mod_auth_mysql_another mod_auth_openid m... X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Sep 2012 21:15:52 -0000 Author: ohauer Date: Sat Sep 22 21:15:50 2012 New Revision: 304723 URL: http://svn.freebsd.org/changeset/ports/304723 Log: - USE_APACHE= s/22+/22/ - adopt new Makefile header Port build fails on local exp-run with apache24 with error: 'conn_rec' has no member named 'remote_ip' or various other apache22 specific functions/parameters with hat apache@ Modified: head/www/cas/Makefile head/www/gnome-user-share/Makefile head/www/mod_antiloris/Makefile head/www/mod_auth_cookie_mysql2/Makefile head/www/mod_auth_external2/Makefile head/www/mod_auth_form/Makefile head/www/mod_auth_kerb2/Makefile head/www/mod_auth_mellon/Makefile head/www/mod_auth_mysql_another/Makefile head/www/mod_auth_openid/Makefile head/www/mod_auth_pgsql2/Makefile head/www/mod_auth_tkt/Makefile head/www/mod_auth_xradius/Makefile head/www/mod_authn_otp/Makefile head/www/mod_authz_unixgroup/Makefile head/www/mod_bw/Makefile head/www/mod_cband/Makefile head/www/mod_cplusplus/Makefile head/www/mod_evasive/Makefile head/www/mod_extract_forwarded/Makefile head/www/mod_fastcgi/Makefile head/www/mod_ftp/Makefile head/www/mod_geoip2/Makefile head/www/mod_gnutls/Makefile head/www/mod_hosts_access/Makefile head/www/mod_jk-apache2/Makefile head/www/mod_limitipconn2/Makefile head/www/mod_lisp2/Makefile head/www/mod_log_config-st/Makefile head/www/mod_log_dbd/Makefile head/www/mod_log_sql2-dtc/Makefile head/www/mod_log_sql2/Makefile head/www/mod_memcache_block/Makefile head/www/mod_mono/Makefile head/www/mod_musicindex/Makefile head/www/mod_ntlm2/Makefile head/www/mod_perl2/Makefile head/www/mod_python3/Makefile head/www/mod_remoteip/Makefile head/www/mod_rpaf2/Makefile head/www/mod_ruby/Makefile head/www/mod_scgi/Makefile head/www/mod_security21/Makefile head/www/mod_wsgi/Makefile head/www/suphp/Makefile Modified: head/www/cas/Makefile ============================================================================== --- head/www/cas/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/cas/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: cas -# Date created: 24 Nov 2011 -# Whom: Alexander Lunkov -# +# Created by: Alexander Lunkov # $FreeBSD$ -# PORTNAME= cas PORTVERSION= 3.5.5 @@ -22,29 +18,51 @@ USE_LDCONFIG= yes USE_ICONV= yes WITHOUT_NLS= yes -OPTIONS= DEBUG_MODE "Enable debug output" off \ - ENABLE_OPTIMIZATION "Enable optimization" on \ - BUILD_APACHE2X_MODULE "Build Apache 2.x module" on \ - BUILD_CURL_XMLRPC_CLIENT "Build cURL-based XMLRPC client" on \ - INSTALL_EXAMPLE_MODULES "Install example modules" off \ - INSTALL_CAS_LIBRARY "Install CAS library (libcas)" on \ - INSTALL_CAS_MODULES "Install CAS modules" on \ - INSTALL_CAS_HEADERS "Install CAS headers" on \ - INSTALL_CAS_CONFIGS "Install CAS configuration files" on \ - INSTALL_CAS_BINARIES "Install CAS binaries" on \ - INSTALL_CAS_DATA "Install CAS data files" on +OPTIONS_DEFINE= DEBUG_MODE \ + ENABLE_OPTIMIZATION \ + BUILD_APACHE2X_MODULE \ + BUILD_CURL_XMLRPC_CLIENT \ + INSTALL_EXAMPLE_MODULES \ + INSTALL_CAS_LIBRARY \ + INSTALL_CAS_MODULES \ + INSTALL_CAS_HEADERS \ + INSTALL_CAS_CONFIGS \ + INSTALL_CAS_BINARIES \ + INSTALL_CAS_DATA + +OPTIONS_DEFAULT=ENABLE_OPTIMIZATION \ + BUILD_APACHE2X_MODULE \ + BUILD_CURL_XMLRPC_CLIENT \ + INSTALL_CAS_LIBRARY \ + INSTALL_CAS_MODULES \ + INSTALL_CAS_HEADERS \ + INSTALL_CAS_CONFIGS \ + INSTALL_CAS_BINARIES \ + INSTALL_CAS_DATA + +DEBUG_MODE_DESC= Enable debug output +ENABLE_OPTIMIZATION_DESC= Enable optimization +BUILD_APACHE2X_MODULE_DESC= Build Apache 2.x module +BUILD_CURL_XMLRPC_CLIENT_DESC= Build cURL-based XMLRPC client +INSTALL_EXAMPLE_MODULES_DESC= Install example modules +INSTALL_CAS_LIBRARY_DESC= Install CAS library (libcas) +INSTALL_CAS_MODULES_DESC= Install CAS modules +INSTALL_CAS_HEADERS_DESC= Install CAS headers +INSTALL_CAS_CONFIGS_DESC= Install CAS configuration files +INSTALL_CAS_BINARIES_DESC= Install CAS binaries +INSTALL_CAS_DATA_DESC= Install CAS data files PLIST_SUB+= PORTVERSION=${PORTVERSION} .include -.if defined(WITH_DEBUG_MODE) +.if ${PORT_OPTIONS:MDEBUG_MODE} CMAKE_ARGS+= -DDEBUG_MODE=ON .else CMAKE_ARGS+= -DDEBUG_MODE=OFF .endif -.if defined(WITH_ENABLE_OPTIMIZATION) +.if ${PORT_OPTIONS:MENABLE_OPTIMIZATION} CMAKE_ARGS+= -DENABLE_OPTIMIZATION=ON .else CMAKE_ARGS+= -DENABLE_OPTIMIZATION=OFF @@ -52,7 +70,7 @@ CMAKE_ARGS+= -DENABLE_OPTIMIZATION=OFF # XXX apache13 was removed from portstree # XXX -##.if defined(WITH_BUILD_APACHE13_MODULE) +##.if ${PORT_OPTIONS:MBUILD_APACHE13_MODULE} ##CMAKE_ARGS+= -DBUILD_APACHE13_MODULE=ON ##USE_APACHE= 13 ##PLIST_SUB+= APACHE13_MODULE="" @@ -61,8 +79,8 @@ CMAKE_ARGS+= -DBUILD_APACHE13_MODULE=OFF PLIST_SUB+= APACHE13_MODULE="@comment " ##.endif -.if defined(WITH_BUILD_APACHE2X_MODULE) -USE_APACHE= 22+ +.if ${PORT_OPTIONS:MBUILD_APACHE2X_MODULE} +USE_APACHE= 22 CMAKE_ARGS+= -DBUILD_APACHE2X_MODULE=ON PLIST_SUB+= APACHE2X_MODULE="" .else @@ -70,7 +88,7 @@ CMAKE_ARGS+= -DBUILD_APACHE2X_MODULE=OFF PLIST_SUB+= APACHE2X_MODULE="@comment " .endif -.if defined(WITH_BUILD_CURL_XMLRPC_CLIENT) +.if ${PORT_OPTIONS:MBUILD_CURL_XMLRPC_CLIENT} LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl CMAKE_ARGS+= -DBUILD_CURL_XMLRPC_CLIENT=ON PLIST_SUB+= CURL_XMLRPC_CLIENT="" @@ -79,7 +97,7 @@ CMAKE_ARGS+= -DBUILD_CURL_XMLRPC_CLIENT= PLIST_SUB+= CURL_XMLRPC_CLIENT="@comment " .endif -.if defined(WITH_INSTALL_EXAMPLE_MODULES) +.if ${PORT_OPTIONS:MINSTALL_EXAMPLE_MODULES} CMAKE_ARGS+= -DINSTALL_EXAMPLE_MODULES=ON PLIST_SUB+= EXAMPLE_MODULES="" .else @@ -87,7 +105,7 @@ CMAKE_ARGS+= -DINSTALL_EXAMPLE_MODULES=O PLIST_SUB+= EXAMPLE_MODULES="@comment " .endif -.if defined(WITH_INSTALL_CAS_LIBRARY) +.if ${PORT_OPTIONS:MINSTALL_CAS_LIBRARY} CMAKE_ARGS+= -DINSTALL_CAS_LIBRARY=ON PLIST_SUB+= CAS_LIBRARY="" .else @@ -95,7 +113,7 @@ CMAKE_ARGS+= -DINSTALL_CAS_LIBRARY=OFF PLIST_SUB+= CAS_LIBRARY="@comment " .endif -.if defined(WITH_INSTALL_CAS_MODULES) +.if ${PORT_OPTIONS:MINSTALL_CAS_MODULES} CMAKE_ARGS+= -DINSTALL_CAS_MODULES=ON PLIST_SUB+= CAS_MODULES="" .else @@ -103,7 +121,7 @@ CMAKE_ARGS+= -DINSTALL_CAS_MODULES=OFF PLIST_SUB+= CAS_MODULES="@comment " .endif -.if defined(WITH_INSTALL_CAS_HEADERS) +.if ${PORT_OPTIONS:MINSTALL_CAS_HEADERS} CMAKE_ARGS+= -DINSTALL_CAS_HEADERS=ON PLIST_SUB+= CAS_HEADERS="" .else @@ -111,7 +129,7 @@ CMAKE_ARGS+= -DINSTALL_CAS_HEADERS=OFF PLIST_SUB+= CAS_HEADERS="@comment " .endif -.if defined(WITH_INSTALL_CAS_CONFIGS) +.if ${PORT_OPTIONS:MINSTALL_CAS_CONFIGS} CMAKE_ARGS+= -DINSTALL_CAS_CONFIGS=ON PLIST_SUB+= CAS_CONFIGS="" .else @@ -119,7 +137,7 @@ CMAKE_ARGS+= -DINSTALL_CAS_CONFIGS=OFF PLIST_SUB+= CAS_CONFIGS="@comment " .endif -.if defined(WITH_INSTALL_CAS_BINARIES) +.if ${PORT_OPTIONS:MINSTALL_CAS_BINARIES} CMAKE_ARGS+= -DINSTALL_CAS_BINARIES=ON PLIST_SUB+= CAS_BINARIES="" .else @@ -127,7 +145,7 @@ CMAKE_ARGS+= -DINSTALL_CAS_BINARIES=OFF PLIST_SUB+= CAS_BINARIES="@comment " .endif -.if defined(WITH_INSTALL_CAS_DATA) +.if ${PORT_OPTIONS:MINSTALL_CAS_DATA} CMAKE_ARGS+= -DINSTALL_CAS_DATA=ON PLIST_SUB+= CAS_DATA="" .else Modified: head/www/gnome-user-share/Makefile ============================================================================== --- head/www/gnome-user-share/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/gnome-user-share/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,10 +1,5 @@ -# New ports collection makefile for: gnome-user-share -# Date created: 26 November 2004 -# Whom: Joe Marcus Clarke -# +# Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/www/gnome-user-share/Makefile,v 1.26 2011/04/30 20:43:27 mezz Exp $ -# PORTNAME= gnome-user-share PORTVERSION= 2.30.1 @@ -26,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_APACHE= 22+ +USE_APACHE= 22 USE_XORG= sm USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils nautilus2 GNU_CONFIGURE= yes Modified: head/www/mod_antiloris/Makefile ============================================================================== --- head/www/mod_antiloris/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_antiloris/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_antiloris -# Date created: 20 August 2009 -# Whom: Aleksandar Pejic -# +# Created by: Aleksandar Pejic # $FreeBSD$ -# PORTNAME= mod_antiloris PORTVERSION= 0.4 @@ -17,7 +13,7 @@ COMMENT= Protect Apache 2.x against the MAKE_JOBS_SAFE= yes USE_BZIP2= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes AP_EXTRAS+= -a Modified: head/www/mod_auth_cookie_mysql2/Makefile ============================================================================== --- head/www/mod_auth_cookie_mysql2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_auth_cookie_mysql2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,7 +1,4 @@ -# New ports collection makefile for: mod_auth_cookie_mysql2 -# Date created: Sun Aug 8 2004 -# Whom: clement -# +# Created by: clement # $FreeBSD$ PORTNAME= mod_auth_cookie_mysql2 @@ -18,7 +15,7 @@ COMMENT= Allows authentication against a MAKE_JOBS_SAFE= yes USE_MYSQL= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes Modified: head/www/mod_auth_external2/Makefile ============================================================================== --- head/www/mod_auth_external2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_auth_external2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,7 +1,4 @@ -# New ports collection makefile for: mod_auth_external2 -# Date created: Fri Oct 10 -# Whom: Clement Laforet -# +# Created by: Clement Laforet # $FreeBSD$ PORTNAME= mod_auth_external @@ -16,7 +13,7 @@ COMMENT= Allows users authentication bas MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes LATEST_LINK= mod_auth_external2 Modified: head/www/mod_auth_form/Makefile ============================================================================== --- head/www/mod_auth_form/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_auth_form/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_auth_form -# Date created: Feb 10 2008 -# Whom: Tommy Scheunemann -# +# Created by: Tommy Scheunemann # $FreeBSD$ -# PORTNAME= mod_auth_form PORTVERSION= 2.05 @@ -21,7 +17,7 @@ MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_MYSQL= yes -USE_APACHE= 22+ +USE_APACHE= 22 GNU_CONFIGURE= yes CONFIGURE_ENV= MYSQL_PREFIX="${LOCALBASE}" APACHE2_PREFIX="${LOCALBASE}" \ Modified: head/www/mod_auth_kerb2/Makefile ============================================================================== --- head/www/mod_auth_kerb2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_auth_kerb2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,12 +1,5 @@ -# New ports collection makefile for: mod_auth_kerb -# Date created: 19 October 2001 -# Whom: wollman -# +# Created by: wollman # $FreeBSD$ -# - - -# Shamelessly stolen from will's mod_auth_any port. PORTNAME= mod_auth_kerb PORTVERSION= 5.4 @@ -22,7 +15,7 @@ MAKE_JOBS_SAFE= yes LATEST_LINK= mod_auth_kerb2 -USE_APACHE= 22+ +USE_APACHE= 22 USE_GMAKE= yes GNU_CONFIGURE= yes Modified: head/www/mod_auth_mellon/Makefile ============================================================================== --- head/www/mod_auth_mellon/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_auth_mellon/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_auth_mellon -# Date created: 2010-20-8 -# Whom: Tom Judge -# +# Created by: Tom Judge # $FreeBSD$ -# PORTNAME= mod_auth_mellon PORTVERSION= 0.3.0 @@ -21,7 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs2=${APXS} CONFIGURE_ENV+= OPENSSL_CFLAGS="-Wall" OPENSSL_LIBS="-lssl" -USE_APACHE= 22+ +USE_APACHE= 22 PLIST_FILES= ${APACHEMODDIR}/mod_auth_mellon.so Modified: head/www/mod_auth_mysql_another/Makefile ============================================================================== --- head/www/mod_auth_mysql_another/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_auth_mysql_another/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,7 +1,4 @@ -# New ports collection makefile for: apache mod_auth_mysql_another -# Date created: 2002/04/20 -# Whom: mbr@freebsd.org -# +# Created by: mbr@freebsd.org # $FreeBSD$ PORTNAME= mod_auth_mysql @@ -17,7 +14,7 @@ COMMENT= Allows users to use MySQL datab MAKE_JOBS_SAFE= yes USE_MYSQL= yes -USE_APACHE= 22+ +USE_APACHE= 22 SHORTMODNAME= mysql_auth AP_FAST_BUILD= yes Modified: head/www/mod_auth_openid/Makefile ============================================================================== --- head/www/mod_auth_openid/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_auth_openid/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_auth_openid -# Date created: 3 August 2008 -# Whom: Sutra Zhou -# +# Created by: Sutra Zhou # $FreeBSD$ -# PORTNAME= mod_auth_openid PORTVERSION= 0.6 @@ -22,7 +18,7 @@ MAKE_JOBS_SAFE= yes PLIST_FILES= ${APACHEMODDIR}/mod_auth_openid.so -USE_APACHE= 22+ +USE_APACHE= 22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pcre=${LOCALBASE} Modified: head/www/mod_auth_pgsql2/Makefile ============================================================================== --- head/www/mod_auth_pgsql2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_auth_pgsql2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,7 +1,4 @@ -# New ports collection makefile for: mod_auth_pgsql2 -# Date created: Mon Oct 6 -# Whom: Clement Laforet -# +# Created by: Clement Laforet # $FreeBSD$ PORTNAME= mod_auth_pgsql @@ -16,7 +13,7 @@ COMMENT= Allows users to use PostgreSQL MAKE_JOBS_SAFE= yes USE_PGSQL= yes -USE_APACHE= 22+ +USE_APACHE= 22 LATEST_LINK= mod_auth_pgsql2 Modified: head/www/mod_auth_tkt/Makefile ============================================================================== --- head/www/mod_auth_tkt/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_auth_tkt/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_auth_tkt -# Date created: 2 Feb 2011 -# Whom: Jun Kuriyama -# +# Created by: Jun Kuriyama # $FreeBSD$ -# PORTNAME= mod_auth_tkt PORTVERSION= 2.1.0 @@ -15,7 +11,7 @@ MASTER_SITE_SUBDIR= kuriyama MAINTAINER= kuriyama@FreeBSD.org COMMENT= Lightweight single-sign-on authentication module for apache -USE_APACHE= 22+ +USE_APACHE= 22 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src AP_FAST_BUILD= yes SRC_FILE= ${PORTNAME}.c sha2.c Modified: head/www/mod_auth_xradius/Makefile ============================================================================== --- head/www/mod_auth_xradius/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_auth_xradius/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,7 +1,4 @@ -# New ports collection makefile for: mod_auth_xradius -# Date created: 1 Jul 2007 -# Whom: mwlucas -# +# Created by: mwlucas # $FreeBSD$ PORTNAME= mod_auth_xradius @@ -16,7 +13,7 @@ COMMENT= Enables RADIUS authentication MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 USE_BZIP2= yes GNU_CONFIGURE= yes Modified: head/www/mod_authn_otp/Makefile ============================================================================== --- head/www/mod_authn_otp/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_authn_otp/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,8 +1,5 @@ -# New ports collection makefile for: ifdepd -# Date created: 03 05 2012 -# Whom: Alexander Hausner +# Created by: Alexander Hausner # $FreeBSD$ -# PORTNAME= mod_authn_otp PORTVERSION= 1.1.4 @@ -19,7 +16,7 @@ COMMENT= Apache module for one-time pass MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes -USE_APACHE= 22+ +USE_APACHE= 22 MAN1= otptool.1 Modified: head/www/mod_authz_unixgroup/Makefile ============================================================================== --- head/www/mod_authz_unixgroup/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_authz_unixgroup/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_authz_unixgroup -# Date created: July 18, 2007 -# Whom: Will Stacey -# +# Created by: Will Stacey # $FreeBSD$ -# PORTNAME= mod_authz_unixgroup PORTVERSION= 1.0.1 @@ -16,7 +12,7 @@ COMMENT= A unix group access control mod MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes SHORTMODNAME= authz_unixgroup Modified: head/www/mod_bw/Makefile ============================================================================== --- head/www/mod_bw/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_bw/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_bw -# Date created: Sep 11 2005 -# Whom: Clement Laforet -# +# Created by: Clement Laforet # $FreeBSD$ -# PORTNAME= mod_bw PORTVERSION= 0.8 @@ -19,7 +15,7 @@ COMMENT= Bandwidth and Connection contro MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/mod_bw -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes Modified: head/www/mod_cband/Makefile ============================================================================== --- head/www/mod_cband/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_cband/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_cband -# Date created: Sep 7 2005 -# Whom: Clement Laforet -# +# Created by: Clement Laforet # $FreeBSD$ -# PORTNAME= mod_cband PORTVERSION= 0.9.7.5 @@ -20,7 +16,7 @@ COMMENT= A per-virtualhost bandwidth lim MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apxs=${APXS} ALL_TARGET= # Modified: head/www/mod_cplusplus/Makefile ============================================================================== --- head/www/mod_cplusplus/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_cplusplus/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# Ports collection makefile for: mod_cplusplus for Apache 2.x -# Date created: Dec 29, 2006 -# Whom: Michael Durian -# +# Created by: Michael Durian # $FreeBSD$ -# PORTNAME= mod_cplusplus PORTVERSION= 1.5.4 @@ -17,7 +13,7 @@ COMMENT= Apache module for loading C++ o MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 USE_AUTOTOOLS= autoconf autoheader libtool automake aclocal CFLAGS+= -I${LOCALBASE}/include Modified: head/www/mod_evasive/Makefile ============================================================================== --- head/www/mod_evasive/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_evasive/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_dosevasive20 -# Date created: 26 Jul 2004 -# Whom: Xavier Beaudouin -# +# Created by: Xavier Beaudouin # $FreeBSD$ -# PORTNAME= mod_evasive PORTVERSION= 1.10.1 @@ -20,7 +16,7 @@ MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME} -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes Modified: head/www/mod_extract_forwarded/Makefile ============================================================================== --- head/www/mod_extract_forwarded/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_extract_forwarded/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_extract_forwarded -# Date created: 9 June 2001 -# Whom: Anders Nordby -# +# Created by: Anders Nordby # $FreeBSD$ -# PORTNAME= mod_extract_forwarded PORTVERSION= 2.0.2 @@ -15,7 +11,7 @@ DISTNAME= extract_forwarded-${DISTVERSIO MAINTAINER= kuriyama@FreeBSD.org COMMENT= An Apache module that can make proxied requests appear with client IP -USE_APACHE= 22+ +USE_APACHE= 22 WRKSRC= ${WRKDIR}/extract_forwarded PORTDOCS= INSTALL README MAKE_JOBS_SAFE= yes Modified: head/www/mod_fastcgi/Makefile ============================================================================== --- head/www/mod_fastcgi/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_fastcgi/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_fastcgi ( in apache ) -# Date created: 14 Jul 2000 -# Whom: JunSeon Oh -# +# Created by: JunSeon Oh # $FreeBSD$ -# PORTNAME= mod_fastcgi PORTVERSION= 2.4.6 @@ -17,7 +13,7 @@ COMMENT= A fast-cgi module for Apache MAKE_JOBS_SAFE= yes CONFLICTS= apache-contrib-1.* -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= *.c Modified: head/www/mod_ftp/Makefile ============================================================================== --- head/www/mod_ftp/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_ftp/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_ftp -# Date created: June 21, 2011 Oct 5 -# Whom: Mikhail Teterin -# +# Created by: Mikhail Teterin # $FreeBSD$ -# PORTNAME= mod_ftp DISTVERSION= 0.9.6-beta @@ -18,7 +14,7 @@ MAKE_JOBS_SAFE= yes USE_BZIP2= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} -USE_APACHE= 22+ +USE_APACHE= 22 HAS_CONFIGURE= yes CONFIGURE_SCRIPT=configure.apxs CONFIGURE_ENV+= APXS="${APXS}" Modified: head/www/mod_geoip2/Makefile ============================================================================== --- head/www/mod_geoip2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_geoip2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_geoip2 -# Date created: 26 Aug 2005 -# Whom: Jukka A. Ukkonen -# +# Created by: Jukka A. Ukkonen # $FreeBSD$ -# PORTNAME= mod_geoip2 PORTVERSION= 1.2.7 @@ -25,7 +21,7 @@ CONFLICTS= mod_geoip-[0-9]* WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} -USE_APACHE= 22+ +USE_APACHE= 22 MODULENAME= mod_geoip AP_FAST_BUILD= yes AP_GENPLIST= yes Modified: head/www/mod_gnutls/Makefile ============================================================================== --- head/www/mod_gnutls/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_gnutls/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_gnutls -# Date created: 2011-01-19 -# Whom: Fumiyuki Shimizu -# +# Created by: Fumiyuki Shimizu # $FreeBSD$ -# PORTNAME= mod_gnutls PORTVERSION= 0.5.10 @@ -24,7 +20,7 @@ LIB_DEPENDS= gnutls.47:${PORTSDIR}/secur USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_PKGCONFIG= build -USE_APACHE= 22+ +USE_APACHE= 22 GNU_CONFIGURE= yes DOCS= LICENSE NEWS README README.ENV Modified: head/www/mod_hosts_access/Makefile ============================================================================== --- head/www/mod_hosts_access/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_hosts_access/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_hosts_access -# Date created: 10 April 2001 -# Whom: will -# +# Created by: will # $FreeBSD$ -# PORTNAME= mod_hosts_access PORTVERSION= 1.1.0 @@ -16,7 +12,7 @@ COMMENT= Apache module that makes Apache MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes Modified: head/www/mod_jk-apache2/Makefile ============================================================================== --- head/www/mod_jk-apache2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_jk-apache2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,12 +1,8 @@ -# New ports collection makefile for: mod_jk -# Date created: Thu Apr 10 15:14:37 EDT 2003 -# Whom: Larry Lansing -# +# Created by: Larry Lansing # $FreeBSD$ -# MASTERDIR= ${.CURDIR}/../mod_jk -USE_APACHE= 22+ +USE_APACHE= 22 PORTREVISION= 2 PORTEPOCH= 0 LATEST_LINK= mod_jk-ap2 Modified: head/www/mod_limitipconn2/Makefile ============================================================================== --- head/www/mod_limitipconn2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_limitipconn2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_limitipconn2 -# Date created: 18 November 2003 -# Whom: Gea-Suan Lin -# +# Created by: Gea-Suan Lin # $FreeBSD$ -# PORTNAME= mod_limitipconn PORTVERSION= 0.23 @@ -20,7 +16,7 @@ MAKE_JOBS_SAFE= yes LATEST_LINK= mod_limitipconn2 -USE_APACHE= 22+ +USE_APACHE= 22 USE_BZIP2= yes AP_FAST_BUILD= yes Modified: head/www/mod_lisp2/Makefile ============================================================================== --- head/www/mod_lisp2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_lisp2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# Ports collection makefile for: mod_lisp2 -# Date created: Tue Jul 17 2007 -# Whom: vl -# +# Created by: vl # $FreeBSD$ -# PORTNAME= mod_lisp2 PORTVERSION= 1.3.1 @@ -16,7 +12,7 @@ COMMENT= Apache2 module for use with Com MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes Modified: head/www/mod_log_config-st/Makefile ============================================================================== --- head/www/mod_log_config-st/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_log_config-st/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_log_config-st -# Date created: Sun May 2 2004 -# Whom: Clement Laforet -# +# Created by: Clement Laforet # $FreeBSD$ -# PORTNAME= mod_log_config-st PORTVERSION= 1.0 @@ -18,7 +14,7 @@ COMMENT= A modified version of mod_log_c MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes SRC_FILE= mod_log_config.c Modified: head/www/mod_log_dbd/Makefile ============================================================================== --- head/www/mod_log_dbd/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_log_dbd/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,7 +1,4 @@ -# New ports collection makefile for: mod_log_dbd -# Date created: 2006/01/19 -# Whom: Brandon Fosdick -# +# Created by: Brandon Fosdick # $FreeBSD$ PORTNAME= mod_log_dbd @@ -16,7 +13,7 @@ COMMENT= Uses APR DBD to store Apache ac MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apache=${PREFIX} Modified: head/www/mod_log_sql2-dtc/Makefile ============================================================================== --- head/www/mod_log_sql2-dtc/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_log_sql2-dtc/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,7 +1,4 @@ -# New ports collection makefile for: mod_log_sql2-dtc -# Date created: 2006/11/20 -# Whom: Marc G. Fournier -# +# Created by: Marc G. Fournier # $FreeBSD$ PORTNAME= mod_log_sql @@ -21,7 +18,7 @@ LATEST_LINK= mod_log_sql2-dtc GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_APACHE= 22+ +USE_APACHE= 22 CONFIGURE_ARGS+= --with-apxs=${APXS} SSL_PLIST= "" PLIST_SUB+= SSL=${SSL_PLIST} Modified: head/www/mod_log_sql2/Makefile ============================================================================== --- head/www/mod_log_sql2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_log_sql2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,7 +1,4 @@ -# New ports collection makefile for: mod_log_sql2 -# Date created: 2001/11/22 -# Whom: Clement Laforet -# +# Created by: Clement Laforet # $FreeBSD$ PORTNAME= mod_log_sql @@ -26,7 +23,7 @@ APACHE2X= "" PLIST_SUB+= SSL=${SSL_PLIST} APACHE2X=${APACHE2X} USE_MYSQL= yes -USE_APACHE= 22+ +USE_APACHE= 22 CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql" .include Modified: head/www/mod_memcache_block/Makefile ============================================================================== --- head/www/mod_memcache_block/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_memcache_block/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_memcache_block -# Date created: 2012-08-21 -# Whom: Hung-Yi Chen -# +# Created by: Hung-Yi Chen # $FreeBSD$ -# PORTNAME= mod_memcache_block PORTVERSION= 20120821 @@ -22,7 +18,7 @@ GITVERSION= 7b1fcec WRKSRC= ${WRKDIR}/netik-${DISTNAME} LATEST_LINK= mod_memcache_block -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes AP_INC= ${LOCALBASE}/include/libmemcached Modified: head/www/mod_mono/Makefile ============================================================================== --- head/www/mod_mono/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_mono/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,10 +1,5 @@ -# New ports collection makefile for: mod_mono -# Date created: 20040828 -# Whom: Tom McLaughlin -# +# Created by: Tom McLaughlin # $FreeBSD$ -# $Id: Makefile,v 1.39 2007/12/13 19:35:47 killfill Exp $ -# PORTNAME= mod_mono PORTVERSION= 2.10 @@ -21,7 +16,7 @@ BUILD_DEPENDS= mono:${PORTSDIR}/lang/mon RUN_DEPENDS= mono:${PORTSDIR}/lang/mono \ xsp:${PORTSDIR}/www/xsp -USE_APACHE= 22+ +USE_APACHE= 22 USE_BZIP2= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --man=${PREFIX}/man Modified: head/www/mod_musicindex/Makefile ============================================================================== --- head/www/mod_musicindex/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_musicindex/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_musicindex -# Date created: Nov 1 2003 -# Whom: clsung -# +# Created by: clsung # $FreeBSD$ -# PORTNAME= mod_musicindex PORTVERSION= 1.3.7 @@ -16,7 +12,7 @@ COMMENT= Apache module that allows downl LICENSE= LGPL21 -USE_APACHE= 22+ +USE_APACHE= 22 .include Modified: head/www/mod_ntlm2/Makefile ============================================================================== --- head/www/mod_ntlm2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_ntlm2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_ntlm2 -# Date created: 26 September 2007 -# Whom: Alex "lissyara" Keda -# +# Created by: Alex "lissyara" Keda # $FreeBSD$ -# PORTNAME= mod_ntlm2 PORTVERSION= 0.1 @@ -22,7 +18,7 @@ SAMBA_PORT?= net/samba34 MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 MAKE_ENV= APXS=${APXS} .include Modified: head/www/mod_perl2/Makefile ============================================================================== --- head/www/mod_perl2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_perl2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -29,11 +29,6 @@ PERL_CONFIGURE= yes GMAKE= yes USE_CSTD= gnu89 -# 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} - MAN3= APR.3 APR::Base64.3 APR::Brigade.3 APR::Bucket.3 \ APR::BucketAlloc.3 APR::BucketType.3 APR::Const.3 \ APR::Date.3 APR::Error.3 APR::Finfo.3 APR::IpSubnet.3 \ @@ -70,6 +65,12 @@ MAN3= APR.3 APR::Base64.3 APR::Brigade. .include +# 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) APR_H= ${LOCALBASE}/include/apr-1/apr.h APR_MAJ_V!= ${ECHO_CMD} `${LOCALBASE}/bin/apr-1-config --version | ${SED} -e 's,\..*,,'` Modified: head/www/mod_python3/Makefile ============================================================================== --- head/www/mod_python3/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_python3/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_python -# Date created: 28 August 2000 -# Whom: Hye-Shik Chang -# +# Created by: Hye-Shik Chang # $FreeBSD$ -# PORTNAME= mod_python PORTVERSION= 3.3.1 @@ -19,7 +15,7 @@ COMMENT= Apache module that embeds the P MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 USE_PYTHON= yes MAKE_ARGS+= APXS=${APXS} Modified: head/www/mod_remoteip/Makefile ============================================================================== --- head/www/mod_remoteip/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_remoteip/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_remoteip -# Date created: 2010-05-11 -# Whom: Jim Riggs -# +# Created by: Jim Riggs # $FreeBSD$ -# PORTNAME= mod_remoteip PORTVERSION= 2.3.5.a @@ -16,7 +12,7 @@ COMMENT= Replaces the client IP address/ MAKE_JOBS_SAFE= yes -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes Modified: head/www/mod_rpaf2/Makefile ============================================================================== --- head/www/mod_rpaf2/Makefile Sat Sep 22 21:06:17 2012 (r304722) +++ head/www/mod_rpaf2/Makefile Sat Sep 22 21:15:50 2012 (r304723) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mod_rpaf2 -# Date created: Mar 17, 2003 -# Whom: Clement Laforet *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***