Update to 2.04 (only released 3 years ago). Unforbid by the new patch-msg

(reviewed by eik@). Reword pkg-descr and add WWW. Set MASTER_SITES to the
author's own site -- SunSite still lists 2.02 as the latest.

6 files changed, 12 insertions, 110 deletions

diff --git a/print/rlpr/Makefile b/print/rlpr/Makefile
index 458123768b6a..44358a0548c8 100644
--- a/print/rlpr/Makefile
+++ b/print/rlpr/Makefile
@@ -6,32 +6,26 @@
 #
 
 PORTNAME=	rlpr
-PORTVERSION=	2.02
-PORTREVISION=	2
+PORTVERSION=	2.04
 CATEGORIES=	print net
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	system/printing
+MASTER_SITES=	ftp://www.truffula.com/pub/
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Send print jobs to lpd servers anywhere on a network
 
-FORBIDDEN=	"Local and remote exploitable buffer overflow (CAN-2004-0393, CAN-2004-0454)"
-
 #LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
 
 GNU_CONFIGURE=	yes
 #CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib -lintl"
+CONFIGURE_ENV=	CPPFLAGS="-I${FILESDIR}"
 CONFIGURE_ARGS=	--disable-nls --without-catgets
+USE_REINPLACE=	yes
 
 post-patch:
 	# Replacing references to /etc/rlprrc to ${PREFIX}/etc/rlprrc
-	@for f in ${WRKSRC}/src/rlprrc.h \
-			`${GREP} -l /etc/rlprrc ${WRKSRC}/man/*.[0-9n]`; do \
-		if test -e $$f.orig; then continue; fi; \
-		${MV} $$f $$f.orig ; \
-		${SED} s%/etc/rlprrc%${PREFIX}/etc/rlprrc%g < $$f.orig > \
-			$$f ; \
-	done
+	${REINPLACE_CMD} -e 's%/etc/rlprrc%${PREFIX}/etc/rlprrc%g' \
+		${WRKSRC}/src/rlprrc.h \
+		`${GREP} -Fl /etc/rlprrc ${WRKSRC}/man/*.[0-9n]`
 
 post-install:
 	# Making the installed binaries suid,\
