Date: Tue, 9 May 2006 17:03:20 +0100 From: Shaun Amott <shaun@inerd.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/97046: net/cap - cleanup port / portlint Message-ID: <1147190600.41819@charon.picobyte.net> Resent-Message-ID: <200605091610.k49GANSo034177@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97046
>Category: ports
>Synopsis: net/cap - cleanup port / portlint
>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: Tue May 09 16:10:22 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Shaun Amott
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
>Description:
Pet portlint:
- Use MLINKS
- pkg-install -> pkg-message[.in]
- Use DOCSDIR in PLIST
Tinderbox tested.
>How-To-Repeat:
>Fix:
--- cap.diff begins here ---
diff -urN cap.orig/Makefile cap/Makefile
--- cap.orig/Makefile Wed Jan 18 23:48:06 2006
+++ cap/Makefile Tue May 9 13:09:55 2006
@@ -23,7 +23,7 @@
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 @@
CFLAGS+= -DUSESTRINGDOTH -DUSEDIRENT
-USE_REINPLACE= YES
+SUBFILES= 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,8 @@
@${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
.include <bsd.port.post.mk>
diff -urN cap.orig/files/pkg-message.in cap/files/pkg-message.in
--- cap.orig/files/pkg-message.in Thu Jan 1 01:00:00 1970
+++ cap/files/pkg-message.in Tue May 9 13:09:39 2006
@@ -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 -urN cap.orig/pkg-install cap/pkg-install
--- cap.orig/pkg-install Mon Dec 2 09:38:55 1996
+++ cap/pkg-install Thu Jan 1 01:00:00 1970
@@ -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 -urN cap.orig/pkg-plist cap/pkg-plist
--- cap.orig/pkg-plist Mon Dec 24 02:16:29 2001
+++ cap/pkg-plist Tue May 9 13:07:39 2006
@@ -44,13 +44,6 @@
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/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%%
--- cap.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?1147190600.41819>