Date: Thu, 4 Jul 2013 06:40:12 GMT From: Jason Helfman <jgh@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: apache@FreeBSD.org Subject: ports/180248: [patch] www/apache22: update to 2.2.25, drop warnings on WITH/WITHOUT Message-ID: <201307040640.r646eCk3070507@freefall.freebsd.org> Resent-Message-ID: <201307040650.r646o0A7070779@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180248
>Category: ports
>Synopsis: [patch] www/apache22: update to 2.2.25, drop warnings on WITH/WITHOUT
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 04 06:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r252008: Wed Jun 19 21:39:58 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64
>Description:
update to 2.2.25
drop warnings on WITH/WITHOUT for old options framework
pet portlint space -> tab
>How-To-Repeat:
>Fix:
Index: www/apache22/Makefile
===================================================================
--- www/apache22/Makefile (revision 322263)
+++ www/apache22/Makefile (working copy)
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= apache22
-PORTVERSION= 2.2.24
-#PORTREVISION?= 1
+PORTVERSION= 2.2.25
+PORTREVISION?= 0
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= httpd-${PORTVERSION}
@@ -46,15 +46,6 @@
.include "${APACHEDIR}/Makefile.options"
-# stop users from using old WITH/WITHOUT parameters
-.for opt in ${OPTIONS_DEFINE}
-. if defined(WITH_${opt}) || defined(WITHOUT_${opt})
-BROKEN= WITH/WITHOUT parameters are obsolete. \
- The port use the new options NG framework. Please read\
- http://wiki.freebsd.org/Ports/Options/OptionsNG
-. endif
-.endfor
-
.for category in ${ALL_MODULES_CATEGORIES}
. if defined(WITH_${category}_MODULES)
BROKEN= WITH/WITHOUT_..._MODULES parameters are obsolete. \
@@ -116,7 +107,7 @@
.endif
.if ${PORT_OPTIONS:MSUEXEC_USERDIR}
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_userdir
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_userdir
. if empty(PORT_OPTIONS:MSUEXEC)
IGNORE= suEXEC UserDir patch requires mod_suexec.\
Please (re)run 'make config' and choose SUEXEC option also
Index: www/apache22/distinfo
===================================================================
--- www/apache22/distinfo (revision 322263)
+++ www/apache22/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (apache22/httpd-2.2.24.tar.bz2) = 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7
-SIZE (apache22/httpd-2.2.24.tar.bz2) = 5490439
+SHA256 (apache22/httpd-2.2.25.tar.bz2) = 4bcaf3524796a514b31aa5c64ce80b0cdb484bab5735416de29d00f6d50fa65a
+SIZE (apache22/httpd-2.2.25.tar.bz2) = 5524905
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307040640.r646eCk3070507>