Update print/cups to 1.15.1. Changes from version 1.14 include:

======================================================================
* Removed the pstoraster filter (based on GNU Ghostscript 5.50) and now
* provide the raster "driver" and patch file necessary to use the current
* GNU Ghostscript 7.05 release.  Pkgsrc users should install the
* print/ghostscript-esp package.
======================================================================

- Many, many bug fixes.
- Improvements to polling and scheduling of jobs to CUPS and to connected
  printers.
- Updated the CUPS license agreement for the new MacOS and OpenSSL license
  exceptions.
- The jobs.cgi web interface now handles all job operations, allowing the
  administrator to allow "job administrators" or operators to manage jobs
  (but not queues) on the server.
- New SCSI printer backend.
- The PostScript filter now supports 6, 9, and 16-up output, as well as new
  page-border and number-up-layout options.
- Added ConfigFilePerm and LogFilePerm directives.
- The HTML job operation templates now link back to the destination printer
  or class.
- Removed unnecessary fonts and updated the Courier and Symbol fonts to the
  latest versions to better support non-ISOLatin1 text.
- The text filter now always embeds the Courier and Symbol fonts to ensure
  that they contain the full set of glyphs.
- The PostScript image filter (imagetops) now supports printing CMYK images
  using the CMYK colorspace.
- The cupsaddsmb program was updated to use the setdriver command instead of
  addprinter.
- The Allow, Deny, BrowseAllow, BrowseDeny, and BrowseAddress directives
  now support the network interface names "@LOCAL" and "@IF(name)" for
  access control and browsing based on the current interface addresses
  instead of fixed names or IP addresses.
- The cupsaddsmb program now supports alternative CUPS and SAMBA server names.
- The PostScript filter now supports the Orientation comment and rotates the
  page as needed automatically.

11 files changed, 144 insertions, 137 deletions

diff --git a/print/cups/INSTALL b/print/cups/INSTALL
new file mode 100644
index 00000000000..ceb1c7fd36c
--- /dev/null
+++ b/print/cups/INSTALL
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.3 2002/09/18 22:58:46 jlam Exp $
+
+CUPS_USER="@CUPS_USER@"
+CUPS_GROUP="@CUPS_GROUP@"
+
+case ${STAGE} in
+POST-INSTALL)
+	${CHOWN} ${CUPS_USER}:${CUPS_GROUP} ${PKG_PREFIX}/bin/lppasswd
+	${CHMOD} 4755 ${PKG_PREFIX}/bin/lppasswd
+	;;
+esac
diff --git a/print/cups/MESSAGE b/print/cups/MESSAGE
index 643236ab50e..feccfa464ed 100644
--- a/print/cups/MESSAGE
+++ b/print/cups/MESSAGE
@@ -1,5 +1,8 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 23:27:35 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2002/09/18 22:58:46 jlam Exp $
+
+You will need to also install print/ghostscript-esp{,-nox11} if you wish
+to print to non-Postscript printers.
 
 You may want to backup /etc/printcap before starting CUPS for the first
 time, as the CUPS scheduler may overwrite this file with automatically
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 66f2964b73f..33469d93781 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2002/08/25 18:39:41 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2002/09/18 22:58:46 jlam Exp $
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
-PKGREVISION=		1
-BASE_VERS=		1.1.14
-DIST_VERS=		${BASE_VERS}
+BASE_VERS=		1.1.15
+DIST_VERS=		${BASE_VERS}-1
 VERS=			${DIST_VERS:S/-/./g}
 WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
 CATEGORIES=		print
@@ -58,6 +57,8 @@ PLIST_SRC=		${PKGDIR}/PLIST
 #
 CUPS_USER?=		lp
 CUPS_GROUP?=		sys
+FILES_SUBST+=		CUPS_USER=${CUPS_USER}
+FILES_SUBST+=		CUPS_GROUP=${CUPS_GROUP}
 
 BUILD_DEFS+=		CUPS_USER CUPS_GROUP
 
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 8a535f2142d..08522c8d8f7 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/02/18 11:26:15 martti Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/09/18 22:58:47 jlam Exp $
 bin/cancel
 bin/cups-config
 bin/disable
@@ -28,11 +28,12 @@ lib/libcupsimage.a
 lib/libcupsimage.la
 lib/libcupsimage.so
 lib/libcupsimage.so.2
-lib/libcupsimage.so.2.0
+lib/libcupsimage.so.2.1
 libexec/cups/backend/http
 libexec/cups/backend/ipp
 libexec/cups/backend/lpd
 libexec/cups/backend/parallel
+libexec/cups/backend/scsi
 libexec/cups/backend/serial
 libexec/cups/backend/socket
 libexec/cups/backend/usb
@@ -47,7 +48,6 @@ libexec/cups/filter/imagetops
 libexec/cups/filter/imagetoraster
 libexec/cups/filter/pdftops
 libexec/cups/filter/pstops
-libexec/cups/filter/pstoraster
 libexec/cups/filter/rastertodymo
 libexec/cups/filter/rastertoepson
 libexec/cups/filter/rastertohp
@@ -80,6 +80,62 @@ man/cat8/lpc.0
 man/cat8/lpinfo.0
 man/cat8/lpmove.0
 man/cat8/reject.0
+man/fr/cat1/backend.0
+man/fr/cat1/cancel.0
+man/fr/cat1/filter.0
+man/fr/cat1/lp.0
+man/fr/cat1/lpoptions.0
+man/fr/cat1/lppasswd.0
+man/fr/cat1/lpq.0
+man/fr/cat1/lpr.0
+man/fr/cat1/lprm.0
+man/fr/cat1/lpstat.0
+man/fr/cat3/cups-config.0
+man/fr/cat5/classes.conf.0
+man/fr/cat5/cupsd.conf.0
+man/fr/cat5/mime.convs.0
+man/fr/cat5/mime.types.0
+man/fr/cat5/printers.conf.0
+man/fr/cat8/accept.0
+man/fr/cat8/cups-lpd.0
+man/fr/cat8/cups-polld.0
+man/fr/cat8/cupsaddsmb.0
+man/fr/cat8/cupsd.0
+man/fr/cat8/disable.0
+man/fr/cat8/enable.0
+man/fr/cat8/lpadmin.0
+man/fr/cat8/lpc.0
+man/fr/cat8/lpinfo.0
+man/fr/cat8/lpmove.0
+man/fr/cat8/reject.0
+man/fr/man1/backend.1
+man/fr/man1/cancel.1
+man/fr/man1/filter.1
+man/fr/man1/lp.1
+man/fr/man1/lpoptions.1
+man/fr/man1/lppasswd.1
+man/fr/man1/lpq.1
+man/fr/man1/lpr.1
+man/fr/man1/lprm.1
+man/fr/man1/lpstat.1
+man/fr/man3/cups-config.3
+man/fr/man5/classes.conf.5
+man/fr/man5/cupsd.conf.5
+man/fr/man5/mime.convs.5
+man/fr/man5/mime.types.5
+man/fr/man5/printers.conf.5
+man/fr/man8/accept.8
+man/fr/man8/cups-lpd.8
+man/fr/man8/cups-polld.8
+man/fr/man8/cupsaddsmb.8
+man/fr/man8/cupsd.8
+man/fr/man8/disable.8
+man/fr/man8/enable.8
+man/fr/man8/lpadmin.8
+man/fr/man8/lpc.8
+man/fr/man8/lpinfo.8
+man/fr/man8/lpmove.8
+man/fr/man8/reject.8
 man/man1/backend.1
 man/man1/cancel.1
 man/man1/filter.1
@@ -151,49 +207,10 @@ share/cups/charsets/windows-874
 share/cups/data/HPGLprolog
 share/cups/data/psglyphs
 share/cups/data/testprint.ps
-share/cups/fonts/AvantGarde-Book
-share/cups/fonts/AvantGarde-BookOblique
-share/cups/fonts/AvantGarde-Demi
-share/cups/fonts/AvantGarde-DemiOblique
-share/cups/fonts/Bookman-Demi
-share/cups/fonts/Bookman-DemiItalic
-share/cups/fonts/Bookman-Light
-share/cups/fonts/Bookman-LightItalic
-share/cups/fonts/Charter-Bold
-share/cups/fonts/Charter-BoldItalic
-share/cups/fonts/Charter-Italic
-share/cups/fonts/Charter-Roman
-share/cups/fonts/Courier
 share/cups/fonts/Courier-Bold
 share/cups/fonts/Courier-BoldOblique
 share/cups/fonts/Courier-Oblique
-share/cups/fonts/Helvetica
-share/cups/fonts/Helvetica-Bold
-share/cups/fonts/Helvetica-BoldOblique
-share/cups/fonts/Helvetica-Narrow
-share/cups/fonts/Helvetica-Narrow-Bold
-share/cups/fonts/Helvetica-Narrow-BoldOblique
-share/cups/fonts/Helvetica-Narrow-Oblique
-share/cups/fonts/Helvetica-Oblique
-share/cups/fonts/NewCenturySchlbk-Bold
-share/cups/fonts/NewCenturySchlbk-BoldItalic
-share/cups/fonts/NewCenturySchlbk-Italic
-share/cups/fonts/NewCenturySchlbk-Roman
-share/cups/fonts/Palatino-Bold
-share/cups/fonts/Palatino-BoldItalic
-share/cups/fonts/Palatino-Italic
-share/cups/fonts/Palatino-Roman
 share/cups/fonts/Symbol
-share/cups/fonts/Times-Bold
-share/cups/fonts/Times-BoldItalic
-share/cups/fonts/Times-Italic
-share/cups/fonts/Times-Roman
-share/cups/fonts/Utopia-Bold
-share/cups/fonts/Utopia-BoldItalic
-share/cups/fonts/Utopia-Italic
-share/cups/fonts/Utopia-Regular
-share/cups/fonts/ZapfChancery-MediumItalic
-share/cups/fonts/ZapfDingbats
 share/cups/model/deskjet.ppd
 share/cups/model/deskjet2.ppd
 share/cups/model/dymo.ppd
@@ -206,44 +223,6 @@ share/cups/model/stcolor.ppd
 share/cups/model/stcolor2.ppd
 share/cups/model/stphoto.ppd
 share/cups/model/stphoto2.ppd
-share/cups/pstoraster/Fontmap
-share/cups/pstoraster/gs_btokn.ps
-share/cups/pstoraster/gs_ccfnt.ps
-share/cups/pstoraster/gs_cff.ps
-share/cups/pstoraster/gs_cidfn.ps
-share/cups/pstoraster/gs_cmap.ps
-share/cups/pstoraster/gs_cmdl.ps
-share/cups/pstoraster/gs_dbt_e.ps
-share/cups/pstoraster/gs_diskf.ps
-share/cups/pstoraster/gs_dpnxt.ps
-share/cups/pstoraster/gs_dps.ps
-share/cups/pstoraster/gs_dps1.ps
-share/cups/pstoraster/gs_dps2.ps
-share/cups/pstoraster/gs_epsf.ps
-share/cups/pstoraster/gs_fform.ps
-share/cups/pstoraster/gs_fonts.ps
-share/cups/pstoraster/gs_init.ps
-share/cups/pstoraster/gs_iso_e.ps
-share/cups/pstoraster/gs_kanji.ps
-share/cups/pstoraster/gs_ksb_e.ps
-share/cups/pstoraster/gs_lev2.ps
-share/cups/pstoraster/gs_ll3.ps
-share/cups/pstoraster/gs_mex_e.ps
-share/cups/pstoraster/gs_mro_e.ps
-share/cups/pstoraster/gs_pfile.ps
-share/cups/pstoraster/gs_res.ps
-share/cups/pstoraster/gs_setpd.ps
-share/cups/pstoraster/gs_statd.ps
-share/cups/pstoraster/gs_std_e.ps
-share/cups/pstoraster/gs_sym_e.ps
-share/cups/pstoraster/gs_ttf.ps
-share/cups/pstoraster/gs_typ32.ps
-share/cups/pstoraster/gs_typ42.ps
-share/cups/pstoraster/gs_type1.ps
-share/cups/pstoraster/gs_wan_e.ps
-share/cups/pstoraster/gs_wl1_e.ps
-share/cups/pstoraster/gs_wl2_e.ps
-share/cups/pstoraster/gs_wl5_e.ps
 share/cups/templates/add-class.tmpl
 share/cups/templates/add-printer.tmpl
 share/cups/templates/admin-op.tmpl
@@ -265,6 +244,7 @@ share/cups/templates/error.tmpl
 share/cups/templates/header.tmpl
 share/cups/templates/job-cancel.tmpl
 share/cups/templates/job-hold.tmpl
+share/cups/templates/job-op.tmpl
 share/cups/templates/job-release.tmpl
 share/cups/templates/job-restart.tmpl
 share/cups/templates/jobs.tmpl
@@ -281,6 +261,7 @@ share/cups/templates/printer-configured.tmpl
 share/cups/templates/printer-confirm.tmpl
 share/cups/templates/printer-deleted.tmpl
 share/cups/templates/printer-modified.tmpl
+share/cups/templates/printer-purge.tmpl
 share/cups/templates/printer-reject.tmpl
 share/cups/templates/printer-start.tmpl
 share/cups/templates/printer-stop.tmpl
@@ -357,6 +338,8 @@ share/doc/html/cups/sum.html
 share/doc/html/cups/sum.pdf
 share/doc/html/cups/svd.html
 share/doc/html/cups/svd.pdf
+share/doc/html/cups/translation.html
+share/doc/html/cups/translation.pdf
 share/examples/cups/classes.conf
 share/examples/cups/client.conf
 share/examples/cups/cupsd.conf
@@ -388,13 +371,21 @@ share/locale/zh_CN/cups_zh_CN
 @dirrm share/doc/html/cups
 @dirrm share/doc/cups
 @dirrm share/cups/templates
-@dirrm share/cups/pstoraster
 @dirrm share/cups/model
 @dirrm share/cups/fonts
 @dirrm share/cups/data
 @dirrm share/cups/charsets
 @dirrm share/cups/banners
 @dirrm share/cups
+@unexec ${RMDIR} %D/man/fr/man8 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/fr/man5 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/fr/man3 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/fr/man1 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/fr/cat8 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/fr/cat5 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/fr/cat3 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/fr/cat1 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/fr 2>/dev/null || ${TRUE}
 @dirrm libexec/cups/filter
 @dirrm libexec/cups/daemon
 @dirrm libexec/cups/cgi-bin
diff --git a/print/cups/distinfo b/print/cups/distinfo
index f279fed1741..930a3030c70 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.15 2002/08/25 18:39:42 jlam Exp $
+$NetBSD: distinfo,v 1.16 2002/09/18 22:58:47 jlam Exp $
 
-SHA1 (cups-1.1.14-source.tar.bz2) = b1a940af5f27cebb8bef340aa6a3552c887ad67d
-Size (cups-1.1.14-source.tar.bz2) = 5408714 bytes
-SHA1 (patch-aa) = e740b0ed9292f72c1161de8b3e98cf7ae260f916
-SHA1 (patch-ab) = 72eca08a8198cc94f817bdb4435e43e637886587
-SHA1 (patch-ag) = df2c471d9dd013017afdef80a41ea2b2e5bdca27
-SHA1 (patch-ah) = a7cdf225c7256c3277559d5bd2923df74ee3d26e
+SHA1 (cups-1.1.15-1-source.tar.bz2) = 1c277b0269476353211e6a60eb2d7a5518879904
+Size (cups-1.1.15-1-source.tar.bz2) = 2962392 bytes
+SHA1 (patch-ab) = 00d438f297bee64411869ab605fc07fe6380f25d
+SHA1 (patch-ag) = f7138afc017694db9a5c74d47b0c8cf109aec459
+SHA1 (patch-ai) = b2d4d3d8d916c0ef3c22b93fe3b93a7d11f77632
diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh
index 4aa27b87a03..84eae65cad9 100644
--- a/print/cups/files/cupsd.sh
+++ b/print/cups/files/cupsd.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: cupsd.sh,v 1.10 2002/03/20 22:46:58 jlam Exp $
+# $NetBSD: cupsd.sh,v 1.11 2002/09/18 22:58:47 jlam Exp $
 #
 # Common UNIX Printing System daemon
 #
@@ -21,6 +21,7 @@ extra_commands="reload"
 if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
