Date: Wed, 7 Jan 2004 19:17:22 +0100 (CET) From: Vincent Tantardini <vinc@FreeBSD-fr.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61027: [patch] clean orphaned ports in misc category - part 2 Message-ID: <20040107181722.51966572@sativa.0x45.org> Resent-Message-ID: <200401071820.i07IKLKr035394@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61027
>Category: ports
>Synopsis: [patch] clean orphaned ports in misc category - part 2
>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 10:20:21 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:
chord2html
colortail
cwish
dejagnu
demoniac
>How-To-Repeat:
>Fix:
--- misc-ports-cleanup.diff begins here ---
diff -ruN chord2html.orig/pkg-plist chord2html/pkg-plist
--- chord2html.orig/pkg-plist Wed Jan 7 19:00:04 2004
+++ chord2html/pkg-plist Wed Jan 7 18:27:18 2004
@@ -1,3 +1,3 @@
bin/chord2html
-share/chord2html/chord2html.css
-@dirrm share/chord2html
+%%DATADIR%%/chord2html.css
+@dirrm %%DATADIR%%
diff -ruN colortail.orig/pkg-plist colortail/pkg-plist
--- colortail.orig/pkg-plist Wed Jan 7 19:00:48 2004
+++ colortail/pkg-plist Wed Jan 7 18:38:11 2004
@@ -1,7 +1,7 @@
bin/colortail
-%%PORTDOCS%%share/examples/colortail/conf.daemon
-%%PORTDOCS%%share/examples/colortail/conf.kernel
-%%PORTDOCS%%share/examples/colortail/conf.messages
-%%PORTDOCS%%share/examples/colortail/conf.secure
-%%PORTDOCS%%share/examples/colortail/conf.xferlog
-%%PORTDOCS%%@dirrm share/examples/colortail
+%%PORTDOCS%%%%EXAMPLESDIR%%/conf.daemn
+%%PORTDOCS%%%%EXAMPLESDIR%%/conf.kernel
+%%PORTDOCS%%%%EXAMPLESDIR%%/conf.messages
+%%PORTDOCS%%%%EXAMPLESDIR%%/conf.secure
+%%PORTDOCS%%%%EXAMPLESDIR%%/conf.xferlog
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff -ruN cwish.orig/Makefile cwish/Makefile
--- cwish.orig/Makefile Wed Jan 7 19:00:57 2004
+++ cwish/Makefile Wed Jan 7 18:54:35 2004
@@ -23,6 +23,6 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/cwish ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/cwish.1 ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/cwish.1 ${MANPREFIX}/man/man1
.include <bsd.port.mk>
diff -ruN dejagnu.orig/pkg-plist dejagnu/pkg-plist
--- dejagnu.orig/pkg-plist Wed Jan 7 19:01:06 2004
+++ dejagnu/pkg-plist Wed Jan 7 18:50:08 2004
@@ -1,166 +1,166 @@
bin/runtest
include/dejagnu.h
-share/dejagnu/baseboards/README
-share/dejagnu/baseboards/a29k-udi.exp
-share/dejagnu/baseboards/arc-sim.exp
-share/dejagnu/baseboards/arm-ice.exp
-share/dejagnu/baseboards/arm-sid.exp
-share/dejagnu/baseboards/arm-sim.exp
-share/dejagnu/baseboards/basic-sid.exp
-share/dejagnu/baseboards/basic-sim.exp
-share/dejagnu/baseboards/cf.exp
-share/dejagnu/baseboards/cygmon.exp
-share/dejagnu/baseboards/cygwin.exp
-share/dejagnu/baseboards/d10v-sim.exp
-share/dejagnu/baseboards/d10v.exp
-share/dejagnu/baseboards/d30v-sim.exp
-share/dejagnu/baseboards/danlite-elf.exp
-share/dejagnu/baseboards/dos.exp
-share/dejagnu/baseboards/fr30-cygmon.exp
-share/dejagnu/baseboards/fr30-elf.exp
-share/dejagnu/baseboards/fr30-sim.exp
-share/dejagnu/baseboards/frv-elf.exp
-share/dejagnu/baseboards/frv-sim.exp
-share/dejagnu/baseboards/frv-tiger.exp
-share/dejagnu/baseboards/frv-tomcat.exp
-share/dejagnu/baseboards/gdbserver-sample.exp
-share/dejagnu/baseboards/h8300-sim.exp
-share/dejagnu/baseboards/h8300.exp
-share/dejagnu/baseboards/i386-bozo.exp
-share/dejagnu/baseboards/i386-sid.exp
-share/dejagnu/baseboards/i960-cyclone.exp
-share/dejagnu/baseboards/i960-sim.exp
-share/dejagnu/baseboards/jmr3904-sim.exp
-share/dejagnu/baseboards/linux-gdbserver.exp
-share/dejagnu/baseboards/linux-libremote.exp
-share/dejagnu/baseboards/m32r-elf.exp
-share/dejagnu/baseboards/m32r-sid.exp
-share/dejagnu/baseboards/m32r-sim.exp
-share/dejagnu/baseboards/m68hc11-sim.exp
-share/dejagnu/baseboards/m68k-emc.exp
-share/dejagnu/baseboards/m68k-sid.exp
-share/dejagnu/baseboards/mcore-elf.exp
-share/dejagnu/baseboards/mcore-moto-sim.exp
-share/dejagnu/baseboards/mcore-pe.exp
-share/dejagnu/baseboards/mcore-sim.exp
-share/dejagnu/baseboards/mips-idt.exp
-share/dejagnu/baseboards/mips-lnews-sim.exp
-share/dejagnu/baseboards/mips-lsi-sim.exp
-share/dejagnu/baseboards/mips-sim-idt32.exp
-share/dejagnu/baseboards/mips-sim-idt64.exp
-share/dejagnu/baseboards/mips-sim.exp
-share/dejagnu/baseboards/mips64-sim.exp
-share/dejagnu/baseboards/mips64vr4100-sim.exp
-share/dejagnu/baseboards/mmixware-sim.exp
-share/dejagnu/baseboards/mn10200-cygmon.exp
-share/dejagnu/baseboards/mn10200-sim.exp
-share/dejagnu/baseboards/mn10300-cygmon.exp
-share/dejagnu/baseboards/mn10300-sim.exp
-share/dejagnu/baseboards/msparc-cygmon.exp
-share/dejagnu/baseboards/op50n.exp
-share/dejagnu/baseboards/powerpc-bug.exp
-share/dejagnu/baseboards/powerpc-bug1.exp
-share/dejagnu/baseboards/powerpc-sim.exp
-share/dejagnu/baseboards/powerpcle-sim.exp
-share/dejagnu/baseboards/rom68k-idp.exp
-share/dejagnu/baseboards/sh-hms-sim.exp
-share/dejagnu/baseboards/sh-hms.exp
-share/dejagnu/baseboards/sh-sid.exp
-share/dejagnu/baseboards/sparc64-sim.exp
-share/dejagnu/baseboards/sparclet-aout.exp
-share/dejagnu/baseboards/sparclite-coff.exp
-share/dejagnu/baseboards/sparclite-cygmon.exp
-share/dejagnu/baseboards/sparclite-sim-le.exp
-share/dejagnu/baseboards/tic80-sim.exp
-share/dejagnu/baseboards/tx39-dve.exp
-share/dejagnu/baseboards/tx39-sim.exp
-share/dejagnu/baseboards/unix.exp
-share/dejagnu/baseboards/v850-sim.exp
-share/dejagnu/baseboards/vr4100-ddb.exp
-share/dejagnu/baseboards/sparclite-sim.exp
-share/dejagnu/baseboards/vr4100-sim.exp
-share/dejagnu/baseboards/vr4111-sim.exp
-share/dejagnu/baseboards/vr4300-ddb.exp
-share/dejagnu/baseboards/vr4300-sim.exp
-share/dejagnu/baseboards/vr4300.exp
-share/dejagnu/baseboards/vr5000-ddb.exp
-share/dejagnu/baseboards/strongarm-cygmon.exp
-share/dejagnu/baseboards/vx4300.exp
-share/dejagnu/baseboards/vx68k.exp
-share/dejagnu/baseboards/vx960.exp
-share/dejagnu/baseboards/usparc-cygmon.exp
-share/dejagnu/baseboards/vxsparc.exp
-share/dejagnu/baseboards/x86-cygmon.exp
-share/dejagnu/baseboards/xscale-cygmon.exp
-share/dejagnu/baseboards/xtensa-sim.exp
-share/dejagnu/config/README
-share/dejagnu/config/arc.exp
-share/dejagnu/config/arm-ice.exp
-share/dejagnu/config/base-config.exp
-share/dejagnu/config/base68k.exp
-share/dejagnu/config/bug.exp
-share/dejagnu/config/cfdbug.exp
-share/dejagnu/config/cygmon.exp
-share/dejagnu/config/d10v.exp
-share/dejagnu/config/ddb-ether.exp
-share/dejagnu/config/ddb.exp
-share/dejagnu/config/default.exp
-share/dejagnu/config/dos.exp
-share/dejagnu/config/dve.exp
-share/dejagnu/config/gdb-comm.exp
-share/dejagnu/config/gdb_stub.exp
-share/dejagnu/config/h8300.exp
-share/dejagnu/config/i386-bozo.exp
-share/dejagnu/config/i960.exp
-share/dejagnu/config/m32r-stub.exp
-share/dejagnu/config/m32r.exp
-share/dejagnu/config/m68hc11.exp
-share/dejagnu/config/m68k-emc.exp
-share/dejagnu/config/mips-idt.exp
-share/dejagnu/config/mn10200-eval.exp
-share/dejagnu/config/mn10300-eval.exp
-share/dejagnu/config/netware.exp
-share/dejagnu/config/powerpc-bug.exp
-share/dejagnu/config/proelf.exp
-share/dejagnu/config/rom68k.exp
-share/dejagnu/config/sh.exp
-share/dejagnu/config/sid.exp
-share/dejagnu/config/sim.exp
-share/dejagnu/config/slite.exp
-share/dejagnu/config/sparclet.exp
-share/dejagnu/config/tic80.exp
-share/dejagnu/config/udi.exp
-share/dejagnu/config/unix.exp
-share/dejagnu/config/vr4100.exp
-share/dejagnu/config/vr4300.exp
-share/dejagnu/config/vr5000.exp
-share/dejagnu/config/vrtx.exp
-share/dejagnu/config/vxworks.exp
-share/dejagnu/debugger.exp
-share/dejagnu/dejagnu.exp
-share/dejagnu/dg.exp
-share/dejagnu/framework.exp
-share/dejagnu/ftp.exp
-share/dejagnu/i960glue.c
-share/dejagnu/kermit.exp
-share/dejagnu/libexec/config.guess
-share/dejagnu/libgloss.exp
-share/dejagnu/mondfe.exp
-share/dejagnu/remote.exp
-share/dejagnu/rlogin.exp
-share/dejagnu/rsh.exp
-share/dejagnu/runtest.exp
-share/dejagnu/standard.exp
-share/dejagnu/stub-loader.c
-share/dejagnu/target.exp
-share/dejagnu/targetdb.exp
-share/dejagnu/telnet.exp
-share/dejagnu/testglue.c
-share/dejagnu/tip.exp
-share/dejagnu/util-defs.exp
-share/dejagnu/utils.exp
-share/dejagnu/xsh.exp
-@dirrm share/dejagnu/libexec
-@dirrm share/dejagnu/baseboards
-@dirrm share/dejagnu/config
-@dirrm share/dejagnu
+%%DATADIR%%/baseboards/README
+%%DATADIR%%/baseboards/a29k-udi.exp
+%%DATADIR%%/baseboards/arc-sim.exp
+%%DATADIR%%/baseboards/arm-ice.exp
+%%DATADIR%%/baseboards/arm-sid.exp
+%%DATADIR%%/baseboards/arm-sim.exp
+%%DATADIR%%/baseboards/basic-sid.exp
+%%DATADIR%%/baseboards/basic-sim.exp
+%%DATADIR%%/baseboards/cf.exp
+%%DATADIR%%/baseboards/cygmon.exp
+%%DATADIR%%/baseboards/cygwin.exp
+%%DATADIR%%/baseboards/d10v-sim.exp
+%%DATADIR%%/baseboards/d10v.exp
+%%DATADIR%%/baseboards/d30v-sim.exp
+%%DATADIR%%/baseboards/danlite-elf.exp
+%%DATADIR%%/baseboards/dos.exp
+%%DATADIR%%/baseboards/fr30-cygmon.exp
+%%DATADIR%%/baseboards/fr30-elf.exp
+%%DATADIR%%/baseboards/fr30-sim.exp
+%%DATADIR%%/baseboards/frv-elf.exp
+%%DATADIR%%/baseboards/frv-sim.exp
+%%DATADIR%%/baseboards/frv-tiger.exp
+%%DATADIR%%/baseboards/frv-tomcat.exp
+%%DATADIR%%/baseboards/gdbserver-sample.exp
+%%DATADIR%%/baseboards/h8300-sim.exp
+%%DATADIR%%/baseboards/h8300.exp
+%%DATADIR%%/baseboards/i386-bozo.exp
+%%DATADIR%%/baseboards/i386-sid.exp
+%%DATADIR%%/baseboards/i960-cyclone.exp
+%%DATADIR%%/baseboards/i960-sim.exp
+%%DATADIR%%/baseboards/jmr3904-sim.exp
+%%DATADIR%%/baseboards/linux-gdbserver.exp
+%%DATADIR%%/baseboards/linux-libremote.exp
+%%DATADIR%%/baseboards/m32r-elf.exp
+%%DATADIR%%/baseboards/m32r-sid.exp
+%%DATADIR%%/baseboards/m32r-sim.exp
+%%DATADIR%%/baseboards/m68hc11-sim.exp
+%%DATADIR%%/baseboards/m68k-emc.exp
+%%DATADIR%%/baseboards/m68k-sid.exp
+%%DATADIR%%/baseboards/mcore-elf.exp
+%%DATADIR%%/baseboards/mcore-moto-sim.exp
+%%DATADIR%%/baseboards/mcore-pe.exp
+%%DATADIR%%/baseboards/mcore-sim.exp
+%%DATADIR%%/baseboards/mips-idt.exp
+%%DATADIR%%/baseboards/mips-lnews-sim.exp
+%%DATADIR%%/baseboards/mips-lsi-sim.exp
+%%DATADIR%%/baseboards/mips-sim-idt32.exp
+%%DATADIR%%/baseboards/mips-sim-idt64.exp
+%%DATADIR%%/baseboards/mips-sim.exp
+%%DATADIR%%/baseboards/mips64-sim.exp
+%%DATADIR%%/baseboards/mips64vr4100-sim.exp
+%%DATADIR%%/baseboards/mmixware-sim.exp
+%%DATADIR%%/baseboards/mn10200-cygmon.exp
+%%DATADIR%%/baseboards/mn10200-sim.exp
+%%DATADIR%%/baseboards/mn10300-cygmon.exp
+%%DATADIR%%/baseboards/mn10300-sim.exp
+%%DATADIR%%/baseboards/msparc-cygmon.exp
+%%DATADIR%%/baseboards/op50n.exp
+%%DATADIR%%/baseboards/powerpc-bug.exp
+%%DATADIR%%/baseboards/powerpc-bug1.exp
+%%DATADIR%%/baseboards/powerpc-sim.exp
+%%DATADIR%%/baseboards/powerpcle-sim.exp
+%%DATADIR%%/baseboards/rom68k-idp.exp
+%%DATADIR%%/baseboards/sh-hms-sim.exp
+%%DATADIR%%/baseboards/sh-hms.exp
+%%DATADIR%%/baseboards/sh-sid.exp
+%%DATADIR%%/baseboards/sparc64-sim.exp
+%%DATADIR%%/baseboards/sparclet-aout.exp
+%%DATADIR%%/baseboards/sparclite-coff.exp
+%%DATADIR%%/baseboards/sparclite-cygmon.exp
+%%DATADIR%%/baseboards/sparclite-sim-le.exp
+%%DATADIR%%/baseboards/tic80-sim.exp
+%%DATADIR%%/baseboards/tx39-dve.exp
+%%DATADIR%%/baseboards/tx39-sim.exp
+%%DATADIR%%/baseboards/unix.exp
+%%DATADIR%%/baseboards/v850-sim.exp
+%%DATADIR%%/baseboards/vr4100-ddb.exp
+%%DATADIR%%/baseboards/sparclite-sim.exp
+%%DATADIR%%/baseboards/vr4100-sim.exp
+%%DATADIR%%/baseboards/vr4111-sim.exp
+%%DATADIR%%/baseboards/vr4300-ddb.exp
+%%DATADIR%%/baseboards/vr4300-sim.exp
+%%DATADIR%%/baseboards/vr4300.exp
+%%DATADIR%%/baseboards/vr5000-ddb.exp
+%%DATADIR%%/baseboards/strongarm-cygmon.exp
+%%DATADIR%%/baseboards/vx4300.exp
+%%DATADIR%%/baseboards/vx68k.exp
+%%DATADIR%%/baseboards/vx960.exp
+%%DATADIR%%/baseboards/usparc-cygmon.exp
+%%DATADIR%%/baseboards/vxsparc.exp
+%%DATADIR%%/baseboards/x86-cygmon.exp
+%%DATADIR%%/baseboards/xscale-cygmon.exp
+%%DATADIR%%/baseboards/xtensa-sim.exp
+%%DATADIR%%/config/README
+%%DATADIR%%/config/arc.exp
+%%DATADIR%%/config/arm-ice.exp
+%%DATADIR%%/config/base-config.exp
+%%DATADIR%%/config/base68k.exp
+%%DATADIR%%/config/bug.exp
+%%DATADIR%%/config/cfdbug.exp
+%%DATADIR%%/config/cygmon.exp
+%%DATADIR%%/config/d10v.exp
+%%DATADIR%%/config/ddb-ether.exp
+%%DATADIR%%/config/ddb.exp
+%%DATADIR%%/config/default.exp
+%%DATADIR%%/config/dos.exp
+%%DATADIR%%/config/dve.exp
+%%DATADIR%%/config/gdb-comm.exp
+%%DATADIR%%/config/gdb_stub.exp
+%%DATADIR%%/config/h8300.exp
+%%DATADIR%%/config/i386-bozo.exp
+%%DATADIR%%/config/i960.exp
+%%DATADIR%%/config/m32r-stub.exp
+%%DATADIR%%/config/m32r.exp
+%%DATADIR%%/config/m68hc11.exp
+%%DATADIR%%/config/m68k-emc.exp
+%%DATADIR%%/config/mips-idt.exp
+%%DATADIR%%/config/mn10200-eval.exp
+%%DATADIR%%/config/mn10300-eval.exp
+%%DATADIR%%/config/netware.exp
+%%DATADIR%%/config/powerpc-bug.exp
+%%DATADIR%%/config/proelf.exp
+%%DATADIR%%/config/rom68k.exp
+%%DATADIR%%/config/sh.exp
+%%DATADIR%%/config/sid.exp
+%%DATADIR%%/config/sim.exp
+%%DATADIR%%/config/slite.exp
+%%DATADIR%%/config/sparclet.exp
+%%DATADIR%%/config/tic80.exp
+%%DATADIR%%/config/udi.exp
+%%DATADIR%%/config/unix.exp
+%%DATADIR%%/config/vr4100.exp
+%%DATADIR%%/config/vr4300.exp
+%%DATADIR%%/config/vr5000.exp
+%%DATADIR%%/config/vrtx.exp
+%%DATADIR%%/config/vxworks.exp
+%%DATADIR%%/debugger.exp
+%%DATADIR%%/dejagnu.exp
+%%DATADIR%%/dg.exp
+%%DATADIR%%/framework.exp
+%%DATADIR%%/ftp.exp
+%%DATADIR%%/i960glue.c
+%%DATADIR%%/kermit.exp
+%%DATADIR%%/libexec/config.guess
+%%DATADIR%%/libgloss.exp
+%%DATADIR%%/mondfe.exp
+%%DATADIR%%/remote.exp
+%%DATADIR%%/rlogin.exp
+%%DATADIR%%/rsh.exp
+%%DATADIR%%/runtest.exp
+%%DATADIR%%/standard.exp
+%%DATADIR%%/stub-loader.c
+%%DATADIR%%/target.exp
+%%DATADIR%%/targetdb.exp
+%%DATADIR%%/telnet.exp
+%%DATADIR%%/testglue.c
+%%DATADIR%%/tip.exp
+%%DATADIR%%/util-defs.exp
+%%DATADIR%%/utils.exp
+%%DATADIR%%/xsh.exp
+@dirrm %%DATADIR%%/libexec
+@dirrm %%DATADIR%%/baseboards
+@dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%
diff -ruN demoniac.orig/pkg-plist demoniac/pkg-plist
--- demoniac.orig/pkg-plist Wed Jan 7 19:01:20 2004
+++ demoniac/pkg-plist Wed Jan 7 18:56:34 2004
@@ -1,4 +1,4 @@
bin/demoniac
-share/demoniac/pixmaps/logo.xpm
-@dirrm share/demoniac/pixmaps
-@dirrm share/demoniac
+%%DATADIR%%/pixmaps/logo.xpm
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/demoniac
--- 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?20040107181722.51966572>