sysutils/LPRng: Update version 3.8.35 => 3.8.C and stage

This version change requires and epoch.  The patch from the PR was
still using :L instead of :tl modifiers, otherwise it was correct.

PR:		145149
Submitted by:	Ports Fury

6 files changed, 80 insertions, 267 deletions

diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 501ea9b8362f..39bec96b2ae6 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -2,117 +2,61 @@
 # $FreeBSD$
 
 PORTNAME=	LPRng
-PORTVERSION=	3.8.35
-PORTREVISION=	1
+PORTVERSION=	3.8.C
+PORTEPOCH=	1
 CATEGORIES=	sysutils print
-MASTER_SITES=	ftp://ftp.lprng.com/pub/%SUBDIR%/ \
-		ftp://ftp.cise.ufl.edu/pub/mirrors/%SUBDIR%/ \
-		ftp://ftp.cs.umn.edu/pub/%SUBDIR%/ \
-		ftp://ftp.informatik.uni-hamburg.de/pub/os/unix/utils/%SUBDIR%/ \
-		ftp://ftp.uni-paderborn.de/pub/unix/printer/%SUBDIR%/
-MASTER_SITE_SUBDIR=	LPRng/LPRng
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Enhanced Printer Spooler
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LICENSE=	ART10 GPLv2
+LICENSE_COMB=	dual
 
-CONFLICTS=	cups-base-1.[2-9]*
+LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
 
+USES=		gmake
+USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-USE_RC_SUBR=	${PORTNAME:tl}
-
-SUB_FILES=	pkg-message pkg-install
-SUB_LIST=	SYSCONFDIR="${SYSCONFDIR}"
-
-PKGDEINSTALL=	${PKGINSTALL}
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	\
-		--with-sbindir=${PREFIX}/sbin \
+CONFIGURE_ARGS=	--with-config_subdir="" \
 		--with-filterdir=${PREFIX}/libexec/filters \
 		--with-filter_path="${PREFIX}/bin:/bin:/usr/bin:${PREFIX}/sbin:/sbin:/usr/sbin" \
 		--with-lpd_conf_path=${SYSCONFDIR}/lpd.conf \
 		--with-lpd_perms_path=${SYSCONFDIR}/lpd.perms \
 		--with-printcap_path=/etc/printcap \
-		--with-ld_library_path="${PREFIX}/lib:/lib:/usr/lib:/${LOCALBASE}/lib" \
-		--enable-gdbm=${LOCALBASE} \
-		--disable-werror
-
-.if defined(PORT_REPLACES_BASE_LPR)
-PREFIX=		/usr
-SYSCONFDIR=	/etc
-.endif
-
-.if defined(SYSCONFDIR)
-CONFIGURE_ARGS+=	--sysconfdir="${SYSCONFDIR}"
-PLIST_SUB+=	CWD="" SYSCONFDIR="${SYSCONFDIR:S,^/,,}"
-.else
-SYSCONFDIR=	${PREFIX}/etc
-PLIST_SUB+=	CWD="@comment " SYSCONFDIR="${SYSCONFDIR:S,^${PREFIX}/,,}"
-.endif
-
-MAN1=	lpf.1 psbanner.1 lp.1 cancel.1 lprng_certs.1 lprng_index_certs.1 \
-	lpstat.1 lpq.1 lpr.1 lprm.1 monitor.1 pclbanner.1 lpbanner.1
-MAN5=	printcap.5 lpd.conf.5 lpd.perms.5
-MAN8=	lpc.8 checkpc.8 lpd.8
-
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DOCS NLS
+		--with-ld_library_path="${PREFIX}/lib:/lib:/usr/lib:/${LOCALBASE}/lib"
+MAKE_ARGS=	INSTALLCONFIGEXAMPLES=""
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	${PORTNAME:tl}
 
-.include <bsd.port.options.mk>
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=			gettext tar:tgz
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
+SUB_FILES=	pkg-message
 
