Pet portlint:

  - Use MLINKS [1]
  - pkg-install -> pkg-message[.in] [1]
  - Use DOCSDIR in PLIST [1]
  - s/SUBFILES/SUB_FILES/ [2]
  - @${CAT} ${PKGMESSAGE} in  post-install [2]

PR:		ports/97046
Submitted by:	Shaun Amott <shaun@inerd.com> (maintainer) [1], lawrance, me [2]
Approved by:	lawrance (mentor)

4 files changed, 41 insertions, 65 deletions

diff --git a/net/cap/Makefile b/net/cap/Makefile
index c88f384f83af..db3f4b535254 100644
--- a/net/cap/Makefile
+++ b/net/cap/Makefile
@@ -23,7 +23,7 @@ PATCHFILES=	cap60.patch193 cap60.patch194 cap60.patch195 cap60.patch196 \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Columbia AppleTalk Package for UNIX
 
-NO_CDROM=	"Don't sell for profit"
+NO_CDROM=	Don't sell for profit
 WRKSRC=		${WRKDIR}/cap60
 DIST_SUBDIR=	cap60
 ALL_TARGET=	libsmade dummy-libinstall programs
@@ -31,16 +31,20 @@ INSTALL_TARGET=	include libinstall install
 
 CFLAGS+=	-DUSESTRINGDOTH -DUSEDIRENT
 
-USE_REINPLACE=	YES
+SUB_FILES=	pkg-message
 
 MAN1=		AUFS.1 ash.1 atlook.1 atprint.1 cvt2apple.1 getzones.1 \
 		instappl.1 snitch.1
 MAN3=		CAP.3
 MAN5=		atalk.local.5 etalk.local.5
 MAN8=		AUFS.8 CAP.8 UAB.8 aarpd.8 atis.8 lwsrv.8 papif.8
-.if !defined(NOMANCOMPRESS)
-GZ=	.gz
-.endif
+MLINKS=		atlook.1 atpinger.1	atlook.1 atlookws.1	\
+		atprint.1 tlw.1		atprint.1 lwpr.1	\
+		atprint.1 isrv.1	atprint.1 iwpr.1	\
+		cvt2apple.1 cvt2cap.1	CAP.3 libcap.3		\
+		CAP.3 libafpc.3		CAP.3 libafp.3		\
+		papif.8 papof.8
+
 ETC_SAMPLES=	etc/start-cap-servers extras/lib.cap.macusers \
 		etc/list-cap-servers etc/kill-cap-servers \
 		applications/papif/cap.printers
@@ -106,20 +110,9 @@ post-install:
 	@${ECHO_MSG} "===>  Installing manual pages."
 .for sect in 1 3 5 8
 .for man in ${MAN${sect}}
-	@${INSTALL_MAN} ${WRKSRC}/man/${man} ${PREFIX}/man/man${sect}
-.endfor
-.endfor
-	@${LN} -fs ${PREFIX}/man/man1/cvt2apple.1${GZ} ${PREFIX}/man/man1/cvt2cap.1${GZ}
-.for f in atpinger atlooklws
-	@${LN} -fs ${PREFIX}/man/man1/atlook.1${GZ} ${PREFIX}/man/man1/${f}.1${GZ}
-.endfor
-.for f in tlw lwpr isrv iwpr
-	@${LN} -fs ${PREFIX}/man/man1/atprint.1${GZ} ${PREFIX}/man/man1/${f}.1${GZ}
+	@${INSTALL_MAN} ${WRKSRC}/man/${man} ${MAN${sect}PREFIX}/man/man${sect}
 .endfor
-.for f in libcap libafpc libafp
-	@${LN} -fs ${PREFIX}/man/man3/CAP.3${GZ} ${PREFIX}/man/man3/${f}.3${GZ}
 .endfor
-	@${LN} -fs ${PREFIX}/man/man8/papif.8${GZ} ${PREFIX}/man/man8/papof.8${GZ}
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net/cap/files/pkg-message.in b/net/cap/files/pkg-message.in
new file mode 100644
index 000000000000..1a3bf1e51625
--- /dev/null
+++ b/net/cap/files/pkg-message.in
@@ -0,0 +1,4 @@
+**********************************************************************
+     Now, edit %%PREFIX%%/etc/cap/start-cap-servers.sample.
+     Then install it as %%PREFIX%%/etc/rc.d/start-cap-servers.sh.
+**********************************************************************
diff --git a/net/cap/pkg-install b/net/cap/pkg-install
deleted file mode 100644
index 9c2ae0b04a8d..000000000000
--- a/net/cap/pkg-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then
-   exit 0;
-fi
-
-echo '**********************************************************************'
-echo "         Now, edit /usr/local/etc/cap/start-cap-servers.sample."
-echo "         Then install it as ${PREFIX}/etc/rc.d/start-cap-servers.sh."
-echo '**********************************************************************'
diff --git a/net/cap/pkg-plist b/net/cap/pkg-plist
index 786f40eee0c0..e70c6189afa1 100644
--- a/net/cap/pkg-plist
+++ b/net/cap/pkg-plist
@@ -44,13 +44,6 @@ include/netat/compat.h
 include/netat/fcntldomv.h
 include/netat/macfile.h
 include/netat/sysvcompat.h
