Fix build and plist by updating the locations of a couple of man pages

that changed in version 1.1.21.

According to lofi (who committed the PR for the upgrade) the maintainer
is currently, "very offline," so he agreed that I should just commit
the fixes.

Forgotten by:	MAINTAINER
Untested by:	lofi

4 files changed, 20 insertions, 29 deletions

diff --git a/print/cups-base/files/manpages.mk b/print/cups-base/files/manpages.mk
index 43e19a112605..23d459dc8a37 100644
--- a/print/cups-base/files/manpages.mk
+++ b/print/cups-base/files/manpages.mk
@@ -1,7 +1,7 @@
 MAN1+=	backend.1
+MAN1+=	cups-config.1
 MAN1+=	cupstestppd.1
 MAN1+=	filter.1
-MAN3+=	cups-config.3
 MAN5+=	classes.conf.5
 MAN5+=	cupsd.conf.5
 MAN5+=	mime.convs.5
diff --git a/print/cups-base/files/patch-man-Makefile.common b/print/cups-base/files/patch-man-Makefile.common
index 2c9028eaaeae..cb91a512bef3 100644
--- a/print/cups-base/files/patch-man-Makefile.common
+++ b/print/cups-base/files/patch-man-Makefile.common
@@ -1,8 +1,8 @@
---- man/Makefile.common.orig	Tue Dec 17 13:59:55 2002
-+++ man/Makefile.common	Wed Jan 22 07:25:31 2003
-@@ -28,58 +28,22 @@
- 
+--- man/Makefile.common.orig	Thu May 27 11:51:30 2004
++++ man/Makefile.common	Sun Nov 14 17:14:24 2004
+@@ -29,57 +29,16 @@
  MAN1	=	backend.man \
+ 		cups-config.man \
  		cupstestppd.man \
 -		filter.man \
 -		lp.man \
@@ -13,7 +13,6 @@
 -		lpr.man \
 -		lpstat.man
 +		filter.man
- MAN3	=	cups-config.man
  MAN5	=	classes.conf.man \
  		cupsd.conf.man \
  		mime.convs.man \
@@ -32,6 +31,7 @@
 -		lpc.man
 -
 -CAT1	=	backend.$(CAT1EXT) \
+-		cups-config.$(CAT1EXT) \
 -		cupstestppd.$(CAT1EXT) \
 -		filter.$(CAT1EXT) \
 -		lp.$(CAT1EXT) \
@@ -41,7 +41,6 @@
 -		lprm.$(CAT1EXT) \
 -		lpr.$(CAT1EXT) \
 -		lpstat.$(CAT1EXT)
--CAT3	=	cups-config.$(CAT3EXT)
 -CAT5	=	classes.conf.$(CAT5EXT) \
 -		cupsd.conf.$(CAT5EXT) \
 -		mime.convs.$(CAT5EXT) \
@@ -57,12 +56,8 @@
 -		lpinfo.$(CAT8EXT) \
 -		lpmove.$(CAT8EXT) \
 -		lpc.$(CAT8EXT)
+-
 +		cupsd.man
  
-+CAT1	=
-+CAT3	=
-+CAT5	=
-+CAT8	=
- 
  #
- # End of "$Id: Makefile.common,v 1.3 2002/12/17 18:59:55 swdev Exp $".
+ # End of "$Id: Makefile.common,v 1.5 2004/05/27 18:51:30 mike Exp $".
diff --git a/print/cups-lpr/files/manpages.mk b/print/cups-lpr/files/manpages.mk
index fa6f89285ff8..f88f73cf4f22 100644
--- a/print/cups-lpr/files/manpages.mk
+++ b/print/cups-lpr/files/manpages.mk
@@ -1,4 +1,3 @@
-MAN1+=	cupsaddsmb.1
 MAN1+=	cupstestppd.1
 MAN1+=	lp.1
 MAN1+=	lpoptions.1
@@ -8,6 +7,7 @@ MAN1+=	lpr.1
 MAN1+=	lprm.1
 MAN1+=	lpstat.1
 MAN8+=	accept.8
+MAN8+=	cupsaddsmb.8
 MAN8+=	enable.8
 MAN8+=	lpadmin.8
 MAN8+=	lpc.8
diff --git a/print/cups-lpr/files/patch-man-Makefile.common b/print/cups-lpr/files/patch-man-Makefile.common
index 73cbbca70975..98356fb4785e 100644
--- a/print/cups-lpr/files/patch-man-Makefile.common
+++ b/print/cups-lpr/files/patch-man-Makefile.common
@@ -1,28 +1,28 @@
---- 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/Makefile.common.orig	Thu May 27 11:51:30 2004
++++ man/Makefile.common	Sun Nov 14 17:54:43 2004
+@@ -26,10 +26,7 @@
  # Man pages...
  #
  
 -MAN1	=	backend.man \
-+MAN1	=	cupsaddsmb.man \
- 		cupstestppd.man \
+-		cups-config.man \
+-		cupstestppd.man \
 -		filter.man \
++MAN1	=	cupstestppd.man \
  		lp.man \
  		lpoptions.man \
  		lppasswd.man \
-@@ -36,50 +35,17 @@
+@@ -37,49 +34,13 @@
  		lprm.man \
  		lpr.man \
  		lpstat.man
--MAN3	=	cups-config.man
 -MAN5	=	classes.conf.man \
 -		cupsd.conf.man \
 -		mime.convs.man \
 -		mime.types.man \
 -		printers.conf.man
  MAN8	=	accept.man \
--		cupsaddsmb.man \
+ 		cupsaddsmb.man \
 -		cups-lpd.man \
 -		cups-polld.man \
 -		cupsd.man \
@@ -31,8 +31,9 @@
  		lpinfo.man \
  		lpmove.man \
  		lpc.man
- 
+-
 -CAT1	=	backend.$(CAT1EXT) \
+-		cups-config.$(CAT1EXT) \
 -		cupstestppd.$(CAT1EXT) \
 -		filter.$(CAT1EXT) \
 -		lp.$(CAT1EXT) \
@@ -42,7 +43,6 @@
 -		lprm.$(CAT1EXT) \
 -		lpr.$(CAT1EXT) \
 -		lpstat.$(CAT1EXT)
--CAT3	=	cups-config.$(CAT3EXT)
 -CAT5	=	classes.conf.$(CAT5EXT) \
 -		cupsd.conf.$(CAT5EXT) \
 -		mime.convs.$(CAT5EXT) \
@@ -59,10 +59,6 @@
 -		lpmove.$(CAT8EXT) \
 -		lpc.$(CAT8EXT)
 -
-+CAT1	=
-+CAT3	=
-+CAT5	=
-+CAT8	=
  
  #
- # End of "$Id: Makefile.common,v 1.3 2002/12/17 18:59:55 swdev Exp $".
+ # End of "$Id: Makefile.common,v 1.5 2004/05/27 18:51:30 mike Exp $".