4 files changed, 83 insertions, 69 deletions

diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 8d9b8c86cd06..ab95ad600964 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -1,30 +1,27 @@
 # New ports collection makefile for:	LPRng
-# Version required:	3.3.3
+# Version required:	3.5.1
 # Date created:		2 Apr 1997
 # Whom:			desmo@bandwidth.org
 #
-# $Id: Makefile,v 1.2 1997/10/28 22:23:43 jseger Exp $
+# $Id: Makefile,v 1.3 1998/01/22 08:19:36 fenner Exp $
 #
 
-DISTNAME=	LPRng-3.4.1
+DISTNAME=	LPRng-3.5.1
 CATEGORIES=	sysutils print
 MASTER_SITES=	ftp://ftp.astart.com/pub/LPRng/LPRng/
 EXTRACT_SUFX=	.tgz
-EXTRA_FILES=	LPRng_DOC-3.4.1.tgz
+EXTRA_FILES=	LPRng_DOC-3.5.1.tgz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	desmo@bandwidth.org
 
 MAKEFILE=	Makefile.bsd
-GNU_CONFIGURE=	yes
-
-pre-build:
-	(cd ${WRKSRC}/po ; ln -s Makefile ${MAKEFILE})
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-lpddir=/usr/local/sbin
 
 post-install:
 	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} default)
-	${LDCONFIG} -m ${PREFIX}/lib
 	@cat ${FILESDIR}/lprng.sh | \
 		${SED} -e "s|@@PREFIX@@|${PREFIX}|g" > ${PREFIX}/etc/rc.d/lprng.sh
 	@chmod +x ${PREFIX}/etc/rc.d/lprng.sh
diff --git a/sysutils/LPRng/distinfo b/sysutils/LPRng/distinfo
index 298792bc5696..a5892e3b0417 100644
--- a/sysutils/LPRng/distinfo
+++ b/sysutils/LPRng/distinfo
@@ -1,2 +1,2 @@
-MD5 (LPRng-3.4.1.tgz) = 96f6e323ff13b1ec3fb877968f28d3d7
-MD5 (LPRng_DOC-3.4.1.tgz) = ad297c9bd0b22d5972877251997033ba
+MD5 (LPRng-3.5.1.tgz) = f08ae8b87d0cdc4091d8a2e3e61831b2
+MD5 (LPRng_DOC-3.5.1.tgz) = 608f6718771cfa6ac80ac8126bd62be9
diff --git a/sysutils/LPRng/pkg-message b/sysutils/LPRng/pkg-message
index 8c97395b5d10..b0a426cc02c9 100644
--- a/sysutils/LPRng/pkg-message
+++ b/sysutils/LPRng/pkg-message
@@ -4,7 +4,7 @@ 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
 - reboot or kill the old lpd (`killall lpd') and
-  start the new one (`/usr/local/libexec/lpd')
+  start the new one (`/usr/local/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
diff --git a/sysutils/LPRng/pkg-plist b/sysutils/LPRng/pkg-plist
index 713c3504afc5..def6837c02bd 100644
--- a/sysutils/LPRng/pkg-plist
+++ b/sysutils/LPRng/pkg-plist
@@ -2,20 +2,15 @@ bin/lpq
 bin/lprm
 bin/lpr
 bin/lpc
+sbin/lpd
+sbin/lpf
+sbin/lpbanner
 bin/checkpc
 bin/lpraccnt
-etc/lpd.perms
-etc/lpd.conf
-etc/rc.d/lprng.sh
-libexec/lpd
-libexec/lpf
-libexec/lpbanner
-libexec/readfilecount
-libexec/removeoneline
-libexec/authenticate_pgp
-libexec/setupauth
-lib/liblpr.a
-lib/liblpr.so.3.41
+sbin/readfilecount
+sbin/removeoneline
+sbin/authenticate_pgp
+sbin/setupauth
 man/man1/authenticate_pgp.1.gz
 man/man1/cancel.1.gz
 man/man1/lp.1.gz
@@ -34,49 +29,71 @@ man/man5/lpd.perms.5.gz
 man/man5/printcap.5.gz
 man/man8/checkpc.8.gz
 man/man8/lpd.8.gz
-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
+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
+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
 @dirrm share/doc/LPRng