From 9f62986f9e94bfd89161348fedf01bad0afc3874 Mon Sep 17 00:00:00 2001 From: gdt Date: Thu, 12 Aug 2010 12:15:08 +0000 Subject: Update to 5.2.6: adds some Canon PIXMA printers adds some Epson printers adds some PCL laser printers changes definitions for some printers (ink choices) bugs fixes Finnish translation pkgsrc changes: Adjust comments. Add PRINT_PLIST_AWK pattern. --- print/gutenprint-lib/Makefile | 53 +++++++++++++++++++++++-------------------- print/gutenprint-lib/PLIST | 18 +++++++++++++-- print/gutenprint-lib/distinfo | 8 +++---- 3 files changed, 48 insertions(+), 31 deletions(-) (limited to 'print') diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile index cb6d81f0e37..4adbecf3255 100644 --- a/print/gutenprint-lib/Makefile +++ b/print/gutenprint-lib/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:15 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2010/08/12 12:15:08 gdt Exp $ -VERSION= 5.2.5 +VERSION= 5.2.6 DISTNAME= gutenprint-${VERSION} PKGNAME= gutenprint-lib-${VERSION} -PKGREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/} EXTRACT_SUFX= .tar.bz2 @@ -16,6 +15,10 @@ PREV_PKGPATH= print/gutenprint51-lib INSTALLVERSION= 5.2 PLIST_SUBST+= INSTALLVERSION=${INSTALLVERSION} +PRINT_PLIST_AWK+= { gsub("gutenprint/${INSTALLVERSION}", \ + "gutenprint/$${INSTALLVERSION}") } +PRINT_PLIST_AWK+= { gsub(".${INSTALLVERSION}$$", \ + ".$${INSTALLVERSION}") } PKG_DESTDIR_SUPPORT= user-destdir @@ -41,50 +44,50 @@ GNU_CONFIGURE= YES # XXX Make command.types be a CONF_FILE -# Adjust configure to disable components that we don't want. For -# components that should eventually be in split packages, we mark them -# as such. Related configure options are grouped together; for now we list -# many default options that probably will not be exercised. +# Adjust configure to disable components that we don't want. Note +# components that should eventually be in split packages. # GTK1 ui and gimp1 plugin. These are obsolete and will not # be supported. CONFIGURE_ARGS+= --disable-libgutenprintui CONFIGURE_ARGS+= --without-gimp -# CUP support. This should be in a split package -#CONFIGURE_ARGS+= --without-cups +# CUPS support, on by default. This should be in a split package. +#CONFIGURE_ARGS+= --with-cups #CONFIGURE_ARGS+= --enable-cups-1_2-enhancements -#CONFIGURE_ARGS+= --disable-cups-ppds +#CONFIGURE_ARGS+= --enable-cups-ppds +# TODO: check status of translated cups ppds #CONFIGURE_ARGS+= --disable-translated-cups-ppds -# Ghostscript support. This should be in split packages, if at all. +# Ghostscript support. This should be in a split package, if at all. CONFIGURE_ARGS+= --without-ghost -# GTK2 ui and gimp2 plugin -#CONFIGURE_ARGS+= --disable-libgutenprintui2 -#CONFIGURE_ARGS+= --without-gimp2 +# GTK2 ui, and gimp plugin +#CONFIGURE_ARGS+= --enable-libgutenprintui2 +#CONFIGURE_ARGS+= --with-gimp2 # By default, the gimp2 plugin is named gutenprint #CONFIGURE_ARGS+= --with-gimp2-as-gutenprint # Foomatic support. This should be in a split package, if at all. -CONFIGURE_ARGS+= --without-foomatic # split-pkg -#CONFIGURE_ARGS+= --with-foomatic3 # IN ABOVE +CONFIGURE_ARGS+= --without-foomatic +#CONFIGURE_ARGS+= --with-foomatic3 # Disable translated ppds. Without this option, there are dozens of # copies of each printer, differing in the CUPS UI only by a language # code. The awkwardness seems to outweigh the benefit. CONFIGURE_ARGS+= --without-translated-ppds -# Sample images. These are small so there seems to be no point in -# omitting them. -#CONFIGURE_ARGS+= --disable-samples # base +# Sample images are small so there seems to be no point in omitting +# them. +#CONFIGURE_ARGS+= --enable-samples -# escputil. This is a utility for epson printers. It should arguably -# be in a split package, but it is tiny so there is little point other -# than cleanliness. -#CONFIGURE_ARGS+= --disable-escputil -# XXX Something in gutenprint seems to use readline, but it's not clear why, -# so just disable it to reduce dependencies. +# escputil is a utility for Epson printers. It should arguably be in +# a split package, but it is so small that there is no point, and it's +# very useful. +#CONFIGURE_ARGS+= --enable-escputil + +# Something in gutenprint seems to use readline, but it's not clear +# why, so just disable it to reduce dependencies. CONFIGURE_ARGS+= --without-readline # test pattern generator. diff --git a/print/gutenprint-lib/PLIST b/print/gutenprint-lib/PLIST index 39c4160b6bf..da812107afc 100644 --- a/print/gutenprint-lib/PLIST +++ b/print/gutenprint-lib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2010/02/27 01:15:13 gdt Exp $ +@comment $NetBSD: PLIST,v 1.10 2010/08/12 12:15:08 gdt Exp $ bin/cups-calibrate bin/escputil bin/testpattern @@ -82,6 +82,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_gen2.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_pigment.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard_gen0.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/ultrachrome.xml @@ -95,6 +96,8 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd_cutter_roll_feed.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd_roll_feed.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cutter_roll_feed.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/default.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/pro3880.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/pro_cutter_roll_feed.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/pro_roll_feed.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/r1800.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/r2400.xml @@ -131,11 +134,13 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen4.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_pigment.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/picturemate_4.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/picturemate_6.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro3880_ultrachrome_k3v.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_gen1.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_gen2.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_pigment.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3v.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/r800.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard_gen0.xml @@ -146,6 +151,14 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/mediasizes/standard.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_0.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_1.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_10.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_100.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_101.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_102.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_103.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_104.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_105.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_106.xml +share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_107.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_11.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_12.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_13.xml @@ -243,7 +256,6 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_96.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_97.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_98.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_99.xml -share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_100.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/p1_5.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/picturemate.xml share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/standard.xml @@ -300,6 +312,8 @@ share/locale/en_GB/LC_MESSAGES/gutenprint.mo share/locale/en_GB/gutenprint_en_GB.po share/locale/es/LC_MESSAGES/gutenprint.mo share/locale/es/gutenprint_es.po +share/locale/fi/LC_MESSAGES/gutenprint.mo +share/locale/fi/gutenprint_fi.po share/locale/fr/LC_MESSAGES/gutenprint.mo share/locale/fr/gutenprint_fr.po share/locale/hu/LC_MESSAGES/gutenprint.mo diff --git a/print/gutenprint-lib/distinfo b/print/gutenprint-lib/distinfo index 77f10f4827d..295a737e6e7 100644 --- a/print/gutenprint-lib/distinfo +++ b/print/gutenprint-lib/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2010/02/18 01:06:49 gdt Exp $ +$NetBSD: distinfo,v 1.8 2010/08/12 12:15:08 gdt Exp $ -SHA1 (gutenprint-5.2.5.tar.bz2) = 380d9f870e7f12088fc5dffac02413cae9a9ccb4 -RMD160 (gutenprint-5.2.5.tar.bz2) = cd88cd3ffc28fcc54e1de94d2f5ee069102d23a6 -Size (gutenprint-5.2.5.tar.bz2) = 5215539 bytes +SHA1 (gutenprint-5.2.6.tar.bz2) = 9fbe1ab899d5e83f34e21534cc5c1b8921c9039b +RMD160 (gutenprint-5.2.6.tar.bz2) = ede2dea11742c77fede450880685efcde3a91967 +Size (gutenprint-5.2.6.tar.bz2) = 5283223 bytes SHA1 (patch-aa) = b085bcf736d230c7f05d7b27bd1831165f958579 SHA1 (patch-ab) = bc9633845555e1bfeeddb94eb1b45353dd96ba7b -- cgit v1.2.3