ports/61028: [patch] clean orphaned ports in misc category - part 3

Vincent Tantardini vinc at FreeBSD-fr.org
Wed Jan 7 18:50:21 UTC 2004 

>Number:         61028
>Category:       ports
>Synopsis:       [patch] clean orphaned ports in misc category - part 3
>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:50:17 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:
		diction
		display
		dotfile
		earthview
		estic
>How-To-Repeat:
	
>Fix:

	

--- misc-ports-cleanup.diff begins here ---
diff -ruN diction.orig/pkg-plist diction/pkg-plist
--- diction.orig/pkg-plist	Wed Jan  7 19:38:41 2004
+++ diction/pkg-plist	Wed Jan  7 19:21:20 2004
@@ -1,6 +1,6 @@
 bin/diction
 bin/style
-share/diction/C
-share/diction/de
-share/diction/en
- at dirrm share/diction
+%%DATADIR%%/C
+%%DATADIR%%/de
+%%DATADIR%%/en
+ at dirrm %%DATADIR%%
diff -ruN display.orig/Makefile display/Makefile
--- display.orig/Makefile	Wed Jan  7 19:38:50 2004
+++ display/Makefile	Wed Jan  7 19:22:28 2004
@@ -20,6 +20,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/display ${PREFIX}/bin/display
-	${INSTALL_MAN} ${WRKSRC}/display.man ${PREFIX}/man/man1/display.1
+	${INSTALL_MAN} ${WRKSRC}/display.man ${MANPREFIX}/man/man1/display.1
 
 .include <bsd.port.mk>
diff -ruN dotfile.orig/pkg-plist dotfile/pkg-plist
--- dotfile.orig/pkg-plist	Wed Jan  7 19:38:58 2004
+++ dotfile/pkg-plist	Wed Jan  7 19:24:36 2004
@@ -337,35 +337,35 @@
 lib/%%DISTNAME%%/japanese/fvwm2/tools.tcl
 lib/%%DISTNAME%%/japanese/fvwm2/version
 lib/%%DISTNAME%%/japanese/fvwm2/virtual.template
-%%PORTDOCS%%share/doc/dotfile/dotfile/config_page.jpg
-%%PORTDOCS%%share/doc/dotfile/dotfile/extentry1.jpg
-%%PORTDOCS%%share/doc/dotfile/dotfile/extentry2.jpg
-%%PORTDOCS%%share/doc/dotfile/dotfile/index.html
-%%PORTDOCS%%share/doc/dotfile/dotfile/job_control.gif
-%%PORTDOCS%%share/doc/dotfile/dotfile/logo.gif
-%%PORTDOCS%%share/doc/dotfile/dotfile/menu_window.jpg
-%%PORTDOCS%%share/doc/dotfile/dotfile/prompt.jpg
-%%PORTDOCS%%share/doc/dotfile/index.html
-%%PORTDOCS%%share/doc/dotfile/procmail/backup.jpg
-%%PORTDOCS%%share/doc/dotfile/procmail/general.jpg
-%%PORTDOCS%%share/doc/dotfile/procmail/gray-g3.gif
-%%PORTDOCS%%share/doc/dotfile/procmail/header.jpg
-%%PORTDOCS%%share/doc/dotfile/procmail/index.html
-%%PORTDOCS%%share/doc/dotfile/procmail/main.jpg
-%%PORTDOCS%%share/doc/dotfile/procmail/recipes-with-numbers.jpg
-%%PORTDOCS%%share/doc/dotfile/procmail/recipes.jpg
-%%PORTDOCS%%share/doc/dotfile/tcsh/index.html
-%%PORTDOCS%%share/doc/dotfile/tcsh/lil2cent.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/pattern.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/pattern2.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/posdef.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/prompt.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/time.gif
-%%PORTDOCS%%share/doc/dotfile/tcsh/userdef.gif
-%%PORTDOCS%%@dirrm share/doc/dotfile/tcsh
-%%PORTDOCS%%@dirrm share/doc/dotfile/procmail
-%%PORTDOCS%%@dirrm share/doc/dotfile/dotfile
-%%PORTDOCS%%@dirrm share/doc/dotfile
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/config_page.jpg
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/extentry1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/extentry2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/index.html
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/job_control.gif
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/menu_window.jpg
+%%PORTDOCS%%%%DOCSDIR%%/dotfile/prompt.jpg
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/procmail/backup.jpg
+%%PORTDOCS%%%%DOCSDIR%%/procmail/general.jpg
+%%PORTDOCS%%%%DOCSDIR%%/procmail/gray-g3.gif
+%%PORTDOCS%%%%DOCSDIR%%/procmail/header.jpg
+%%PORTDOCS%%%%DOCSDIR%%/procmail/index.html
+%%PORTDOCS%%%%DOCSDIR%%/procmail/main.jpg
+%%PORTDOCS%%%%DOCSDIR%%/procmail/recipes-with-numbers.jpg
+%%PORTDOCS%%%%DOCSDIR%%/procmail/recipes.jpg
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/index.html
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/lil2cent.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/pattern.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/pattern2.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/posdef.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/prompt.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/time.gif
+%%PORTDOCS%%%%DOCSDIR%%/tcsh/userdef.gif
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tcsh
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/procmail
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/dotfile
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/%%DISTNAME%%/japanese/fvwm2/save-files
 @dirrm lib/%%DISTNAME%%/japanese/fvwm2/exports
 @dirrm lib/%%DISTNAME%%/japanese/fvwm2
