Tue Jan 22 23:58:14 2008 UTC ()
Update cups to 1.3.5

Adds dns-sd support and Negotiate authentication (kerberos)
various bug fixes.


(markd)
diff -r1.130 -r1.131 pkgsrc/print/cups/Makefile
diff -r1.21 -r1.22 pkgsrc/print/cups/PLIST
diff -r1.53 -r1.54 pkgsrc/print/cups/distinfo
diff -r0 -r1.1 pkgsrc/print/cups/options.mk
diff -r1.17 -r1.18 pkgsrc/print/cups/patches/patch-ab
diff -r1.8 -r1.9 pkgsrc/print/cups/patches/patch-an
diff -r1.7 -r1.8 pkgsrc/print/cups/patches/patch-ao
diff -r1.9 -r0 pkgsrc/print/cups/patches/patch-au
cvs diff -r1.130 -r1.131 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2008/01/18 05:08:53 1.130
+++ pkgsrc/print/cups/Makefile 2008/01/22 23:58:13 1.131
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1# $NetBSD: Makefile,v 1.130 2008/01/18 05:08:53 tnn Exp $ 1# $NetBSD: Makefile,v 1.131 2008/01/22 23:58:13 markd Exp $
2# 2#
3# The CUPS author is very good about taking back changes into the main 3# The CUPS author is very good about taking back changes into the main
4# CUPS distribution. The correct place to send patches or bug-fixes is: 4# CUPS distribution. The correct place to send patches or bug-fixes is:
5# cups-bugs@cups.org. 5# cups-bugs@cups.org.
6 6
7DISTNAME= cups-${DIST_VERS}-source 7DISTNAME= cups-${DIST_VERS}-source
8PKGNAME= cups-${VERS} 8PKGNAME= cups-${VERS}
9BASE_VERS= 1.2.12 9BASE_VERS= 1.3.5
10DIST_VERS= ${BASE_VERS} 10DIST_VERS= ${BASE_VERS}
11VERS= ${DIST_VERS:S/-/./g} 11VERS= ${DIST_VERS:S/-/./g}
12PKGREVISION= 3 
13CATEGORIES= print 12CATEGORIES= print
14MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ 13MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
15 ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \ 14 ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
16 ftp://ftp3.easysw.com/pub/cups/${BASE_VERS}/ \ 15 ftp://ftp3.easysw.com/pub/cups/${BASE_VERS}/ \
17 ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \ 16 ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \
18 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/ \ 17 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/ \
19 ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${BASE_VERS}/ \ 18 ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${BASE_VERS}/ \
20 ftp://ftp.fisek.com.tr/pub/cups/${BASE_VERS}/ 19 ftp://ftp.fisek.com.tr/pub/cups/${BASE_VERS}/
21EXTRACT_SUFX= .tar.bz2 20EXTRACT_SUFX= .tar.bz2
22 21
23MAINTAINER= jlam@pkgsrc.org 22MAINTAINER= jlam@pkgsrc.org
24HOMEPAGE= http://www.cups.org/ 23HOMEPAGE= http://www.cups.org/
25COMMENT= Common UNIX Printing System 24COMMENT= Common UNIX Printing System
@@ -42,59 +41,38 @@ AUTOCONF_REQD= 2.60 @@ -42,59 +41,38 @@ AUTOCONF_REQD= 2.60
42 41
43GNU_CONFIGURE= yes 42GNU_CONFIGURE= yes
44CONFIGURE_ARGS+= --with-localedir=${PREFIX}/${PKGLOCALEDIR}/locale 43CONFIGURE_ARGS+= --with-localedir=${PREFIX}/${PKGLOCALEDIR}/locale
45CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} 44CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
46CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 45CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
47CONFIGURE_ARGS+= --with-cachedir=${VARBASE:Q}/cache/cups 46CONFIGURE_ARGS+= --with-cachedir=${VARBASE:Q}/cache/cups
48CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 47CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
49CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 48CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
50CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR:Q} 49CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR:Q}
51CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER:Q} 50CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER:Q}
52CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP:Q} 51CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP:Q}
53CONFIGURE_ARGS+= --with-manext=bsd 52CONFIGURE_ARGS+= --with-manext=bsd
54CONFIGURE_ARGS+= --without-perl 53CONFIGURE_ARGS+= --without-perl
 54CONFIGURE_ARGS+= --without-icondir
 55CONFIGURE_ARGS+= --without-menudir
55CONFIGURE_ARGS+= --enable-libtool 56CONFIGURE_ARGS+= --enable-libtool
56CONFIGURE_ARGS+= --enable-ssl 57CONFIGURE_ARGS+= --enable-ssl
57CONFIGURE_ARGS+= --enable-gnutls=no 58CONFIGURE_ARGS+= --enable-gnutls=no
58CONFIGURE_ARGS+= --enable-openssl 59CONFIGURE_ARGS+= --enable-openssl
59CONFIGURE_ARGS+= --without-php 60CONFIGURE_ARGS+= --without-php
60 61
61CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 62CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
62 63
63.include "../../mk/bsd.prefs.mk" 64.include "../../mk/bsd.prefs.mk"
64 65.include "options.mk"
65PKG_OPTIONS_VAR= PKG_OPTIONS.cups 
66PKG_SUPPORTED_OPTIONS= pam slp 
67PKG_SUGGESTED_OPTIONS= slp 
68.include "../../mk/bsd.options.mk" 
69 
70.if !empty(PKG_OPTIONS:Mpam) 
71. include "../../mk/pam.buildlink3.mk" 
72CONFIGURE_ARGS+= --enable-pam 
73MESSAGE_SRC= ${PKGDIR}/MESSAGE 
74MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam 
75PLIST_SUBST+= PAM= 
76.else 
77CONFIGURE_ARGS+= --disable-pam 
78MESSAGE_SRC= ${.CURDIR}/MESSAGE 
79PLIST_SUBST+= PAM="@comment " 
80.endif 
81 
82.if !empty(PKG_OPTIONS:Mslp) 
83.include "../../net/openslp/buildlink3.mk" 
84CONFIGURE_ARGS+= --enable-slp 
85.else 
86CONFIGURE_ARGS+= --disable-slp 
87.endif 
88 66
89# CUPS_USER username of the CUPS administrator 67# CUPS_USER username of the CUPS administrator
90# CUPS_GROUP group of the CUPS administrator 68# CUPS_GROUP group of the CUPS administrator
91# 69#
92CUPS_USER?= lp 70CUPS_USER?= lp
93CUPS_GROUP?= sys 71CUPS_GROUP?= sys
94FILES_SUBST+= CUPS_USER=${CUPS_USER:Q} 72FILES_SUBST+= CUPS_USER=${CUPS_USER:Q}
95FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP:Q} 73FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP:Q}
96 74
97PKG_GROUPS_VARS+= CUPS_GROUP 75PKG_GROUPS_VARS+= CUPS_GROUP
98PKG_USERS_VARS+= CUPS_USER 76PKG_USERS_VARS+= CUPS_USER
99 77
100BUILD_DEFS+= VARBASE 78BUILD_DEFS+= VARBASE
@@ -149,27 +127,27 @@ INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} @@ -149,27 +127,27 @@ INSTALLATION_DIRS= ${DOCDIR} ${EGDIR}
149INSTALL_ENV+= DSTROOT=${DESTDIR:Q} 127INSTALL_ENV+= DSTROOT=${DESTDIR:Q}
150 128
151pre-configure: 129pre-configure:
152 cd ${WRKSRC} && aclocal && autoconf 130 cd ${WRKSRC} && aclocal && autoconf
153 131
154post-extract: 132post-extract:
155 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam 133 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
156 134
157post-install: 135post-install:
158 for file in LICENSE.txt README.txt; do \ 136 for file in LICENSE.txt README.txt; do \
159 ${INSTALL_DATA} ${WRKSRC}/$${file} \ 137 ${INSTALL_DATA} ${WRKSRC}/$${file} \
160 ${DESTDIR}${DOCDIR}/$${file}; \ 138 ${DESTDIR}${DOCDIR}/$${file}; \
161 done 139 done
162 cd ${WRKSRC}/conf; for file in *.conf mime.*; do \ 140 cd ${WRKSRC}/conf; for file in *.conf mime.convs mime.types; do \
163 case $${file} in \ 141 case $${file} in \
164 pam.conf) \ 142 pam.conf) \
165 ;; \ 143 ;; \
166 *) \ 144 *) \
167 ${INSTALL_DATA} $${file} \ 145 ${INSTALL_DATA} $${file} \
168 ${DESTDIR}${EGDIR}/$${file}; \ 146 ${DESTDIR}${EGDIR}/$${file}; \
169 ;; \ 147 ;; \
170 esac; \ 148 esac; \
171 done 149 done
172.if !empty(PKG_OPTIONS:Mpam) 150.if !empty(PKG_OPTIONS:Mpam)
173 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR} 151 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
174.endif 152.endif
175 153
cvs diff -r1.21 -r1.22 pkgsrc/print/cups/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/PLIST 2007/06/06 11:14:27 1.21
+++ pkgsrc/print/cups/Attic/PLIST 2008/01/22 23:58:13 1.22
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1@comment $NetBSD: PLIST,v 1.21 2007/06/06 11:14:27 markd Exp $ 1@comment $NetBSD: PLIST,v 1.22 2008/01/22 23:58:13 markd Exp $
2bin/cancel 2bin/cancel
3bin/cups-config 3bin/cups-config
4bin/cupstestdsc 4bin/cupstestdsc
5bin/cupstestppd 5bin/cupstestppd
6bin/lp 6bin/lp
7bin/lpoptions 7bin/lpoptions
8bin/lppasswd 8bin/lppasswd
9bin/lpq 9bin/lpq
10bin/lpr 10bin/lpr
11bin/lprm 11bin/lprm
12bin/lpstat 12bin/lpstat
13include/cups/adminutil.h 13include/cups/adminutil.h
14include/cups/array.h 14include/cups/array.h
15include/cups/backend.h 15include/cups/backend.h
16include/cups/cups.h 16include/cups/cups.h
17include/cups/dir.h 17include/cups/dir.h
18include/cups/file.h 18include/cups/file.h
19include/cups/http.h 19include/cups/http.h
20include/cups/i18n.h 20include/cups/i18n.h
21include/cups/image.h 21include/cups/image.h
22include/cups/ipp.h 22include/cups/ipp.h
23include/cups/language.h 23include/cups/language.h
24include/cups/md5.h 
25include/cups/ppd.h 24include/cups/ppd.h
26include/cups/raster.h 25include/cups/raster.h
 26include/cups/sidechannel.h
27include/cups/transcode.h 27include/cups/transcode.h
28lib/libcups.la 28lib/libcups.la
29lib/libcupsimage.la 29lib/libcupsimage.la
30libexec/cups/backend/http 30libexec/cups/backend/http
31libexec/cups/backend/ipp 31libexec/cups/backend/ipp
32libexec/cups/backend/lpd 32libexec/cups/backend/lpd
33libexec/cups/backend/parallel 33libexec/cups/backend/parallel
34libexec/cups/backend/scsi 34libexec/cups/backend/scsi
35libexec/cups/backend/serial 35libexec/cups/backend/serial
36libexec/cups/backend/snmp 36libexec/cups/backend/snmp
37libexec/cups/backend/socket 37libexec/cups/backend/socket
38libexec/cups/backend/usb 38libexec/cups/backend/usb
39libexec/cups/cgi-bin/admin.cgi 39libexec/cups/cgi-bin/admin.cgi
@@ -49,26 +49,27 @@ libexec/cups/filter/gziptoany @@ -49,26 +49,27 @@ libexec/cups/filter/gziptoany
49libexec/cups/filter/hpgltops 49libexec/cups/filter/hpgltops
50libexec/cups/filter/imagetops 50libexec/cups/filter/imagetops
51libexec/cups/filter/imagetoraster 51libexec/cups/filter/imagetoraster
52libexec/cups/filter/pdftops 52libexec/cups/filter/pdftops
53libexec/cups/filter/pstops 53libexec/cups/filter/pstops
54libexec/cups/filter/rastertodymo 54libexec/cups/filter/rastertodymo
55libexec/cups/filter/rastertoepson 55libexec/cups/filter/rastertoepson
56libexec/cups/filter/rastertohp 56libexec/cups/filter/rastertohp
57libexec/cups/filter/rastertolabel 57libexec/cups/filter/rastertolabel
58libexec/cups/filter/texttops 58libexec/cups/filter/texttops
59libexec/cups/monitor/bcp 59libexec/cups/monitor/bcp
60libexec/cups/monitor/tbcp 60libexec/cups/monitor/tbcp
61libexec/cups/notifier/mailto 61libexec/cups/notifier/mailto
 62libexec/cups/notifier/rss
62libexec/cups/notifier/testnotify 63libexec/cups/notifier/testnotify
63man/man1/cancel.1 64man/man1/cancel.1
64man/man1/cups-config.1 65man/man1/cups-config.1
65man/man1/cupstestdsc.1 66man/man1/cupstestdsc.1
66man/man1/cupstestppd.1 67man/man1/cupstestppd.1
67man/man1/lp.1 68man/man1/lp.1
68man/man1/lpoptions.1 69man/man1/lpoptions.1
69man/man1/lppasswd.1 70man/man1/lppasswd.1
70man/man1/lpq.1 71man/man1/lpq.1
71man/man1/lpr.1 72man/man1/lpr.1
72man/man1/lprm.1 73man/man1/lprm.1
73man/man1/lpstat.1 74man/man1/lpstat.1
74man/man5/classes.conf.5 75man/man5/classes.conf.5
@@ -78,39 +79,43 @@ man/man5/cupsd.conf.5 @@ -78,39 +79,43 @@ man/man5/cupsd.conf.5
78man/man5/mailto.conf.5 79man/man5/mailto.conf.5
79man/man5/mime.convs.5 80man/man5/mime.convs.5
80man/man5/mime.types.5 81man/man5/mime.types.5
81man/man5/printers.conf.5 82man/man5/printers.conf.5
82man/man5/subscriptions.conf.5 83man/man5/subscriptions.conf.5
83man/man7/backend.7 84man/man7/backend.7
84man/man7/filter.7 85man/man7/filter.7
85man/man8/accept.8 86man/man8/accept.8
86man/man8/cups-deviced.8 87man/man8/cups-deviced.8
87man/man8/cups-driverd.8 88man/man8/cups-driverd.8
88man/man8/cups-lpd.8 89man/man8/cups-lpd.8
89man/man8/cups-polld.8 90man/man8/cups-polld.8
90man/man8/cupsaddsmb.8 91man/man8/cupsaddsmb.8
 92man/man8/cupsctl.8
91man/man8/cupsd.8 93man/man8/cupsd.8
92man/man8/cupsdisable.8 94man/man8/cupsdisable.8
93man/man8/cupsenable.8 95man/man8/cupsenable.8
 96man/man8/cupsfilter.8
94man/man8/lpadmin.8 97man/man8/lpadmin.8
95man/man8/lpc.8 98man/man8/lpc.8
96man/man8/lpinfo.8 99man/man8/lpinfo.8
97man/man8/lpmove.8 100man/man8/lpmove.8
98man/man8/reject.8 101man/man8/reject.8
99sbin/accept 102sbin/accept
100sbin/cupsaddsmb 103sbin/cupsaddsmb
 104sbin/cupsctl
101sbin/cupsd 105sbin/cupsd
102sbin/cupsdisable 106sbin/cupsdisable
103sbin/cupsenable 107sbin/cupsenable
 108sbin/cupsfilter
104sbin/lpadmin 109sbin/lpadmin
105sbin/lpc 110sbin/lpc
106sbin/lpinfo 111sbin/lpinfo
107sbin/lpmove 112sbin/lpmove
108sbin/reject 113sbin/reject
109share/cups/banners/classified 114share/cups/banners/classified
110share/cups/banners/confidential 115share/cups/banners/confidential
111share/cups/banners/secret 116share/cups/banners/secret
112share/cups/banners/standard 117share/cups/banners/standard
113share/cups/banners/topsecret 118share/cups/banners/topsecret
114share/cups/banners/unclassified 119share/cups/banners/unclassified
115share/cups/charmaps/euc-cn.txt 120share/cups/charmaps/euc-cn.txt
116share/cups/charmaps/euc-jp.txt 121share/cups/charmaps/euc-jp.txt
@@ -139,92 +144,70 @@ share/cups/charmaps/windows-1251.txt @@ -139,92 +144,70 @@ share/cups/charmaps/windows-1251.txt
139share/cups/charmaps/windows-1252.txt 144share/cups/charmaps/windows-1252.txt
140share/cups/charmaps/windows-1253.txt 145share/cups/charmaps/windows-1253.txt
141share/cups/charmaps/windows-1254.txt 146share/cups/charmaps/windows-1254.txt
142share/cups/charmaps/windows-1255.txt 147share/cups/charmaps/windows-1255.txt
143share/cups/charmaps/windows-1256.txt 148share/cups/charmaps/windows-1256.txt
144share/cups/charmaps/windows-1257.txt 149share/cups/charmaps/windows-1257.txt
145share/cups/charmaps/windows-1258.txt 150share/cups/charmaps/windows-1258.txt
146share/cups/charmaps/windows-1361.txt 151share/cups/charmaps/windows-1361.txt
147share/cups/charmaps/windows-874.txt 152share/cups/charmaps/windows-874.txt
148share/cups/charmaps/windows-932.txt 153share/cups/charmaps/windows-932.txt
149share/cups/charmaps/windows-936.txt 154share/cups/charmaps/windows-936.txt
150share/cups/charmaps/windows-949.txt 155share/cups/charmaps/windows-949.txt
151share/cups/charmaps/windows-950.txt 156share/cups/charmaps/windows-950.txt
152share/cups/charsets/iso-8859-1 
153share/cups/charsets/iso-8859-10 
154share/cups/charsets/iso-8859-13 
155share/cups/charsets/iso-8859-14 
156share/cups/charsets/iso-8859-15 
157share/cups/charsets/iso-8859-2 
158share/cups/charsets/iso-8859-3 
159share/cups/charsets/iso-8859-4 
160share/cups/charsets/iso-8859-5 
161share/cups/charsets/iso-8859-6 
162share/cups/charsets/iso-8859-7 
163share/cups/charsets/iso-8859-8 
164share/cups/charsets/iso-8859-9 
165share/cups/charsets/koi8-r 
166share/cups/charsets/koi8-u 
167share/cups/charsets/utf-8 157share/cups/charsets/utf-8
168share/cups/charsets/windows-1250 
169share/cups/charsets/windows-1251 
170share/cups/charsets/windows-1252 
171share/cups/charsets/windows-1253 
172share/cups/charsets/windows-1254 
173share/cups/charsets/windows-1255 
174share/cups/charsets/windows-1256 
175share/cups/charsets/windows-1257 
176share/cups/charsets/windows-1258 
177share/cups/charsets/windows-874 
178share/cups/data/HPGLprolog 158share/cups/data/HPGLprolog
179share/cups/data/psglyphs 159share/cups/data/psglyphs
180share/cups/data/testprint.ps 160share/cups/data/testprint.ps
181share/cups/fonts/Courier 161share/cups/fonts/Courier
182share/cups/fonts/Courier-Bold 162share/cups/fonts/Courier-Bold
183share/cups/fonts/Courier-BoldOblique 163share/cups/fonts/Courier-BoldOblique
184share/cups/fonts/Courier-Oblique 164share/cups/fonts/Courier-Oblique
185share/cups/fonts/Symbol 165share/cups/fonts/Symbol
186share/cups/model/deskjet.ppd 166share/cups/model/deskjet.ppd
187share/cups/model/deskjet2.ppd 
188share/cups/model/dymo.ppd 167share/cups/model/dymo.ppd
189share/cups/model/epson24.ppd 168share/cups/model/epson24.ppd
190share/cups/model/epson9.ppd 169share/cups/model/epson9.ppd
 170share/cups/model/intelbar.ppd
191share/cups/model/laserjet.ppd 171share/cups/model/laserjet.ppd
192share/cups/model/okidat24.ppd 172share/cups/model/okidat24.ppd
193share/cups/model/okidata9.ppd 173share/cups/model/okidata9.ppd
194share/cups/model/stcolor.ppd 174share/cups/model/stcolor.ppd
195share/cups/model/stcolor2.ppd 175share/cups/model/stcolor2.ppd
196share/cups/model/stphoto.ppd 176share/cups/model/stphoto.ppd
197share/cups/model/stphoto2.ppd 177share/cups/model/stphoto2.ppd
198share/cups/model/zebra.ppd 178share/cups/model/zebra.ppd
 179share/cups/model/zebracpl.ppd
199share/cups/model/zebraep1.ppd 180share/cups/model/zebraep1.ppd
200share/cups/model/zebraep2.ppd 181share/cups/model/zebraep2.ppd
201share/cups/templates/add-class.tmpl 182share/cups/templates/add-class.tmpl
202share/cups/templates/add-printer.tmpl 183share/cups/templates/add-printer.tmpl
 184share/cups/templates/add-rss-subscription.tmpl
203share/cups/templates/admin.tmpl 185share/cups/templates/admin.tmpl
204share/cups/templates/choose-device.tmpl 186share/cups/templates/choose-device.tmpl
205share/cups/templates/choose-make.tmpl 187share/cups/templates/choose-make.tmpl
206share/cups/templates/choose-model.tmpl 188share/cups/templates/choose-model.tmpl
207share/cups/templates/choose-serial.tmpl 189share/cups/templates/choose-serial.tmpl
208share/cups/templates/choose-uri.tmpl 190share/cups/templates/choose-uri.tmpl
209share/cups/templates/class-added.tmpl 191share/cups/templates/class-added.tmpl
210share/cups/templates/class-confirm.tmpl 192share/cups/templates/class-confirm.tmpl
211share/cups/templates/class-deleted.tmpl 193share/cups/templates/class-deleted.tmpl
212share/cups/templates/class-jobs-header.tmpl 194share/cups/templates/class-jobs-header.tmpl
213share/cups/templates/class-modified.tmpl 195share/cups/templates/class-modified.tmpl
214share/cups/templates/classes-header.tmpl 196share/cups/templates/classes-header.tmpl
215share/cups/templates/classes.tmpl 197share/cups/templates/classes.tmpl
216share/cups/templates/de/add-class.tmpl 198share/cups/templates/de/add-class.tmpl
217share/cups/templates/de/add-printer.tmpl 199share/cups/templates/de/add-printer.tmpl
 200share/cups/templates/de/add-rss-subscription.tmpl
218share/cups/templates/de/admin.tmpl 201share/cups/templates/de/admin.tmpl
219share/cups/templates/de/choose-device.tmpl 202share/cups/templates/de/choose-device.tmpl
220share/cups/templates/de/choose-make.tmpl 203share/cups/templates/de/choose-make.tmpl
221share/cups/templates/de/choose-model.tmpl 204share/cups/templates/de/choose-model.tmpl
222share/cups/templates/de/choose-serial.tmpl 205share/cups/templates/de/choose-serial.tmpl
223share/cups/templates/de/choose-uri.tmpl 206share/cups/templates/de/choose-uri.tmpl
224share/cups/templates/de/class-added.tmpl 207share/cups/templates/de/class-added.tmpl
225share/cups/templates/de/class-confirm.tmpl 208share/cups/templates/de/class-confirm.tmpl
226share/cups/templates/de/class-deleted.tmpl 209share/cups/templates/de/class-deleted.tmpl
227share/cups/templates/de/class-jobs-header.tmpl 210share/cups/templates/de/class-jobs-header.tmpl
228share/cups/templates/de/class-modified.tmpl 211share/cups/templates/de/class-modified.tmpl
229share/cups/templates/de/classes-header.tmpl 212share/cups/templates/de/classes-header.tmpl
230share/cups/templates/de/classes.tmpl 213share/cups/templates/de/classes.tmpl
@@ -232,26 +215,27 @@ share/cups/templates/de/edit-config.tmpl @@ -232,26 +215,27 @@ share/cups/templates/de/edit-config.tmpl
232share/cups/templates/de/error-op.tmpl 215share/cups/templates/de/error-op.tmpl
233share/cups/templates/de/error.tmpl 216share/cups/templates/de/error.tmpl
234share/cups/templates/de/header.tmpl 217share/cups/templates/de/header.tmpl
235share/cups/templates/de/help-header.tmpl 218share/cups/templates/de/help-header.tmpl
236share/cups/templates/de/help-printable.tmpl 219share/cups/templates/de/help-printable.tmpl
237share/cups/templates/de/job-cancel.tmpl 220share/cups/templates/de/job-cancel.tmpl
238share/cups/templates/de/job-hold.tmpl 221share/cups/templates/de/job-hold.tmpl
239share/cups/templates/de/job-move.tmpl 222share/cups/templates/de/job-move.tmpl
240share/cups/templates/de/job-moved.tmpl 223share/cups/templates/de/job-moved.tmpl
241share/cups/templates/de/job-release.tmpl 224share/cups/templates/de/job-release.tmpl
242share/cups/templates/de/job-restart.tmpl 225share/cups/templates/de/job-restart.tmpl
243share/cups/templates/de/jobs-header.tmpl 226share/cups/templates/de/jobs-header.tmpl
244share/cups/templates/de/jobs.tmpl 227share/cups/templates/de/jobs.tmpl
 228share/cups/templates/de/list-available-printers.tmpl
245share/cups/templates/de/maintenance.tmpl 229share/cups/templates/de/maintenance.tmpl
246share/cups/templates/de/modify-class.tmpl 230share/cups/templates/de/modify-class.tmpl
247share/cups/templates/de/modify-printer.tmpl 231share/cups/templates/de/modify-printer.tmpl
248share/cups/templates/de/option-boolean.tmpl 232share/cups/templates/de/option-boolean.tmpl
249share/cups/templates/de/option-conflict.tmpl 233share/cups/templates/de/option-conflict.tmpl
250share/cups/templates/de/option-header.tmpl 234share/cups/templates/de/option-header.tmpl
251share/cups/templates/de/option-pickmany.tmpl 235share/cups/templates/de/option-pickmany.tmpl
252share/cups/templates/de/option-pickone.tmpl 236share/cups/templates/de/option-pickone.tmpl
253share/cups/templates/de/option-trailer.tmpl 237share/cups/templates/de/option-trailer.tmpl
254share/cups/templates/de/pager.tmpl 238share/cups/templates/de/pager.tmpl
255share/cups/templates/de/printer-accept.tmpl 239share/cups/templates/de/printer-accept.tmpl
256share/cups/templates/de/printer-added.tmpl 240share/cups/templates/de/printer-added.tmpl
257share/cups/templates/de/printer-configured.tmpl 241share/cups/templates/de/printer-configured.tmpl
@@ -262,34 +246,37 @@ share/cups/templates/de/printer-jobs-hea @@ -262,34 +246,37 @@ share/cups/templates/de/printer-jobs-hea
262share/cups/templates/de/printer-modified.tmpl 246share/cups/templates/de/printer-modified.tmpl
263share/cups/templates/de/printer-purge.tmpl 247share/cups/templates/de/printer-purge.tmpl
264share/cups/templates/de/printer-reject.tmpl 248share/cups/templates/de/printer-reject.tmpl
265share/cups/templates/de/printer-start.tmpl 249share/cups/templates/de/printer-start.tmpl
266share/cups/templates/de/printer-stop.tmpl 250share/cups/templates/de/printer-stop.tmpl
267share/cups/templates/de/printers-header.tmpl 251share/cups/templates/de/printers-header.tmpl
268share/cups/templates/de/printers.tmpl 252share/cups/templates/de/printers.tmpl
269share/cups/templates/de/restart.tmpl 253share/cups/templates/de/restart.tmpl
270share/cups/templates/de/samba-export.tmpl 254share/cups/templates/de/samba-export.tmpl
271share/cups/templates/de/samba-exported.tmpl 255share/cups/templates/de/samba-exported.tmpl
272share/cups/templates/de/search.tmpl 256share/cups/templates/de/search.tmpl
273share/cups/templates/de/set-printer-options-header.tmpl 257share/cups/templates/de/set-printer-options-header.tmpl
274share/cups/templates/de/set-printer-options-trailer.tmpl 258share/cups/templates/de/set-printer-options-trailer.tmpl
 259share/cups/templates/de/subscription-added.tmpl
 260share/cups/templates/de/subscription-canceled.tmpl
275share/cups/templates/de/test-page.tmpl 261share/cups/templates/de/test-page.tmpl
276share/cups/templates/de/trailer.tmpl 262share/cups/templates/de/trailer.tmpl
277share/cups/templates/de/users.tmpl 263share/cups/templates/de/users.tmpl
278share/cups/templates/edit-config.tmpl 264share/cups/templates/edit-config.tmpl
279share/cups/templates/error-op.tmpl 265share/cups/templates/error-op.tmpl
280share/cups/templates/error.tmpl 266share/cups/templates/error.tmpl
281share/cups/templates/es/add-class.tmpl 267share/cups/templates/es/add-class.tmpl
282share/cups/templates/es/add-printer.tmpl 268share/cups/templates/es/add-printer.tmpl
 269share/cups/templates/es/add-rss-subscription.tmpl
283share/cups/templates/es/admin.tmpl 270share/cups/templates/es/admin.tmpl
284share/cups/templates/es/choose-device.tmpl 271share/cups/templates/es/choose-device.tmpl
285share/cups/templates/es/choose-make.tmpl 272share/cups/templates/es/choose-make.tmpl
286share/cups/templates/es/choose-model.tmpl 273share/cups/templates/es/choose-model.tmpl
287share/cups/templates/es/choose-serial.tmpl 274share/cups/templates/es/choose-serial.tmpl
288share/cups/templates/es/choose-uri.tmpl 275share/cups/templates/es/choose-uri.tmpl
289share/cups/templates/es/class-added.tmpl 276share/cups/templates/es/class-added.tmpl
290share/cups/templates/es/class-confirm.tmpl 277share/cups/templates/es/class-confirm.tmpl
291share/cups/templates/es/class-deleted.tmpl 278share/cups/templates/es/class-deleted.tmpl
292share/cups/templates/es/class-jobs-header.tmpl 279share/cups/templates/es/class-jobs-header.tmpl
293share/cups/templates/es/class-modified.tmpl 280share/cups/templates/es/class-modified.tmpl
294share/cups/templates/es/classes-header.tmpl 281share/cups/templates/es/classes-header.tmpl
295share/cups/templates/es/classes.tmpl 282share/cups/templates/es/classes.tmpl
@@ -297,26 +284,27 @@ share/cups/templates/es/edit-config.tmpl @@ -297,26 +284,27 @@ share/cups/templates/es/edit-config.tmpl
297share/cups/templates/es/error-op.tmpl 284share/cups/templates/es/error-op.tmpl
298share/cups/templates/es/error.tmpl 285share/cups/templates/es/error.tmpl
299share/cups/templates/es/header.tmpl 286share/cups/templates/es/header.tmpl
300share/cups/templates/es/help-header.tmpl 287share/cups/templates/es/help-header.tmpl
301share/cups/templates/es/help-printable.tmpl 288share/cups/templates/es/help-printable.tmpl
302share/cups/templates/es/job-cancel.tmpl 289share/cups/templates/es/job-cancel.tmpl
303share/cups/templates/es/job-hold.tmpl 290share/cups/templates/es/job-hold.tmpl
304share/cups/templates/es/job-move.tmpl 291share/cups/templates/es/job-move.tmpl
305share/cups/templates/es/job-moved.tmpl 292share/cups/templates/es/job-moved.tmpl
306share/cups/templates/es/job-release.tmpl 293share/cups/templates/es/job-release.tmpl
307share/cups/templates/es/job-restart.tmpl 294share/cups/templates/es/job-restart.tmpl
308share/cups/templates/es/jobs-header.tmpl 295share/cups/templates/es/jobs-header.tmpl
309share/cups/templates/es/jobs.tmpl 296share/cups/templates/es/jobs.tmpl
 297share/cups/templates/es/list-available-printers.tmpl
