diff options
7 files changed, 39 insertions, 19 deletions
diff --git a/print/epson-inkjet-printer-escpr/Makefile b/print/epson-inkjet-printer-escpr/Makefile index 5ac433c3eb44..310d7352934b 100644 --- a/print/epson-inkjet-printer-escpr/Makefile +++ b/print/epson-inkjet-printer-escpr/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= epson-inkjet-printer-escpr -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.0 DISTVERSIONSUFFIX= -1lsb3.2 CATEGORIES= print MASTER_SITES= LOCAL/hrs diff --git a/print/epson-inkjet-printer-escpr/distinfo b/print/epson-inkjet-printer-escpr/distinfo index 866fcd9fa77d..bcdf0f8b999f 100644 --- a/print/epson-inkjet-printer-escpr/distinfo +++ b/print/epson-inkjet-printer-escpr/distinfo @@ -1,2 +1,2 @@ -SHA256 (epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz) = 9229aa8a033e97e29b0671082d08e1c56ebbee4e5adb2f350f81181835f06be8 -SIZE (epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz) = 2852564 +SHA256 (epson-inkjet-printer-escpr-1.6.0-1lsb3.2.tar.gz) = 745aa837edfca269800d3c5fd2b81b40f4e3e9a316bc0c1a3e265260e3184f95 +SIZE (epson-inkjet-printer-escpr-1.6.0-1lsb3.2.tar.gz) = 3005609 diff --git a/print/epson-inkjet-printer-escpr/files/patch-configure.ac b/print/epson-inkjet-printer-escpr/files/patch-configure.ac index 2a0c57214f8a..5e91f7ba7f67 100644 --- a/print/epson-inkjet-printer-escpr/files/patch-configure.ac +++ b/print/epson-inkjet-printer-escpr/files/patch-configure.ac @@ -1,24 +1,35 @@ ---- configure.ac.orig 2015-08-21 11:53:00.000000000 +0900 -+++ configure.ac 2015-09-22 21:45:18.055998000 +0900 -@@ -58,7 +58,7 @@ +--- configure.ac.orig 2015-08-31 23:48:56 UTC ++++ configure.ac +@@ -58,9 +58,9 @@ AC_ARG_WITH([cupsfilterdir], if test "xno" = "x${with_cupsfilterdir}"; then if test "xyes" = "x$have_cups_config" ; then dnl `@<:@' , `@:>@' are replaced with `[' , `]' - CUPS_FILTER_DIR="${cups_default_prefix}`cups-config --serverbin | sed -e 's,^/@<:@^/@:>@@<:@^/@:>@*,,'`/filter" + CUPS_FILTER_DIR="`cups-config --serverbin`/filter" else - CUPS_FILTER_DIR="${cups_default_prefix}/lib/cups/filter" +- CUPS_FILTER_DIR="${cups_default_prefix}/lib/cups/filter" ++ AC_MSG_ERROR([CUPS_FILTER_DIR could not be found.]) fi -@@ -76,7 +76,7 @@ - CUPS_PPD_DIR="${cups_default_prefix}/share/ppd" - elif test "xyes" = "x$have_cups_config" ; then + else + CUPS_FILTER_DIR="${with_cupsfilterdir}" +@@ -72,13 +72,11 @@ AC_ARG_WITH([cupsppddir], + [], + [with_cupsppddir=no]) + if test "xno" = "x${with_cupsppddir}"; then +- if test -d "${cups_default_prefix}/share/ppd" ; then +- CUPS_PPD_DIR="${cups_default_prefix}/share/ppd" +- elif test "xyes" = "x$have_cups_config" ; then ++ if test "xyes" = "x$have_cups_config" ; then dnl `@<:@' , `@:>@' are replaced with `[' , `]' - CUPS_PPD_DIR="${cups_default_prefix}/`cups-config --datadir | sed -e 's,^/@<:@^/@:>@@<:@^/@:>@*,,'`/model" + CUPS_PPD_DIR="`cups-config --datadir`/model" else - CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model" +- CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model" ++ AC_MSG_ERROR([CUPS_PPD_DIR could not be found.]) fi -@@ -87,6 +87,13 @@ + else + CUPS_PPD_DIR="${with_cupsppddir}" +@@ -87,6 +85,13 @@ fi AC_SUBST(CUPS_FILTER_DIR) AC_SUBST(CUPS_PPD_DIR) @@ -32,7 +43,7 @@ dnl Checks for header files. AC_HEADER_STDC -@@ -96,11 +103,14 @@ +@@ -96,11 +101,14 @@ AC_STRUCT_TM AC_TYPE_PID_T AC_TYPE_SIZE_T @@ -47,7 +58,7 @@ AC_CHECK_HEADERS([\ ctype.h \ errno.h \ -@@ -117,10 +127,6 @@ +@@ -117,10 +125,6 @@ AC_CHECK_HEADERS([\ unistd.h \ ]) @@ -58,7 +69,7 @@ # Checks for library functions. AC_FUNC_MALLOC AC_FUNC_MEMCMP -@@ -132,6 +138,16 @@ +@@ -132,6 +136,16 @@ AC_CHECK_FUNCS([\ strrchr \ ]) diff --git a/print/epson-inkjet-printer-escpr/files/patch-lib-epson-escpr-api-private.h b/print/epson-inkjet-printer-escpr/files/patch-lib-epson-escpr-api-private.h index 6044b188572e..89b1a717c684 100644 --- a/print/epson-inkjet-printer-escpr/files/patch-lib-epson-escpr-api-private.h +++ b/print/epson-inkjet-printer-escpr/files/patch-lib-epson-escpr-api-private.h @@ -1,4 +1,4 @@ ---- lib/epson-escpr-api-private.h.orig 2015-09-22 12:16:47 UTC +--- lib/epson-escpr-api-private.h.orig 2015-10-01 04:30:19 UTC +++ lib/epson-escpr-api-private.h @@ -0,0 +1,3 @@ +EPS_ERR_CODE SetupJobAttrib(const EPS_JOB_ATTRIB*); diff --git a/print/epson-inkjet-printer-escpr/files/patch-src-Makefile.am b/print/epson-inkjet-printer-escpr/files/patch-src-Makefile.am index 0ac255c038af..a699e4a6adc4 100644 --- a/print/epson-inkjet-printer-escpr/files/patch-src-Makefile.am +++ b/print/epson-inkjet-printer-escpr/files/patch-src-Makefile.am @@ -1,6 +1,6 @@ ---- src/Makefile.am.orig 2014-07-29 03:00:06 UTC +--- src/Makefile.am.orig 2015-08-04 02:35:06 UTC +++ src/Makefile.am -@@ -26,7 +26,11 @@ cupsfilter_PROGRAMS =\ +@@ -28,7 +28,11 @@ cupsfilter_PROGRAMS =\ epson_escpr_wrapper_CFLAGS =\ -Wall\ -DCUPS_FILTER_NAME=\"epson-escpr\" \ diff --git a/print/epson-inkjet-printer-escpr/files/patch-src-filter.c b/print/epson-inkjet-printer-escpr/files/patch-src-filter.c index 3138d598248a..d2735b472576 100644 --- a/print/epson-inkjet-printer-escpr/files/patch-src-filter.c +++ b/print/epson-inkjet-printer-escpr/files/patch-src-filter.c @@ -1,4 +1,4 @@ ---- src/filter.c.orig 2015-05-15 06:28:36 UTC +--- src/filter.c.orig 2015-09-02 06:47:47 UTC +++ src/filter.c @@ -35,6 +35,7 @@ #include "epson-escpr-media.h" diff --git a/print/epson-inkjet-printer-escpr/pkg-plist b/print/epson-inkjet-printer-escpr/pkg-plist index 62a0afb8e207..8c590888b02e 100644 --- a/print/epson-inkjet-printer-escpr/pkg-plist +++ b/print/epson-inkjet-printer-escpr/pkg-plist @@ -35,6 +35,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-E-820-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-E-830_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-E-840_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-E-850_Series-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-EP-10VA_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-EP-306_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-EP-4004-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-EP-702A-epson-escpr-en.ppd @@ -165,6 +166,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M740F-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M741F-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M840F-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M840FX-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M860F-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S05_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S350-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S5040-epson-escpr-en.ppd @@ -174,6 +176,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S7050_Series-epson-escpr-en share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S740-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S840-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S840X-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S860-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_500-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_Deluxe-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_Express-epson-escpr-en.ppd @@ -401,6 +404,12 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-WP-4545_Series-epson-escpr-en. share/cups/model/epson-inkjet-printer-escpr/Epson-WP-4590_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-WP-4592_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-WP-4595_Series-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4011_Series-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4015_Series-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4095_Series-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4521_Series-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4525_Series-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4595_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-WorkForce_310-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-WorkForce_320-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-WorkForce_435-epson-escpr-en.ppd |