Update to version 3.4.1

PR:		ports/5485
Submitted by:	Ken Monville <desmo@bandwidth.org>

3 files changed, 62 insertions, 59 deletions

diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index d8a93da208c4..8d9b8c86cd06 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -3,59 +3,38 @@
 # Date created:		2 Apr 1997
 # Whom:			desmo@bandwidth.org
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/18 08:36:41 tg Exp $
+# $Id: Makefile,v 1.2 1997/10/28 22:23:43 jseger Exp $
 #
 
-DISTNAME=	LPRng-3.3.3
+DISTNAME=	LPRng-3.4.1
 CATEGORIES=	sysutils print
-MASTER_SITES=	ftp://ftp.astart.com/pub/LPRng/
+MASTER_SITES=	ftp://ftp.astart.com/pub/LPRng/LPRng/
 EXTRACT_SUFX=	.tgz
+EXTRA_FILES=	LPRng_DOC-3.4.1.tgz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	desmo@bandwidth.org
 
 MAKEFILE=	Makefile.bsd
 GNU_CONFIGURE=	yes
 
-post-patch:
-	@mv ${WRKSRC}/src/common/default.c ${WRKSRC}/src/common/default.c.tmp
-	@${SED} -e "s|@@PREFIX@@|${PREFIX}|g" \
-	    <${WRKSRC}/src/common/default.c.tmp >${WRKSRC}/src/common/default.c
-
 pre-build:
 	(cd ${WRKSRC}/po ; ln -s Makefile ${MAKEFILE})
 
 post-install:
 	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} default)
 	${LDCONFIG} -m ${PREFIX}/lib
-	${INSTALL} -d -g bin -o bin -m 0555 ${PREFIX}/share/doc/LPRng
-	(cd ${WRKSRC} ; ${INSTALL_DATA} \
-		README \
-		README.1st \
-		README.LPRng_to_lpr_spooling \
-		README.accounting \
-		README.authentication \
-		README.banner \
-		README.bouncequeues \
-		README.deskjet \
-		README.install \
-		README.kerberos_authentication \
-		README.logger \
-		README.lp_Malformed_from_address \
-		README.lp_emulation \
-		README.lpd.conf \
-		README.lpd.perms \
-		README.nis \
-		README.pgp_authentication \
-		README.ports \
-		README.printcap \
-		README.routing \
-		README.solaris \
-		README.solaris.newsprint \
-		README.statusdisplays \
-		${PREFIX}/share/doc/LPRng )
 	@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>
diff --git a/sysutils/LPRng/distinfo b/sysutils/LPRng/distinfo
index 7a1b4d60ca5c..298792bc5696 100644
--- a/sysutils/LPRng/distinfo
+++ b/sysutils/LPRng/distinfo
@@ -1 +1,2 @@
-MD5 (LPRng-3.3.3.tgz) = 507c47b34147e7bd0355d7fec1fcf293
+MD5 (LPRng-3.4.1.tgz) = 96f6e323ff13b1ec3fb877968f28d3d7
+MD5 (LPRng_DOC-3.4.1.tgz) = ad297c9bd0b22d5972877251997033ba
diff --git a/sysutils/LPRng/pkg-plist b/sysutils/LPRng/pkg-plist
index 01d527f4e967..713c3504afc5 100644
--- a/sysutils/LPRng/pkg-plist
+++ b/sysutils/LPRng/pkg-plist
@@ -15,7 +15,8 @@ libexec/removeoneline
 libexec/authenticate_pgp
 libexec/setupauth
 lib/liblpr.a
-lib/liblpr.so.3.33
+lib/liblpr.so.3.41
+man/man1/authenticate_pgp.1.gz
 man/man1/cancel.1.gz
 man/man1/lp.1.gz
 man/man1/lpbanner.1.gz
@@ -33,27 +34,49 @@ man/man5/lpd.perms.5.gz
 man/man5/printcap.5.gz
 man/man8/checkpc.8.gz
 man/man8/lpd.8.gz
