ports/143318: [PATCH] news/ubh: make DOCS & DATADIR safe

[Sevan Janiyan]

>Number:         143318
>Category:       ports
>Synopsis:       [PATCH] news/ubh: make DOCS & DATADIR safe
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 28 17:40:08 UTC 2010
>Closed-Date:
>Last-Modified:
>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 at 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
- at 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:
>Unformatted: