Attachment #161836 for bug #203637

Lines 1-7 Link Here

(-)Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= epson-inkjet-printer-escpr	3	PORTNAME= epson-inkjet-printer-escpr
4	PORTVERSION= 1.5.2	4	PORTVERSION= 1.6.0
5	DISTVERSIONSUFFIX= -1lsb3.2	5	DISTVERSIONSUFFIX= -1lsb3.2
6	CATEGORIES= print	6	CATEGORIES= print
7	MASTER_SITES= LOCAL/hrs	7	MASTER_SITES= LOCAL/hrs

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz) = 9229aa8a033e97e29b0671082d08e1c56ebbee4e5adb2f350f81181835f06be8	1	SHA256 (epson-inkjet-printer-escpr-1.6.0-1lsb3.2.tar.gz) = 745aa837edfca269800d3c5fd2b81b40f4e3e9a316bc0c1a3e265260e3184f95
2	SIZE (epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz) = 2852564	2	SIZE (epson-inkjet-printer-escpr-1.6.0-1lsb3.2.tar.gz) = 3005609




--- 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"
+      AC_MSG_ERROR([CUPS_FILTER_DIR could not be found.])
    fi
 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"
+      AC_MSG_ERROR([CUPS_PPD_DIR could not be found.])
    fi
 else
    CUPS_PPD_DIR="${with_cupsppddir}"
