From owner-svn-ports-head@FreeBSD.ORG Sun Dec 1 17:51:44 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 668CD32D; Sun, 1 Dec 2013 17:51:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4716F1240; Sun, 1 Dec 2013 17:51:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB1HpiBa040061; Sun, 1 Dec 2013 17:51:44 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rB1HphZO040053; Sun, 1 Dec 2013 17:51:43 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201312011751.rB1HphZO040053@svn.freebsd.org> From: Matthew Seaman Date: Sun, 1 Dec 2013 17:51:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335414 - in head/www: p5-RT-Authen-ExternalAuth p5-RT-Extension-LDAPImport p5-RT-Extension-MandatoryOnTransition p5-RT-Extension-SLA p5-RTx-Calendar X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Dec 2013 17:51:44 -0000 Author: matthew Date: Sun Dec 1 17:51:42 2013 New Revision: 335414 URL: http://svnweb.freebsd.org/changeset/ports/335414 Log: Update all the RT extension modules to work with www/rt42 and make that the new default. Modified: head/www/p5-RT-Authen-ExternalAuth/Makefile head/www/p5-RT-Extension-LDAPImport/Makefile head/www/p5-RT-Extension-MandatoryOnTransition/Makefile head/www/p5-RT-Extension-SLA/Makefile head/www/p5-RTx-Calendar/Makefile Modified: head/www/p5-RT-Authen-ExternalAuth/Makefile ============================================================================== --- head/www/p5-RT-Authen-ExternalAuth/Makefile Sun Dec 1 17:49:02 2013 (r335413) +++ head/www/p5-RT-Authen-ExternalAuth/Makefile Sun Dec 1 17:51:42 2013 (r335414) @@ -3,6 +3,7 @@ PORTNAME= RT-Authen-ExternalAuth DISTVERSION= 0.17 +PORTREVISION= 1 CATEGORIES= www net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,16 +21,23 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES+= perl5 USE_PERL5= configure -OPTIONS_DEFINE= RT38 -RT38_DESC= Install for rt-3.8.x (default rt-4.0.x) +OPTIONS_SINGLE= RTVERSION +OPTIONS_SINGLE_RTVERSION= RT38 RT40 RT42 +RT38_DESC= Install for rt-3.8.x (www/rt38) +RT40_DESC= Install for rt-4.0.x (www/rt40) +RT42_DESC= Install for rt-4.2.x (www/rt42) +OPTIONS_DEFAULT= RT42 .include -.if ${PORT_OPTIONS:MRT38} -RT_VER= 38 -.else -RT_VER= 40 +.for opt in 38 40 42 +.if ${PORT_OPTIONS:MRT${opt}} +RT_VER= ${opt} .endif +.endfor + +### Temporary for debugging +#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER} BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} RUN_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} Modified: head/www/p5-RT-Extension-LDAPImport/Makefile ============================================================================== --- head/www/p5-RT-Extension-LDAPImport/Makefile Sun Dec 1 17:49:02 2013 (r335413) +++ head/www/p5-RT-Extension-LDAPImport/Makefile Sun Dec 1 17:51:42 2013 (r335414) @@ -3,6 +3,7 @@ PORTNAME= RT-Extension-LDAPImport PORTVERSION= 0.35 +PORTREVISON= 1 CATEGORIES= www net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,16 +21,23 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES+= perl5 USE_PERL5= configure -OPTIONS_DEFINE= RT38 -RT38_DESC= Install for rt-3.8.x (default rt-4.0.x) +OPTIONS_SINGLE= RTVERSION +OPTIONS_SINGLE_RTVERSION= RT38 RT40 RT42 +RT38_DESC= Install for rt-3.8.x (www/rt38) +RT40_DESC= Install for rt-4.0.x (www/rt40) +RT42_DESC= Install for rt-4.2.x (www/rt42) +OPTIONS_DEFAULT= RT42 .include -.if ${PORT_OPTIONS:MRT38} -RT_VER= 38 -.else -RT_VER= 40 +.for opt in 38 40 42 +.if ${PORT_OPTIONS:MRT${opt}} +RT_VER= ${opt} .endif +.endfor + +### Temporary for debugging +#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER} BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} RUN_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} Modified: head/www/p5-RT-Extension-MandatoryOnTransition/Makefile ============================================================================== --- head/www/p5-RT-Extension-MandatoryOnTransition/Makefile Sun Dec 1 17:49:02 2013 (r335413) +++ head/www/p5-RT-Extension-MandatoryOnTransition/Makefile Sun Dec 1 17:51:42 2013 (r335414) @@ -3,6 +3,7 @@ PORTNAME= RT-Extension-MandatoryOnTransition DISTVERSION= 0.04 +PORTREVISION= 1 CATEGORIES= www net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,16 +13,30 @@ COMMENT= Extension to require core and t LICENSE= GPLv2 -BUILD_DEPENDS= rt${RT_VER}>4.0.8:${PORTSDIR}/www/rt${RT_VER} -RUN_DEPENDS= rt${RT_VER}>4.0.8:${PORTSDIR}/www/rt${RT_VER} +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 + +.include + +.for opt in 40 42 +.if ${PORT_OPTIONS:MRT${opt}} +RT_VER= ${opt} +.endif +.endfor + +### Temporary for debugging +#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER} + +BUILD_DEPENDS= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} +RUN_DEPENDS= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} USES= perl5 USE_PERL5= configure PLIST_SUB+= RT_VER=${RT_VER} -RT_VER= 40 - -#MAN3PREFIX= ${PREFIX} # Note: You can install using an arbitrary $PREFIX but only if it # matches the $PREFIX used to install www/rt{38,40}. Hence ignore Modified: head/www/p5-RT-Extension-SLA/Makefile ============================================================================== --- head/www/p5-RT-Extension-SLA/Makefile Sun Dec 1 17:49:02 2013 (r335413) +++ head/www/p5-RT-Extension-SLA/Makefile Sun Dec 1 17:51:42 2013 (r335414) @@ -3,6 +3,7 @@ PORTNAME= RT-Extension-SLA PORTVERSION= 0.07 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,16 +21,23 @@ LICENSE= GPLv2 USES+= perl5 USE_PERL5= configure -OPTIONS_DEFINE= RT38 -RT38_DESC= Install for rt-3.8.x (default rt-4.0.x) +OPTIONS_SINGLE= RTVERSION +OPTIONS_SINGLE_RTVERSION= RT38 RT40 RT42 +RT38_DESC= Install for rt-3.8.x (www/rt38) +RT40_DESC= Install for rt-4.0.x (www/rt40) +RT42_DESC= Install for rt-4.2.x (www/rt42) +OPTIONS_DEFAULT= RT42 .include -.if ${PORT_OPTIONS:MRT38} -RT_VER= 38 -.else -RT_VER= 40 +.for opt in 38 40 42 +.if ${PORT_OPTIONS:MRT${opt}} +RT_VER= ${opt} .endif +.endfor + +### Temporary for debugging +#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER} BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} RUN_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} Modified: head/www/p5-RTx-Calendar/Makefile ============================================================================== --- head/www/p5-RTx-Calendar/Makefile Sun Dec 1 17:49:02 2013 (r335413) +++ head/www/p5-RTx-Calendar/Makefile Sun Dec 1 17:51:42 2013 (r335414) @@ -3,6 +3,7 @@ PORTNAME= RTx-Calendar PORTVERSION= 0.17 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -21,16 +22,20 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES+= perl5 USE_PERL5= configure -OPTIONS_DEFINE= RT38 -RT38_DESC= Install for rt-3.8.x (default rt-4.0.x) +OPTIONS_SINGLE= RTVERSION +OPTIONS_SINGLE_RTVERSION= RT38 RT40 RT42 +RT38_DESC= Install for rt-3.8.x (www/rt38) +RT40_DESC= Install for rt-4.0.x (www/rt40) +RT42_DESC= Install for rt-4.2.x (www/rt42) +OPTIONS_DEFAULT= RT42 .include -.if ${PORT_OPTIONS:MRT38} -RT_VER= 38 -.else -RT_VER= 40 +.for opt in 38 40 42 +.if ${PORT_OPTIONS:MRT${opt}} +RT_VER= ${opt} .endif +.endfor BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} RUN_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} @@ -39,11 +44,14 @@ MAN3PREFIX= ${PREFIX} PLIST_SUB+= RTHOME=share/rt${RT_VER} +### Temporary for debugging +#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER} + post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete # Note: You can install using an arbitrary $PREFIX but only if it -# matches the $PREFIX used to install www/rt{38,40}. Hence ignore +# matches the $PREFIX used to install www/rt{38,40,42}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: @cd ${CONFIGURE_WRKSRC} && \