Date: Sun, 21 Jun 2009 10:50:16 +0100 (BST) From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/135884: [maintainer] www/p5-RT-Extension-LDAPImport update to 0.06 Message-ID: <200906210950.n5L9oGUa098896@happy-idiot-talk.infracaninophile.co.uk> Resent-Message-ID: <200906211000.n5LA0HRF016977@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135884
>Category: ports
>Synopsis: [maintainer] www/p5-RT-Extension-LDAPImport update to 0.06
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 21 10:00:17 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Matthew Seaman
>Release: FreeBSD 7.2-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 7.2-STABLE FreeBSD 7.2-STABLE #0: Sat Jun 13 17:37:55 BST 2009 root@happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386
>Description:
Routine bug fix / new features update to version 0.06.
This update adds support for use with rt-3.8.x and for importing
Custom Fields.
Note to committer:
Files removed:
pkg-plist
Files added:
pkg-plist.rt36
pkg-plist.rt38
>How-To-Repeat:
>Fix:
--- p5-RT-Extension-LDAPImport.diff begins here ---
diff -Nur /usr/ports/www/p5-RT-Extension-LDAPImport/Makefile p5-RT-Extension-LDAPImport/Makefile
--- /usr/ports/www/p5-RT-Extension-LDAPImport/Makefile 2009-03-24 06:42:10.000000000 +0000
+++ p5-RT-Extension-LDAPImport/Makefile 2009-06-21 10:25:34.000000000 +0100
@@ -2,12 +2,11 @@
# Date created: 24 August 2008
# Whom: Matthew Seaman <m.seaman@infracaninophile.co.uk>
#
-# $FreeBSD: ports/www/p5-RT-Extension-LDAPImport/Makefile,v 1.3 2009/03/22 18:40:06 pav Exp $
+# $FreeBSD: ports/www/p5-RT-Extension-LDAPImport/Makefile,v 1.2 2008/12/19 22:16:17 miwi Exp $
#
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 @@
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 @@
# 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 -Nur /usr/ports/www/p5-RT-Extension-LDAPImport/distinfo p5-RT-Extension-LDAPImport/distinfo
--- /usr/ports/www/p5-RT-Extension-LDAPImport/distinfo 2008-12-14 20:08:46.000000000 +0000
+++ p5-RT-Extension-LDAPImport/distinfo 2009-06-21 09:38:05.000000000 +0100
@@ -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 -Nur /usr/ports/www/p5-RT-Extension-LDAPImport/pkg-plist p5-RT-Extension-LDAPImport/pkg-plist
--- /usr/ports/www/p5-RT-Extension-LDAPImport/pkg-plist 2008-12-14 20:08:46.000000000 +0000
+++ p5-RT-Extension-LDAPImport/pkg-plist 1970-01-01 01:00:00.000000000 +0100
@@ -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 -Nur /usr/ports/www/p5-RT-Extension-LDAPImport/pkg-plist.rt36 p5-RT-Extension-LDAPImport/pkg-plist.rt36
--- /usr/ports/www/p5-RT-Extension-LDAPImport/pkg-plist.rt36 1970-01-01 01:00:00.000000000 +0100
+++ p5-RT-Extension-LDAPImport/pkg-plist.rt36 2009-06-21 10:17:01.000000000 +0100
@@ -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 -Nur /usr/ports/www/p5-RT-Extension-LDAPImport/pkg-plist.rt38 p5-RT-Extension-LDAPImport/pkg-plist.rt38
--- /usr/ports/www/p5-RT-Extension-LDAPImport/pkg-plist.rt38 1970-01-01 01:00:00.000000000 +0100
+++ p5-RT-Extension-LDAPImport/pkg-plist.rt38 2009-06-21 10:34:14.000000000 +0100
@@ -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
--- p5-RT-Extension-LDAPImport.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906210950.n5L9oGUa098896>