Update to cups-1.5.2.

While here, create cups's printcap under /etc/cups/ because we are
running unpriviledged so we cannot touch /etc/printcap.
Tweak rc script accordingly.

print/cups/Makefile

@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.122 2012/02/02 07:11:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.123 2012/02/16 22:12:08 ajacoutot Exp $
 
 COMMENT=	Common Unix Printing System
 
-VERSION=	1.5.0
+VERSION=	1.5.2
 DISTNAME=	cups-${VERSION}-source
 PKGNAME=	cups-${VERSION}
 
-REVISION=	8
-
 CATEGORIES=	print sysutils
 
-# XXX ghostscript needs to dlopen() libcupsimage.so.5
+# XXX ghostscript needs to dlopen() libcupsimage.so.5 for the cups device.
 SHARED_LIBS+=	cupsimage	5.0
 SHARED_LIBS+=	cups		6.0
 SHARED_LIBS+=	cupscgi		1.0
@@ -81,31 +79,27 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 CONFIGURE_STYLE= gnu dest
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--enable-static \
-		--with-cups-user=_cups \
-		--with-cups-group=_cups \
-		--with-system-groups=wheel \
 		--localstatedir=/var \
-		--without-java \
-		--with-perl="/usr/bin/perl" \
+		--with-cups-group=_cups \
+		--with-cups-user=_cups \
+		--with-system-groups=wheel \
 		--with-optim="${CFLAGS}" \
+		--with-dbusdir=${SYSCONFDIR}/dbus-1 \
+		--with-perl="/usr/bin/perl" \
+		--with-printcap=${SYSCONFDIR}/cups/printcap \
 		--with-smbconfigfile="samba:///${SYSCONFDIR}/samba/smb.conf" \
-		--with-pdftops="${LOCALBASE}/bin/gs" \
-		--without-php \
-		--without-python \
-		--enable-image \
 		--enable-dbus \
-		--enable-texttops \
 		--enable-raw-printing \
-		--enable-gssapi \
-		--enable-openssl \
 		--enable-libusb \
+		--disable-cdsassl \
+		--disable-default-shared \
+		--disable-dnssd \
 		--disable-gnutls \
-		--disable-pam \
 		--disable-launchd \
+		--disable-pam \
 		--disable-pap \
 		--disable-slp \
-		--disable-tcp-wrappers \
-		--disable-default-shared
+		--disable-tcp-wrappers
 
 FLAVORS=	ldap
 FLAVOR?=
@@ -118,11 +112,6 @@ LIB_DEPENDS+=	databases/openldap
 CONFIGURE_ARGS+=--disable-ldap
 .endif
 
-# needed otherwise cups will strip binaries even with INSTALL_STRIP=
-.if defined(DEBUG)
-CONFIGURE_ARGS += --enable-debug
-.endif
-
 post-extract:
 	${INSTALL} -m 555 ${FILESDIR}/krb5-config ${WRKDIR}/bin
 

print/cups/distinfo

@@ -1,5 +1,5 @@
-MD5 (cups-1.5.0-source.tar.bz2) = 5U7Qnt4jQPwwFJEzM1IP5A==
-RMD160 (cups-1.5.0-source.tar.bz2) = 576ba0RChWFgnFmrrqj6MaEa7/8=
-SHA1 (cups-1.5.0-source.tar.bz2) = Yo9UmGd1Hjc/wgx1WP7EIvnrlCs=
-SHA256 (cups-1.5.0-source.tar.bz2) = xvmbaKVY9NYm6aUHbWZPOOmSVxXcVBsH8DKMmusC7DM=
-SIZE (cups-1.5.0-source.tar.bz2) = 4090210
+MD5 (cups-1.5.2-source.tar.bz2) = lHHSp8kgz7sXEzwy0uaGbw==
+RMD160 (cups-1.5.2-source.tar.bz2) = mBgeLujG5XT7bUBfaI9SybYaI1U=
+SHA1 (cups-1.5.2-source.tar.bz2) = Vv209Y5nZgeEUyHAKWwekOQWiD8=
+SHA256 (cups-1.5.2-source.tar.bz2) = sVCqEIxjH08H6SyxPAEmOmcXDlrIODxVSO+PhHOhh/s=
+SIZE (cups-1.5.2-source.tar.bz2) = 9595665

print/cups/patches/patch-Makedefs_in