310share/cups/templates/es/maintenance.tmpl 298share/cups/templates/es/maintenance.tmpl
311share/cups/templates/es/modify-class.tmpl 299share/cups/templates/es/modify-class.tmpl
312share/cups/templates/es/modify-printer.tmpl 300share/cups/templates/es/modify-printer.tmpl
313share/cups/templates/es/norestart.tmpl 301share/cups/templates/es/norestart.tmpl
314share/cups/templates/es/option-boolean.tmpl 302share/cups/templates/es/option-boolean.tmpl
315share/cups/templates/es/option-conflict.tmpl 303share/cups/templates/es/option-conflict.tmpl
316share/cups/templates/es/option-header.tmpl 304share/cups/templates/es/option-header.tmpl
317share/cups/templates/es/option-pickmany.tmpl 305share/cups/templates/es/option-pickmany.tmpl
318share/cups/templates/es/option-pickone.tmpl 306share/cups/templates/es/option-pickone.tmpl
319share/cups/templates/es/option-trailer.tmpl 307share/cups/templates/es/option-trailer.tmpl
320share/cups/templates/es/pager.tmpl 308share/cups/templates/es/pager.tmpl
321share/cups/templates/es/printer-accept.tmpl 309share/cups/templates/es/printer-accept.tmpl
322share/cups/templates/es/printer-added.tmpl 310share/cups/templates/es/printer-added.tmpl
@@ -328,26 +316,28 @@ share/cups/templates/es/printer-jobs-hea @@ -328,26 +316,28 @@ share/cups/templates/es/printer-jobs-hea
328share/cups/templates/es/printer-modified.tmpl 316share/cups/templates/es/printer-modified.tmpl
329share/cups/templates/es/printer-purge.tmpl 317share/cups/templates/es/printer-purge.tmpl
330share/cups/templates/es/printer-reject.tmpl 318share/cups/templates/es/printer-reject.tmpl
331share/cups/templates/es/printer-start.tmpl 319share/cups/templates/es/printer-start.tmpl
332share/cups/templates/es/printer-stop.tmpl 320share/cups/templates/es/printer-stop.tmpl
333share/cups/templates/es/printers-header.tmpl 321share/cups/templates/es/printers-header.tmpl
334share/cups/templates/es/printers.tmpl 322share/cups/templates/es/printers.tmpl
335share/cups/templates/es/restart.tmpl 323share/cups/templates/es/restart.tmpl
336share/cups/templates/es/samba-export.tmpl 324share/cups/templates/es/samba-export.tmpl
337share/cups/templates/es/samba-exported.tmpl 325share/cups/templates/es/samba-exported.tmpl
338share/cups/templates/es/search.tmpl 326share/cups/templates/es/search.tmpl
339share/cups/templates/es/set-printer-options-header.tmpl 327share/cups/templates/es/set-printer-options-header.tmpl
340share/cups/templates/es/set-printer-options-trailer.tmpl 328share/cups/templates/es/set-printer-options-trailer.tmpl
 329share/cups/templates/es/subscription-added.tmpl
 330share/cups/templates/es/subscription-canceled.tmpl
341share/cups/templates/es/test-page.tmpl 331share/cups/templates/es/test-page.tmpl
342share/cups/templates/es/trailer.tmpl 332share/cups/templates/es/trailer.tmpl
343share/cups/templates/es/users.tmpl 333share/cups/templates/es/users.tmpl
344share/cups/templates/et/add-class.tmpl 334share/cups/templates/et/add-class.tmpl
345share/cups/templates/et/add-printer.tmpl 335share/cups/templates/et/add-printer.tmpl
346share/cups/templates/et/admin.tmpl 336share/cups/templates/et/admin.tmpl
347share/cups/templates/et/choose-device.tmpl 337share/cups/templates/et/choose-device.tmpl
348share/cups/templates/et/choose-make.tmpl 338share/cups/templates/et/choose-make.tmpl
349share/cups/templates/et/choose-model.tmpl 339share/cups/templates/et/choose-model.tmpl
350share/cups/templates/et/choose-serial.tmpl 340share/cups/templates/et/choose-serial.tmpl
351share/cups/templates/et/choose-uri.tmpl 341share/cups/templates/et/choose-uri.tmpl
352share/cups/templates/et/class-added.tmpl 342share/cups/templates/et/class-added.tmpl
353share/cups/templates/et/class-confirm.tmpl 343share/cups/templates/et/class-confirm.tmpl
@@ -456,26 +446,89 @@ share/cups/templates/fr/printer-reject.t @@ -456,26 +446,89 @@ share/cups/templates/fr/printer-reject.t
456share/cups/templates/fr/printer-start.tmpl 446share/cups/templates/fr/printer-start.tmpl
457share/cups/templates/fr/printer-stop.tmpl 447share/cups/templates/fr/printer-stop.tmpl
458share/cups/templates/fr/printers-header.tmpl 448share/cups/templates/fr/printers-header.tmpl
459share/cups/templates/fr/printers.tmpl 449share/cups/templates/fr/printers.tmpl
460share/cups/templates/fr/restart.tmpl 450share/cups/templates/fr/restart.tmpl
461share/cups/templates/fr/samba-export.tmpl 451share/cups/templates/fr/samba-export.tmpl
462share/cups/templates/fr/samba-exported.tmpl 452share/cups/templates/fr/samba-exported.tmpl
463share/cups/templates/fr/search.tmpl 453share/cups/templates/fr/search.tmpl
464share/cups/templates/fr/set-printer-options-header.tmpl 454share/cups/templates/fr/set-printer-options-header.tmpl
465share/cups/templates/fr/set-printer-options-trailer.tmpl 455share/cups/templates/fr/set-printer-options-trailer.tmpl
466share/cups/templates/fr/test-page.tmpl 456share/cups/templates/fr/test-page.tmpl
467share/cups/templates/fr/trailer.tmpl 457share/cups/templates/fr/trailer.tmpl
468share/cups/templates/fr/users.tmpl 458share/cups/templates/fr/users.tmpl
 459share/cups/templates/he/add-class.tmpl
 460share/cups/templates/he/add-printer.tmpl
 461share/cups/templates/he/admin.tmpl
 462share/cups/templates/he/choose-device.tmpl
 463share/cups/templates/he/choose-make.tmpl
 464share/cups/templates/he/choose-model.tmpl
 465share/cups/templates/he/choose-serial.tmpl
 466share/cups/templates/he/choose-uri.tmpl
 467share/cups/templates/he/class-added.tmpl
 468share/cups/templates/he/class-confirm.tmpl
 469share/cups/templates/he/class-deleted.tmpl
 470share/cups/templates/he/class-jobs-header.tmpl
 471share/cups/templates/he/class-modified.tmpl
 472share/cups/templates/he/classes-header.tmpl
 473share/cups/templates/he/classes.tmpl
 474share/cups/templates/he/edit-config.tmpl
 475share/cups/templates/he/error-op.tmpl
 476share/cups/templates/he/error.tmpl
 477share/cups/templates/he/header.tmpl
 478share/cups/templates/he/help-header.tmpl
 479share/cups/templates/he/help-printable.tmpl
 480share/cups/templates/he/job-cancel.tmpl
 481share/cups/templates/he/job-hold.tmpl
 482share/cups/templates/he/job-move.tmpl
 483share/cups/templates/he/job-moved.tmpl
 484share/cups/templates/he/job-release.tmpl
 485share/cups/templates/he/job-restart.tmpl
 486share/cups/templates/he/jobs-header.tmpl
 487share/cups/templates/he/jobs.tmpl
 488share/cups/templates/he/maintenance.tmpl
 489share/cups/templates/he/modify-class.tmpl
 490share/cups/templates/he/modify-printer.tmpl
 491share/cups/templates/he/norestart.tmpl
 492share/cups/templates/he/option-boolean.tmpl
 493share/cups/templates/he/option-conflict.tmpl
 494share/cups/templates/he/option-header.tmpl
 495share/cups/templates/he/option-pickmany.tmpl
 496share/cups/templates/he/option-pickone.tmpl
 497share/cups/templates/he/option-trailer.tmpl
 498share/cups/templates/he/pager.tmpl
 499share/cups/templates/he/printer-accept.tmpl
 500share/cups/templates/he/printer-added.tmpl
 501share/cups/templates/he/printer-configured.tmpl
 502share/cups/templates/he/printer-confirm.tmpl
 503share/cups/templates/he/printer-default.tmpl
 504share/cups/templates/he/printer-deleted.tmpl
 505share/cups/templates/he/printer-jobs-header.tmpl
 506share/cups/templates/he/printer-modified.tmpl
 507share/cups/templates/he/printer-purge.tmpl
 508share/cups/templates/he/printer-reject.tmpl
 509share/cups/templates/he/printer-start.tmpl
 510share/cups/templates/he/printer-stop.tmpl
 511share/cups/templates/he/printers-header.tmpl
 512share/cups/templates/he/printers.tmpl
 513share/cups/templates/he/restart.tmpl
 514share/cups/templates/he/samba-export.tmpl
 515share/cups/templates/he/samba-exported.tmpl
 516share/cups/templates/he/search.tmpl
 517share/cups/templates/he/set-printer-options-header.tmpl
 518share/cups/templates/he/set-printer-options-trailer.tmpl
 519share/cups/templates/he/test-page.tmpl
 520share/cups/templates/he/trailer.tmpl
 521share/cups/templates/he/users.tmpl
469share/cups/templates/header.tmpl 522share/cups/templates/header.tmpl
470share/cups/templates/help-header.tmpl 523share/cups/templates/help-header.tmpl
471share/cups/templates/help-printable.tmpl 524share/cups/templates/help-printable.tmpl
472share/cups/templates/it/add-class.tmpl 525share/cups/templates/it/add-class.tmpl
473share/cups/templates/it/add-printer.tmpl 526share/cups/templates/it/add-printer.tmpl
474share/cups/templates/it/admin.tmpl 527share/cups/templates/it/admin.tmpl
475share/cups/templates/it/choose-device.tmpl 528share/cups/templates/it/choose-device.tmpl
476share/cups/templates/it/choose-make.tmpl 529share/cups/templates/it/choose-make.tmpl
477share/cups/templates/it/choose-model.tmpl 530share/cups/templates/it/choose-model.tmpl
478share/cups/templates/it/choose-serial.tmpl 531share/cups/templates/it/choose-serial.tmpl
479share/cups/templates/it/choose-uri.tmpl 532share/cups/templates/it/choose-uri.tmpl
480share/cups/templates/it/class-added.tmpl 533share/cups/templates/it/class-added.tmpl
481share/cups/templates/it/class-confirm.tmpl 534share/cups/templates/it/class-confirm.tmpl
@@ -524,86 +577,92 @@ share/cups/templates/it/printer-stop.tmp @@ -524,86 +577,92 @@ share/cups/templates/it/printer-stop.tmp
524share/cups/templates/it/printers-header.tmpl 577share/cups/templates/it/printers-header.tmpl
525share/cups/templates/it/printers.tmpl 578share/cups/templates/it/printers.tmpl
526share/cups/templates/it/restart.tmpl 579share/cups/templates/it/restart.tmpl
527share/cups/templates/it/samba-export.tmpl 580share/cups/templates/it/samba-export.tmpl
528share/cups/templates/it/samba-exported.tmpl 581share/cups/templates/it/samba-exported.tmpl
529share/cups/templates/it/search.tmpl 582share/cups/templates/it/search.tmpl
530share/cups/templates/it/set-printer-options-header.tmpl 583share/cups/templates/it/set-printer-options-header.tmpl
531share/cups/templates/it/set-printer-options-trailer.tmpl 584share/cups/templates/it/set-printer-options-trailer.tmpl
532share/cups/templates/it/test-page.tmpl 585share/cups/templates/it/test-page.tmpl
533share/cups/templates/it/trailer.tmpl 586share/cups/templates/it/trailer.tmpl
534share/cups/templates/it/users.tmpl 587share/cups/templates/it/users.tmpl
535share/cups/templates/ja/add-class.tmpl 588share/cups/templates/ja/add-class.tmpl
536share/cups/templates/ja/add-printer.tmpl 589share/cups/templates/ja/add-printer.tmpl
 590share/cups/templates/ja/add-rss-subscription.tmpl
537share/cups/templates/ja/admin.tmpl 591share/cups/templates/ja/admin.tmpl
538share/cups/templates/ja/choose-device.tmpl 592share/cups/templates/ja/choose-device.tmpl
539share/cups/templates/ja/choose-make.tmpl 593share/cups/templates/ja/choose-make.tmpl
540share/cups/templates/ja/choose-model.tmpl 594share/cups/templates/ja/choose-model.tmpl
541share/cups/templates/ja/choose-serial.tmpl 595share/cups/templates/ja/choose-serial.tmpl
542share/cups/templates/ja/choose-uri.tmpl 596share/cups/templates/ja/choose-uri.tmpl
543share/cups/templates/ja/class-added.tmpl 597share/cups/templates/ja/class-added.tmpl
544share/cups/templates/ja/class-confirm.tmpl 598share/cups/templates/ja/class-confirm.tmpl
545share/cups/templates/ja/class-deleted.tmpl 599share/cups/templates/ja/class-deleted.tmpl
546share/cups/templates/ja/class-jobs-header.tmpl 600share/cups/templates/ja/class-jobs-header.tmpl
547share/cups/templates/ja/class-modified.tmpl 601share/cups/templates/ja/class-modified.tmpl
548share/cups/templates/ja/classes-header.tmpl 602share/cups/templates/ja/classes-header.tmpl
549share/cups/templates/ja/classes.tmpl 603share/cups/templates/ja/classes.tmpl
550share/cups/templates/ja/edit-config.tmpl 604share/cups/templates/ja/edit-config.tmpl
551share/cups/templates/ja/error-op.tmpl 605share/cups/templates/ja/error-op.tmpl
552share/cups/templates/ja/error.tmpl 606share/cups/templates/ja/error.tmpl
553share/cups/templates/ja/header.tmpl 607share/cups/templates/ja/header.tmpl
554share/cups/templates/ja/help-header.tmpl 608share/cups/templates/ja/help-header.tmpl
555share/cups/templates/ja/job-cancel.tmpl 609share/cups/templates/ja/job-cancel.tmpl
556share/cups/templates/ja/job-hold.tmpl 610share/cups/templates/ja/job-hold.tmpl
557share/cups/templates/ja/job-move.tmpl 611share/cups/templates/ja/job-move.tmpl
558share/cups/templates/ja/job-moved.tmpl 612share/cups/templates/ja/job-moved.tmpl
559share/cups/templates/ja/job-release.tmpl 613share/cups/templates/ja/job-release.tmpl
560share/cups/templates/ja/job-restart.tmpl 614share/cups/templates/ja/job-restart.tmpl
561share/cups/templates/ja/jobs-header.tmpl 615share/cups/templates/ja/jobs-header.tmpl
562share/cups/templates/ja/jobs.tmpl 616share/cups/templates/ja/jobs.tmpl
 617share/cups/templates/ja/list-available-printers.tmpl
