Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Feb 2009 13:23:29 +0000
From:      Matthew Seaman <m.seaman@infracaninophile.co.uk>
To:        FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/131698: [maintainer] www/p5-RTx-Calendar -- update to 0.06, rt38 compatibility
Message-ID:  <20090215132329.GA36637@happy-idiot-talk.infracaninophile.co.uk>
In-Reply-To: <200902151320.n1FDK12L048352@freefall.freebsd.org>
References:  <200902151318.n1FDI5dh036410@happy-idiot-talk.infracaninophile.co.uk> <200902151320.n1FDK12L048352@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--EVF5PPMfhYS0aIcm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Feb 15, 2009 at 01:20:01PM +0000, FreeBSD-gnats-submit@FreeBSD.org =
wrote:
> http://www.freebsd.org/cgi/query-pr.cgi?pr=3D131698

Ooops.  Tab damage in that diff.  Please use this instead:

diff -Nur /usr/ports/www/p5-RTx-Calendar/Makefile p5-RTx-Calendar/Makefile
--- /usr/ports/www/p5-RTx-Calendar/Makefile	2008-12-20 13:10:20.000000000 +=
0000
+++ p5-RTx-Calendar/Makefile	2009-02-15 13:19:54.000000000 +0000
@@ -6,7 +6,7 @@
 #
=20
 PORTNAME=3D	RTx-Calendar
-PORTVERSION=3D	0.05
+PORTVERSION=3D	0.06
 CATEGORIES=3D	www perl5
 MASTER_SITES=3D	CPAN
 PKGNAMEPREFIX=3D	p5-
@@ -14,27 +14,45 @@
 MAINTAINER=3D	m.seaman@infracaninophile.co.uk
 COMMENT=3D	Calendar extension module for the RT ticketing system
=20
-BUILD_DEPENDS=3D	${LOCALBASE}/${RTHOME}/bin/rt:${PORTSDIR}/www/rt36     	 =
     \
-		${SITE_PERL}/Date/ICal.pm:${PORTSDIR}/devel/p5-Date-ICal      \
+BUILD_DEPENDS=3D	${SITE_PERL}/Date/ICal.pm:${PORTSDIR}/devel/p5-Date-ICal =
     \
 		${SITE_PERL}/Data/ICal.pm:${PORTSDIR}/deskutils/p5-Data-ICal  \
 		${SITE_PERL}/DateTime/Set.pm:${PORTSDIR}/devel/p5-DateTime-Set
 RUN_DEPENDS=3D	${BUILD_DEPENDS}
=20
-RTHOME?=3D	rt3
-PLIST_SUB+=3D	RTHOME=3D${RTHOME}
+OPTIONS=3D	RT36 "Install for rt-3.6.x (default rt-3.8.x)" off
=20
 PERL_CONFIGURE=3D	yes
-CONFIGURE_ENV+=3D	RTHOME=3D${PREFIX}/${RTHOME}
=20
-MAN3PREFIX=3D	${PREFIX}/${RTHOME}/local
 MAN3=3D		RTx::Calendar.3
=20
+PLIST_SUB+=3D	RTHOME=3D${RTHOME}
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_RT36)
+
+RTHOME?=3D	rt3
+RT_PM_DIR=3D	${LOCALBASE}/${RTHOME}/lib
+BUILD_DEPENDS+=3D	${RT_PM_DIR}/RT.pm:${PORTSDIR}/www/rt36
+PLIST=3D		${PKGDIR}/pkg-plist.rt36
+MAN3PREFIX=3D	${PREFIX}/${RTHOME}/local
+
+.else
+
+RTHOME?=3D	share/rt38
+RT_PM_DIR=3D	${SITE_PERL}
+BUILD_DEPENDS+=3D	${RT_PM_DIR}/RT.pm:${PORTSDIR}/www/rt38
+PLIST=3D		${PKGDIR}/pkg-plist.rt38
+MAN3PREFIX=3D	${PREFIX}
+
+.endif
+
 # Don't use normal CONFIGURE_ARGS.  Disable doc_?????_indstall targets to
 # suppress installing perllocal.pod.  This duplicates code from bsd.perl.mk
 # rather undesirably.
 do-configure:
 	@cd ${CONFIGURE_WRKSRC} && \
-	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} ./${CONFIGURE_SCRIPT} && \
+	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${RT_PM_DIR} ./${CONFIGURE_SCRI=
PT} && \
 	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' M=
