print/epson-inkjet-printer-escpr: 1.6.4 -> 1.6.9

- MASTER_SITE changed to LOCAL/pi for now
- corrections of brightness, contrast are halved
- saturation is precisely set

PR:		209221
Submitted by:	Tatsuki Makino <tatsuki_makino@hotmail.com> (maintainer)

8 files changed, 93 insertions, 25 deletions

diff --git a/print/epson-inkjet-printer-escpr/Makefile b/print/epson-inkjet-printer-escpr/Makefile
index 1f1449858fbd..f40920469f4b 100644
--- a/print/epson-inkjet-printer-escpr/Makefile
+++ b/print/epson-inkjet-printer-escpr/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	epson-inkjet-printer-escpr
-PORTVERSION=	1.6.4
+PORTVERSION=	1.6.9
 DISTVERSIONSUFFIX=	-1lsb3.2
-PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	LOCAL/hrs
+MASTER_SITES=	LOCAL/pi
 
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	Epson Inkjet Printer Driver (ESC/P-R) for Linux
diff --git a/print/epson-inkjet-printer-escpr/distinfo b/print/epson-inkjet-printer-escpr/distinfo
index 39189486de39..0d85c7294721 100644
--- a/print/epson-inkjet-printer-escpr/distinfo
+++ b/print/epson-inkjet-printer-escpr/distinfo
@@ -1,2 +1,3 @@
-SHA256 (epson-inkjet-printer-escpr-1.6.4-1lsb3.2.tar.gz) = 76c66461a30be82b9cc37d663147a72f488fe060ef54578120602bb87a3f7754
-SIZE (epson-inkjet-printer-escpr-1.6.4-1lsb3.2.tar.gz) = 3243924
+TIMESTAMP = 1475716808
+SHA256 (epson-inkjet-printer-escpr-1.6.9-1lsb3.2.tar.gz) = e76e019e5051bfdb6cde970346cab3518c192a8dd87d05f3f3af380ed4542970
+SIZE (epson-inkjet-printer-escpr-1.6.9-1lsb3.2.tar.gz) = 3625376
diff --git a/print/epson-inkjet-printer-escpr/files/patch-lib-Makefile.am b/print/epson-inkjet-printer-escpr/files/patch-lib-Makefile.am
index 8a2dccd74336..28f7586d776f 100644
--- a/print/epson-inkjet-printer-escpr/files/patch-lib-Makefile.am
+++ b/print/epson-inkjet-printer-escpr/files/patch-lib-Makefile.am
@@ -1,7 +1,7 @@
---- lib/Makefile.am.orig	2015-04-22 04:40:14 UTC
+--- lib/Makefile.am.orig	2016-06-29 23:57:44 UTC
 +++ lib/Makefile.am
-@@ -45,7 +45,7 @@ DEFINES 	    +=	-DGCOMSW_RAWFILE_SUPPORT
- 
+@@ -44,7 +44,7 @@ DEFINES 		+=	-DGCOMSW_ASYNCJOB_SUPPORT
+ DEFINES 	    +=	-DGCOMSW_RAWFILE_SUPPORT
  
  lib_LTLIBRARIES = libescpr.la
 -libescpr_la_CFLAGS = -Wall $(DEFINES)
@@ -9,7 +9,7 @@
  ## Make sure these will be cleaned even when they're not built by
  ## default.
  CLEANFILES = libescpr.la
-@@ -72,5 +72,5 @@ libescpr_la_SOURCES = \
+@@ -71,5 +71,5 @@ libescpr_la_SOURCES = \
  	epson-typedefs.h \
  	epson-usb.c epson-usb.h
  
