From owner-svn-ports-all@freebsd.org Thu May 5 20:07:28 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2AD3B2FBA2; Thu, 5 May 2016 20:07:28 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD7EF1D44; Thu, 5 May 2016 20:07:28 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u45K7Rh7050877; Thu, 5 May 2016 20:07:27 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u45K7R2k050874; Thu, 5 May 2016 20:07:27 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201605052007.u45K7R2k050874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Thu, 5 May 2016 20:07:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414662 - in head/www: p5-RT-Authen-ExternalAuth p5-RT-Extension-LDAPImport p5-RT-Extension-SLA X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 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: Thu, 05 May 2016 20:07:29 -0000 Author: matthew Date: Thu May 5 20:07:27 2016 New Revision: 414662 URL: https://svnweb.freebsd.org/changeset/ports/414662 Log: Add option to allow compiling for www/rt44, and make that the default. (Except for www/p5-RT-Extension-SLA, as the SLA functionality is now an integral part of rt44) Refactor the option handling code. Modified: head/www/p5-RT-Authen-ExternalAuth/Makefile head/www/p5-RT-Extension-LDAPImport/Makefile head/www/p5-RT-Extension-SLA/Makefile Modified: head/www/p5-RT-Authen-ExternalAuth/Makefile ============================================================================== --- head/www/p5-RT-Authen-ExternalAuth/Makefile Thu May 5 19:55:40 2016 (r414661) +++ head/www/p5-RT-Authen-ExternalAuth/Makefile Thu May 5 20:07:27 2016 (r414662) @@ -3,7 +3,7 @@ PORTNAME= RT-Authen-ExternalAuth DISTVERSION= 0.25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -23,17 +23,18 @@ NO_ARCH= yes USES+= perl5 USE_PERL5= configure -OPTIONS_SINGLE= RTVERSION -OPTIONS_SINGLE_RTVERSION= RT40 RT42 -RT40_DESC= Install for rt-4.0.x (www/rt40) -RT42_DESC= Install for rt-4.2.x (www/rt42) -OPTIONS_DEFAULT= RT42 +OPTIONS_SINGLE= RTVERSION +OPTIONS_SINGLE_RTVERSION= RT40 RT42 RT44 +RT40_DESC= Install for rt-4.0.x (www/rt40) +RT42_DESC= Install for rt-4.2.x (www/rt42) +RT44_DESC= Install for rt-4.4.x (www/rt44) +OPTIONS_DEFAULT= RT44 .include -.for opt in 40 42 -.if ${PORT_OPTIONS:MRT${opt}} -RT_VER= ${opt} +.for opt in ${OPTIONS_SINGLE_RTVERSION} +.if ${PORT_OPTIONS:M${opt}} +RT_VER= ${opt:S/RT//} .endif .endfor @@ -48,7 +49,7 @@ MAN3PREFIX= ${PREFIX} PLIST_SUB+= RTHOME=share/rt${RT_VER} # Note: You can install using an arbitrary $PREFIX but only if it -# matches the $PREFIX used to install www/rt{40,42}. Hence ignore +# matches the $PREFIX used to install www/rt{40,42,44}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: Modified: head/www/p5-RT-Extension-LDAPImport/Makefile ============================================================================== --- head/www/p5-RT-Extension-LDAPImport/Makefile Thu May 5 19:55:40 2016 (r414661) +++ head/www/p5-RT-Extension-LDAPImport/Makefile Thu May 5 20:07:27 2016 (r414662) @@ -3,7 +3,7 @@ PORTNAME= RT-Extension-LDAPImport PORTVERSION= 0.36 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -23,17 +23,18 @@ NO_ARCH= yes USES+= perl5 USE_PERL5= configure -OPTIONS_SINGLE= RTVERSION -OPTIONS_SINGLE_RTVERSION= RT40 RT42 -RT40_DESC= Install for rt-4.0.x (www/rt40) -RT42_DESC= Install for rt-4.2.x (www/rt42) -OPTIONS_DEFAULT= RT42 +OPTIONS_SINGLE= RTVERSION +OPTIONS_SINGLE_RTVERSION= RT40 RT42 RT44 +RT40_DESC= Install for rt-4.0.x (www/rt40) +RT42_DESC= Install for rt-4.2.x (www/rt42) +RT44_DESC= Install for rt-4.4.x (www/rt44) +OPTIONS_DEFAULT= RT44 .include -.for opt in 38 40 42 -.if ${PORT_OPTIONS:MRT${opt}} -RT_VER= ${opt} +.for opt in ${OPTIONS_SINGLE_RTVERSION} +.if ${PORT_OPTIONS:M${opt}} +RT_VER= ${opt:S/RT//} .endif .endfor @@ -48,7 +49,7 @@ MAN3PREFIX= ${PREFIX} PLIST_SUB+= RTHOME=share/rt${RT_VER} # Note: You can install using an arbitrary $PREFIX but only if it -# matches the $PREFIX used to install www/rt{40,42}. Hence ignore +# matches the $PREFIX used to install www/rt{40,42,44}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: @cd ${CONFIGURE_WRKSRC} && \ Modified: head/www/p5-RT-Extension-SLA/Makefile ============================================================================== --- head/www/p5-RT-Extension-SLA/Makefile Thu May 5 19:55:40 2016 (r414661) +++ head/www/p5-RT-Extension-SLA/Makefile Thu May 5 20:07:27 2016 (r414662) @@ -31,9 +31,9 @@ OPTIONS_DEFAULT= RT42 .include -.for opt in 40 42 -.if ${PORT_OPTIONS:MRT${opt}} -RT_VER= ${opt} +.for opt in OPTIONS_SINGLE_RTVERSION +.if ${PORT_OPTIONS:M${opt}} +RT_VER= ${opt:S/RT//} .endif .endfor