@@ -87,6 +85,13 @@ fi
 AC_SUBST(CUPS_FILTER_DIR)
 AC_SUBST(CUPS_PPD_DIR)
 

 
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -96,11 +101,14 @@ AC_STRUCT_TM
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 

 AC_CHECK_HEADERS([\
         ctype.h \
         errno.h \
@@ -117,10 +125,6 @@ AC_CHECK_HEADERS([\
         unistd.h \
         ])
 

 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_MEMCMP
@@ -132,6 +136,16 @@ AC_CHECK_FUNCS([\
         strrchr \
         ])
 

Lines 1-4 Link Here

(-)files/patch-lib-epson-escpr-api-private.h (-1 / +1 lines)
1	--- lib/epson-escpr-api-private.h.orig 2015-09-22 12:16:47 UTC	1	--- lib/epson-escpr-api-private.h.orig 2015-10-01 04:30:19 UTC
2	+++ lib/epson-escpr-api-private.h	2	+++ lib/epson-escpr-api-private.h
3	@@ -0,0 +1,3 @@	3	@@ -0,0 +1,3 @@
4	+EPS_ERR_CODE SetupJobAttrib(const EPS_JOB_ATTRIB*);	4	+EPS_ERR_CODE SetupJobAttrib(const EPS_JOB_ATTRIB*);

Lines 1-6 Link Here

(-)files/patch-src-Makefile.am (-2 / +2 lines)
1	--- src/Makefile.am.orig 2014-07-29 03:00:06 UTC	1	--- src/Makefile.am.orig 2015-08-04 02:35:06 UTC
2	+++ src/Makefile.am	2	+++ src/Makefile.am
3	@@ -26,7 +26,11 @@ cupsfilter_PROGRAMS =\	3	@@ -28,7 +28,11 @@ cupsfilter_PROGRAMS =\
4	epson_escpr_wrapper_CFLAGS =\	4	epson_escpr_wrapper_CFLAGS =\
5	-Wall\	5	-Wall\
6	-DCUPS_FILTER_NAME=\"epson-escpr\" \	6	-DCUPS_FILTER_NAME=\"epson-escpr\" \

Lines 1-4 Link Here

(-)files/patch-src-filter.c (-1 / +1 lines)
1	--- src/filter.c.orig 2015-05-15 06:28:36 UTC	1	--- src/filter.c.orig 2015-09-02 06:47:47 UTC
2	+++ src/filter.c	2	+++ src/filter.c
3	@@ -35,6 +35,7 @@	3	@@ -35,6 +35,7 @@
4	#include "epson-escpr-media.h"	4	#include "epson-escpr-media.h"




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

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

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

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

Return to bug 203637

Lines 1-6 Link Here

(-)files/patch-configure.ac (-12 / +23 lines)
1	--- configure.ac.orig 2015-08-21 11:53:00.000000000 +0900	1	--- configure.ac.orig 2015-08-31 23:48:56 UTC
2	+++ configure.ac 2015-09-22 21:45:18.055998000 +0900	2	+++ configure.ac
3	@@ -58,7 +58,7 @@	3	@@ -58,9 +58,9 @@ AC_ARG_WITH([cupsfilterdir],
4	if test "xno" = "x${with_cupsfilterdir}"; then	4	if test "xno" = "x${with_cupsfilterdir}"; then
5	if test "xyes" = "x$have_cups_config" ; then	5	if test "xyes" = "x$have_cups_config" ; then
6	dnl `@<:@' , `@:>@' are replaced with `[' , `]'	6	dnl `@<:@' , `@:>@' are replaced with `[' , `]'
Lines 7-24 Link Here
7	- CUPS_FILTER_DIR="${cups_default_prefix}`cups-config --serverbin \| sed -e 's,^/@<:@^/@:>@@<:@^/@:>@*,,'`/filter"	7	- CUPS_FILTER_DIR="${cups_default_prefix}`cups-config --serverbin \| sed -e 's,^/@<:@^/@:>@@<:@^/@:>@*,,'`/filter"
8	+ CUPS_FILTER_DIR="`cups-config --serverbin`/filter"	8	+ CUPS_FILTER_DIR="`cups-config --serverbin`/filter"
9	else	9	else
10	CUPS_FILTER_DIR="${cups_default_prefix}/lib/cups/filter"	10	- CUPS_FILTER_DIR="${cups_default_prefix}/lib/cups/filter"
		11	+ AC_MSG_ERROR([CUPS_FILTER_DIR could not be found.])
11	fi	12	fi
12	@@ -76,7 +76,7 @@	13	else
13	CUPS_PPD_DIR="${cups_default_prefix}/share/ppd"	14	CUPS_FILTER_DIR="${with_cupsfilterdir}"
14	elif test "xyes" = "x$have_cups_config" ; then	15	@@ -72,13 +72,11 @@ AC_ARG_WITH([cupsppddir],
		16	[],
		17	[with_cupsppddir=no])
		18	if test "xno" = "x${with_cupsppddir}"; then
		19	- if test -d "${cups_default_prefix}/share/ppd" ; then
		20	- CUPS_PPD_DIR="${cups_default_prefix}/share/ppd"
		21	- elif test "xyes" = "x$have_cups_config" ; then
		22	+ if test "xyes" = "x$have_cups_config" ; then
15	dnl `@<:@' , `@:>@' are replaced with `[' , `]'	23	dnl `@<:@' , `@:>@' are replaced with `[' , `]'
16	- CUPS_PPD_DIR="${cups_default_prefix}/`cups-config --datadir \| sed -e 's,^/@<:@^/@:>@@<:@^/@:>@*,,'`/model"	24	- CUPS_PPD_DIR="${cups_default_prefix}/`cups-config --datadir \| sed -e 's,^/@<:@^/@:>@@<:@^/@:>@*,,'`/model"
17	+ CUPS_PPD_DIR="`cups-config --datadir`/model"	25	+ CUPS_PPD_DIR="`cups-config --datadir`/model"
18	else	26	else
19	CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model"	27	- CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model"
		28	+ AC_MSG_ERROR([CUPS_PPD_DIR could not be found.])
20	fi	29	fi
21	@@ -87,6 +87,13 @@	30	else
		31	CUPS_PPD_DIR="${with_cupsppddir}"
		32	@@ -87,6 +85,13 @@ fi
22	AC_SUBST(CUPS_FILTER_DIR)	33	AC_SUBST(CUPS_FILTER_DIR)
23	AC_SUBST(CUPS_PPD_DIR)	34	AC_SUBST(CUPS_PPD_DIR)
24		35
Lines 32-38 Link Here
32		43
33	dnl Checks for header files.	44	dnl Checks for header files.
34	AC_HEADER_STDC	45	AC_HEADER_STDC
35	@@ -96,11 +103,14 @@	46	@@ -96,11 +101,14 @@ AC_STRUCT_TM
36	AC_TYPE_PID_T	47	AC_TYPE_PID_T
37	AC_TYPE_SIZE_T	48	AC_TYPE_SIZE_T
38		49
Lines 47-53 Link Here
47	AC_CHECK_HEADERS([\	58	AC_CHECK_HEADERS([\
48	ctype.h \	59	ctype.h \
49	errno.h \	60	errno.h \
50	@@ -117,10 +127,6 @@	61	@@ -117,10 +125,6 @@ AC_CHECK_HEADERS([\
51	unistd.h \	62	unistd.h \
52	])	63	])
53		64
Lines 58-64 Link Here
58	# Checks for library functions.	69	# Checks for library functions.
59	AC_FUNC_MALLOC	70	AC_FUNC_MALLOC
60	AC_FUNC_MEMCMP	71	AC_FUNC_MEMCMP
61	@@ -132,6 +138,16 @@	72	@@ -132,6 +136,16 @@ AC_CHECK_FUNCS([\
62	strrchr \	73	strrchr \
63	])	74	])
64		75

Lines 35-40 Link Here

(-)pkg-plist (+9 lines)
35	share/cups/model/epson-inkjet-printer-escpr/Epson-E-830_Series-epson-escpr-en.ppd	35	share/cups/model/epson-inkjet-printer-escpr/Epson-E-830_Series-epson-escpr-en.ppd
36	share/cups/model/epson-inkjet-printer-escpr/Epson-E-840_Series-epson-escpr-en.ppd	36	share/cups/model/epson-inkjet-printer-escpr/Epson-E-840_Series-epson-escpr-en.ppd
37	share/cups/model/epson-inkjet-printer-escpr/Epson-E-850_Series-epson-escpr-en.ppd	37	share/cups/model/epson-inkjet-printer-escpr/Epson-E-850_Series-epson-escpr-en.ppd
		38	share/cups/model/epson-inkjet-printer-escpr/Epson-EP-10VA_Series-epson-escpr-en.ppd
38	share/cups/model/epson-inkjet-printer-escpr/Epson-EP-306_Series-epson-escpr-en.ppd	39	share/cups/model/epson-inkjet-printer-escpr/Epson-EP-306_Series-epson-escpr-en.ppd
39	share/cups/model/epson-inkjet-printer-escpr/Epson-EP-4004-epson-escpr-en.ppd	40	share/cups/model/epson-inkjet-printer-escpr/Epson-EP-4004-epson-escpr-en.ppd
40	share/cups/model/epson-inkjet-printer-escpr/Epson-EP-702A-epson-escpr-en.ppd	41	share/cups/model/epson-inkjet-printer-escpr/Epson-EP-702A-epson-escpr-en.ppd
Lines 165-170 Link Here
165	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M741F-epson-escpr-en.ppd	166	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M741F-epson-escpr-en.ppd
166	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M840F-epson-escpr-en.ppd	167	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M840F-epson-escpr-en.ppd
167	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M840FX-epson-escpr-en.ppd	168	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M840FX-epson-escpr-en.ppd
		169	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-M860F-epson-escpr-en.ppd
168	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S05_Series-epson-escpr-en.ppd	170	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S05_Series-epson-escpr-en.ppd
169	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S350-epson-escpr-en.ppd	171	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S350-epson-escpr-en.ppd
170	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S5040-epson-escpr-en.ppd	172	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S5040-epson-escpr-en.ppd
Lines 174-179 Link Here
174	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S740-epson-escpr-en.ppd	176	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S740-epson-escpr-en.ppd
175	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S840-epson-escpr-en.ppd	177	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S840-epson-escpr-en.ppd
176	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S840X-epson-escpr-en.ppd	178	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S840X-epson-escpr-en.ppd
		179	share/cups/model/epson-inkjet-printer-escpr/Epson-PX-S860-epson-escpr-en.ppd
177	share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_500-epson-escpr-en.ppd	180	share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_500-epson-escpr-en.ppd
178	share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_Deluxe-epson-escpr-en.ppd	181	share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_Deluxe-epson-escpr-en.ppd
179	share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_Express-epson-escpr-en.ppd	182	share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_Express-epson-escpr-en.ppd
Lines 401-406 Link Here
401	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-4590_Series-epson-escpr-en.ppd	404	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-4590_Series-epson-escpr-en.ppd
402	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-4592_Series-epson-escpr-en.ppd	405	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-4592_Series-epson-escpr-en.ppd
403	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-4595_Series-epson-escpr-en.ppd	406	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-4595_Series-epson-escpr-en.ppd
		407	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4011_Series-epson-escpr-en.ppd
		408	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4015_Series-epson-escpr-en.ppd
		409	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4095_Series-epson-escpr-en.ppd
		410	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4521_Series-epson-escpr-en.ppd
		411	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4525_Series-epson-escpr-en.ppd
		412	share/cups/model/epson-inkjet-printer-escpr/Epson-WP-M4595_Series-epson-escpr-en.ppd
404	share/cups/model/epson-inkjet-printer-escpr/Epson-WorkForce_310-epson-escpr-en.ppd	413	share/cups/model/epson-inkjet-printer-escpr/Epson-WorkForce_310-epson-escpr-en.ppd
405	share/cups/model/epson-inkjet-printer-escpr/Epson-WorkForce_320-epson-escpr-en.ppd	414	share/cups/model/epson-inkjet-printer-escpr/Epson-WorkForce_320-epson-escpr-en.ppd
406	share/cups/model/epson-inkjet-printer-escpr/Epson-WorkForce_435-epson-escpr-en.ppd	415	share/cups/model/epson-inkjet-printer-escpr/Epson-WorkForce_435-epson-escpr-en.ppd