563share/cups/templates/ja/maintenance.tmpl 618share/cups/templates/ja/maintenance.tmpl
564share/cups/templates/ja/modify-class.tmpl 619share/cups/templates/ja/modify-class.tmpl
565share/cups/templates/ja/modify-printer.tmpl 620share/cups/templates/ja/modify-printer.tmpl
 621share/cups/templates/ja/norestart.tmpl
566share/cups/templates/ja/option-conflict.tmpl 622share/cups/templates/ja/option-conflict.tmpl
567share/cups/templates/ja/option-trailer.tmpl 623share/cups/templates/ja/option-trailer.tmpl
568share/cups/templates/ja/pager.tmpl 624share/cups/templates/ja/pager.tmpl
569share/cups/templates/ja/printer-accept.tmpl 625share/cups/templates/ja/printer-accept.tmpl
570share/cups/templates/ja/printer-added.tmpl 626share/cups/templates/ja/printer-added.tmpl
571share/cups/templates/ja/printer-configured.tmpl 627share/cups/templates/ja/printer-configured.tmpl
572share/cups/templates/ja/printer-confirm.tmpl 628share/cups/templates/ja/printer-confirm.tmpl
573share/cups/templates/ja/printer-default.tmpl 629share/cups/templates/ja/printer-default.tmpl
574share/cups/templates/ja/printer-deleted.tmpl 630share/cups/templates/ja/printer-deleted.tmpl
575share/cups/templates/ja/printer-jobs-header.tmpl 631share/cups/templates/ja/printer-jobs-header.tmpl
576share/cups/templates/ja/printer-modified.tmpl 632share/cups/templates/ja/printer-modified.tmpl
577share/cups/templates/ja/printer-purge.tmpl 633share/cups/templates/ja/printer-purge.tmpl
578share/cups/templates/ja/printer-reject.tmpl 634share/cups/templates/ja/printer-reject.tmpl
579share/cups/templates/ja/printer-start.tmpl 635share/cups/templates/ja/printer-start.tmpl
580share/cups/templates/ja/printer-stop.tmpl 636share/cups/templates/ja/printer-stop.tmpl
581share/cups/templates/ja/printers-header.tmpl 637share/cups/templates/ja/printers-header.tmpl
582share/cups/templates/ja/printers.tmpl 638share/cups/templates/ja/printers.tmpl
583share/cups/templates/ja/restart.tmpl 639share/cups/templates/ja/restart.tmpl
584share/cups/templates/ja/samba-export.tmpl 640share/cups/templates/ja/samba-export.tmpl
585share/cups/templates/ja/samba-exported.tmpl 641share/cups/templates/ja/samba-exported.tmpl
586share/cups/templates/ja/search.tmpl 642share/cups/templates/ja/search.tmpl
 643share/cups/templates/ja/subscription-added.tmpl
 644share/cups/templates/ja/subscription-canceled.tmpl
587share/cups/templates/ja/test-page.tmpl 645share/cups/templates/ja/test-page.tmpl
588share/cups/templates/ja/users.tmpl 646share/cups/templates/ja/users.tmpl
589share/cups/templates/job-cancel.tmpl 647share/cups/templates/job-cancel.tmpl
590share/cups/templates/job-hold.tmpl 648share/cups/templates/job-hold.tmpl
591share/cups/templates/job-move.tmpl 649share/cups/templates/job-move.tmpl
592share/cups/templates/job-moved.tmpl 650share/cups/templates/job-moved.tmpl
593share/cups/templates/job-release.tmpl 651share/cups/templates/job-release.tmpl
594share/cups/templates/job-restart.tmpl 652share/cups/templates/job-restart.tmpl
595share/cups/templates/jobs-header.tmpl 653share/cups/templates/jobs-header.tmpl
596share/cups/templates/jobs.tmpl 654share/cups/templates/jobs.tmpl
 655share/cups/templates/list-available-printers.tmpl
597share/cups/templates/maintenance.tmpl 656share/cups/templates/maintenance.tmpl
598share/cups/templates/modify-class.tmpl 657share/cups/templates/modify-class.tmpl
599share/cups/templates/modify-printer.tmpl 658share/cups/templates/modify-printer.tmpl
600share/cups/templates/norestart.tmpl 659share/cups/templates/norestart.tmpl
601share/cups/templates/option-boolean.tmpl 660share/cups/templates/option-boolean.tmpl
602share/cups/templates/option-conflict.tmpl 661share/cups/templates/option-conflict.tmpl
603share/cups/templates/option-header.tmpl 662share/cups/templates/option-header.tmpl
604share/cups/templates/option-pickmany.tmpl 663share/cups/templates/option-pickmany.tmpl
605share/cups/templates/option-pickone.tmpl 664share/cups/templates/option-pickone.tmpl
606share/cups/templates/option-trailer.tmpl 665share/cups/templates/option-trailer.tmpl
607share/cups/templates/pager.tmpl 666share/cups/templates/pager.tmpl
608share/cups/templates/pl/add-class.tmpl 667share/cups/templates/pl/add-class.tmpl
609share/cups/templates/pl/add-printer.tmpl 668share/cups/templates/pl/add-printer.tmpl
@@ -677,26 +736,28 @@ share/cups/templates/printer-jobs-header @@ -677,26 +736,28 @@ share/cups/templates/printer-jobs-header
677share/cups/templates/printer-modified.tmpl 736share/cups/templates/printer-modified.tmpl
678share/cups/templates/printer-purge.tmpl 737share/cups/templates/printer-purge.tmpl
679share/cups/templates/printer-reject.tmpl 738share/cups/templates/printer-reject.tmpl
680share/cups/templates/printer-start.tmpl 739share/cups/templates/printer-start.tmpl
681share/cups/templates/printer-stop.tmpl 740share/cups/templates/printer-stop.tmpl
682share/cups/templates/printers-header.tmpl 741share/cups/templates/printers-header.tmpl
683share/cups/templates/printers.tmpl 742share/cups/templates/printers.tmpl
684share/cups/templates/restart.tmpl 743share/cups/templates/restart.tmpl
685share/cups/templates/samba-export.tmpl 744share/cups/templates/samba-export.tmpl
686share/cups/templates/samba-exported.tmpl 745share/cups/templates/samba-exported.tmpl
687share/cups/templates/search.tmpl 746share/cups/templates/search.tmpl
688share/cups/templates/set-printer-options-header.tmpl 747share/cups/templates/set-printer-options-header.tmpl
689share/cups/templates/set-printer-options-trailer.tmpl 748share/cups/templates/set-printer-options-trailer.tmpl
 749share/cups/templates/subscription-added.tmpl
 750share/cups/templates/subscription-canceled.tmpl
690share/cups/templates/sv/add-class.tmpl 751share/cups/templates/sv/add-class.tmpl
691share/cups/templates/sv/add-printer.tmpl 752share/cups/templates/sv/add-printer.tmpl
692share/cups/templates/sv/admin.tmpl 753share/cups/templates/sv/admin.tmpl
693share/cups/templates/sv/choose-device.tmpl 754share/cups/templates/sv/choose-device.tmpl
694share/cups/templates/sv/choose-make.tmpl 755share/cups/templates/sv/choose-make.tmpl
695share/cups/templates/sv/choose-model.tmpl 756share/cups/templates/sv/choose-model.tmpl
696share/cups/templates/sv/choose-serial.tmpl 757share/cups/templates/sv/choose-serial.tmpl
697share/cups/templates/sv/choose-uri.tmpl 758share/cups/templates/sv/choose-uri.tmpl
698share/cups/templates/sv/class-added.tmpl 759share/cups/templates/sv/class-added.tmpl
699share/cups/templates/sv/class-confirm.tmpl 760share/cups/templates/sv/class-confirm.tmpl
700share/cups/templates/sv/class-deleted.tmpl 761share/cups/templates/sv/class-deleted.tmpl
701share/cups/templates/sv/class-jobs-header.tmpl 762share/cups/templates/sv/class-jobs-header.tmpl
702share/cups/templates/sv/class-modified.tmpl 763share/cups/templates/sv/class-modified.tmpl
@@ -774,27 +835,26 @@ share/cups/templates/zh_TW/header.tmpl @@ -774,27 +835,26 @@ share/cups/templates/zh_TW/header.tmpl
774share/cups/templates/zh_TW/help-header.tmpl 835share/cups/templates/zh_TW/help-header.tmpl
775share/cups/templates/zh_TW/help-printable.tmpl 836share/cups/templates/zh_TW/help-printable.tmpl
776share/cups/templates/zh_TW/job-cancel.tmpl 837share/cups/templates/zh_TW/job-cancel.tmpl
777share/cups/templates/zh_TW/job-hold.tmpl 838share/cups/templates/zh_TW/job-hold.tmpl
778share/cups/templates/zh_TW/job-move.tmpl 839share/cups/templates/zh_TW/job-move.tmpl
779share/cups/templates/zh_TW/job-moved.tmpl 840share/cups/templates/zh_TW/job-moved.tmpl
780share/cups/templates/zh_TW/job-release.tmpl 841share/cups/templates/zh_TW/job-release.tmpl
781share/cups/templates/zh_TW/job-restart.tmpl 842share/cups/templates/zh_TW/job-restart.tmpl
782share/cups/templates/zh_TW/jobs-header.tmpl 843share/cups/templates/zh_TW/jobs-header.tmpl
783share/cups/templates/zh_TW/jobs.tmpl 844share/cups/templates/zh_TW/jobs.tmpl
784share/cups/templates/zh_TW/maintenance.tmpl 845share/cups/templates/zh_TW/maintenance.tmpl
785share/cups/templates/zh_TW/modify-class.tmpl 846share/cups/templates/zh_TW/modify-class.tmpl
786share/cups/templates/zh_TW/modify-printer.tmpl 847share/cups/templates/zh_TW/modify-printer.tmpl
787share/cups/templates/zh_TW/norestart.tmpl 
788share/cups/templates/zh_TW/option-boolean.tmpl 848share/cups/templates/zh_TW/option-boolean.tmpl
789share/cups/templates/zh_TW/option-conflict.tmpl 849share/cups/templates/zh_TW/option-conflict.tmpl
790share/cups/templates/zh_TW/option-header.tmpl 850share/cups/templates/zh_TW/option-header.tmpl
791share/cups/templates/zh_TW/option-pickmany.tmpl 851share/cups/templates/zh_TW/option-pickmany.tmpl
792share/cups/templates/zh_TW/option-pickone.tmpl 852share/cups/templates/zh_TW/option-pickone.tmpl
793share/cups/templates/zh_TW/option-trailer.tmpl 853share/cups/templates/zh_TW/option-trailer.tmpl
794share/cups/templates/zh_TW/pager.tmpl 854share/cups/templates/zh_TW/pager.tmpl
795share/cups/templates/zh_TW/printer-accept.tmpl 855share/cups/templates/zh_TW/printer-accept.tmpl
796share/cups/templates/zh_TW/printer-added.tmpl 856share/cups/templates/zh_TW/printer-added.tmpl
797share/cups/templates/zh_TW/printer-configured.tmpl 857share/cups/templates/zh_TW/printer-configured.tmpl
798share/cups/templates/zh_TW/printer-confirm.tmpl 858share/cups/templates/zh_TW/printer-confirm.tmpl
799share/cups/templates/zh_TW/printer-default.tmpl 859share/cups/templates/zh_TW/printer-default.tmpl
800share/cups/templates/zh_TW/printer-deleted.tmpl 860share/cups/templates/zh_TW/printer-deleted.tmpl
@@ -812,37 +872,40 @@ share/cups/templates/zh_TW/samba-exporte @@ -812,37 +872,40 @@ share/cups/templates/zh_TW/samba-exporte
812share/cups/templates/zh_TW/search.tmpl 872share/cups/templates/zh_TW/search.tmpl
813share/cups/templates/zh_TW/set-printer-options-header.tmpl 873share/cups/templates/zh_TW/set-printer-options-header.tmpl
814share/cups/templates/zh_TW/set-printer-options-trailer.tmpl 874share/cups/templates/zh_TW/set-printer-options-trailer.tmpl
815share/cups/templates/zh_TW/test-page.tmpl 875share/cups/templates/zh_TW/test-page.tmpl
816share/cups/templates/zh_TW/trailer.tmpl 876share/cups/templates/zh_TW/trailer.tmpl
817share/cups/templates/zh_TW/users.tmpl 877share/cups/templates/zh_TW/users.tmpl
818share/doc/cups/LICENSE.txt 878share/doc/cups/LICENSE.txt
819share/doc/cups/README.txt 879share/doc/cups/README.txt
820share/doc/cups/cups-printable.css 880share/doc/cups/cups-printable.css
821share/doc/cups/cups.css 881share/doc/cups/cups.css
822share/doc/cups/de/images/button-accept-jobs.gif 882share/doc/cups/de/images/button-accept-jobs.gif
823share/doc/cups/de/images/button-add-class.gif 883share/doc/cups/de/images/button-add-class.gif
824share/doc/cups/de/images/button-add-printer.gif 884share/doc/cups/de/images/button-add-printer.gif
 885share/doc/cups/de/images/button-add-rss-subscription.gif
825share/doc/cups/de/images/button-add-this-printer.gif 886share/doc/cups/de/images/button-add-this-printer.gif
826share/doc/cups/de/images/button-cancel-all-jobs.gif 887share/doc/cups/de/images/button-cancel-all-jobs.gif
827share/doc/cups/de/images/button-cancel-job.gif 888share/doc/cups/de/images/button-cancel-job.gif
 889share/doc/cups/de/images/button-cancel-subscription.gif
828share/doc/cups/de/images/button-change-settings.gif 890share/doc/cups/de/images/button-change-settings.gif
829share/doc/cups/de/images/button-clean-print-heads.gif 891share/doc/cups/de/images/button-clean-print-heads.gif
830share/doc/cups/de/images/button-clear.gif 892share/doc/cups/de/images/button-clear.gif
831share/doc/cups/de/images/button-continue.gif 893share/doc/cups/de/images/button-continue.gif
832share/doc/cups/de/images/button-delete-class.gif 894share/doc/cups/de/images/button-delete-class.gif
833share/doc/cups/de/images/button-delete-printer.gif 895share/doc/cups/de/images/button-delete-printer.gif
834share/doc/cups/de/images/button-edit-configuration-file.gif 896share/doc/cups/de/images/button-edit-configuration-file.gif
835share/doc/cups/de/images/button-export-samba.gif 897share/doc/cups/de/images/button-export-samba.gif
 898share/doc/cups/de/images/button-find-new-printers.gif