diff --git a/print/rlpr/distinfo b/print/rlpr/distinfo
index f131f1f051c6..982332bbb51d 100644
--- a/print/rlpr/distinfo
+++ b/print/rlpr/distinfo
@@ -1,2 +1,2 @@
-MD5 (rlpr-2.02.tar.gz) = ea80a4bcc9d3b4d2c9b94b92d11da387
-SIZE (rlpr-2.02.tar.gz) = 153489
+MD5 (rlpr-2.04.tar.gz) = d4560cad31b0f031796a260b6d6b7123
+SIZE (rlpr-2.04.tar.gz) = 158637
diff --git a/print/rlpr/files/patch-aa b/print/rlpr/files/patch-aa
deleted file mode 100644
index 7f365e962f64..000000000000
--- a/print/rlpr/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/rlpq.c.orig	Sun Dec 13 19:21:22 1998
-+++ src/rlpq.c	Sat Apr 10 18:39:54 1999
-@@ -19,2 +19,3 @@
- #include <pwd.h>
-+#include <stdio.h>
- #include <stdlib.h>
---- src/rlprm.c.orig	Sun Dec 13 19:21:30 1998
-+++ src/rlprm.c	Sat Apr 10 18:41:11 1999
-@@ -19,2 +19,3 @@
- #include <pwd.h>
-+#include <stdio.h>
- #include <stdlib.h>
diff --git a/print/rlpr/files/patch-ab b/print/rlpr/files/patch-ab
deleted file mode 100644
index e015e61ac59f..000000000000
--- a/print/rlpr/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/Makefile.in	Sat Sep  4 22:29:16 1999
-+++ src/Makefile.in	Tue Mar 21 23:05:50 2000
-@@ -90,4 +90,4 @@
- LDFLAGS		= -L../lib
--LIBS		= @INTLLIBS@ -lrlpr
--INCLUDES	= -I../intl -I../lib -DLOCALEDIR=\"$(localedir)\"
-+LIBS		= -lrlpr
-+INCLUDES	= -I../lib -DLOCALEDIR=\"$(localedir)\"
- 
---- Makefile.in	Sat Sep  4 22:29:12 1999
-+++ Makefile.in	Tue Mar 21 23:07:50 2000
-@@ -89,3 +89,3 @@
- EXTRA_DIST = INSTALL.generic $(PACKAGE)-$(VERSION).lsm
--SUBDIRS = po intl lib man src
-+SUBDIRS = lib man src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/print/rlpr/files/patch-ac b/print/rlpr/files/patch-ac
deleted file mode 100644
index c0803a738c57..000000000000
--- a/print/rlpr/files/patch-ac
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/rlpq.c	Mon May  3 21:50:22 1999
-+++ src/rlpq.c	Tue Mar 21 23:29:36 2000
-@@ -65,4 +66,6 @@
-     setlocale(LC_ALL, "");
-+#ifdef ENABLE_NLS
-     bindtextdomain(PACKAGE, LOCALEDIR);
-     textdomain(PACKAGE);
-+#endif
- 
---- src/rlpr.c	Sat Sep  4 22:09:36 1999
-+++ src/rlpr.c	Tue Mar 21 23:24:48 2000
-@@ -79,4 +79,6 @@
-     setlocale(LC_ALL, "");
-+#ifdef ENABLE_NLS
-     bindtextdomain(PACKAGE, LOCALEDIR);
-     textdomain(PACKAGE);
-+#endif
- 
---- src/rlprd.c	Mon May  3 21:50:29 1999
-+++ src/rlprd.c	Tue Mar 21 23:31:12 2000
-@@ -75,4 +75,6 @@
-     setlocale(LC_ALL, "");
-+#ifdef ENABLE_NLS
-     bindtextdomain(PACKAGE, LOCALEDIR);
-     textdomain(PACKAGE);
-+#endif
- 
---- src/rlprm.c	Mon May  3 21:50:22 1999
-+++ src/rlprm.c	Tue Mar 21 23:30:22 2000
-@@ -63,4 +64,6 @@
-     setlocale(LC_ALL, "");
-+#ifdef ENABLE_NLS
-     bindtextdomain(PACKAGE, LOCALEDIR);
-     textdomain(PACKAGE);
-+#endif
- 
---- src/intl.h	Mon May  3 21:48:39 1999
-+++ src/intl.h	Wed Mar 22 12:40:02 2000
-@@ -19,7 +19,14 @@
- 
-+#ifdef ENABLE_NLS
- #include <libintl.h>
-+#endif
- #include <locale.h>
- 
-+#ifdef ENABLE_NLS
- #define	_(string)	gettext(string)
- #define	N_(string)	gettext_noop(string)
-+#else
-+#define _(string)	(string)
-+#define N_(string)	(string)
-+#endif
- 
diff --git a/print/rlpr/pkg-descr b/print/rlpr/pkg-descr
index bddc66cae544..a1054cd68bc6 100644
--- a/print/rlpr/pkg-descr
+++ b/print/rlpr/pkg-descr
@@ -2,19 +2,8 @@ Send print jobs to lpd servers anywhere on a network. Does not require
 lpd server to be listed in client's /etc/printcap, and is therefore
 useful for printing from machines one does not have root access on.
 
-This version has been completely redesigned and rewritten from the
-ground up. the source code is oh-so-much-better than before. there are
-also a number of user-visible changes:
-
-        . addition of new rlprm command 
-        . new hooks for internationalization support 
-        . build procedure now uses automake in addition to autoconf 
-        . new --timeout option in case remote end dies 
-        . new --send-data-first option to improve support for buggy lpd's 
-        . now works with hp jetdirect printers 
-	. shiny-new rlpr progress meter, useful for printing over slow links
-        . all printing commands default to `lp' printer now, like bsd 
-
-Gettext  (-lintl) is  ripped  out by  this port  because  it adds  bloat
+Gettext  (-lintl) is  not used by  this port  because  it adds  bloat
 without functionality -- there are  no language files supplied with this
 package yet. May be in future versions.
+
+WWW: http://truffula.com/rlpr/