6 files changed, 58 insertions, 11 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 911072d2ea15..e2aa66f593e6 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	cups-base
 PORTVERSION=	${CUPS_PORTVER}
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	${CUPS_PORTEPOCH}
 CATEGORIES=	print
 MASTER_SITES=	${CUPS_MASTER_SITES}
@@ -19,6 +19,7 @@ COMMENT=	The Common UNIX Printing System: headers, libs, & daemons
 
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
+USE_RC_SUBR=	cupsd
 
 MANLANG=	"" es fr
 
@@ -33,8 +34,6 @@ post-patch:
 		${WRKSRC}/man/*.man
 	@${REINPLACE_CMD} -e 's|CXX="$$CC"||g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${CP} ${WRKSRC}/cups.sh.in ${WRKSRC}/cups.sh.in.presed
-	@${SED} 40d ${WRKSRC}/cups.sh.in.presed > ${WRKSRC}/cups.sh.in
 
 pre-install:
 	@${ECHO_MSG} "===>" Stopping cupsd ...
@@ -47,7 +46,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N
 	cd ${CUPS_ETCDIR}; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi
 .endfor # classes.conf client.conf cupsd.conf printers.conf
-	cd ${CUPS_RCDIR}; ${MV} cups cups.sh.sample
 	${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete
 	${MKDIR} ${CUPS_SPOOLDIR} ${CUPS_SPOOLDIR}/tmp
 	${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR}
diff --git a/print/cups-base/files/cupsd.in b/print/cups-base/files/cupsd.in
new file mode 100644
index 000000000000..314685028291
--- /dev/null
+++ b/print/cups-base/files/cupsd.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cupsd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following to /etc/rc.conf[.local] to enable this service
+#
+# cupsd_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name=cupsd
+rcvar=`set_rcvar`
+
+start_precmd=${name}_prestart
+
+command=%%PREFIX%%/sbin/cupsd
+extra_commands=reload
+
+cupsd_prestart()
+{
+	if [ -n "$TZ" ]; then
+		export TZ
+	fi
+}
+
+load_rc_config ${name}
+
+: ${cupsd_enable=NO}
+
+run_rc_command "$1"
diff --git a/print/cups-base/files/patch-Makefile b/print/cups-base/files/patch-Makefile
index 5cb9d44d5209..6959f535f0e5 100644
--- a/print/cups-base/files/patch-Makefile
+++ b/print/cups-base/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Mar  7 01:36:00 2003
-+++ Makefile	Wed Jun 11 01:03:08 2003
+--- Makefile.orig	Mon Jan  3 11:29:44 2005
++++ Makefile	Fri Jan 27 00:04:20 2006
 @@ -28,8 +28,8 @@
  # Directories to make...
  #
@@ -20,3 +20,12 @@
  	echo Installing in data...
  	(cd data; $(MAKE) $(MFLAGS) install)
  	echo Installing in doc...
+@@ -109,8 +107,6 @@
+ 			$(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; \
+-		else \
+-			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
+ 		fi \
+ 	fi
+ 
diff --git a/print/cups-base/pkg-descr b/print/cups-base/pkg-descr
index 015c38731b0d..635a3434c034 100644
--- a/print/cups-base/pkg-descr
+++ b/print/cups-base/pkg-descr
@@ -19,7 +19,3 @@ that use these filters. This software is available in the cups-pstoraster
 port.
 
 WWW: http://www.cups.org/
-
-- AlanE (maintainer)
-alane@freebsd.org, ports@geeksrus.net
-[original text by greid@ukug.uk.freebsd.org]
diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message
index 69d111549eca..65b0111aaa9f 100644
--- a/print/cups-base/pkg-message
+++ b/print/cups-base/pkg-message
@@ -30,3 +30,13 @@ To enable printing under Gimp do the following:
 3) Restart cupsd
 
 **********************************************************************
+
+The cups-base port now uses a new style rc.d startup
+script.  Please remove any old cups.sh* scripts you
+might have in /usr/local/etc/rc.d, or your local
+PREFIX.  You should also put the following line in
+/etc/rc.conf.local, or /etc/rc.conf to start cupsd
+automatically at boot time:
+
+cupsd_enable="yes"
+**********************************************************************
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index cce1325d55c7..d73ffab2b078 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -20,7 +20,6 @@ etc/cups/mime.types.N
 @unexec if cmp -s %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; then rm -f %D/etc/cups/printers.conf; fi
 etc/cups/printers.conf.N
 @exec if test ! -f %D/etc/cups/printers.conf; then cp -p %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; fi
-etc/rc.d/cups.sh.sample
 include/cups/cups.h
 include/cups/http.h
 include/cups/image.h