Date: Thu, 5 May 2016 20:07:27 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> 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 Message-ID: <201605052007.u45K7R2k050874@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> -.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 <bsd.port.options.mk> -.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 <bsd.port.options.mk> -.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605052007.u45K7R2k050874>