836share/doc/cups/de/images/button-help.gif 899share/doc/cups/de/images/button-help.gif
837share/doc/cups/de/images/button-hold-job.gif 900share/doc/cups/de/images/button-hold-job.gif
838share/doc/cups/de/images/button-manage-classes.gif 901share/doc/cups/de/images/button-manage-classes.gif
839share/doc/cups/de/images/button-manage-jobs.gif 902share/doc/cups/de/images/button-manage-jobs.gif
840share/doc/cups/de/images/button-manage-printers.gif 903share/doc/cups/de/images/button-manage-printers.gif
841share/doc/cups/de/images/button-manage-server.gif 904share/doc/cups/de/images/button-manage-server.gif
842share/doc/cups/de/images/button-modify-class.gif 905share/doc/cups/de/images/button-modify-class.gif
843share/doc/cups/de/images/button-modify-printer.gif 906share/doc/cups/de/images/button-modify-printer.gif
844share/doc/cups/de/images/button-move-job.gif 907share/doc/cups/de/images/button-move-job.gif
845share/doc/cups/de/images/button-move-jobs.gif 908share/doc/cups/de/images/button-move-jobs.gif
846share/doc/cups/de/images/button-print-self-test-page.gif 909share/doc/cups/de/images/button-print-self-test-page.gif
847share/doc/cups/de/images/button-print-test-page.gif 910share/doc/cups/de/images/button-print-test-page.gif
848share/doc/cups/de/images/button-publish-printer.gif 911share/doc/cups/de/images/button-publish-printer.gif
@@ -856,45 +919,49 @@ share/doc/cups/de/images/button-set-as-d @@ -856,45 +919,49 @@ share/doc/cups/de/images/button-set-as-d
856share/doc/cups/de/images/button-set-printer-options.gif 919share/doc/cups/de/images/button-set-printer-options.gif
857share/doc/cups/de/images/button-show-active.gif 920share/doc/cups/de/images/button-show-active.gif
858share/doc/cups/de/images/button-show-all.gif 921share/doc/cups/de/images/button-show-all.gif
859share/doc/cups/de/images/button-show-completed.gif 922share/doc/cups/de/images/button-show-completed.gif
860share/doc/cups/de/images/button-show-next.gif 923share/doc/cups/de/images/button-show-next.gif
861share/doc/cups/de/images/button-show-previous.gif 924share/doc/cups/de/images/button-show-previous.gif
862share/doc/cups/de/images/button-sort-ascending.gif 925share/doc/cups/de/images/button-sort-ascending.gif
863share/doc/cups/de/images/button-sort-descending.gif 926share/doc/cups/de/images/button-sort-descending.gif
864share/doc/cups/de/images/button-start-class.gif 927share/doc/cups/de/images/button-start-class.gif
865share/doc/cups/de/images/button-start-printer.gif 928share/doc/cups/de/images/button-start-printer.gif
866share/doc/cups/de/images/button-stop-class.gif 929share/doc/cups/de/images/button-stop-class.gif
867share/doc/cups/de/images/button-stop-printer.gif 930share/doc/cups/de/images/button-stop-printer.gif
868share/doc/cups/de/images/button-unpublish-printer.gif 931share/doc/cups/de/images/button-unpublish-printer.gif
 932share/doc/cups/de/images/button-use-default-config.gif
869share/doc/cups/de/images/button-view-access-log.gif 933share/doc/cups/de/images/button-view-access-log.gif
870share/doc/cups/de/images/button-view-error-log.gif 934share/doc/cups/de/images/button-view-error-log.gif
871share/doc/cups/de/images/button-view-page-log.gif 935share/doc/cups/de/images/button-view-page-log.gif
872share/doc/cups/de/images/button-view-printable-version.gif 936share/doc/cups/de/images/button-view-printable-version.gif
873share/doc/cups/de/index.html 937share/doc/cups/de/index.html
874share/doc/cups/es/images/button-accept-jobs.gif 938share/doc/cups/es/images/button-accept-jobs.gif
875share/doc/cups/es/images/button-add-class.gif 939share/doc/cups/es/images/button-add-class.gif
876share/doc/cups/es/images/button-add-printer.gif 940share/doc/cups/es/images/button-add-printer.gif
 941share/doc/cups/es/images/button-add-rss-subscription.gif
877share/doc/cups/es/images/button-add-this-printer.gif 942share/doc/cups/es/images/button-add-this-printer.gif
878share/doc/cups/es/images/button-cancel-all-jobs.gif 943share/doc/cups/es/images/button-cancel-all-jobs.gif
879share/doc/cups/es/images/button-cancel-job.gif 944share/doc/cups/es/images/button-cancel-job.gif
 945share/doc/cups/es/images/button-cancel-subscription.gif
880share/doc/cups/es/images/button-change-settings.gif 946share/doc/cups/es/images/button-change-settings.gif
881share/doc/cups/es/images/button-clean-print-heads.gif 947share/doc/cups/es/images/button-clean-print-heads.gif
882share/doc/cups/es/images/button-clear.gif 948share/doc/cups/es/images/button-clear.gif
883share/doc/cups/es/images/button-continue.gif 949share/doc/cups/es/images/button-continue.gif
884share/doc/cups/es/images/button-delete-class.gif 950share/doc/cups/es/images/button-delete-class.gif
885share/doc/cups/es/images/button-delete-printer.gif 951share/doc/cups/es/images/button-delete-printer.gif
886share/doc/cups/es/images/button-edit-configuration-file.gif 952share/doc/cups/es/images/button-edit-configuration-file.gif
887share/doc/cups/es/images/button-export-samba.gif 953share/doc/cups/es/images/button-export-samba.gif
 954share/doc/cups/es/images/button-find-new-printers.gif
888share/doc/cups/es/images/button-help.gif 955share/doc/cups/es/images/button-help.gif
889share/doc/cups/es/images/button-hold-job.gif 956share/doc/cups/es/images/button-hold-job.gif
890share/doc/cups/es/images/button-manage-classes.gif 957share/doc/cups/es/images/button-manage-classes.gif
891share/doc/cups/es/images/button-manage-jobs.gif 958share/doc/cups/es/images/button-manage-jobs.gif
892share/doc/cups/es/images/button-manage-printers.gif 959share/doc/cups/es/images/button-manage-printers.gif
893share/doc/cups/es/images/button-manage-server.gif 960share/doc/cups/es/images/button-manage-server.gif
894share/doc/cups/es/images/button-modify-class.gif 961share/doc/cups/es/images/button-modify-class.gif
895share/doc/cups/es/images/button-modify-printer.gif 962share/doc/cups/es/images/button-modify-printer.gif
896share/doc/cups/es/images/button-move-job.gif 963share/doc/cups/es/images/button-move-job.gif
897share/doc/cups/es/images/button-move-jobs.gif 964share/doc/cups/es/images/button-move-jobs.gif
898share/doc/cups/es/images/button-print-self-test-page.gif 965share/doc/cups/es/images/button-print-self-test-page.gif
899share/doc/cups/es/images/button-print-test-page.gif 966share/doc/cups/es/images/button-print-test-page.gif
900share/doc/cups/es/images/button-publish-printer.gif 967share/doc/cups/es/images/button-publish-printer.gif
@@ -1021,35 +1088,91 @@ share/doc/cups/fr/images/button-show-pre @@ -1021,35 +1088,91 @@ share/doc/cups/fr/images/button-show-pre
1021share/doc/cups/fr/images/button-sort-ascending.gif 1088share/doc/cups/fr/images/button-sort-ascending.gif
1022share/doc/cups/fr/images/button-sort-descending.gif 1089share/doc/cups/fr/images/button-sort-descending.gif
1023share/doc/cups/fr/images/button-start-class.gif 1090share/doc/cups/fr/images/button-start-class.gif
1024share/doc/cups/fr/images/button-start-printer.gif 1091share/doc/cups/fr/images/button-start-printer.gif
1025share/doc/cups/fr/images/button-stop-class.gif 1092share/doc/cups/fr/images/button-stop-class.gif
1026share/doc/cups/fr/images/button-stop-printer.gif 1093share/doc/cups/fr/images/button-stop-printer.gif
1027share/doc/cups/fr/images/button-unpublish-printer.gif 1094share/doc/cups/fr/images/button-unpublish-printer.gif
1028share/doc/cups/fr/images/button-use-default-config.gif 1095share/doc/cups/fr/images/button-use-default-config.gif
1029share/doc/cups/fr/images/button-view-access-log.gif 1096share/doc/cups/fr/images/button-view-access-log.gif
1030share/doc/cups/fr/images/button-view-error-log.gif 1097share/doc/cups/fr/images/button-view-error-log.gif
1031share/doc/cups/fr/images/button-view-page-log.gif 1098share/doc/cups/fr/images/button-view-page-log.gif
1032share/doc/cups/fr/images/button-view-printable-version.gif 1099share/doc/cups/fr/images/button-view-printable-version.gif
1033share/doc/cups/fr/index.html 1100share/doc/cups/fr/index.html
 1101share/doc/cups/he/cups.css
 1102share/doc/cups/he/images/button-accept-jobs.gif
 1103share/doc/cups/he/images/button-add-class.gif
 1104share/doc/cups/he/images/button-add-printer.gif
 1105share/doc/cups/he/images/button-add-this-printer.gif
 1106share/doc/cups/he/images/button-cancel-all-jobs.gif
 1107share/doc/cups/he/images/button-cancel-job.gif
 1108share/doc/cups/he/images/button-change-settings.gif
 1109share/doc/cups/he/images/button-clean-print-heads.gif
 1110share/doc/cups/he/images/button-clear.gif
 1111share/doc/cups/he/images/button-continue.gif
 1112share/doc/cups/he/images/button-delete-class.gif
 1113share/doc/cups/he/images/button-delete-printer.gif
 1114share/doc/cups/he/images/button-edit-configuration-file.gif
 1115share/doc/cups/he/images/button-export-samba.gif
 1116share/doc/cups/he/images/button-help.gif
 1117share/doc/cups/he/images/button-hold-job.gif
 1118share/doc/cups/he/images/button-manage-classes.gif
 1119share/doc/cups/he/images/button-manage-jobs.gif
 1120share/doc/cups/he/images/button-manage-printers.gif
 1121share/doc/cups/he/images/button-manage-server.gif
 1122share/doc/cups/he/images/button-modify-class.gif
 1123share/doc/cups/he/images/button-modify-printer.gif
 1124share/doc/cups/he/images/button-move-job.gif
 1125share/doc/cups/he/images/button-move-jobs.gif
 1126share/doc/cups/he/images/button-print-self-test-page.gif
 1127share/doc/cups/he/images/button-print-test-page.gif
 1128share/doc/cups/he/images/button-publish-printer.gif
 1129share/doc/cups/he/images/button-reject-jobs.gif
 1130share/doc/cups/he/images/button-release-job.gif
 1131share/doc/cups/he/images/button-restart-job.gif
 1132share/doc/cups/he/images/button-save-changes.gif
 1133share/doc/cups/he/images/button-search.gif
 1134share/doc/cups/he/images/button-set-allowed-users.gif
 1135share/doc/cups/he/images/button-set-as-default.gif
 1136share/doc/cups/he/images/button-set-printer-options.gif
 1137share/doc/cups/he/images/button-show-active.gif
 1138share/doc/cups/he/images/button-show-all.gif
 1139share/doc/cups/he/images/button-show-completed.gif
 1140share/doc/cups/he/images/button-show-next.gif
 1141share/doc/cups/he/images/button-show-previous.gif
 1142share/doc/cups/he/images/button-sort-ascending.gif
 1143share/doc/cups/he/images/button-sort-descending.gif
 1144share/doc/cups/he/images/button-start-class.gif
 1145share/doc/cups/he/images/button-start-printer.gif
 1146share/doc/cups/he/images/button-stop-class.gif
 1147share/doc/cups/he/images/button-stop-printer.gif
 1148share/doc/cups/he/images/button-unpublish-printer.gif
 1149share/doc/cups/he/images/button-use-default-config.gif
 1150share/doc/cups/he/images/button-view-access-log.gif
 1151share/doc/cups/he/images/button-view-error-log.gif
 1152share/doc/cups/he/images/button-view-page-log.gif
 1153share/doc/cups/he/images/button-view-printable-version.gif
 1154share/doc/cups/he/index.html
 1155share/doc/cups/help/accounting.html
1034share/doc/cups/help/api-array.html 1156share/doc/cups/help/api-array.html
1035share/doc/cups/help/api-cups.html 1157share/doc/cups/help/api-cups.html
1036share/doc/cups/help/api-filedir.html 1158share/doc/cups/help/api-filedir.html
1037share/doc/cups/help/api-filter.html 1159share/doc/cups/help/api-filter.html
1038share/doc/cups/help/api-httpipp.html 1160share/doc/cups/help/api-httpipp.html
1039share/doc/cups/help/api-ppd.html 1161share/doc/cups/help/api-ppd.html
1040share/doc/cups/help/api-raster.html 1162share/doc/cups/help/api-raster.html
1041share/doc/cups/help/cgi.html 1163share/doc/cups/help/cgi.html
1042share/doc/cups/help/glossary.html 1164share/doc/cups/help/glossary.html
 1165share/doc/cups/help/kerberos.html
1043share/doc/cups/help/license.html 1166share/doc/cups/help/license.html
1044share/doc/cups/help/man-accept.html 1167share/doc/cups/help/man-accept.html
1045share/doc/cups/help/man-backend.html 1168share/doc/cups/help/man-backend.html
1046share/doc/cups/help/man-cancel.html 1169share/doc/cups/help/man-cancel.html
1047share/doc/cups/help/man-classes.conf.html 1170share/doc/cups/help/man-classes.conf.html
1048share/doc/cups/help/man-client.conf.html 1171share/doc/cups/help/man-client.conf.html
1049share/doc/cups/help/man-cups-config.html 1172share/doc/cups/help/man-cups-config.html
1050share/doc/cups/help/man-cups-lpd.html 1173share/doc/cups/help/man-cups-lpd.html
1051share/doc/cups/help/man-cups-polld.html 1174share/doc/cups/help/man-cups-polld.html
1052share/doc/cups/help/man-cupsaddsmb.html 1175share/doc/cups/help/man-cupsaddsmb.html
1053share/doc/cups/help/man-cupsd.conf.html 1176share/doc/cups/help/man-cupsd.conf.html
1054share/doc/cups/help/man-cupsd.html 1177share/doc/cups/help/man-cupsd.html
1055share/doc/cups/help/man-cupsenable.html 1178share/doc/cups/help/man-cupsenable.html
@@ -1079,48 +1202,52 @@ share/doc/cups/help/ref-classes-conf.htm @@ -1079,48 +1202,52 @@ share/doc/cups/help/ref-classes-conf.htm
1079share/doc/cups/help/ref-client-conf.html 1202share/doc/cups/help/ref-client-conf.html
1080share/doc/cups/help/ref-cupsd-conf.html 1203share/doc/cups/help/ref-cupsd-conf.html
1081share/doc/cups/help/ref-error_log.html 1204share/doc/cups/help/ref-error_log.html
1082share/doc/cups/help/ref-mailto-conf.html 1205share/doc/cups/help/ref-mailto-conf.html
1083share/doc/cups/help/ref-page_log.html 1206share/doc/cups/help/ref-page_log.html
1084share/doc/cups/help/ref-printers-conf.html 1207share/doc/cups/help/ref-printers-conf.html
1085share/doc/cups/help/ref-snmp-conf.html 1208share/doc/cups/help/ref-snmp-conf.html
1086share/doc/cups/help/ref-subscriptions-conf.html 1209share/doc/cups/help/ref-subscriptions-conf.html
1087share/doc/cups/help/security.html 1210share/doc/cups/help/security.html
1088share/doc/cups/help/spec-cmp.html 1211share/doc/cups/help/spec-cmp.html
1089share/doc/cups/help/spec-command.html 1212share/doc/cups/help/spec-command.html
1090share/doc/cups/help/spec-design.html 1213share/doc/cups/help/spec-design.html
1091share/doc/cups/help/spec-ipp.html 1214share/doc/cups/help/spec-ipp.html
 1215share/doc/cups/help/spec-postscript.html
