Skip site navigation (1)Skip section navigation (2)
Date:      Wed,  7 Jan 2004 21:56:55 +0100 (CET)
From:      Vincent Tantardini <vinc@FreeBSD-fr.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/61041: [patch] clean orphaned ports in misc category - part 6
Message-ID:  <20040107205655.7B193573@sativa.0x45.org>
Resent-Message-ID: <200401072100.i07L0d9Q054474@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         61041
>Category:       ports
>Synopsis:       [patch] clean orphaned ports in misc category - part 6
>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 13:00:38 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:
		splitvt
		tcb
		wmstock
		xenmenu
		xpns
		yaunc
>How-To-Repeat:
	
>Fix:

	

--- misc-ports-cleanup.diff begins here ---
diff -ruN splitvt.orig/Makefile splitvt/Makefile
--- splitvt.orig/Makefile	Wed Jan  7 21:46:34 2004
+++ splitvt/Makefile	Wed Jan  7 21:45:22 2004
@@ -25,6 +25,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/splitvt ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/splitvt.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/splitvt.1 ${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff -ruN tcb.orig/Makefile tcb/Makefile
--- tcb.orig/Makefile	Wed Jan  7 21:46:47 2004
+++ tcb/Makefile	Wed Jan  7 21:22:57 2004
@@ -20,15 +20,15 @@
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/src/tcb ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/tcb
-	@ ${INSTALL_DATA} ${WRKSRC}/tcbrc ${PREFIX}/share/tcb
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/HELP ${PREFIX}/share/tcb
-	@ ${INSTALL_MAN} ${WRKSRC}/doc/tcb.1 ${PREFIX}/man/man1
+	@ ${MKDIR} ${DATADIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/tcbrc ${DATADIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/doc/HELP ${DATADIR}
+	@ ${INSTALL_MAN} ${WRKSRC}/doc/tcb.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/tcb
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/CHANGES ${PREFIX}/share/doc/tcb
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${PREFIX}/share/doc/tcb
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tcb
+	@ ${MKDIR} ${DOCSDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/doc/CHANGES ${DOCSDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${DOCSDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN tcb.orig/pkg-plist tcb/pkg-plist
--- tcb.orig/pkg-plist	Wed Jan  7 21:46:47 2004
+++ tcb/pkg-plist	Wed Jan  7 21:23:55 2004
@@ -1,8 +1,8 @@
 bin/tcb
-%%PORTDOCS%%share/doc/tcb/CHANGES
-%%PORTDOCS%%share/doc/tcb/COPYING
-%%PORTDOCS%%share/doc/tcb/README
-share/tcb/HELP
-share/tcb/tcbrc
-%%PORTDOCS%%@dirrm share/doc/tcb
-@dirrm share/tcb
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/HELP
+%%DATADIR%%/tcbrc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
diff -ruN wmstock.orig/Makefile wmstock/Makefile
--- wmstock.orig/Makefile	Wed Jan  7 21:46:55 2004
+++ wmstock/Makefile	Wed Jan  7 21:29:13 2004
@@ -27,6 +27,6 @@
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmstock ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/getquote ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/wmstock.1x ${PREFIX}/man/man1/wmstock.1
+	${INSTALL_MAN} ${WRKSRC}/wmstock.1x ${MAN1PREFIX}/man/man1/wmstock.1
 
 .include <bsd.port.mk>
diff -ruN xenmenu.orig/Makefile xenmenu/Makefile
--- xenmenu.orig/Makefile	Wed Jan  7 21:47:09 2004
+++ xenmenu/Makefile	Wed Jan  7 21:35:57 2004
@@ -26,43 +26,43 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xenmenu ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/xenmenu
-	@${MKDIR} ${PREFIX}/share/xenmenu/bin
-	@${MKDIR} ${PREFIX}/share/xenmenu/menus
-	@${MKDIR} ${PREFIX}/share/xenmenu/text
-	@${MKDIR} ${PREFIX}/share/examples/xenmenu/bin
+	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${DATADIR}/bin
+	@${MKDIR} ${DATADIR}/menus
+	@${MKDIR} ${DATADIR}/text
+	@${MKDIR} ${EXAMPLESDIR}/bin
 .for file in Makefile README get_backspace.c set_cols.c set_rows.c show_backspace.c show_cols.c show_rows.c
-	${INSTALL_DATA} ${WRKSRC}/contrib/${file} ${PREFIX}/share/examples/xenmenu/bin
+	${INSTALL_DATA} ${WRKSRC}/contrib/${file} ${EXAMPLESDIR}/bin
 .endfor
 .for file in bbs finger ftp party ssh talk telegram telnet
-	${INSTALL_SCRIPT} ${WRKSRC}/contrib/${file} ${PREFIX}/share/examples/xenmenu/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/${file} ${EXAMPLESDIR}/bin
 .endfor
-	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus
-	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/games_menus
-	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/help_menus
+	@${MKDIR} ${EXAMPLESDIR}/menus
+	@${MKDIR} ${EXAMPLESDIR}/menus/games_menus
+	@${MKDIR} ${EXAMPLESDIR}/menus/help_menus
 .for file in bbs config freeport freeportb freeportc games help helpb internet mail mainmenu other party telmenu telmenu_changecurrent telmenu_changedefault
-	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus
+	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${EXAMPLESDIR}/menus
 .endfor
-	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/bbs_menus
+	@${MKDIR} ${EXAMPLESDIR}/menus/bbs_menus
 .for file in bbs_menus/technical bbs_menus/general_interest bbs_menus/sig bbs_menus/literary bbs_menus/misc
-	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus/bbs_menus
+	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${EXAMPLESDIR}/menus/bbs_menus
 .endfor
-	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/games_menus
+	@${MKDIR} ${EXAMPLESDIR}/menus/games_menus
 .for file in games_menus/multiplayer games_menus/amusements games_menus/singleplayer games_menus/singleplayer2 games_menus/amusements2
-	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus/games_menus
+	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${EXAMPLESDIR}/menus/games_menus
 .endfor
-	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/help_menus
+	@${MKDIR} ${EXAMPLESDIR}/menus/help_menus
 .for file in help_menus/partyb help_menus/party help_menus/bbs help_menus/bbsb help_menus/mail help_menus/mailb help_menus/abuse help_menus/games help_menus/abuseb help_menus/bbsc help_menus/partyc help_menus/mailc
-	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus/help_menus
+	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${EXAMPLESDIR}/menus/help_menus
 .endfor
-	@${MKDIR} ${PREFIX}/share/examples/xenmenu/text
+	@${MKDIR} ${EXAMPLESDIR}/text
 .for file in backspace_help.txt col_help.txt shell_help.txt
-	${INSTALL_DATA} ${WRKSRC}/sample_text/${file} ${PREFIX}/share/examples/xenmenu/text
+	${INSTALL_DATA} ${WRKSRC}/sample_text/${file} ${EXAMPLESDIR}/text
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/xenmenu
+	@${MKDIR} ${DOCSDIR}
 .for file in BUGS COPYRIGHT CHANGELOG README README.html TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xenmenu
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff -ruN xenmenu.orig/pkg-plist xenmenu/pkg-plist
--- xenmenu.orig/pkg-plist	Wed Jan  7 21:47:09 2004
+++ xenmenu/pkg-plist	Wed Jan  7 21:44:58 2004
@@ -1,80 +1,80 @@
 bin/xenmenu
-%%PORTDOCS%%share/doc/xenmenu/BUGS
-%%PORTDOCS%%share/doc/xenmenu/CHANGELOG
-%%PORTDOCS%%share/doc/xenmenu/COPYRIGHT
-%%PORTDOCS%%share/doc/xenmenu/README
-%%PORTDOCS%%share/doc/xenmenu/README.html
-%%PORTDOCS%%share/doc/xenmenu/TODO
-share/examples/xenmenu/bin/Makefile
-share/examples/xenmenu/bin/README
-share/examples/xenmenu/bin/bbs
-share/examples/xenmenu/bin/finger
-share/examples/xenmenu/bin/ftp
-share/examples/xenmenu/bin/get_backspace.c
-share/examples/xenmenu/bin/party
-share/examples/xenmenu/bin/set_cols.c
-share/examples/xenmenu/bin/set_rows.c
-share/examples/xenmenu/bin/show_backspace.c
-share/examples/xenmenu/bin/show_cols.c
-share/examples/xenmenu/bin/show_rows.c
-share/examples/xenmenu/bin/ssh
-share/examples/xenmenu/bin/talk
-share/examples/xenmenu/bin/telegram
-share/examples/xenmenu/bin/telnet
-share/examples/xenmenu/menus/bbs
-share/examples/xenmenu/menus/bbs_menus/technical
-share/examples/xenmenu/menus/bbs_menus/general_interest
-share/examples/xenmenu/menus/bbs_menus/sig
-share/examples/xenmenu/menus/bbs_menus/literary
-share/examples/xenmenu/menus/bbs_menus/misc
-share/examples/xenmenu/menus/config
-share/examples/xenmenu/menus/freeport
-share/examples/xenmenu/menus/freeportb
-share/examples/xenmenu/menus/freeportc
-share/examples/xenmenu/menus/games
-share/examples/xenmenu/menus/games_menus/multiplayer
-share/examples/xenmenu/menus/games_menus/amusements
-share/examples/xenmenu/menus/games_menus/singleplayer
-share/examples/xenmenu/menus/games_menus/singleplayer2
-share/examples/xenmenu/menus/games_menus/amusements2
-share/examples/xenmenu/menus/help
-share/examples/xenmenu/menus/help_menus/partyb
-share/examples/xenmenu/menus/help_menus/party
-share/examples/xenmenu/menus/help_menus/bbs
-share/examples/xenmenu/menus/help_menus/bbsb
-share/examples/xenmenu/menus/help_menus/mail
-share/examples/xenmenu/menus/help_menus/mailb
-share/examples/xenmenu/menus/help_menus/abuse
-share/examples/xenmenu/menus/help_menus/games
-share/examples/xenmenu/menus/help_menus/abuseb
-share/examples/xenmenu/menus/help_menus/bbsc
-share/examples/xenmenu/menus/help_menus/partyc
-share/examples/xenmenu/menus/help_menus/mailc
-share/examples/xenmenu/menus/helpb
-share/examples/xenmenu/menus/internet
-share/examples/xenmenu/menus/mail
-share/examples/xenmenu/menus/mainmenu
-share/examples/xenmenu/menus/other
-share/examples/xenmenu/menus/party
-share/examples/xenmenu/menus/telmenu
-share/examples/xenmenu/menus/telmenu_changecurrent
-share/examples/xenmenu/menus/telmenu_changedefault
-share/examples/xenmenu/text/backspace_help.txt
-share/examples/xenmenu/text/col_help.txt
-share/examples/xenmenu/text/shell_help.txt
-@exec mkdir %D/share/xenmenu
-@exec mkdir %D/share/xenmenu/bin
-@exec mkdir %D/share/xenmenu/menus
-@exec mkdir %D/share/xenmenu/text
-%%PORTDOCS%%@dirrm share/doc/xenmenu
-@dirrm share/examples/xenmenu/bin
-@dirrm share/examples/xenmenu/menus/bbs_menus
-@dirrm share/examples/xenmenu/menus/games_menus
-@dirrm share/examples/xenmenu/menus/help_menus
-@dirrm share/examples/xenmenu/menus
-@dirrm share/examples/xenmenu/text
-@dirrm share/examples/xenmenu
-@dirrm share/xenmenu/bin
-@dirrm share/xenmenu/menus
-@dirrm share/xenmenu/text
-@dirrm share/xenmenu
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/bbs
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/finger
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/ftp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/get_backspace.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/party
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/set_cols.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/set_rows.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/show_backspace.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/show_cols.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/show_rows.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/ssh
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/talk
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/telegram
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin/telnet
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/bbs
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/bbs_menus/technical
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/bbs_menus/general_interest
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/bbs_menus/sig
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/bbs_menus/literary
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/bbs_menus/misc
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/config
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/freeport
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/freeportb
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/freeportc
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/games
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/games_menus/multiplayer
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/games_menus/amusements
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/games_menus/singleplayer
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/games_menus/singleplayer2
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/games_menus/amusements2
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/partyb
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/party
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/bbs
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/bbsb
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/mail
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/mailb
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/abuse
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/games
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/abuseb
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/bbsc
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/partyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/help_menus/mailc
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/helpb
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/internet
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/mail
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/mainmenu
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/other
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/party
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/telmenu
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/telmenu_changecurrent
+%%PORTDOCS%%%%EXAMPLESDIR%%/menus/telmenu_changedefault
+%%PORTDOCS%%%%EXAMPLESDIR%%/text/backspace_help.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/text/col_help.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/text/shell_help.txt
+@exec mkdir %D/%%DATADIR%%
+@exec mkdir %D/%%DATADIR%%/bin
+@exec mkdir %D/%%DATADIR%%/menus
+@exec mkdir %D/%%DATADIR%%/text
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/bin
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/menus/bbs_menus
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/menus/games_menus
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/menus/help_menus
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/menus
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/text
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/menus
+@dirrm %%DATADIR%%/text
+@dirrm %%DATADIR%%
diff -ruN xpns.orig/Makefile xpns/Makefile
--- xpns.orig/Makefile	Wed Jan  7 21:47:15 2004
+++ xpns/Makefile	Wed Jan  7 21:42:49 2004
@@ -27,12 +27,12 @@
 	${INSTALL_SCRIPT} ${WRKSRC}/xpns ${PREFIX}/bin/xpns
 	${MKDIR} ${PREFIX}/libexec/xpns
 	${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/libexec/xpns
-	${MKDIR} ${PREFIX}/share/xpns
-	${INSTALL_DATA} ${WRKSRC}/pns.hlp ${PREFIX}/share/xpns
-	${INSTALL_DATA} ${WRKSRC}/pns.shell ${PREFIX}/share/xpns
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/pns.hlp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/pns.shell ${DATADIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/xpns
-	${INSTALL_DATA} ${WRKSRC}/*.net ${PREFIX}/share/doc/xpns
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.net ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN xpns.orig/pkg-plist xpns/pkg-plist
--- xpns.orig/pkg-plist	Wed Jan  7 21:47:15 2004
+++ xpns/pkg-plist	Wed Jan  7 21:43:39 2004
@@ -1,15 +1,15 @@
 bin/xpns
 libexec/xpns/pns
-share/xpns/pns.hlp
-share/xpns/pns.shell
-%%PORTDOCS%%share/doc/xpns/a.net
-%%PORTDOCS%%share/doc/xpns/a1.net
-%%PORTDOCS%%share/doc/xpns/add.net
-%%PORTDOCS%%share/doc/xpns/mult.net
-%%PORTDOCS%%share/doc/xpns/phil.net
-%%PORTDOCS%%share/doc/xpns/rw.net
-%%PORTDOCS%%share/doc/xpns/sub.net
-%%PORTDOCS%%share/doc/xpns/sub2.net
-@dirrm share/xpns
-%%PORTDOCS%%@dirrm share/doc/xpns
+%%DATADIR%%/pns.hlp
+%%DATADIR%%/pns.shell
+%%PORTDOCS%%%%DOCSDIR%%/a.net
+%%PORTDOCS%%%%DOCSDIR%%/a1.net
+%%PORTDOCS%%%%DOCSDIR%%/add.net
+%%PORTDOCS%%%%DOCSDIR%%/mult.net
+%%PORTDOCS%%%%DOCSDIR%%/phil.net
+%%PORTDOCS%%%%DOCSDIR%%/rw.net
+%%PORTDOCS%%%%DOCSDIR%%/sub.net
+%%PORTDOCS%%%%DOCSDIR%%/sub2.net
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/xpns
diff -ruN yaunc.orig/Makefile yaunc/Makefile
--- yaunc.orig/Makefile	Wed Jan  7 21:47:26 2004
+++ yaunc/Makefile	Wed Jan  7 21:46:11 2004
@@ -27,7 +27,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/yaunc ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/yaunc.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/yaunc.1 ${MAN1PREFIX}/man/man1
 	${INSTALL_DATA} -m 600 ${WRKSRC}/yaunc.conf ${PREFIX}/etc/yaunc.conf.sample
 	${INSTALL_SCRIPT} -m 755 ${WRKSRC}/yaunc.sh ${PREFIX}/etc/rc.d
 
--- 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?20040107205655.7B193573>