Common UNIX Printing System, a IPP 1.0 implementation.

27 files changed, 1061 insertions, 0 deletions

diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
new file mode 100644
index 00000000000..e1b98e8f16c
--- /dev/null
+++ b/print/cups/patches/patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- Makedefs.in.orig	Fri Oct 22 13:37:34 1999
++++ Makedefs.in	Sun Nov 28 21:09:21 1999
+@@ -65,11 +65,11 @@
+ #
+ 
+ ARFLAGS	=	crvs
+-CFLAGS	=	@CFLAGS@ $(OPTIM) -I.. $(OPTIONS)
++CFLAGS	=	@CPPFLAGS@ @CFLAGS@ $(OPTIM) -I.. $(OPTIONS)
+ DSOLIBS	=	@DSOLIBS@
+ IMGLIBS	=	@IMGLIBS@ -lm
+ LDFLAGS	=	@LDFLAGS@ $(OPTIM)
+-LIBS	=	-L../cups -lcups $(NETLIBS) @LIBS@
++LIBS	=	../cups/libcups.la $(NETLIBS) @LIBS@
+ NETLIBS	=	@NETLIBS@
+ OPTIM	=	@OPTIM@
+ OPTIONS	=
+@@ -111,6 +111,9 @@
+ 
+ BINDIR		=	@bindir@
+ DATADIR		=	@CUPS_DATADIR@
++DOCDIR		=	@CUPS_DOCDIR@
++CONFDIR		=	@CUPS_CONFDIR@
++EXECDIR		=	@CUPS_EXECDIR@
+ INCLUDEDIR	=	$(includedir)
+ LIBDIR		=	$(libdir)
+ LOCALEDIR	= 	@CUPS_LOCALEDIR@
+@@ -123,10 +126,13 @@
+ #
+ 
+ .SILENT:
+-.SUFFIXES:	.a .c .gz .h .o .z .1 .5 .8
++.SUFFIXES:	.a .c .gz .h .lo .o .z .1 .5 .8
+ .c.o:
+ 	echo Compiling $<...
+ 	$(CC) $(CFLAGS) -c $<
++.c.lo:
++	echo Compiling $<...
++	$(LIBTOOL) $(CC) $(CFLAGS) -c $<
+ .1.z .5.z .8.z .1.gz .5.gz .8.gz:
+ 	echo Formatting $<...
+ 	$(NROFF) -man $< >t
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
new file mode 100644
index 00000000000..c674dd5738e
--- /dev/null
+++ b/print/cups/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- Makefile.orig	Mon Jun 21 14:59:04 1999
++++ Makefile	Sun Nov 28 21:06:28 1999
+@@ -28,7 +28,7 @@
+ # Directories to make...
+ #
+ 
+-DIRS	=	cups backend berkeley cgi-bin filter man pstoraster \
++DIRS	=	cups backend berkeley cgi-bin filter locale man pstoraster \
+ 		scheduler systemv
+ 
+ #
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
new file mode 100644
index 00000000000..f4821961361
--- /dev/null
+++ b/print/cups/patches/patch-ac
@@ -0,0 +1,73 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- backend/Makefile.orig	Tue Oct 12 14:19:29 1999
++++ backend/Makefile	Sun Nov 28 21:06:28 1999
+@@ -45,10 +45,10 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(SERVERROOT)/backend
+-	$(CP) $(TARGETS) $(SERVERROOT)/backend
+-	-$(LN) ipp $(SERVERROOT)/backend/http
+-	$(CHMOD) u+s $(SERVERROOT)/backend/lpd
++	-$(BSD_INSTALL_PROGRAM_DIR) $(EXECDIR)/backend
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) $(TARGETS) $(EXECDIR)/backend
++	-$(LN) ipp $(EXECDIR)/backend/http
++	$(CHMOD) u+s $(EXECDIR)/backend/lpd
+ 
+ #
+ # betest
+@@ -56,7 +56,7 @@
+ 
+ betest:	betest.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o betest betest.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o betest betest.o $(LIBS)
+ 
+ betest.o:	../cups/string.h ../Makedefs
+ 
+@@ -66,7 +66,7 @@
+ 
+ ipp:	ipp.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS)
+ 	-$(LN) ipp http
+ 
+ ipp.o:	../cups/cups.h ../Makedefs
+@@ -77,7 +77,7 @@
+ 
+ lpd:	lpd.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS)
+ 
+ lpd.o:	../cups/cups.h ../Makedefs
+ 
+@@ -87,7 +87,7 @@
+ 
+ parallel:	parallel.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o parallel parallel.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o parallel parallel.o $(LIBS)
+ 
+ parallel.o:	../cups/cups.h ../Makedefs
+ 
+@@ -97,7 +97,7 @@
+ 
+ serial:	serial.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o serial serial.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o serial serial.o $(LIBS)
+ 
+ serial.o:	../cups/cups.h ../Makedefs
+ 
+@@ -107,7 +107,7 @@
+ 
+ socket:	socket.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o socket socket.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o socket socket.o $(LIBS)
+ 
+ socket.o:	../cups/cups.h ../Makedefs
+ 
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad
new file mode 100644
index 00000000000..a749a370a33
--- /dev/null
+++ b/print/cups/patches/patch-ad
@@ -0,0 +1,55 @@
+$NetBSD: patch-ad,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- berkeley/Makefile.orig	Tue Jul 13 08:39:37 1999
++++ berkeley/Makefile	Sun Nov 28 21:06:28 1999
+@@ -45,10 +45,10 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(BINDIR)
+-	-$(MKDIR) $(SBINDIR)
+-	$(CP) lpq lpr lprm $(BINDIR)
+-	$(CP) lpc $(SBINDIR)
++	-$(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
++	-$(BSD_INSTALL_PROGRAM_DIR) $(SBINDIR)
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) lpq lpr lprm $(BINDIR)
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) lpc $(SBINDIR)
+ 
+ #
+ # lpc
+@@ -56,7 +56,7 @@
+ 
+ lpc:	lpc.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
+ 
+ lpc.o:	../cups/cups.h ../Makedefs
+ 
+@@ -66,7 +66,7 @@
+ 
+ lpq:	lpq.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
+ 
+ lpq.o:	../cups/cups.h ../Makedefs
+ 
+@@ -76,7 +76,7 @@
+ 
+ lpr:	lpr.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
+ 
+ lpr.o:	../cups/cups.h ../Makedefs
+ 
+@@ -86,7 +86,7 @@
+ 
+ lprm:	lprm.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
+ 
+ lprm.o:	../cups/cups.h ../Makedefs
+ 
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
new file mode 100644
index 00000000000..9e0c4d29538
--- /dev/null
+++ b/print/cups/patches/patch-ae
@@ -0,0 +1,42 @@
+$NetBSD: patch-ae,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- cgi-bin/Makefile.orig	Thu Jul  8 10:20:38 1999
++++ cgi-bin/Makefile	Sun Nov 28 21:06:28 1999
+@@ -45,8 +45,8 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(SERVERROOT)/cgi-bin
+-	$(CP) $(TARGETS) $(SERVERROOT)/cgi-bin
++	-$(BSD_INSTALL_PROGRAM_DIR) $(EXECDIR)/cgi-bin
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) $(TARGETS) $(EXECDIR)/cgi-bin
+ 
+ #
+ # classes.cgi
+@@ -54,7 +54,7 @@
+ 
+ classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ classes.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o $@ classes.o $(LIBS)
+ 
+ $(OBJS):	../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
+ 
+@@ -64,7 +64,7 @@
+ 
+ jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ jobs.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o $@ jobs.o $(LIBS)
+ 
+ $(OBJS):	../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
+ 
+@@ -74,7 +74,7 @@
+ 
+ printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ printers.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o $@ printers.o $(LIBS)
+ 
+ $(OBJS):	../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
+ 
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
new file mode 100644
index 00000000000..19412cf4d8a
--- /dev/null
+++ b/print/cups/patches/patch-af
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- conf/Makefile.orig	Fri Jul 30 10:18:35 1999
++++ conf/Makefile	Sun Nov 28 21:06:28 1999
+@@ -48,19 +48,19 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(SERVERROOT)/conf
++	-$(MKDIR) $(CONFDIR)
+ 	for file in $(KEEP); do \
+-		if test -e $(SERVERROOT)/conf/$$file ; then \
+-			$(CP) $$file $(SERVERROOT)/conf/$$file.N ; \
++		if test -e $(CONFDIR)/$$file ; then \
++			$(CP) $$file $(CONFDIR)/$$file.N ; \
+ 		else \
+-			$(CP) $$file $(SERVERROOT)/conf ; \
++			$(CP) $$file $(CONFDIR) ; \
+ 		fi ; \
+ 	done
+ 	for file in $(REPLACE); do \
+-		if test -e $(SERVERROOT)/conf/$$file ; then \
+-			$(MV) $(SERVERROOT)/conf/$$file $(SERVERROOT)/conf/$$file.O ; \
++		if test -e $(CONFDIR)/$$file ; then \
++			$(MV) $(CONFDIR)/$$file $(CONFDIR)/$$file.O ; \
+ 		fi ; \
+-		$(CP) $$file $(SERVERROOT)/conf ; \
++		$(CP) $$file $(CONFDIR) ; \
+ 	done
+ 
+ #
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
new file mode 100644
index 00000000000..fc9624020a8
--- /dev/null
+++ b/print/cups/patches/patch-ag
@@ -0,0 +1,25 @@
+$NetBSD: patch-ag,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- conf/cupsd.conf.orig	Mon Aug 23 11:24:48 1999
++++ conf/cupsd.conf	Sun Nov 28 21:06:28 1999
+@@ -107,6 +107,20 @@
+ #ServerRoot /var/cups
+ 
+ #
++# ConfRoot: the root directory for the configuration files.
++# By default the compiled-in value
++#
++
++#ConfRoot /etc/cups
++
++#
++# ExecRoot: the root directory for the CUPS executables.
++# By default the compiled-in value
++#
++
++#ExecRoot /usr/pkg/libexec/cups
++
++#
+ # AccessLog: the access log file; if this does not start with a leading /
+ # then it is assumed to be relative to ServerRoot.  By default set to
+ # "logs/access_log"
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
new file mode 100644
index 00000000000..d4c21ba1f66
--- /dev/null
+++ b/print/cups/patches/patch-ah
@@ -0,0 +1,18 @@
+$NetBSD: patch-ah,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- config.h.in.orig	Thu Nov  4 08:35:00 1999
++++ config.h.in	Sun Nov 28 21:06:28 1999
+@@ -34,9 +34,12 @@
+  * Where are files stored?
+  */
+ 
+-#define CUPS_LOCALEDIR	"/usr/lib/locale"
++#define CUPS_LOCALEDIR	"/usr/share/cups/locale"
+ #define CUPS_SERVERROOT	"/var/cups"
+ #define CUPS_DATADIR	"/usr/share/cups"
++#define CUPS_DOCDIR	"/usr/share/doc/cups"
++#define CUPS_CONFDIR	"/etc/cups"
++#define CUPS_EXECDIR	"/usr/libexec/cups"
+ 
+ /*
+  * Do we have various image libraries?
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
new file mode 100644
index 00000000000..f6c9129d546
--- /dev/null
+++ b/print/cups/patches/patch-ai
@@ -0,0 +1,136 @@
+$NetBSD: patch-ai,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- configure.orig	Thu Nov  4 10:34:48 1999
++++ configure	Sun Nov 28 21:06:28 1999
+@@ -556,6 +556,9 @@
+   :
+ fi
+ 
++# Use libtool to build shared libraries.
++#
++if false; then
+ if test "$enable_shared" != "no"; then
+ 	case "$uname" in
+ 		SunOS* | UNIX_S*)
+@@ -597,6 +600,11 @@
+ 	LIBCUPSIMAGE="libcupsimage.a"
+ 	DSO=":"
+ fi
++else
++	LIBCUPS="libcups.la"
++	LIBCUPSIMAGE="libcupsimage.la"
++	DSO=":"
++fi
+ 
+ for ac_prog in mawk gawk nawk awk
+ do
+@@ -1820,7 +1828,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lpng  $LIBS"
++LIBS="-lpng -lz -lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1826 "configure"
+ #include "confdefs.h"
+@@ -1865,7 +1873,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-ltiff  $LIBS"
++LIBS="-ltiff -ljpeg -lz -lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1871 "configure"
+ #include "confdefs.h"
+@@ -1903,9 +1911,9 @@
+ fi
+ 
+ 
+-echo $ac_n "checking for deflateInit in -lz""... $ac_c" 1>&6
+-echo "configure:1908: checking for deflateInit in -lz" >&5
+-ac_lib_var=`echo z'_'deflateInit | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
++echo "configure:1908: checking for deflate in -lz" >&5
++ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1917,10 +1925,10 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char deflateInit();
++char deflate();
+ 
+ int main() {
+-deflateInit()
++deflate()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -2795,11 +2803,16 @@
+ 	libdir="/usr/lib32"
+ fi
+ 
++if false; then
+ if test "$prefix" = "/usr"; then
+ 	CUPS_SERVERROOT="/var/cups"
+ else
+ 	CUPS_SERVERROOT="$prefix/var/cups"
+ fi
++else
++	# NetBSD's CUPS runtime files go into /var/cups
++	CUPS_SERVERROOT="/var/cups"
++fi
+ cat >> confdefs.h <<EOF
+ #define CUPS_SERVERROOT "$CUPS_SERVERROOT"
+ EOF
+@@ -2811,6 +2824,10 @@
+ 		CUPS_LOCALEDIR="$prefix/share/locale"
+ 		;;
+ 
++	FreeBSD* | NetBSD* | OpenBSD*)
++		CUPS_LOCALEDIR="$prefix/share/cups/locale"
++		;;
++
+ 	OSF1)
+ 		CUPS_LOCALEDIR="$prefix/lib/nls/msg"
+ 		;;
+@@ -2834,6 +2851,27 @@
+ 
+ 
+ 
++CUPS_DOCDIR="$prefix/share/doc/cups"
++cat >> confdefs.h <<EOF
++#define CUPS_DOCDIR "$CUPS_DOCDIR"
++EOF
++
++
++
++CUPS_CONFDIR="/etc/cups"
++cat >> confdefs.h <<EOF
++#define CUPS_CONFDIR "$CUPS_CONFDIR"
++EOF
++
++
++
++CUPS_EXECDIR="$prefix/libexec/cups"
++cat >> confdefs.h <<EOF
++#define CUPS_EXECDIR "$CUPS_EXECDIR"
++EOF
++
++
++
+ trap '' 1 2 15
+ cat > confcache <<\EOF
+ # This file is a shell script that caches the results of configure
+@@ -2996,6 +3034,9 @@
+ s%@CUPS_SERVERROOT@%$CUPS_SERVERROOT%g
+ s%@CUPS_LOCALEDIR@%$CUPS_LOCALEDIR%g
+ s%@CUPS_DATADIR@%$CUPS_DATADIR%g
++s%@CUPS_DOCDIR@%$CUPS_DOCDIR%g
++s%@CUPS_CONFDIR@%$CUPS_CONFDIR%g
++s%@CUPS_EXECDIR@%$CUPS_EXECDIR%g
+ 
+ CEOF
+ EOF
diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj
new file mode 100644
index 00000000000..95c9503f292
--- /dev/null
+++ b/print/cups/patches/patch-aj
@@ -0,0 +1,68 @@
+$NetBSD: patch-aj,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- cups/Makefile.orig	Fri Oct 22 11:53:09 1999
++++ cups/Makefile	Sun Nov 28 21:06:28 1999
+@@ -63,13 +63,20 @@
+ #
+ 
+ install:	all
+-	-$(MKDIR) $(INCLUDEDIR)/cups
+-	$(CP) $(HEADERS) $(INCLUDEDIR)/cups
+-	-$(MKDIR) $(LIBDIR)
+-	$(CP) $(LIBCUPS) $(LIBDIR)
+-	if test $(LIBCUPS) != "libcups.a"; then \
+-		$(LN) $(LIBCUPS) `basename $(LIBCUPS) .1`; \
+-	fi
++	-$(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/cups
++	$(BSD_INSTALL_DATA) $(HEADERS) $(INCLUDEDIR)/cups
++	-$(BSD_INSTALL_DATA_DIR) $(LIBDIR)
++	$(LIBTOOL) $(BSD_INSTALL_DATA) $(LIBCUPS) $(LIBDIR)
++
++#
++# libcups.la
++#
++
++libcups.la:	$(LIBOBJS:.o=.lo)
++	echo Linking $@...
++	$(RM) $@
++	$(LIBTOOL) $(CC) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
++		-version-info 1:0
+ 
+ #
+ # libcups.so.1, libcups.sl.1
+@@ -120,9 +127,9 @@
+ # testhttp (dependency on static CUPS library is intentional)
+ #
+ 
+-testhttp:	testhttp.o libcups.a
++testhttp:	testhttp.o $(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS)
++	$(CC) $(LDFLAGS) -o $@ testhttp.o .libs/libcups.a $(NETLIBS)
+ 
+ testhttp.o:	http.h ../Makedefs
+ 
+@@ -130,9 +137,9 @@
+ # testmime (dependency on static CUPS library is intentional)
+ #
+ 
+-testmime:	testmime.o libcups.a
++testmime:	testmime.o $(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ testmime.o libcups.a
++	$(CC) $(LDFLAGS) -o $@ testmime.o .libs/libcups.a
+ 
+ testmime.o:	mime.h ../Makedefs
+ 
+@@ -140,9 +147,9 @@
+ # testppd (dependency on static CUPS library is intentional)
+ #
+ 
+-testppd:	testppd.o libcups.a
++testppd:	testppd.o $(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ testppd.o libcups.a $(NETLIBS)
++	$(CC) $(LDFLAGS) -o $@ testppd.o .libs/libcups.a $(NETLIBS)
+ 
+ testppd.o:	ppd.h ../Makedefs
+ 
diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak
new file mode 100644
index 00000000000..efdb5f364f9
--- /dev/null
+++ b/print/cups/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- cups/usersys.c.orig	Mon Jul 12 12:09:42 1999
++++ cups/usersys.c	Sun Nov 28 21:06:28 1999
+@@ -136,7 +136,7 @@
+   * Next check to see if we have a cupsd.conf file...
+   */
+ 
+-  if ((fp = fopen(CUPS_SERVERROOT "/conf/cupsd.conf", "r")) == NULL)
++  if ((fp = fopen(CUPS_CONFDIR "/cupsd.conf", "r")) == NULL)
+     return ("localhost");
+ 
+  /*
diff --git a/print/cups/patches/patch-al b/print/cups/patches/patch-al
new file mode 100644
index 00000000000..b88cf8b1762
--- /dev/null
+++ b/print/cups/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- data/Makefile.orig	Fri Jul 30 10:22:10 1999
++++ data/Makefile	Sun Nov 28 21:06:28 1999
+@@ -48,8 +48,8 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(DATADIR)/data
+-	$(CP) $(FILES) $(DATADIR)/data
++	-$(BSD_INSTALL_DATA_DIR) $(DATADIR)/data
++	$(BSD_INSTALL_DATA) $(FILES) $(DATADIR)/data
+ 
+ #
+ # End of "$Id: patch-al,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $".
diff --git a/print/cups/patches/patch-am b/print/cups/patches/patch-am
new file mode 100644
index 00000000000..e5fff5b2745
--- /dev/null
+++ b/print/cups/patches/patch-am
@@ -0,0 +1,27 @@
+$NetBSD: patch-am,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- doc/Makefile.orig	Wed Sep 22 16:06:17 1999
++++ doc/Makefile	Sun Nov 28 21:06:28 1999
+@@ -71,14 +71,14 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(DATADIR)/doc
+-	$(CP) $(WEBPAGES) $(DATADIR)/doc
+-	$(CP) overview.html overview.pdf $(DATADIR)/doc
+-	$(CP) $(DOCUMENTS:.shtml=.html) $(DATADIR)/doc
+-	$(CP) $(DOCUMENTS:.shtml=.pdf) $(DATADIR)/doc
+-	-$(MKDIR) $(DATADIR)/doc/images
+-	$(CP) $(WEBIMAGES) $(DATADIR)/doc/images
+-	$(CP) $(DOCIMAGES) $(DATADIR)/doc/images
++	-$(BSD_INSTALL_DATA_DIR) $(DOCDIR)
++	$(BSD_INSTALL_DATA) $(WEBPAGES) $(DOCDIR)
++	$(BSD_INSTALL_DATA) overview.html overview.pdf $(DOCDIR)
++	$(BSD_INSTALL_DATA) $(DOCUMENTS:.shtml=.html) $(DOCDIR)
++	$(BSD_INSTALL_DATA) $(DOCUMENTS:.shtml=.pdf) $(DOCDIR)
++	-$(BSD_INSTALL_DATA_DIR) $(DOCDIR)/images
++	$(BSD_INSTALL_DATA) $(WEBIMAGES) $(DOCDIR)/images
++	$(BSD_INSTALL_DATA) $(DOCIMAGES) $(DOCDIR)/images
+ 
+ #
+ # The overview, admin guide, and user's guide get special attention...
diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an
new file mode 100644
index 00000000000..8ba1753d7c4
--- /dev/null
+++ b/print/cups/patches/patch-an
@@ -0,0 +1,93 @@
+$NetBSD: patch-an,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- filter/Makefile.orig	Fri Jul 30 10:57:20 1999
++++ filter/Makefile	Sun Nov 28 21:06:28 1999
+@@ -53,13 +53,10 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(SERVERROOT)/filter
+-	$(CP) $(TARGETS) $(SERVERROOT)/filter
+-	-$(MKDIR) $(LIBDIR)
+-	$(CP) $(LIBCUPSIMAGE) $(LIBDIR)
+-	-if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
+-		$(LN) $(LIBCUPSIMAGE) `basename $(LIBCUPSIMAGE) .1`; \
+-	fi
++	-$(BSD_INSTALL_PROGRAM_DIR) $(EXECDIR)/filter
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) $(TARGETS) $(EXECDIR)/filter
++	-$(BSD_INSTALL_DATA_DIR) $(LIBDIR)
++	$(LIBTOOL) $(BSD_INSTALL_DATA) $(LIBCUPSIMAGE) $(LIBDIR)
+ 
+ #
+ # hpgltops
+@@ -67,10 +64,19 @@
+ 
+ hpgltops:	$(HPGLOBJS) common.o ../Makedefs ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS) -lm
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS) -lm
+ $(HPGLOBJS):	hpgltops.h
+ 
+ #
++# libcupsimage.la
++#
++libcupsimage.la: $(IMAGEOBJS:.o=.lo)
++	echo Linking $@...
++	$(RM) $@
++	$(LIBTOOL) $(CC) -o $@ $(IMAGEOBJS:.o=.lo) -rpath $(LIBDIR) \
++		-version-info 1:0
++
++#
+ # libcupsimage.so.1, libcupsimage.sl.1
+ #
+ 
+@@ -98,8 +104,8 @@
+ imagetops:	imagetops.o common.o $(LIBCUPSIMAGE) ../Makedefs \
+ 		../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ imagetops.o common.o -L. -lcupsimage \
+-		$(IMGLIBS) $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o $@ imagetops.o common.o \
++		$(LIBCUPSIMAGE) $(IMGLIBS) $(LIBS)
+ imagetops:	common.h image.h
+ 
+ #
+@@ -109,8 +115,8 @@
+ imagetoraster:	imagetoraster.o common.o $(LIBCUPSIMAGE) ../Makedefs \
+ 		../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ imagetoraster.o common.o -L. -lcupsimage \
+-		$(IMGLIBS) $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o $@ imagetoraster.o common.o \
++		$(LIBCUPSIMAGE) $(IMGLIBS) $(LIBS)
+ imagetoraster:	common.h image.h
+ 
+ #
+@@ -119,7 +125,7 @@
+ 
+ pstops:	pstops.o common.o ../Makedefs ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS)
+ pstops.o:	common.h
+ 
+ #
+@@ -128,7 +134,7 @@
+ 
+ rastertohp:	rastertohp.o ../Makedefs ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ rastertohp.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o $@ rastertohp.o $(LIBS)
+ rastertohp.o:	../cups/raster.h
+ 
+ #
+@@ -138,7 +144,8 @@
+ texttops:	texttops.o textcommon.o common.o ../Makedefs \
+ 		../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ texttops.o textcommon.o common.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o $@ texttops.o textcommon.o common.o \
++		$(LIBS)
+ texttops.o:	common.h textcommon.h
+ 
+ common.o:	common.h
diff --git a/print/cups/patches/patch-ao b/print/cups/patches/patch-ao
new file mode 100644
index 00000000000..be541f652e6
--- /dev/null
+++ b/print/cups/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- fonts/Makefile.orig	Mon May 10 17:33:34 1999
++++ fonts/Makefile	Sun Nov 28 21:06:28 1999
+@@ -60,8 +60,8 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(DATADIR)/fonts
+-	$(CP) $(FONTS) $(DATADIR)/fonts
++	-$(BSD_INSTALL_DATA_DIR) $(DATADIR)/fonts
++	$(BSD_INSTALL_DATA) $(FONTS) $(DATADIR)/fonts
+ 
+ #
+ # End of "$Id: patch-ao,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $".
diff --git a/print/cups/patches/patch-ap b/print/cups/patches/patch-ap
new file mode 100644
index 00000000000..99eacb0d26a
--- /dev/null
+++ b/print/cups/patches/patch-ap
@@ -0,0 +1,30 @@
+$NetBSD: patch-ap,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- locale/Makefile.orig	Mon Jun 21 14:47:44 1999
++++ locale/Makefile	Sun Nov 28 21:06:28 1999
+@@ -47,12 +47,12 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(LIBDIR)/locale
++	-$(BSD_INSTALL_DATA_DIR) $(LOCALEDIR)
+ 	for dir in $(LOCALES) ; do \
+-		if test ! -d $(LIBDIR)/locale/$$dir ; then \
+-			$(MKDIR) $(LIBDIR)/locale/$$dir ; \
++		if test ! -d $(LOCALEDIR)/$$dir ; then \
++			$(BSD_INSTALL_DATA_DIR) $(LOCALEDIR)/$$dir ; \
+ 		fi ; \
+-		$(CP) cups_$$dir $(LIBDIR)/locale/$$dir ; \
++		$(BSD_INSTALL_DATA) $$dir/cups_$$dir $(LOCALEDIR)/$$dir ; \
+ 	done
+ 
+ #
+@@ -64,7 +64,7 @@
+ 
+ translate:	translate.o ../cups/libcups.a
+ 	echo Linking $<...
+-	$(CC) $(LDFLAGS) -o translate translate.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o translate translate.o $(LIBS)
+ 
+ translate.o:	../cups/http.h
+ 
diff --git a/print/cups/patches/patch-aq b/print/cups/patches/patch-aq
new file mode 100644
index 00000000000..8c2511563f6
--- /dev/null
+++ b/print/cups/patches/patch-aq
@@ -0,0 +1,44 @@
+$NetBSD: patch-aq,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- man/Makefile.orig	Mon Jun 21 11:27:44 1999
++++ man/Makefile	Sun Nov 28 21:06:28 1999
+@@ -41,7 +41,7 @@
+ # Make everything...
+ #
+ 
+-all:	$(CAT1) $(CAT5) $(CAT8)
++all:	# $(CAT1) $(CAT5) $(CAT8)
+ 
+ #
+ # Clean all config and object files...
+@@ -54,24 +54,15 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(MANDIR)/man1
+-	$(CP) $(MAN1) $(MANDIR)/man1
++	-$(BSD_INSTALL_DATA_DIR) $(MANDIR)/man1
++	$(BSD_INSTALL_DATA) $(MAN1) $(MANDIR)/man1
+ 	$(LN) lp.1 $(MANDIR)/man1/cancel.1
+-	-$(MKDIR) $(MANDIR)/man5
+-	$(CP) $(MAN5) $(MANDIR)/man5
+-	-$(MKDIR) $(MANDIR)/man8
+-	$(CP) $(MAN8) $(MANDIR)/man8
++	-$(BSD_INSTALL_DATA_DIR) $(MANDIR)/man5
++	$(BSD_INSTALL_DATA) $(MAN5) $(MANDIR)/man5
++	-$(BSD_INSTALL_DATA_DIR) $(MANDIR)/man8
++	$(BSD_INSTALL_DATA) $(MAN8) $(MANDIR)/man8
+ 	$(LN) accept.8 $(MANDIR)/man8/reject.8
+ 	$(LN) enable.8 $(MANDIR)/man8/disable.8
+-	-$(MKDIR) $(MANDIR)/cat1
+-	$(CP) $(CAT1) $(MANDIR)/cat1
+-	$(LN) lp.$(CAT) $(MANDIR)/cat1/cancel.$(CAT)
+-	-$(MKDIR) $(MANDIR)/cat5
+-	$(CP) $(CAT5) $(MANDIR)/cat5
+-	-$(MKDIR) $(MANDIR)/cat8
+-	$(CP) $(CAT8) $(MANDIR)/cat8
+-	$(LN) accept.$(CAT) $(MANDIR)/cat8/reject.$(CAT)
+-	$(LN) enable.$(CAT) $(MANDIR)/cat8/disable.$(CAT)
+ 
+ #
+ # End of "$Id: patch-aq,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $".
diff --git a/print/cups/patches/patch-ar b/print/cups/patches/patch-ar
new file mode 100644
index 00000000000..edbc671aa39
--- /dev/null
+++ b/print/cups/patches/patch-ar
@@ -0,0 +1,15 @@
+$NetBSD: patch-ar,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- ppd/Makefile.orig	Wed May 19 14:00:57 1999
++++ ppd/Makefile	Sun Nov 28 21:06:28 1999
+@@ -47,8 +47,8 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(DATADIR)/model
+-	$(CP) $(FILES) $(DATADIR)/model
++	-$(BSD_INSTALL_DATA_DIR) $(DATADIR)/model
++	$(BSD_INSTALL_DATA) $(FILES) $(DATADIR)/model
+ 
+ #
+ # End of "$Id: patch-ar,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $".
diff --git a/print/cups/patches/patch-as b/print/cups/patches/patch-as
new file mode 100644
index 00000000000..8f196d45923
--- /dev/null
+++ b/print/cups/patches/patch-as
@@ -0,0 +1,30 @@
+$NetBSD: patch-as,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- pstoraster/Makefile.orig	Thu Jul 29 16:33:30 1999
++++ pstoraster/Makefile	Sun Nov 28 21:06:28 1999
+@@ -120,11 +120,11 @@
+ #
+ 
+ install:	$(TARGETS)
+-	-$(MKDIR) $(SERVERROOT)/filter
+-	$(CP) pstoraster $(SERVERROOT)/filter
+-	-$(LN) pstoraster $(SERVERROOT)/filter/pdftops
+-	-$(MKDIR) $(DATADIR)/pstoraster
+-	$(CP) $(DFILES) $(DATADIR)/pstoraster
++	-$(BSD_INSTALL_PROGRAM_DIR) $(EXECDIR)/filter
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) pstoraster $(EXECDIR)/filter
++	-$(LN) pstoraster $(EXECDIR)/filter/pdftops
++	-$(BSD_INSTALL_DATA_DIR) $(DATADIR)/pstoraster
++	$(BSD_INSTALL_DATA) $(DFILES) $(DATADIR)/pstoraster
+ 
+ #
+ # genarch - generate the architecture configuration file.
+@@ -158,7 +158,7 @@
+ 
+ pstoraster:	pstoraster.o libgs.a ../Makedefs ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o pstoraster pstoraster.o libgs.a \
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o pstoraster pstoraster.o libgs.a \
+ 		$(LIBJPEG) $(LIBZ) $(LIBS) -lm
+ pstoraster.o:	arch.h ../config.h ../Makedefs
+ 
diff --git a/print/cups/patches/patch-at b/print/cups/patches/patch-at
new file mode 100644
index 00000000000..82d6e410678
--- /dev/null
+++ b/print/cups/patches/patch-at
@@ -0,0 +1,33 @@
+$NetBSD: patch-at,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- scheduler/Makefile.orig	Mon Sep 27 14:21:21 1999
++++ scheduler/Makefile	Sun Nov 28 21:06:28 1999
+@@ -46,8 +46,8 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(SBINDIR)
+-	$(CP) cupsd $(SBINDIR)
++	-$(BSD_INSTALL_PROGRAM_DIR) $(SBINDIR)
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) cupsd $(SBINDIR)
+ 	-$(MKDIR) $(SERVERROOT)/interfaces
+ 	-$(MKDIR) $(SERVERROOT)/logs
+ 	-$(MKDIR) $(SERVERROOT)/ppd
+@@ -59,7 +59,7 @@
+ 
+ cupsd:	$(CUPSDOBJS) ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) $(LIBS)
+ 
+ $(CUPSDOBJS):	auth.h classes.h client.h conf.h cupsd.h dirsvc.h job.h \
+ 		printers.h ../cups/cups.h ../cups/http.h ../cups/ipp.h \
+@@ -71,7 +71,7 @@
+ 
+ testspeed:	testspeed.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o testspeed testspeed.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o testspeed testspeed.o $(LIBS)
+ 
+ testspeed.o:	../cups/cups.h ../cups/http.h ../cups/ipp.h ../cups/language.h
+ 
diff --git a/print/cups/patches/patch-au b/print/cups/patches/patch-au
new file mode 100644
index 00000000000..35c1ca5798a
--- /dev/null
+++ b/print/cups/patches/patch-au
@@ -0,0 +1,22 @@
+$NetBSD: patch-au,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- scheduler/classes.c.orig	Wed Sep 22 14:08:40 1999
++++ scheduler/classes.c	Sun Nov 28 21:06:29 1999
+@@ -300,7 +300,7 @@
+   * Open the classes.conf file...
+   */
+ 
+-  sprintf(line, "%s/conf/classes.conf", ServerRoot);
++  sprintf(line, "%s/classes.conf", ConfRoot);
+   if ((fp = fopen(line, "r")) == NULL)
+     return;
+ 
+@@ -470,7 +470,7 @@
+   * Create the classes.conf file...
+   */
+ 
+-  sprintf(temp, "%s/conf/classes.conf", ServerRoot);
++  sprintf(temp, "%s/classes.conf", ConfRoot);
+   if ((fp = fopen(temp, "w")) == NULL)
+   {
+     LogMessage(LOG_ERROR, "Unable to save classes.conf - %s", strerror(errno));
diff --git a/print/cups/patches/patch-av b/print/cups/patches/patch-av
new file mode 100644
index 00000000000..68ac7c96cde
--- /dev/null
+++ b/print/cups/patches/patch-av
@@ -0,0 +1,46 @@
+$NetBSD: patch-av,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- scheduler/client.c.orig	Thu Nov  4 09:56:33 1999
++++ scheduler/client.c	Sun Nov 28 21:06:29 1999
+@@ -474,17 +474,17 @@
+ 
+             if (strncmp(con->uri, "/printers", 9) == 0)
+ 	    {
+-	      snprintf(command, sizeof(command), "%s/cgi-bin/printers.cgi", ServerRoot);
++	      snprintf(command, sizeof(command), "%s/cgi-bin/printers.cgi", ExecRoot);
+ 	      options = con->uri + 9;
+ 	    }
+ 	    else if (strncmp(con->uri, "/classes", 8) == 0)
+ 	    {
+-	      snprintf(command, sizeof(command), "%s/cgi-bin/classes.cgi", ServerRoot);
++	      snprintf(command, sizeof(command), "%s/cgi-bin/classes.cgi", ExecRoot);
+ 	      options = con->uri + 8;
+ 	    }
+ 	    else
+ 	    {
+-	      snprintf(command, sizeof(command), "%s/cgi-bin/jobs.cgi", ServerRoot);
++	      snprintf(command, sizeof(command), "%s/cgi-bin/jobs.cgi", ExecRoot);
+ 	      options = con->uri + 5;
+ 	    }
+ 
+@@ -585,17 +585,17 @@
+ 
+             if (strncmp(con->uri, "/printers", 9) == 0)
+ 	    {
+-	      snprintf(command, sizeof(command), "%s/cgi-bin/printers", ServerRoot);
++	      snprintf(command, sizeof(command), "%s/cgi-bin/printers", ExecRoot);
+ 	      options = con->uri + 9;
+ 	    }
+ 	    else if (strncmp(con->uri, "/classes", 8) == 0)
+ 	    {
+-	      snprintf(command, sizeof(command), "%s/cgi-bin/classes", ServerRoot);
++	      snprintf(command, sizeof(command), "%s/cgi-bin/classes", ExecRoot);
+ 	      options = con->uri + 8;
+ 	    }
+ 	    else
+ 	    {
+-	      snprintf(command, sizeof(command), "%s/cgi-bin/jobs", ServerRoot);
++	      snprintf(command, sizeof(command), "%s/cgi-bin/jobs", ExecRoot);
+ 	      options = con->uri + 5;
+ 	    }
+ 
diff --git a/print/cups/patches/patch-aw b/print/cups/patches/patch-aw
new file mode 100644
index 00000000000..ca0adf5b72c
--- /dev/null
+++ b/print/cups/patches/patch-aw
@@ -0,0 +1,33 @@
+$NetBSD: patch-aw,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- scheduler/conf.c.orig	Sun Oct 10 11:41:09 1999
++++ scheduler/conf.c	Sun Nov 28 21:06:29 1999
+@@ -76,6 +76,8 @@
+   { "ServerAdmin",	ServerAdmin,		VAR_STRING,	sizeof(ServerAdmin) },
+   { "ServerRoot",	ServerRoot,		VAR_STRING,	sizeof(ServerRoot) },
+   { "DocumentRoot",	DocumentRoot,		VAR_STRING,	sizeof(DocumentRoot) },
++  { "ConfRoot",		ConfRoot,		VAR_STRING,	sizeof(ConfRoot) },
++  { "ExecRoot",		ExecRoot,		VAR_STRING,	sizeof(ExecRoot) },
+   { "SystemGroup",	SystemGroup,		VAR_STRING,	sizeof(SystemGroup) },
+   { "AccessLog",	AccessLog,		VAR_STRING,	sizeof(AccessLog) },
+   { "ErrorLog",		ErrorLog,		VAR_STRING,	sizeof(ErrorLog) },
+@@ -168,7 +170,9 @@
+   gethostname(ServerName, sizeof(ServerName));
+   sprintf(ServerAdmin, "root@%s", ServerName);
+   strcpy(ServerRoot, CUPS_SERVERROOT);
+-  strcpy(DocumentRoot, CUPS_DATADIR "/doc");
++  strcpy(DocumentRoot, CUPS_DOCDIR);
++  strcpy(ConfRoot, CUPS_CONFDIR);
++  strcpy(ExecRoot, CUPS_EXECDIR);
+   strcpy(AccessLog, "logs/access_log");
+   strcpy(ErrorLog, "logs/error_log");
+ 
+@@ -272,7 +276,7 @@
+   * Read the MIME type and conversion database...
+   */
+ 
+-  sprintf(directory, "%s/conf", ServerRoot);
++  sprintf(directory, "%s", ConfRoot);
+ 
+   MimeDatabase = mimeNew();
+   mimeMerge(MimeDatabase, directory);
diff --git a/print/cups/patches/patch-ax b/print/cups/patches/patch-ax
new file mode 100644
index 00000000000..364d679aa13
--- /dev/null
+++ b/print/cups/patches/patch-ax
@@ -0,0 +1,27 @@
+$NetBSD: patch-ax,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- scheduler/conf.h.orig	Sat Aug 28 12:17:51 1999
++++ scheduler/conf.h	Sun Nov 28 21:06:29 1999
+@@ -39,7 +39,7 @@
+  * Globals...
+  */
+ 
+-VAR char		ConfigurationFile[256]	VALUE(CUPS_SERVERROOT "/conf/cupsd.conf"),
++VAR char		ConfigurationFile[256]	VALUE(CUPS_CONFDIR "/cupsd.conf"),
+ 					/* Configuration file to use */
+ 			ServerName[256]		VALUE(""),
+ 					/* FQDN for server */
+@@ -47,8 +47,12 @@
+ 					/* Administrator's email */
+ 			ServerRoot[1024]	VALUE(CUPS_SERVERROOT),
+ 					/* Root directory for scheduler */
+-			DocumentRoot[1024]	VALUE(CUPS_DATADIR "/doc"),
++			DocumentRoot[1024]	VALUE(CUPS_DOCDIR),
+ 					/* Root directory for documents */
++			ConfRoot[1024]		VALUE(CUPS_CONFDIR),
++					/* Root dir for configuration files */
++			ExecRoot[1024]		VALUE(CUPS_EXECDIR),
++					/* Root dir for CUPS executables */
+ 			SystemGroup[32],
+ 					/* System group name */
+ 			AccessLog[1024]		VALUE("logs/access_log"),
diff --git a/print/cups/patches/patch-ay b/print/cups/patches/patch-ay
new file mode 100644
index 00000000000..638953ed678
--- /dev/null
+++ b/print/cups/patches/patch-ay
@@ -0,0 +1,22 @@
+$NetBSD: patch-ay,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- scheduler/job.c.orig	Tue Oct 12 14:29:30 1999
++++ scheduler/job.c	Sun Nov 28 21:06:29 1999
+@@ -604,7 +604,7 @@
+       argv[6] = NULL;
+ 
+     if (filters[i].filter[0] != '/')
+-      sprintf(command, "%s/filter/%s", ServerRoot, filters[i].filter);
++      sprintf(command, "%s/filter/%s", ExecRoot, filters[i].filter);
+     else
+       strcpy(command, filters[i].filter);
+ 
+@@ -662,7 +662,7 @@
+   if (strncmp(printer->device_uri, "file:", 5) != 0)
+   {
+     sscanf(printer->device_uri, "%254[^:]", method);
+-    sprintf(command, "%s/backend/%s", ServerRoot, method);
++    sprintf(command, "%s/backend/%s", ExecRoot, method);
+ 
+     argv[0] = printer->device_uri;
+     if (num_filters)
diff --git a/print/cups/patches/patch-az b/print/cups/patches/patch-az
new file mode 100644
index 00000000000..273687c5e4e
--- /dev/null
+++ b/print/cups/patches/patch-az
@@ -0,0 +1,22 @@
+$NetBSD: patch-az,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- scheduler/printers.c.orig	Wed Oct 13 12:50:13 1999
++++ scheduler/printers.c	Sun Nov 28 21:06:29 1999
+@@ -376,7 +376,7 @@
+   * Open the printer.conf file...
+   */
+ 
+-  sprintf(line, "%s/conf/printers.conf", ServerRoot);
++  sprintf(line, "%s/printers.conf", ConfRoot);
+   if ((fp = fopen(line, "r")) == NULL)
+     return;
+ 
+@@ -549,7 +549,7 @@
+   * Create the printers.conf file...
+   */
+ 
+-  sprintf(temp, "%s/conf/printers.conf", ServerRoot);
++  sprintf(temp, "%s/printers.conf", ConfRoot);
+   if ((fp = fopen(temp, "w")) == NULL)
+   {
+     LogMessage(LOG_ERROR, "Unable to save printers.conf - %s", strerror(errno));
diff --git a/print/cups/patches/patch-ba b/print/cups/patches/patch-ba
new file mode 100644
index 00000000000..079dfddb30c
--- /dev/null
+++ b/print/cups/patches/patch-ba
@@ -0,0 +1,70 @@
+$NetBSD: patch-ba,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $
+
+--- systemv/Makefile.orig	Thu Aug 12 09:11:02 1999
++++ systemv/Makefile	Sun Nov 28 21:06:29 1999
+@@ -45,16 +45,13 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(BINDIR)
+-	-$(MKDIR) $(LIBDIR)
+-	$(CP) accept lpadmin $(SBINDIR)
++	-$(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
++	-$(BSD_INSTALL_DATA_DIR) $(LIBDIR)
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) accept lpadmin $(SBINDIR)
+ 	-$(LN) accept $(SBINDIR)/reject
+-	-$(LN) $(SBINDIR)/lpadmin $(LIBDIR)
+-	-$(LN) $(SBINDIR)/accept $(LIBDIR)
+-	-$(LN) $(SBINDIR)/accept $(LIBDIR)/reject
+ 	-$(LN) $(SBINDIR)/accept $(BINDIR)/disable
+ 	-$(LN) $(SBINDIR)/accept $(BINDIR)/enable
+-	$(CP) cancel lp lpstat $(BINDIR)
++	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) cancel lp lpstat $(BINDIR)
+ 
+ #
+ # accept
+@@ -62,7 +59,7 @@
+ 
+ accept:	accept.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o accept accept.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o accept accept.o $(LIBS)
+ 	-$(LN) accept disable
+ 	-$(LN) accept enable
+ 	-$(LN) accept reject
+@@ -75,7 +72,7 @@
+ 
+ cancel:	cancel.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS)
+ 
+ cancel.o:	../cups/cups.h ../Makedefs
+ 
+@@ -85,7 +82,7 @@
+ 
+ lp:	lp.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o lp lp.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o lp lp.o $(LIBS)
+ 
+ lp.o:	../cups/cups.h ../Makedefs
+ 
+@@ -95,7 +92,7 @@
+ 
+ lpadmin:	lpadmin.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS)
+ 
+ lpadmin.o:	../cups/cups.h ../Makedefs
+ 
+@@ -105,7 +102,7 @@
+ 
+ lpstat:	lpstat.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o lpstat lpstat.o $(LIBS)
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o lpstat lpstat.o $(LIBS)
+ 
+ lpstat.o:	../cups/cups.h ../Makedefs
+