Index: www/p5-RT-Authen-ExternalAuth/Makefile =================================================================== --- www/p5-RT-Authen-ExternalAuth/Makefile +++ www/p5-RT-Authen-ExternalAuth/Makefile @@ -3,6 +3,7 @@ PORTNAME= RT-Authen-ExternalAuth DISTVERSION= 0.27 +PORTREVISION= 1 CATEGORIES= www net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,41 +15,31 @@ BUILD_DEPENDS= p5-perl-ldap>0:net/p5-perl-ldap \ p5-DBI>0:databases/p5-DBI \ - p5-Net-SSLeay>0:security/p5-Net-SSLeay -RUN_DEPENDS:= ${BUILD_DEPENDS} + p5-Net-SSLeay>0:security/p5-Net-SSLeay \ + ${LOCALBASE}/bin/rt:www/rt${RT_VER} +RUN_DEPENDS= p5-perl-ldap>0:net/p5-perl-ldap \ + p5-DBI>0:databases/p5-DBI \ + p5-Net-SSLeay>0:security/p5-Net-SSLeay \ + ${LOCALBASE}/bin/rt:www/rt${RT_VER} -NO_ARCH= yes +# This module has been made part of core rt-4.4.x +FLAVORS= rt42 +rt42_PKGNAMESUFFIX= -rt42 +rt42_CONFLICTS_INSTALL= rt44 USES+= perl5 USE_PERL5= configure -# This module has been made part of core rt-4.4.x -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 ${OPTIONS_SINGLE_RTVERSION} -.if ${PORT_OPTIONS:M${opt}} -RT_VER= ${opt:S/RT//} -.endif -.endfor - -### Temporary for debugging -#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER} +NO_ARCH= yes -BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER} -RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER} +RT_VER= 42 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{42}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: Index: www/p5-RT-Extension-CommandByMail/Makefile =================================================================== --- www/p5-RT-Extension-CommandByMail/Makefile +++ www/p5-RT-Extension-CommandByMail/Makefile @@ -3,6 +3,7 @@ PORTNAME= RT-Extension-CommandByMail PORTVERSION= 3.00 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,33 +13,30 @@ LICENSE= GPLv2 -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 ${OPTIONS_SINGLE_RTVERSION} -.if ${PORT_OPTIONS:M${opt}} -RT_VER= ${opt:S/RT//} -.endif -.endfor - BUILD_DEPENDS= ${LOCALBASE}/bin/rt:www/rt${RT_VER} RUN_DEPENDS= ${LOCALBASE}/bin/rt:www/rt${RT_VER} -NO_ARCH= yes +FLAVORS= rt44 rt42 +rt42_PKGNAMESUFFIX= -rt42 +rt42_CONFLICTS_INSTALL= rt44 +rt44_PKGNAMESUFFIX= -rt44 +rt44_CONFLICTS_INSTALL= rt42 + +.if ${FLAVOR:U} != rt44 +RT_VER= 42 +.else +RT_VER= 44 +.endif USES= perl5 USE_PERL5= configure +NO_ARCH= yes + 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,44}. Hence ignore +# matches the $PREFIX used to install www/rt{42,44}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: @cd ${CONFIGURE_WRKSRC} && \ Index: www/p5-RT-Extension-Gravatar/Makefile =================================================================== --- www/p5-RT-Extension-Gravatar/Makefile +++ www/p5-RT-Extension-Gravatar/Makefile @@ -3,6 +3,7 @@ PORTNAME= RT-Extension-Gravatar PORTVERSION= 2.01 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,33 +13,30 @@ LICENSE= GPLv2 -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 ${OPTIONS_SINGLE_RTVERSION} -.if ${PORT_OPTIONS:M${opt}} -RT_VER= ${opt:S/RT//} -.endif -.endfor - BUILD_DEPENDS= ${LOCALBASE}/bin/rt:www/rt${RT_VER} RUN_DEPENDS= ${LOCALBASE}/bin/rt:www/rt${RT_VER} -NO_ARCH= yes +FLAVORS= rt44 rt42 +rt42_PKGNAMESUFFIX= -rt42 +rt42_CONFLICTS_INSTALL= rt44 +rt44_PKGNAMESUFFIX= -rt44 +rt44_CONFLICTS_INSTALL= rt42 + +.if ${FLAVOR:U} != rt44 +RT_VER= 42 +.else +RT_VER= 44 +.endif USES= perl5 USE_PERL5= configure +NO_ARCH= yes + 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,44}. Hence ignore +# matches the $PREFIX used to install www/rt{42,44}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: @cd ${CONFIGURE_WRKSRC} && \ Index: www/p5-RT-Extension-LDAPImport/Makefile =================================================================== --- www/p5-RT-Extension-LDAPImport/Makefile +++ www/p5-RT-Extension-LDAPImport/Makefile @@ -3,7 +3,7 @@ PORTNAME= RT-Extension-LDAPImport PORTVERSION= 0.36 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,45 +11,42 @@ MAINTAINER= matthew@FreeBSD.org COMMENT= RT extension to import users from an LDAP store -LICENSE_COMB= dual LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual BUILD_DEPENDS= p5-perl-ldap>0:net/p5-perl-ldap \ - p5-Class-Accessor>0:devel/p5-Class-Accessor -RUN_DEPENDS:= ${BUILD_DEPENDS} - -NO_ARCH= yes + p5-Class-Accessor>0:devel/p5-Class-Accessor \ + ${LOCALBASE}/bin/rt:www/rt${RT_VER} +RUN_DEPENDS= p5-perl-ldap>0:net/p5-perl-ldap \ + p5-Class-Accessor>0:devel/p5-Class-Accessor \ + ${LOCALBASE}/bin/rt:www/rt${RT_VER} + +FLAVORS= rt44 rt42 +rt42_PKGNAMESUFFIX= -rt42 +rt42_CONFLICTS_INSTALL= rt44 +rt44_PKGNAMESUFFIX= -rt44 +rt44_CONFLICTS_INSTALL= rt42 + +.if ${FLAVOR:U} != rt44 +RT_VER= 42 +.else +RT_VER= 44 +.endif USES+= perl5 USE_PERL5= configure -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 ${OPTIONS_SINGLE_RTVERSION} -.if ${PORT_OPTIONS:M${opt}} -RT_VER= ${opt:S/RT//} -.endif -.endfor +NO_ARCH= yes ### Temporary for debugging #WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER} -BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER} -RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER} - 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,44}. Hence ignore +# matches the $PREFIX used to install www/rt{42,44}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: @cd ${CONFIGURE_WRKSRC} && \ Index: www/p5-RT-Extension-MandatoryOnTransition/Makefile =================================================================== --- www/p5-RT-Extension-MandatoryOnTransition/Makefile +++ www/p5-RT-Extension-MandatoryOnTransition/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= RT-Extension-MandatoryOnTransition -DISTVERSION= 0.13 +DISTVERSION= 0.16 CATEGORIES= www net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,36 +12,30 @@ LICENSE= GPLv2 -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 ${OPTIONS_SINGLE_RTVERSION} -.if ${PORT_OPTIONS:M${opt}} -RT_VER= ${opt:S/RT//} -.endif -.endfor - -### Temporary for debugging -#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER} - BUILD_DEPENDS= ${LOCALBASE}/bin/rt:www/rt${RT_VER} RUN_DEPENDS= ${LOCALBASE}/bin/rt:www/rt${RT_VER} -NO_ARCH= yes +FLAVORS= rt44 rt42 +rt42_PKGNAMESUFFIX= -rt42 +rt42_CONFLICTS_INSTALL= rt44 +rt44_PKGNAMESUFFIX= -rt44 +rt44_CONFLICTS_INSTALL= rt42 + +.if ${FLAVOR:U} != rt44 +RT_VER= 42 +.else +RT_VER= 44 +.endif USES= perl5 USE_PERL5= configure +NO_ARCH= yes + PLIST_SUB+= RT_VER=${RT_VER} # Note: You can install using an arbitrary $PREFIX but only if it -# matches the $PREFIX used to install www/rt{40,42,44}. Hence ignore +# matches the $PREFIX used to install www/rt{42,44}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: @cd ${CONFIGURE_WRKSRC} && \ Index: www/p5-RT-Extension-MandatoryOnTransition/distinfo =================================================================== --- www/p5-RT-Extension-MandatoryOnTransition/distinfo +++ www/p5-RT-Extension-MandatoryOnTransition/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1468566130 -SHA256 (RT-Extension-MandatoryOnTransition-0.13.tar.gz) = b91404859ccf1b87492c63e7a068d69ffb641949649e9a53ff0d9e953b9a2caa -SIZE (RT-Extension-MandatoryOnTransition-0.13.tar.gz) = 46281 +TIMESTAMP = 1537605763 +SHA256 (RT-Extension-MandatoryOnTransition-0.16.tar.gz) = d1aaa1edbda0ec67b1a475ef8c2d4ff2bb9b7c4e06e54ac170fe380a1c100e77 +SIZE (RT-Extension-MandatoryOnTransition-0.16.tar.gz) = 48310 Index: www/p5-RT-Extension-MandatoryOnTransition/pkg-plist =================================================================== --- www/p5-RT-Extension-MandatoryOnTransition/pkg-plist +++ www/p5-RT-Extension-MandatoryOnTransition/pkg-plist @@ -1,5 +1,6 @@ man/man3/RT::Extension::MandatoryOnTransition.3.gz share/rt%%RT_VER%%/plugins/RT-Extension-MandatoryOnTransition/html/Callbacks/RT-Extension-MandatoryOnTransition/Elements/EditCustomFields/BeforeCustomFields +share/rt%%RT_VER%%/plugins/RT-Extension-MandatoryOnTransition/html/Callbacks/RT-Extension-MandatoryOnTransition/Elements/EditCustomFields/MassageCustomFields share/rt%%RT_VER%%/plugins/RT-Extension-MandatoryOnTransition/html/Callbacks/RT-Extension-MandatoryOnTransition/Ticket/Create.html/BeforeCreate share/rt%%RT_VER%%/plugins/RT-Extension-MandatoryOnTransition/html/Callbacks/RT-Extension-MandatoryOnTransition/Ticket/Elements/EditCustomFields/MassageCustomFields share/rt%%RT_VER%%/plugins/RT-Extension-MandatoryOnTransition/html/Callbacks/RT-Extension-MandatoryOnTransition/Ticket/Modify.html/Default Index: www/p5-RT-Extension-QuickAssign/Makefile =================================================================== --- www/p5-RT-Extension-QuickAssign/Makefile +++ www/p5-RT-Extension-QuickAssign/Makefile @@ -3,6 +3,7 @@ PORTNAME= RT-Extension-QuickAssign PORTVERSION= 1.00 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,33 +13,25 @@ LICENSE= GPLv2 -# this is not compatible with RT 4.4 at this time. -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 ${OPTIONS_SINGLE_RTVERSION} -.if ${PORT_OPTIONS:M${opt}} -RT_VER= ${opt:S/RT//} -.endif -.endfor - BUILD_DEPENDS= ${LOCALBASE}/bin/rt:www/rt${RT_VER} RUN_DEPENDS= ${LOCALBASE}/bin/rt:www/rt${RT_VER} -NO_ARCH= yes +FLAVORS= rt42 +rt42_PKGNAMESUFFIX= -rt42 +rt42_CONFLICTS_INSTALL= rt44 USES= perl5 USE_PERL5= configure +NO_ARCH= yes + +# this is not compatible with RT 4.4 at this time. +RT_VER=42 + 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,44}. Hence ignore +# matches the $PREFIX used to install www/rt{42}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: @cd ${CONFIGURE_WRKSRC} && \ Index: www/p5-RT-Extension-SLA/Makefile =================================================================== --- www/p5-RT-Extension-SLA/Makefile +++ www/p5-RT-Extension-SLA/Makefile @@ -3,6 +3,7 @@ PORTNAME= RT-Extension-SLA PORTVERSION= 1.04 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,36 +13,22 @@ LICENSE= GPLv2 -BUILD_DEPENDS= p5-Business-Hours>0:misc/p5-Business-Hours -RUN_DEPENDS:= ${BUILD_DEPENDS} +BUILD_DEPENDS= p5-Business-Hours>0:misc/p5-Business-Hours \ + ${LOCALBASE}/bin/rt:www/rt${RT_VER} +RUN_DEPENDS= p5-Business-Hours>0:misc/p5-Business-Hours \ + ${LOCALBASE}/bin/rt:www/rt${RT_VER} # SLA functionality comes as standard in RT 4.4.x -CONFLICTS_INSTALL= rt44-4.4.* - -NO_ARCH= yes +FLAVORS= rt42 +rt42_PKGNAMESUFFIX= -rt42 +rt42_CONFLICTS_INSTALL= rt44 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 - -.include - -.for opt in ${OPTIONS_SINGLE_RTVERSION} -.if ${PORT_OPTIONS:M${opt}} -RT_VER= ${opt:S/RT//} -.endif -.endfor - -### Temporary for debugging -#WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work${RT_VER} +NO_ARCH= yes -BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER} -RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER} +RT_VER= 42 PLIST_SUB+= RTHOME=share/rt${RT_VER} @@ -51,7 +38,7 @@ SUB_FILES+= pkg-message # Note: You can install using an arbitrary $PREFIX but only if it -# matches the $PREFIX used to install www/rt{38,40,42}. Hence ignore +# matches the $PREFIX used to install www/rt42. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: @cd ${CONFIGURE_WRKSRC} && \ Index: www/p5-RT-Extension-SLA/files/patch-inc__Module__Install__RTx.pm =================================================================== --- www/p5-RT-Extension-SLA/files/patch-inc__Module__Install__RTx.pm +++ www/p5-RT-Extension-SLA/files/patch-inc__Module__Install__RTx.pm @@ -1,6 +1,6 @@ ---- ./inc/Module/Install/RTx.pm.orig 2014-07-01 20:40:45.000000000 +0100 -+++ ./inc/Module/Install/RTx.pm 2014-07-03 23:02:03.735533399 +0100 -@@ -77,7 +77,7 @@ +--- inc/Module/Install/RTx.pm.orig 2014-12-18 22:31:31 UTC ++++ inc/Module/Install/RTx.pm +@@ -85,7 +85,7 @@ sub RTx { my %index = map { $_ => 1 } @INDEX_DIRS; $self->no_index( directory => $_ ) foreach grep !$index{$_}, @DIRS; Index: www/p5-RTx-Calendar/Makefile =================================================================== --- www/p5-RTx-Calendar/Makefile +++ www/p5-RTx-Calendar/Makefile @@ -15,44 +15,39 @@ BUILD_DEPENDS= p5-Date-ICal>0:devel/p5-Date-ICal \ p5-Data-ICal>0:deskutils/p5-Data-ICal \ - p5-DateTime-Set>0:devel/p5-DateTime-Set -RUN_DEPENDS:= ${BUILD_DEPENDS} + p5-DateTime-Set>0:devel/p5-DateTime-Set \ + ${LOCALBASE}/bin/rt:www/rt${RT_VER} +BUILD_DEPENDS= p5-Date-ICal>0:devel/p5-Date-ICal \ + p5-Data-ICal>0:deskutils/p5-Data-ICal \ + p5-DateTime-Set>0:devel/p5-DateTime-Set \ + ${LOCALBASE}/bin/rt:www/rt${RT_VER} -NO_ARCH= yes +FLAVORS= rt44 rt42 +rt42_PKGNAMESUFFIX= -rt42 +rt42_CONFLICTS_INSTALL= rt44 +rt44_PKGNAMESUFFIX= -rt44 +rt44_CONFLICTS_INSTALL= rt42 + +.if ${FLAVOR:U} != rt44 +RT_VER= 42 +.else +RT_VER= 44 +.endif USES+= perl5 USE_PERL5= configure -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 ${OPTIONS_SINGLE_RTVERSION} -.if ${PORT_OPTIONS:M${opt}} -RT_VER= ${opt:S/RT//} -.endif -.endfor - -BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER} -RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER} +NO_ARCH= yes 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{40,42,44}. Hence ignore +# matches the $PREFIX used to install www/rt{42,44}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm do-configure: @cd ${CONFIGURE_WRKSRC} && \