ports/127267: [PATCH] net/xwhois: Fix plist / install (QA Tindy errors)

[Thomas Sandford]

>Number:         127267
>Category:       ports
>Synopsis:       [PATCH] net/xwhois: Fix plist / install (QA Tindy errors)
>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:   Wed Sep 10 10:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Sandford
>Release:        FreeBSD 7.0-RELEASE-p2 i386
>Organization:
Paradise Green Technical Services
>Environment:
System: FreeBSD miriam.paradisegreen.co.uk 7.0-RELEASE-p2 FreeBSD 7.0-RELEASE-p2 #0: Wed Jun 18 07:33:20 UTC 2008
>Description:
Make PORTDOCS / PORTDATA / DOCSDIR / DATADIR safe.

Prompted by: QA Tindy

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

--- xwhois-0.4.2_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/xwhois_orig/Makefile /usr/ports/net/xwhois/Makefile
--- /usr/ports/net/xwhois_orig/Makefile	2008-09-10 10:48:50.000000000 +0100
+++ /usr/ports/net/xwhois/Makefile	2008-09-10 10:59:12.000000000 +0100
@@ -19,15 +19,17 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xwhois ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/xwhois
-	${MKDIR} ${PREFIX}/share/xwhois/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/docs/xwhois.servers ${PREFIX}/share/xwhois
-	${INSTALL_DATA} ${WRKSRC}/docs/xwhois.xpm ${PREFIX}/share/xwhois/pixmaps
+.if !defined(NOPORTDATA)
+	${MKDIR} ${DATADIR}
+	${MKDIR} ${DATADIR}/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/docs/xwhois.servers ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/xwhois.xpm ${DATADIR}/pixmaps
+.endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/xwhois
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xwhois
-	${INSTALL_DATA} ${WRKSRC}/docs/TODO ${PREFIX}/share/doc/xwhois
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xwhois
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README    ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/TODO ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/net/xwhois_orig/pkg-plist /usr/ports/net/xwhois/pkg-plist
--- /usr/ports/net/xwhois_orig/pkg-plist	2008-09-10 10:48:50.000000000 +0100
+++ /usr/ports/net/xwhois/pkg-plist	2008-09-10 11:01:51.000000000 +0100
@@ -1,9 +1,9 @@
 bin/xwhois
-share/xwhois/xwhois.servers
-share/xwhois/pixmaps/xwhois.xpm
-share/doc/xwhois/README
-share/doc/xwhois/TODO
-share/doc/xwhois/ChangeLog
- at dirrm share/xwhois/pixmaps
- at dirrm share/xwhois
- at dirrm share/doc/xwhois
+%%PORTDATA%%%%DATADIR%%/xwhois.servers
+%%PORTDATA%%%%DATADIR%%/pixmaps/xwhois.xpm
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDATA%%@dirrm %%DATADIR%%/pixmaps
+%%PORTDATA%%@dirrm %%DATADIR%%
--- xwhois-0.4.2_4.patch ends here ---

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