5 files changed, 125 insertions, 102 deletions

diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index a62f41ae2230..6dd33b4ec623 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -1,44 +1,47 @@
 # New ports collection makefile for:	LPRng
-# Version required:	3.5.1
+# Version required:	3.6.8
 # Date created:		2 Apr 1997
 # Whom:			desmo@bandwidth.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	LPRng-3.5.1
+DISTNAME=	LPRng-${LPRNG_VER}
 CATEGORIES=	sysutils print
 MASTER_SITES=	ftp://ftp.astart.com/pub/LPRng/LPRng/
 EXTRACT_SUFX=	.tgz
-EXTRA_FILES=	LPRng_DOC-3.5.1.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LPRNG_DOC}
 
 MAINTAINER=	desmo@bandwidth.org
 
+LPRNG_VER=	3.6.8
+PLIST_SUB+=	LPRNG_VER=${LPRNG_VER}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+LPRNG_DOC=	LPRng_DOC-${LPRNG_VER}.tgz
+
 MAKEFILE=	Makefile.bsd
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-lpddir=/usr/local/sbin
+CONFIGURE_ARGS= \
+		--with-sbindir=${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=		authenticate_pgp.1 cancel.1 lp.1 lpbanner.1 lpc.1 lpf.1 \
-		lpq.1 lpr.1 lpraccnt.1 lprm.1 lpstat.1 monitor.1 \
-		readfilecount.1
+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
 
 post-install:
-	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} default)
-	@${CAT} ${FILESDIR}/lprng.sh | \
+	${CAT} ${FILESDIR}/lprng.sh | \
 		${SED} -e "s|@@PREFIX@@|${PREFIX}|g" > ${PREFIX}/etc/rc.d/lprng.sh