-pre-everything::
-	@${ECHO_MSG} "If you want to replace the default printing system with LPRng, use:"
-	@${ECHO_MSG} "  make PORT_REPLACES_BASE_LPR=yes clean all install"
-	@${ECHO_MSG} " OR"
-	@${ECHO_MSG} "  make CONFIGURE_SCRIPT=STANDARD_configuration clean all install"
-	@if [ "${PREFIX}" = "/usr" -a ! -d /usr/man ] ; then \
-		${ECHO_MSG} "The man pages will be installed in /usr/man." ; \
-		${ECHO_MSG} "You should make a symbolic link /usr/share/man from /usr/man"; \
-		${ECHO_MSG} "   ln -s /usr/share/man /usr/man"; \
-		${ECHO_MSG} "If you do not, you will retain the old FreeBSD man pages."; \
-		${ECHO_MSG} "See the hier(7) man page for details of the FreeBSD file system"; \
-		${ECHO_MSG} "layout.  Configure is not equipped to determine the location of"; \
-		${ECHO_MSG} 'man pages and defaults to $${PREFIX}/man, which is incorrect for FreeBSD.'; \
-	fi
+CONFLICTS=	cups-base-1.[2-9]*
 
-post-patch:
-	@${ECHO} "#! /bin/sh" > ${WRKSRC}/postinstall.freebsd.sh
-	@${REINPLACE_CMD} -e 's,$${INSTALL} $$$$i $${DATADIR}/$$$$i.sample,true &,' \
-		${WRKSRC}/Makefile.in
+OPTIONS_DEFINE=		LIBWRAP NLS
+OPTIONS_DEFAULT=	LIBWRAP
+OPTIONS_SUB=		yes
 
-pre-install: apply-slist
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+LIBWRAP_CONFIGURE_ENABLE=	tcpwrappers
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+NLS_CONFIGURE_ENV=	gt_cv_func_gnugettext1_libc=yes \
+			ac_cv_func_ngettext=yes
+NLS_LDFLAGS=		-lintl
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/lpd.conf ${SYSCONFDIR}/lpd.conf.sample
-	@${INSTALL_DATA} ${WRKSRC}/lpd.perms ${SYSCONFDIR}/lpd.perms.sample
-	@${INSTALL_DATA} ${WRKSRC}/printcap ${SYSCONFDIR}/printcap.sample
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}
-	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}/Reference
-	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}/PrintingCookbook
-.for ext in html pdf ppt ps txt gif jpg png
-	@for i in `${LS} ${WRKSRC}/DOCS | ${GREP} "\.${ext}$$"`; \
-		do ${INSTALL_DATA} ${WRKSRC}/DOCS/$$i ${DOCSDIR}; done
-	@for i in `${LS} ${WRKSRC}/PrintingCookbook/HTML | ${GREP} "\.${ext}$$"`; \
-		do ${INSTALL_DATA} ${WRKSRC}/PrintingCookbook/HTML/$$i ${DOCSDIR}/PrintingCookbook; done;
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+.for i in lpd.perms printcap
+	(cd ${WRKSRC}/conf && $ ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DATADIR}/${i}.sample)
+.endfor
+.for i in lpd.conf
+	(cd ${WRKSRC}/src && $ ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DATADIR}/${i}.sample)
 .endfor
