5 files changed, 22 insertions, 16 deletions

diff --git a/print/cups-lpr/Makefile b/print/cups-lpr/Makefile
index 6d47ef0bba97..aec4c29becbe 100644
--- a/print/cups-lpr/Makefile
+++ b/print/cups-lpr/Makefile
@@ -17,11 +17,20 @@ MASTER_SITES=	${CUPS_MASTER_SITES}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The CUPS BSD and system V compatibility binaries (lp* commands)
 
+USE_REINPLACE=	yes
+
+MANLANG=	"" fr
+
+post-patch:
+	@${REINPLACE_CMD} -e '/SILENT/d' \
+		${WRKSRC}/Makedefs.in
+	@${REINPLACE_CMD} -e '/LN/d' \
+		${WRKSRC}/man/Makefile ${WRKSRC}/man/fr/Makefile
+
 post-install:
 	${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete
 	${FIND} ${PREFIX}/man/fr/cat* -type l -name '*.0' -delete
 
-MANLANG=	"" fr
 
 .include "${.CURDIR}/../../print/cups/Makefile.common"
 .include <bsd.port.pre.mk>
diff --git a/print/cups-lpr/distinfo b/print/cups-lpr/distinfo
deleted file mode 100644
index 7c4c9f612542..000000000000
--- a/print/cups-lpr/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cups-1.1.18-source.tar.bz2) = 4a8a423a8268d088bffa19f6515883a7
diff --git a/print/cups-lpr/files/patch-Makefile b/print/cups-lpr/files/patch-Makefile
index 133708751f6d..bb32b26ef5e5 100644
--- a/print/cups-lpr/files/patch-Makefile
+++ b/print/cups-lpr/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Dec 17 13:56:25 2002
-+++ Makefile	Wed Jan 22 08:02:38 2003
+--- Makefile.orig	Fri Mar  7 01:36:00 2003
++++ Makefile	Tue Jun 10 22:24:03 2003
 @@ -28,8 +28,7 @@
  # Directories to make...
  #
@@ -19,7 +19,7 @@
  		echo Making all in $$dir... ;\
  		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
  	done
-@@ -67,104 +66,11 @@
+@@ -67,103 +66,11 @@
  # Install object and target files...
  #
  
@@ -62,7 +62,7 @@
 -	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
 -		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
 -		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
--			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+-			$(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \
 -			$(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
 -			$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
 -			$(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
@@ -121,7 +121,6 @@
 -
 -tardist:
 -	epm $(EPMFLAGS) -f tardist cups
--
- #
- # End of "$Id: Makefile,v 1.47 2002/12/17 18:56:25 swdev Exp $".
+ 
  #
+ # End of "$Id: Makefile,v 1.48 2003/03/06 16:36:00 mike Exp $".
diff --git a/print/cups-lpr/files/patch-man-Makefile.common b/print/cups-lpr/files/patch-man-Makefile.common
index b160843f0ed0..73cbbca70975 100644
--- a/print/cups-lpr/files/patch-man-Makefile.common
+++ b/print/cups-lpr/files/patch-man-Makefile.common
@@ -1,14 +1,13 @@
---- man/Makefile.common.orig	Tue Dec 17 13:59:55 2002
-+++ man/Makefile.common	Wed Jan 22 07:38:08 2003
+--- man/Makefile.common.orig	Wed Dec 18 03:59:55 2002
++++ man/Makefile.common	Tue Jun 10 22:32:41 2003
 @@ -26,9 +26,8 @@
  # Man pages...
  #
  
 -MAN1	=	backend.man \
--		cupstestppd.man \
++MAN1	=	cupsaddsmb.man \
+ 		cupstestppd.man \
 -		filter.man \
-+MAN1	=	cupsaddsmb.man\
-+		cupstestppd.man\
  		lp.man \
  		lpoptions.man \
  		lppasswd.man \
diff --git a/print/cups-lpr/pkg-plist b/print/cups-lpr/pkg-plist
index 310bf8bd6315..71a869e594ee 100644
--- a/print/cups-lpr/pkg-plist
+++ b/print/cups-lpr/pkg-plist
@@ -1,4 +1,5 @@
 bin/cancel
+bin/cupstestppd
 bin/disable
 bin/enable
 bin/lp
@@ -9,10 +10,9 @@ bin/lpr
 bin/lprm
 bin/lpstat
 sbin/accept
-sbin/reject
 sbin/cupsaddsmb
-sbin/cupstestppd
 sbin/lpadmin
 sbin/lpc
 sbin/lpinfo
 sbin/lpmove
+sbin/reject