make PKGNAME handbook compliant.

support PORTDOCS in pkg-plist.

2 files changed, 163 insertions, 162 deletions

diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 4bf6a0be0a7d..9b5a1c6bae40 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION=	4.0.99m-rc2
+PORTVERSION=	4.0.99m.r2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ \
 		http://www.eeics.udel.edu/~ntp/ntp_spool/ntp4/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 
 MAINTAINER=	Cy.Schubert@uumail.gov.bc.ca
 
diff --git a/net/ntp-devel/pkg-plist b/net/ntp-devel/pkg-plist
index cc37d1e53501..f804d5d7eae0 100644
--- a/net/ntp-devel/pkg-plist
+++ b/net/ntp-devel/pkg-plist
@@ -8,164 +8,164 @@ bin/ntptrace
 bin/ntp-genkeys
 bin/ntp-wait
 bin/tickadj
-share/doc/ntp/Oncore-SHMEM.htm
-share/doc/ntp/accopt.htm
-share/doc/ntp/assoc.htm
-share/doc/ntp/audio.htm
-share/doc/ntp/authopt.htm
-share/doc/ntp/biblio.htm
-share/doc/ntp/build.htm
-share/doc/ntp/clockopt.htm
-share/doc/ntp/config.htm
-share/doc/ntp/confopt.htm
-share/doc/ntp/copyright.htm
-share/doc/ntp/debug.htm
-share/doc/ntp/driver1.htm
-share/doc/ntp/driver10.htm
-share/doc/ntp/driver11.htm
-share/doc/ntp/driver12.htm
-share/doc/ntp/driver16.htm
-share/doc/ntp/driver18.htm
-share/doc/ntp/driver19.htm
-share/doc/ntp/driver2.htm
-share/doc/ntp/driver20.htm
-share/doc/ntp/driver22.htm
-share/doc/ntp/driver23.htm
-share/doc/ntp/driver24.htm
-share/doc/ntp/driver26.htm
-share/doc/ntp/driver27.htm
-share/doc/ntp/driver28.htm
-share/doc/ntp/driver29.htm
-share/doc/ntp/driver3.htm
-share/doc/ntp/driver30.htm
-share/doc/ntp/driver32.htm
-share/doc/ntp/driver33.htm
-share/doc/ntp/driver34.htm
-share/doc/ntp/driver35.htm
-share/doc/ntp/driver36.htm
-share/doc/ntp/driver37.htm
-share/doc/ntp/driver38.htm
-share/doc/ntp/driver39.htm
-share/doc/ntp/driver4.htm
-share/doc/ntp/driver5.htm
-share/doc/ntp/driver6.htm
-share/doc/ntp/driver7.htm
-share/doc/ntp/driver8.htm
-share/doc/ntp/driver9.htm
-share/doc/ntp/exec.htm
-share/doc/ntp/extern.htm
-share/doc/ntp/gadget.htm
-share/doc/ntp/genkeys.htm
-share/doc/ntp/hints/a-ux
-share/doc/ntp/hints/aix
-share/doc/ntp/hints/bsdi
-share/doc/ntp/hints/changes
-share/doc/ntp/hints/decosf1
-share/doc/ntp/hints/decosf2
-share/doc/ntp/hints/freebsd
-share/doc/ntp/hints/hpux
-share/doc/ntp/hints/linux
-share/doc/ntp/hints/notes-xntp-v3
-share/doc/ntp/hints/parse
-share/doc/ntp/hints/refclocks
-share/doc/ntp/hints/rs6000
-share/doc/ntp/hints/sco.htm
-share/doc/ntp/hints/sgi
-share/doc/ntp/hints/solaris-dosynctodr.html
-share/doc/ntp/hints/solaris.html
-share/doc/ntp/hints/solaris.xtra.4023118
-share/doc/ntp/hints/solaris.xtra.4095849
-share/doc/ntp/hints/solaris.xtra.S99ntpd
-share/doc/ntp/hints/solaris.xtra.patchfreq
-share/doc/ntp/hints/sun4
-share/doc/ntp/hints/svr4-dell
-share/doc/ntp/hints/svr4_package
-share/doc/ntp/hints/todo
-share/doc/ntp/hints/vxworks.htm
-share/doc/ntp/hints/vxworks.html
-share/doc/ntp/hints/winnt.htm
-share/doc/ntp/hints.htm
-share/doc/ntp/howto.htm
-share/doc/ntp/htmlprimer.htm
-share/doc/ntp/index.htm
-share/doc/ntp/kern.htm
-share/doc/ntp/kernpps.htm
-share/doc/ntp/ldisc.htm
-share/doc/ntp/leap.htm
-share/doc/ntp/measure.htm
-share/doc/ntp/miscopt.htm
-share/doc/ntp/monopt.htm
-share/doc/ntp/mx4200data.htm
-share/doc/ntp/notes.htm
-share/doc/ntp/ntpd.htm
-share/doc/ntp/ntpdate.htm
-share/doc/ntp/ntpdc.htm
-share/doc/ntp/ntpq.htm
-share/doc/ntp/ntptime.htm
-share/doc/ntp/ntptrace.htm
-share/doc/ntp/parsedata.htm
-share/doc/ntp/parsenew.htm
-share/doc/ntp/patches.htm
-share/doc/ntp/pic/9400n.jpg
-share/doc/ntp/pic/alice11.gif
-share/doc/ntp/pic/alice12.gif
-share/doc/ntp/pic/alice13.gif
-share/doc/ntp/pic/alice15.gif
-share/doc/ntp/pic/alice23.gif
-share/doc/ntp/pic/alice31.gif
-share/doc/ntp/pic/alice32.gif
-share/doc/ntp/pic/alice35.gif
-share/doc/ntp/pic/alice38.gif
-share/doc/ntp/pic/alice44.gif
-share/doc/ntp/pic/alice47.gif
-share/doc/ntp/pic/alice51.gif
-share/doc/ntp/pic/alice61.gif
-share/doc/ntp/pic/barnstable.gif
-share/doc/ntp/pic/beaver.gif
-share/doc/ntp/pic/boom3.gif
-share/doc/ntp/pic/boom3a.gif
-share/doc/ntp/pic/boom4.gif
-share/doc/ntp/pic/bustardfly.gif
-share/doc/ntp/pic/c51.jpg
-share/doc/ntp/pic/driver29.gif
-share/doc/ntp/pic/fg6021.gif
-share/doc/ntp/pic/fg6039.jpg
-share/doc/ntp/pic/flatheads.gif
-share/doc/ntp/pic/gadget.jpg
-share/doc/ntp/pic/gps167.jpg
-share/doc/ntp/pic/home.gif
-share/doc/ntp/pic/hornraba.gif
-share/doc/ntp/pic/igclock.gif
-share/doc/ntp/pic/oncore_evalbig.gif
-share/doc/ntp/pic/oncore_remoteant.jpg
-share/doc/ntp/pic/oncore_utplusbig.gif
-share/doc/ntp/pic/oz2.gif
-share/doc/ntp/pic/panda.gif
-share/doc/ntp/pic/pd_om006.gif
-share/doc/ntp/pic/pd_om011.gif
-share/doc/ntp/pic/pogo.gif
-share/doc/ntp/pic/pogo1a.gif
-share/doc/ntp/pic/pogo3a.gif
-share/doc/ntp/pic/pogo4.gif
-share/doc/ntp/pic/pogo5.gif
-share/doc/ntp/pic/pogo6.gif
-share/doc/ntp/pic/pogo8.gif
-share/doc/ntp/pic/pzf509.jpg
-share/doc/ntp/pic/rabbit.gif
-share/doc/ntp/pic/radio2.gif
-share/doc/ntp/pic/sheepb.jpg
-share/doc/ntp/pic/stack1a.jpg
-share/doc/ntp/pic/tonea.gif
-share/doc/ntp/pic/wingdorothy.gif
-share/doc/ntp/porting.htm
-share/doc/ntp/pps.htm
-share/doc/ntp/prefer.htm
-share/doc/ntp/qth.htm
-share/doc/ntp/quick.htm
-share/doc/ntp/rdebug.htm
-share/doc/ntp/refclock.htm
-share/doc/ntp/release.htm
-share/doc/ntp/tickadj.htm
-@dirrm share/doc/ntp/pic
-@dirrm share/doc/ntp/hints
-@dirrm share/doc/ntp
+%%PORTDOCS%%share/doc/ntp/Oncore-SHMEM.htm
+%%PORTDOCS%%share/doc/ntp/accopt.htm
+%%PORTDOCS%%share/doc/ntp/assoc.htm
+%%PORTDOCS%%share/doc/ntp/audio.htm
+%%PORTDOCS%%share/doc/ntp/authopt.htm
+%%PORTDOCS%%share/doc/ntp/biblio.htm
+%%PORTDOCS%%share/doc/ntp/build.htm
+%%PORTDOCS%%share/doc/ntp/clockopt.htm
+%%PORTDOCS%%share/doc/ntp/config.htm
+%%PORTDOCS%%share/doc/ntp/confopt.htm
+%%PORTDOCS%%share/doc/ntp/copyright.htm
+%%PORTDOCS%%share/doc/ntp/debug.htm
+%%PORTDOCS%%share/doc/ntp/driver1.htm
+%%PORTDOCS%%share/doc/ntp/driver10.htm
+%%PORTDOCS%%share/doc/ntp/driver11.htm
+%%PORTDOCS%%share/doc/ntp/driver12.htm
+%%PORTDOCS%%share/doc/ntp/driver16.htm
+%%PORTDOCS%%share/doc/ntp/driver18.htm
+%%PORTDOCS%%share/doc/ntp/driver19.htm
+%%PORTDOCS%%share/doc/ntp/driver2.htm
+%%PORTDOCS%%share/doc/ntp/driver20.htm
+%%PORTDOCS%%share/doc/ntp/driver22.htm
+%%PORTDOCS%%share/doc/ntp/driver23.htm
+%%PORTDOCS%%share/doc/ntp/driver24.htm
+%%PORTDOCS%%share/doc/ntp/driver26.htm
+%%PORTDOCS%%share/doc/ntp/driver27.htm
+%%PORTDOCS%%share/doc/ntp/driver28.htm
+%%PORTDOCS%%share/doc/ntp/driver29.htm
+%%PORTDOCS%%share/doc/ntp/driver3.htm
+%%PORTDOCS%%share/doc/ntp/driver30.htm
+%%PORTDOCS%%share/doc/ntp/driver32.htm
+%%PORTDOCS%%share/doc/ntp/driver33.htm
+%%PORTDOCS%%share/doc/ntp/driver34.htm
+%%PORTDOCS%%share/doc/ntp/driver35.htm
+%%PORTDOCS%%share/doc/ntp/driver36.htm
+%%PORTDOCS%%share/doc/ntp/driver37.htm
+%%PORTDOCS%%share/doc/ntp/driver38.htm
+%%PORTDOCS%%share/doc/ntp/driver39.htm
+%%PORTDOCS%%share/doc/ntp/driver4.htm
+%%PORTDOCS%%share/doc/ntp/driver5.htm
+%%PORTDOCS%%share/doc/ntp/driver6.htm
+%%PORTDOCS%%share/doc/ntp/driver7.htm
+%%PORTDOCS%%share/doc/ntp/driver8.htm
+%%PORTDOCS%%share/doc/ntp/driver9.htm
+%%PORTDOCS%%share/doc/ntp/exec.htm
+%%PORTDOCS%%share/doc/ntp/extern.htm
+%%PORTDOCS%%share/doc/ntp/gadget.htm
+%%PORTDOCS%%share/doc/ntp/genkeys.htm
+%%PORTDOCS%%share/doc/ntp/hints/a-ux
+%%PORTDOCS%%share/doc/ntp/hints/aix
+%%PORTDOCS%%share/doc/ntp/hints/bsdi
+%%PORTDOCS%%share/doc/ntp/hints/changes
+%%PORTDOCS%%share/doc/ntp/hints/decosf1
+%%PORTDOCS%%share/doc/ntp/hints/decosf2
+%%PORTDOCS%%share/doc/ntp/hints/freebsd
+%%PORTDOCS%%share/doc/ntp/hints/hpux
+%%PORTDOCS%%share/doc/ntp/hints/linux
+%%PORTDOCS%%share/doc/ntp/hints/notes-xntp-v3
+%%PORTDOCS%%share/doc/ntp/hints/parse
+%%PORTDOCS%%share/doc/ntp/hints/refclocks
+%%PORTDOCS%%share/doc/ntp/hints/rs6000
+%%PORTDOCS%%share/doc/ntp/hints/sco.htm
+%%PORTDOCS%%share/doc/ntp/hints/sgi
+%%PORTDOCS%%share/doc/ntp/hints/solaris-dosynctodr.html
+%%PORTDOCS%%share/doc/ntp/hints/solaris.html
+%%PORTDOCS%%share/doc/ntp/hints/solaris.xtra.4023118
+%%PORTDOCS%%share/doc/ntp/hints/solaris.xtra.4095849
+%%PORTDOCS%%share/doc/ntp/hints/solaris.xtra.S99ntpd
+%%PORTDOCS%%share/doc/ntp/hints/solaris.xtra.patchfreq
+%%PORTDOCS%%share/doc/ntp/hints/sun4
+%%PORTDOCS%%share/doc/ntp/hints/svr4-dell
+%%PORTDOCS%%share/doc/ntp/hints/svr4_package
+%%PORTDOCS%%share/doc/ntp/hints/todo
+%%PORTDOCS%%share/doc/ntp/hints/vxworks.htm
+%%PORTDOCS%%share/doc/ntp/hints/vxworks.html
+%%PORTDOCS%%share/doc/ntp/hints/winnt.htm
+%%PORTDOCS%%share/doc/ntp/hints.htm
+%%PORTDOCS%%share/doc/ntp/howto.htm
+%%PORTDOCS%%share/doc/ntp/htmlprimer.htm
+%%PORTDOCS%%share/doc/ntp/index.htm
+%%PORTDOCS%%share/doc/ntp/kern.htm
+%%PORTDOCS%%share/doc/ntp/kernpps.htm
+%%PORTDOCS%%share/doc/ntp/ldisc.htm
+%%PORTDOCS%%share/doc/ntp/leap.htm
+%%PORTDOCS%%share/doc/ntp/measure.htm
+%%PORTDOCS%%share/doc/ntp/miscopt.htm
+%%PORTDOCS%%share/doc/ntp/monopt.htm
+%%PORTDOCS%%share/doc/ntp/mx4200data.htm
+%%PORTDOCS%%share/doc/ntp/notes.htm
+%%PORTDOCS%%share/doc/ntp/ntpd.htm
+%%PORTDOCS%%share/doc/ntp/ntpdate.htm
+%%PORTDOCS%%share/doc/ntp/ntpdc.htm
+%%PORTDOCS%%share/doc/ntp/ntpq.htm
+%%PORTDOCS%%share/doc/ntp/ntptime.htm
+%%PORTDOCS%%share/doc/ntp/ntptrace.htm
+%%PORTDOCS%%share/doc/ntp/parsedata.htm
+%%PORTDOCS%%share/doc/ntp/parsenew.htm
+%%PORTDOCS%%share/doc/ntp/patches.htm
+%%PORTDOCS%%share/doc/ntp/pic/9400n.jpg
+%%PORTDOCS%%share/doc/ntp/pic/alice11.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice12.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice13.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice15.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice23.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice31.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice32.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice35.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice38.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice44.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice47.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice51.gif
+%%PORTDOCS%%share/doc/ntp/pic/alice61.gif
+%%PORTDOCS%%share/doc/ntp/pic/barnstable.gif
+%%PORTDOCS%%share/doc/ntp/pic/beaver.gif
+%%PORTDOCS%%share/doc/ntp/pic/boom3.gif
+%%PORTDOCS%%share/doc/ntp/pic/boom3a.gif
+%%PORTDOCS%%share/doc/ntp/pic/boom4.gif
+%%PORTDOCS%%share/doc/ntp/pic/bustardfly.gif
+%%PORTDOCS%%share/doc/ntp/pic/c51.jpg
+%%PORTDOCS%%share/doc/ntp/pic/driver29.gif
+%%PORTDOCS%%share/doc/ntp/pic/fg6021.gif
+%%PORTDOCS%%share/doc/ntp/pic/fg6039.jpg
+%%PORTDOCS%%share/doc/ntp/pic/flatheads.gif
+%%PORTDOCS%%share/doc/ntp/pic/gadget.jpg
+%%PORTDOCS%%share/doc/ntp/pic/gps167.jpg
+%%PORTDOCS%%share/doc/ntp/pic/home.gif
+%%PORTDOCS%%share/doc/ntp/pic/hornraba.gif
+%%PORTDOCS%%share/doc/ntp/pic/igclock.gif
+%%PORTDOCS%%share/doc/ntp/pic/oncore_evalbig.gif
+%%PORTDOCS%%share/doc/ntp/pic/oncore_remoteant.jpg
+%%PORTDOCS%%share/doc/ntp/pic/oncore_utplusbig.gif
+%%PORTDOCS%%share/doc/ntp/pic/oz2.gif
+%%PORTDOCS%%share/doc/ntp/pic/panda.gif
+%%PORTDOCS%%share/doc/ntp/pic/pd_om006.gif
+%%PORTDOCS%%share/doc/ntp/pic/pd_om011.gif
+%%PORTDOCS%%share/doc/ntp/pic/pogo.gif
+%%PORTDOCS%%share/doc/ntp/pic/pogo1a.gif
+%%PORTDOCS%%share/doc/ntp/pic/pogo3a.gif
+%%PORTDOCS%%share/doc/ntp/pic/pogo4.gif
+%%PORTDOCS%%share/doc/ntp/pic/pogo5.gif
+%%PORTDOCS%%share/doc/ntp/pic/pogo6.gif
+%%PORTDOCS%%share/doc/ntp/pic/pogo8.gif
+%%PORTDOCS%%share/doc/ntp/pic/pzf509.jpg
+%%PORTDOCS%%share/doc/ntp/pic/rabbit.gif
+%%PORTDOCS%%share/doc/ntp/pic/radio2.jpg
+%%PORTDOCS%%share/doc/ntp/pic/sheepb.jpg
+%%PORTDOCS%%share/doc/ntp/pic/stack1a.jpg
+%%PORTDOCS%%share/doc/ntp/pic/tonea.gif
+%%PORTDOCS%%share/doc/ntp/pic/wingdorothy.gif
+%%PORTDOCS%%share/doc/ntp/porting.htm
+%%PORTDOCS%%share/doc/ntp/pps.htm
+%%PORTDOCS%%share/doc/ntp/prefer.htm
+%%PORTDOCS%%share/doc/ntp/qth.htm
+%%PORTDOCS%%share/doc/ntp/quick.htm
+%%PORTDOCS%%share/doc/ntp/rdebug.htm
+%%PORTDOCS%%share/doc/ntp/refclock.htm
+%%PORTDOCS%%share/doc/ntp/release.htm
+%%PORTDOCS%%share/doc/ntp/tickadj.htm
+%%PORTDOCS%%@dirrm share/doc/ntp/pic
+%%PORTDOCS%%@dirrm share/doc/ntp/hints
+%%PORTDOCS%%@dirrm share/doc/ntp