ports/142140: [maintainer] www/p5-RTx-Calendar -- bsd.port.options.mk, etc.

[Matthew Seaman]

>Number:         142140
>Category:       ports
>Synopsis:       [maintainer] www/p5-RTx-Calendar -- bsd.port.options.mk, etc.
>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:   Tue Dec 29 17:30:05 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 8.0-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 8.0-STABLE FreeBSD 8.0-STABLE #15: Thu Dec 24 09:23:16 GMT 2009 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

   * Switch to using bsd.port.options.mk
   * Track PREFIX settings from the parent www/rt38 or www/rt36 port:
     has to match, or it won't work.

>How-To-Repeat:
	
>Fix:

	

--- p5-RTx-Calendar.diff begins here ---
diff -Nur /usr/ports/www/p5-RTx-Calendar/Makefile p5-RTx-Calendar/Makefile
--- /usr/ports/www/p5-RTx-Calendar/Makefile	2009-07-31 14:56:34.000000000 +0100
+++ p5-RTx-Calendar/Makefile	2009-12-29 17:17:44.000000000 +0000
@@ -20,15 +20,11 @@
 		${SITE_PERL}/DateTime/Set.pm:${PORTSDIR}/devel/p5-DateTime-Set
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-OPTIONS=	RT36 "Install for rt-3.6.x (default rt-3.8.x)" off
-
 PERL_CONFIGURE=	yes
 
-MAN3=		RTx::Calendar.3
-
-PLIST_SUB+=	RTHOME=${RTHOME}
+OPTIONS=	RT36 "Install for rt-3.6.x (default rt-3.8.x)" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_RT36)
 
@@ -48,12 +44,15 @@
 
 .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.
+MAN3=		RTx::Calendar.3
+PLIST_SUB+=	RTHOME=${RTHOME}
+
+# Note: You can install using an arbitrary $PREFIX but only if it
+# matches the $PREFIX used to install www/rt3{6,8}.  Hence ignore
+# $PREFIX in the environment and inherit settings from RT.pm
 do-configure:
 	@cd ${CONFIGURE_WRKSRC} && \
-	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${RT_PM_DIR} ./${CONFIGURE_SCRIPT} && \
+	    ${SETENV} -u PREFIX ${CONFIGURE_ENV} ${PERL5} -I${RT_PM_DIR} ./${CONFIGURE_SCRIPT} && \
 	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- p5-RTx-Calendar.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: