Bug 131698 - [maintainer] www/p5-RTx-Calendar -- update to 0.06, rt38 compatibility
Summary: [maintainer] www/p5-RTx-Calendar -- update to 0.06, rt38 compatibility
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Wesley Shields
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-02-15 13:20 UTC by Matthew Seaman
Modified: 2009-02-19 15:40 UTC (History)
0 users

See Also:

Attachments
p5-RTx-Calendar.diff (10.25 KB, patch)
2009-02-15 13:20 UTC, Matthew Seaman 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Matthew Seaman 2009-02-15 13:20:01 UTC 
Update to version 0.06

Add OPTIONS to choose between depending on www/rt36 and www/rt38

File changes:

     p5-RTx-Calendar/pkg-plist renamed to p5-RTx-Calendar/pkg-plist.rt36

     New file: p5-RTx-Calendar/pkg-plist.rt38
Comment 1 Matthew Seaman 2009-02-15 13:23:29 UTC 
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=131698


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 @@
 #
 
 PORTNAME=	RTx-Calendar
-PORTVERSION=	0.05
+PORTVERSION=	0.06
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,27 +14,45 @@
 MAINTAINER=	m.seaman@infracaninophile.co.uk
 COMMENT=	Calendar extension module for the RT ticketing system
 
-BUILD_DEPENDS=	${LOCALBASE}/${RTHOME}/bin/rt:${PORTSDIR}/www/rt36     	      \
-		${SITE_PERL}/Date/ICal.pm:${PORTSDIR}/devel/p5-Date-ICal      \
+BUILD_DEPENDS=	${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=	${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}
 
-MAN3PREFIX=	${PREFIX}/${RTHOME}/local
 MAN3=		RTx::Calendar.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
+
 # 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_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-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) = 53a305c3a5929d77276f98c255186591
-SHA256 (RTx-Calendar-0.05.tar.gz) = f9311929943f35bd631df442da3e428e8524b8236c449d0ccd9266e3aa0d9721
-SIZE (RTx-Calendar-0.05.tar.gz) = 27640
+MD5 (RTx-Calendar-0.06.tar.gz) = f24991d0ed92ab0ae0ecdf348c481d57
+SHA256 (RTx-Calendar-0.06.tar.gz) = 29375bb1fd6a9d96cbf1c7aaa97c731a20e95beb19ef1f9aaec3d25f91fb4b29
+SIZE (RTx-Calendar-0.06.tar.gz) = 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.000000000 +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.000000000 +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/Elements/Tabs/Default
+%%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Elements/Header/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/Elements/Tabs
+@dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/User/Elements
+@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/Elements/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


-- 
Dr Matthew J Seaman MA, D.Phil.                   7 Priory Courtyard
                                                  Flat 3
PGP: http://www.infracaninophile.co.uk/pgpkey     Ramsgate
                                                  Kent, CT11 9PW
Comment 2 Wesley Shields freebsd_committer freebsd_triage 2009-02-16 14:20:36 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->wxs

I'll take it.
Comment 3 dfilter service freebsd_committer freebsd_triage 2009-02-19 15:34:00 UTC 
wxs         2009-02-19 15:33:51 UTC

  FreeBSD ports repository

  Modified files:
    www/p5-RTx-Calendar  Makefile distinfo 
  Added files:
    www/p5-RTx-Calendar  pkg-plist.rt36 pkg-plist.rt38 
  Removed files:
    www/p5-RTx-Calendar  pkg-plist 
  Log:
  - Update to 0.06
  - Provide rt38 compatability (default)
  - Optionally install for rt36
  - Split pkg-plist into pkg-plist.rt36 and pkg-plist.rt38
  
  PR:             ports/131698
  Submitted by:   Matthew Seaman <m.seaman@infracaninophile.co.uk> (maintainer)
  
  Revision  Changes    Path
  1.3       +27 -9     ports/www/p5-RTx-Calendar/Makefile
  1.2       +3 -3      ports/www/p5-RTx-Calendar/distinfo
  1.2       +0 -40     ports/www/p5-RTx-Calendar/pkg-plist (dead)
  1.1       +40 -0     ports/www/p5-RTx-Calendar/pkg-plist.rt36 (new)
  1.1       +48 -0     ports/www/p5-RTx-Calendar/pkg-plist.rt38 (new)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 Wesley Shields freebsd_committer freebsd_triage 2009-02-19 15:34:02 UTC 
State Changed
From-To: open->closed

Committed. Thanks!