diff -ruN earthview.orig/pkg-plist earthview/pkg-plist
--- earthview.orig/pkg-plist	Wed Jan  7 19:39:07 2004
+++ earthview/pkg-plist	Wed Jan  7 19:30:59 2004
@@ -1,8 +1,8 @@
 bin/earthview
-share/earthview/topography/topography.cps
-share/earthview/topography/1440x720-2x2.az2
-share/earthview/population/population.cps
-share/earthview/population/4320x2160-6x6.pz2
- at dirrm share/earthview/topography
- at dirrm share/earthview/population
- at dirrm share/earthview
+%%DATADIR%%/topography/topography.cps
+%%DATADIR%%/topography/1440x720-2x2.az2
+%%DATADIR%%/population/population.cps
+%%DATADIR%%/population/4320x2160-6x6.pz2
+ at dirrm %%DATADIR%%/topography
+ at dirrm %%DATADIR%%/population
+ at dirrm %%DATADIR%%
diff -ruN estic.orig/Makefile estic/Makefile
--- estic.orig/Makefile	Wed Jan  7 19:39:35 2004
+++ estic/Makefile	Wed Jan  7 19:34:25 2004
@@ -26,9 +26,9 @@
 # Personal Preferences, Where to install.
 PBX_VAR=${PREFIX}/var/log/pbx
 PBX_ETC=${PREFIX}/etc/pbx
-PBX_MAN=${PREFIX}/man/man1
+PBX_MAN=${MANPREFIX}/man/man1
 PBX_BIN=${PREFIX}/bin
-PBX_DOC=${PREFIX}/share/doc/estic
+PBX_DOC=${DOCSDIR}
 ESTIC=${WRKSRC}/estic
 MAKE_E= make X11BASE=${X11BASE} -f make/freebsd${X_OR_NOT}.mak
 
diff -ruN estic.orig/pkg-plist estic/pkg-plist
--- estic.orig/pkg-plist	Wed Jan  7 19:39:35 2004
+++ estic/pkg-plist	Wed Jan  7 19:37:04 2004
@@ -4,11 +4,11 @@
 etc/pbx/config
 etc/pbx/estic.ini.freebsd_example
 etc/pbx/estic.ini.generic_example
-share/doc/estic/README
-share/doc/estic/estic.doc
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/estic.doc
 var/log/pbx/debug
 @dirrm etc/pbx
- at dirrm share/doc/estic
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm var/log/pbx
 @dirrm var/log
 @dirrm var
--- misc-ports-cleanup.diff ends here ---


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

More information about the freebsd-ports-bugs mailing list