@@ -1,25 +1,23 @@
-$OpenBSD: patch-Makedefs_in,v 1.6 2011/09/08 10:33:12 ajacoutot Exp $
+$OpenBSD: patch-Makedefs_in,v 1.7 2012/02/16 22:12:08 ajacoutot Exp $
+
+BSD_INSTALL_PROGRAM is used to respect INSTALL_STRIP.
+
 --- Makedefs.in.orig	Wed May  4 06:28:00 2011
-+++ Makedefs.in	Fri Sep  2 10:42:54 2011
-@@ -41,13 +41,13 @@ SHELL		=	/bin/sh
++++ Makedefs.in	Mon Feb  6 11:27:07 2012
+@@ -41,11 +41,11 @@ SHELL		=	/bin/sh
  # Installation programs...
  #
  
 -INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m $(BINMODE) @INSTALL_STRIP@
++INSTALL_BIN	=	$(LIBTOOL) $(BSD_INSTALL_PROGRAM)
  INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_DATA	=	$(INSTALL) -c -m 444
-+INSTALL_DATA	=	$(INSTALL) -c -m $(SHAREMODE)
+ INSTALL_DATA	=	$(INSTALL) -c -m 444
  INSTALL_DIR	=	$(INSTALL) -d
 -INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_MAN	=	$(INSTALL) -c -m 444
--INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
-+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m $(BINMODE) @INSTALL_STRIP@
-+INSTALL_MAN	=	$(INSTALL) -c -m $(SHAREMODE)
-+INSTALL_SCRIPT	=	$(INSTALL) -c -m $(BINMODE)
++INSTALL_LIB	=	$(LIBTOOL) $(BSD_INSTALL_PROGRAM)
+ INSTALL_MAN	=	$(INSTALL) -c -m 444
+ INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
  
- #
- # Default user, group, and system groups for the scheduler...
 @@ -84,15 +84,15 @@ LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
  LIBCUPSMIME	=	@LIBCUPSMIME@
  LIBCUPSPPDC	=	@LIBCUPSPPDC@

print/cups/patches/patch-backend_ipp_c

@@ -0,0 +1,24 @@
+$OpenBSD: patch-backend_ipp_c,v 1.1 2012/02/16 22:12:08 ajacoutot Exp $
+
+Increase timeout so that it doesn't fail on low-end configurations.
+
+--- backend/ipp.c.orig	Mon Feb  6 11:17:34 2012
++++ backend/ipp.c	Mon Feb  6 11:17:43 2012
+@@ -634,7 +634,7 @@ main(int  argc,				/* I - Number of command-line args 
+   }
+ 
+   http = _httpCreate(hostname, port, addrlist, cupsEncryption(), AF_UNSPEC);
+-  httpSetTimeout(http, 30.0, timeout_cb, NULL);
++  httpSetTimeout(http, 90.0, timeout_cb, NULL);
+ 
+  /*
+   * See if the printer supports SNMP...
+@@ -1980,7 +1980,7 @@ monitor_printer(
+ 
+   http = _httpCreate(monitor->hostname, monitor->port, NULL, monitor->encryption,
+                      AF_UNSPEC);
+-  httpSetTimeout(http, 30.0, timeout_cb, NULL);
++  httpSetTimeout(http, 90.0, timeout_cb, NULL);
+   cupsSetPasswordCB(password_cb);
+ 
+  /*

print/cups/patches/patch-cgi-bin_admin_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-cgi-bin_admin_c,v 1.7 2011/06/28 11:52:38 ajacoutot Exp $
---- cgi-bin/admin.c.orig	Fri Mar  4 20:28:38 2011
-+++ cgi-bin/admin.c	Tue Jun 28 13:32:08 2011
-@@ -858,7 +858,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
- 		*uriptr;		/* Pointer into URI */
-   int		maxrate;		/* Maximum baud rate */
-   char		baudrate[255];		/* Baud rate string */
--  const char	*name,			/* Pointer to class name */
-+  const signed char	*name,			/* Pointer to class name */
- 		*ptr;			/* Pointer to CGI variable */
-   const char	*title;			/* Title of page */
-   static int	baudrates[] =		/* Baud rates */

print/cups/patches/patch-config-scripts_cups-common_m4

@@ -1,7 +1,7 @@
-$OpenBSD: patch-config-scripts_cups-common_m4,v 1.6 2011/09/08 10:33:12 ajacoutot Exp $
---- config-scripts/cups-common.m4.orig	Mon Jul 25 22:24:24 2011
-+++ config-scripts/cups-common.m4	Fri Sep  2 09:33:11 2011
-@@ -133,7 +133,6 @@ AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
+$OpenBSD: patch-config-scripts_cups-common_m4,v 1.7 2012/02/16 22:12:08 ajacoutot Exp $
+--- config-scripts/cups-common.m4.orig	Sun Feb  5 19:56:14 2012
++++ config-scripts/cups-common.m4	Mon Feb  6 11:14:32 2012
+@@ -134,7 +134,6 @@ AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
  AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H))
  AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
  AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H))

