5 files changed, 55 insertions, 24 deletions

diff --git a/www/p5-RT-Extension-LDAPImport/Makefile b/www/p5-RT-Extension-LDAPImport/Makefile
index ed1a44e006dd..c7d1691ad473 100644
--- a/www/p5-RT-Extension-LDAPImport/Makefile
+++ b/www/p5-RT-Extension-LDAPImport/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	RT-Extension-LDAPImport
-PORTVERSION=	0.04
-PORTREVISION=	1
+PORTVERSION=	0.06
 CATEGORIES=	www net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,21 +14,40 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	m.seaman@infracaninophile.co.uk
 COMMENT=	RT extension to import users from an LDAP store
 
-BUILD_DEPENDS=	${LOCALBASE}/${RTHOME}/bin/rt:${PORTSDIR}/www/rt36 \
-		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
+BUILD_DEPENDS=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
 		${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-RTHOME?=	rt3
-PLIST_SUB+=	RTHOME=${RTHOME}
+OPTIONS=	RT36 "Install for rt-3.6.x (default rt-3.8.x)" off
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ENV+=	RTHOME=${PREFIX}/${RTHOME}
 
 MAN3=		RT::Extension::LDAPImport.3
 
+PLIST_SUB+=	RTHOME=${RTHOME}
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_RT36)
+
+RTHOME?=	rt3
+RT_PM_DIR=	${LOCALBASE}/${RTHOME}/lib
+BUILD_DEPENDS+=	${RT_PM_DIR}/RT.pm:${PORTSDIR}/www/rt36
+PLIST=		${PKGDIR}/pkg-plist.rt36
+MAN3PREFIX=	${PREFIX}/${RTHOME}/local
+
+.else
+
+RTHOME?=	share/rt38
+RT_PM_DIR=	${SITE_PERL}
+BUILD_DEPENDS+=	${RT_PM_DIR}/RT.pm:${PORTSDIR}/www/rt38
+PLIST=		${PKGDIR}/pkg-plist.rt38
+MAN3PREFIX=	${PREFIX}
+
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's,/opt/rt3/lib,${PREFIX}/${RTHOME}/lib,' \
+	@${REINPLACE_CMD} -e 's,/opt/rt3/lib,${RT_PM_DIR},' \
 	    ${WRKSRC}/bin/rtldapimport && \
 	    ${RM} ${WRKSRC}/bin/rtldapimport.bak
 
@@ -38,7 +56,7 @@ post-patch:
 # rather undesirably.
 do-configure:
 	@cd ${CONFIGURE_WRKSRC} && \
-	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} ./${CONFIGURE_SCRIPT} && \
+	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${RT_PM_DIR} ./${CONFIGURE_SCRIPT} && \
 	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/p5-RT-Extension-LDAPImport/distinfo b/www/p5-RT-Extension-LDAPImport/distinfo
index e9f7bb86f951..3b8fa5bb876d 100644
--- a/www/p5-RT-Extension-LDAPImport/distinfo
+++ b/www/p5-RT-Extension-LDAPImport/distinfo
@@ -1,3 +1,3 @@
-MD5 (RT-Extension-LDAPImport-0.04.tar.gz) = 256d3989df641518c5864bfe2f080a39
-SHA256 (RT-Extension-LDAPImport-0.04.tar.gz) = 12e613fa7333b90883a8b7d5cd48acac93e4fe595f66cfc7a986d5834f1f9832
-SIZE (RT-Extension-LDAPImport-0.04.tar.gz) = 18063
+MD5 (RT-Extension-LDAPImport-0.06.tar.gz) = 677de81ae93915ab8f53511043f6318e
+SHA256 (RT-Extension-LDAPImport-0.06.tar.gz) = 3c52f707e16bec50d6ff7c3e41eefe8b15f58c2b8cb8bf72ede1d66eb6ef31c5
+SIZE (RT-Extension-LDAPImport-0.06.tar.gz) = 23127
diff --git a/www/p5-RT-Extension-LDAPImport/pkg-plist b/www/p5-RT-Extension-LDAPImport/pkg-plist
deleted file mode 100644
index 1328f1b78502..000000000000
--- a/www/p5-RT-Extension-LDAPImport/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%RTHOME%%/local/lib/RT/Extension/LDAPImport.pm
-%%RTHOME%%/local/bin/rtldapimport
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RT/Extension/LDAPImport/.packlist
-@dirrmtry %%RTHOME%%/local/lib/RT/Extension
-@dirrmtry %%RTHOME%%/local/lib/RT
-@dirrmtry %%RTHOME%%/local/lib
-@dirrmtry %%RTHOME%%/local/bin
-@dirrmtry %%RTHOME%%/local
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RT/Extension/LDAPImport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RT/Extension
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RT
diff --git a/www/p5-RT-Extension-LDAPImport/pkg-plist.rt36 b/www/p5-RT-Extension-LDAPImport/pkg-plist.rt36
new file mode 100644
index 000000000000..8f6384e8023e
--- /dev/null
+++ b/www/p5-RT-Extension-LDAPImport/pkg-plist.rt36
@@ -0,0 +1,12 @@
+%%RTHOME%%/local/lib/RT/Extension/LDAPImport.pm
+%%RTHOME%%/local/bin/rtldapimport
+%%RTHOME%%/local/man/auto/RT/Extension/LDAPImport/.packlist
+@dirrmtry %%RTHOME%%/local/lib/RT/Extension
+@dirrmtry %%RTHOME%%/local/lib/RT
+@dirrmtry %%RTHOME%%/local/bin
+@dirrm %%RTHOME%%/local/man/auto/RT/Extension/LDAPImport
+@dirrmtry %%RTHOME%%/local/man/auto/RT/Extension
+@dirrmtry %%RTHOME%%/local/man/auto/RT
+@dirrmtry %%RTHOME%%/local/man/auto
+@dirrmtry %%RTHOME%%/local/man/man3
+@dirrmtry %%RTHOME%%/local/man
diff --git a/www/p5-RT-Extension-LDAPImport/pkg-plist.rt38 b/www/p5-RT-Extension-LDAPImport/pkg-plist.rt38
new file mode 100644
index 000000000000..95165a432f4c
--- /dev/null
+++ b/www/p5-RT-Extension-LDAPImport/pkg-plist.rt38
@@ -0,0 +1,12 @@
+%%RTHOME%%/plugins/RT-Extension-LDAPImport/lib/RT/Extension/LDAPImport.pm
+%%RTHOME%%/plugins/RT-Extension-LDAPImport/bin/rtldapimport
+man/auto/RT/Extension/LDAPImport/.packlist
+@dirrm %%RTHOME%%/plugins/RT-Extension-LDAPImport/lib/RT/Extension
+@dirrm %%RTHOME%%/plugins/RT-Extension-LDAPImport/lib/RT
+@dirrm %%RTHOME%%/plugins/RT-Extension-LDAPImport/lib
+@dirrm %%RTHOME%%/plugins/RT-Extension-LDAPImport/bin
+@dirrm %%RTHOME%%/plugins/RT-Extension-LDAPImport
+@dirrm man/auto/RT/Extension/LDAPImport
+@dirrmtry man/auto/RT/Extension
+@dirrmtry man/auto/RT
+@dirrmtry man/auto