Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@80 a1ca3aef-8c08-0410-bb20-df032aa958be

2 files changed, 25 insertions, 70 deletions

diff --git a/conf/Makefile b/conf/Makefile
index 82a796509..e806900af 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5185 2006-02-26 15:27:14Z mike $"
+# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -28,7 +28,7 @@ include ../Makedefs
 # Config files...
 #
 
-KEEP	=	client.conf cupsd.conf
+KEEP	=	cupsd.conf
 REPLACE	=	mime.convs mime.types
 
 
@@ -47,6 +47,13 @@ clean:
 
 
 #
+# Dummy depend...
+#
+
+depend:
+
+
+#
 # Install files...
 #
 
@@ -81,5 +88,20 @@ install:	all
 
 
 #
-# End of "$Id: Makefile 5185 2006-02-26 15:27:14Z mike $".
+# Uninstall files...
+#
+
+uninstall:
+	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+		$(RM) $(SERVERROOT)/$$file; \
+	done
+	-$(RMDIR) $(SERVERROOT)
+	-if test x$(PAMDIR) != x; then \
+		$(RM) $(BUILDROOT)$(PAMDIR)/cups; \
+		$(RMDIR) $(BUILDROOT)$(PAMDIR); \
+	fi
+
+
+#
+# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
 #
diff --git a/conf/client.conf b/conf/client.conf
deleted file mode 100644
index dfe332165..000000000
--- a/conf/client.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# "$Id: client.conf 4494 2005-02-18 02:18:11Z mike $"
-#
-#   Sample client configuration file for the Common UNIX Printing System
-#   (CUPS).
-#
-#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-########################################################################
-#                                                                      #
-# This is the CUPS client configuration file.  This file is used to    #
-# define client-specific parameters, such as the default server or     #
-# default encryption settings.                                         #
-#                                                                      #
-########################################################################
-
-#
-# ServerName: the hostname of your server.  By default CUPS will use the
-# hostname of the system or the value of the CUPS_SERVER environment
-# variable.  ONLY ONE SERVER NAME MAY BE SPECIFIED AT A TIME.  To use
-# more than one server you must use a local scheduler with browsing
-# and possibly polling.
-#
-
-#ServerName myhost.domain.com
-
-#
-# Encryption: whether or not to use encryption; this depends on having
-# the OpenSSL library linked into the CUPS library.
-#
-# Possible values:
-#
-#     Always       - Always use encryption (SSL)
-#     Never        - Never use encryption
-#     Required     - Use TLS encryption upgrade
-#     IfRequested  - Use encryption if the server requests it
-#
-# The default value is "IfRequested".  This parameter can also be set
-# using the CUPS_ENCRYPTION environment variable.
-#
-
-#Encryption Always
-#Encryption Never
-#Encryption Required
-#Encryption IfRequested
-
-
-#
-# End of "$Id: client.conf 4494 2005-02-18 02:18:11Z mike $".
-#