1092share/doc/cups/help/spec-ppd.html 1216share/doc/cups/help/spec-ppd.html
1093share/doc/cups/help/spec-raster.html 1217share/doc/cups/help/spec-raster.html
1094share/doc/cups/help/spec-stp.html 1218share/doc/cups/help/spec-stp.html
1095share/doc/cups/help/standard.html 1219share/doc/cups/help/standard.html
1096share/doc/cups/help/translation.html 1220share/doc/cups/help/translation.html
1097share/doc/cups/help/whatsnew.html 1221share/doc/cups/help/whatsnew.html
1098share/doc/cups/images/bottom-left.gif 1222share/doc/cups/images/bottom-left.gif
1099share/doc/cups/images/bottom-right.gif 1223share/doc/cups/images/bottom-right.gif
1100share/doc/cups/images/button-accept-jobs.gif 1224share/doc/cups/images/button-accept-jobs.gif
1101share/doc/cups/images/button-add-class.gif 1225share/doc/cups/images/button-add-class.gif
1102share/doc/cups/images/button-add-printer.gif 1226share/doc/cups/images/button-add-printer.gif
 1227share/doc/cups/images/button-add-rss-subscription.gif
1103share/doc/cups/images/button-add-this-printer.gif 1228share/doc/cups/images/button-add-this-printer.gif
1104share/doc/cups/images/button-cancel-all-jobs.gif 1229share/doc/cups/images/button-cancel-all-jobs.gif
1105share/doc/cups/images/button-cancel-job.gif 1230share/doc/cups/images/button-cancel-job.gif
 1231share/doc/cups/images/button-cancel-subscription.gif
1106share/doc/cups/images/button-change-settings.gif 1232share/doc/cups/images/button-change-settings.gif
1107share/doc/cups/images/button-clean-print-heads.gif 1233share/doc/cups/images/button-clean-print-heads.gif
1108share/doc/cups/images/button-clear.gif 1234share/doc/cups/images/button-clear.gif
1109share/doc/cups/images/button-continue.gif 1235share/doc/cups/images/button-continue.gif
1110share/doc/cups/images/button-delete-class.gif 1236share/doc/cups/images/button-delete-class.gif
1111share/doc/cups/images/button-delete-printer.gif 1237share/doc/cups/images/button-delete-printer.gif
1112share/doc/cups/images/button-edit-configuration-file.gif 1238share/doc/cups/images/button-edit-configuration-file.gif
1113share/doc/cups/images/button-export-samba.gif 1239share/doc/cups/images/button-export-samba.gif
 1240share/doc/cups/images/button-find-new-printers.gif
1114share/doc/cups/images/button-help.gif 1241share/doc/cups/images/button-help.gif
1115share/doc/cups/images/button-hold-job.gif 1242share/doc/cups/images/button-hold-job.gif
1116share/doc/cups/images/button-manage-classes.gif 1243share/doc/cups/images/button-manage-classes.gif
1117share/doc/cups/images/button-manage-jobs.gif 1244share/doc/cups/images/button-manage-jobs.gif
1118share/doc/cups/images/button-manage-printers.gif 1245share/doc/cups/images/button-manage-printers.gif
1119share/doc/cups/images/button-manage-server.gif 1246share/doc/cups/images/button-manage-server.gif
1120share/doc/cups/images/button-modify-class.gif 1247share/doc/cups/images/button-modify-class.gif
1121share/doc/cups/images/button-modify-printer.gif 1248share/doc/cups/images/button-modify-printer.gif
1122share/doc/cups/images/button-move-job.gif 1249share/doc/cups/images/button-move-job.gif
1123share/doc/cups/images/button-move-jobs.gif 1250share/doc/cups/images/button-move-jobs.gif
1124share/doc/cups/images/button-print-self-test-page.gif 1251share/doc/cups/images/button-print-self-test-page.gif
1125share/doc/cups/images/button-print-test-page.gif 1252share/doc/cups/images/button-print-test-page.gif
1126share/doc/cups/images/button-publish-printer.gif 1253share/doc/cups/images/button-publish-printer.gif
@@ -1147,26 +1274,28 @@ share/doc/cups/images/button-unpublish-p @@ -1147,26 +1274,28 @@ share/doc/cups/images/button-unpublish-p
1147share/doc/cups/images/button-use-default-config.gif 1274share/doc/cups/images/button-use-default-config.gif
1148share/doc/cups/images/button-view-access-log.gif 1275share/doc/cups/images/button-view-access-log.gif
1149share/doc/cups/images/button-view-error-log.gif 1276share/doc/cups/images/button-view-error-log.gif
1150share/doc/cups/images/button-view-page-log.gif 1277share/doc/cups/images/button-view-page-log.gif
1151share/doc/cups/images/button-view-printable-version.gif 1278share/doc/cups/images/button-view-printable-version.gif
1152share/doc/cups/images/classes.gif 1279share/doc/cups/images/classes.gif
1153share/doc/cups/images/cups-block-diagram.gif 1280share/doc/cups/images/cups-block-diagram.gif
1154share/doc/cups/images/esp-logo.gif 1281share/doc/cups/images/esp-logo.gif
1155share/doc/cups/images/happy.gif 1282share/doc/cups/images/happy.gif
1156share/doc/cups/images/logo.gif 1283share/doc/cups/images/logo.gif
1157share/doc/cups/images/printer-idle.gif 1284share/doc/cups/images/printer-idle.gif
1158share/doc/cups/images/printer-processing.gif 1285share/doc/cups/images/printer-processing.gif
1159share/doc/cups/images/printer-stopped.gif 1286share/doc/cups/images/printer-stopped.gif
 1287share/doc/cups/images/raster.png
 1288share/doc/cups/images/raster.svg
1160share/doc/cups/images/smiley.jpg 1289share/doc/cups/images/smiley.jpg
1161share/doc/cups/images/tab-left.gif 1290share/doc/cups/images/tab-left.gif
1162share/doc/cups/images/tab-right.gif 1291share/doc/cups/images/tab-right.gif
1163share/doc/cups/images/top-left.gif 1292share/doc/cups/images/top-left.gif
1164share/doc/cups/images/top-middle.gif 1293share/doc/cups/images/top-middle.gif
1165share/doc/cups/images/top-right.gif 1294share/doc/cups/images/top-right.gif
1166share/doc/cups/images/web-add-this-printer.gif 1295share/doc/cups/images/web-add-this-printer.gif
1167share/doc/cups/images/web-password.gif 1296share/doc/cups/images/web-password.gif
1168share/doc/cups/images/web-printer-driver.gif 1297share/doc/cups/images/web-printer-driver.gif
1169share/doc/cups/images/web-printer-status.gif 1298share/doc/cups/images/web-printer-status.gif
1170share/doc/cups/images/web-set-printer-options.gif 1299share/doc/cups/images/web-set-printer-options.gif
1171share/doc/cups/images/web-test-page.gif 1300share/doc/cups/images/web-test-page.gif
1172share/doc/cups/index.html 1301share/doc/cups/index.html
@@ -1216,71 +1345,78 @@ share/doc/cups/it/images/button-start-cl @@ -1216,71 +1345,78 @@ share/doc/cups/it/images/button-start-cl
1216share/doc/cups/it/images/button-start-printer.gif 1345share/doc/cups/it/images/button-start-printer.gif
1217share/doc/cups/it/images/button-stop-class.gif 1346share/doc/cups/it/images/button-stop-class.gif
1218share/doc/cups/it/images/button-stop-printer.gif 1347share/doc/cups/it/images/button-stop-printer.gif
1219share/doc/cups/it/images/button-unpublish-printer.gif 1348share/doc/cups/it/images/button-unpublish-printer.gif
1220share/doc/cups/it/images/button-use-default-config.gif 1349share/doc/cups/it/images/button-use-default-config.gif
1221share/doc/cups/it/images/button-view-access-log.gif 1350share/doc/cups/it/images/button-view-access-log.gif
1222share/doc/cups/it/images/button-view-error-log.gif 1351share/doc/cups/it/images/button-view-error-log.gif
1223share/doc/cups/it/images/button-view-page-log.gif 1352share/doc/cups/it/images/button-view-page-log.gif
1224share/doc/cups/it/images/button-view-printable-version.gif 1353share/doc/cups/it/images/button-view-printable-version.gif
1225share/doc/cups/it/index.html 1354share/doc/cups/it/index.html
1226share/doc/cups/ja/images/button-accept-jobs.gif 1355share/doc/cups/ja/images/button-accept-jobs.gif
1227share/doc/cups/ja/images/button-add-class.gif 1356share/doc/cups/ja/images/button-add-class.gif
1228share/doc/cups/ja/images/button-add-printer.gif 1357share/doc/cups/ja/images/button-add-printer.gif
 1358share/doc/cups/ja/images/button-add-rss-subscription.gif
1229share/doc/cups/ja/images/button-add-this-printer.gif 1359share/doc/cups/ja/images/button-add-this-printer.gif
1230share/doc/cups/ja/images/button-cancel-all-jobs.gif 1360share/doc/cups/ja/images/button-cancel-all-jobs.gif
1231share/doc/cups/ja/images/button-cancel-job.gif 1361share/doc/cups/ja/images/button-cancel-job.gif
 1362share/doc/cups/ja/images/button-cancel-subscription.gif
1232share/doc/cups/ja/images/button-change-settings.gif 1363share/doc/cups/ja/images/button-change-settings.gif
 1364share/doc/cups/ja/images/button-clean-print-heads.gif
 1365share/doc/cups/ja/images/button-clear.gif
1233share/doc/cups/ja/images/button-continue.gif 1366share/doc/cups/ja/images/button-continue.gif
1234share/doc/cups/ja/images/button-delete-class.gif 1367share/doc/cups/ja/images/button-delete-class.gif
1235share/doc/cups/ja/images/button-delete-printer.gif 1368share/doc/cups/ja/images/button-delete-printer.gif
1236share/doc/cups/ja/images/button-edit-configuration-file.gif 1369share/doc/cups/ja/images/button-edit-configuration-file.gif
1237share/doc/cups/ja/images/button-export-samba.gif 1370share/doc/cups/ja/images/button-export-samba.gif
 1371share/doc/cups/ja/images/button-find-new-printers.gif
1238share/doc/cups/ja/images/button-help.gif 1372share/doc/cups/ja/images/button-help.gif
1239share/doc/cups/ja/images/button-hold-job.gif 1373share/doc/cups/ja/images/button-hold-job.gif
1240share/doc/cups/ja/images/button-manage-classes.gif 1374share/doc/cups/ja/images/button-manage-classes.gif
1241share/doc/cups/ja/images/button-manage-jobs.gif 1375share/doc/cups/ja/images/button-manage-jobs.gif
1242share/doc/cups/ja/images/button-manage-printers.gif 1376share/doc/cups/ja/images/button-manage-printers.gif
1243share/doc/cups/ja/images/button-manage-server.gif 1377share/doc/cups/ja/images/button-manage-server.gif
1244share/doc/cups/ja/images/button-modify-class.gif 1378share/doc/cups/ja/images/button-modify-class.gif
1245share/doc/cups/ja/images/button-modify-printer.gif 1379share/doc/cups/ja/images/button-modify-printer.gif
1246share/doc/cups/ja/images/button-move-job.gif 1380share/doc/cups/ja/images/button-move-job.gif
1247share/doc/cups/ja/images/button-move-jobs.gif 1381share/doc/cups/ja/images/button-move-jobs.gif
 1382share/doc/cups/ja/images/button-print-self-test-page.gif
1248share/doc/cups/ja/images/button-print-test-page.gif 1383share/doc/cups/ja/images/button-print-test-page.gif
1249share/doc/cups/ja/images/button-publish-printer.gif 1384share/doc/cups/ja/images/button-publish-printer.gif
1250share/doc/cups/ja/images/button-reject-jobs.gif 1385share/doc/cups/ja/images/button-reject-jobs.gif
1251share/doc/cups/ja/images/button-release-job.gif 1386share/doc/cups/ja/images/button-release-job.gif
1252share/doc/cups/ja/images/button-restart-job.gif 1387share/doc/cups/ja/images/button-restart-job.gif
1253share/doc/cups/ja/images/button-save-changes.gif 1388share/doc/cups/ja/images/button-save-changes.gif
1254share/doc/cups/ja/images/button-search.gif 1389share/doc/cups/ja/images/button-search.gif
1255share/doc/cups/ja/images/button-set-allowed-users.gif 1390share/doc/cups/ja/images/button-set-allowed-users.gif
1256share/doc/cups/ja/images/button-set-as-default.gif 1391share/doc/cups/ja/images/button-set-as-default.gif
1257share/doc/cups/ja/images/button-set-printer-options.gif 1392share/doc/cups/ja/images/button-set-printer-options.gif
1258share/doc/cups/ja/images/button-show-active.gif 1393share/doc/cups/ja/images/button-show-active.gif
1259share/doc/cups/ja/images/button-show-all.gif 1394share/doc/cups/ja/images/button-show-all.gif
1260share/doc/cups/ja/images/button-show-completed.gif 1395share/doc/cups/ja/images/button-show-completed.gif
1261share/doc/cups/ja/images/button-show-next.gif 1396share/doc/cups/ja/images/button-show-next.gif
1262share/doc/cups/ja/images/button-show-previous.gif 1397share/doc/cups/ja/images/button-show-previous.gif
1263share/doc/cups/ja/images/button-sort-ascending.gif 1398share/doc/cups/ja/images/button-sort-ascending.gif
1264share/doc/cups/ja/images/button-sort-descending.gif 1399share/doc/cups/ja/images/button-sort-descending.gif
1265share/doc/cups/ja/images/button-start-class.gif 1400share/doc/cups/ja/images/button-start-class.gif
1266share/doc/cups/ja/images/button-start-printer.gif 1401share/doc/cups/ja/images/button-start-printer.gif
1267share/doc/cups/ja/images/button-stop-class.gif 1402share/doc/cups/ja/images/button-stop-class.gif
1268share/doc/cups/ja/images/button-stop-printer.gif 1403share/doc/cups/ja/images/button-stop-printer.gif
1269share/doc/cups/ja/images/button-unpublish-printer.gif 1404share/doc/cups/ja/images/button-unpublish-printer.gif
1270share/doc/cups/ja/images/button-use-default-config.gif 1405share/doc/cups/ja/images/button-use-default-config.gif
1271share/doc/cups/ja/images/button-view-access-log.gif 1406share/doc/cups/ja/images/button-view-access-log.gif
1272share/doc/cups/ja/images/button-view-error-log.gif 1407share/doc/cups/ja/images/button-view-error-log.gif
1273share/doc/cups/ja/images/button-view-page-log.gif 1408share/doc/cups/ja/images/button-view-page-log.gif
 1409share/doc/cups/ja/images/button-view-printable-version.gif