+	eval [ -z "\$${rcvar}" ] && eval ${rcvar}=NO
 	run_rc_command "$1"
 else
 	@ECHO@ -n " ${name}"
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
deleted file mode 100644
index c2b5f9871dc..00000000000
--- a/print/cups/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2002/08/25 18:39:42 jlam Exp $
-
---- scheduler/main.c.orig	Wed Feb 13 12:21:36 2002
-+++ scheduler/main.c
-@@ -476,9 +476,9 @@
-     * Update the browse list as needed...
-     */
- 
--    if (Browsing)
-+    if (Browsing && BrowseProtocols)
-     {
--      if (FD_ISSET(BrowseSocket, &input))
-+      if (BrowseSocket >= 0 && FD_ISSET(BrowseSocket, &input))
-         UpdateCUPSBrowse();
- 
-       if (PollPipe >= 0 && FD_ISSET(PollPipe, &input))
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index 4b09dd7d832..5674bcb30f4 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.14 2002/02/18 11:26:16 martti Exp $
+$NetBSD: patch-ab,v 1.15 2002/09/18 22:58:47 jlam Exp $
 
---- Makefile.orig	Tue Feb 12 20:05:36 2002
-+++ Makefile	Mon Feb 18 11:44:24 2002
-@@ -61,8 +61,6 @@
+--- Makefile.orig	Tue Apr 23 10:49:34 2002
++++ Makefile
+@@ -72,8 +72,6 @@ install:	installhdrs
  		echo Installing in $$dir... ;\
  		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
  	done
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.14 2002/02/18 11:26:16 martti Exp $
  	echo Installing in data...
  	(cd data; $(MAKE) $(MFLAGS) install)
  	echo Installing in doc...
-@@ -78,30 +76,6 @@
+@@ -89,30 +87,6 @@ install:	installhdrs
  	echo Installing cups-config script...
  	$(INSTALL_DIR) $(BINDIR)
  	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.14 2002/02/18 11:26:16 martti Exp $
 -	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.sh; \
+-			$(INSTALL_SCRIPT) cups.sh $(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; \
@@ -40,5 +40,5 @@ $NetBSD: patch-ab,v 1.14 2002/02/18 11:26:16 martti Exp $
 -		fi \
 -	fi
  
- 
  #
+ # Install source and header files...
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
index d6f767d9524..3ea74d1e582 100644
--- a/print/cups/patches/patch-ag
+++ b/print/cups/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.11 2002/01/31 17:51:27 jlam Exp $
+$NetBSD: patch-ag,v 1.12 2002/09/18 22:58:49 jlam Exp $
 
---- filter/Makefile.orig	Wed Jan 23 17:30:42 2002
+--- filter/Makefile.orig	Mon May 13 18:14:28 2002
 +++ filter/Makefile
-@@ -142,7 +142,7 @@
+@@ -154,7 +154,7 @@ libcupsimage_s.a:	$(IMAGEOBJS) ../Makede
  
  libcupsimage.la:       $(IMAGEOBJS) ../Makedefs
  	echo Linking $@...
 -	$(DSO) -o $(DSOFLAGS) $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
 +	$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
- 		-rpath $(LIBDIR) -version-info 2:0
+ 		-rpath $(LIBDIR) -version-info 2:1
  
  
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
deleted file mode 100644
index 4e066f4604a..00000000000
--- a/print/cups/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.12 2001/12/10 07:41:24 jmc Exp $
-
---- pstoraster/genarch.c.orig	Wed Mar  8 23:14:26 2000
-+++ pstoraster/genarch.c	Mon Dec 10 06:28:12 2001
-@@ -154,7 +154,11 @@
-     /* Some machines can't handle a variable shift by */
-     /* the full width of a long. */
-     fprintf(f, "#define arch_can_shift_full_long %d\n",
-+#if defined(__NetBSD__) && defined(__powerpc__)
-+	    (um1 >> (lwidth / 2)) >> (lwidth / 2) == 0);
-+#else
- 	    um1 >> lwidth == 0);
-+#endif
- 
- /* ---------------- Done. ---------------- */
- 
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
new file mode 100644
index 00000000000..6c9ecbfcd60
--- /dev/null
+++ b/print/cups/patches/patch-ai
@@ -0,0 +1,31 @@
+$NetBSD: patch-ai,v 1.12 2002/09/18 22:58:49 jlam Exp $
+
+--- man/Makefile.orig	Mon Sep 16 14:35:20 2002
++++ man/Makefile
+@@ -40,7 +40,7 @@ LANGDIRS =	fr
+ all:	$(CAT1) $(CAT3) $(CAT5) $(CAT8)
+ 	for dir in $(LANGDIRS); do \
+ 		echo "Making all in man/$$dir..."; \
+-		(cd $$dir; make all); \
++		(cd $$dir; $(MAKE) $(MFLAGS) all); \
+ 	done
+ 
+ 
+@@ -52,7 +52,7 @@ clean:
+ 	$(RM) $(CAT1) $(CAT3) $(CAT5) $(CAT8)
+ 	for dir in $(LANGDIRS); do \
+ 		echo "Cleaning all in man/$$dir..."; \
+-		(cd $$dir; make clean); \
++		(cd $$dir; $(MAKE) $(MFLAGS) clean); \
+ 	done
+ 
+ 
+@@ -114,7 +114,7 @@ install:	all
+ 	$(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+ 	for dir in $(LANGDIRS); do \
+ 		echo "Installing all in man/$$dir..."; \
+-		(cd $$dir; make install); \
++		(cd $$dir; $(MAKE) $(MFLAGS) install); \
+ 	done
+ 
+