Page MenuHomeFreeBSD
Files F159345892

D17285.id55401.diff
No OneTemporary
Actions

D17285.id55401.diff
View Options

Index: www/p5-RT-Authen-ExternalAuth/Makefile
===================================================================
--- www/p5-RT-Authen-ExternalAuth/Makefile
+++ www/p5-RT-Authen-ExternalAuth/Makefile
@@ -8,46 +8,34 @@
PKGNAMEPREFIX= p5-
MAINTAINER= matthew@FreeBSD.org
-COMMENT= RT extension to authenticate users against an external source
+COMMENT= RT42 extension to authenticate users against an external source
LICENSE= GPLv2
-BUILD_DEPENDS= ${RUN_DEPENDS}
+BUILD_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}
RUN_DEPENDS= p5-perl-ldap>0:net/p5-perl-ldap \
p5-DBI>0:databases/p5-DBI \
- p5-Net-SSLeay>0:security/p5-Net-SSLeay
-
-NO_ARCH= yes
+ p5-Net-SSLeay>0:security/p5-Net-SSLeay \
+ ${LOCALBASE}/bin/rt:www/rt${RT_VER}
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 <bsd.port.options.mk>
-
-.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
-RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
+# This module has been made part of core rt-4.4.x
+CONFLICTS_INSTALL= rt44
+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/rt42. 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,42 +3,40 @@
PORTNAME= RT-Extension-CommandByMail
PORTVERSION= 3.00
+PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-PKGNAMEPREFIX= p5-
MAINTAINER= sysadmin@gkg.net
COMMENT= RT Extension to change ticket metadata via email
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 <bsd.port.options.mk>
-
-.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
+FLAVOR?= ${FLAVORS:[1]}
+FLAVORS= rt44 rt42
+rt42_PKGNAMEPREFIX= p5-RT42-
+rt42_CONFLICTS_INSTALL= rt44
+rt44_PKGNAMEPREFIX= p5-RT44-
+rt44_CONFLICTS_INSTALL= rt42
+
+.if ${FLAVOR:U} == rt44
+RT_VER= 44
+.elif ${FLAVOR:U} == rt42
+RT_VER= 42
+.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,42 +3,40 @@
PORTNAME= RT-Extension-Gravatar
PORTVERSION= 2.01
+PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
-PKGNAMEPREFIX= p5-
MAINTAINER= sysadmin@gkg.net
COMMENT= RT Extension to change ticket metadata via email
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 <bsd.port.options.mk>
-
-.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
+FLAVOR?= ${FLAVORS:[1]}
+FLAVORS= rt44 rt42
+rt42_PKGNAMEPREFIX= p5-RT42-
+rt42_CONFLICTS_INSTALL= rt44
+rt44_PKGNAMEPREFIX= p5-RT44-
+rt44_CONFLICTS_INSTALL= rt42
+
+.if ${FLAVOR:U} == rt44
+RT_VER= 44
+.elif ${FLAVOR:U} == rt42
+RT_VER= 42
+.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,52 +3,49 @@
PORTNAME= RT-Extension-LDAPImport
PORTVERSION= 0.36
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www net perl5
MASTER_SITES= CPAN
-PKGNAMEPREFIX= p5-
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= ${RUN_DEPENDS}
RUN_DEPENDS= p5-perl-ldap>0:net/p5-perl-ldap \
- p5-Class-Accessor>0:devel/p5-Class-Accessor
-
-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}
+
+FLAVOR?= ${FLAVORS:[1]}
+FLAVORS= rt44 rt42
+rt42_PKGNAMEPREFIX= p5-RT42-
+rt42_CONFLICTS_INSTALL= rt44
+rt44_PKGNAMEPREFIX= p5-RT44-
+rt44_CONFLICTS_INSTALL= rt42
+
+.if ${FLAVOR:U} == rt44
+RT_VER= 44
+.elif ${FLAVOR:U} == rt42
+RT_VER= 42
+.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 <bsd.port.options.mk>
-
-.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}
-
-RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
+NO_ARCH= yes
+MAN3PREFIX= ${PREFIX}
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
@@ -5,38 +5,33 @@
DISTVERSION= 0.18
CATEGORIES= www net perl5
MASTER_SITES= CPAN
-PKGNAMEPREFIX= p5-
MAINTAINER= matthew@FreeBSD.org
COMMENT= Extension to require core and ticket custom fields on status changes
LICENSE= GPLv2
-OPTIONS_SINGLE= RTVERSION
-OPTIONS_SINGLE_RTVERSION= RT42 RT44
-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 ${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
+FLAVOR?= ${FLAVORS:[1]}
+FLAVORS= rt44 rt42
+rt42_PKGNAMEPREFIX= p5-RT42-
+rt42_CONFLICTS_INSTALL= rt44
+rt44_PKGNAMEPREFIX= p5-RT44-
+rt44_CONFLICTS_INSTALL= rt42
+
+.if ${FLAVOR:U} == rt44
+RT_VER= 44
+.elif ${FLAVOR:U} == rt42
+RT_VER= 42
+.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
Index: www/p5-RT-Extension-QuickAssign/Makefile
===================================================================
--- www/p5-RT-Extension-QuickAssign/Makefile
+++ www/p5-RT-Extension-QuickAssign/Makefile
@@ -12,33 +12,22 @@
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 <bsd.port.options.mk>
-
-.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
-
USES= perl5
USE_PERL5= configure
+NO_ARCH= yes
+
+# this is not compatible with RT 4.4 at this time.
+CONFLICTS_INSTALL= rt44
+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/rt42. 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,35 +13,19 @@
LICENSE= GPLv2
-BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= p5-Business-Hours>0:misc/p5-Business-Hours
-
-# SLA functionality comes as standard in RT 4.4.x
-CONFLICTS_INSTALL= rt44-4.4.*
-
-NO_ARCH= yes
+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}
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 <bsd.port.options.mk>
-
-.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
-RUN_DEPENDS+= ${LOCALBASE}/bin/rt:www/rt${RT_VER}
+# SLA functionality comes as standard in RT 4.4.x
+CONFLICTS_INSTALL= rt44
+RT_VER= 42
PLIST_SUB+= RTHOME=share/rt${RT_VER}
@@ -50,7 +35,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
@@ -5,7 +5,6 @@
PORTVERSION= 1.01
CATEGORIES= www perl5
MASTER_SITES= CPAN
-PKGNAMEPREFIX= p5-
MAINTAINER= matthew@FreeBSD.org
COMMENT= Calendar extension module for the RT ticketing system
@@ -13,40 +12,38 @@
LICENSE_COMB= dual
LICENSE= ART10 GPLv1+
-BUILD_DEPENDS= ${RUN_DEPENDS}
+
+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}
RUN_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
-
-NO_ARCH= yes
+ p5-DateTime-Set>0:devel/p5-DateTime-Set \
+ ${LOCALBASE}/bin/rt:www/rt${RT_VER}
+
+FLAVOR?= ${FLAVORS:[1]}
+FLAVORS= rt44 rt42
+rt42_PKGNAMEPREFIX= p5-RT42-
+rt42_CONFLICTS_INSTALL= rt44
+rt44_PKGNAMEPREFIX= p5-RT44-
+rt44_CONFLICTS_INSTALL= rt42
+
+.if ${FLAVOR:U} == rt44
+RT_VER= 44
+.elif ${FLAVOR:U} == rt42
+RT_VER= 42
+.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 <bsd.port.options.mk>
-
-.for opt in ${OPTIONS_SINGLE_RTVERSION}
-.if ${PORT_OPTIONS:M${opt}}
-RT_VER= ${opt:S/RT//}
-.endif
-.endfor
-
-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

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 14, 2:53 AM (11 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33939653
Default Alt Text
D17285.id55401.diff (14 KB)

Event Timeline