akefile
=20
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Nur /usr/ports/www/p5-RTx-Calendar/distinfo p5-RTx-Calendar/distinfo
--- /usr/ports/www/p5-RTx-Calendar/distinfo	2008-12-14 20:12:18.000000000 +=
0000
+++ p5-RTx-Calendar/distinfo	2009-02-13 19:59:47.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (RTx-Calendar-0.05.tar.gz) =3D 53a305c3a5929d77276f98c255186591
-SHA256 (RTx-Calendar-0.05.tar.gz) =3D f9311929943f35bd631df442da3e428e8524=
b8236c449d0ccd9266e3aa0d9721
-SIZE (RTx-Calendar-0.05.tar.gz) =3D 27640
+MD5 (RTx-Calendar-0.06.tar.gz) =3D f24991d0ed92ab0ae0ecdf348c481d57
+SHA256 (RTx-Calendar-0.06.tar.gz) =3D 29375bb1fd6a9d96cbf1c7aaa97c731a20e9=
5beb19ef1f9aaec3d25f91fb4b29
+SIZE (RTx-Calendar-0.06.tar.gz) =3D 27974
diff -Nur /usr/ports/www/p5-RTx-Calendar/pkg-plist p5-RTx-Calendar/pkg-plist
--- /usr/ports/www/p5-RTx-Calendar/pkg-plist	2008-12-14 20:12:18.000000000 =
+0000
+++ p5-RTx-Calendar/pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-%%RTHOME%%/share/html/Search/Calendar.html
-%%RTHOME%%/share/html/Prefs/Elements/CalendarFeed
-%%RTHOME%%/share/html/Prefs/Calendar.html
-%%RTHOME%%/share/html/NoAuth/images/updated.png
-%%RTHOME%%/share/html/NoAuth/images/starts_due.png
-%%RTHOME%%/share/html/NoAuth/images/starts.png
-%%RTHOME%%/share/html/NoAuth/images/started.png
-%%RTHOME%%/share/html/NoAuth/images/resolved.png
-%%RTHOME%%/share/html/NoAuth/images/reminder.png
-%%RTHOME%%/share/html/NoAuth/images/due.png
-%%RTHOME%%/share/html/NoAuth/images/created_due.png
-%%RTHOME%%/share/html/NoAuth/images/created.png
-%%RTHOME%%/share/html/NoAuth/css/calendar.css
-%%RTHOME%%/share/html/NoAuth/Calendar/dhandler
-%%RTHOME%%/share/html/Elements/MyCalendar
-%%RTHOME%%/share/html/Elements/CalendarEvent
-%%RTHOME%%/share/html/Callbacks/RTx-Calendar/User/Elements/Tabs/Default
-%%RTHOME%%/share/html/Callbacks/RTx-Calendar/Ticket/Elements/Tabs/Default
-%%RTHOME%%/share/html/Callbacks/RTx-Calendar/Elements/Header/Head
-%%RTHOME%%/local/man/auto/RTx/Calendar/.packlist
-%%RTHOME%%/local/lib/RTx/Calendar.pm
-@dirrm %%RTHOME%%/share/html/NoAuth/Calendar
-@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/User/Elements/Tabs
-@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/User/Elements
-@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/User
-@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/Ticket/Elements/Tabs
-@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/Ticket/Elements
-@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/Ticket
-@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/Elements/Header
-@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/Elements
-@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar
-@dirrmtry %%RTHOME%%/share/html/Callbacks
-@dirrm %%RTHOME%%/local/man/auto/RTx/Calendar
-@dirrmtry %%RTHOME%%/local/man/auto/RTx
-@dirrmtry %%RTHOME%%/local/man/auto
-@dirrmtry %%RTHOME%%/local/man/man3
-@dirrmtry %%RTHOME%%/local/man
-@dirrmtry %%RTHOME%%/local/lib/RTx
-@dirrmtry %%RTHOME%%/local/lib
-@dirrmtry %%RTHOME%%/local
diff -Nur /usr/ports/www/p5-RTx-Calendar/pkg-plist.rt36 p5-RTx-Calendar/pkg=
-plist.rt36
--- /usr/ports/www/p5-RTx-Calendar/pkg-plist.rt36	1970-01-01 01:00:00.00000=
0000 +0100
+++ p5-RTx-Calendar/pkg-plist.rt36	2008-12-14 20:12:18.000000000 +0000
@@ -0,0 +1,40 @@
+%%RTHOME%%/share/html/Search/Calendar.html
+%%RTHOME%%/share/html/Prefs/Elements/CalendarFeed
+%%RTHOME%%/share/html/Prefs/Calendar.html
+%%RTHOME%%/share/html/NoAuth/images/updated.png
+%%RTHOME%%/share/html/NoAuth/images/starts_due.png
+%%RTHOME%%/share/html/NoAuth/images/starts.png
+%%RTHOME%%/share/html/NoAuth/images/started.png
+%%RTHOME%%/share/html/NoAuth/images/resolved.png
+%%RTHOME%%/share/html/NoAuth/images/reminder.png
+%%RTHOME%%/share/html/NoAuth/images/due.png
+%%RTHOME%%/share/html/NoAuth/images/created_due.png
+%%RTHOME%%/share/html/NoAuth/images/created.png
+%%RTHOME%%/share/html/NoAuth/css/calendar.css
+%%RTHOME%%/share/html/NoAuth/Calendar/dhandler
+%%RTHOME%%/share/html/Elements/MyCalendar
+%%RTHOME%%/share/html/Elements/CalendarEvent
+%%RTHOME%%/share/html/Callbacks/RTx-Calendar/User/Elements/Tabs/Default
+%%RTHOME%%/share/html/Callbacks/RTx-Calendar/Ticket/Elements/Tabs/Default
+%%RTHOME%%/share/html/Callbacks/RTx-Calendar/Elements/Header/Head
+%%RTHOME%%/local/man/auto/RTx/Calendar/.packlist
+%%RTHOME%%/local/lib/RTx/Calendar.pm
+@dirrm %%RTHOME%%/share/html/NoAuth/Calendar
+@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/User/Elements/Tabs
+@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/User/Elements
+@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/User
+@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/Ticket/Elements/Tabs
+@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/Ticket/Elements
+@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/Ticket
+@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/Elements/Header
+@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar/Elements
+@dirrm %%RTHOME%%/share/html/Callbacks/RTx-Calendar
+@dirrmtry %%RTHOME%%/share/html/Callbacks
+@dirrm %%RTHOME%%/local/man/auto/RTx/Calendar
+@dirrmtry %%RTHOME%%/local/man/auto/RTx
+@dirrmtry %%RTHOME%%/local/man/auto
+@dirrmtry %%RTHOME%%/local/man/man3
+@dirrmtry %%RTHOME%%/local/man
+@dirrmtry %%RTHOME%%/local/lib/RTx
+@dirrmtry %%RTHOME%%/local/lib
+@dirrmtry %%RTHOME%%/local
diff -Nur /usr/ports/www/p5-RTx-Calendar/pkg-plist.rt38 p5-RTx-Calendar/pkg=
-plist.rt38
--- /usr/ports/www/p5-RTx-Calendar/pkg-plist.rt38	1970-01-01 01:00:00.00000=
0000 +0100
+++ p5-RTx-Calendar/pkg-plist.rt38	2009-02-15 12:54:06.000000000 +0000
@@ -0,0 +1,48 @@
+%%RTHOME%%/plugins/RTx-Calendar/lib/RTx/Calendar.pm
+%%RTHOME%%/plugins/RTx-Calendar/html/Search/Calendar.html
+%%RTHOME%%/plugins/RTx-Calendar/html/Prefs/Elements/CalendarFeed
+%%RTHOME%%/plugins/RTx-Calendar/html/Prefs/Calendar.html
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/images/updated.png
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/images/starts_due.png
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/images/starts.png
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/images/started.png
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/images/resolved.png
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/images/reminder.png
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/images/due.png
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/images/created_due.png
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/images/created.png
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/css/calendar.css
+%%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/Calendar/dhandler
+%%RTHOME%%/plugins/RTx-Calendar/html/Elements/MyCalendar
+%%RTHOME%%/plugins/RTx-Calendar/html/Elements/CalendarEvent
+%%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/User/Elements/=
Tabs/Default
+%%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Ticket/Element=
s/Tabs/Default
+%%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Elements/Heade=
r/Head
+man/auto/RTx/Calendar/.packlist
+lib/RTx/Calendar.pm
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/lib/RTx
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/lib
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Search
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Prefs/Elements
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Prefs
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/images
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/css
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/NoAuth/Calendar
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/NoAuth
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Elements
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/User/El=
ements/Tabs
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/User/El=
ements
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/User
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Ticket/=
Elements/Tabs
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Ticket/=
Elements
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Ticket
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Element=
s/Header
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Elements
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html
+@dirrm %%RTHOME%%/plugins/RTx-Calendar
+@dirrm man/auto/RTx/Calendar
+@dirrmtry man/auto/RTx
+@dirrmtry man/auto
+@dirrmtry lib/RTx


--=20
Dr Matthew J Seaman MA, D.Phil.                   7 Priory Courtyard
                                                  Flat 3
PGP: http://www.infracaninophile.co.uk/pgpkey     Ramsgate
                                                  Kent, CT11 9PW

--EVF5PPMfhYS0aIcm
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.10 (FreeBSD)

iEYEARECAAYFAkmYF08ACgkQ8Mjk52CukIy42gCfYxUKxJliK005UF3C87vaXSUX
uxAAmwS4k5l/jAmG/OanKvDBQTc4Puod
=mkCg
-----END PGP SIGNATURE-----

--EVF5PPMfhYS0aIcm--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090215132329.GA36637>