Date: Tue, 15 Jun 2004 23:54:36 +0200 From: Piotr Smyrak <smyru@smyrak.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: shige@FreeBSD.org Subject: ports/67989: [patch] Fix the graphics/xv packaging Message-ID: <E1BaLt6-0001Ge-2h@beth.poprostu.pl> Resent-Message-ID: <200406152200.i5FM0TkN036910@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67989
>Category: ports
>Synopsis: [patch] Fix the graphics/xv packaging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 15 22:00:29 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Piotr Smyrak
>Release: FreeBSD 5.2.1-RELEASE-p6 i386
>Organization:
>Environment:
System:
FreeBSD ntbk 5.2.1-RELEASE-p6 FreeBSD 5.2.1-RELEASE-p6 #1: Sun Jun 13 11:49:43 CEST 2004 root@ntbk:/usr/obj/usr/src/sys/SMYRU i386
>Description:
Currently packaging of graphics/xv fails under NOPORTDOCS set.
The patch below fixes the pkg-plist and the Makefile introducing
DOCSDIR and PORTDOCS.
>How-To-Repeat:
$ cd /usr/ports/graphics/xv && make NOPORTDOCS=yes package
>Fix:
--- xv.patch begins here ---
--- Makefile.orig Fri Jun 11 01:28:28 2004
+++ Makefile Fri Jun 11 01:33:23 2004
@@ -71,20 +71,20 @@
post-install:
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/README.PNG ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/docs/epsf.ps ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/docs/xpm.ps ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/docs/xvtitle.ps ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/docs/help ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/docs/bmp.doc ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/docs/gif* ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/CHANGELOG.* ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/README.PhotoCD ${PREFIX}/share/doc/xv
- @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/README.xv310a-ext-5.3.3 ${PREFIX}/share/doc/xv/README.xv310a-ext-5.3.3.ja
- @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/magic.add ${PREFIX}/share/doc/xv
+ @${MKDIR} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/README.PNG ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/docs/epsf.ps ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/docs/xpm.ps ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/docs/xvtitle.ps ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/docs/help ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/docs/bmp.doc ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/docs/gif* ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/CHANGELOG.* ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/README.PhotoCD ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/README.xv310a-ext-5.3.3 ${DOCSDIR}/README.xv310a-ext-5.3.3.ja
+ @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/magic.add ${DOCSDIR}
.endif
.include <bsd.port.mk>
--- pkg-plist.orig Fri Jun 11 01:26:20 2004
+++ pkg-plist Fri Jun 11 01:30:30 2004
@@ -4,20 +4,20 @@
bin/xcmap
bin/xvpictoppm
lib/X11/xv_mgcsfx.sample
-share/doc/xv/README
-share/doc/xv/README.PNG
-share/doc/xv/epsf.ps
-share/doc/xv/xpm.ps
-share/doc/xv/xvdocs.ps
-share/doc/xv/xvtitle.ps
-share/doc/xv/help
-share/doc/xv/bmp.doc
-share/doc/xv/gif.ack
-share/doc/xv/gif.aspect
-share/doc/xv/gif87.doc
-share/doc/xv/gif89.doc
-share/doc/xv/CHANGELOG.jp-ext
-share/doc/xv/README.PhotoCD
-share/doc/xv/README.xv310a-ext-5.3.3.ja
-share/doc/xv/magic.add
-@dirrm share/doc/xv
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.PNG
+%%PORTDOCS%%%%DOCSDIR%%/epsf.ps
+%%PORTDOCS%%%%DOCSDIR%%/xpm.ps
+%%PORTDOCS%%%%DOCSDIR%%/xvdocs.ps
+%%PORTDOCS%%%%DOCSDIR%%/xvtitle.ps
+%%PORTDOCS%%%%DOCSDIR%%/help
+%%PORTDOCS%%%%DOCSDIR%%/bmp.doc
+%%PORTDOCS%%%%DOCSDIR%%/gif.ack
+%%PORTDOCS%%%%DOCSDIR%%/gif.aspect
+%%PORTDOCS%%%%DOCSDIR%%/gif87.doc
+%%PORTDOCS%%%%DOCSDIR%%/gif89.doc
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.jp-ext
+%%PORTDOCS%%%%DOCSDIR%%/README.PhotoCD
+%%PORTDOCS%%%%DOCSDIR%%/README.xv310a-ext-5.3.3.ja
+%%PORTDOCS%%%%DOCSDIR%%/magic.add
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- xv.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1BaLt6-0001Ge-2h>