7 files changed, 90 insertions, 24 deletions

diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 83fa189a2588..46e63c1aaf2d 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	LPRng
-PORTVERSION=	3.8.10
+PORTVERSION=	3.8.20
 CATEGORIES=	sysutils print
 MASTER_SITES=	ftp://ftp.lprng.com/pub/%SUBDIR%/ \
 		ftp://ftp.astart.com/pub/%SUBDIR%/ \
@@ -24,6 +24,8 @@ COMMENT=	An Enhanced Printer Spooler
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+
 CONFIGURE_ARGS=	\
 		--with-sbindir=${PREFIX}/sbin \
 		--with-filterdir=${PREFIX}/libexec/filters \
@@ -31,22 +33,34 @@ CONFIGURE_ARGS=	\
 		--with-lpd_perms_path=${PREFIX}/etc/lpd.perms \
 		--with-printcap_path=/etc/printcap \
 		--enable-gdbm=${LOCALBASE}
-USE_LIBTOOL=	yes
 
 MAN1=		cancel.1 lp.1 lpbanner.1 lpf.1 \
-		lpq.1 lpr.1 lprm.1 lpstat.1 monitor.1 \
-		pclbanner.1 psbanner.1
+		lpq.1 lpr.1 lprm.1 lprng_certs.1 lprng_index_certs.1 \
+		lpstat.1 monitor.1 pclbanner.1 psbanner.1
 MAN5=		lpd.conf.5 lpd.perms.5 printcap.5
 MAN8=		checkpc.8 lpc.8 lpd.8
 MANCOMPRESSED=	yes
 
 DOC_FILES=	CHANGES LPRng-HOWTO.* *.jpg LISA98.ppt
+HTML_FILES=	LPRng.jpg LPRngT-L.jpg LPRngT-S.jpg chooser.png clients.png \
+		configfiles.png filter.png index.html network.png parallel.png \
+		pooling.png printserver.png samba.png serial.png spooler.png \
+		x_add.png x_advanced.png x_checkpc.png x_edit.png \
+		x_ifhpfilter.png x_nup.png x_open.png x_printcaps.png \
+		x_reread.png x_results.png x_smb.png x_write.png
+OTHER_FILES=	Cookbook.pdf
 
 post-install:
 	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/HTML
+	@${MKDIR} ${DOCSDIR}/PDF
+	@${INSTALL_DATA} ${WRKSRC}/PrintingCookbook/PDF/${OTHER_FILES} ${DOCSDIR}/PDF
 .for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/HOWTO/${file} ${DOCSDIR}
 .endfor