diff --git a/print/epson-inkjet-printer-escpr/files/patch-lib_epson-escpr-api.c b/print/epson-inkjet-printer-escpr/files/patch-lib_epson-escpr-api.c
new file mode 100644
index 000000000000..d353a8395e0e
--- /dev/null
+++ b/print/epson-inkjet-printer-escpr/files/patch-lib_epson-escpr-api.c
@@ -0,0 +1,37 @@
+--- lib/epson-escpr-api.c.orig	2016-06-29 23:37:45 UTC
++++ lib/epson-escpr-api.c
+@@ -62,6 +62,7 @@
+ 
+ /*------------------------------------  Includes   -------------------------------------*/
+ /*******************************************|********************************************/
++#include <stddef.h>
+ #include "epson-escpr-pvt.h"
+ #include "epson-escpr-services.h"
+ #include "epson-escpr-pm.h"
+@@ -231,7 +232,7 @@ static const EPS_UINT8 PrintQualityCmd[]
+ 
+     /*** ESC/P-R Commands (Print Num)                                                   */
+     /*** -------------------------------------------------------------------------------*/
+-static const EPS_UINT8 PrintNumCmd[] = {
++static const EPS_UINT8 PrintNumCmd[] __unused = {
+ 	                        0x1B, 'n', 0x02, 0x00, 0x00, 0x00,
+                             's', 'e', 't', 'n',
+                             0x00, 0x00};
+@@ -244,7 +245,7 @@ static const EPS_UINT8 PrintNumCmd2[] = 
+ 
+     /*** ESC/P-R Commands (custom setting)                                              */
+     /*** -------------------------------------------------------------------------------*/
+-static const EPS_UINT8 CustomCmd[]       = {
++static const EPS_UINT8 CustomCmd[] __unused       = {
+ 	                        0x1B, 'm', 0x01, 0x00, 0x00, 0x00,
+                             's', 'e', 't', 'c',
+                             0x00 };
+@@ -4463,7 +4464,7 @@ EPS_UINT8       array4[4] = {0, 0, 0, 0}
+ /*======================================================================================*/
+ /*** Set up ESC/PR "Print Num" Command                                                  */
+ /*======================================================================================*/
+-static void    MakePageNumCmd (
++static void    __unused MakePageNumCmd (
+ 
+         EPS_UINT8*		pBuf
+ 
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 6960eaf68a3c..4e0c2df210aa 100644
--- a/print/epson-inkjet-printer-escpr/files/patch-src-filter.c
+++ b/print/epson-inkjet-printer-escpr/files/patch-src-filter.c
@@ -1,17 +1,17 @@
---- src/filter.c.orig	2015-09-02 06:47:47 UTC
+--- src/filter.c.orig	2016-02-29 04:28:11 UTC
 +++ src/filter.c
-@@ -35,8 +35,10 @@
- #include "epson-escpr-media.h"
+@@ -33,7 +33,10 @@
+ 
  #include "epson-protocol.h"
  #include "epson-escpr-api.h"
 +#include "epson-escpr-api-private.h"
- #include "epson-escpr-services.h"
++#include "epson-escpr-services.h"
  #include "epson-escpr-mem.h"
 +#include "epson-escpage.h"
  
  #include "err.h"
  #include "mem.h"
-@@ -45,6 +47,7 @@
+@@ -42,6 +45,7 @@
  #include "libprtX.h"
  #include "optBase.h"
  #include "linux_cmn.h"
@@ -19,7 +19,7 @@
  
  #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
  
-@@ -385,7 +388,7 @@ main (int argc, char *argv[])
+@@ -382,7 +386,7 @@ main (int argc, char *argv[])
  	}
  	
  	printJob.jobStatus = EPS_STATUS_ESTABLISHED;
@@ -28,7 +28,7 @@
  ///////////////////////////////////////////////////////////////////////////////////////////////////////////	
  
  	print_area_x = printJob.printableAreaWidth;
-@@ -416,7 +419,7 @@ main (int argc, char *argv[])
+@@ -411,7 +415,7 @@ main (int argc, char *argv[])
  	while ((read_page_no = read (STDIN_FILENO, &page_num, 1)) > 0)  // 最初に page番号を読み込み
  	{
  		long x_count, y_count;
@@ -37,7 +37,7 @@
  		y_count = 0;
  		band_line_count = 0;
  
-@@ -504,7 +507,11 @@ main (int argc, char *argv[])
+@@ -499,7 +503,11 @@ main (int argc, char *argv[])
  					pagebuf+= bandBmp.widthBytes;
  					posbuf+=bandBmp.widthBytes;
  
@@ -49,7 +49,7 @@
  					bandBmp.bits += band_line_count;
  					
  				}
-@@ -515,13 +522,17 @@ main (int argc, char *argv[])
+@@ -510,13 +518,17 @@ main (int argc, char *argv[])
  				memcpy(pagebuf, bandBmp.bits, bandBmp.widthBytes);
  				pagebuf+= bandBmp.widthBytes;
  				posbuf+= bandBmp.widthBytes;
@@ -68,7 +68,7 @@
  			for (revert = print_area_y; revert > 0; revert--)
  			{
  				if (3 != byte_par_pixel)
-@@ -665,7 +676,11 @@ main (int argc, char *argv[])
+@@ -660,7 +672,11 @@ main (int argc, char *argv[])
  #endif
  					debug_msg("printHeight = %d\n", printHeight);
  					debug_msg("widthByte = %d\n", bandBmp.widthBytes);
@@ -80,7 +80,7 @@
  					bandBmp.bits += band_line_count;
  				}
  				
-@@ -687,7 +702,11 @@ main (int argc, char *argv[])
+@@ -682,7 +698,11 @@ main (int argc, char *argv[])
  				fprintf(fp, "\n");
  				fclose(fp);
  #endif
@@ -92,7 +92,7 @@
  				bandBmp.bits += band_line_count;
  			}
  
-@@ -886,7 +905,7 @@ EPS_INT32 print_spool_fnc(void* hParam, 
+@@ -881,7 +901,7 @@ EPS_INT32 print_spool_fnc(void* hParam, 
  
  //	fwrite (pBuf, cbBuf, 1, outfp);
  
diff --git a/print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c b/print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c
new file mode 100644
index 000000000000..25a4fe061dc4
--- /dev/null
+++ b/print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c
@@ -0,0 +1,13 @@
+--- src/wrapper.c.orig	2015-10-23 07:16:10 UTC
++++ src/wrapper.c
+@@ -176,8 +176,8 @@ main (int argc, char *argv[])
+ 
+ 	int total_read = 0;
+ 	int total_read_cache = 0;
+-	char *page_raw;      //2ページ分のバッファ
+-	char *page_raw_cache;//2ページ分のキャッシュ
++	char *page_raw = NULL;      //2ページ分のバッファ
++	char *page_raw_cache = NULL;//2ページ分のキャッシュ
+ 
+ 	static BOOL first_fwrite = TRUE;
+ 	static BOOL cache_exist = FALSE;
diff --git a/print/epson-inkjet-printer-escpr/files/pkg-message.in b/print/epson-inkjet-printer-escpr/files/pkg-message.in
index 88036303679e..6c3f4580ad10 100644
--- a/print/epson-inkjet-printer-escpr/files/pkg-message.in
+++ b/print/epson-inkjet-printer-escpr/files/pkg-message.in
@@ -3,14 +3,10 @@ Examples to add printer for EP-803AW
 
 # The printer connected with USB cable (using ulpt0)
 
-chown :cups /dev/ulpt0
-chmod g+rw /dev/ulpt0
 lpadmin -p EPSON_EP-803AW -m "`lpinfo --make-and-model 'EPSON EP-803A' -m | cut -f 1 -d ' '`" -v 'usb:/dev/ulpt0' -D 'EPSON EP-803AW (ulpt0)' -E
 
 # The printer connected with USB cable (using unlpt0)
 
-chown :cups /dev/unlpt0
-chmod g+rw /dev/unlpt0
 lpadmin -p EPSON_EP-803AW -m "`lpinfo --make-and-model 'EPSON EP-803A' -m | cut -f 1 -d ' '`" -v 'usb:/dev/unlpt0' -D 'EPSON EP-803AW (unlpt0)' -E
 
 # The printer joined network (using LPD port)
diff --git a/print/epson-inkjet-printer-escpr/pkg-plist b/print/epson-inkjet-printer-escpr/pkg-plist
index f9aeb2834fbe..e2436e20ba81 100644
--- a/print/epson-inkjet-printer-escpr/pkg-plist
+++ b/print/epson-inkjet-printer-escpr/pkg-plist
@@ -37,6 +37,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-E-840_Series-epson-escpr-en.pp
 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-30VA_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
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-703A-epson-escpr-en.ppd
@@ -45,6 +46,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EP-705A_Series-epson-escpr-en.
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-706A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-707A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-708A_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-EP-709A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-774A-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-775A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-776A_Series-epson-escpr-en.ppd
@@ -71,6 +73,9 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EP-907F_Series-epson-escpr-en.
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-976A3_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-977A3_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-EP-978A3_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-EP-979A3_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-EP-M570T_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-ET-16500_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2500_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2550_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4500_Series-epson-escpr-en.ppd
@@ -78,11 +83,19 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4550_Series-epson-escpr-en.
 share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M660FT_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-K200-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-K300-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-L1455_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-L375_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-L380_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-L382_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-L385_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-L386_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-L455_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-L475_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-L485_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-L486_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-L565_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-L575_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-L605_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-L655_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-L805_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-L810_Series-epson-escpr-en.ppd
@@ -130,6 +143,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-PM-T990-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-PX-046A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-PX-047A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-PX-048A_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-PX-049A_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-PX-1600F-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-PX-1700F-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-PX-205_Series-epson-escpr-en.ppd
@@ -355,6 +369,8 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2540_Series-epson-escpr-en.
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2630_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2650_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2660_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2750_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2760_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-3010_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-3520_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-3530_Series-epson-escpr-en.ppd
@@ -445,6 +461,8 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-XP-215_217_Series-epson-escpr-
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-220_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-225_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-235_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-XP-240_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-XP-243_245_247_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-300_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-302_303_305_306_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-310_Series-epson-escpr-en.ppd
@@ -453,6 +471,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-XP-320_Series-epson-escpr-en.p
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-322_323_325_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-330_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-332_335_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-XP-342_343_345_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-400_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-402_403_405_406_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-410_Series-epson-escpr-en.ppd
@@ -461,6 +480,8 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-XP-420_Series-epson-escpr-en.p
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-422_423_425_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-430_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-432_435_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-XP-440_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-XP-442_445_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-510_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-520_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-530_Series-epson-escpr-en.ppd
@@ -480,5 +501,6 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-XP-820_Series-epson-escpr-en.p
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-830_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-850_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-860_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-XP-900_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-950_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-XP-960_Series-epson-escpr-en.ppd