Date: Tue, 26 Mar 2013 21:31:27 +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: r315333 - in head: Mk www/apache22 Message-ID: <201303262131.r2QLVROi020550@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Tue Mar 26 21:31:27 2013 New Revision: 315333 URL: http://svnweb.freebsd.org/changeset/ports/315333 Log: - prepare for apache24 Modified: head/Mk/bsd.apache.mk head/www/apache22/Makefile Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Tue Mar 26 21:22:45 2013 (r315332) +++ head/Mk/bsd.apache.mk Tue Mar 26 21:31:27 2013 (r315333) @@ -81,7 +81,7 @@ Apache_Pre_Include= bsd.apache.mk DEFAULT_APACHE_VERSION= 22 -APACHE_SUPPORTED_VERSION= 22 # preferred version first +APACHE_SUPPORTED_VERSION= 22 24 # preferred version first # Print warnings _ERROR_MSG= : Error from bsd.apache.mk. @@ -93,9 +93,9 @@ _ERROR_MSG= : Error from bsd.apache.mk. .if defined(USE_APACHE) && !empty(USE_APACHE) . if ${USE_APACHE:Mcommon*} != "" AP_PORT_IS_SERVER= yes -. elif ${USE_APACHE:C/\-//:S/^22//:C/\+$//} == "" +. elif ${USE_APACHE:C/\-//:S/^22//:S/^24//:C/\+$//} == "" AP_PORT_IS_MODULE= yes -. if ${USE_APACHE:C/\-//:S/^22//} == "+" +. if ${USE_APACHE:C/\-//:S/^22//:S/^24//} == "+" AP_PLUS= yes . endif . else @@ -382,7 +382,7 @@ AP_EXTRAS+= -L ${AP_LIB} Apache_Post_Include= bsd.apache.mk .if defined(USE_APACHE_RUN) && !empty(USE_APACHE_RUN) -. if ${USE_APACHE_RUN:C/\-//:S/^22//:C/\+$//} != "" +. if ${USE_APACHE_RUN:C/\-//:S/^22//:S/^24//:C/\+$//} != "" IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_RUN ( ${USE_APACHE_RUN} ) . endif .elif defined(USE_APACHE_RUN) @@ -390,7 +390,7 @@ IGNORE= ${_ERROR_MSG} Illegal use of USE .endif .if defined(USE_APACHE_BUILD) && !empty(USE_APACHE_BUILD) -. if ${USE_APACHE_BUILD:C/\-//:S/^22//:C/\+$//} != "" +. if ${USE_APACHE_BUILD:C/\-//:S/^22//:S/^24//:C/\+$//} != "" IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_BUILD ( ${USE_APACHE_BUILD} ) . endif .elif defined(USE_APACHE_BUILD) Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Tue Mar 26 21:22:45 2013 (r315332) +++ head/www/apache22/Makefile Tue Mar 26 21:31:27 2013 (r315333) @@ -19,9 +19,9 @@ MAKE_JOBS_SAFE= yes LATEST_LINK?= apache22 -CONFLICTS= caudium14-1.* \ - apache-2.0.* apache-*-2.0.* \ - apache-*-2.2.* apache22-*-2.2.* +CONFLICTS_INSTALL= caudium14-1.* \ + apache-*-2.2.* apache22-*-2.2.* \ + apache-*-2.4.* apache24-*-2.4.* USE_APACHE= common22 USE_BZIP2= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303262131.r2QLVROi020550>