Date: Wed, 7 Jan 2004 21:20:33 +0100 (CET) From: Vincent Tantardini <vinc@FreeBSD-fr.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61036: [patch] clean orphaned ports in misc category - part 5 Message-ID: <20040107202033.16FC4573@sativa.0x45.org> Resent-Message-ID: <200401072030.i07KUPxv049657@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61036
>Category: ports
>Synopsis: [patch] clean orphaned ports in misc category - part 5
>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 Jan 07 12:30:25 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Vincent Tantardini
>Release: FreeBSD 4.9-STABLE i386
>Organization:
Kerneled.com
>Environment:
System: FreeBSD sativa.0x45.org 4.9-STABLE FreeBSD 4.9-STABLE #0: Fri Dec 26 21:19:14 CET 2003 vinc@sativa.0x45.org:/usr/obj/usr/src/sys/SATIVA i386
>Description:
Clean misc category orphaned ports:
- use ${DOCSDIR} and %%DOCSDIR%%
- use ${DATADIR} and %%DATADIR%%
- use ${EXAMPLESDIR} and %%EXAMPLESDIR%%
- use PORTDOCS when I can
Modified ports:
kcd
kenny
kp
libutf
pypanda
>How-To-Repeat:
>Fix:
--- misc-ports-cleanup.diff begins here ---
diff -ruN kcd.orig/pkg-plist kcd/pkg-plist
--- kcd.orig/pkg-plist Wed Jan 7 21:07:00 2004
+++ kcd/pkg-plist Wed Jan 7 20:36:25 2004
@@ -4,8 +4,8 @@
share/locale/en_GB/LC_MESSAGES/kcd.mo
share/locale/en_GB.UTF-8/LC_MESSAGES/kcd.mo
share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
-%%PORTDOCS%%share/doc/kcd/README
-%%PORTDOCS%%share/examples/kcd/kcd.csh.init
-%%PORTDOCS%%share/examples/kcd/kcd.sh.init
-%%PORTDOCS%%@dirrm share/examples/kcd
-%%PORTDOCS%%@dirrm share/doc/kcd
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/kcd.csh.init
+%%PORTDOCS%%%%EXAMPLESDIR%%/kcd.sh.init
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff -ruN kenny.orig/Makefile kenny/Makefile
--- kenny.orig/Makefile Wed Jan 7 21:09:32 2004
+++ kenny/Makefile Wed Jan 7 20:46:54 2004
@@ -26,7 +26,6 @@
MAN1= kenny.1
program= kenny
-manpage= kenny.1
.if exists(/usr/bin/pod2man)
POD2MAN= /usr/bin/pod2man
@@ -46,6 +45,6 @@
do-install:
@${INSTALL_SCRIPT} ${WRKDIR}/${program} ${PREFIX}/bin/${program}
- @${INSTALL_MAN} ${WRKDIR}/${manpage} ${MANPREFIX}/man/man1/${manpage}
+ @${INSTALL_MAN} ${WRKDIR}/${MAN1} ${MANPREFIX}/man/man1/
.include <bsd.port.mk>
diff -ruN kp.orig/Makefile kp/Makefile
--- kp.orig/Makefile Wed Jan 7 21:09:39 2004
+++ kp/Makefile Wed Jan 7 20:48:13 2004
@@ -19,8 +19,8 @@
MAN1= kp.1
post-install:
- ${MKDIR} ${PREFIX}/share/kp/xmodmaps
- cd ${WRKSRC}; ${INSTALL_DATA} COPYRIGHT README ${PREFIX}/share/kp
- cd ${WRKSRC}/xmodmaps; ${INSTALL_DATA} * ${PREFIX}/share/kp/xmodmaps
+ ${MKDIR} ${DATADIR}/xmodmaps
+ cd ${WRKSRC}; ${INSTALL_DATA} COPYRIGHT README ${DATADIR}
+ cd ${WRKSRC}/xmodmaps; ${INSTALL_DATA} * ${DATADIR}/xmodmaps
.include <bsd.port.mk>
diff -ruN kp.orig/pkg-plist kp/pkg-plist
--- kp.orig/pkg-plist Wed Jan 7 21:09:39 2004
+++ kp/pkg-plist Wed Jan 7 20:48:40 2004
@@ -1,15 +1,15 @@
bin/kp
-share/kp/COPYRIGHT
-share/kp/README
-share/kp/xmodmaps/dec.dv
-share/kp/xmodmaps/dec.qw
-share/kp/xmodmaps/hp.dv
-share/kp/xmodmaps/hp.qw
-share/kp/xmodmaps/pc.dv
-share/kp/xmodmaps/pc.qw
-share/kp/xmodmaps/sgi.dv
-share/kp/xmodmaps/sgi.qw
-share/kp/xmodmaps/sun.dv
-share/kp/xmodmaps/sun.qw
-@dirrm share/kp/xmodmaps
-@dirrm share/kp
+%%DATADIR%%/COPYRIGHT
+%%DATADIR%%/README
+%%DATADIR%%/xmodmaps/dec.dv
+%%DATADIR%%/xmodmaps/dec.qw
+%%DATADIR%%/xmodmaps/hp.dv
+%%DATADIR%%/xmodmaps/hp.qw
+%%DATADIR%%/xmodmaps/pc.dv
+%%DATADIR%%/xmodmaps/pc.qw
+%%DATADIR%%/xmodmaps/sgi.dv
+%%DATADIR%%/xmodmaps/sgi.qw
+%%DATADIR%%/xmodmaps/sun.dv
+%%DATADIR%%/xmodmaps/sun.qw
+@dirrm %%DATADIR%%/xmodmaps
+@dirrm %%DATADIR%%
diff -ruN libutf.orig/pkg-plist libutf/pkg-plist
--- libutf.orig/pkg-plist Wed Jan 7 21:09:53 2004
+++ libutf/pkg-plist Wed Jan 7 20:52:58 2004
@@ -1,5 +1,5 @@
include/ure.h
include/utf.h
lib/libutf.a
-share/examples/libutf/langcoll.utf
-@dirrm share/examples/libutf
+%%EXAMPLESDIR%%/langcoll.utf
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff -ruN pypanda.orig/pkg-plist pypanda/pkg-plist
--- pypanda.orig/pkg-plist Wed Jan 7 21:10:04 2004
+++ pypanda/pkg-plist Wed Jan 7 21:02:26 2004
@@ -1,10 +1,10 @@
bin/pypanda
-share/doc/pypanda/README
-share/pypanda/camdown.jpg
-share/pypanda/camrefresh.jpg
-share/pypanda/pypanda.png
-share/pypanda/pypanda.py
-share/pypanda/pypanda.pyc
-share/pypanda/pypanda.pyo
-@dirrm share/pypanda
-@dirrm share/doc/pypanda
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/camdown.jpg
+%%DATADIR%%/camrefresh.jpg
+%%DATADIR%%/pypanda.png
+%%DATADIR%%/pypanda.py
+%%DATADIR%%/pypanda.pyc
+%%DATADIR%%/pypanda.pyo
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- misc-ports-cleanup.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040107202033.16FC4573>