pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/cups Update cups to 1.3.5
details: https://anonhg.NetBSD.org/pkgsrc/rev/b60905d7e4e6
branches: trunk
changeset: 537976:b60905d7e4e6
user: markd <markd%pkgsrc.org@localhost>
date: Tue Jan 22 23:58:13 2008 +0000
description:
Update cups to 1.3.5
Adds dns-sd support and Negotiate authentication (kerberos)
various bug fixes.
diffstat:
print/cups/Makefile | 34 +----
print/cups/PLIST | 253 ++++++++++++++++++++++++++++++++++++++-----
print/cups/distinfo | 16 +-
print/cups/options.mk | 33 +++++
print/cups/patches/patch-ab | 16 +-
print/cups/patches/patch-an | 70 +++++++----
print/cups/patches/patch-ao | 12 +-
print/cups/patches/patch-au | 155 --------------------------
8 files changed, 329 insertions(+), 260 deletions(-)
diffs (truncated from 1075 to 300 lines):
diff -r 718f7f2227ca -r b60905d7e4e6 print/cups/Makefile
--- a/print/cups/Makefile Tue Jan 22 22:54:01 2008 +0000
+++ b/print/cups/Makefile Tue Jan 22 23:58:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2008/01/18 05:08:53 tnn Exp $
+# $NetBSD: Makefile,v 1.131 2008/01/22 23:58:13 markd 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:
@@ -6,10 +6,9 @@
DISTNAME= cups-${DIST_VERS}-source
PKGNAME= cups-${VERS}
-BASE_VERS= 1.2.12
+BASE_VERS= 1.3.5
DIST_VERS= ${BASE_VERS}
VERS= ${DIST_VERS:S/-/./g}
-PKGREVISION= 3
CATEGORIES= print
MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
@@ -52,6 +51,8 @@
CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP:Q}
CONFIGURE_ARGS+= --with-manext=bsd
CONFIGURE_ARGS+= --without-perl
+CONFIGURE_ARGS+= --without-icondir
+CONFIGURE_ARGS+= --without-menudir
CONFIGURE_ARGS+= --enable-libtool
CONFIGURE_ARGS+= --enable-ssl
CONFIGURE_ARGS+= --enable-gnutls=no
@@ -61,30 +62,7 @@
CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.cups
-PKG_SUPPORTED_OPTIONS= pam slp
-PKG_SUGGESTED_OPTIONS= 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
+.include "options.mk"
# CUPS_USER username of the CUPS administrator
# CUPS_GROUP group of the CUPS administrator
@@ -159,7 +137,7 @@
${INSTALL_DATA} ${WRKSRC}/$${file} \
${DESTDIR}${DOCDIR}/$${file}; \
done
- cd ${WRKSRC}/conf; for file in *.conf mime.*; do \
+ cd ${WRKSRC}/conf; for file in *.conf mime.convs mime.types; do \
case $${file} in \
pam.conf) \
;; \
diff -r 718f7f2227ca -r b60905d7e4e6 print/cups/PLIST
--- a/print/cups/PLIST Tue Jan 22 22:54:01 2008 +0000
+++ b/print/cups/PLIST Tue Jan 22 23:58:13 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2007/06/06 11:14:27 markd Exp $
+@comment $NetBSD: PLIST,v 1.22 2008/01/22 23:58:13 markd Exp $
bin/cancel
bin/cups-config
bin/cupstestdsc
@@ -21,9 +21,9 @@
include/cups/image.h
include/cups/ipp.h
include/cups/language.h
-include/cups/md5.h
include/cups/ppd.h
include/cups/raster.h
+include/cups/sidechannel.h
include/cups/transcode.h
lib/libcups.la
lib/libcupsimage.la
@@ -59,6 +59,7 @@
libexec/cups/monitor/bcp
libexec/cups/monitor/tbcp
libexec/cups/notifier/mailto
+libexec/cups/notifier/rss
libexec/cups/notifier/testnotify
man/man1/cancel.1
man/man1/cups-config.1
@@ -88,9 +89,11 @@
man/man8/cups-lpd.8
man/man8/cups-polld.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/lpadmin.8
man/man8/lpc.8
man/man8/lpinfo.8
@@ -98,9 +101,11 @@
man/man8/reject.8
sbin/accept
sbin/cupsaddsmb
+sbin/cupsctl
sbin/cupsd
sbin/cupsdisable
sbin/cupsenable
+sbin/cupsfilter
sbin/lpadmin
sbin/lpc
sbin/lpinfo
@@ -149,32 +154,7 @@
share/cups/charmaps/windows-936.txt
share/cups/charmaps/windows-949.txt
share/cups/charmaps/windows-950.txt
-share/cups/charsets/iso-8859-1
-share/cups/charsets/iso-8859-10
-share/cups/charsets/iso-8859-13
-share/cups/charsets/iso-8859-14
-share/cups/charsets/iso-8859-15
-share/cups/charsets/iso-8859-2
-share/cups/charsets/iso-8859-3
-share/cups/charsets/iso-8859-4
-share/cups/charsets/iso-8859-5
-share/cups/charsets/iso-8859-6
-share/cups/charsets/iso-8859-7
-share/cups/charsets/iso-8859-8
-share/cups/charsets/iso-8859-9
-share/cups/charsets/koi8-r
-share/cups/charsets/koi8-u
share/cups/charsets/utf-8
-share/cups/charsets/windows-1250
-share/cups/charsets/windows-1251
-share/cups/charsets/windows-1252
-share/cups/charsets/windows-1253
-share/cups/charsets/windows-1254
-share/cups/charsets/windows-1255
-share/cups/charsets/windows-1256
-share/cups/charsets/windows-1257
-share/cups/charsets/windows-1258
-share/cups/charsets/windows-874
share/cups/data/HPGLprolog
share/cups/data/psglyphs
share/cups/data/testprint.ps
@@ -184,10 +164,10 @@
share/cups/fonts/Courier-Oblique
share/cups/fonts/Symbol
share/cups/model/deskjet.ppd
-share/cups/model/deskjet2.ppd
share/cups/model/dymo.ppd
share/cups/model/epson24.ppd
share/cups/model/epson9.ppd
+share/cups/model/intelbar.ppd
share/cups/model/laserjet.ppd
share/cups/model/okidat24.ppd
share/cups/model/okidata9.ppd
@@ -196,10 +176,12 @@
share/cups/model/stphoto.ppd
share/cups/model/stphoto2.ppd
share/cups/model/zebra.ppd
+share/cups/model/zebracpl.ppd
share/cups/model/zebraep1.ppd
share/cups/model/zebraep2.ppd
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
@@ -215,6 +197,7 @@
share/cups/templates/classes.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
@@ -242,6 +225,7 @@
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/maintenance.tmpl
share/cups/templates/de/modify-class.tmpl
share/cups/templates/de/modify-printer.tmpl
@@ -272,6 +256,8 @@
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
@@ -280,6 +266,7 @@
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
@@ -307,6 +294,7 @@
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/maintenance.tmpl
share/cups/templates/es/modify-class.tmpl
share/cups/templates/es/modify-printer.tmpl
@@ -338,6 +326,8 @@
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
@@ -466,6 +456,69 @@
share/cups/templates/fr/test-page.tmpl
share/cups/templates/fr/trailer.tmpl
share/cups/templates/fr/users.tmpl
+share/cups/templates/he/add-class.tmpl
+share/cups/templates/he/add-printer.tmpl
+share/cups/templates/he/admin.tmpl
+share/cups/templates/he/choose-device.tmpl
+share/cups/templates/he/choose-make.tmpl
+share/cups/templates/he/choose-model.tmpl
+share/cups/templates/he/choose-serial.tmpl
+share/cups/templates/he/choose-uri.tmpl
+share/cups/templates/he/class-added.tmpl
+share/cups/templates/he/class-confirm.tmpl
+share/cups/templates/he/class-deleted.tmpl
+share/cups/templates/he/class-jobs-header.tmpl
+share/cups/templates/he/class-modified.tmpl
+share/cups/templates/he/classes-header.tmpl
+share/cups/templates/he/classes.tmpl
+share/cups/templates/he/edit-config.tmpl
+share/cups/templates/he/error-op.tmpl
+share/cups/templates/he/error.tmpl
+share/cups/templates/he/header.tmpl
+share/cups/templates/he/help-header.tmpl
+share/cups/templates/he/help-printable.tmpl
+share/cups/templates/he/job-cancel.tmpl
+share/cups/templates/he/job-hold.tmpl
+share/cups/templates/he/job-move.tmpl
+share/cups/templates/he/job-moved.tmpl
+share/cups/templates/he/job-release.tmpl
+share/cups/templates/he/job-restart.tmpl
+share/cups/templates/he/jobs-header.tmpl
+share/cups/templates/he/jobs.tmpl
+share/cups/templates/he/maintenance.tmpl
+share/cups/templates/he/modify-class.tmpl
+share/cups/templates/he/modify-printer.tmpl
+share/cups/templates/he/norestart.tmpl
+share/cups/templates/he/option-boolean.tmpl
+share/cups/templates/he/option-conflict.tmpl
+share/cups/templates/he/option-header.tmpl
+share/cups/templates/he/option-pickmany.tmpl
+share/cups/templates/he/option-pickone.tmpl
+share/cups/templates/he/option-trailer.tmpl
+share/cups/templates/he/pager.tmpl
+share/cups/templates/he/printer-accept.tmpl
+share/cups/templates/he/printer-added.tmpl
+share/cups/templates/he/printer-configured.tmpl
+share/cups/templates/he/printer-confirm.tmpl
+share/cups/templates/he/printer-default.tmpl
+share/cups/templates/he/printer-deleted.tmpl
+share/cups/templates/he/printer-jobs-header.tmpl
+share/cups/templates/he/printer-modified.tmpl
+share/cups/templates/he/printer-purge.tmpl
+share/cups/templates/he/printer-reject.tmpl
+share/cups/templates/he/printer-start.tmpl
+share/cups/templates/he/printer-stop.tmpl
+share/cups/templates/he/printers-header.tmpl
+share/cups/templates/he/printers.tmpl
+share/cups/templates/he/restart.tmpl
+share/cups/templates/he/samba-export.tmpl
+share/cups/templates/he/samba-exported.tmpl
+share/cups/templates/he/search.tmpl
+share/cups/templates/he/set-printer-options-header.tmpl
+share/cups/templates/he/set-printer-options-trailer.tmpl
+share/cups/templates/he/test-page.tmpl
+share/cups/templates/he/trailer.tmpl
+share/cups/templates/he/users.tmpl
share/cups/templates/header.tmpl
share/cups/templates/help-header.tmpl
Home |
Main Index |
Thread Index |
Old Index