print/cups/patches/patch-cups_http_c

@@ -1,22 +1,10 @@
-$OpenBSD: patch-cups_http_c,v 1.8 2011/10/15 07:20:43 ajacoutot Exp $
-
-Increase timeout for the PPD file to be copied so that it doesn't fail
-on low-end configurations.
+$OpenBSD: patch-cups_http_c,v 1.9 2012/02/16 22:12:08 ajacoutot Exp $
 
 Fix build on gcc-2.95 archs.
 
---- cups/http.c.orig	Thu Jun 16 22:12:16 2011
-+++ cups/http.c	Sat Oct 15 09:18:38 2011
-@@ -1314,7 +1314,7 @@ httpGets(char   *line,			/* I - Line to read into */
-       * No newline; see if there is more data to be read...
-       */
- 
--      while (!_httpWait(http, http->blocking ? 30000 : 10000, 1))
-+      while (!_httpWait(http, http->blocking ? 90000 : 10000, 1))
-       {
- 	if (http->timeout_cb && (*http->timeout_cb)(http, http->timeout_data))
- 	  continue;
-@@ -1469,6 +1469,8 @@ httpInitialize(void)
+--- cups/http.c.orig	Fri Dec 16 08:16:04 2011
++++ cups/http.c	Mon Feb  6 11:14:32 2012
+@@ -1481,6 +1481,8 @@ httpInitialize(void)
    static int	initialized = 0;	/* Have we been called before? */
  #ifdef WIN32
    WSADATA	winsockdata;		/* WinSock data */
@@ -25,7 +13,7 @@ Fix build on gcc-2.95 archs.
  #endif /* WIN32 */
  #ifdef HAVE_LIBSSL
    int		i;			/* Looping var */
-@@ -1495,7 +1497,6 @@ httpInitialize(void)
+@@ -1507,7 +1509,6 @@ httpInitialize(void)
    sigset(SIGPIPE, SIG_IGN);
  
  #  elif defined(HAVE_SIGACTION)

print/cups/patches/patch-filter_Makefile

@@ -1,6 +1,6 @@
-$OpenBSD: patch-filter_Makefile,v 1.9 2011/09/08 10:33:12 ajacoutot Exp $
---- filter/Makefile.orig	Fri Apr  1 07:55:27 2011
-+++ filter/Makefile	Fri Sep  2 09:33:11 2011
+$OpenBSD: patch-filter_Makefile,v 1.10 2012/02/16 22:12:08 ajacoutot Exp $
+--- filter/Makefile.orig	Fri Sep  9 18:34:29 2011
++++ filter/Makefile	Mon Feb  6 11:18:46 2012
 @@ -150,10 +150,6 @@ install-headers:
  install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
  	$(INSTALL_DIR) -m 755 $(LIBDIR)
@@ -65,7 +65,7 @@ $OpenBSD: patch-filter_Makefile,v 1.9 2011/09/08 10:33:12 ajacoutot Exp $
 +libcupsimage.so.${LIBcupsimage_VERSION} libcupsimage.sl.2:	$(IMAGEOBJS)
  	echo Linking $@...
  	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
- 		-L../cups $(LINKCUPS) -lm
+ 		-L../cups $(LINKCUPS)
 -	$(RM) `basename $@ .2`
 -	$(LN) $@ `basename $@ .2`
  

print/cups/patches/patch-filter_image-gif_c

@@ -1,36 +0,0 @@
-$OpenBSD: patch-filter_image-gif_c,v 1.2 2011/08/31 12:43:08 ajacoutot Exp $
-
-CVE-2011-2896 GIF decoder LZW decoder buffer overflow
-
---- filter/image-gif.c.orig	Mon Jun 20 22:37:51 2011
-+++ filter/image-gif.c	Wed Aug 31 14:37:19 2011
-@@ -648,11 +648,13 @@ gif_read_lzw(FILE *fp,			/* I - File to read from */
- 
-     if (code == max_code)
-     {
--      *sp++ = firstcode;
--      code  = oldcode;
-+      if (sp < (stack + 8192))
-+	*sp++ = firstcode;
-+
-+      code = oldcode;
-     }
- 
--    while (code >= clear_code)
-+    while (code >= clear_code && sp < (stack + 8192))
-     {
-       *sp++ = table[1][code];
-       if (code == table[0][code])
-@@ -661,8 +663,10 @@ gif_read_lzw(FILE *fp,			/* I - File to read from */
-       code = table[0][code];
-     }
- 
--    *sp++ = firstcode = table[1][code];
--    code  = max_code;
-+    if (sp < (stack + 8192))
-+      *sp++ = firstcode = table[1][code];
-+
-+    code = max_code;
- 
-     if (code < 4096)
-     {

print/cups/patches/patch-scheduler_cups-driverd_cxx

@@ -1,17 +0,0 @@
-$OpenBSD: patch-scheduler_cups-driverd_cxx,v 1.2 2011/09/30 07:34:00 ajacoutot Exp $
-
-http://www.cups.org/str.php?L3921
-
---- scheduler/cups-driverd.cxx.orig	Wed Jun  8 23:19:11 2011
-+++ scheduler/cups-driverd.cxx	Thu Sep 29 21:00:20 2011
-@@ -1411,9 +1411,7 @@ load_drv(const char  *filename,		/* I - Actual filenam
-   * Add a dummy entry for the file...
-   */
- 
--  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "drv", "", "", 0,
--		   "/%s", name);
--  add_ppd(name, uri, "", "", "", "", "", "", mtime, size, 0,
-+  add_ppd(name, name, "", "", "", "", "", "", mtime, size, 0,
-           PPD_TYPE_DRV, "drv");
-   ChangedPPD = 1;
- 

print/cups/patches/patch-scheduler_ipp_c

@@ -1,11 +1,11 @@
-$OpenBSD: patch-scheduler_ipp_c,v 1.8 2011/10/15 07:20:43 ajacoutot Exp $
+$OpenBSD: patch-scheduler_ipp_c,v 1.9 2012/02/16 22:12:08 ajacoutot Exp $
 
 Increase timeout for the PPD file to be copied so that it doesn't fail
 on low-end configurations.
 
---- scheduler/ipp.c.orig	Mon Jun 13 22:45:23 2011
-+++ scheduler/ipp.c	Sat Oct 15 09:17:36 2011
-@@ -5714,7 +5714,7 @@ copy_model(cupsd_client_t *con,		/* I - Client connect
+--- scheduler/ipp.c.orig	Mon Nov  7 07:08:44 2011
++++ scheduler/ipp.c	Mon Feb  6 11:14:33 2012
+@@ -5717,7 +5717,7 @@ copy_model(cupsd_client_t *con,		/* I - Client connect
    close(temppipe[1]);
  
   /*
@@ -14,7 +14,7 @@ on low-end configurations.
    */
  
    total = 0;
-@@ -5734,7 +5734,7 @@ copy_model(cupsd_client_t *con,		/* I - Client connect
+@@ -5737,7 +5737,7 @@ copy_model(cupsd_client_t *con,		/* I - Client connect
      FD_SET(temppipe[0], &input);
      FD_SET(CGIPipes[0], &input);
  

print/cups/patches/patch-scheduler_log_c

@@ -0,0 +1,24 @@
+$OpenBSD: patch-scheduler_log_c,v 1.1 2012/02/16 22:12:08 ajacoutot Exp $
+
+log.c:289: warning: passing argument 1 of 'localtime' from incompatible pointer type
+
+--- scheduler/log.c.orig	Mon Feb  6 13:30:19 2012
++++ scheduler/log.c	Mon Feb  6 13:31:24 2012
+@@ -235,6 +235,7 @@ char *					/* O - Date/time string */
+ cupsdGetDateTime(struct timeval *t,	/* I - Time value or NULL for current */
+                  cupsd_time_t   format)	/* I - Format to use */
+ {
++  time_t tmp;
+   struct timeval	curtime;	/* Current time value */
+   struct tm		*date;		/* Date/time value */
+   static struct timeval	last_time = { 0, 0 };
+@@ -286,7 +287,8 @@ cupsdGetDateTime(struct timeval *t,	/* I - Time value 
+     * (*BSD and Darwin store the timezone offset in the tm structure)
+     */
+ 
+-    date = localtime(&(t->tv_sec));
++    tmp = t->tv_sec;
++    date = localtime (&tmp);
+ 
+     if (format == CUPSD_TIME_STANDARD)
+       snprintf(s, sizeof(s), "[%02d/%s/%04d:%02d:%02d:%02d %+03ld%02ld]",

print/cups/patches/patch-scheduler_main_c

@@ -0,0 +1,17 @@
+$OpenBSD: patch-scheduler_main_c,v 1.6 2012/02/16 22:12:08 ajacoutot Exp $
+
+main.c:376: warning: implicit declaration of function '_thread_sys_closefrom'
+(XXX rework after rthreads are enabled)
+
+--- scheduler/main.c.orig	Mon Feb  6 14:02:24 2012
++++ scheduler/main.c	Mon Feb  6 14:03:01 2012
+@@ -69,6 +69,9 @@
+ #  include <notify.h>
+ #endif /* HAVE_NOTIFY_H */
+ 
++#ifdef __OpenBSD__
++int	_thread_sys_closefrom(int);
++#endif
+ 
+ /*
+  * Local functions...

print/cups/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.37 2012/02/02 07:11:19 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.38 2012/02/16 22:12:08 ajacoutot Exp $
 @conflict LPRng-*
 @newgroup _cups:541
 @newuser _cups:541:541:daemon:CUPS printer spooler daemon:/var/empty:/sbin/nologin
@@ -195,12 +195,23 @@ share/cups/fonts/Monospace-Bold
 share/cups/fonts/Monospace-BoldOblique
 share/cups/fonts/Monospace-Oblique
 share/cups/ipptool/
+share/cups/ipptool/color.jpg
 share/cups/ipptool/create-printer-subscription.test
+share/cups/ipptool/document-a4.pdf
+share/cups/ipptool/document-a4.ps
+share/cups/ipptool/document-letter.pdf
+share/cups/ipptool/document-letter.ps
 share/cups/ipptool/get-completed-jobs.test
 share/cups/ipptool/get-jobs.test
+share/cups/ipptool/gray.jpg
 share/cups/ipptool/ipp-1.1.test
 share/cups/ipptool/ipp-2.0.test
 share/cups/ipptool/ipp-2.1.test
+share/cups/ipptool/ipp-2.2.test
+share/cups/ipptool/onepage-a4.pdf
+share/cups/ipptool/onepage-a4.ps
+share/cups/ipptool/onepage-letter.pdf
+share/cups/ipptool/onepage-letter.ps
 share/cups/ipptool/testfile.jpg
 share/cups/ipptool/testfile.pdf
 share/cups/ipptool/testfile.ps
@@ -454,10 +465,152 @@ share/cups/templates/eu/subscription-canceled.tmpl
 share/cups/templates/eu/test-page.tmpl
 share/cups/templates/eu/trailer.tmpl
 share/cups/templates/eu/users.tmpl
+share/cups/templates/fr/
+share/cups/templates/fr/add-class.tmpl
+share/cups/templates/fr/add-printer.tmpl
+share/cups/templates/fr/add-rss-subscription.tmpl
+share/cups/templates/fr/admin.tmpl
+share/cups/templates/fr/choose-device.tmpl
+share/cups/templates/fr/choose-make.tmpl
+share/cups/templates/fr/choose-model.tmpl
+share/cups/templates/fr/choose-serial.tmpl
+share/cups/templates/fr/choose-uri.tmpl
+share/cups/templates/fr/class-added.tmpl
+share/cups/templates/fr/class-confirm.tmpl
+share/cups/templates/fr/class-deleted.tmpl
+share/cups/templates/fr/class-jobs-header.tmpl
+share/cups/templates/fr/class-modified.tmpl
+share/cups/templates/fr/class.tmpl
+share/cups/templates/fr/classes-header.tmpl
+share/cups/templates/fr/classes.tmpl
+share/cups/templates/fr/command.tmpl
+share/cups/templates/fr/edit-config.tmpl
+share/cups/templates/fr/error-op.tmpl
+share/cups/templates/fr/error.tmpl
+share/cups/templates/fr/header.tmpl
+share/cups/templates/fr/help-header.tmpl
+share/cups/templates/fr/help-printable.tmpl
+share/cups/templates/fr/help-trailer.tmpl
+share/cups/templates/fr/job-cancel.tmpl
+share/cups/templates/fr/job-hold.tmpl
+share/cups/templates/fr/job-move.tmpl
+share/cups/templates/fr/job-moved.tmpl
+share/cups/templates/fr/job-release.tmpl
+share/cups/templates/fr/job-restart.tmpl
+share/cups/templates/fr/jobs-header.tmpl
+share/cups/templates/fr/jobs.tmpl
+share/cups/templates/fr/list-available-printers.tmpl
+share/cups/templates/fr/modify-class.tmpl
+share/cups/templates/fr/modify-printer.tmpl
+share/cups/templates/fr/norestart.tmpl
+share/cups/templates/fr/option-boolean.tmpl
+share/cups/templates/fr/option-conflict.tmpl
+share/cups/templates/fr/option-header.tmpl
+share/cups/templates/fr/option-pickmany.tmpl
+share/cups/templates/fr/option-pickone.tmpl
+share/cups/templates/fr/option-trailer.tmpl
+share/cups/templates/fr/pager.tmpl
+share/cups/templates/fr/printer-accept.tmpl
+share/cups/templates/fr/printer-added.tmpl
+share/cups/templates/fr/printer-configured.tmpl
+share/cups/templates/fr/printer-confirm.tmpl
+share/cups/templates/fr/printer-default.tmpl
+share/cups/templates/fr/printer-deleted.tmpl
+share/cups/templates/fr/printer-jobs-header.tmpl
+share/cups/templates/fr/printer-modified.tmpl
+share/cups/templates/fr/printer-purge.tmpl
+share/cups/templates/fr/printer-reject.tmpl
+share/cups/templates/fr/printer-start.tmpl
+share/cups/templates/fr/printer-stop.tmpl
+share/cups/templates/fr/printer.tmpl
+share/cups/templates/fr/printers-header.tmpl
+share/cups/templates/fr/printers.tmpl
+share/cups/templates/fr/restart.tmpl
+share/cups/templates/fr/samba-export.tmpl
+share/cups/templates/fr/samba-exported.tmpl
+share/cups/templates/fr/search.tmpl
+share/cups/templates/fr/set-printer-options-header.tmpl
+share/cups/templates/fr/set-printer-options-trailer.tmpl
+share/cups/templates/fr/subscription-added.tmpl
+share/cups/templates/fr/subscription-canceled.tmpl
+share/cups/templates/fr/test-page.tmpl
+share/cups/templates/fr/trailer.tmpl
+share/cups/templates/fr/users.tmpl
 share/cups/templates/header.tmpl
 share/cups/templates/help-header.tmpl
 share/cups/templates/help-printable.tmpl
 share/cups/templates/help-trailer.tmpl
+share/cups/templates/hu/
+share/cups/templates/hu/add-class.tmpl
+share/cups/templates/hu/add-printer.tmpl
+share/cups/templates/hu/add-rss-subscription.tmpl
+share/cups/templates/hu/admin.tmpl
+share/cups/templates/hu/choose-device.tmpl
+share/cups/templates/hu/choose-make.tmpl
+share/cups/templates/hu/choose-model.tmpl
+share/cups/templates/hu/choose-serial.tmpl
+share/cups/templates/hu/choose-uri.tmpl
+share/cups/templates/hu/class-added.tmpl
+share/cups/templates/hu/class-confirm.tmpl
+share/cups/templates/hu/class-deleted.tmpl
+share/cups/templates/hu/class-jobs-header.tmpl
+share/cups/templates/hu/class-modified.tmpl
+share/cups/templates/hu/class.tmpl
+share/cups/templates/hu/classes-header.tmpl
+share/cups/templates/hu/classes.tmpl
+share/cups/templates/hu/command.tmpl
+share/cups/templates/hu/edit-config.tmpl
+share/cups/templates/hu/error-op.tmpl
+share/cups/templates/hu/error.tmpl
+share/cups/templates/hu/header.tmpl
+share/cups/templates/hu/help-header.tmpl
+share/cups/templates/hu/help-printable.tmpl
+share/cups/templates/hu/help-trailer.tmpl
+share/cups/templates/hu/job-cancel.tmpl
+share/cups/templates/hu/job-hold.tmpl
+share/cups/templates/hu/job-move.tmpl
+share/cups/templates/hu/job-moved.tmpl
+share/cups/templates/hu/job-release.tmpl
+share/cups/templates/hu/job-restart.tmpl
+share/cups/templates/hu/jobs-header.tmpl
+share/cups/templates/hu/jobs.tmpl
+share/cups/templates/hu/list-available-printers.tmpl
+share/cups/templates/hu/modify-class.tmpl
+share/cups/templates/hu/modify-printer.tmpl
+share/cups/templates/hu/norestart.tmpl
+share/cups/templates/hu/option-boolean.tmpl
+share/cups/templates/hu/option-conflict.tmpl
+share/cups/templates/hu/option-header.tmpl
+share/cups/templates/hu/option-pickmany.tmpl
+share/cups/templates/hu/option-pickone.tmpl
+share/cups/templates/hu/option-trailer.tmpl
+share/cups/templates/hu/pager.tmpl
+share/cups/templates/hu/printer-accept.tmpl
+share/cups/templates/hu/printer-added.tmpl
+share/cups/templates/hu/printer-configured.tmpl
+share/cups/templates/hu/printer-confirm.tmpl
+share/cups/templates/hu/printer-default.tmpl
+share/cups/templates/hu/printer-deleted.tmpl
+share/cups/templates/hu/printer-jobs-header.tmpl
+share/cups/templates/hu/printer-modified.tmpl
+share/cups/templates/hu/printer-purge.tmpl
+share/cups/templates/hu/printer-reject.tmpl
+share/cups/templates/hu/printer-start.tmpl
+share/cups/templates/hu/printer-stop.tmpl
+share/cups/templates/hu/printer.tmpl
+share/cups/templates/hu/printers-header.tmpl
+share/cups/templates/hu/printers.tmpl
+share/cups/templates/hu/restart.tmpl
+share/cups/templates/hu/samba-export.tmpl
+share/cups/templates/hu/samba-exported.tmpl
+share/cups/templates/hu/search.tmpl
+share/cups/templates/hu/set-printer-options-header.tmpl
+share/cups/templates/hu/set-printer-options-trailer.tmpl
+share/cups/templates/hu/subscription-added.tmpl
+share/cups/templates/hu/subscription-canceled.tmpl
+share/cups/templates/hu/test-page.tmpl
+share/cups/templates/hu/trailer.tmpl
+share/cups/templates/hu/users.tmpl
 share/cups/templates/id/
 share/cups/templates/id/add-class.tmpl
 share/cups/templates/id/add-printer.tmpl
@@ -866,6 +1019,8 @@ share/doc/cups/es/
 share/doc/cups/es/index.html
 share/doc/cups/eu/
 share/doc/cups/eu/index.html
+share/doc/cups/fr/
+share/doc/cups/fr/index.html
 share/doc/cups/help/
 share/doc/cups/help/accounting.html
 share/doc/cups/help/api-array.html
@@ -951,6 +1106,8 @@ share/doc/cups/help/spec-stp.html
 share/doc/cups/help/standard.html
 share/doc/cups/help/translation.html
 share/doc/cups/help/whatsnew.html
+share/doc/cups/hu/
+share/doc/cups/hu/index.html
 share/doc/cups/id/
 share/doc/cups/id/index.html
 share/doc/cups/images/
@@ -994,10 +1151,13 @@ share/examples/cups/cupsd.conf.default
 share/examples/cups/dbus-1/
 share/examples/cups/dbus-1/system.d/
 share/examples/cups/dbus-1/system.d/system.d/
-@group _cups
+@group wheel
 share/examples/cups/dbus-1/system.d/system.d/cups.conf
+@group
 @sample ${SYSCONFDIR}/dbus-1/system.d/cups.conf
+@group _cups
 share/examples/cups/interfaces/
+@sample ${SYSCONFDIR}/cups/interfaces/
 share/examples/cups/ppd/
 @sample ${SYSCONFDIR}/cups/ppd/
 share/examples/cups/snmp.conf
@@ -1009,25 +1169,46 @@ share/examples/cups/ssl/
 @sample ${SYSCONFDIR}/cups/ssl/
 @mode
 @group
+share/locale/
+share/locale/da/
 share/locale/da/cups_da.po
+share/locale/de/
 share/locale/de/cups_de.po
+share/locale/es/
 share/locale/es/cups_es.po
+share/locale/eu/
 share/locale/eu/cups_eu.po
+share/locale/fi/
 share/locale/fi/cups_fi.po
+share/locale/fr/
 share/locale/fr/cups_fr.po
+share/locale/hu/
+share/locale/hu/cups_hu.po
+share/locale/id/
 share/locale/id/cups_id.po
+share/locale/it/
 share/locale/it/cups_it.po
+share/locale/ja/
 share/locale/ja/cups_ja.po
+share/locale/ko/
 share/locale/ko/cups_ko.po
+share/locale/nl/
 share/locale/nl/cups_nl.po
+share/locale/no/
 share/locale/no/cups_no.po
+share/locale/pl/
 share/locale/pl/cups_pl.po
+share/locale/pt/
 share/locale/pt/cups_pt.po
+share/locale/pt_BR/
 share/locale/pt_BR/cups_pt_BR.po
+share/locale/ru/
 share/locale/ru/cups_ru.po
+share/locale/sv/
 share/locale/sv/cups_sv.po
 share/locale/zh/
 share/locale/zh/cups_zh.po
+share/locale/zh_TW/
 share/locale/zh_TW/cups_zh_TW.po
 @owner _cups
 @group _cups

print/cups/pkg/README

@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.13 2012/02/02 07:11:19 ajacoutot Exp $
+$OpenBSD: README,v 1.14 2012/02/16 22:12:08 ajacoutot Exp $
 
 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
@@ -9,10 +9,12 @@ for a quick and easy (graphical) setup, after starting the CUPS daemon,
 point your browser to:
     http://localhost:631
 
-If you want to print to non-Postscript printers or use CUPS bundled PPD
-files (i.e. drivers), you'll need to install gstoraster.  You will also
-most probably want to install foomatic-filters which provides a
-universal filter script along with the foomatic-db-engine package which
+If you plan on printing non-Postscript files, the "ghostscript" package
+needs to be installed.
+
+By default, CUPS only supports a handful amount of printers -- you will
+most probably want to install the "foomatic-filters" packages which
+provides a universal filter script along with "foomatic-db-engine" which
 will allow you to generate a PPD (Printer Postscript Description) file
 for your printer.
 
@@ -21,7 +23,7 @@ package like (non-exhaustive list): hplip/hpijs, gutenprint, foo2zjs,
 splix...
 
 To be able to use CUPS printers from GTK applications, the corresponding
-package needs to be installed: gtk+2-cups and/or gtk+3-cups.
+package needs to be installed: "gtk+2-cups" and/or "gtk+3-cups".
 
 USB
 ===
@@ -39,6 +41,9 @@ addr 1: full speed, self powered, config 1, OHCI root hub(0x0000), ATI(0x1002),
 
 $ sudo chown _cups /dev/ugen0.* /dev/usb3
 
+Alternatively, hotplugd(4) attach/detach scripts can be used to automate
+this.
+
 The reason we are changing the user and not the group is that it will
 allow for multi-function devices to work for both printing and scanning
 (e.g. by being owned by _cups:_saned).

print/cups/pkg/cupsd.rc

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: cupsd.rc,v 1.10 2012/02/02 07:11:19 ajacoutot Exp $
+# $OpenBSD: cupsd.rc,v 1.11 2012/02/16 22:12:08 ajacoutot Exp $
 
 daemon="${TRUEPREFIX}/sbin/cupsd"
 
@@ -29,8 +29,9 @@ rc_pre() {
 			fi
 		done
 	fi
-	if [ -f /etc/printcap -a ! -f /etc/printcap.pre-cups ]; then
-		cp -f /etc/printcap /etc/printcap.pre-cups
+	if [ -e /etc/printcap -a ! -e /etc/printcap.pre-cups ]; then
+		mv /etc/printcap /etc/printcap.pre-cups
+		ln -s ${SYSCONFDIR}/cups/printcap /etc/printcap
 	fi
 	for i in lpq lpr lprm; do
 		rm -f /usr/bin/$i