1274share/doc/cups/ja/index.html 1410share/doc/cups/ja/index.html
1275share/doc/cups/pl/images/button-accept-jobs.gif 1411share/doc/cups/pl/images/button-accept-jobs.gif
1276share/doc/cups/pl/images/button-add-class.gif 1412share/doc/cups/pl/images/button-add-class.gif
1277share/doc/cups/pl/images/button-add-printer.gif 1413share/doc/cups/pl/images/button-add-printer.gif
1278share/doc/cups/pl/images/button-add-this-printer.gif 1414share/doc/cups/pl/images/button-add-this-printer.gif
1279share/doc/cups/pl/images/button-cancel-all-jobs.gif 1415share/doc/cups/pl/images/button-cancel-all-jobs.gif
1280share/doc/cups/pl/images/button-cancel-job.gif 1416share/doc/cups/pl/images/button-cancel-job.gif
1281share/doc/cups/pl/images/button-change-settings.gif 1417share/doc/cups/pl/images/button-change-settings.gif
1282share/doc/cups/pl/images/button-clean-print-heads.gif 1418share/doc/cups/pl/images/button-clean-print-heads.gif
1283share/doc/cups/pl/images/button-clear.gif 1419share/doc/cups/pl/images/button-clear.gif
1284share/doc/cups/pl/images/button-continue.gif 1420share/doc/cups/pl/images/button-continue.gif
1285share/doc/cups/pl/images/button-delete-class.gif 1421share/doc/cups/pl/images/button-delete-class.gif
1286share/doc/cups/pl/images/button-delete-printer.gif 1422share/doc/cups/pl/images/button-delete-printer.gif
@@ -1426,67 +1562,126 @@ share/doc/cups/zh_TW/images/button-start @@ -1426,67 +1562,126 @@ share/doc/cups/zh_TW/images/button-start
1426share/doc/cups/zh_TW/images/button-stop-class.gif 1562share/doc/cups/zh_TW/images/button-stop-class.gif
1427share/doc/cups/zh_TW/images/button-stop-printer.gif 1563share/doc/cups/zh_TW/images/button-stop-printer.gif
1428share/doc/cups/zh_TW/images/button-unpublish-printer.gif 1564share/doc/cups/zh_TW/images/button-unpublish-printer.gif
1429share/doc/cups/zh_TW/images/button-use-default-config.gif 1565share/doc/cups/zh_TW/images/button-use-default-config.gif
1430share/doc/cups/zh_TW/images/button-view-access-log.gif 1566share/doc/cups/zh_TW/images/button-view-access-log.gif
1431share/doc/cups/zh_TW/images/button-view-error-log.gif 1567share/doc/cups/zh_TW/images/button-view-error-log.gif
1432share/doc/cups/zh_TW/images/button-view-page-log.gif 1568share/doc/cups/zh_TW/images/button-view-page-log.gif
1433share/doc/cups/zh_TW/images/button-view-printable-version.gif 1569share/doc/cups/zh_TW/images/button-view-printable-version.gif
1434share/doc/cups/zh_TW/index.html 1570share/doc/cups/zh_TW/index.html
1435${PAM}share/examples/cups/cups.pam 1571${PAM}share/examples/cups/cups.pam
1436share/examples/cups/cupsd.conf 1572share/examples/cups/cupsd.conf
1437share/examples/cups/mime.convs 1573share/examples/cups/mime.convs
1438share/examples/cups/mime.types 1574share/examples/cups/mime.types
 1575share/examples/cups/snmp.conf
1439share/examples/rc.d/cupsd 1576share/examples/rc.d/cupsd
 1577share/locale/da/cups_da.po
1440share/locale/de/cups_de.po 1578share/locale/de/cups_de.po
1441share/locale/es/cups_es.po 1579share/locale/es/cups_es.po
1442share/locale/et/cups_et.po 1580share/locale/et/cups_et.po
 1581share/locale/fi/cups_fi.po
1443share/locale/fr/cups_fr.po 1582share/locale/fr/cups_fr.po
 1583share/locale/he/cups_he.po
1444share/locale/it/cups_it.po 1584share/locale/it/cups_it.po
1445share/locale/ja/cups_ja.po 1585share/locale/ja/cups_ja.po
 1586share/locale/ko/cups_ko.po
 1587share/locale/nl/cups_nl.po
 1588share/locale/no/cups_no.po
1446share/locale/pl/cups_pl.po 1589share/locale/pl/cups_pl.po
 1590share/locale/pt/cups_pt.po
 1591share/locale/pt_BR/cups_pt_BR.po
 1592share/locale/ru/cups_ru.po
1447share/locale/sv/cups_sv.po 1593share/locale/sv/cups_sv.po
 1594share/locale/zh/cups_zh.po
1448share/locale/zh_TW/cups_zh_TW.po 1595share/locale/zh_TW/cups_zh_TW.po
1449@dirrm share/examples/cups 1596@dirrm share/examples/cups
1450@dirrm share/doc/cups/zh_TW/images 1597@dirrm share/doc/cups/zh_TW/images
1451@dirrm share/doc/cups/zh_TW 1598@dirrm share/doc/cups/zh_TW
 1599@exec ${MKDIR} %D/share/doc/cups/zh/images
 1600@dirrm share/doc/cups/zh/images
 1601@dirrm share/doc/cups/zh
1452@dirrm share/doc/cups/sv/images 1602@dirrm share/doc/cups/sv/images
1453@dirrm share/doc/cups/sv 1603@dirrm share/doc/cups/sv
 1604@exec ${MKDIR} %D/share/doc/cups/ru/images
 1605@dirrm share/doc/cups/ru/images
 1606@dirrm share/doc/cups/ru
 1607@exec ${MKDIR} %D/share/doc/cups/pt_BR/images
 1608@dirrm share/doc/cups/pt_BR/images
 1609@dirrm share/doc/cups/pt_BR
 1610@exec ${MKDIR} %D/share/doc/cups/pt/images
 1611@dirrm share/doc/cups/pt/images
 1612@dirrm share/doc/cups/pt
1454@dirrm share/doc/cups/pl/images 1613@dirrm share/doc/cups/pl/images
1455@dirrm share/doc/cups/pl 1614@dirrm share/doc/cups/pl
 1615@exec ${MKDIR} %D/share/doc/cups/no/images
 1616@dirrm share/doc/cups/no/images
 1617@dirrm share/doc/cups/no
 1618@exec ${MKDIR} %D/share/doc/cups/nl/images
 1619@dirrm share/doc/cups/nl/images
 1620@dirrm share/doc/cups/nl
 1621@exec ${MKDIR} %D/share/doc/cups/ko/images
 1622@dirrm share/doc/cups/ko/images
 1623@dirrm share/doc/cups/ko
1456@dirrm share/doc/cups/ja/images 1624@dirrm share/doc/cups/ja/images
1457@dirrm share/doc/cups/ja 1625@dirrm share/doc/cups/ja
1458@dirrm share/doc/cups/it/images 1626@dirrm share/doc/cups/it/images
1459@dirrm share/doc/cups/it 1627@dirrm share/doc/cups/it
1460@dirrm share/doc/cups/images 1628@dirrm share/doc/cups/images
1461@dirrm share/doc/cups/help 1629@dirrm share/doc/cups/help
 1630@dirrm share/doc/cups/he/images
 1631@dirrm share/doc/cups/he
1462@dirrm share/doc/cups/fr/images 1632@dirrm share/doc/cups/fr/images
1463@dirrm share/doc/cups/fr 1633@dirrm share/doc/cups/fr
 1634@exec ${MKDIR} %D/share/doc/cups/fi/images
 1635@dirrm share/doc/cups/fi/images
 1636@dirrm share/doc/cups/fi
1464@dirrm share/doc/cups/et/images 1637@dirrm share/doc/cups/et/images
1465@dirrm share/doc/cups/et 1638@dirrm share/doc/cups/et
1466@dirrm share/doc/cups/es/images 1639@dirrm share/doc/cups/es/images
1467@dirrm share/doc/cups/es 1640@dirrm share/doc/cups/es
1468@dirrm share/doc/cups/de/images 1641@dirrm share/doc/cups/de/images
1469@dirrm share/doc/cups/de 1642@dirrm share/doc/cups/de
 1643@exec ${MKDIR} %D/share/doc/cups/da/images
 1644@dirrm share/doc/cups/da/images
 1645@dirrm share/doc/cups/da
1470@dirrm share/doc/cups 1646@dirrm share/doc/cups
1471@dirrm share/cups/templates/zh_TW 1647@dirrm share/cups/templates/zh_TW
 1648@exec ${MKDIR} %D/share/cups/templates/zh
 1649@dirrm share/cups/templates/zh
1472@dirrm share/cups/templates/sv 1650@dirrm share/cups/templates/sv
 1651@exec ${MKDIR} %D/share/cups/templates/ru
 1652@dirrm share/cups/templates/ru
 1653@exec ${MKDIR} %D/share/cups/templates/pt_BR
 1654@dirrm share/cups/templates/pt_BR
 1655@exec ${MKDIR} %D/share/cups/templates/pt
 1656@dirrm share/cups/templates/pt
1473@dirrm share/cups/templates/pl 1657@dirrm share/cups/templates/pl
 1658@exec ${MKDIR} %D/share/cups/templates/no
 1659@dirrm share/cups/templates/no
 1660@exec ${MKDIR} %D/share/cups/templates/nl
 1661@dirrm share/cups/templates/nl
 1662@exec ${MKDIR} %D/share/cups/templates/ko
 1663@dirrm share/cups/templates/ko
1474@dirrm share/cups/templates/ja 1664@dirrm share/cups/templates/ja
1475@dirrm share/cups/templates/it 1665@dirrm share/cups/templates/it
 1666@dirrm share/cups/templates/he
1476@dirrm share/cups/templates/fr 1667@dirrm share/cups/templates/fr
 1668@exec ${MKDIR} %D/share/cups/templates/fi
 1669@dirrm share/cups/templates/fi
1477@dirrm share/cups/templates/et 1670@dirrm share/cups/templates/et
1478@dirrm share/cups/templates/es 1671@dirrm share/cups/templates/es
1479@dirrm share/cups/templates/de 1672@dirrm share/cups/templates/de
 1673@exec ${MKDIR} %D/share/cups/templates/da
 1674@dirrm share/cups/templates/da
1480@dirrm share/cups/templates 1675@dirrm share/cups/templates
1481@exec ${MKDIR} %D/share/cups/profiles 1676@exec ${MKDIR} %D/share/cups/profiles
1482@dirrm share/cups/profiles 1677@dirrm share/cups/profiles
1483@dirrm share/cups/model 1678@dirrm share/cups/model
1484@dirrm share/cups/fonts 1679@dirrm share/cups/fonts
1485@dirrm share/cups/data 1680@dirrm share/cups/data
1486@dirrm share/cups/charsets 1681@dirrm share/cups/charsets
1487@dirrm share/cups/charmaps 1682@dirrm share/cups/charmaps
1488@dirrm share/cups/banners 1683@dirrm share/cups/banners
1489@dirrm share/cups 1684@dirrm share/cups
1490@dirrm libexec/cups/notifier 1685@dirrm libexec/cups/notifier
1491@dirrm libexec/cups/monitor 1686@dirrm libexec/cups/monitor
1492@dirrm libexec/cups/filter 1687@dirrm libexec/cups/filter
cvs diff -r1.53 -r1.54 pkgsrc/print/cups/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/distinfo 2007/11/05 20:16:19 1.53
+++ pkgsrc/print/cups/Attic/distinfo 2008/01/22 23:58:13 1.54
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.53 2007/11/05 20:16:19 adrianp Exp $ 1$NetBSD: distinfo,v 1.54 2008/01/22 23:58:13 markd Exp $
2 2
3SHA1 (cups-1.2.12-source.tar.bz2) = 11a540f76a1d3164b6636bf8ba47928803ad9356 3SHA1 (cups-1.3.5-source.tar.bz2) = f0f7674b46e00582f327765acd4133a6035d393e
4RMD160 (cups-1.2.12-source.tar.bz2) = 598270e37ff8a9b9ff1e667066d6f7e120493e32 4RMD160 (cups-1.3.5-source.tar.bz2) = c6157e552e833447e623175a4e90146ceb9d9ba4
5Size (cups-1.2.12-source.tar.bz2) = 3788301 bytes 5Size (cups-1.3.5-source.tar.bz2) = 4082098 bytes
6SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd 6SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd
7SHA1 (patch-ab) = f4e587f328390c550bbb70e24d7c2a90c4c73557 7SHA1 (patch-ab) = 11936b2512fc4480a45a8efb01de0c5a29a7a6e8
8SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04 8SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04
9SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60 9SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60
10SHA1 (patch-an) = 4c5271b0f4a262e782e3de8396870498125675bd 10SHA1 (patch-ae) = f833e5b95c62a76d1d9222107a08f241c688a88d
11SHA1 (patch-ao) = 5cb88810f316ffad2a004d13e65b70108c8234b2 11SHA1 (patch-an) = 5c12e6de5d83659011c6050786049756e4aa4b49
 12SHA1 (patch-ao) = 4fc204e312bf8752f3f3b4fd73ec1e4f166ae2d3
12SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1 13SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1
13SHA1 (patch-au) = 9d9f8474cb553e112f5b53e84593347f919534e1 
File Added: pkgsrc/print/cups/Attic/options.mk
# $NetBSD: options.mk,v 1.1 2008/01/22 23:58:13 markd Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
PKG_SUPPORTED_OPTIONS=	dnssd kerberos pam slp
PKG_SUGGESTED_OPTIONS=	dnssd kerberos slp
.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mpam)
.  include "../../mk/pam.buildlink3.mk"
CONFIGURE_ARGS+=	--enable-pam
MESSAGE_SRC=		${PKGDIR}/MESSAGE
MESSAGE_SRC+=		${PKGDIR}/MESSAGE.pam
PLIST_SUBST+=		PAM=
.else
CONFIGURE_ARGS+=	--disable-pam
MESSAGE_SRC=		${.CURDIR}/MESSAGE
PLIST_SUBST+=		PAM="@comment "
.endif

.if !empty(PKG_OPTIONS:Mslp)
.include "../../net/openslp/buildlink3.mk"
CONFIGURE_ARGS+=	--enable-slp
.else
CONFIGURE_ARGS+=	--disable-slp
.endif