+.for file in ${HTML_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/PrintingCookbook/HTML/${file} ${DOCSDIR}/HTML
+.endfor
 	@${CAT} ${PKGMESSAGE} | ${SED} -e "s|@@PREFIX@@|${PREFIX}|g"
 
 .include <bsd.port.mk>
diff --git a/sysutils/LPRng/distinfo b/sysutils/LPRng/distinfo
index 5015ac186ecf..775d274bae11 100644
--- a/sysutils/LPRng/distinfo
+++ b/sysutils/LPRng/distinfo
@@ -1 +1 @@
-MD5 (LPRng-3.8.10.tgz) = 3127e3793b94bd4a403a3809b1d8467b
+MD5 (LPRng-3.8.20.tgz) = 84a7dc3c7076a1efb2682c63313fad74
diff --git a/sysutils/LPRng/files/patch-aj b/sysutils/LPRng/files/patch-aj
new file mode 100644
index 000000000000..8a75d5aaf759
--- /dev/null
+++ b/sysutils/LPRng/files/patch-aj
@@ -0,0 +1,33 @@
+--- postinstall.freebsd.sh.orig	Mon Jun 17 22:10:17 2002
++++ postinstall.freebsd.sh	Fri Mar  7 15:54:41 2003
+@@ -56,7 +56,7 @@
+     cp lpd.conf ${hold}/lpd.conf.sample
+     cp printcap ${hold}/printcap.sample
+     if [ "$INIT" != no ] ; then
+-        cp init.freebsd ${hold}/lprng.sh
++        cp init.freebsd ${hold}/rc.d/lprng.sh
+     fi
+ elif [ "X$MAKEINSTALL" = XYES ] ; then
+ 	# we have the port pre-install operation
+@@ -81,8 +81,8 @@
+ 		if [ -f /etc/rc.conf ] ; then
+ 			perl -spi.bak -e 's/^lpd_enable/#lpd_enable/;' ${DESTDIR}/etc/rc.conf 
+ 		fi
+-		cp init.freebsd ${hold}/lprng.sh
+-		init=${DESTDIR}/usr/local/etc/rc.d/lprng.sh
++		cp init.freebsd ${hold}/rc.d/lprng.sh
++		init=${DESTDIR}${PREFIX}/etc/rc.d/lprng.sh
+ 		echo "Setting up init script $init using init.freebsd"
+ 		if [ ! -d `dirname $init` ] ; then mkdir -p `dirname $init ` ; fi;
+ 		rm -f $init
+@@ -107,8 +107,8 @@
+         fix ${hold}/lpd.conf "${LPD_CONF_PATH}"
+         fix ${hold}/printcap "${PRINTCAP_PATH}"
+ 		if [ "$INIT" != no ] ; then
+-			init=/usr/local/etc/rc.d/lprng.sh
+-			cp ${hold}/lprng.sh $init;
++			init=${DESTDIR}${PREFIX}/etc/rc.d/lprng.sh
++			cp ${hold}/rc.d/lprng.sh $init;
+ 			chmod 755 $init;
+ 			if [ -f /etc/rc.conf ] ; then
+ 				perl -spi.bak -e 's/^lpd_enable/#lpd_enable/;' /etc/rc.conf 
diff --git a/sysutils/LPRng/files/patch-src_common_lpd__jobs.c b/sysutils/LPRng/files/patch-src_common_lpd__jobs.c
deleted file mode 100644
index 24f579585eeb..000000000000
--- a/sysutils/LPRng/files/patch-src_common_lpd__jobs.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/common/lpd_jobs.c.orig	Mon Dec 30 20:33:17 2002
-+++ src/common/lpd_jobs.c	Mon Dec 30 20:33:27 2002
-@@ -189,7 +189,6 @@
- {   
-     struct line_list *l, *r;
- 	int tr, tl;
--	tr = (int)p;
- 	l = ((struct line_list **)left)[0];
- 	r = ((struct line_list **)right)[0];
- 	tl = Find_flag_value(l,DONE_TIME,Value_sep);
diff --git a/sysutils/LPRng/pkg-descr b/sysutils/LPRng/pkg-descr
index 18e56ab81e31..425e6b368afd 100644
--- a/sysutils/LPRng/pkg-descr
+++ b/sysutils/LPRng/pkg-descr
@@ -9,4 +9,4 @@ do not need to run SUID root; greatly enhanced security checks; and a
 greatly improved permission and authorization mechanism.
 
 Author: Patrick Powell <papowell@lprng.com>
-WWW: http://www.astart.com/lprng/LPRng.html
+WWW: http://www.lprng.com/
diff --git a/sysutils/LPRng/pkg-message b/sysutils/LPRng/pkg-message
index adba20b242ee..9a1b97d30e93 100644
--- a/sysutils/LPRng/pkg-message
+++ b/sysutils/LPRng/pkg-message
@@ -8,9 +8,12 @@ To activate the new printing system do the following:
   start the new one (`@@PREFIX@@/sbin/lpd')
 - remember to adjust your aliases or your PATH to use the new programs
 
-Note that LPRng uses /etc/printcap, /etc/lpd.conf, and /etc/lpd.perms
+Note that LPRng uses /etc/printcap, @@PREFIX@@/etc/lpd.conf, and 
+@@PREFIX@@/etc/lpd.perms
 
 For further information, have a look at:
   @@PREFIX@@/share/doc/LPRng
+
 also:
-  WWW: http://www.astart.com/lprng.html
+  WWW: http://www.lprng.com/
+
diff --git a/sysutils/LPRng/pkg-plist b/sysutils/LPRng/pkg-plist
index e570d508f244..707801752363 100644
--- a/sysutils/LPRng/pkg-plist
+++ b/sysutils/LPRng/pkg-plist
@@ -8,11 +8,8 @@ bin/lpstat
 etc/lpd.conf.sample
 @unexec if [ -f %D/etc/lpd.perms ]; then cmp -s %D/etc/lpd.perms.sample %D/etc/lpd.perms && rm -f %D/etc/lpd.perms || echo "If you are permanently removing this port, you should do a ``rm ${PKG_PREFIX}/etc/lpd.perms`` to remove config files left." | fmt ; fi
 etc/lpd.perms.sample
-etc/lprng.sh
 etc/printcap.sample
 etc/rc.d/lprng.sh
-lib/liblpr.a
-lib/liblpr.la
 lib/liblpr.so
 lib/liblpr.so.0
 libexec/filters/lpbanner
@@ -22,6 +19,8 @@ libexec/filters/psbanner
 sbin/checkpc
 sbin/lpc
 sbin/lpd
+sbin/lprng_certs
+sbin/lprng_index_certs
 share/doc/LPRng/CHANGES
 share/doc/LPRng/LISA98.ppt
 share/doc/LPRng/LPRng-HOWTO.dsl
@@ -32,5 +31,35 @@ share/doc/LPRng/LPRng-HOWTO.sgml
 share/doc/LPRng/LPRng.jpg
 share/doc/LPRng/LPRngT-L.jpg
 share/doc/LPRng/LPRngT-S.jpg
+share/doc/LPRng/HTML/LPRng.jpg
+share/doc/LPRng/HTML/LPRngT-L.jpg
+share/doc/LPRng/HTML/LPRngT-S.jpg
+share/doc/LPRng/HTML/chooser.png
+share/doc/LPRng/HTML/clients.png 
+share/doc/LPRng/HTML/configfiles.png
+share/doc/LPRng/HTML/filter.png
+share/doc/LPRng/HTML/index.html
+share/doc/LPRng/HTML/network.png
+share/doc/LPRng/HTML/parallel.png
+share/doc/LPRng/HTML/pooling.png
+share/doc/LPRng/HTML/printserver.png
+share/doc/LPRng/HTML/samba.png
+share/doc/LPRng/HTML/serial.png
+share/doc/LPRng/HTML/spooler.png
+share/doc/LPRng/HTML/x_add.png
+share/doc/LPRng/HTML/x_advanced.png
+share/doc/LPRng/HTML/x_checkpc.png
+share/doc/LPRng/HTML/x_edit.png 
+share/doc/LPRng/HTML/x_ifhpfilter.png
+share/doc/LPRng/HTML/x_nup.png
+share/doc/LPRng/HTML/x_open.png
+share/doc/LPRng/HTML/x_printcaps.png
+share/doc/LPRng/HTML/x_reread.png
+share/doc/LPRng/HTML/x_results.png
+share/doc/LPRng/HTML/x_smb.png
+share/doc/LPRng/HTML/x_write.png
+share/doc/LPRng/PDF/Cookbook.pdf
 @dirrm libexec/filters
+@dirrm share/doc/LPRng/HTML
+@dirrm share/doc/LPRng/PDF
 @dirrm share/doc/LPRng