From m.seaman@infracaninophile.co.uk  Tue Dec 29 17:22:30 2009
Return-Path: <m.seaman@infracaninophile.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0C117106568F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Dec 2009 17:22:30 +0000 (UTC)
	(envelope-from m.seaman@infracaninophile.co.uk)
Received: from smtp.infracaninophile.co.uk (gate6.infracaninophile.co.uk [IPv6:2001:8b0:151:1::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E4F08FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Dec 2009 17:22:29 +0000 (UTC)
Received: from happy-idiot-talk.infracaninophile.co.uk (localhost [IPv6:::1])
	by smtp.infracaninophile.co.uk (8.14.3/8.14.3) with ESMTP id nBTHMPVk073572
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Dec 2009 17:22:25 GMT
	(envelope-from matthew@happy-idiot-talk.infracaninophile.co.uk)
Received: (from matthew@localhost)
	by happy-idiot-talk.infracaninophile.co.uk (8.14.3/8.14.3/Submit) id nBTHMPYW073571;
	Tue, 29 Dec 2009 17:22:25 GMT
	(envelope-from matthew)
Message-Id: <200912291722.nBTHMPYW073571@happy-idiot-talk.infracaninophile.co.uk>
Date: Tue, 29 Dec 2009 17:22:25 GMT
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Reply-To: Matthew Seaman <m.seaman@infracaninophile.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer] www/p5-RTx-Calendar -- bsd.port.options.mk, etc.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142140
>Category:       ports
>Synopsis:       [maintainer] www/p5-RTx-Calendar -- bsd.port.options.mk, etc.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 29 17:30:05 UTC 2009
>Closed-Date:    Thu Jan 14 06:27:24 UTC 2010
>Last-Modified:  Thu Jan 14 06:30:15 UTC 2010
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Wed Jan 13 04:28:17 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142140 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Thu Jan 14 06:27:23 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142140 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142140: commit references a PR
Date: Thu, 14 Jan 2010 06:23:39 +0000 (UTC)

 pgollucci    2010-01-14 06:23:31 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/p5-RTx-Calendar  Makefile 
   Log:
   * 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.
   
   PR:             ports/142140
   Submitted by:   Matthew Seaman <m.seaman@infracaninophile.co.uk> (maintainer)
   
   Revision  Changes    Path
   1.7       +10 -11    ports/www/p5-RTx-Calendar/Makefile
 _______________________________________________
 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"
 
>Unformatted:
