diff options
| author | wiz <wiz@pkgsrc.org> | 2014-06-17 13:17:12 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-06-17 13:17:12 +0000 |
| commit | f3e6f255192e82be4e9054dceb0ae34343790003 (patch) | |
| tree | f44db1e2b3a9b98ad71543d72f69b55c0dcc8dca | |
| parent | 3d0f4a614895fbcd146d64306d177c6ef1c48055 (diff) | |
| download | pkgsrc-f3e6f255192e82be4e9054dceb0ae34343790003.tar.gz | |
Import cups-1.5.4nb12 as print/cups15, for those that prefer it to cups-1.7.x
The Common UNIX Printing System provides a portable printing layer for
UNIX operating systems. It has been developed by Easy Software Products
to promote a standard printing solution for all UNIX vendors and users.
CUPS provides the System V and Berkeley command-line interfaces.
CUPS uses the Internet Printing Protocol (IETF-IPP) as the basis for
managing print jobs and queues. The Line Printer Daemon (LPD, RFC1179)
and AppSocket protocols are also supported with reduced functionality.
CUPS adds network printer browsing and PostScript Printer Description
("PPD")-based printing options to support real world applications under
UNIX.
This package contains the older 1.5 series, before Apple stopped
maintaining the filters.
30 files changed, 2287 insertions, 0 deletions
diff --git a/print/cups15/DESCR b/print/cups15/DESCR new file mode 100644 index 00000000000..c1143577b21 --- /dev/null +++ b/print/cups15/DESCR @@ -0,0 +1,15 @@ +The Common UNIX Printing System provides a portable printing layer for +UNIX operating systems. It has been developed by Easy Software Products +to promote a standard printing solution for all UNIX vendors and users. +CUPS provides the System V and Berkeley command-line interfaces. + +CUPS uses the Internet Printing Protocol (IETF-IPP) as the basis for +managing print jobs and queues. The Line Printer Daemon (LPD, RFC1179) +and AppSocket protocols are also supported with reduced functionality. + +CUPS adds network printer browsing and PostScript Printer Description +("PPD")-based printing options to support real world applications under +UNIX. + +This package contains the older 1.5 series, before Apple stopped +maintaining the filters. diff --git a/print/cups15/MESSAGE b/print/cups15/MESSAGE new file mode 100644 index 00000000000..db23f64fdd0 --- /dev/null +++ b/print/cups15/MESSAGE @@ -0,0 +1,13 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2014/06/17 13:17:12 wiz Exp $ + +You will need to also install print/ghostscript if you wish to +print to non-Postscript printers. + +You may install additional PPD files for other printer models into +${PREFIX}/share/cups/model. + +You may want to backup /etc/printcap before starting CUPS for the first +time, as the CUPS scheduler may overwrite this file with automatically +generated content. +=========================================================================== diff --git a/print/cups15/MESSAGE.libusb b/print/cups15/MESSAGE.libusb new file mode 100644 index 00000000000..18c63eaf76a --- /dev/null +++ b/print/cups15/MESSAGE.libusb @@ -0,0 +1,14 @@ +=========================================================================== +$NetBSD: MESSAGE.libusb,v 1.1 2014/06/17 13:17:12 wiz Exp $ + +With cups 1.4 from pkgsrc, USB printing can use libusb in addition to +traditional USB printer devices. + +To see the DeviceURI of all attached printers run: + +${PREFIX}/libexec/cups/backend/usb + +libusb DeviceURIs start with "usb://". + +ulpt(4)/usblp DeviceURIs start with "usb:/dev/" (e.g., "usb:/dev/ulpt0".) +=========================================================================== diff --git a/print/cups15/MESSAGE.pam b/print/cups15/MESSAGE.pam new file mode 100644 index 00000000000..15a237a0912 --- /dev/null +++ b/print/cups15/MESSAGE.pam @@ -0,0 +1,9 @@ +=========================================================================== +$NetBSD: MESSAGE.pam,v 1.1 2014/06/17 13:17:12 wiz Exp $ + +To authenticate for CUPS using PAM, add the contents of the file: + + ${PREFIX}/share/examples/cups/cups.pam + +to your PAM configuration file. +=========================================================================== diff --git a/print/cups15/Makefile b/print/cups15/Makefile new file mode 100644 index 00000000000..64a56743cf3 --- /dev/null +++ b/print/cups15/Makefile @@ -0,0 +1,194 @@ +# $NetBSD: Makefile,v 1.1 2014/06/17 13:17:12 wiz Exp $ +# +# The CUPS author is very good about taking back changes into the main +# CUPS distribution. The correct place to send patches or bug-fixes is: +# cups-bugs@cups.org. + +DISTNAME= cups-${DIST_VERS}-source +PKGNAME= cups-${DIST_VERS:S/-/./g} +BASE_VERS= 1.5.4 +DIST_VERS= ${BASE_VERS} + +PKGREVISION= 12 +CATEGORIES= print +MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ + ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ + ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/ +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= sbd@NetBSD.org +HOMEPAGE= http://www.cups.org/ +COMMENT= Common UNIX Printing System (1.5 branch) +LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 + +CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* + +#PKG_INSTALLATION_TYPES= overwrite pkgviews + +WRKSRC= ${WRKDIR}/cups-${BASE_VERS} +UNLIMIT_RESOURCES= datasize memorysize +USE_LANGUAGES= c c++ # pdftops is a C++ application +USE_PKGLOCALEDIR= yes +USE_TOOLS+= aclocal autoconf automake gmake +USE_LIBTOOL= yes +# patch-a[jkl] were added for 2.60 +AUTOCONF_REQD= 2.60 + +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} +CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups +CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups +CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} +CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} +CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} +CONFIGURE_ARGS+= --enable-libpaper +CONFIGURE_ARGS+= --enable-libtool +CONFIGURE_ARGS+= --enable-jpeg +CONFIGURE_ARGS+= --enable-png +CONFIGURE_ARGS+= --enable-tiff +CONFIGURE_ARGS+= --enable-ssl +CONFIGURE_ARGS+= --enable-openssl +CONFIGURE_ARGS+= --enable-bannertops +CONFIGURE_ARGS+= --enable-texttops +CONFIGURE_ARGS+= --with-manext=bsd +CONFIGURE_ARGS+= --without-icondir +CONFIGURE_ARGS+= --without-menudir +CONFIGURE_ARGS+= --without-perl +CONFIGURE_ARGS+= --without-php +CONFIGURE_ARGS+= --without-python +CONFIGURE_ARGS+= --without-java +CONFIGURE_ARGS+= --disable-gssapi +CONFIGURE_ARGS+= --disable-gnutls +CONFIGURE_ARGS+= --disable-ldap + +CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} + +.include "../../mk/bsd.prefs.mk" +.include "options.mk" + +.if ${OPSYS} == "SunOS" +LIBS_SSP = -lssp_nonshared -lssp +CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q} +LIBS.SunOS+= -liconv +.endif + +PLIST_VARS+= notmac +.if ${OPSYS} != "Darwin" +PLIST.notmac= yes +.endif + +# Avoid the following error when compiling with clang. +# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC' +# can not be used when making a shared object; recompile with -fPIC +.if ${OPSYS} == "FreeBSD" +BUILDLINK_TRANSFORM+= rm:-Wl,-pie +.endif + +# CUPS_USER user to run filter and CGI programs as +# CUPS_GROUP group to run filter and CGI programs as +# CUPS_SYSTEM_GROUPS group for system administration +# +CUPS_USER?= lp +CUPS_GROUP?= lp +CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP} +FILES_SUBST+= CUPS_USER=${CUPS_USER} +FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} +FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q} + +PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS +PKG_USERS_VARS+= CUPS_USER + +BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE + +DOCDIR= ${PREFIX}/share/doc/cups +EGDIR= ${PREFIX}/share/examples/cups +MIMEDIR= ${PREFIX}/share/cups/mime +PKG_SYSCONFSUBDIR= cups +CUPS_CONFDIR= ${PKG_SYSCONFDIR} +CUPS_LOGDIR= ${VARBASE}/log/cups +CUPS_REQUESTS= ${VARBASE}/spool/cups +CUPS_CACHE= ${VARBASE}/cache/cups +CUPS_STATEDIR= ${VARBASE}/run/cups + +PKG_GROUPS= ${CUPS_GROUP} +PKG_USERS= ${CUPS_USER}:${CUPS_GROUP} +PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user +PKG_SHELL.${CUPS_USER}= ${SH} + +CONF_FILES= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf +CONF_FILES+= ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf +RCD_SCRIPTS= cupsd + +OWN_DIRS= ${CUPS_CONFDIR} +OWN_DIRS+= ${CUPS_CONFDIR}/interfaces +OWN_DIRS+= ${CUPS_CONFDIR}/ppd +OWN_DIRS+= ${PREFIX}/libexec/cups/driver +OWN_DIRS+= ${CUPS_LOGDIR} +OWN_DIRS+= ${CUPS_STATEDIR} +OWN_DIRS_PERMS= ${CUPS_STATEDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711 +OWN_DIRS_PERMS+= ${CUPS_CONFDIR}/ssl ${REAL_ROOT_USER} ${CUPS_GROUP} 0700 +OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${REAL_ROOT_USER} ${CUPS_GROUP} 0710 +OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${REAL_ROOT_USER} ${CUPS_GROUP} 1770 +OWN_DIRS_PERMS+= ${CUPS_CACHE} ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 +OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 + +SUBST_CLASSES+= paths +SUBST_FILES.paths= ${WRKDIR}/cups.pam +SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g' +SUBST_STAGE.paths= post-patch + +SUBST_CLASSES+= rpathfix +SUBST_FILES.rpathfix= cups-config.in +SUBST_MESSAGE.rpathfix= Adding rpath to cups-config. +SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g' +SUBST_STAGE.rpathfix= post-patch + +.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc) +SUBST_CLASSES+= piefix +SUBST_FILES.piefix= Makedefs.in +SUBST_MESSAGE.piefix= Removing PIE flags +SUBST_SED.piefix= -e 's|@PIEFLAGS@||g' +SUBST_STAGE.piefix= post-patch +.endif + +INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR} +INSTALL_ENV+= DSTROOT=${DESTDIR} + +pre-configure: +.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP}) + ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP" + exit 1 +.endif + cd ${WRKSRC} && aclocal && autoconf + +post-extract: + ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam + +post-install: + set -e; for file in LICENSE.txt README.txt; do \ + ${INSTALL_DATA} ${WRKSRC}/$${file} \ + ${DESTDIR}${DOCDIR}/$${file}; \ + done + ${RUN} for file in cupsd.conf snmp.conf ; do \ + ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \ + ${DESTDIR}${EGDIR}/$${file}; \ + done +.if !empty(PKG_OPTIONS:Mpam) + ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR} +.endif +.if !empty(PKG_OPTIONS:Mdnssd) + ${LN} -s ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns +.endif + +.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../print/libpaper/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/print/cups15/PLIST b/print/cups15/PLIST new file mode 100644 index 00000000000..9129be56f76 --- /dev/null +++ b/print/cups15/PLIST @@ -0,0 +1,1119 @@ +@comment $NetBSD: PLIST,v 1.1 2014/06/17 13:17:12 wiz Exp $ +bin/cancel +bin/cups-config +bin/cupstestdsc +bin/cupstestppd +bin/ipptool +bin/lp +bin/lpoptions +bin/lppasswd +bin/lpq +bin/lpr +bin/lprm +bin/lpstat +bin/ppdc +bin/ppdhtml +bin/ppdi +bin/ppdmerge +bin/ppdpo +include/cups/adminutil.h +include/cups/array.h +include/cups/backend.h +include/cups/cgi.h +include/cups/cups.h +include/cups/dir.h +include/cups/driver.h +include/cups/file.h +include/cups/help-index.h +include/cups/http.h +include/cups/image.h +include/cups/ipp.h +include/cups/language.h +include/cups/mime.h +include/cups/ppd.h +include/cups/ppdc.h +include/cups/raster.h +include/cups/sidechannel.h +include/cups/transcode.h +include/cups/versioning.h +lib/libcups.la +lib/libcupscgi.la +lib/libcupsdriver.la +lib/libcupsimage.la +lib/libcupsmime.la +lib/libcupsppdc.la +${PLIST.dnssd}libexec/cups/backend/dnssd +libexec/cups/backend/http +libexec/cups/backend/https +libexec/cups/backend/ipp +libexec/cups/backend/ipps +libexec/cups/backend/lpd +${PLIST.dnssd}libexec/cups/backend/mdns +${PLIST.notmac}libexec/cups/backend/parallel +libexec/cups/backend/serial +libexec/cups/backend/snmp +libexec/cups/backend/socket +libexec/cups/backend/usb +libexec/cups/cgi-bin/admin.cgi +libexec/cups/cgi-bin/classes.cgi +libexec/cups/cgi-bin/help.cgi +libexec/cups/cgi-bin/jobs.cgi +libexec/cups/cgi-bin/printers.cgi +libexec/cups/daemon/cups-deviced +libexec/cups/daemon/cups-driverd +libexec/cups/daemon/cups-exec +libexec/cups/daemon/cups-lpd +libexec/cups/daemon/cups-polld +libexec/cups/filter/bannertops +libexec/cups/filter/commandtoescpx +libexec/cups/filter/commandtopclx +libexec/cups/filter/commandtops +libexec/cups/filter/gziptoany +${PLIST.notmac}libexec/cups/filter/imagetops +${PLIST.notmac}libexec/cups/filter/imagetoraster +libexec/cups/filter/pdftops +libexec/cups/filter/pstops +libexec/cups/filter/rastertodymo +libexec/cups/filter/rastertoepson +libexec/cups/filter/rastertoescpx +libexec/cups/filter/rastertohp +libexec/cups/filter/rastertolabel +libexec/cups/filter/rastertopclx +libexec/cups/filter/rastertopwg +libexec/cups/filter/texttops +libexec/cups/monitor/bcp +libexec/cups/monitor/tbcp +${PLIST.dbus}libexec/cups/notifier/dbus +libexec/cups/notifier/mailto +libexec/cups/notifier/rss +man/man1/cancel.1 +man/man1/cups-config.1 +man/man1/cupstestdsc.1 +man/man1/cupstestppd.1 +man/man1/ipptool.1 +man/man1/lp.1 +man/man1/lpoptions.1 +man/man1/lppasswd.1 +man/man1/lpq.1 +man/man1/lpr.1 +man/man1/lprm.1 +man/man1/lpstat.1 +man/man1/ppdc.1 +man/man1/ppdhtml.1 +man/man1/ppdi.1 +man/man1/ppdmerge.1 +man/man1/ppdpo.1 +man/man5/classes.conf.5 +man/man5/client.conf.5 +man/man5/cups-snmp.conf.5 +man/man5/cupsd.conf.5 +man/man5/ipptoolfile.5 +man/man5/mailto.conf.5 +man/man5/mime.convs.5 +man/man5/mime.types.5 +man/man5/ppdcfile.5 +man/man5/printers.conf.5 +man/man5/subscriptions.conf.5 +man/man7/backend.7 +man/man7/filter.7 +man/man7/notifier.7 +man/man8/accept.8 +man/man8/cups-deviced.8 +man/man8/cups-driverd.8 +man/man8/cups-lpd.8 +man/man8/cups-polld.8 +man/man8/cupsaccept.8 +man/man8/cupsaddsmb.8 +man/man8/cupsctl.8 +man/man8/cupsd.8 +man/man8/cupsdisable.8 +man/man8/cupsenable.8 +man/man8/cupsfilter.8 +man/man8/cupsreject.8 +man/man8/lpadmin.8 +man/man8/lpc.8 +man/man8/lpinfo.8 +man/man8/lpmove.8 +man/man8/reject.8 +sbin/accept +sbin/cupsaccept +sbin/cupsaddsmb +sbin/cupsctl +sbin/cupsd +sbin/cupsdisable +sbin/cupsenable +sbin/cupsfilter +sbin/cupsreject +sbin/lpadmin +sbin/lpc +sbin/lpinfo +sbin/lpmove +sbin/reject +share/cups/banners/classified +share/cups/banners/confidential +share/cups/banners/secret +share/cups/banners/standard +share/cups/banners/topsecret +share/cups/banners/unclassified +share/cups/charsets/utf-8 +share/cups/data/psglyphs +share/cups/data/testprint +share/cups/drv/sample.drv +share/cups/examples/color.drv +share/cups/examples/constraint.drv +share/cups/examples/custom.drv +share/cups/examples/grouping.drv +share/cups/examples/laserjet-basic.drv +share/cups/examples/laserjet-pjl.drv +share/cups/examples/minimum.drv +share/cups/examples/postscript.drv +share/cups/examples/r300-basic.drv +share/cups/examples/r300-colorman.drv +share/cups/examples/r300-remote.drv +share/cups/fonts/Monospace +share/cups/fonts/Monospace-Bold +share/cups/fonts/Monospace-BoldOblique +share/cups/fonts/Monospace-Oblique +share/cups/ipptool/color.jpg +share/cups/ipptool/create-printer-subscription.test +share/cups/ipptool/document-a4.pdf +share/cups/ipptool/document-a4.ps +share/cups/ipptool/document-letter.pdf +share/cups/ipptool/document-letter.ps +share/cups/ipptool/get-completed-jobs.test +share/cups/ipptool/get-jobs.test +share/cups/ipptool/get-printer-attributes.test +share/cups/ipptool/gray.jpg +share/cups/ipptool/ipp-1.1.test +share/cups/ipptool/ipp-2.0.test +share/cups/ipptool/ipp-2.1.test +share/cups/ipptool/ipp-2.2.test +share/cups/ipptool/onepage-a4.pdf +share/cups/ipptool/onepage-a4.ps +share/cups/ipptool/onepage-letter.pdf +share/cups/ipptool/onepage-letter.ps +share/cups/ipptool/testfile.jpg +share/cups/ipptool/testfile.pdf +share/cups/ipptool/testfile.ps +share/cups/ipptool/testfile.txt +share/cups/mime/mime.convs +share/cups/mime/mime.types +share/cups/ppdc/epson.h +share/cups/ppdc/escp.h +share/cups/ppdc/font.defs +share/cups/ppdc/hp.h +share/cups/ppdc/label.h +share/cups/ppdc/media.defs +share/cups/ppdc/pcl.h +share/cups/ppdc/raster.defs +share/cups/templates/add-class.tmpl +share/cups/templates/add-printer.tmpl +share/cups/templates/add-rss-subscription.tmpl +share/cups/templates/admin.tmpl +share/cups/templates/choose-device.tmpl +share/cups/templates/choose-make.tmpl +share/cups/templates/choose-model.tmpl +share/cups/templates/choose-serial.tmpl +share/cups/templates/choose-uri.tmpl +share/cups/templates/class-added.tmpl +share/cups/templates/class-confirm.tmpl +share/cups/templates/class-deleted.tmpl +share/cups/templates/class-jobs-header.tmpl +share/cups/templates/class-modified.tmpl +share/cups/templates/class.tmpl +share/cups/templates/classes-header.tmpl +share/cups/templates/classes.tmpl +share/cups/templates/command.tmpl +share/cups/templates/de/add-class.tmpl +share/cups/templates/de/add-printer.tmpl +share/cups/templates/de/add-rss-subscription.tmpl +share/cups/templates/de/admin.tmpl +share/cups/templates/de/choose-device.tmpl +share/cups/templates/de/choose-make.tmpl +share/cups/templates/de/choose-model.tmpl +share/cups/templates/de/choose-serial.tmpl +share/cups/templates/de/choose-uri.tmpl +share/cups/templates/de/class-added.tmpl +share/cups/templates/de/class-confirm.tmpl +share/cups/templates/de/class-deleted.tmpl +share/cups/templates/de/class-jobs-header.tmpl +share/cups/templates/de/class-modified.tmpl +share/cups/templates/de/class.tmpl +share/cups/templates/de/classes-header.tmpl +share/cups/templates/de/classes.tmpl +share/cups/templates/de/command.tmpl +share/cups/templates/de/edit-config.tmpl +share/cups/templates/de/error-op.tmpl +share/cups/templates/de/error.tmpl +share/cups/templates/de/header.tmpl +share/cups/templates/de/help-header.tmpl +share/cups/templates/de/help-printable.tmpl +share/cups/templates/de/help-trailer.tmpl +share/cups/templates/de/job-cancel.tmpl +share/cups/templates/de/job-hold.tmpl +share/cups/templates/de/job-move.tmpl +share/cups/templates/de/job-moved.tmpl +share/cups/templates/de/job-release.tmpl +share/cups/templates/de/job-restart.tmpl +share/cups/templates/de/jobs-header.tmpl +share/cups/templates/de/jobs.tmpl +share/cups/templates/de/list-available-printers.tmpl +share/cups/templates/de/modify-class.tmpl +share/cups/templates/de/modify-printer.tmpl +share/cups/templates/de/norestart.tmpl +share/cups/templates/de/option-boolean.tmpl +share/cups/templates/de/option-conflict.tmpl +share/cups/templates/de/option-header.tmpl +share/cups/templates/de/option-pickmany.tmpl +share/cups/templates/de/option-pickone.tmpl +share/cups/templates/de/option-trailer.tmpl +share/cups/templates/de/pager.tmpl +share/cups/templates/de/printer-accept.tmpl +share/cups/templates/de/printer-added.tmpl +share/cups/templates/de/printer-configured.tmpl +share/cups/templates/de/printer-confirm.tmpl +share/cups/templates/de/printer-default.tmpl +share/cups/templates/de/printer-deleted.tmpl +share/cups/templates/de/printer-jobs-header.tmpl +share/cups/templates/de/printer-modified.tmpl +share/cups/templates/de/printer-purge.tmpl +share/cups/templates/de/printer-reject.tmpl +share/cups/templates/de/printer-start.tmpl +share/cups/templates/de/printer-stop.tmpl +share/cups/templates/de/printer.tmpl +share/cups/templates/de/printers-header.tmpl +share/cups/templates/de/printers.tmpl +share/cups/templates/de/restart.tmpl +share/cups/templates/de/samba-export.tmpl +share/cups/templates/de/samba-exported.tmpl +share/cups/templates/de/search.tmpl +share/cups/templates/de/set-printer-options-header.tmpl +share/cups/templates/de/set-printer-options-trailer.tmpl +share/cups/templates/de/subscription-added.tmpl +share/cups/templates/de/subscription-canceled.tmpl +share/cups/templates/de/test-page.tmpl +share/cups/templates/de/trailer.tmpl +share/cups/templates/de/users.tmpl +share/cups/templates/edit-config.tmpl +share/cups/templates/error-op.tmpl +share/cups/templates/error.tmpl +share/cups/templates/es/add-class.tmpl +share/cups/templates/es/add-printer.tmpl +share/cups/templates/es/add-rss-subscription.tmpl +share/cups/templates/es/admin.tmpl +share/cups/templates/es/choose-device.tmpl +share/cups/templates/es/choose-make.tmpl +share/cups/templates/es/choose-model.tmpl +share/cups/templates/es/choose-serial.tmpl +share/cups/templates/es/choose-uri.tmpl +share/cups/templates/es/class-added.tmpl +share/cups/templates/es/class-confirm.tmpl +share/cups/templates/es/class-deleted.tmpl +share/cups/templates/es/class-jobs-header.tmpl +share/cups/templates/es/class-modified.tmpl +share/cups/templates/es/class.tmpl +share/cups/templates/es/classes-header.tmpl +share/cups/templates/es/classes.tmpl +share/cups/templates/es/command.tmpl +share/cups/templates/es/edit-config.tmpl +share/cups/templates/es/error-op.tmpl +share/cups/templates/es/error.tmpl +share/cups/templates/es/header.tmpl +share/cups/templates/es/help-header.tmpl +share/cups/templates/es/help-printable.tmpl +share/cups/templates/es/help-trailer.tmpl +share/cups/templates/es/job-cancel.tmpl +share/cups/templates/es/job-hold.tmpl +share/cups/templates/es/job-move.tmpl +share/cups/templates/es/job-moved.tmpl +share/cups/templates/es/job-release.tmpl +share/cups/templates/es/job-restart.tmpl +share/cups/templates/es/jobs-header.tmpl +share/cups/templates/es/jobs.tmpl +share/cups/templates/es/list-available-printers.tmpl +share/cups/templates/es/modify-class.tmpl +share/cups/templates/es/modify-printer.tmpl +share/cups/templates/es/norestart.tmpl +share/cups/templates/es/option-boolean.tmpl +share/cups/templates/es/option-conflict.tmpl +share/cups/templates/es/option-header.tmpl +share/cups/templates/es/option-pickmany.tmpl +share/cups/templates/es/option-pickone.tmpl +share/cups/templates/es/option-trailer.tmpl +share/cups/templates/es/pager.tmpl +share/cups/templates/es/printer-accept.tmpl +share/cups/templates/es/printer-added.tmpl +share/cups/templates/es/printer-configured.tmpl +share/cups/templates/es/printer-confirm.tmpl +share/cups/templates/es/printer-default.tmpl +share/cups/templates/es/printer-deleted.tmpl +share/cups/templates/es/printer-jobs-header.tmpl +share/cups/templates/es/printer-modified.tmpl +share/cups/templates/es/printer-purge.tmpl +share/cups/templates/es/printer-reject.tmpl +share/cups/templates/es/printer-start.tmpl +share/cups/templates/es/printer-stop.tmpl +share/cups/templates/es/printer.tmpl +share/cups/templates/es/printers-header.tmpl +share/cups/templates/es/printers.tmpl +share/cups/templates/es/restart.tmpl +share/cups/templates/es/samba-export.tmpl +share/cups/templates/es/samba-exported.tmpl +share/cups/templates/es/search.tmpl +share/cups/templates/es/set-printer-options-header.tmpl +share/cups/templates/es/set-printer-options-trailer.tmpl +share/cups/templates/es/subscription-added.tmpl +share/cups/templates/es/subscription-canceled.tmpl +share/cups/templates/es/test-page.tmpl +share/cups/templates/es/trailer.tmpl +share/cups/templates/es/users.tmpl +share/cups/templates/eu/add-class.tmpl +share/cups/templates/eu/add-printer.tmpl +share/cups/templates/eu/add-rss-subscription.tmpl +share/cups/templates/eu/admin.tmpl +share/cups/templates/eu/choose-device.tmpl +share/cups/templates/eu/choose-make.tmpl +share/cups/templates/eu/choose-model.tmpl +share/cups/templates/eu/choose-serial.tmpl +share/cups/templates/eu/choose-uri.tmpl +share/cups/templates/eu/class-added.tmpl +share/cups/templates/eu/class-confirm.tmpl +share/cups/templates/eu/class-deleted.tmpl +share/cups/templates/eu/class-jobs-header.tmpl +share/cups/templates/eu/class-modified.tmpl +share/cups/templates/eu/class.tmpl +share/cups/templates/eu/classes-header.tmpl +share/cups/templates/eu/classes.tmpl +share/cups/templates/eu/command.tmpl +share/cups/templates/eu/edit-config.tmpl +share/cups/templates/eu/error-op.tmpl +share/cups/templates/eu/error.tmpl +share/cups/templates/eu/header.tmpl +share/cups/templates/eu/help-header.tmpl +share/cups/templates/eu/help-printable.tmpl +share/cups/templates/eu/help-trailer.tmpl +share/cups/templates/eu/job-cancel.tmpl +share/cups/templates/eu/job-hold.tmpl +share/cups/templates/eu/job-move.tmpl +share/cups/templates/eu/job-moved.tmpl +share/cups/templates/eu/job-release.tmpl +share/cups/templates/eu/job-restart.tmpl +share/cups/templates/eu/jobs-header.tmpl +share/cups/templates/eu/jobs.tmpl +share/cups/templates/eu/list-available-printers.tmpl +share/cups/templates/eu/modify-class.tmpl +share/cups/templates/eu/modify-printer.tmpl +share/cups/templates/eu/norestart.tmpl +share/cups/templates/eu/option-boolean.tmpl +share/cups/templates/eu/option-conflict.tmpl +share/cups/templates/eu/option-header.tmpl +share/cups/templates/eu/option-pickmany.tmpl +share/cups/templates/eu/option-pickone.tmpl +share/cups/templates/eu/option-trailer.tmpl +share/cups/templates/eu/pager.tmpl +share/cups/templates/eu/printer-accept.tmpl +share/cups/templates/eu/printer-added.tmpl +share/cups/templates/eu/printer-configured.tmpl +share/cups/templates/eu/printer-confirm.tmpl +share/cups/templates/eu/printer-default.tmpl +share/cups/templates/eu/printer-deleted.tmpl +share/cups/templates/eu/printer-jobs-header.tmpl +share/cups/templates/eu/printer-modified.tmpl +share/cups/templates/eu/printer-purge.tmpl +share/cups/templates/eu/printer-reject.tmpl +share/cups/templates/eu/printer-start.tmpl +share/cups/templates/eu/printer-stop.tmpl +share/cups/templates/eu/printer.tmpl +share/cups/templates/eu/printers-header.tmpl +share/cups/templates/eu/printers.tmpl +share/cups/templates/eu/restart.tmpl +share/cups/templates/eu/samba-export.tmpl +share/cups/templates/eu/samba-exported.tmpl +share/cups/templates/eu/search.tmpl +share/cups/templates/eu/set-printer-options-header.tmpl +share/cups/templates/eu/set-printer-options-trailer.tmpl +share/cups/templates/eu/subscription-added.tmpl +share/cups/templates/eu/subscription-canceled.tmpl +share/cups/templates/eu/test-page.tmpl +share/cups/templates/eu/trailer.tmpl +share/cups/templates/eu/users.tmpl +share/cups/templates/fr/add-class.tmpl +share/cups/templates/fr/add-printer.tmpl +share/cups/templates/fr/add-rss-subscription.tmpl +share/cups/templates/fr/admin.tmpl +share/cups/templates/fr/choose-device.tmpl +share/cups/templates/fr/choose-make.tmpl +share/cups/templates/fr/choose-model.tmpl +share/cups/templates/fr/choose-serial.tmpl +share/cups/templates/fr/choose-uri.tmpl +share/cups/templates/fr/class-added.tmpl +share/cups/templates/fr/class-confirm.tmpl +share/cups/templates/fr/class-deleted.tmpl +share/cups/templates/fr/class-jobs-header.tmpl +share/cups/templates/fr/class-modified.tmpl +share/cups/templates/fr/class.tmpl +share/cups/templates/fr/classes-header.tmpl +share/cups/templates/fr/classes.tmpl +share/cups/templates/fr/command.tmpl +share/cups/templates/fr/edit-config.tmpl +share/cups/templates/fr/error-op.tmpl +share/cups/templates/fr/error.tmpl +share/cups/templates/fr/header.tmpl +share/cups/templates/fr/help-header.tmpl +share/cups/templates/fr/help-printable.tmpl +share/cups/templates/fr/help-trailer.tmpl +share/cups/templates/fr/job-cancel.tmpl +share/cups/templates/fr/job-hold.tmpl +share/cups/templates/fr/job-move.tmpl +share/cups/templates/fr/job-moved.tmpl +share/cups/templates/fr/job-release.tmpl +share/cups/templates/fr/job-restart.tmpl +share/cups/templates/fr/jobs-header.tmpl +share/cups/templates/fr/jobs.tmpl +share/cups/templates/fr/list-available-printers.tmpl +share/cups/templates/fr/modify-class.tmpl +share/cups/templates/fr/modify-printer.tmpl +share/cups/templates/fr/norestart.tmpl +share/cups/templates/fr/option-boolean.tmpl +share/cups/templates/fr/option-conflict.tmpl +share/cups/templates/fr/option-header.tmpl +share/cups/templates/fr/option-pickmany.tmpl +share/cups/templates/fr/option-pickone.tmpl +share/cups/templates/fr/option-trailer.tmpl +share/cups/templates/fr/pager.tmpl +share/cups/templates/fr/printer-accept.tmpl +share/cups/templates/fr/printer-added.tmpl +share/cups/templates/fr/printer-configured.tmpl +share/cups/templates/fr/printer-confirm.tmpl +share/cups/templates/fr/printer-default.tmpl +share/cups/templates/fr/printer-deleted.tmpl +share/cups/templates/fr/printer-jobs-header.tmpl +share/cups/templates/fr/printer-modified.tmpl +share/cups/templates/fr/printer-purge.tmpl +share/cups/templates/fr/printer-reject.tmpl +share/cups/templates/fr/printer-start.tmpl +share/cups/templates/fr/printer-stop.tmpl +share/cups/templates/fr/printer.tmpl +share/cups/templates/fr/printers-header.tmpl +share/cups/templates/fr/printers.tmpl +share/cups/templates/fr/restart.tmpl +share/cups/templates/fr/samba-export.tmpl +share/cups/templates/fr/samba-exported.tmpl +share/cups/templates/fr/search.tmpl +share/cups/templates/fr/set-printer-options-header.tmpl +share/cups/templates/fr/set-printer-options-trailer.tmpl +share/cups/templates/fr/subscription-added.tmpl +share/cups/templates/fr/subscription-canceled.tmpl +share/cups/templates/fr/test-page.tmpl +share/cups/templates/fr/trailer.tmpl +share/cups/templates/fr/users.tmpl +share/cups/templates/header.tmpl +share/cups/templates/help-header.tmpl +share/cups/templates/help-printable.tmpl +share/cups/templates/help-trailer.tmpl +share/cups/templates/hu/add-class.tmpl +share/cups/templates/hu/add-printer.tmpl +share/cups/templates/hu/add-rss-subscription.tmpl +share/cups/templates/hu/admin.tmpl +share/cups/templates/hu/choose-device.tmpl +share/cups/templates/hu/choose-make.tmpl +share/cups/templates/hu/choose-model.tmpl +share/cups/templates/hu/choose-serial.tmpl +share/cups/templates/hu/choose-uri.tmpl +share/cups/templates/hu/class-added.tmpl +share/cups/templates/hu/class-confirm.tmpl +share/cups/templates/hu/class-deleted.tmpl +share/cups/templates/hu/class-jobs-header.tmpl +share/cups/templates/hu/class-modified.tmpl +share/cups/templates/hu/class.tmpl +share/cups/templates/hu/classes-header.tmpl +share/cups/templates/hu/classes.tmpl +share/cups/templates/hu/command.tmpl +share/cups/templates/hu/edit-config.tmpl +share/cups/templates/hu/error-op.tmpl +share/cups/templates/hu/error.tmpl +share/cups/templates/hu/header.tmpl +share/cups/templates/hu/help-header.tmpl +share/cups/templates/hu/help-printable.tmpl +share/cups/templates/hu/help-trailer.tmpl +share/cups/templates/hu/job-cancel.tmpl +share/cups/templates/hu/job-hold.tmpl +share/cups/templates/hu/job-move.tmpl +share/cups/templates/hu/job-moved.tmpl +share/cups/templates/hu/job-release.tmpl +share/cups/templates/hu/job-restart.tmpl +share/cups/templates/hu/jobs-header.tmpl +share/cups/templates/hu/jobs.tmpl +share/cups/templates/hu/list-available-printers.tmpl +share/cups/templates/hu/modify-class.tmpl +share/cups/templates/hu/modify-printer.tmpl +share/cups/templates/hu/norestart.tmpl +share/cups/templates/hu/option-boolean.tmpl +share/cups/templates/hu/option-conflict.tmpl +share/cups/templates/hu/option-header.tmpl +share/cups/templates/hu/option-pickmany.tmpl +share/cups/templates/hu/option-pickone.tmpl +share/cups/templates/hu/option-trailer.tmpl +share/cups/templates/hu/pager.tmpl +share/cups/templates/hu/printer-accept.tmpl +share/cups/templates/hu/printer-added.tmpl +share/cups/templates/hu/printer-configured.tmpl +share/cups/templates/hu/printer-confirm.tmpl +share/cups/templates/hu/printer-default.tmpl +share/cups/templates/hu/printer-deleted.tmpl +share/cups/templates/hu/printer-jobs-header.tmpl +share/cups/templates/hu/printer-modified.tmpl +share/cups/templates/hu/printer-purge.tmpl +share/cups/templates/hu/printer-reject.tmpl +share/cups/templates/hu/printer-start.tmpl +share/cups/templates/hu/printer-stop.tmpl +share/cups/templates/hu/printer.tmpl +share/cups/templates/hu/printers-header.tmpl +share/cups/templates/hu/printers.tmpl +share/cups/templates/hu/restart.tmpl +share/cups/templates/hu/samba-export.tmpl +share/cups/templates/hu/samba-exported.tmpl +share/cups/templates/hu/search.tmpl +share/cups/templates/hu/set-printer-options-header.tmpl +share/cups/templates/hu/set-printer-options-trailer.tmpl +share/cups/templates/hu/subscription-added.tmpl +share/cups/templates/hu/subscription-canceled.tmpl +share/cups/templates/hu/test-page.tmpl +share/cups/templates/hu/trailer.tmpl +share/cups/templates/hu/users.tmpl +share/cups/templates/id/add-class.tmpl +share/cups/templates/id/add-printer.tmpl +share/cups/templates/id/add-rss-subscription.tmpl +share/cups/templates/id/admin.tmpl +share/cups/templates/id/choose-device.tmpl +share/cups/templates/id/choose-make.tmpl +share/cups/templates/id/choose-model.tmpl +share/cups/templates/id/choose-serial.tmpl +share/cups/templates/id/choose-uri.tmpl +share/cups/templates/id/class-added.tmpl +share/cups/templates/id/class-confirm.tmpl +share/cups/templates/id/class-deleted.tmpl +share/cups/templates/id/class-jobs-header.tmpl +share/cups/templates/id/class-modified.tmpl +share/cups/templates/id/class.tmpl +share/cups/templates/id/classes-header.tmpl +share/cups/templates/id/classes.tmpl +share/cups/templates/id/command.tmpl +share/cups/templates/id/edit-config.tmpl +share/cups/templates/id/error-op.tmpl +share/cups/templates/id/error.tmpl +share/cups/templates/id/header.tmpl +share/cups/templates/id/help-header.tmpl +share/cups/templates/id/help-printable.tmpl +share/cups/templates/id/help-trailer.tmpl +share/cups/templates/id/job-cancel.tmpl +share/cups/templates/id/job-hold.tmpl +share/cups/templates/id/job-move.tmpl +share/cups/templates/id/job-moved.tmpl +share/cups/templates/id/job-release.tmpl +share/cups/templates/id/job-restart.tmpl +share/cups/templates/id/jobs-header.tmpl +share/cups/templates/id/jobs.tmpl +share/cups/templates/id/list-available-printers.tmpl +share/cups/templates/id/modify-class.tmpl +share/cups/templates/id/modify-printer.tmpl +share/cups/templates/id/norestart.tmpl +share/cups/templates/id/option-boolean.tmpl +share/cups/templates/id/option-conflict.tmpl +share/cups/templates/id/option-header.tmpl +share/cups/templates/id/option-pickmany.tmpl +share/cups/templates/id/option-pickone.tmpl +share/cups/templates/id/option-trailer.tmpl +share/cups/templates/id/pager.tmpl +share/cups/templates/id/printer-accept.tmpl +share/cups/templates/id/printer-added.tmpl +share/cups/templates/id/printer-configured.tmpl +share/cups/templates/id/printer-confirm.tmpl +share/cups/templates/id/printer-default.tmpl +share/cups/templates/id/printer-deleted.tmpl +share/cups/templates/id/printer-jobs-header.tmpl +share/cups/templates/id/printer-modified.tmpl +share/cups/templates/id/printer-purge.tmpl +share/cups/templates/id/printer-reject.tmpl +share/cups/templates/id/printer-start.tmpl +share/cups/templates/id/printer-stop.tmpl +share/cups/templates/id/printer.tmpl +share/cups/templates/id/printers-header.tmpl +share/cups/templates/id/printers.tmpl +share/cups/templates/id/restart.tmpl +share/cups/templates/id/samba-export.tmpl +share/cups/templates/id/samba-exported.tmpl +share/cups/templates/id/search.tmpl +share/cups/templates/id/set-printer-options-header.tmpl +share/cups/templates/id/set-printer-options-trailer.tmpl +share/cups/templates/id/subscription-added.tmpl +share/cups/templates/id/subscription-canceled.tmpl +share/cups/templates/id/test-page.tmpl +share/cups/templates/id/trailer.tmpl +share/cups/templates/id/users.tmpl +share/cups/templates/it/add-class.tmpl +share/cups/templates/it/add-printer.tmpl +share/cups/templates/it/add-rss-subscription.tmpl +share/cups/templates/it/admin.tmpl +share/cups/templates/it/choose-device.tmpl +share/cups/templates/it/choose-make.tmpl +share/cups/templates/it/choose-model.tmpl +share/cups/templates/it/choose-serial.tmpl +share/cups/templates/it/choose-uri.tmpl +share/cups/templates/it/class-added.tmpl +share/cups/templates/it/class-confirm.tmpl +share/cups/templates/it/class-deleted.tmpl +share/cups/templates/it/class-jobs-header.tmpl +share/cups/templates/it/class-modified.tmpl +share/cups/templates/it/class.tmpl +share/cups/templates/it/classes-header.tmpl +share/cups/templates/it/classes.tmpl +share/cups/templates/it/command.tmpl +share/cups/templates/it/edit-config.tmpl +share/cups/templates/it/error-op.tmpl +share/cups/templates/it/error.tmpl +share/cups/templates/it/help-header.tmpl +share/cups/templates/it/help-printable.tmpl +share/cups/templates/it/help-trailer.tmpl +share/cups/templates/it/job-cancel.tmpl +share/cups/templates/it/job-hold.tmpl +share/cups/templates/it/job-move.tmpl +share/cups/templates/it/job-moved.tmpl +share/cups/templates/it/job-release.tmpl +share/cups/templates/it/job-restart.tmpl +share/cups/templates/it/jobs-header.tmpl +share/cups/templates/it/jobs.tmpl +share/cups/templates/it/list-available-printers.tmpl +share/cups/templates/it/modify-class.tmpl +share/cups/templates/it/modify-printer.tmpl +share/cups/templates/it/norestart.tmpl +share/cups/templates/it/option-boolean.tmpl +share/cups/templates/it/option-conflict.tmpl +share/cups/templates/it/option-header.tmpl +share/cups/templates/it/option-pickmany.tmpl +share/cups/templates/it/option-pickone.tmpl +share/cups/templates/it/option-trailer.tmpl +share/cups/templates/it/pager.tmpl +share/cups/templates/it/printer-accept.tmpl +share/cups/templates/it/printer-added.tmpl +share/cups/templates/it/printer-configured.tmpl +share/cups/templates/it/printer-confirm.tmpl +share/cups/templates/it/printer-default.tmpl +share/cups/templates/it/printer-deleted.tmpl +share/cups/templates/it/printer-jobs-header.tmpl +share/cups/templates/it/printer-modified.tmpl +share/cups/templates/it/printer-purge.tmpl +share/cups/templates/it/printer-reject.tmpl +share/cups/templates/it/printer-start.tmpl +share/cups/templates/it/printer-stop.tmpl +share/cups/templates/it/printer.tmpl +share/cups/templates/it/printers-header.tmpl +share/cups/templates/it/printers.tmpl +share/cups/templates/it/restart.tmpl +share/cups/templates/it/samba-export.tmpl +share/cups/templates/it/samba-exported.tmpl +share/cups/templates/it/search.tmpl +share/cups/templates/it/set-printer-options-header.tmpl +share/cups/templates/it/set-printer-options-trailer.tmpl +share/cups/templates/it/subscription-added.tmpl +share/cups/templates/it/subscription-canceled.tmpl +share/cups/templates/it/test-page.tmpl +share/cups/templates/it/trailer.tmpl +share/cups/templates/it/users.tmpl +share/cups/templates/ja/add-class.tmpl +share/cups/templates/ja/add-printer.tmpl +share/cups/templates/ja/add-rss-subscription.tmpl +share/cups/templates/ja/admin.tmpl +share/cups/templates/ja/choose-device.tmpl +share/cups/templates/ja/choose-make.tmpl +share/cups/templates/ja/choose-model.tmpl +share/cups/templates/ja/choose-serial.tmpl +share/cups/templates/ja/choose-uri.tmpl +share/cups/templates/ja/class-added.tmpl +share/cups/templates/ja/class-confirm.tmpl +share/cups/templates/ja/class-deleted.tmpl +share/cups/templates/ja/class-jobs-header.tmpl +share/cups/templates/ja/class-modified.tmpl +share/cups/templates/ja/class.tmpl +share/cups/templates/ja/classes-header.tmpl +share/cups/templates/ja/classes.tmpl +share/cups/templates/ja/command.tmpl +share/cups/templates/ja/edit-config.tmpl +share/cups/templates/ja/error-op.tmpl +share/cups/templates/ja/error.tmpl +share/cups/templates/ja/header.tmpl +share/cups/templates/ja/help-header.tmpl +share/cups/templates/ja/help-printable.tmpl +share/cups/templates/ja/help-trailer.tmpl +share/cups/templates/ja/job-cancel.tmpl +share/cups/templates/ja/job-hold.tmpl +share/cups/templates/ja/job-move.tmpl +share/cups/templates/ja/job-moved.tmpl +share/cups/templates/ja/job-release.tmpl +share/cups/templates/ja/job-restart.tmpl +share/cups/templates/ja/jobs-header.tmpl +share/cups/templates/ja/jobs.tmpl +share/cups/templates/ja/list-available-printers.tmpl +share/cups/templates/ja/modify-class.tmpl +share/cups/templates/ja/modify-printer.tmpl +share/cups/templates/ja/norestart.tmpl +share/cups/templates/ja/option-boolean.tmpl +share/cups/templates/ja/option-conflict.tmpl +share/cups/templates/ja/option-header.tmpl +share/cups/templates/ja/option-pickmany.tmpl +share/cups/templates/ja/option-pickone.tmpl +share/cups/templates/ja/option-trailer.tmpl +share/cups/templates/ja/pager.tmpl +share/cups/templates/ja/printer-accept.tmpl +share/cups/templates/ja/printer-added.tmpl +share/cups/templates/ja/printer-configured.tmpl +share/cups/templates/ja/printer-confirm.tmpl +share/cups/templates/ja/printer-default.tmpl +share/cups/templates/ja/printer-deleted.tmpl +share/cups/templates/ja/printer-jobs-header.tmpl +share/cups/templates/ja/printer-modified.tmpl +share/cups/templates/ja/printer-purge.tmpl +share/cups/templates/ja/printer-reject.tmpl +share/cups/templates/ja/printer-start.tmpl +share/cups/templates/ja/printer-stop.tmpl +share/cups/templates/ja/printer.tmpl +share/cups/templates/ja/printers-header.tmpl +share/cups/templates/ja/printers.tmpl +share/cups/templates/ja/restart.tmpl +share/cups/templates/ja/samba-export.tmpl +share/cups/templates/ja/samba-exported.tmpl +share/cups/templates/ja/search.tmpl +share/cups/templates/ja/set-printer-options-header.tmpl +share/cups/templates/ja/set-printer-options-trailer.tmpl +share/cups/templates/ja/subscription-added.tmpl +share/cups/templates/ja/subscription-canceled.tmpl +share/cups/templates/ja/test-page.tmpl +share/cups/templates/ja/trailer.tmpl +share/cups/templates/ja/users.tmpl +share/cups/templates/job-cancel.tmpl +share/cups/templates/job-hold.tmpl +share/cups/templates/job-move.tmpl +share/cups/templates/job-moved.tmpl +share/cups/templates/job-release.tmpl +share/cups/templates/job-restart.tmpl +share/cups/templates/jobs-header.tmpl +share/cups/templates/jobs.tmpl +share/cups/templates/list-available-printers.tmpl +share/cups/templates/modify-class.tmpl +share/cups/templates/modify-printer.tmpl +share/cups/templates/norestart.tmpl +share/cups/templates/option-boolean.tmpl +share/cups/templates/option-conflict.tmpl +share/cups/templates/option-header.tmpl +share/cups/templates/option-pickmany.tmpl +share/cups/templates/option-pickone.tmpl +share/cups/templates/option-trailer.tmpl +share/cups/templates/pager.tmpl +share/cups/templates/pl/add-class.tmpl +share/cups/templates/pl/add-printer.tmpl +share/cups/templates/pl/add-rss-subscription.tmpl +share/cups/templates/pl/admin.tmpl +share/cups/templates/pl/choose-device.tmpl +share/cups/templates/pl/choose-make.tmpl +share/cups/templates/pl/choose-model.tmpl +share/cups/templates/pl/choose-serial.tmpl +share/cups/templates/pl/choose-uri.tmpl +share/cups/templates/pl/class-added.tmpl +share/cups/templates/pl/class-confirm.tmpl +share/cups/templates/pl/class-deleted.tmpl +share/cups/templates/pl/class-jobs-header.tmpl +share/cups/templates/pl/class-modified.tmpl +share/cups/templates/pl/class.tmpl +share/cups/templates/pl/classes-header.tmpl +share/cups/templates/pl/classes.tmpl +share/cups/templates/pl/command.tmpl +share/cups/templates/pl/edit-config.tmpl +share/cups/templates/pl/error-op.tmpl +share/cups/templates/pl/error.tmpl +share/cups/templates/pl/header.tmpl +share/cups/templates/pl/help-header.tmpl +share/cups/templates/pl/help-printable.tmpl +share/cups/templates/pl/help-trailer.tmpl +share/cups/templates/pl/job-cancel.tmpl +share/cups/templates/pl/job-hold.tmpl +share/cups/templates/pl/job-move.tmpl +share/cups/templates/pl/job-moved.tmpl +share/cups/templates/pl/job-release.tmpl +share/cups/templates/pl/job-restart.tmpl +share/cups/templates/pl/jobs-header.tmpl +share/cups/templates/pl/jobs.tmpl +share/cups/templates/pl/list-available-printers.tmpl +share/cups/templates/pl/modify-class.tmpl +share/cups/templates/pl/modify-printer.tmpl +share/cups/templates/pl/norestart.tmpl +share/cups/templates/pl/option-boolean.tmpl +share/cups/templates/pl/option-conflict.tmpl +share/cups/templates/pl/option-header.tmpl +share/cups/templates/pl/option-pickmany.tmpl +share/cups/templates/pl/option-pickone.tmpl +share/cups/templates/pl/option-trailer.tmpl +share/cups/templates/pl/pager.tmpl +share/cups/templates/pl/printer-accept.tmpl +share/cups/templates/pl/printer-added.tmpl +share/cups/templates/pl/printer-configured.tmpl +share/cups/templates/pl/printer-confirm.tmpl +share/cups/templates/pl/printer-default.tmpl +share/cups/templates/pl/printer-deleted.tmpl +share/cups/templates/pl/printer-jobs-header.tmpl +share/cups/templates/pl/printer-modified.tmpl +share/cups/templates/pl/printer-purge.tmpl +share/cups/templates/pl/printer-reject.tmpl +share/cups/templates/pl/printer-start.tmpl +share/cups/templates/pl/printer-stop.tmpl +share/cups/templates/pl/printer.tmpl +share/cups/templates/pl/printers-header.tmpl +share/cups/templates/pl/printers.tmpl +share/cups/templates/pl/restart.tmpl +share/cups/templates/pl/samba-export.tmpl +share/cups/templates/pl/samba-exported.tmpl +share/cups/templates/pl/search.tmpl +share/cups/templates/pl/set-printer-options-header.tmpl +share/cups/templates/pl/set-printer-options-trailer.tmpl +share/cups/templates/pl/subscription-added.tmpl +share/cups/templates/pl/subscription-canceled.tmpl +share/cups/templates/pl/test-page.tmpl +share/cups/templates/pl/trailer.tmpl +share/cups/templates/pl/users.tmpl +share/cups/templates/printer-accept.tmpl +share/cups/templates/printer-added.tmpl +share/cups/templates/printer-configured.tmpl +share/cups/templates/printer-confirm.tmpl +share/cups/templates/printer-default.tmpl +share/cups/templates/printer-deleted.tmpl +share/cups/templates/printer-jobs-header.tmpl +share/cups/templates/printer-modified.tmpl +share/cups/templates/printer-purge.tmpl +share/cups/templates/printer-reject.tmpl +share/cups/templates/printer-start.tmpl +share/cups/templates/printer-stop.tmpl +share/cups/templates/printer.tmpl +share/cups/templates/printers-header.tmpl +share/cups/templates/printers.tmpl +share/cups/templates/restart.tmpl +share/cups/templates/ru/add-class.tmpl +share/cups/templates/ru/add-printer.tmpl +share/cups/templates/ru/add-rss-subscription.tmpl +share/cups/templates/ru/admin.tmpl +share/cups/templates/ru/choose-device.tmpl +share/cups/templates/ru/choose-make.tmpl +share/cups/templates/ru/choose-model.tmpl +share/cups/templates/ru/choose-serial.tmpl +share/cups/templates/ru/choose-uri.tmpl +share/cups/templates/ru/class-added.tmpl +share/cups/templates/ru/class-confirm.tmpl +share/cups/templates/ru/class-deleted.tmpl +share/cups/templates/ru/class-jobs-header.tmpl +share/cups/templates/ru/class-modified.tmpl +share/cups/templates/ru/class.tmpl +share/cups/templates/ru/classes-header.tmpl +share/cups/templates/ru/classes.tmpl +share/cups/templates/ru/command.tmpl +share/cups/templates/ru/edit-config.tmpl +share/cups/templates/ru/error-op.tmpl +share/cups/templates/ru/error.tmpl +share/cups/templates/ru/header.tmpl +share/cups/templates/ru/help-header.tmpl +share/cups/templates/ru/help-printable.tmpl +share/cups/templates/ru/help-trailer.tmpl +share/cups/templates/ru/job-cancel.tmpl +share/cups/templates/ru/job-hold.tmpl +share/cups/templates/ru/job-move.tmpl +share/cups/templates/ru/job-moved.tmpl +share/cups/templates/ru/job-release.tmpl +share/cups/templates/ru/job-restart.tmpl +share/cups/templates/ru/jobs-header.tmpl +share/cups/templates/ru/jobs.tmpl +share/cups/templates/ru/list-available-printers.tmpl +share/cups/templates/ru/modify-class.tmpl +share/cups/templates/ru/modify-printer.tmpl +share/cups/templates/ru/norestart.tmpl +share/cups/templates/ru/option-boolean.tmpl +share/cups/templates/ru/option-conflict.tmpl +share/cups/templates/ru/option-header.tmpl +share/cups/templates/ru/option-pickmany.tmpl +share/cups/templates/ru/option-pickone.tmpl +share/cups/templates/ru/option-trailer.tmpl +share/cups/templates/ru/pager.tmpl +share/cups/templates/ru/printer-accept.tmpl +share/cups/templates/ru/printer-added.tmpl +share/cups/templates/ru/printer-configured.tmpl +share/cups/templates/ru/printer-confirm.tmpl +share/cups/templates/ru/printer-default.tmpl +share/cups/templates/ru/printer-deleted.tmpl +share/cups/templates/ru/printer-jobs-header.tmpl +share/cups/templates/ru/printer-modified.tmpl +share/cups/templates/ru/printer-purge.tmpl +share/cups/templates/ru/printer-reject.tmpl +share/cups/templates/ru/printer-start.tmpl +share/cups/templates/ru/printer-stop.tmpl +share/cups/templates/ru/printer.tmpl +share/cups/templates/ru/printers-header.tmpl +share/cups/templates/ru/printers.tmpl +share/cups/templates/ru/restart.tmpl +share/cups/templates/ru/samba-export.tmpl +share/cups/templates/ru/samba-exported.tmpl +share/cups/templates/ru/search.tmpl +share/cups/templates/ru/set-printer-options-header.tmpl +share/cups/templates/ru/set-printer-options-trailer.tmpl +share/cups/templates/ru/subscription-added.tmpl +share/cups/templates/ru/subscription-canceled.tmpl +share/cups/templates/ru/test-page.tmpl +share/cups/templates/ru/trailer.tmpl +share/cups/templates/ru/users.tmpl +share/cups/templates/samba-export.tmpl +share/cups/templates/samba-exported.tmpl +share/cups/templates/search.tmpl +share/cups/templates/set-printer-options-header.tmpl +share/cups/templates/set-printer-options-trailer.tmpl +share/cups/templates/subscription-added.tmpl +share/cups/templates/subscription-canceled.tmpl +share/cups/templates/test-page.tmpl +share/cups/templates/trailer.tmpl +share/cups/templates/users.tmpl +share/doc/cups/LICENSE.txt +share/doc/cups/README.txt +share/doc/cups/cups-printable.css +share/doc/cups/cups.css +share/doc/cups/de/index.html +share/doc/cups/es/index.html +share/doc/cups/eu/index.html +share/doc/cups/fr/index.html +share/doc/cups/help/accounting.html +share/doc/cups/help/api-array.html +share/doc/cups/help/api-cgi.html +share/doc/cups/help/api-cups.html +share/doc/cups/help/api-driver.html +share/doc/cups/help/api-filedir.html +share/doc/cups/help/api-filter.html +share/doc/cups/help/api-httpipp.html +share/doc/cups/help/api-mime.html +share/doc/cups/help/api-overview.html +share/doc/cups/help/api-ppd.html +share/doc/cups/help/api-ppdc.html +share/doc/cups/help/api-raster.html +share/doc/cups/help/cgi.html +share/doc/cups/help/glossary.html +share/doc/cups/help/kerberos.html +share/doc/cups/help/license.html +share/doc/cups/help/man-backend.html +share/doc/cups/help/man-cancel.html +share/doc/cups/help/man-cups-config.html +share/doc/cups/help/man-cups-lpd.html +share/doc/cups/help/man-cups-polld.html +share/doc/cups/help/man-cupsaccept.html +share/doc/cups/help/man-cupsaddsmb.html +share/doc/cups/help/man-cupsd.html +share/doc/cups/help/man-cupsenable.html +share/doc/cups/help/man-cupstestdsc.html +share/doc/cups/help/man-cupstestppd.html +share/doc/cups/help/man-filter.html +share/doc/cups/help/man-ipptool.html +share/doc/cups/help/man-ipptoolfile.html +share/doc/cups/help/man-lp.html +share/doc/cups/help/man-lpadmin.html +share/doc/cups/help/man-lpc.html +share/doc/cups/help/man-lpinfo.html +share/doc/cups/help/man-lpmove.html +share/doc/cups/help/man-lpoptions.html +share/doc/cups/help/man-lppasswd.html +share/doc/cups/help/man-lpq.html +share/doc/cups/help/man-lpr.html +share/doc/cups/help/man-lprm.html +share/doc/cups/help/man-lpstat.html +share/doc/cups/help/man-mime.convs.html +share/doc/cups/help/man-mime.types.html +share/doc/cups/help/man-notifier.html +share/doc/cups/help/man-ppdc.html +share/doc/cups/help/man-ppdhtml.html +share/doc/cups/help/man-ppdi.html +share/doc/cups/help/man-ppdmerge.html +share/doc/cups/help/man-ppdpo.html +share/doc/cups/help/network.html +share/doc/cups/help/options.html +share/doc/cups/help/overview.html +share/doc/cups/help/policies.html +share/doc/cups/help/postscript-driver.html +share/doc/cups/help/ppd-compiler.html +share/doc/cups/help/raster-driver.html +share/doc/cups/help/ref-access_log.html +share/doc/cups/help/ref-classes-conf.html +share/doc/cups/help/ref-client-conf.html +share/doc/cups/help/ref-cupsd-conf.html +share/doc/cups/help/ref-error_log.html +share/doc/cups/help/ref-mailto-conf.html +share/doc/cups/help/ref-page_log.html +share/doc/cups/help/ref-ppdcfile.html +share/doc/cups/help/ref-printers-conf.html +share/doc/cups/help/ref-snmp-conf.html +share/doc/cups/help/ref-subscriptions-conf.html +share/doc/cups/help/security.html +share/doc/cups/help/sharing.html +share/doc/cups/help/spec-banner.html +share/doc/cups/help/spec-browsing.html +share/doc/cups/help/spec-cmp.html +share/doc/cups/help/spec-command.html +share/doc/cups/help/spec-design.html +share/doc/cups/help/spec-ipp.html +share/doc/cups/help/spec-pdf.html +share/doc/cups/help/spec-postscript.html +share/doc/cups/help/spec-ppd.html +share/doc/cups/help/spec-raster.html +share/doc/cups/help/spec-stp.html +share/doc/cups/help/standard.html +share/doc/cups/help/translation.html +share/doc/cups/help/whatsnew.html +share/doc/cups/hu/index.html +share/doc/cups/id/index.html +share/doc/cups/images/color-wheel.png +share/doc/cups/images/cups-block-diagram.png +share/doc/cups/images/cups-command-chain.png +share/doc/cups/images/cups-icon.png +share/doc/cups/images/cups-postscript-chain.png +share/doc/cups/images/cups-raster-chain.png +share/doc/cups/images/cups.png +share/doc/cups/images/generic.png +share/doc/cups/images/left.gif +share/doc/cups/images/raster-organization.png +share/doc/cups/images/raster.png +share/doc/cups/images/right.gif +share/doc/cups/images/sample-image.png +share/doc/cups/images/sel.gif +share/doc/cups/images/smiley.jpg +share/doc/cups/images/unsel.gif +share/doc/cups/images/wait.gif +share/doc/cups/index.html +share/doc/cups/it/index.html +share/doc/cups/ja/index.html +share/doc/cups/pl/index.html +share/doc/cups/robots.txt +share/doc/cups/ru/index.html +${PLIST.pam}share/examples/cups/cups.pam +share/examples/cups/cupsd.conf +share/examples/cups/snmp.conf +share/locale/da/cups_da.po +share/locale/de/cups_de.po +share/locale/es/cups_es.po +share/locale/eu/cups_eu.po +share/locale/fi/cups_fi.po +share/locale/fr/cups_fr.po +share/locale/hu/cups_hu.po +share/locale/id/cups_id.po +share/locale/it/cups_it.po +share/locale/ja/cups_ja.po +share/locale/ko/cups_ko.po +share/locale/nl/cups_nl.po +share/locale/no/cups_no.po +share/locale/pl/cups_pl.po +share/locale/pt/cups_pt.po +share/locale/pt_BR/cups_pt_BR.po +share/locale/ru/cups_ru.po +share/locale/sv/cups_sv.po +share/locale/zh/cups_zh.po +share/locale/zh_TW/cups_zh_TW.po +@pkgdir share/cups/model +@pkgdir share/cups/profiles diff --git a/print/cups15/buildlink3.mk b/print/cups15/buildlink3.mk new file mode 100644 index 00000000000..00f87cdb190 --- /dev/null +++ b/print/cups15/buildlink3.mk @@ -0,0 +1,29 @@ +# $NetBSD: buildlink3.mk,v 1.1 2014/06/17 13:17:12 wiz Exp $ + +BUILDLINK_TREE+= cups + +.if !defined(CUPS_BUILDLINK3_MK) +CUPS_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.cups+= cups>=1.1.19nb3 +BUILDLINK_ABI_DEPENDS.cups+= cups>=1.5.4nb9 +BUILDLINK_PKGSRCDIR.cups?= ../../print/cups + +pkgbase := cups +.include "../../mk/pkg-build-options.mk" + +.if !empty(PKG_BUILD_OPTIONS.cups:Mkerberos) +.include "../../mk/krb5.buildlink3.mk" +.endif + +.if !empty(PKG_BUILD_OPTIONS.cups:Mdnssd) +.include "../../net/mDNSResponder/buildlink3.mk" +.endif + +.include "../../converters/libiconv/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.endif # CUPS_BUILDLINK3_MK + +BUILDLINK_TREE+= -cups diff --git a/print/cups15/distinfo b/print/cups15/distinfo new file mode 100644 index 00000000000..8e907f7f4ae --- /dev/null +++ b/print/cups15/distinfo @@ -0,0 +1,24 @@ +$NetBSD: distinfo,v 1.1 2014/06/17 13:17:12 wiz Exp $ + +SHA1 (cups-1.5.4-source.tar.bz2) = cb39961cbaf1851a47694828ad9a7cdf4da51fbd +RMD160 (cups-1.5.4-source.tar.bz2) = 9d6a7fd69d3036ec1f3dfd9c70672a2c6fb517b6 +Size (cups-1.5.4-source.tar.bz2) = 9583002 bytes +SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b +SHA1 (patch-ad) = a8d6610c4057ae98d98435ba577606e3c2bfb4b9 +SHA1 (patch-ae) = 67e846ac428b4c44d8da9b49d959fa4f14fbb494 +SHA1 (patch-af) = 025f198dd491a55ffc460d03d3ad23a100fe5271 +SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e +SHA1 (patch-ah) = 27d9b92a2f1ae116162b4f24d9aab3a955d52052 +SHA1 (patch-ai) = 13725f3b4e0016acf5ead79cadb9626d1f2ce58e +SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971 +SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7 +SHA1 (patch-at) = bbda891ed0820e23fe7f6fe3dd5326eeda5b3b2e +SHA1 (patch-au) = 0d1d3cf255b996c96b0ea798f46b08523ef22a60 +SHA1 (patch-conf_Makefile) = 5b5d45abc1e8d6b73a1ad6b7a7098714d4c55395 +SHA1 (patch-config-scripts_cups-gssapi.m4) = 6f558ee1d2d56ceba3a9705d3278c7969495be5d +SHA1 (patch-config.h.in) = 0f072063d24810dcbdd2d095b9f2fa6bab44ff20 +SHA1 (patch-filter_raster.c) = fc48e9cc7f7f32355816355dfc199157a00246c7 +SHA1 (patch-ppdc_Makefile) = 7dcc34217557a4c6f42064b61abf593bd7620b60 +SHA1 (patch-scheduler_auth.c) = 29cd4378eb4ceeb1e618534fc5a9975022dbcf2c +SHA1 (patch-scheduler_client.c) = d4b6667199c0ff9617847ba119b82a50457cfd98 +SHA1 (patch-scheduler_dirsvc.c) = 62c6b47522a60b9f8042421e4a9d25a5dfa47c47 diff --git a/print/cups15/files/cups.pam b/print/cups15/files/cups.pam new file mode 100644 index 00000000000..b2e64ee4835 --- /dev/null +++ b/print/cups15/files/cups.pam @@ -0,0 +1,6 @@ +# $NetBSD: cups.pam,v 1.1 2014/06/17 13:17:13 wiz Exp $ +# +# PAM configuration for Common UNIX Printing System +# +auth required @LOCALBASE@/lib/security/pam_unix.so nullok +account required @LOCALBASE@/lib/security/pam_unix.so diff --git a/print/cups15/files/cupsd.sh b/print/cups15/files/cupsd.sh new file mode 100644 index 00000000000..86d67c2383f --- /dev/null +++ b/print/cups15/files/cupsd.sh @@ -0,0 +1,73 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: cupsd.sh,v 1.1 2014/06/17 13:17:13 wiz Exp $ +# +# Common UNIX Printing System daemon +# +# PROVIDE: cupsd +# REQUIRE: DAEMON slpd +# +# You will need to set some variables in /etc/rc.conf to start cupsd: +# +# cupsd=YES +# cupsd_wait=YES # set to "YES" to wait for cupsd to detect printers; +# # this variable is optional and defaults to "NO". +# cupsd_timeout=60 # set to the number of seconds we wait for cupsd +# # to respond before we declare it not responding; +# # this variable is optional and defaults to "60". + +if [ -f /etc/rc.subr ]; then + . /etc/rc.subr +fi + +name="cupsd" +rcvar=${name} +command="@PREFIX@/sbin/${name}" +lpstat_command="@PREFIX@/bin/lpstat" +command_args="& sleep 2" +required_files="@PKG_SYSCONFDIR@/${name}.conf" +extra_commands="reload wait" +wait_cmd="cupsd_waitcmd" +start_postcmd="cupsd_poststart" + +cupsd_poststart() +{ + if checkyesno cupsd_wait; then + run_rc_command wait + fi +} + +cupsd_waitcmd() +{ + if [ -x ${lpstat_command} ]; then + msg= + @ECHO@ -n "Waiting ${cupsd_timeout} seconds for ${name}: " + if ${lpstat_command} -r >/dev/null 2>&1; then + msg='responding' + else + master=$$ + trap "msg='not responding'" ALRM + (sleep ${cupsd_timeout} && kill -ALRM $master) >/dev/null 2>&1 & + while [ -z "$msg" ]; do + if ${lpstat_command} -r >/dev/null 2>&1; then + msg='responding' + trap : ALRM + else + sleep 5 + @ECHO@ -n '.' + fi + done + fi + @ECHO@ "$msg" + fi +} + +if [ -f /etc/rc.subr ]; then + load_rc_config $name + : ${cupsd_wait:=NO} + : ${cupsd_timeout:=60} + run_rc_command "$1" +else + @ECHO@ -n " ${name}" + ${command} ${cupsd_flags} ${command_args} +fi diff --git a/print/cups15/options.mk b/print/cups15/options.mk new file mode 100644 index 00000000000..c9b9dd768fa --- /dev/null +++ b/print/cups15/options.mk @@ -0,0 +1,98 @@ +# $NetBSD: options.mk,v 1.1 2014/06/17 13:17:12 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.cups +PKG_OPTIONS_REQUIRED_GROUPS= pdftops +PKG_OPTIONS_GROUP.pdftops= ghostscript poppler +PKG_SUPPORTED_OPTIONS= acl dbus dnssd kerberos pam slp tcpwrappers +PKG_SUGGESTED_OPTIONS= dbus dnssd kerberos poppler slp +PKG_OPTIONS_LEGACY_OPTS+= xpdf:poppler gs:ghostscript + +# Neither DragonFly nor SunOS can build libusb1 +.if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS" +PKG_SUPPORTED_OPTIONS+= libusb +PKG_SUGGESTED_OPTIONS+= libusb +.endif + +.include "../../mk/bsd.options.mk" + +MESSAGE_SRC= ${PKGDIR}/MESSAGE + +.if !empty(PKG_OPTIONS:Macl) +CONFIGURE_ARGS+= --enable-acl +.else +CONFIGURE_ARGS+= --disable-acl +.endif + +PLIST_VARS+= dbus +.if !empty(PKG_OPTIONS:Mdbus) +USE_TOOLS+= pkg-config +. include "../../sysutils/dbus/buildlink3.mk" +CONFIGURE_ARGS+= --enable-dbus +PLIST.dbus= yes +.else +CONFIGURE_ARGS+= --disable-dbus +.endif + +PLIST_VARS+= dnssd +.if !empty(PKG_OPTIONS:Mdnssd) +.include "../../net/mDNSResponder/buildlink3.mk" +CONFIGURE_ARGS+= --enable-dnssd +PLIST.dnssd= yes +.else +CONFIGURE_ARGS+= --disable-dnssd +.endif + +.if !empty(PKG_OPTIONS:Mghostscript) +USE_TOOLS+= gs:run +CONFIGURE_ARGS+= --with-pdftops=gs +CONFIGURE_ENV+= ac_cv_path_CUPS_GHOSTSCRIPT=${TOOLS_PATH.gs} +.endif + +.if !empty(PKG_OPTIONS:Mkerberos) +.include "../../mk/krb5.buildlink3.mk" +CONFIGURE_ARGS+= --enable-gssapi +.else +CONFIGURE_ARGS+= --disable-gssapi +.endif + +.if !empty(PKG_OPTIONS:Mlibusb) +.include "../../devel/libusb1/buildlink3.mk" +CONFIGURE_ARGS+= --enable-libusb +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb +USE_TOOLS+= pkg-config +.else +CONFIGURE_ARGS+= --disable-libusb +.endif + +PLIST_VARS+= pam +.if !empty(PKG_OPTIONS:Mpam) +. include "../../mk/pam.buildlink3.mk" +CONFIGURE_ARGS+= --enable-pam +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam +PLIST.pam= yes +.else +CONFIGURE_ARGS+= --disable-pam +MESSAGE_SRC= ${.CURDIR}/MESSAGE +.endif + +.if !empty(PKG_OPTIONS:Mpoppler) +FIND_PREFIX:= POPPLERDIR=poppler-utils +.include "../../mk/find-prefix.mk" +DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils +CONFIGURE_ARGS+= --with-pdftops=pdftops +CONFIGURE_ENV+= ac_cv_path_CUPS_PDFTOPS=${POPPLERDIR}/bin/pdftops +.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:Mtcpwrappers) +.include "../../security/tcp_wrappers/buildlink3.mk" +CONFIGURE_ARGS+= --enable-tcp-wrappers +.else +CONFIGURE_ARGS+= --disable-tcp-wrappers +.endif diff --git a/print/cups15/patches/patch-ac b/print/cups15/patches/patch-ac new file mode 100644 index 00000000000..787ea07dc17 --- /dev/null +++ b/print/cups15/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +libtoolize. + +--- configure.in.orig 2008-11-14 19:32:22.000000000 +0000 ++++ configure.in +@@ -22,7 +22,6 @@ sinclude(config-scripts/cups-manpages.m4 + + sinclude(config-scripts/cups-3264.m4) + sinclude(config-scripts/cups-sharedlibs.m4) +-sinclude(config-scripts/cups-libtool.m4) + sinclude(config-scripts/cups-compiler.m4) + + sinclude(config-scripts/cups-image.m4) diff --git a/print/cups15/patches/patch-ad b/print/cups15/patches/patch-ad new file mode 100644 index 00000000000..2797fe3f743 --- /dev/null +++ b/print/cups15/patches/patch-ad @@ -0,0 +1,89 @@ +$NetBSD: patch-ad,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +libtoolize. + +--- config-scripts/cups-sharedlibs.m4.orig 2010-06-16 00:48:25.000000000 +0000 ++++ config-scripts/cups-sharedlibs.m4 +@@ -22,6 +22,24 @@ cupsbase="cups" + LIBCUPSBASE="lib$cupsbase" + LIBCUPSSTATIC="lib$cupsbase.a" + ++AC_ARG_ENABLE(libtool, [ --enable-libtool[=LIBTOOL_PATH] ++ turn on building with libtool (UNSUPPORTED!), default=no]) ++ ++if test x$enable_libtool != xno; then ++ echo "WARNING: libtool is not supported or endorsed by Easy Software Products." ++ echo " WE DO NOT PROVIDE TECHNICAL SUPPORT FOR LIBTOOL PROBLEMS." ++ echo " (even if you have a support contract)" ++ enable_shared=no ++ if test x$enable_libtool = xyes; then ++ LIBTOOL=libtool ++ else ++ LIBTOOL=$enable_libtool ++ fi ++else ++ LIBTOOL= ++fi ++AC_SUBST(LIBTOOL) ++ + if test x$enable_shared != xno; then + case "$uname" in + SunOS*) +@@ -131,6 +149,15 @@ if test x$enable_shared != xno; then + DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)" + ;; + esac ++elif test x$enable_libtool != xno; then ++ LIBCUPS="libcups.la" ++ LIBCUPSCGI="libcupscgi.la" ++ LIBCUPSDRIVER="libcupsdriver.la" ++ LIBCUPSIMAGE="libcupsimage.la" ++ LIBCUPSMIME="libcupsmime.la" ++ LIBCUPSPPDC="libcupsppdc.la" ++ DSO="\$(CC)" ++ DSOXX="\$(CXX)" + else + PICFLAG=0 + LIBCUPS="lib$cupsbase.a" +@@ -163,8 +190,13 @@ AC_SUBST(LIBCUPSPPDC) + AC_SUBST(LIBCUPSSTATIC) + + if test x$enable_shared = xno; then +- LINKCUPS="../cups/lib$cupsbase.a" +- LINKCUPSIMAGE="../filter/libcupsimage.a" ++ if test x$enable_libtool = xno; then ++ LINKCUPS="../cups/lib$cupsbase.a" ++ LINKCUPSIMAGE="../filter/libcupsimage.a" ++ else ++ LINKCUPS="../cups/\$(LIBCUPS)" ++ LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)" ++ fi + + EXTLINKCUPS="-lcups" + EXTLINKCUPSDRIVER="-lcupsdriver" +@@ -204,10 +236,11 @@ if test "$DSO" != ":"; then + DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)" + IMGLIBS="" + +- # Tell the run-time linkers where to find a DSO. Some platforms +- # need this option, even when the library is installed in a +- # standard location... +- case $uname in ++ if test x$enable_libtool = xno; then ++ # Tell the run-time linkers where to find a DSO. Some platforms ++ # need this option, even when the library is installed in a ++ # standard location... ++ case $uname in + HP-UX*) + # HP-UX needs the path, even for /usr/lib... + case "$uarch" in +@@ -255,7 +288,8 @@ if test "$DSO" != ":"; then + EXPORT_LDFLAGS="-Wl,-rpath,$libdir" + fi + ;; +- esac ++ esac ++ fi + else + DSOLIBS="" + IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)" diff --git a/print/cups15/patches/patch-ae b/print/cups15/patches/patch-ae new file mode 100644 index 00000000000..7efd840d296 --- /dev/null +++ b/print/cups15/patches/patch-ae @@ -0,0 +1,72 @@ +$NetBSD: patch-ae,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +For proper libtool usage split CC into CC_COMPILE and CC with libtool +mode options compile/link respectively. + +Same for CXX. + +--- Makedefs.in.orig 2012-03-01 00:05:55.000000000 +0000 ++++ Makedefs.in +@@ -19,9 +19,11 @@ + + AR = @AR@ + AWK = @AWK@ +-CC = @LIBTOOL@ @CC@ ++CC_COMPILE = @LIBTOOL@ --mode=compile @CC@ ++CC = @LIBTOOL@ --mode=link @CC@ + CHMOD = @CHMOD@ +-CXX = @LIBTOOL@ @CXX@ ++CXX_COMPILE = @LIBTOOL@ --mode=compile @CXX@ ++CXX = @LIBTOOL@ --mode=link @CXX@ + DSO = @DSO@ + DSOXX = @DSOXX@ + HTMLDOC = @HTMLDOC@ +@@ -41,12 +43,12 @@ SHELL = /bin/sh + # Installation programs... + # + +-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ ++INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) -c -m 755 @INSTALL_STRIP@ + INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ +-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ ++INSTALL_COMPDATA = $(INSTALL) -c -m 444 + INSTALL_DATA = $(INSTALL) -c -m 444 + INSTALL_DIR = $(INSTALL) -d +-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ ++INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) -c -m 755 @INSTALL_STRIP@ + INSTALL_MAN = $(INSTALL) -c -m 444 + INSTALL_SCRIPT = $(INSTALL) -c -m 555 + +@@ -145,7 +147,7 @@ CXXLIBS = @CXXLIBS@ + DBUS_NOTIFIER = @DBUS_NOTIFIER@ + DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ + DNSSD_BACKEND = @DNSSD_BACKEND@ +-DSOFLAGS = -L../cups @DSOFLAGS@ ++DSOFLAGS = -L../cups @DSOFLAGS@ $(OPTIM) + DSOLIBS = @DSOLIBS@ $(COMMONLIBS) + DNSSDLIBS = @DNSSDLIBS@ + FONTS = @FONTS@ +@@ -279,19 +281,19 @@ DBUSDIR = @DBUSDIR@ + + .c.o: + echo Compiling $<... +- $(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $< ++ $(CC_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $< + + .c.32.o: + echo Compiling 32-bit $<... +- $(CC) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $< ++ $(CC_COMPILE) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $< + + .c.64.o: + echo Compiling 64-bit $<... +- $(CC) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $< ++ $(CC_COMPILE) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $< + + .cxx.o: + echo Compiling $<... +- $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $< ++ $(CXX_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $< + + .man.1 .man.1m .man.3 .man.5 .man.7 .man.8: + echo Linking $<... diff --git a/print/cups15/patches/patch-af b/print/cups15/patches/patch-af new file mode 100644 index 00000000000..f6cc16da344 --- /dev/null +++ b/print/cups15/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +* Remove unneeded $(LIBTOOL), it's now in $(INSTALL_BIN). + +--- backend/Makefile.orig 2011-05-04 04:28:00.000000000 +0000 ++++ backend/Makefile +@@ -89,7 +89,7 @@ install-exec: $(INSTALLXPC) + echo Installing backends in $(SERVERBIN)/backend + $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend + for file in $(RBACKENDS); do \ +- $(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \ ++ $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \ + done + for file in $(UBACKENDS); do \ + $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \ diff --git a/print/cups15/patches/patch-ag b/print/cups15/patches/patch-ag new file mode 100644 index 00000000000..978f2614d3f --- /dev/null +++ b/print/cups15/patches/patch-ag @@ -0,0 +1,24 @@ +$NetBSD: patch-ag,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +cups installs stuff in /usr/pkg/lib64 on Linux. Don't do this. + +--- config-scripts/cups-3264.m4.orig 2009-04-19 21:18:45.000000000 +0000 ++++ config-scripts/cups-3264.m4 +@@ -95,7 +95,7 @@ case "$uname" in + LIB32CUPS="32bit/libcups.so.2" + LIB32CUPSIMAGE="32bit/libcupsimage.so.2" + LIB32DIR="$exec_prefix/lib" +- if test -d /usr/lib32; then ++ if test -d /usr/lib32 && false; then + LIB32DIR="${LIB32DIR}32" + fi + UNINSTALL32="uninstall32bit" +@@ -107,7 +107,7 @@ case "$uname" in + LIB64CUPS="64bit/libcups.so.2" + LIB64CUPSIMAGE="64bit/libcupsimage.so.2" + LIB64DIR="$exec_prefix/lib" +- if test -d /usr/lib64; then ++ if test -d /usr/lib64 && false; then + LIB64DIR="${LIB64DIR}64" + fi + UNINSTALL64="uninstall64bit" diff --git a/print/cups15/patches/patch-ah b/print/cups15/patches/patch-ah new file mode 100644 index 00000000000..ef7797ecefb --- /dev/null +++ b/print/cups15/patches/patch-ah @@ -0,0 +1,18 @@ +$NetBSD: patch-ah,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +Some builds of gcc seem to support this for compiling but then fail during +linking with undefined reference to `__stack_chk_fail_local' + +--- config-scripts/cups-compiler.m4.orig 2009-05-17 00:13:47.000000000 +0000 ++++ config-scripts/cups-compiler.m4 +@@ -140,8 +140,9 @@ if test -n "$GCC"; then + AC_MSG_CHECKING(if GCC supports -fstack-protector) + OLDCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fstack-protector" +- AC_TRY_LINK(,, ++ AC_TRY_LINK(, [return 0;], + OPTIM="$OPTIM -fstack-protector" ++ LIBS="$LIBS $LIBS_SSP" + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + CFLAGS="$OLDCFLAGS" diff --git a/print/cups15/patches/patch-ai b/print/cups15/patches/patch-ai new file mode 100644 index 00000000000..77a3e35bd38 --- /dev/null +++ b/print/cups15/patches/patch-ai @@ -0,0 +1,15 @@ +$NetBSD: patch-ai,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS + +--- notifier/Makefile.orig 2009-04-12 23:04:51.000000000 +0000 ++++ notifier/Makefile +@@ -62,6 +62,8 @@ install: all install-data install-header + # + + install-data: ++ ++install-dirs: + $(INSTALL_DIR) -m 775 -g $(CUPS_GROUP) $(CACHEDIR)/rss + + diff --git a/print/cups15/patches/patch-an b/print/cups15/patches/patch-an new file mode 100644 index 00000000000..10e4937de1a --- /dev/null +++ b/print/cups15/patches/patch-an @@ -0,0 +1,158 @@ +$NetBSD: patch-an,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +The '$' while loops expand the variables as long as possible so that no +references to other variables occur. This is necessary because fontpath +may be "${exec_prefix}", which itself may be "${prefix}", and so on. I +don't know how many levels of indirection are possible, therefore the +loop. + +I'm also sure that this is not the Right Way to fix it, but at least it +works. + +--- config-scripts/cups-directories.m4.orig 2009-04-12 23:04:51.000000000 +0000 ++++ config-scripts/cups-directories.m4 +@@ -106,7 +106,7 @@ if test "$libdir" = "\${exec_prefix}/lib + libdir="$exec_prefix/lib32" + ;; + Linux*) +- if test -d /usr/lib64; then ++ if test -d /usr/lib64 && false; then + libdir="$exec_prefix/lib64" + fi + ;; +@@ -297,7 +297,15 @@ AC_SUBST(CUPS_CACHEDIR) + + # Data files + CUPS_DATADIR="$datadir/cups" +-AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups") ++done=no ++while test $done = no; do ++ case "$CUPS_DATADIR" in ++ *'$'*) eval "CUPS_DATADIR=$CUPS_DATADIR";; ++ *) done=yes;; ++ esac ++done ++ ++AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR") + AC_SUBST(CUPS_DATADIR) + + # Icon directory +@@ -306,7 +314,11 @@ AC_ARG_WITH(icondir, [ --with-icondir + if test "x$icondir" = x -a -d /usr/share/icons; then + ICONDIR="/usr/share/icons" + else +- ICONDIR="$icondir" ++ if test "x$icondir" = xno; then ++ ICONDIR="" ++ else ++ ICONDIR="$icondir" ++ fi + fi + + AC_SUBST(ICONDIR) +@@ -317,7 +329,11 @@ AC_ARG_WITH(menudir, [ --with-menudir + if test "x$menudir" = x -a -d /usr/share/applications; then + MENUDIR="/usr/share/applications" + else +- MENUDIR="$menudir" ++ if test "x$menudir" = xno; then ++ MENUDIR="" ++ else ++ MENUDIR="$menudir" ++ fi + fi + + AC_SUBST(MENUDIR) +@@ -332,7 +348,15 @@ else + CUPS_DOCROOT="$docdir" + fi + +-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir") ++done=no ++while test $done = no; do ++ case "$CUPS_DOCROOT" in ++ *'$'*) eval "CUPS_DOCROOT=$CUPS_DOCROOT";; ++ *) done=yes;; ++ esac ++done ++ ++AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$CUPS_DOCROOT") + AC_SUBST(CUPS_DOCROOT) + + # Fonts +@@ -344,8 +368,16 @@ else + CUPS_FONTPATH="$fontpath" + fi + +-AC_SUBST(CUPS_FONTPATH) ++done=no ++while test $done = no; do ++ case "$CUPS_FONTPATH" in ++ *'$'*) eval "CUPS_FONTPATH=$CUPS_FONTPATH";; ++ *) done=yes;; ++ esac ++done ++ + AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH") ++AC_SUBST(CUPS_FONTPATH) + + # Locale data + if test "$localedir" = "\${datarootdir}/locale"; then +@@ -367,6 +399,14 @@ else + CUPS_LOCALEDIR="$localedir" + fi + ++done=no ++while test $done = no; do ++ case "$CUPS_LOCALEDIR" in ++ *'$'*) eval "CUPS_LOCALEDIR=$CUPS_LOCALEDIR";; ++ *) done=yes;; ++ esac ++done ++ + AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR") + AC_SUBST(CUPS_LOCALEDIR) + +@@ -375,7 +415,6 @@ AC_ARG_WITH(logdir, [ --with-logdir + + if test x$logdir = x; then + CUPS_LOGDIR="$localstatedir/log/cups" +- AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups") + else + CUPS_LOGDIR="$logdir" + fi +@@ -384,10 +423,13 @@ AC_SUBST(CUPS_LOGDIR) + + # Longer-term spool data + CUPS_REQUESTS="$localstatedir/spool/cups" +-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups") ++AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS") + AC_SUBST(CUPS_REQUESTS) + + # Server executables... ++AC_ARG_WITH(serverbindir, [ --with-serverbindir set path for server helper programs],serverbindir="$withval",serverbindir="") ++ ++if test x$serverbindir = x; then + case "$uname" in + *BSD* | Darwin*) + # *BSD and Darwin (MacOS X) +@@ -400,6 +442,10 @@ case "$uname" in + CUPS_SERVERBIN="$exec_prefix/lib/cups" + ;; + esac ++else ++ INSTALL_SYSV="" ++ CUPS_SERVERBIN="$serverbindir" ++fi + + AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN") + AC_SUBST(CUPS_SERVERBIN) +@@ -407,7 +453,7 @@ AC_SUBST(INSTALL_SYSV) + + # Configuration files + CUPS_SERVERROOT="$sysconfdir/cups" +-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups") ++AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT") + AC_SUBST(CUPS_SERVERROOT) + + # Transient run-time state diff --git a/print/cups15/patches/patch-ao b/print/cups15/patches/patch-ao new file mode 100644 index 00000000000..d8cc373240c --- /dev/null +++ b/print/cups15/patches/patch-ao @@ -0,0 +1,78 @@ +$NetBSD: patch-ao,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +Add '--with-manext' configure option. + +--- config-scripts/cups-manpages.m4.orig 2009-01-12 19:17:09.000000000 +0000 ++++ config-scripts/cups-manpages.m4 +@@ -13,6 +13,8 @@ dnl which should have been included wi + dnl file is missing or damaged, see the license at "http://www.cups.org/". + dnl + ++AC_ARG_WITH(manext, [ --with-manext set man page extension style (bsd,irix,sysv,none)],manext="$withval",manext="") ++ + dnl Fix "mandir" variable... + if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then + # New GNU "standards" break previous ones, so make sure we use +@@ -50,8 +52,33 @@ AC_SUBST(AMANDIR) + AC_SUBST(PMANDIR) + + dnl Setup manpage extensions... +-case "$uname" in +- IRIX*) ++if test x$manext = x; then ++ case "$uname" in ++ *BSD* | DragonFly*) ++ # *BSD and Darwin (MacOS X) ++ manext=bsd ++ ;; ++ IRIX*) ++ # SGI IRIX ++ manext=irix ++ ;; ++ SunOS* | HP-UX*) ++ # Solaris and HP-UX ++ manext=sysv ++ ;; ++ Linux* | GNU* | Darwin*) ++ # Linux and GNU Hurd ++ manext=linux ++ ;; ++ *) ++ # All others ++ manext=none ++ ;; ++ esac ++fi ++ ++case "$manext" in ++ irix) + # SGI IRIX + MAN1EXT=1 + MAN5EXT=5 +@@ -59,7 +86,7 @@ case "$uname" in + MAN8EXT=1m + MAN8DIR=1 + ;; +- SunOS* | HP-UX*) ++ sysv) + # Solaris and HP-UX + MAN1EXT=1 + MAN5EXT=5 +@@ -67,7 +94,7 @@ case "$uname" in + MAN8EXT=1m + MAN8DIR=1m + ;; +- Linux* | GNU* | Darwin*) ++ linux) + # Linux, GNU Hurd, and Mac OS X + MAN1EXT=1.gz + MAN5EXT=5.gz +@@ -75,7 +102,7 @@ case "$uname" in + MAN8EXT=8.gz + MAN8DIR=8 + ;; +- *) ++ none|*) + # All others + MAN1EXT=1 + MAN5EXT=5 diff --git a/print/cups15/patches/patch-at b/print/cups15/patches/patch-at new file mode 100644 index 00000000000..619c1053da0 --- /dev/null +++ b/print/cups15/patches/patch-at @@ -0,0 +1,15 @@ +$NetBSD: patch-at,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS + +--- scheduler/Makefile.orig 2009-05-26 23:27:06.000000000 +0000 ++++ scheduler/Makefile +@@ -135,6 +135,8 @@ install: all install-data install-header + # + + install-data: ++ ++install-dirs: + echo Creating $(SERVERBIN)/driver... + $(INSTALL_DIR) -m 755 $(SERVERBIN)/driver + echo Creating $(SERVERROOT)... diff --git a/print/cups15/patches/patch-au b/print/cups15/patches/patch-au new file mode 100644 index 00000000000..9a4efd659f7 --- /dev/null +++ b/print/cups15/patches/patch-au @@ -0,0 +1,14 @@ +$NetBSD: patch-au,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +--- scheduler/printers.c.orig 2011-06-15 00:46:13.000000000 +0000 ++++ scheduler/printers.c +@@ -80,6 +80,9 @@ + # include <asl.h> + #endif /* __APPLE__ */ + ++#if defined(HAVE_STATVFS) && ( defined(__NetBSD__) || defined(__sun) ) ++#undef HAVE_STATFS ++#endif + + /* + * Local functions... diff --git a/print/cups15/patches/patch-conf_Makefile b/print/cups15/patches/patch-conf_Makefile new file mode 100644 index 00000000000..7a4c0df711a --- /dev/null +++ b/print/cups15/patches/patch-conf_Makefile @@ -0,0 +1,29 @@ +$NetBSD: patch-conf_Makefile,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +Don't install the config files (leave it up to pkgsrc). + +--- conf/Makefile.orig 2011-05-12 05:21:56.000000000 +0000 ++++ conf/Makefile +@@ -70,22 +70,8 @@ install: all install-data install-header + # + + install-data: +- for file in $(KEEP); do \ +- if test -r $(SERVERROOT)/$$file ; then \ +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \ +- else \ +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ +- fi ; \ +- done +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default + $(INSTALL_DIR) -m 755 $(DATADIR)/mime + for file in $(REPLACE); do \ +- if test -r $(DATADIR)/mime/$$file ; then \ +- $(MV) $(DATADIR)/mime/$$file $(DATADIR)/mime/$$file.O ; \ +- fi ; \ +- if test -r $(SERVERROOT)/$$file ; then \ +- $(MV) $(SERVERROOT)/$$file $(DATADIR)/mime/$$file.O ; \ +- fi ; \ + $(INSTALL_DATA) $$file $(DATADIR)/mime ; \ + done + -if test x$(PAMDIR) != x; then \ diff --git a/print/cups15/patches/patch-config-scripts_cups-gssapi.m4 b/print/cups15/patches/patch-config-scripts_cups-gssapi.m4 new file mode 100644 index 00000000000..8822a0462c6 --- /dev/null +++ b/print/cups15/patches/patch-config-scripts_cups-gssapi.m4 @@ -0,0 +1,36 @@ +$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +builtin krb5-config in platforms such as solaris do not support +the gssapi option, and need an explicit -lgss + +--- config-scripts/cups-gssapi.m4.orig 2011-10-19 20:21:16.000000000 +0000 ++++ config-scripts/cups-gssapi.m4 +@@ -36,19 +36,18 @@ if test x$enable_gssapi != xno; then + AC_MSG_RESULT(no) + fi + ;; +- SunOS*) +- # Solaris has a non-standard krb5-config, don't use it! +- AC_CHECK_LIB(gss, gss_display_status, +- AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available]) ++ *) ++ # make sure krb5-config supports gssapi option ++ if $KRB5CONFIG --cflags gssapi 2>&1 | grep "Unknown option" > /dev/null ; then + CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS" + CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS" +- LIBGSSAPI="-lgss `$KRB5CONFIG --libs`") +- ;; +- *) ++ LIBGSSAPI="-lgss `$KRB5CONFIG --libs`" ++ else + # Other platforms just ask for GSSAPI +- CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" +- CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS" +- LIBGSSAPI="`$KRB5CONFIG --libs gssapi`" ++ CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" ++ CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS" ++ LIBGSSAPI="`$KRB5CONFIG --libs gssapi`" ++ fi + ;; + esac + AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available]) diff --git a/print/cups15/patches/patch-config.h.in b/print/cups15/patches/patch-config.h.in new file mode 100644 index 00000000000..0461e7f7bd3 --- /dev/null +++ b/print/cups15/patches/patch-config.h.in @@ -0,0 +1,18 @@ +$NetBSD: patch-config.h.in,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +* OpenBSD has no arc4random_stir + +--- config.h.in.orig 2012-03-21 04:45:48.000000000 +0000 ++++ config.h.in +@@ -674,7 +674,11 @@ + + #ifdef HAVE_ARC4RANDOM + # define CUPS_RAND() arc4random() ++#if defined(__OpenBSD__) ++# define CUPS_SRAND(v) ++#else + # define CUPS_SRAND(v) arc4random_stir() ++#endif + #elif defined(HAVE_RANDOM) + # define CUPS_RAND() random() + # define CUPS_SRAND(v) srandom(v) diff --git a/print/cups15/patches/patch-filter_raster.c b/print/cups15/patches/patch-filter_raster.c new file mode 100644 index 00000000000..a180bd411aa --- /dev/null +++ b/print/cups15/patches/patch-filter_raster.c @@ -0,0 +1,14 @@ +$NetBSD: patch-filter_raster.c,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +* OpenBSD needs stdint.h + +--- filter/raster.c.orig 2011-09-20 18:36:33.000000000 +0000 ++++ filter/raster.c +@@ -50,6 +50,7 @@ + # include <io.h> + # include <winsock2.h> /* for htonl() definition */ + #else ++# include <stdint.h> + # include <unistd.h> + #endif /* WIN32 || __EMX__ */ + diff --git a/print/cups15/patches/patch-ppdc_Makefile b/print/cups15/patches/patch-ppdc_Makefile new file mode 100644 index 00000000000..51b341709b4 --- /dev/null +++ b/print/cups15/patches/patch-ppdc_Makefile @@ -0,0 +1,13 @@ +$NetBSD: patch-ppdc_Makefile,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +--- ppdc/Makefile.orig 2011-01-06 23:21:05.000000000 +0100 ++++ ppdc/Makefile 2011-11-13 15:51:42.867152712 +0100 +@@ -378,7 +378,7 @@ libcupsppdc_s.a: $(LIBOBJS) ../cups/$(LI + libcupsppdc.la: $(LIBOBJS) ../cups/$(LIBCUPS) + echo Linking $@... + $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ +- -version-info 1:0 $(LINKCUPS) ++ -version-info 1:0 $(COMMONLIBS) + + + # diff --git a/print/cups15/patches/patch-scheduler_auth.c b/print/cups15/patches/patch-scheduler_auth.c new file mode 100644 index 00000000000..dc0e560ba25 --- /dev/null +++ b/print/cups15/patches/patch-scheduler_auth.c @@ -0,0 +1,36 @@ +$NetBSD: patch-scheduler_auth.c,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +Don't pull in sys/ucred.h on Solaris as it results in procfs.h being +included and conflicts between _FILE_OFFSET_BITS=64 and 32-bit procfs. + +OpenBSD defines SO_PEERCRED, but it is different from Linux's one. + +--- scheduler/auth.c.orig 2011-08-31 04:58:33.000000000 +0000 ++++ scheduler/auth.c +@@ -84,7 +84,7 @@ extern const char *cssmErrorString(int e + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif /* HAVE_SYS_PARAM_H */ +-#ifdef HAVE_SYS_UCRED_H ++#if defined(HAVE_SYS_UCRED_H) && !defined(__sun) && !defined(__OpenBSD__) + # include <sys/ucred.h> + typedef struct xucred cupsd_ucred_t; + # define CUPSD_UCRED_UID(c) (c).cr_uid +@@ -493,7 +493,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I + con->type = CUPSD_AUTH_BASIC; + } + #endif /* HAVE_AUTHORIZATION_H */ +-#if defined(SO_PEERCRED) && defined(AF_LOCAL) ++#if defined(SO_PEERCRED) && defined(AF_LOCAL) && !defined(__OpenBSD__) + else if (!strncmp(authorization, "PeerCred ", 9) && + con->http.hostaddr->addr.sa_family == AF_LOCAL) + { +@@ -1120,7 +1120,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I + + gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER); + +-# if defined(SO_PEERCRED) && defined(AF_LOCAL) ++# if defined(SO_PEERCRED) && defined(AF_LOCAL) && !defined(__OpenBSD__) + /* + * Get the client's UID if we are printing locally - that allows a backend + * to run as the correct user to get Kerberos credentials of its own. diff --git a/print/cups15/patches/patch-scheduler_client.c b/print/cups15/patches/patch-scheduler_client.c new file mode 100644 index 00000000000..136dd5a880e --- /dev/null +++ b/print/cups15/patches/patch-scheduler_client.c @@ -0,0 +1,22 @@ +$NetBSD: patch-scheduler_client.c,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +Fix for CVE-2014-2856 from +http://www.cups.org/str.php?L4356 + +--- scheduler/client.c.orig 2012-03-07 06:05:39.000000000 +0000 ++++ scheduler/client.c +@@ -4075,6 +4075,14 @@ is_path_absolute(const char *path) /* I + return (0); + + /* ++ * Check for "<" or quotes in the path and reject since this is probably ++ * someone trying to inject HTML... ++ */ ++ ++ if (strchr(path, '<') != NULL || strchr(path, '\"') != NULL || strchr(path, '\'') != NULL) ++ return (0); ++ ++ /* + * Check for "/.." in the path... + */ + diff --git a/print/cups15/patches/patch-scheduler_dirsvc.c b/print/cups15/patches/patch-scheduler_dirsvc.c new file mode 100644 index 00000000000..cc6e5bb5e38 --- /dev/null +++ b/print/cups15/patches/patch-scheduler_dirsvc.c @@ -0,0 +1,13 @@ +$NetBSD: patch-scheduler_dirsvc.c,v 1.1 2014/06/17 13:17:13 wiz Exp $ + +--- scheduler/dirsvc.c.orig 2011-01-22 01:07:22.000000000 +0100 ++++ scheduler/dirsvc.c 2011-09-20 19:08:50.512786064 +0200 +@@ -1332,7 +1332,7 @@ ldap_connect(void) + cupsdLogMessage(CUPSD_LOG_ERROR, "LDAP bind failed with error %d: %s", + rc, ldap_err2string(rc)); + +-# if defined(HAVE_LDAP_SSL) && defined (HAVE_MOZILLA_LDAP) ++# if defined(HAVE_LDAP_SSL) && defined (HAVE_MOZILLA_LDAP) && !defined(__sun) + if (ldap_ssl && (rc == LDAP_SERVER_DOWN || rc == LDAP_CONNECT_ERROR)) + { + ssl_err = PORT_GetError(); |