-	@${CHMOD} +x ${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
+	cd ${PREFIX}/share/doc/LPRng; \
+		tar xvfz ${DISTDIR}/${LPRNG_DOC}
+	@${CAT} ${PKGDIR}/MESSAGE | \
+		${SED} -e "s|@@PREFIX@@|${PREFIX}|g"
 
 .include <bsd.port.mk>
diff --git a/sysutils/LPRng/distinfo b/sysutils/LPRng/distinfo
index a5892e3b0417..f256bc811432 100644
--- a/sysutils/LPRng/distinfo
+++ b/sysutils/LPRng/distinfo
@@ -1,2 +1,2 @@
-MD5 (LPRng-3.5.1.tgz) = f08ae8b87d0cdc4091d8a2e3e61831b2
-MD5 (LPRng_DOC-3.5.1.tgz) = 608f6718771cfa6ac80ac8126bd62be9
+MD5 (LPRng-3.6.8.tgz) = d67d2e57f08323f4efd5d58a98c78ac8
+MD5 (LPRng_DOC-3.6.8.tgz) = b2df8d549110aa08320b38e9f4d2117d
diff --git a/sysutils/LPRng/files/patch-ah b/sysutils/LPRng/files/patch-ah
new file mode 100644
index 000000000000..9e69cdc1d760
--- /dev/null
+++ b/sysutils/LPRng/files/patch-ah
@@ -0,0 +1,44 @@
+*** 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 */
diff --git a/sysutils/LPRng/pkg-message b/sysutils/LPRng/pkg-message
index b0a426cc02c9..adba20b242ee 100644
--- a/sysutils/LPRng/pkg-message
+++ b/sysutils/LPRng/pkg-message
@@ -3,15 +3,14 @@ To activate the new printing system do the following:
 
 - 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')
+  start the new one (`@@PREFIX@@/sbin/lpd')
 - remember to adjust your aliases or your PATH to use the new programs
 
-Note that LPRng searches /usr/local/etc before /etc for
-its configuration files.
+Note that LPRng uses /etc/printcap, /etc/lpd.conf, and /etc/lpd.perms
 
 For further information, have a look at:
-  /usr/local/share/doc/LPRng
+  @@PREFIX@@/share/doc/LPRng
 also:
-  http://www.astart.com/lprng.html
-
+  WWW: http://www.astart.com/lprng.html
diff --git a/sysutils/LPRng/pkg-plist b/sysutils/LPRng/pkg-plist
index 7e5d19c09150..da90e253a224 100644
--- a/sysutils/LPRng/pkg-plist
+++ b/sysutils/LPRng/pkg-plist
@@ -1,81 +1,58 @@
 bin/lpq
 bin/lprm
 bin/lpr
-bin/lpc
+bin/lpstat
+sbin/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.1/Tutorial.ps
-share/doc/LPRng/LPRng_DOC-3.5.1/Makefile
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial/Tutorial.02.nrf
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial/Makefile
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial/Tutorial.01.nrf
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial/Tutorial.05.nrf
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial/Tutorial.06.nrf
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial/Tutorial.03.nrf
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial/Tutorial.07.nrf
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial/Tutorial.04.nrf
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial/Tutorial.txt
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial/Tutorial.ps
-share/doc/LPRng/LPRng_DOC-3.5.1/README
-share/doc/LPRng/LPRng_DOC-3.5.1/Macros/using.tmac.usenix
-share/doc/LPRng/LPRng_DOC-3.5.1/Macros/tmac.usenix
-share/doc/LPRng/LPRng_DOC-3.5.1/Macros/Makefile
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro.txt
-share/doc/LPRng/LPRng_DOC-3.5.1/bg.gif
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro.ps
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO.ps
-share/doc/LPRng/LPRng_DOC-3.5.1/Using_stty.txt
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro/Intro.f4
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro/Intro.f5
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro/Intro.f8
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro/Intro.f8a
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro/Intro.f8b
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro/Intro.f8c
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro/Intro.f9
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro/Intro.nroff
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro/Makefile
-share/doc/LPRng/LPRng_DOC-3.5.1/Intro/Intro.f2
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-LISA95.ps
-share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial.txt
-share/doc/LPRng/LPRng_DOC-3.5.1/rfc1179.txt
-share/doc/LPRng/LPRng_DOC-3.5.1/LISA97/slides/P01PrintingLISA97.ppt
-share/doc/LPRng/LPRng_DOC-3.5.1/LISA97/slides/P01PrintingLISA97.ps.2up
-share/doc/LPRng/LPRng_DOC-3.5.1/LISA97/README
-share/doc/LPRng/LPRng_DOC-3.5.1/LISA97/COPYRIGHT
-share/doc/LPRng/LPRng_DOC-3.5.1/README.solaris
-share/doc/LPRng/LPRng_DOC-3.5.1/UPDATE
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-1.html
-share/doc/LPRng/LPRng_DOC-3.5.1/star1.gif
-share/doc/LPRng/LPRng_DOC-3.5.1/lprng.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-9.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-8.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-7.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-6.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-5.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-4.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-3.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-2.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-15.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-14.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-13.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-12.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-11.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO-10.html
-share/doc/LPRng/LPRng_DOC-3.5.1/LPRng-HOWTO.dvi
+libexec/filters/lpf
+libexec/filters/lpbanner
+libexec/filters/pclbanner
+libexec/filters/psbanner
+sbin/checkpc
+sbin/lpraccnt
 etc/rc.d/lprng.sh
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.1/LISA97/slides
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.1/LISA97
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.1/Macros
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.1/Intro
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.1/Tutorial
-@dirrm share/doc/LPRng/LPRng_DOC-3.5.1
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/lprng.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/Makefile
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/README
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/Macros/using.tmac.usenix
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/Macros/tmac.usenix
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/Macros/Makefile
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/bg.gif
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-1.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-LISA95.ps
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/rfc1179.txt
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/UPDATE
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO.txt
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/star1.gif
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO.ps
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-16.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO.dvi
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-9.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-8.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-7.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-6.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-5.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-4.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-3.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-21.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-20.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-2.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-19.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-18.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-17.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/REDIRECT.LPRng.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LISA98.ppt
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LISA98.ps
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/SENDTOWEBSITE
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-15.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-14.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-13.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-12.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-11.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/LPRng-HOWTO-10.html
+share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/license.txt
+@dirrm share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%/Macros
+@dirrm share/doc/LPRng/LPRng_DOC-%%LPRNG_VER%%
 @dirrm share/doc/LPRng