-.endif
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/LPRng/distinfo b/sysutils/LPRng/distinfo
index ea77cdcb1b8e..4f7aecf875d5 100644
--- a/sysutils/LPRng/distinfo
+++ b/sysutils/LPRng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (LPRng-3.8.35.tgz) = c9909a0b94f8611b8d2faeb1199e292a53b74bf7d16c363b810dce25b7623c37
-SIZE (LPRng-3.8.35.tgz) = 12512453
+SHA256 (lprng-3.8.C.tar.gz) = 694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10
+SIZE (lprng-3.8.C.tar.gz) = 865165
diff --git a/sysutils/LPRng/files/patch-src__common__lpd.c b/sysutils/LPRng/files/patch-src__common__lpd.c
new file mode 100644
index 000000000000..d04b67598230
--- /dev/null
+++ b/sysutils/LPRng/files/patch-src__common__lpd.c
@@ -0,0 +1,18 @@
+--- src/common/lpd.c.orig
++++ src/common/lpd.c
+@@ -979,7 +979,6 @@
+ * libwrap/tcp_wrappers:
+ * draht@suse.de, Mon Jan 28 2002
+ */
+-		if( !unix_socket ){
+ 			struct request_info wrap_req;
+ 
+ 			request_init(&wrap_req, RQ_DAEMON, "lpd" , RQ_FILE, newsock, NULL);
+@@ -993,7 +992,6 @@
+ 				close( newsock );
+ 				return;
+ 			}
+-		}
+ #endif
+ 
+ 		pid = Start_worker( "server", Service_connection, &args, newsock );
diff --git a/sysutils/LPRng/files/pkg-install.in b/sysutils/LPRng/files/pkg-install.in
deleted file mode 100644
index 0dde0937c7b1..000000000000
--- a/sysutils/LPRng/files/pkg-install.in
+++ /dev/null
@@ -1,119 +0,0 @@
-#! /bin/sh
-
-prefix=%%PREFIX%%
-sysconfdir=%%SYSCONFDIR%%
-
-case "x$2" in
-
-"xPRE-INSTALL")
-
-	# Preserve original files from being overwritten.
-
-	if [ "x$prefix" = "x/usr" ]; then
-		cd $prefix
-		for i in bin/lp bin/lpq bin/lpr bin/lprm sbin/lpc sbin/lpd \
-			share/man/man1/lp.1.gz share/man/man1/lpq.1.gz \
-			share/man/man1/lpr.1.gz share/man/man1/lprm.1.gz \
-			share/man/man5/printcap.5.gz share/man/man8/lpc.8.gz \
-			share/man/man8/lpd.8.gz ; do
-			cp -p $i $i.orig
-		done
-	fi
-
-	;;
-
-"xPOST-INSTALL")
-
-	cd $sysconfdir
-
-	# Preserve original configuration files from being overwritten.
-	# Restore previously saved configuration if possible.
-
-	if [ "x$sysconfdir" = "x/etc" ]; then
-		for i in lpd.conf lpd.perms printcap; do
-			[ -f $i ] && mv $i $i.orig
-			[ -f $i.saved ] && mv $i.saved $i || cp $i.sample $i
-		done
-	else
-		for i in lpd.conf lpd.perms printcap; do
-			[ -f $i.saved ] && mv $i.saved $i || cp $i.sample $i
-		done
-	fi
-
-	# This is a trick to detect if the user installed a new world at deinstall stage.
-
-	if [ "x$prefix" = "x/usr" ]; then
-		cd $prefix
-		for i in bin/lp bin/lpq bin/lpr bin/lprm sbin/lpc sbin/lpd \
-			share/man/man1/lp.1.gz share/man/man1/lpq.1.gz \
-			share/man/man1/lpr.1.gz share/man/man1/lprm.1.gz \
-			share/man/man5/printcap.5.gz share/man/man8/lpc.8.gz \
-			share/man/man8/lpd.8.gz ; do
-			touch $i.orig
-		done
-	fi
-
-	;;
-
-"xDEINSTALL")
-
-	cd $sysconfdir
-
-	# Remove unchanged files.
-
-	for i in lpd.conf lpd.perms printcap; do
-		cmp -s $i $i.sample && rm -f $i
-	done
-
-	# Remove backup files if installworld overwrited LPRng files.
-
-	if [ "x$prefix" = "x/usr" ]; then
-		cd $prefix
-		for i in bin/lp bin/lpq bin/lpr bin/lprm sbin/lpc sbin/lpd \
-			share/man/man1/lp.1.gz share/man/man1/lpq.1.gz \
-			share/man/man1/lpr.1.gz share/man/man1/lprm.1.gz \
-			share/man/man5/printcap.5.gz share/man/man8/lpc.8.gz \
-			share/man/man8/lpd.8.gz ; do
-			[ $i -nt $i.orig ] && rm $i.orig
-		done
-	fi
-
-	;;
-
-"xPOST-DEINSTALL")
-
-	cd $sysconfdir
-
-	# Save remaining modified files so we can restore them at next install.
-	# Restore original files when LPRng files haven't changed.
-
-	for i in lpd.conf lpd.perms printcap; do
-		if [ "x$sysconfdir" = "x/etc" ]; then
-			if [ -f $i ]; then
-				mv $i $i.saved
-			else
-				[ -f $i.orig ] && mv $i.orig $i
-			fi
-		else
-			[ -f $i ] && mv $i $i.saved
-		fi
-	done
-
-	# Restore backup files.
-
-	if [ "x$prefix" = "x/usr" ]; then
-		cd $prefix
-		for i in bin/lp bin/lpq bin/lpr bin/lprm sbin/lpc sbin/lpd \
-			share/man/man1/lp.1.gz share/man/man1/lpq.1.gz \
-			share/man/man1/lpr.1.gz share/man/man1/lprm.1.gz \
-			share/man/man5/printcap.5.gz share/man/man8/lpc.8.gz \
-			share/man/man8/lpd.8.gz ; do
-			[ -f $i.orig ] && mv $i.orig $i
-		done
-	fi
-
-	;;
-
-esac
-
-exit 0
diff --git a/sysutils/LPRng/pkg-descr b/sysutils/LPRng/pkg-descr
index 05da0ff11dc9..f27cce1dff66 100644
--- a/sysutils/LPRng/pkg-descr
+++ b/sysutils/LPRng/pkg-descr
@@ -8,4 +8,4 @@ diagnostics; multiple printers serving a single queue; client programs
 do not need to run SUID root; greatly enhanced security checks; and a
 greatly improved permission and authorization mechanism.
 
