Adapt FreeBSD LPRng port to work with pkgsrc machinery.

Also add back FreeBSD RCS ID to Makefile.

11 files changed, 310 insertions, 246 deletions

diff --git a/print/LPRng/Makefile b/print/LPRng/Makefile
index 5c0c9e8ec7d..ff2a9f56e2b 100644
--- a/print/LPRng/Makefile
+++ b/print/LPRng/Makefile
@@ -1,47 +1,73 @@
-# New ports collection makefile for:	LPRng
-# Version required:	3.6.6
-# Date created:		2 Apr 1997
-# Whom:			desmo@bandwidth.org
-#
-# $Id: Makefile,v 1.1.1.1 1999/09/11 21:58:30 jlam Exp $
+# $NetBSD: Makefile,v 1.2 1999/09/13 18:40:51 jlam Exp $
+# FreeBSD Id: Makefile,v 1.5 1998/10/21 00:57:27 steve Exp
 #
 
-DISTNAME=	LPRng-3.6.6
-CATEGORIES=	sysutils print
+DISTNAME=	LPRng-3.6.8
+CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.astart.com/pub/LPRng/LPRng/
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} LPRng_DOC-3.6.6.tgz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	desmo@bandwidth.org
-
-MAKEFILE=	Makefile.bsd
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= \
- --with-lpddir=${PREFIX}/sbin \
- --with-admindir=${PREFIX}/sbin \
- --with-filterdir=${PREFIX}/libexec/filters \
- --with-lpd_conf_path=/etc/lpd.conf \
- --with-lpd_perms_path=/etc/lpd.perms \
- --with-printcap_path=/etc/printcap
-
-MAN1=		cancel.1 lp.1 lpbanner.1 lpc.1 lpf.1 \
-		lpq.1 lpr.1 lpraccnt.1 lprm.1 lpstat.1 monitor.1
-MAN5=		lpd.conf.5 lpd.perms.5 printcap.5
-MAN8=		checkpc.8 lpd.8
-MANCOMPRESSED=	yes
+DISTFILES=	${LPRNG_SRC} ${LPRNG_DOC}
+
+MAINTAINER=	jlam@netbsd.org
+HOMEPAGE=	http://www.astart.com/LPRng.html
+
+LPRNG_SRC=	${DISTNAME}${EXTRACT_SUFX}
+LPRNG_DOC=	${DISTNAME:S/-/_DOC-/}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${LPRNG_SRC}
+
+BUILD_DEFS+=	LPRNG_SUID LPRNG_PRIV_PORTS
+
+MAKEFILE=		Makefile.bsd
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${LPRNG_SYSCONFDIR} \
+			--with-filterdir=${FILTER_DIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+LPRNG_SUID?=		YES
+LPRNG_PRIV_PORTS?=	NO
+
+.if (${LPRNG_SUID} == "NO")
+CONFIGURE_ARGS+=	--disable-setuid
+.endif
+.if (${LPRNG_PRIV_PORTS} == "YES")
+CONFIGURE_ARGS+=	--enable-priv_ports
+.endif
+
+LPRNG_SYSCONFDIR=	/etc
+LPD_PRINTCAP_PATH=	${LPRNG_SYSCONFDIR}/lpd_printcap,${PREFIX}/etc/lpd_printcap
+LPD_PERMS_PATH=		${LPRNG_SYSCONFDIR}/lpd.perms
+PRINTCAP_PATH=		${LPRNG_SYSCONFDIR}/printcap
+
+FILTER_DIR=		${PREFIX}/libexec/LPRng
+FILTER_LD_PATH=		/usr/lib:${PREFIX}/lib:/usr/local/lib
+FILTER_PATH=		${FILTER_DIR}:/sbin:/usr/sbin:/bin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin:/usr/local/sbin:/usr/local/bin
+
+MAKE_ENV+=	FILTER_LD_PATH="${FILTER_LD_PATH}" \
+		FILTER_PATH="${FILTER_PATH}" \
+		LPD_PRINTCAP_PATH="${LPD_PRINTCAP_PATH}"
+
+pre-patch:
+	${MV} ${WRKSRC}/man/lpd.conf.5 ${WRKSRC}/man/lpd.conf.5.in
+
+post-configure:
+	${SED}	-e "s#@@FILTER_LD_PATH@@#${FILTER_LD_PATH}#g" \
+		-e "s#@@FILTER_PATH@@#${FILTER_PATH}#g" \
+		-e "s#@@LPD_PRINTCAP_PATH@@#${LPD_PRINTCAP_PATH}#g" \
+		-e "s#@@LPD_PERMS_PATH@@#${LPD_PERMS_PATH}#g" \
+		-e "s#@@PRINTCAP_PATH@@#${PRINTCAP_PATH}#g" \
+		${WRKSRC}/man/lpd.conf.5.in > ${WRKSRC}/man/lpd.conf.5
 
 post-install:
-	${CAT} ${FILESDIR}/lprng.sh | \
-		${SED} -e "s|@@PREFIX@@|${PREFIX}|g" > ${PREFIX}/etc/rc.d/lprng.sh
-	chmod +x ${PREFIX}/etc/rc.d/lprng.sh
-	${INSTALL} -d -g bin -o bin -m 0555 ${PREFIX}/share/doc/LPRng
-	@for file in ${EXTRA_FILES}; do \
-		${CP} ${DISTDIR}/$$file ${PREFIX}/share/doc/LPRng; \
-		cd ${PREFIX}/share/doc/LPRng; \
-		tar xvfz $$file; \
-		${RM} ${PREFIX}/share/doc/LPRng/$$file; \
-	done
-	@${CAT} ${PKGDIR}/MESSAGE
-
-.include <bsd.port.mk>
+	${SED}	-e "s#@@PREFIX@@#${PREFIX}#g" \
+		-e "s#@@CAT@@#${CAT}#g" \
+		-e "s#@@ECHO@@#${ECHO}#g" \
+		${FILESDIR}/lprng.sh > ${WRKDIR}/lprng.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/lprng.sh ${PREFIX}/etc/rc.d/lprng.sh
+
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/LPRng
+	${PAX}	-rzf ${DISTDIR}/${LPRNG_DOC} \
+		-s "#^${DISTNAME:S/-/_DOC-/}/#${PREFIX}/share/doc/LPRng/#" \
+		*.gif *.html *.ps *.txt
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/LPRng/files/lprng.sh b/print/LPRng/files/lprng.sh
index 53946039ebf..ade031a79d8 100644
--- a/print/LPRng/files/lprng.sh
+++ b/print/LPRng/files/lprng.sh
@@ -1,10 +1,16 @@
 #!/bin/sh
+#
+# $NetBSD: lprng.sh,v 1.2 1999/09/13 18:40:52 jlam Exp $
 
-# Find out if lpd is already running. I guess you could also detect
-# the existence of /var/run/printer.
-
-killall -s lpd > /dev/null 2>&1
+# Stop BSD lpd if it is running.
+#
+if [ -f /var/run/lpd.pid ]; then
+	kill `@@CAT@@ /var/run/lpd.pid`
+fi
 
-if [ $? != 0 ]; then
-	echo -n ' printer';             @@PREFIX@@/sbin/lpd
+# Start LPRng lpd if it exists.
+#
+if [ -x @@PREFIX@@/sbin/lpd ]; then
+	@@ECHO@@ -n ' LPRng';
+	@@PREFIX@@/sbin/lpd
 fi
diff --git a/print/LPRng/files/md5 b/print/LPRng/files/md5
index e806bb159e2..f46ebacd136 100644
--- a/print/LPRng/files/md5
+++ b/print/LPRng/files/md5
@@ -1,2 +1,4 @@
-MD5 (LPRng-3.6.6.tgz) = 90d0ed3be7c5cfd559185c55d5df3d26
-MD5 (LPRng_DOC-3.6.6.tgz) = 4efaf91200dbf7fd117885d6ad82d8ad
+$NetBSD: md5,v 1.2 1999/09/13 18:40:52 jlam Exp $
+
+MD5 (LPRng-3.6.8.tgz) = d67d2e57f08323f4efd5d58a98c78ac8
+MD5 (LPRng_DOC-3.6.8.tgz) = b2df8d549110aa08320b38e9f4d2117d
diff --git a/print/LPRng/files/patch-sum b/print/LPRng/files/patch-sum
new file mode 100644
index 00000000000..6fffa36b863
--- /dev/null
+++ b/print/LPRng/files/patch-sum
@@ -0,0 +1,6 @@
+$NetBSD: patch-sum,v 1.1 1999/09/13 18:40:52 jlam Exp $
+
+MD5 (patch-aa) = 1917fa18c550d16e7b144be5bce30903
+MD5 (patch-ab) = f5cd2c7a963d704863dc7ea17f6df8ed
+MD5 (patch-ac) = 89fa587f78602373b3e3b0e736125c92
+MD5 (patch-ah) = db316d465b655120356990420e451c2d
diff --git a/print/LPRng/patches/patch-aa b/print/LPRng/patches/patch-aa
new file mode 100644
index 00000000000..6babd9ca857
--- /dev/null
+++ b/print/LPRng/patches/patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.1 1999/09/13 18:40:52 jlam Exp $
+
+--- Makefile.bsd.in.orig	Fri Aug 27 21:37:47 1999
++++ Makefile.bsd.in	Mon Sep 13 13:24:16 1999
+@@ -31,6 +31,8 @@
+ libexecdir=@libexecdir@
+ # for the configuration stuff
+ sysconfdir=@sysconfdir@
++# for the sample configuraton files
++egdir=${prefix}/share/examples/LPRng
+ 
+ LPD_PERMS_PATH=@LPD_PERMS_PATH@
+ LPD_CONF_PATH=@LPD_CONF_PATH@
+@@ -73,20 +75,20 @@
+ install::
+ 	#install default versions of the lpd.conf and lpd.perm files
+ 
++	${BSD_INSTALL_DATA_DIR} ${egdir};
++
+ 	f=$(LPD_CONF_PATH) ; g=lpd.conf; \
+-	if [ -z "$$f" ] ; then f=${admindir}/$$g; fi; \
+-	$(INSTALL) -m 644 $(SRC)/$$g $$f.sample; \
++	${BSD_INSTALL_DATA} ${SRC}/$$g ${egdir}/$$g.sample; \
+ 	if [ ! -f "$$f" ] ; then \
+-		echo $(INSTALL) -m 644 $(SRC)/$$g $$f; \
+-		$(INSTALL) -m 644 $(SRC)/$$g $$f; \
++		echo ${BSD_INSTALL_DATA} ${SRC}/$$g $$f; \
++		${BSD_INSTALL_DATA} ${SRC}/$$g $$f; \
+ 	fi;
+ 
+-	f=$(LPD_PERMS_PATH); g=lpd.perms; \
+-	if [ -z "$$f" ] ; then f=${admindir}/$$g; fi; \
+-	$(INSTALL) -m 644 $(SRC)/$$g $$f.sample; \
++	f=$(LPD_PERMS_PATH) ; g=lpd.perms; \
++	${BSD_INSTALL_DATA} ${SRC}/$$g ${egdir}/$$g.sample; \
+ 	if [ ! -f "$$f" ] ; then \
+-		echo $(INSTALL) -m 644 $(SRC)/$$g $$f; \
+-		$(INSTALL) -m 644 $(SRC)/$$g $$f; \
++		echo ${BSD_INSTALL_DATA} ${SRC}/$$g $$f; \
++		${BSD_INSTALL_DATA} ${SRC}/$$g $$f; \
+ 	fi;
+ 
+ info dvi check:
diff --git a/print/LPRng/patches/patch-ab b/print/LPRng/patches/patch-ab
new file mode 100644
index 00000000000..3c4d850c7f5
--- /dev/null
+++ b/print/LPRng/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 1999/09/13 18:40:52 jlam Exp $
+
+--- src/Makefile.bsd.in.orig	Fri Aug 27 21:37:56 1999
++++ src/Makefile.bsd.in	Mon Sep 13 11:38:07 1999
+@@ -81,7 +81,10 @@
+ FORCE_LOCALHOST=@FORCE_LOCALHOST@
+ PERMS=@PERMS@
+ 
+-CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\"
++CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\" \
++	 -DFILTER_LD_PATH=\"${FILTER_LD_PATH}\" \
++	 -DFILTER_PATH=\"${FILTER_PATH}\" \
++	 -DLPD_PRINTCAP_PATH=\"${LPD_PRINTCAP_PATH}\"
+ LDFLAGS:= @LDFLAGS@
+ 
+ #********************** End of configure modifiable settings ************
diff --git a/print/LPRng/patches/patch-ac b/print/LPRng/patches/patch-ac
new file mode 100644
index 00000000000..bc95857c9c9
--- /dev/null
+++ b/print/LPRng/patches/patch-ac
@@ -0,0 +1,48 @@
+$NetBSD: patch-ac,v 1.1 1999/09/13 18:40:52 jlam Exp $
+
+--- man/lpd.conf.5.in.orig	Fri Aug 27 21:38:52 1999
++++ man/lpd.conf.5.in	Mon Sep 13 11:35:56 1999
+@@ -250,7 +250,7 @@
+ Formfeed string.
+ .TP
+ \fBfilter_ld_path\fR
+-(default: /lib:/usr/lib:/usr/5lib:/usr/ucblib)
++(default: @@FILTER_LD_PATH@@)
+ The value for the environment variable LD_LIBRARY_PATH, 
+ both used when executing, and passed on to filters.
+ This variable is used to find shared libraries on
+@@ -268,7 +268,7 @@
+ (see of_filter_options, filter_options, bk_filter_options, bk_of_filter_options)
+ .TP
+ \fBfilter_path\fR
+-(default: /bin:/usr/bin:/usr/ucb:/usr/sbin:/usr/etc:/etc)
++(default: @@FILTER_PATH@@)
+ The value for the environment variable PATH, both used to find filters
+ and passed on to filters run by \fBlpd\fR and \fBlpr\fR.
+ .TP
+@@ -387,7 +387,7 @@
+ interfere with a previous installation of
+ LPD or LPRng.
+ .TP
+-\fBlpd_printcap_path\fR (default: "/etc/lpd_printcap:/usr/etc/lpd_printcap")
++\fBlpd_printcap_path\fR (default: @@LPD_PRINTCAP_PATH@@)
+ The location of additional 
+ .B lpd
+ server printcap database information.
+@@ -487,14 +487,14 @@
+ See \fBprintcap\fP(5) for details.
+ .TP
+ \fBprintcap_path\fR
+-(default: "etc/printcap:/usr/etc/printcap:/var/spool/lpd/printcap.%h")
++(default: @@PRINTCAP_PATH@@)
+ The location of the printcap database information.
+ If a file or filter does not exist, it is skipped.
+ All valid entries in these files will be used.
+ See PRINTCAP LOOKUP for details.
+ .TP
+ \fBperms_path\fR
+-(default: /etc/lpd.perms:/usr/etc/lpd.perms:/var/spool/lpd/lpd.perms.%h)
++(default: @@LPD_PERMS_PATH@@)
+ The location of the printer permissions database.
+ If a file or filter does not exist, it is skipped.
+ The first file or filter that exists and is readable will be used.
diff --git a/print/LPRng/patches/patch-ag b/print/LPRng/patches/patch-ag
deleted file mode 100644
index 81c750446e7..00000000000
--- a/print/LPRng/patches/patch-ag
+++ /dev/null
@@ -1,64 +0,0 @@
-*** man/Makefile.bsd.in.orig	Thu Jul 22 09:46:16 1999
---- man/Makefile.bsd.in	Thu Jul 22 10:10:23 1999
-***************
-*** 18,24 ****
-  MANINSTCMD =	@INSTALL_MAN@
-  
-  # change MANEXT to .gz or .Z if you use compressed manpages.
-! MANEXT =	
-  
-  ## fix up prefix to be a make variable
-  prefix = @prefix@
---- 18,24 ----
-  MANINSTCMD =	@INSTALL_MAN@
-  
-  # change MANEXT to .gz or .Z if you use compressed manpages.
-! MANEXT =	.gz	
-  
-  ## fix up prefix to be a make variable
-  prefix = @prefix@
-***************
-*** 51,71 ****
-  
-  # Standard man install target.
-  #
-! install:
-! 	-${SRC}/mkinstalldirs $(MAN)/man1 $(MAN)/man5 $(MAN)/man8
-! 	for i in ${SRC}/*.1; do $(MANINSTCMD) $$i $(MAN)/man1/`basename $$i`$(MANEXT); done
-! 	for i in ${SRC}/*.5; do $(MANINSTCMD) $$i $(MAN)/man5/`basename $$i`$(MANEXT); done
-! 	for i in ${SRC}/*.8; do $(MANINSTCMD) $$i $(MAN)/man8/`basename $$i`$(MANEXT); done
-  
-  # Install man pages in compressed form.
-  #
-! install.zman:
-! 	for i in ${SRC}/*.1; do compress < $$i >/tmp/_; \
-! 		 $(MANINSTCMD) /tmp/_ $(MAN)/man1.Z/$$i$(MANEXT); rm -f /tmp/_; done
-! 	for i in ${SRC}/*.5; do compress < $$i >/tmp/_; \
-! 		 $(MANINSTCMD) /tmp/_ $(MAN)/man5.Z/$$i$(MANEXT); rm -f /tmp/_; done
-! 	for i in ${SRC}/*.8; do compress < $$i >/tmp/_; \
-! 		 $(MANINSTCMD) /tmp/_ $(MAN)/man8.Z/$$i$(MANEXT); rm -f /tmp/_; done
-  
-  uninstall:
-  	for i in *.1; do rm -f $(MAN)/man1/$$i$(MANEXT); done
---- 51,71 ----
-  
-  # Standard man install target.
-  #
-! #install:
-! #	-${SRC}/mkinstalldirs $(MAN)/man1 $(MAN)/man5 $(MAN)/man8
-! #	for i in ${SRC}/*.1; do $(MANINSTCMD) $$i $(MAN)/man1/`basename $$i`$(MANEXT); done
-! #	for i in ${SRC}/*.5; do $(MANINSTCMD) $$i $(MAN)/man5/`basename $$i`$(MANEXT); done
-! #	for i in ${SRC}/*.8; do $(MANINSTCMD) $$i $(MAN)/man8/`basename $$i`$(MANEXT); done
-  
-  # Install man pages in compressed form.
-  #
-! install:
-! 	for i in ${SRC}/*.1; do gzip < $$i >/tmp/_; \
-! 		$(MANINSTCMD) /tmp/_ $(MAN)/man1/$$i$(MANEXT); rm -f /tmp/_; done
-! 	for i in ${SRC}/*.5; do gzip < $$i >/tmp/_; \
-! 		$(MANINSTCMD) /tmp/_ $(MAN)/man5/$$i$(MANEXT); rm -f /tmp/_; done
-! 	for i in ${SRC}/*.8; do gzip < $$i >/tmp/_; \
-! 		$(MANINSTCMD) /tmp/_ $(MAN)/man8/$$i$(MANEXT); rm -f /tmp/_; done
-  
-  uninstall:
-  	for i in *.1; do rm -f $(MAN)/man1/$$i$(MANEXT); done
diff --git a/print/LPRng/patches/patch-ah b/print/LPRng/patches/patch-ah
index 9e69cdc1d76..0bf4a27ec88 100644
--- a/print/LPRng/patches/patch-ah
+++ b/print/LPRng/patches/patch-ah
@@ -1,44 +1,27 @@
-*** src/common/vars.c.orig	Thu Jul 22 09:47:00 1999
---- src/common/vars.c	Thu Jul 22 10:25:58 1999
-***************
-*** 175,185 ****
-     /* default filter */
-  { "filter", STRING_K, &Filter_DYN,0,0},
-     /* filter LD_LIBRARY_PATH value */
-! { "filter_ld_path", STRING_K, &Filter_ld_path_DYN,0,0,"=/lib:/usr/lib:/usr/5lib:/usr/ucblib"},
-     /* filter options */
-  { "filter_options", STRING_K, &Filter_options_DYN,0,0,"=$C $A $F $H $J $K $L $P $Q $R $Z $a $c $d $e $f $h $i $j $k $l $n $p $r $s $w $x $y $-a"},
-     /* filter PATH environment variable */
-! { "filter_path", STRING_K, &Filter_path_DYN,0,0,"=/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/sbin:/usr/etc:/etc"},
-     /* interval at which to check OF filter for error status */
-  { "filter_poll_interval", INTEGER_K, &Filter_poll_interval_DYN,0,0,"=30"},
-     /*  print a form feed when device is opened */
---- 175,185 ----
-     /* default filter */
-  { "filter", STRING_K, &Filter_DYN,0,0},
-     /* filter LD_LIBRARY_PATH value */
-! { "filter_ld_path", STRING_K, &Filter_ld_path_DYN,0,0,"=/lib:/usr/lib:/usr/local/lib"},
-     /* filter options */
-  { "filter_options", STRING_K, &Filter_options_DYN,0,0,"=$C $A $F $H $J $K $L $P $Q $R $Z $a $c $d $e $f $h $i $j $k $l $n $p $r $s $w $x $y $-a"},
-     /* filter PATH environment variable */
-! { "filter_path", STRING_K, &Filter_path_DYN,0,0,"=/bin:/usr/bin:/usr/libexec:/usr/local/libexec:/usr/sbin:/var/spool/bin"},
-     /* interval at which to check OF filter for error status */
-  { "filter_poll_interval", INTEGER_K, &Filter_poll_interval_DYN,0,0,"=30"},
-     /*  print a form feed when device is opened */
-***************
-*** 209,215 ****
-     /*  Running IPV6 */
-  { "ipv6",  FLAG_K,  &IPV6Protocol_DYN,0,0},
-  	/* keytab file location for kerberos, used by server */
-! { "kerberos_keytab", STRING_K, &Kerberos_keytab_DYN,0,0,"=/etc/lpd.keytab"},
-  	/* key lifetime for kerberos, used by server */
-  { "kerberos_life", STRING_K, &Kerberos_life_DYN,0,0},
-  	/* key renewal time for kerberos, used by server */
---- 209,215 ----
-     /*  Running IPV6 */
-  { "ipv6",  FLAG_K,  &IPV6Protocol_DYN,0,0},
-  	/* keytab file location for kerberos, used by server */
-! { "kerberos_keytab", STRING_K, &Kerberos_keytab_DYN,0,0,"=/usr/local/etc/lpd.keytab:/etc/lpd.keytab"},
-  	/* key lifetime for kerberos, used by server */
-  { "kerberos_life", STRING_K, &Kerberos_life_DYN,0,0},
-  	/* key renewal time for kerberos, used by server */
+$NetBSD: patch-ah,v 1.2 1999/09/13 18:40:53 jlam Exp $
+
+--- src/common/vars.c.orig	Fri Aug 27 21:38:25 1999
++++ src/common/vars.c	Mon Sep 13 11:19:06 1999
+@@ -179,11 +179,11 @@
+    /* default filter */
+ { "filter", STRING_K, &Filter_DYN,0,0},
+    /* filter LD_LIBRARY_PATH value */
+-{ "filter_ld_path", STRING_K, &Filter_ld_path_DYN,0,0,"=/lib:/usr/lib:/usr/5lib:/usr/ucblib"},
++{ "filter_ld_path", STRING_K, &Filter_ld_path_DYN,0,0,"=" FILTER_LD_PATH},
+    /* filter options */
+ { "filter_options", STRING_K, &Filter_options_DYN,0,0,"=$C $A $F $H $J $K $L $P $Q $R $Z $a $c $d $e $f $h $i $j $k $l $n $p $r $s $w $x $y $-a"},
+    /* filter PATH environment variable */
+-{ "filter_path", STRING_K, &Filter_path_DYN,0,0,"=/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/sbin:/usr/etc:/etc"},
++{ "filter_path", STRING_K, &Filter_path_DYN,0,0,"=" FILTER_PATH},
+    /* interval at which to check OF filter for error status */
+ { "filter_poll_interval", INTEGER_K, &Filter_poll_interval_DYN,0,0,"=30"},
+    /*  print a form feed when device is opened */
+@@ -259,7 +259,7 @@
+    /* lpd port */
+ { "lpd_port", STRING_K, &Lpd_port_DYN,0,0,"=printer"},
+    /* lpd printcap path */
+-{ "lpd_printcap_path", STRING_K, &Lpd_printcap_path_DYN,1,0,"=/etc/lpd_printcap,/usr/etc/lpd_printcap"},
++{ "lpd_printcap_path", STRING_K, &Lpd_printcap_path_DYN,1,0,"=" LPD_PRINTCAP_PATH},
+    /* use lpr filtering as in bounce queue */
+ { "lpr_bounce", FLAG_K, &Lpr_bounce_DYN,0,0},
+    /* BSD LPR -m flag, does not require mail address */
diff --git a/print/LPRng/pkg/MESSAGE b/print/LPRng/pkg/MESSAGE
index aafd2044d01..24d517316b0 100644
--- a/print/LPRng/pkg/MESSAGE
+++ b/print/LPRng/pkg/MESSAGE
@@ -1,17 +1,21 @@
+$NetBSD: MESSAGE,v 1.2 1999/09/13 18:40:53 jlam Exp $
+===========================================================================
 
-To activate the new printing system do the following:
+To activate the LPRng printing system do the following:
+	- set `lpd=NO' in /etc/rc.conf
+	- run ${PREFIX}/etc/rc.d/lprng.sh (may be added to /etc/rc.local)
+	- remember to adjust your aliases or your PATH to use the new programs
 
-- save your old printcap (`cp /etc/printcap /etc/printcap.save')
-- set `lpd_enable=NO' in /etc/rc.conf
-- run checkpc -f to make sure that necessary files have been created
-- reboot or kill the old lpd (`killall lpd') and
-  start the new one (`/usr/local/sbin/lpd')
-- remember to adjust your aliases or your PATH to use the new programs
+Note that LPRng uses:
+	/etc/printcap
+	/etc/lpd_printcap
+	/etc/lpd.conf
+	/etc/lpd.perms
 
-Note that LPRng uses /etc/printcap, /etc/lpd.conf, and /etc/lpd.perms
+For further information, have a look at
+	${PREFIX}/share/doc/LPRng/LPRng-HOWTO.txt
 
-For further information, have a look at:
-  /usr/local/share/doc/LPRng
-also:
-  http://www.astart.com/lprng.html
+or point your favorite brower at
+	${PREFIX}/share/doc/LPRng/LPRng-HOWTO.html
 
+===========================================================================
diff --git a/print/LPRng/pkg/PLIST b/print/LPRng/pkg/PLIST
index 64f82642af8..4df53a6e7a3 100644
--- a/print/LPRng/pkg/PLIST
+++ b/print/LPRng/pkg/PLIST
@@ -1,81 +1,75 @@
+@comment $NetBSD: PLIST,v 1.2 1999/09/13 18:40:53 jlam Exp $
+bin/cancel
+bin/lp
 bin/lpq
-bin/lprm
 bin/lpr
-bin/lpc
-sbin/lpd
-sbin/lpf
-sbin/lpbanner
-bin/checkpc
-bin/lpraccnt
-sbin/readfilecount
-sbin/removeoneline
-sbin/authenticate_pgp
-sbin/setupauth
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial.ps
-share/doc/LPRng/LPRng_DOC-3.5.6/Makefile
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial/Tutorial.02.nrf
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial/Makefile
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial/Tutorial.01.nrf
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial/Tutorial.05.nrf
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial/Tutorial.06.nrf
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial/Tutorial.03.nrf
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial/Tutorial.07.nrf
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial/Tutorial.04.nrf
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial/Tutorial.txt
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial/Tutorial.ps
-share/doc/LPRng/LPRng_DOC-3.5.6/README
-share/doc/LPRng/LPRng_DOC-3.5.6/Macros/using.tmac.usenix
-share/doc/LPRng/LPRng_DOC-3.5.6/Macros/tmac.usenix
-share/doc/LPRng/LPRng_DOC-3.5.6/Macros/Makefile
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro.txt
-share/doc/LPRng/LPRng_DOC-3.5.6/bg.gif
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro.ps
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO.ps
-share/doc/LPRng/LPRng_DOC-3.5.6/Using_stty.txt
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro/Intro.f4
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro/Intro.f5
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro/Intro.f8
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro/Intro.f8a
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro/Intro.f8b
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro/Intro.f8c
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro/Intro.f9
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro/Intro.nroff
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro/Makefile
-share/doc/LPRng/LPRng_DOC-3.5.6/Intro/Intro.f2
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-LISA95.ps
-share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial.txt
-share/doc/LPRng/LPRng_DOC-3.5.6/rfc1179.txt
-share/doc/LPRng/LPRng_DOC-3.5.6/LISA97/slides/P01PrintingLISA97.ppt
-share/doc/LPRng/LPRng_DOC-3.5.6/LISA97/slides/P01PrintingLISA97.ps.2up
-share/doc/LPRng/LPRng_DOC-3.5.6/LISA97/README
-share/doc/LPRng/LPRng_DOC-3.5.6/LISA97/COPYRIGHT
-share/doc/LPRng/LPRng_DOC-3.5.6/README.solaris
-share/doc/LPRng/LPRng_DOC-3.5.6/UPDATE
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-1.html
-share/doc/LPRng/LPRng_DOC-3.5.6/star1.gif
-share/doc/LPRng/LPRng_DOC-3.5.6/lprng.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-9.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-8.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-7.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-6.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-5.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-4.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-3.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-2.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-15.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-14.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-13.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-12.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-11.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO-10.html
-share/doc/LPRng/LPRng_DOC-3.5.6/LPRng-HOWTO.dvi
+bin/lprm
+bin/lpstat
 etc/rc.d/lprng.sh
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.6/LISA97/slides
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.6/LISA97
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.6/Macros
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.6/Intro
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.6/Tutorial
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.6
+libexec/LPRng/lpbanner
+libexec/LPRng/lpf
+libexec/LPRng/pclbanner
+libexec/LPRng/psbanner
+man/man1/cancel.1
+man/man1/lp.1
+man/man1/lpbanner.1
+man/man1/lpc.1
+man/man1/lpf.1
+man/man1/lpq.1
+man/man1/lpr.1
+man/man1/lpraccnt.1
+man/man1/lprm.1
+man/man1/lpstat.1
+man/man1/monitor.1
+man/man1/pclbanner.1
+man/man1/psbanner.1
+man/man5/lpd.conf.5
+man/man5/lpd.perms.5
+man/man5/printcap.5
+man/man8/checkpc.8
+man/man8/lpd.8
+sbin/checkpc
+sbin/lpc
+sbin/lpd
+sbin/lpraccnt
+share/doc/LPRng/LISA98.ps
+share/doc/LPRng/LPRng-HOWTO-1.html
+share/doc/LPRng/LPRng-HOWTO-10.html
+share/doc/LPRng/LPRng-HOWTO-11.html
+share/doc/LPRng/LPRng-HOWTO-12.html
+share/doc/LPRng/LPRng-HOWTO-13.html
+share/doc/LPRng/LPRng-HOWTO-14.html
+share/doc/LPRng/LPRng-HOWTO-15.html
+share/doc/LPRng/LPRng-HOWTO-16.html
+share/doc/LPRng/LPRng-HOWTO-17.html
+share/doc/LPRng/LPRng-HOWTO-18.html
+share/doc/LPRng/LPRng-HOWTO-19.html
+share/doc/LPRng/LPRng-HOWTO-2.html
+share/doc/LPRng/LPRng-HOWTO-20.html
+share/doc/LPRng/LPRng-HOWTO-21.html
+share/doc/LPRng/LPRng-HOWTO-3.html
+share/doc/LPRng/LPRng-HOWTO-4.html
+share/doc/LPRng/LPRng-HOWTO-5.html
+share/doc/LPRng/LPRng-HOWTO-6.html
+share/doc/LPRng/LPRng-HOWTO-7.html
+share/doc/LPRng/LPRng-HOWTO-8.html
+share/doc/LPRng/LPRng-HOWTO-9.html
+share/doc/LPRng/LPRng-HOWTO.html
+share/doc/LPRng/LPRng-HOWTO.ps
+share/doc/LPRng/LPRng-HOWTO.txt
+share/doc/LPRng/LPRng-LISA95.ps
+share/doc/LPRng/LPRng.html
+share/doc/LPRng/REDIRECT.LPRng.html
+share/doc/LPRng/bg.gif
+share/doc/LPRng/license.txt
+share/doc/LPRng/lprng.html
+share/doc/LPRng/rfc1179.txt
+share/doc/LPRng/star1.gif
+share/examples/LPRng/lpd.conf.sample
+@exec if [ ! -f /etc/lpd.conf ]; then cp %D/%F /etc/lpd.conf; fi
+share/examples/LPRng/lpd.perms.sample
+@exec if [ ! -f /etc/lpd.perms ]; then cp %D/%F /etc/lpd.perms; fi
+@unexec echo "If you won't be using the LPRng package anymore, you may want to manually delete /etc/lpd.conf and /etc/lpd.perms."
+@dirrm share/examples/LPRng
 @dirrm share/doc/LPRng
+@dirrm libexec/LPRng