ports/61031: [patch] clean orphaned ports in misc category - part 4

Vincent Tantardini vinc at FreeBSD-fr.org
Wed Jan 7 19:40:52 UTC 2004


>Number:         61031
>Category:       ports
>Synopsis:       [patch] clean orphaned ports in misc category - part 4
>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 11:40:14 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 at 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:
		ewipe
		geekcode
		git
		gnomesword
		grc
>How-To-Repeat:
	
>Fix:

	

--- misc-ports-cleanup.diff begins here ---
diff -ruN ewipe.orig/Makefile ewipe/Makefile
--- ewipe.orig/Makefile	Wed Jan  7 20:24:28 2004
+++ ewipe/Makefile	Wed Jan  7 20:05:49 2004
@@ -41,16 +41,16 @@
 	@${MKDIR} ${PREFIX}/share/ewipe
 	${INSTALL_SCRIPT} ${WRKSRC}/ewipe ${PREFIX}/bin
 .for file in ${TCLLIBS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/ewipe
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/ewipe
+	@${MKDIR} ${DOCSDIR}
 .for file in ${MYPORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ewipe
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
-	@${MKDIR} ${PREFIX}/share/examples/ewipe
+	@${MKDIR} ${DOCSDIR}
 .for file in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/sample/${file} ${PREFIX}/share/examples/ewipe
+	${INSTALL_DATA} ${WRKSRC}/sample/${file} ${EXAMPLESDIR}
 .endfor
 .endif
 
diff -ruN ewipe.orig/pkg-plist ewipe/pkg-plist
--- ewipe.orig/pkg-plist	Wed Jan  7 20:24:28 2004
+++ ewipe/pkg-plist	Wed Jan  7 20:08:16 2004
@@ -1,22 +1,22 @@
 bin/ewipe
-%%PORTDOCS%%share/doc/ewipe/Changes.jp
-%%PORTDOCS%%share/doc/ewipe/README
-%%PORTDOCS%%share/doc/ewipe/README.jp
-%%PORTDOCS%%share/doc/ewipe/dot.ewipe
-share/ewipe/definefont.tcl
-share/ewipe/edittable.tcl
-share/ewipe/setpointer.tcl
-share/ewipe/tclIndex
-share/ewipe/viewer.tcl
-%%PORTDOCS%%share/examples/ewipe/a1.gif
-%%PORTDOCS%%share/examples/ewipe/a2.gif
-%%PORTDOCS%%share/examples/ewipe/a3.gif
-%%PORTDOCS%%share/examples/ewipe/a4.gif
-%%PORTDOCS%%share/examples/ewipe/blue1.gif
-%%PORTDOCS%%share/examples/ewipe/sample.ewp
-%%PORTDOCS%%share/examples/ewipe/test.ewp
-%%PORTDOCS%%share/examples/ewipe/tutorial.ewp
-%%PORTDOCS%%share/examples/ewipe/tutorial-e.ewp
-%%PORTDOCS%%@dirrm share/examples/ewipe
- at dirrm share/ewipe
-%%PORTDOCS%%@dirrm share/doc/ewipe
+%%PORTDOCS%%%%DOCSDIR%%/Changes.jp
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.jp
+%%PORTDOCS%%%%DOCSDIR%%/dot.ewipe
+%%DATADIR%%/definefont.tcl
+%%DATADIR%%/edittable.tcl
+%%DATADIR%%/setpointer.tcl
+%%DATADIR%%/tclIndex
+%%DATADIR%%/viewer.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/a1.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/a2.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/a3.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/a4.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/blue1.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/sample.ewp
+%%PORTDOCS%%%%EXAMPLESDIR%%/test.ewp
+%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial.ewp
+%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial-e.ewp
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+ at dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff -ruN geekcode.orig/Makefile geekcode/Makefile
--- geekcode.orig/Makefile	Wed Jan  7 20:24:37 2004
+++ geekcode/Makefile	Wed Jan  7 20:10:09 2004
@@ -17,8 +17,8 @@
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/geekcode ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/geekcode
-	${INSTALL_DATA} ${WRKSRC}/geekcode.txt ${PREFIX}/share/doc/geekcode
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/geekcode.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN geekcode.orig/pkg-plist geekcode/pkg-plist
--- geekcode.orig/pkg-plist	Wed Jan  7 20:24:37 2004
+++ geekcode/pkg-plist	Wed Jan  7 20:10:45 2004
@@ -1,3 +1,3 @@
 bin/geekcode
-share/doc/geekcode/geekcode.txt
- at dirrm share/doc/geekcode
+%%PORTDOCS%%%%DOCSDIR%%/geekcode.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff -ruN git.orig/pkg-plist git/pkg-plist
--- git.orig/pkg-plist	Wed Jan  7 20:24:43 2004
+++ git/pkg-plist	Wed Jan  7 20:12:37 2004
@@ -17,42 +17,42 @@
 info/git.info-2
 info/git.info-3
 @exec install-info %D/info/git.info %D/info/dir
-share/git/.gitrc.aixterm
-share/git/.gitrc.ansi
-share/git/.gitrc.common
-share/git/.gitrc.cons25
-share/git/.gitrc.console
-share/git/.gitrc.dtterm
-share/git/.gitrc.eterm
-share/git/.gitrc.generic
-share/git/.gitrc.hft
-share/git/.gitrc.hp
-share/git/.gitrc.hpterm
-share/git/.gitrc.iris-ansi
-share/git/.gitrc.iris-ansi-net
-share/git/.gitrc.linux
-share/git/.gitrc.mach
-share/git/.gitrc.minix
-share/git/.gitrc.pc3
-share/git/.gitrc.rxvt
-share/git/.gitrc.screen
-share/git/.gitrc.sun
-share/git/.gitrc.sun-cmd
-share/git/.gitrc.thix
-share/git/.gitrc.vt100
-share/git/.gitrc.vt102
-share/git/.gitrc.vt125
-share/git/.gitrc.vt200
-share/git/.gitrc.vt201
-share/git/.gitrc.vt220
-share/git/.gitrc.vt240
-share/git/.gitrc.vt300
-share/git/.gitrc.vt320
-share/git/.gitrc.vt400
-share/git/.gitrc.vt420
-share/git/.gitrc.xterm
-share/git/.gitrc.xterm-color
-share/git/.gitrc.xterm-debian
-share/git/.gitrc.xterms
-share/git/git.html
- at dirrm share/git
+%%DATADIR%%/.gitrc.aixterm
+%%DATADIR%%/.gitrc.ansi
+%%DATADIR%%/.gitrc.common
+%%DATADIR%%/.gitrc.cons25
+%%DATADIR%%/.gitrc.console
+%%DATADIR%%/.gitrc.dtterm
+%%DATADIR%%/.gitrc.eterm
+%%DATADIR%%/.gitrc.generic
+%%DATADIR%%/.gitrc.hft
+%%DATADIR%%/.gitrc.hp
+%%DATADIR%%/.gitrc.hpterm
+%%DATADIR%%/.gitrc.iris-ansi
+%%DATADIR%%/.gitrc.iris-ansi-net
+%%DATADIR%%/.gitrc.linux
+%%DATADIR%%/.gitrc.mach
+%%DATADIR%%/.gitrc.minix
+%%DATADIR%%/.gitrc.pc3
+%%DATADIR%%/.gitrc.rxvt
+%%DATADIR%%/.gitrc.screen
+%%DATADIR%%/.gitrc.sun
+%%DATADIR%%/.gitrc.sun-cmd
+%%DATADIR%%/.gitrc.thix
+%%DATADIR%%/.gitrc.vt100
+%%DATADIR%%/.gitrc.vt102
+%%DATADIR%%/.gitrc.vt125
+%%DATADIR%%/.gitrc.vt200
+%%DATADIR%%/.gitrc.vt201
+%%DATADIR%%/.gitrc.vt220
+%%DATADIR%%/.gitrc.vt240
+%%DATADIR%%/.gitrc.vt300
+%%DATADIR%%/.gitrc.vt320
+%%DATADIR%%/.gitrc.vt400
+%%DATADIR%%/.gitrc.vt420
+%%DATADIR%%/.gitrc.xterm
+%%DATADIR%%/.gitrc.xterm-color
+%%DATADIR%%/.gitrc.xterm-debian
+%%DATADIR%%/.gitrc.xterms
+%%DATADIR%%/git.html
+ at dirrm %%DATADIR%%
diff -ruN gnomesword.orig/pkg-plist gnomesword/pkg-plist
--- gnomesword.orig/pkg-plist	Wed Jan  7 20:24:59 2004
+++ gnomesword/pkg-plist	Wed Jan  7 20:16:49 2004
@@ -1,10 +1,10 @@
 bin/gnomesword
-%%PORTDOCS%%share/doc/gnomesword/AUTHORS
-%%PORTDOCS%%share/doc/gnomesword/ChangeLog
-%%PORTDOCS%%share/doc/gnomesword/INSTALL
-%%PORTDOCS%%share/doc/gnomesword/NEWS
-%%PORTDOCS%%share/doc/gnomesword/README
-%%PORTDOCS%%share/doc/gnomesword/TODO
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/apps/Applications/gnomesword.desktop
 share/gnome/help/gnomesword/C/index.html
 share/gnome/help/gnomesword/C/intro.html
@@ -36,4 +36,4 @@
 @dirrm share/gnome/pixmaps/gnomesword
 @dirrm share/gnome/help/gnomesword/C
 @dirrm share/gnome/help/gnomesword
-%%PORTDOCS%%@dirrm share/doc/gnomesword
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff -ruN grc.orig/pkg-plist grc/pkg-plist
--- grc.orig/pkg-plist	Wed Jan  7 20:25:14 2004
+++ grc/pkg-plist	Wed Jan  7 20:19:26 2004
@@ -1,14 +1,14 @@
 bin/grc
 bin/grcat
 etc/grc.conf
-share/grc/conf.diff
-share/grc/conf.esperanto
-share/grc/conf.gcc
-share/grc/conf.irclog
-share/grc/conf.ldap
-share/grc/conf.log
-share/grc/conf.netstat
-share/grc/conf.ping
-share/grc/conf.proftpd
-share/grc/conf.traceroute
- at dirrm share/grc
+%%DATADIR%%/conf.diff
+%%DATADIR%%/conf.esperanto
+%%DATADIR%%/conf.gcc
+%%DATADIR%%/conf.irclog
+%%DATADIR%%/conf.ldap
+%%DATADIR%%/conf.log
+%%DATADIR%%/conf.netstat
+%%DATADIR%%/conf.ping
+%%DATADIR%%/conf.proftpd
+%%DATADIR%%/conf.traceroute
+ at dirrm %%DATADIR%%
--- misc-ports-cleanup.diff ends here ---


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



More information about the freebsd-ports-bugs mailing list