-share/doc/LPRng/README
-share/doc/LPRng/README.1st
-share/doc/LPRng/README.LPRng_to_lpr_spooling
-share/doc/LPRng/README.accounting
-share/doc/LPRng/README.authentication
-share/doc/LPRng/README.banner
-share/doc/LPRng/README.bouncequeues
-share/doc/LPRng/README.deskjet
-share/doc/LPRng/README.install
-share/doc/LPRng/README.kerberos_authentication
-share/doc/LPRng/README.logger
-share/doc/LPRng/README.lp_Malformed_from_address
-share/doc/LPRng/README.lp_emulation
-share/doc/LPRng/README.lpd.conf
-share/doc/LPRng/README.lpd.perms
-share/doc/LPRng/README.nis
-share/doc/LPRng/README.pgp_authentication
-share/doc/LPRng/README.ports
-share/doc/LPRng/README.printcap
-share/doc/LPRng/README.routing
-share/doc/LPRng/README.solaris
-share/doc/LPRng/README.solaris.newsprint
-share/doc/LPRng/README.statusdisplays
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial.ps
+share/doc/LPRng/LPRng_DOC-3.4.1/Makefile
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial/Tutorial.02.nrf
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial/Makefile
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial/Tutorial.01.nrf
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial/Tutorial.05.nrf
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial/Tutorial.06.nrf
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial/Tutorial.03.nrf
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial/Tutorial.07.nrf
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial/Tutorial.04.nrf
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial/Tutorial.txt
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial/Tutorial.ps
+share/doc/LPRng/LPRng_DOC-3.4.1/README
+share/doc/LPRng/LPRng_DOC-3.4.1/Macros/using.tmac.usenix
+share/doc/LPRng/LPRng_DOC-3.4.1/Macros/tmac.usenix
+share/doc/LPRng/LPRng_DOC-3.4.1/Macros/Makefile
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro.txt
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro.ps
+share/doc/LPRng/LPRng_DOC-3.4.1/LPRng-HOWTO.ps
+share/doc/LPRng/LPRng_DOC-3.4.1/Using_stty.txt
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro/Intro.f4
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro/Intro.f5
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro/Intro.f8
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro/Intro.f8a
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro/Intro.f8b
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro/Intro.f8c
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro/Intro.f9
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro/Intro.nroff
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro/Makefile
+share/doc/LPRng/LPRng_DOC-3.4.1/Intro/Intro.f2
+share/doc/LPRng/LPRng_DOC-3.4.1/LPRng-LISA95.ps
+share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial.txt
+share/doc/LPRng/LPRng_DOC-3.4.1/rfc1179.txt
+share/doc/LPRng/LPRng_DOC-3.4.1/LISA97/slides/P01PrintingLISA97.ppt
+share/doc/LPRng/LPRng_DOC-3.4.1/LISA97/slides/P01PrintingLISA97.ps.2up
+share/doc/LPRng/LPRng_DOC-3.4.1/LISA97/README
+share/doc/LPRng/LPRng_DOC-3.4.1/LISA97/COPYRIGHT
+share/doc/LPRng/LPRng_DOC-3.4.1/README.solaris
+share/doc/LPRng/LPRng_DOC-3.4.1/UPDATE
+@dirrm share/doc/LPRng/LPRng_DOC-3.4.1/Tutorial
+@dirrm share/doc/LPRng/LPRng_DOC-3.4.1/Macros
+@dirrm share/doc/LPRng/LPRng_DOC-3.4.1/Intro
+@dirrm share/doc/LPRng/LPRng_DOC-3.4.1/LISA97/slides
+@dirrm share/doc/LPRng/LPRng_DOC-3.4.1/LISA97
+@dirrm share/doc/LPRng/LPRng_DOC-3.4.1
 @dirrm share/doc/LPRng