From owner-freebsd-apache@FreeBSD.ORG Sat Jun 25 23:41:07 2011 Return-Path: Delivered-To: apache@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8CC4106566C; Sat, 25 Jun 2011 23:41:07 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de [87.139.233.65]) by mx1.freebsd.org (Postfix) with ESMTP id 62EE88FC14; Sat, 25 Jun 2011 23:41:07 +0000 (UTC) Received: from [192.168.0.100] (unknown [192.168.0.100]) (Authenticated sender: ohauer) by p578be941.dip0.t-ipconnect.de (Postfix) with ESMTPSA id 50BCB206A8; Sun, 26 Jun 2011 01:21:18 +0200 (CEST) Message-ID: <4E066D7A.50603@FreeBSD.org> Date: Sun, 26 Jun 2011 01:21:30 +0200 From: Olli Hauer User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.18) Gecko/20110616 Thunderbird/3.1.11 MIME-Version: 1.0 To: apache@FreeBSD.org X-Enigmail-Version: 1.1.1 Content-Type: multipart/mixed; boundary="------------090008080102030204070403" Cc: "Philip M. Gollucci" Subject: [patch] to notify users about the deprecation of apache13/20 without touching any port X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ohauer@FreeBSD.org List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jun 2011 23:41:07 -0000 This is a multi-part message in MIME format. --------------090008080102030204070403 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Hi Philip, what do you think about the following patch to note user about the deprecation of apache13/20? -- olli --------------090008080102030204070403 Content-Type: text/plain; name="bsd.apache.mk_apache13_and_20_global-note_2011-06-25.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="bsd.apache.mk_apache13_and_20_global-note_2011-06-25.txt" Index: ports/Mk/bsd.apache.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.apache.mk,v retrieving revision 1.29 diff -u -r1.29 bsd.apache.mk --- ports/Mk/bsd.apache.mk 15 May 2011 20:21:30 -0000 1.29 +++ ports/Mk/bsd.apache.mk 25 Jun 2011 23:08:53 -0000 @@ -346,6 +346,20 @@ _APACHE_VERSION_MAXIMUM_TMP:= ${_APACHE_VERSION_CHECK:C/.*-([1-9][0-9])/\1/} _APACHE_VERSION_MAXIMUM:= ${_APACHE_VERSION_MAXIMUM_TMP:M[1-9][0-9]} +# Note users about the removal of apache13/20 and apache13/20 only ports +# (mass deprecation without touching all ports ;) +.if !defined(DEPRECATED) && !empty(_APACHE_VERSION_MAXIMUM) +. if ${_APACHE_VERSION_MAXIMUM} == 20 +DEPRECATED= will be unsupported by ASF when 2.4.0 is released, migrate to 2.2.x+ now +. endif +. if ${_APACHE_VERSION_MAXIMUM} == 13 +DEPRECATED= apache13 is unsupported upstream, migrate to 2.2.x+ now +. if !defined(EXPIRATION_DATE) +EXPIRATION_DATE= the next FreeBSD release +. endif +. endif +.endif + .if defined(_APACHE_VERSION) # Validate Apache version whether it meets USE_APACHE version restriction. . if !empty(_APACHE_VERSION_MINIMUM) && (${_APACHE_VERSION} < ${_APACHE_VERSION_MINIMUM}) --------------090008080102030204070403--