.if !empty(PKG_OPTIONS:Mkerberos)
.include "../../mk/krb5.buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mdnssd)
.include "../../net/mDNSResponder/buildlink3.mk"
.endif
cvs diff -r1.17 -r1.18 pkgsrc/print/cups/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/cups/patches/Attic/patch-ab 2007/03/14 12:29:03 1.17
+++ pkgsrc/print/cups/patches/Attic/patch-ab 2008/01/22 23:58:13 1.18
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: patch-ab,v 1.17 2007/03/14 12:29:03 markd Exp $ 1$NetBSD: patch-ab,v 1.18 2008/01/22 23:58:13 markd Exp $
2 2
3--- Makefile.orig 2006-08-30 03:51:19.000000000 +1200 3--- Makefile.orig 2007-12-07 09:09:39.000000000 +1300
4+++ Makefile 2007-01-19 15:11:19.000000000 +1300 4+++ Makefile 2008-01-16 12:28:17.000000000 +1300
5@@ -31,7 +31,7 @@ 5@@ -22,7 +22,7 @@
6 DIRS = cups backend berkeley cgi-bin filter locale man monitor \ 6 DIRS = cups backend berkeley cgi-bin filter locale man monitor \
7 notifier $(PDFTOPS) scheduler systemv test \ 7 notifier $(PDFTOPS) scheduler systemv test \
8 $(PHPDIR) \ 8 $(PHPDIR) \
9- conf data doc fonts ppd templates 9- conf data doc $(FONTS) ppd templates
10+ data doc fonts ppd templates 10+ data doc $(FONTS) ppd templates
11  11
12  12
13 # 13 #
14@@ -91,7 +91,9 @@ 14@@ -92,7 +92,9 @@
15 # Install object and target files... 15 # Install object and target files...
16 # 16 #
17  17
18-install: installhdrs 18-install: installhdrs
19+install: installcups installconf 19+install: installcups installconf
20+ 20+
21+installcups: installhdrs 21+installcups: installhdrs
22 for dir in $(DIRS); do\ 22 for dir in $(DIRS); do\
23 echo Installing in $$dir... ;\ 23 echo Installing in $$dir... ;\
24 (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\ 24 (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
25@@ -99,6 +101,10 @@ 25@@ -100,6 +102,10 @@
26 echo Installing cups-config script... 26 echo Installing cups-config script...
27 $(INSTALL_DIR) -m 755 $(BINDIR) 27 $(INSTALL_DIR) -m 755 $(BINDIR)
28 $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config 28 $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
29+ 29+
30+installconf: 30+installconf:
31+ echo Installing in conf... 31+ echo Installing in conf...
32+ (cd conf; $(MAKE) $(MFLAGS) install) 32+ (cd conf; $(MAKE) $(MFLAGS) install)
33 if test "x$(INITDIR)" != x; then \ 33 if test "x$(INITDIR)" != x; then \
34 echo Installing init scripts...; \ 34 echo Installing init scripts...; \
35 $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ 35 $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
cvs diff -r1.8 -r1.9 pkgsrc/print/cups/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/print/cups/patches/Attic/patch-an 2007/03/14 12:29:05 1.8
+++ pkgsrc/print/cups/patches/Attic/patch-an 2008/01/22 23:58:14 1.9
@@ -1,136 +1,154 @@ @@ -1,136 +1,154 @@
1$NetBSD: patch-an,v 1.8 2007/03/14 12:29:05 markd Exp $ 1$NetBSD: patch-an,v 1.9 2008/01/22 23:58:14 markd Exp $
2 2
3The '$' while loops expand the variables as long as possible so that no 3The '$' while loops expand the variables as long as possible so that no
4references to other variables occur. This is necessary because fontpath 4references to other variables occur. This is necessary because fontpath
5may be "${exec_prefix}", which itself may be "${prefix}", and so on. I 5may be "${exec_prefix}", which itself may be "${prefix}", and so on. I
6don't know how many levels of indirection are possible, therefore the 6don't know how many levels of indirection are possible, therefore the
7loop. 7loop.
8 8
9I'm also sure that this is not the Right Way to fix it, but at least it 9I'm also sure that this is not the Right Way to fix it, but at least it
10works. 10works.
11 11
12--- config-scripts/cups-directories.m4.orig 2007-02-05 22:22:11.000000000 +1300 12--- config-scripts/cups-directories.m4.orig 2007-09-19 08:39:31.000000000 +1200
13+++ config-scripts/cups-directories.m4 13+++ config-scripts/cups-directories.m4
14@@ -223,7 +223,15 @@ AC_SUBST(CUPS_CACHEDIR) 14@@ -247,7 +247,15 @@ AC_SUBST(CUPS_CACHEDIR)
15  15
16 # Data files 16 # Data files
17 CUPS_DATADIR="$datadir/cups" 17 CUPS_DATADIR="$datadir/cups"
18-AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups") 18-AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
19+done=no 19+done=no
20+while test $done = no; do 20+while test $done = no; do
21+ case "$CUPS_DATADIR" in 21+ case "$CUPS_DATADIR" in
22+ *'$'*) eval "CUPS_DATADIR=$CUPS_DATADIR";; 22+ *'$'*) eval "CUPS_DATADIR=$CUPS_DATADIR";;
23+ *) done=yes;; 23+ *) done=yes;;
24+ esac 24+ esac
25+done 25+done
26+ 26+
27+AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR") 27+AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR")
28 AC_SUBST(CUPS_DATADIR) 28 AC_SUBST(CUPS_DATADIR)
29  29
30 # Documentation files 30 # Icon directory
31@@ -236,7 +244,15 @@ else 31@@ -256,7 +264,11 @@ AC_ARG_WITH(icondir, [ --with-icondir
 32 if test "x$icondir" = x -a -d /usr/share/icons; then
 33 ICONDIR="/usr/share/icons"
 34 else
 35- ICONDIR="$icondir"
 36+ if test "x$icondir" = xno; then
 37+ ICONDIR=""
 38+ else
 39+ ICONDIR="$icondir"
 40+ fi
 41 fi
 42
 43 AC_SUBST(ICONDIR)
 44@@ -267,7 +279,11 @@ AC_ARG_WITH(menudir, [ --with-menudir
 45 if test "x$menudir" = x -a -d /usr/share/applications; then
 46 MENUDIR="/usr/share/applications"
 47 else
 48- MENUDIR="$menudir"
 49+ if test "x$menudir" = xno; then
 50+ MENUDIR=""
 51+ else
 52+ MENUDIR="$menudir"
 53+ fi
 54 fi
 55
 56 AC_SUBST(MENUDIR)
 57@@ -282,7 +298,15 @@ else
32 CUPS_DOCROOT="$docdir" 58 CUPS_DOCROOT="$docdir"
33 fi 59 fi
34  60
35-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir") 61-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
36+done=no 62+done=no
37+while test $done = no; do 63+while test $done = no; do
38+ case "$CUPS_DOCROOT" in 64+ case "$CUPS_DOCROOT" in
39+ *'$'*) eval "CUPS_DOCROOT=$CUPS_DOCROOT";; 65+ *'$'*) eval "CUPS_DOCROOT=$CUPS_DOCROOT";;
40+ *) done=yes;; 66+ *) done=yes;;
41+ esac 67+ esac
42+done 68+done
43+ 69+
44+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$CUPS_DOCROOT") 70+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$CUPS_DOCROOT")
45 AC_SUBST(CUPS_DOCROOT) 71 AC_SUBST(CUPS_DOCROOT)
46  72
47 # Fonts 73 # Fonts
48@@ -248,10 +264,21 @@ else 74@@ -294,8 +318,16 @@ else
49 CUPS_FONTPATH="$fontpath" 75 CUPS_FONTPATH="$fontpath"
50 fi 76 fi
51  77
52-AC_SUBST(CUPS_FONTPATH) 78-AC_SUBST(CUPS_FONTPATH)
53+done=no 79+done=no
54+while test $done = no; do 80+while test $done = no; do
55+ case "$CUPS_FONTPATH" in 81+ case "$CUPS_FONTPATH" in
56+ *'$'*) eval "CUPS_FONTPATH=$CUPS_FONTPATH";; 82+ *'$'*) eval "CUPS_FONTPATH=$CUPS_FONTPATH";;
57+ *) done=yes;; 83+ *) done=yes;;
58+ esac 84+ esac
59+done 85+done
60+ 86+
61 AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH") 87 AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
62+AC_SUBST(CUPS_FONTPATH) 88+AC_SUBST(CUPS_FONTPATH)
63  89
64 # Locale data 90 # Locale data (initial assignment allows us not to require autoconf 2.60)
65+AC_ARG_WITH(localedir, [ --with-localedir set path for locale files],localedir="$withval",localedir="") 91 localedir="${localedir:=}"
66+ 92@@ -318,6 +350,14 @@ else
67+if test x$localedir = x; then 93 CUPS_LOCALEDIR="$localedir"
68 case "$uname" in 94 fi
69 Linux | GNU | *BSD* | Darwin*) 95
70 CUPS_LOCALEDIR="$datadir/locale" 
71@@ -266,6 +293,17 @@ case "$uname" in 
72 CUPS_LOCALEDIR="$exec_prefix/lib/locale" 
73 ;; 
74 esac 
75+else 
76+ CUPS_LOCALEDIR="$localedir" 
77+fi 
78+ 
79+done=no 96+done=no
80+while test $done = no; do 97+while test $done = no; do
81+ case "$CUPS_LOCALEDIR" in 98+ case "$CUPS_LOCALEDIR" in
82+ *'$'*) eval "CUPS_LOCALEDIR=$CUPS_LOCALEDIR";; 99+ *'$'*) eval "CUPS_LOCALEDIR=$CUPS_LOCALEDIR";;
83+ *) done=yes;; 100+ *) done=yes;;
84+ esac 101+ esac
85+done 102+done
86  103+
87 AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR") 104 AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
88 AC_SUBST(CUPS_LOCALEDIR) 105 AC_SUBST(CUPS_LOCALEDIR)
89@@ -275,7 +313,6 @@ AC_ARG_WITH(logdir, [ --with-logdir  106
 107@@ -326,7 +366,6 @@ AC_ARG_WITH(logdir, [ --with-logdir
90  108
91 if test x$logdir = x; then 109 if test x$logdir = x; then
92 CUPS_LOGDIR="$localstatedir/log/cups" 110 CUPS_LOGDIR="$localstatedir/log/cups"
93- AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups") 111- AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
94 else 112 else
95 CUPS_LOGDIR="$logdir" 113 CUPS_LOGDIR="$logdir"
96 fi 114 fi
97@@ -284,10 +321,13 @@ AC_SUBST(CUPS_LOGDIR) 115@@ -335,10 +374,13 @@ AC_SUBST(CUPS_LOGDIR)
98  116
99 # Longer-term spool data 117 # Longer-term spool data
100 CUPS_REQUESTS="$localstatedir/spool/cups" 118 CUPS_REQUESTS="$localstatedir/spool/cups"
101-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups") 119-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
102+AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS") 120+AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS")
103 AC_SUBST(CUPS_REQUESTS) 121 AC_SUBST(CUPS_REQUESTS)
104  122
105 # Server executables... 123 # Server executables...
106+AC_ARG_WITH(serverbindir, [ --with-serverbindir set path for server helper programs],serverbindir="$withval",serverbindir="") 124+AC_ARG_WITH(serverbindir, [ --with-serverbindir set path for server helper programs],serverbindir="$withval",serverbindir="")
107+ 125+
108+if test x$serverbindir = x; then 126+if test x$serverbindir = x; then
109 case "$uname" in 127 case "$uname" in
110 *BSD* | Darwin*) 128 *BSD* | Darwin*)
111 # *BSD and Darwin (MacOS X) 129 # *BSD and Darwin (MacOS X)
112@@ -300,6 +340,10 @@ case "$uname" in 130@@ -351,6 +393,10 @@ case "$uname" in
113 CUPS_SERVERBIN="$exec_prefix/lib/cups" 131 CUPS_SERVERBIN="$exec_prefix/lib/cups"
114 ;; 132 ;;
115 esac 133 esac
116+else 134+else
117+ INSTALL_SYSV="" 135+ INSTALL_SYSV=""
118+ CUPS_SERVERBIN="$serverbindir" 136+ CUPS_SERVERBIN="$serverbindir"
119+fi 137+fi
120  138
121 AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN") 139 AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
122 AC_SUBST(CUPS_SERVERBIN) 140 AC_SUBST(CUPS_SERVERBIN)
123@@ -307,12 +351,12 @@ AC_SUBST(INSTALL_SYSV) 141@@ -358,12 +404,12 @@ AC_SUBST(INSTALL_SYSV)
124  142
125 # Configuration files 143 # Configuration files
126 CUPS_SERVERROOT="$sysconfdir/cups" 144 CUPS_SERVERROOT="$sysconfdir/cups"
127-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups") 145-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
128+AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT") 146+AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
129 AC_SUBST(CUPS_SERVERROOT) 147 AC_SUBST(CUPS_SERVERROOT)
130  148
131 # Transient run-time state 149 # Transient run-time state
132 CUPS_STATEDIR="$localstatedir/run/cups" 150 CUPS_STATEDIR="$localstatedir/run/cups"
133-AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups") 151-AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
134+AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") 152+AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
135 AC_SUBST(CUPS_STATEDIR) 153 AC_SUBST(CUPS_STATEDIR)
136  154
cvs diff -r1.7 -r1.8 pkgsrc/print/cups/patches/Attic/patch-ao (expand / switch to unified diff)

--- pkgsrc/print/cups/patches/Attic/patch-ao 2007/03/15 19:01:12 1.7
+++ pkgsrc/print/cups/patches/Attic/patch-ao 2008/01/22 23:58:14 1.8
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-ao,v 1.7 2007/03/15 19:01:12 joerg Exp $ 1$NetBSD: patch-ao,v 1.8 2008/01/22 23:58:14 markd Exp $
2 2
3--- config-scripts/cups-manpages.m4.orig 2007-02-05 23:09:00.000000000 +1300 3--- config-scripts/cups-manpages.m4.orig 2007-07-12 09:46:42.000000000 +1200
4+++ config-scripts/cups-manpages.m4 4+++ config-scripts/cups-manpages.m4
5@@ -22,6 +22,8 @@ dnl EMail: cups-info@cups.org 5@@ -13,6 +13,8 @@ dnl which should have been included wi
6 dnl WWW: http://www.cups.org 6 dnl file is missing or damaged, see the license at "http://www.cups.org/".
7 dnl 7 dnl
8  8
9+AC_ARG_WITH(manext, [ --with-manext set man page extension style (bsd,irix,sysv,none)],manext="$withval",manext="") 9+AC_ARG_WITH(manext, [ --with-manext set man page extension style (bsd,irix,sysv,none)],manext="$withval",manext="")
10+ 10+
11 dnl Fix "mandir" variable... 11 dnl Fix "mandir" variable...
12 if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then 12 if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
13 # New GNU "standards" break previous ones, so make sure we use 13 # New GNU "standards" break previous ones, so make sure we use
14@@ -59,41 +61,60 @@ AC_SUBST(AMANDIR) 14@@ -50,41 +52,60 @@ AC_SUBST(AMANDIR)
15 AC_SUBST(PMANDIR) 15 AC_SUBST(PMANDIR)
16  16
17 dnl Setup manpage extensions... 17 dnl Setup manpage extensions...
18-case "$uname" in 18-case "$uname" in
19- *BSD* | Darwin*) 19- *BSD* | Darwin*)
20- # *BSD 20- # *BSD
21+if test x$manext = x; then 21+if test x$manext = x; then
22+ case "$uname" in 22+ case "$uname" in
23+ *BSD* | Darwin* | DragonFly*) 23+ *BSD* | Darwin* | DragonFly*)
24+ # *BSD and Darwin (MacOS X) 24+ # *BSD and Darwin (MacOS X)
25+ manext=bsd 25+ manext=bsd
26+ ;; 26+ ;;
27+ IRIX*) 27+ IRIX*)
File Deleted: pkgsrc/print/cups/patches/Attic/patch-au