-WWW: http://www.lprng.com/
+WWW: http://lprng.sourceforge.net/
diff --git a/sysutils/LPRng/pkg-plist b/sysutils/LPRng/pkg-plist
index 9115b207f143..12822fe8b37f 100644
--- a/sysutils/LPRng/pkg-plist
+++ b/sysutils/LPRng/pkg-plist
@@ -4,69 +4,39 @@ bin/lpq
 bin/lpr
 bin/lprm
 bin/lpstat
-lib/liblpr.a
-lib/liblpr.la
 libexec/filters/lpbanner
 libexec/filters/lpf
 libexec/filters/pclbanner
 libexec/filters/psbanner
+man/man1/cancel.1.gz
+man/man1/lp.1.gz
+man/man1/lpbanner.1.gz
+man/man1/lpf.1.gz
+man/man1/lpq.1.gz
+man/man1/lpr.1.gz
+man/man1/lprm.1.gz
+man/man1/lprng_certs.1.gz
+man/man1/lprng_index_certs.1.gz
+man/man1/lpstat.1.gz
+man/man1/pclbanner.1.gz
+man/man1/psbanner.1.gz
+man/man5/lpd.conf.5.gz
+man/man5/lpd.perms.5.gz
+man/man5/printcap.5.gz
+man/man8/checkpc.8.gz
+man/man8/lpc.8.gz
+man/man8/lpd.8.gz
 sbin/checkpc
 sbin/lpc
 sbin/lpd
 sbin/lprng_certs
 sbin/lprng_index_certs
-%%NLS%%share/locale/de/LC_MESSAGES/LPRng.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/LPRng.mo
-%%DATADIR%%/lpd.perms.sample
-%%DATADIR%%/lprng.sh.sample
 %%DATADIR%%/lpd.conf.sample
+%%DATADIR%%/lpd.perms.sample
 %%DATADIR%%/printcap.sample
-%%DATADIR%%/postinstall.sample
-%%PORTDOCS%%%%DOCSDIR%%/LISA98.ppt
-%%PORTDOCS%%%%DOCSDIR%%/LPRng-Reference.html
-%%PORTDOCS%%%%DOCSDIR%%/LPRng-Reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/LPRng.jpg
-%%PORTDOCS%%%%DOCSDIR%%/LPRng.png
-%%PORTDOCS%%%%DOCSDIR%%/LPRngT-L.jpg
-%%PORTDOCS%%%%DOCSDIR%%/LPRngT-L.png
-%%PORTDOCS%%%%DOCSDIR%%/LPRngT-S.jpg
-%%PORTDOCS%%%%DOCSDIR%%/LPRngT-S.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/LPRng.jpg
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/LPRngT-L.jpg
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/LPRngT-S.jpg
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/chooser.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/clients.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/configfiles.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/filter.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/index.html
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/network.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/parallel.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/pooling.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/printserver.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/samba.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/serial.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/spooler.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_add.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_advanced.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_checkpc.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_edit.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_ifhpfilter.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_nup.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_open.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_printcaps.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_reread.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_results.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_smb.png
-%%PORTDOCS%%%%DOCSDIR%%/PrintingCookbook/x_write.png
-%%PORTDOCS%%%%DOCSDIR%%/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc1179.txt
-%%PORTDOCS%%%%DOCSDIR%%/y2k.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Reference
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/PrintingCookbook
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/filters
+%%NLS%%share/locale/de/LC_MESSAGES/LPRng.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/LPRng.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/LPRng.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/LPRng.mo
 @dirrm %%DATADIR%%
-%%CWD%%@cwd /
-%%SYSCONFDIR%%/lpd.conf.sample
-%%SYSCONFDIR%%/lpd.perms.sample
-%%SYSCONFDIR%%/printcap.sample
+@dirrm libexec/filters