-man/man1/atpinger.1.gz
-man/man1/atlooklws.1.gz
-man/man1/tlw.1.gz
-man/man1/lwpr.1.gz
-man/man1/isrv.1.gz
-man/man1/iwpr.1.gz
-man/man1/cvt2cap.1.gz
 etc/cap/start-cap-servers.sample
 etc/cap/lib.cap.macusers.sample
 etc/cap/list-cap-servers.sample
@@ -63,36 +56,32 @@ lib/cap/LWIIfgFonts.sample
 lib/cap/LWPlusFonts.sample
 lib/cap/query.ps.sample
 lib/cap/afpvols.sample
-man/man3/libcap.3.gz
-man/man3/libafpc.3.gz
-man/man3/libafp.3.gz
-man/man8/papof.8.gz
-%%PORTDOCS%%share/doc/cap/abmisc.doc
-%%PORTDOCS%%share/doc/cap/asp.notes
-%%PORTDOCS%%share/doc/cap/atp.notes
-%%PORTDOCS%%share/doc/cap/cap.auth.doc
-%%PORTDOCS%%share/doc/cap/cap.notes
-%%PORTDOCS%%share/doc/cap/glossary
-%%PORTDOCS%%share/doc/cap/install.ms
-%%PORTDOCS%%share/doc/cap/iptalk.cookbook
-%%PORTDOCS%%share/doc/cap/nbp.ext
-%%PORTDOCS%%share/doc/cap/pap.notes
-%%PORTDOCS%%share/doc/cap/print.cookbook
-%%PORTDOCS%%share/doc/cap/sched.notes
-%%PORTDOCS%%share/doc/cap/uab.desc.ms
-%%PORTDOCS%%share/doc/cap/uar.cookbook
-%%PORTDOCS%%share/doc/cap/CAP.faq
-%%PORTDOCS%%share/doc/cap/CAP60.README
-%%PORTDOCS%%share/doc/cap/NOTICE
-%%PORTDOCS%%share/doc/cap/README
-%%PORTDOCS%%share/doc/cap/papif.README
-%%PORTDOCS%%share/doc/cap/lwsrv.README
-%%PORTDOCS%%share/doc/cap/aufs.README
-%%PORTDOCS%%share/doc/cap/doc.README
-%%PORTDOCS%%share/doc/cap/applications.README
-%%PORTDOCS%%share/doc/cap/uab.README
-%%PORTDOCS%%share/doc/cap/ethertalk.README
+%%PORTDOCS%%%%DOCSDIR%%/abmisc.doc
+%%PORTDOCS%%%%DOCSDIR%%/asp.notes
+%%PORTDOCS%%%%DOCSDIR%%/atp.notes
+%%PORTDOCS%%%%DOCSDIR%%/cap.auth.doc
+%%PORTDOCS%%%%DOCSDIR%%/cap.notes
+%%PORTDOCS%%%%DOCSDIR%%/glossary
+%%PORTDOCS%%%%DOCSDIR%%/install.ms
+%%PORTDOCS%%%%DOCSDIR%%/iptalk.cookbook
+%%PORTDOCS%%%%DOCSDIR%%/nbp.ext
+%%PORTDOCS%%%%DOCSDIR%%/pap.notes
+%%PORTDOCS%%%%DOCSDIR%%/print.cookbook
+%%PORTDOCS%%%%DOCSDIR%%/sched.notes
+%%PORTDOCS%%%%DOCSDIR%%/uab.desc.ms
+%%PORTDOCS%%%%DOCSDIR%%/uar.cookbook
+%%PORTDOCS%%%%DOCSDIR%%/CAP.faq
+%%PORTDOCS%%%%DOCSDIR%%/CAP60.README
+%%PORTDOCS%%%%DOCSDIR%%/NOTICE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/papif.README
+%%PORTDOCS%%%%DOCSDIR%%/lwsrv.README
+%%PORTDOCS%%%%DOCSDIR%%/aufs.README
+%%PORTDOCS%%%%DOCSDIR%%/doc.README
+%%PORTDOCS%%%%DOCSDIR%%/applications.README
+%%PORTDOCS%%%%DOCSDIR%%/uab.README
+%%PORTDOCS%%%%DOCSDIR%%/ethertalk.README
 @dirrm include/netat
 @dirrm etc/cap
 @dirrm lib/cap
-%%PORTDOCS%%@dirrm share/doc/cap
+%%PORTDOCS%%@dirrm %%DOCSDIR%%