From sevan@newbie.thingamajig-systems.co.uk  Thu Jan 28 17:31:52 2010
Return-Path: <sevan@newbie.thingamajig-systems.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 97D2D106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Jan 2010 17:31:52 +0000 (UTC)
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103])
	by mx1.freebsd.org (Postfix) with ESMTP id 25F478FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 28 Jan 2010 17:31:51 +0000 (UTC)
Received: from newbie.thingamajig-systems.co.uk (localhost [127.0.0.1])
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o0SHS2gG058363;
	Thu, 28 Jan 2010 17:28:02 GMT
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: (from root@localhost)
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o0SHS1Wa058362;
	Thu, 28 Jan 2010 17:28:01 GMT
	(envelope-from sevan)
Message-Id: <201001281728.o0SHS1Wa058362@newbie.thingamajig-systems.co.uk>
Date: Thu, 28 Jan 2010 17:28:01 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc: john@zoner.org
Subject: [PATCH] news/ubh: make DOCS & DATADIR safe 
X-Send-Pr-Version: 3.113
X-GNATS-Notify: john@zoner.org

>Number:         143318
>Category:       ports
>Synopsis:       [PATCH] news/ubh: make DOCS & DATADIR safe
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 28 17:40:08 UTC 2010
>Closed-Date:    Sat May 08 10:14:24 UTC 2010
>Last-Modified:  Sat May 08 10:14:24 UTC 2010
>Originator:     Sevan Janiyan
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 21:11:58 UTC
>Description:
Use DOCSDIR & DATADIR macros
Support NOPORTSDATA

Port maintainer (john@zoner.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- ubh-2.5_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/news/ubh/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	26 Jan 2010 15:01:06 -0000	1.14
+++ Makefile	28 Jan 2010 17:23:54 -0000
@@ -31,10 +31,12 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ubh ${PREFIX}/bin
-	${CP} -R ${WRKSRC}/examples ${PREFIX}/share/ubh
+.if !defined(NOPORTDATA)
+	${CP} -R ${WRKSRC}/examples ${DATADIR}
+.endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ubh
-	${INSTALL_DATA} ${WRKSRC}/doc/ubh.html ${PREFIX}/share/doc/ubh
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/ubh.html ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/news/ubh/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	7 Jun 2002 01:50:41 -0000	1.5
+++ pkg-plist	28 Jan 2010 17:23:54 -0000
@@ -1,6 +1,6 @@
 bin/ubh
-share/ubh/ubhrc
-share/ubh/newsrc
-@dirrm share/ubh
-%%PORTDOCS%%share/doc/ubh/ubh.html
-%%PORTDOCS%%@dirrm share/doc/ubh
+%%PORTDATA%%%%DATADIR%%/ubhrc
+%%PORTDATA%%%%DATADIR%%/newsrc
+%%PORTDATA%%@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/ubh.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- ubh-2.5_1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Jan 28 17:40:21 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: john@zoner.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/143318: [PATCH] news/ubh: make DOCS & DATADIR safe
Date: Thu, 28 Jan 2010 17:40:19 UT

 Maintainer of news/ubh,
 
 Please note that PR ports/143318 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/143318
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Jan 28 18:52:51 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

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

From: John Holland <azoner@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/143318: [PATCH] news/ubh: make DOCS & DATADIR safe
Date: Thu, 28 Jan 2010 13:57:18 -0500

 Looks reasonable to me.
 
 --
 John Holland
 john@zoner.org
 
 
 
 On Thu, Jan 28, 2010 at 12:40 PM, Edwin Groothuis <edwin@freebsd.org> wrote=
 :
 > Maintainer of news/ubh,
 >
 > Please note that PR ports/143318 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 > =A0 =A0http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/143318
 >
 > --
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 >
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sat May 8 10:14:23 UTC 2010 
State-Changed-Why:  
timeout. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143318 
>Unformatted:
