print/epson-inkjet-printer-escpr: update to 1.6.33

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

5 files changed, 89 insertions, 30 deletions

diff --git a/print/epson-inkjet-printer-escpr/Makefile b/print/epson-inkjet-printer-escpr/Makefile
index c05dd94f4cd5..71321fa75a1b 100644
--- a/print/epson-inkjet-printer-escpr/Makefile
+++ b/print/epson-inkjet-printer-escpr/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	epson-inkjet-printer-escpr
-PORTVERSION=	1.6.30
+PORTVERSION=	1.6.33
 DISTVERSIONSUFFIX=	-1lsb3.2
 CATEGORIES=	print
-MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/08/18/20/e94de600e28e510c1cfa158929d8b2c0aadc8aa0/
+MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/08/70/14/e33b7a89e843b3ac97dcab773f03fbac7769f147/
 
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	Epson Inkjet Printer Driver (ESC/P-R) for Linux
@@ -18,6 +18,7 @@ USES=		autoreconf dos2unix gmake libtool
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-lsb
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-message
 PORTDOCS=	AUTHORS COPYING NEWS README README.ja
diff --git a/print/epson-inkjet-printer-escpr/distinfo b/print/epson-inkjet-printer-escpr/distinfo
index b8739620e830..82008e250fa3 100644
--- a/print/epson-inkjet-printer-escpr/distinfo
+++ b/print/epson-inkjet-printer-escpr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538532000
-SHA256 (epson-inkjet-printer-escpr-1.6.30-1lsb3.2.tar.gz) = 22b8df9069ae4f63f6ee6203aa74fcbf04ab232043764ed90657c71ea7f31755
-SIZE (epson-inkjet-printer-escpr-1.6.30-1lsb3.2.tar.gz) = 4311820
+TIMESTAMP = 1545868800
+SHA256 (epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz) = f5c4f1084ec88f138309800dc030e93155890a30e8f9cbf0ede98488e1a172f3
+SIZE (epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz) = 4402012
diff --git a/print/epson-inkjet-printer-escpr/files/patch-configure.ac b/print/epson-inkjet-printer-escpr/files/patch-configure.ac
index e4ad45079a46..5daaa7369b99 100644
--- a/print/epson-inkjet-printer-escpr/files/patch-configure.ac
+++ b/print/epson-inkjet-printer-escpr/files/patch-configure.ac
@@ -1,11 +1,11 @@
---- configure.ac.orig	2018-03-08 02:38:54 UTC
+--- configure.ac.orig	2018-11-15 06:09:26 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"
++      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.])
@@ -21,68 +21,104 @@
 -   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"
+-      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)
+@@ -100,6 +98,16 @@ esac],[lsb=true])
+ AM_CONDITIONAL(LSB, test x$lsb = xtrue)
  
-+if test "xyes" = "x$have_cups_config"; then
+ 
++if test "xyes" = "x$have_cups_config" ; then
 +	CUPS_CPPFLAGS=`cups-config --cflags`
 +	CUPS_LDFLAGS=`cups-config --ldflags`
++else
++	CUPS_CPPFLAGS=
++	CUPS_LDFLAGS=
 +fi
-+
 +AC_SUBST(CUPS_CPPFLAGS)
 +AC_SUBST(CUPS_LDFLAGS)
- 
++
  dnl Checks for header files.
  AC_HEADER_STDC
-@@ -96,11 +101,14 @@ AC_STRUCT_TM
+ AC_HEADER_STAT
+@@ -107,17 +115,23 @@ AC_HEADER_TIME
+ AC_STRUCT_TM
  AC_TYPE_PID_T
  AC_TYPE_SIZE_T
- 
-+old_CPPFLAGS=$CPPFLAGS
++AC_TYPE_SSIZE_T
++
++old_CPPFLAGS="$CPPFLAGS"
 +CPPFLAGS="$CUPS_CPPFLAGS $CPPFLAGS"
+ 
  AC_CHECK_HEADERS([\
          cups/cups.h \
          cups/ppd.h \
          cups/raster.h \
          ])
-+CPPFLAGS=$old_CPPFLAGS
++
++CPPFLAGS="$old_CPPFLAGS"
++
  AC_CHECK_HEADERS([\
          ctype.h \
          errno.h \
-@@ -117,10 +125,6 @@ AC_CHECK_HEADERS([\
+         fcntl.h \
+-        malloc.h \
+         signal.h \
+         stdarg.h \
+         stddef.h \
+@@ -128,21 +142,45 @@ AC_CHECK_HEADERS([\
+         time.h \
          unistd.h \
          ])
- 
+-
 -# Checks for libraries.
 -AC_CHECK_LIB([cups], [ppdOpenFile])
 -AC_CHECK_LIB([cupsimage], [cupsRasterOpen])
--
++AC_CHECK_HEADERS([\
++        sys/ioctl.h \
++        sys/time.h \
++        termios.h \
++        ])
+ 
  # Checks for library functions.
- AC_FUNC_MALLOC
+ #AC_FUNC_MALLOC avoiding rpl_malloc stupidness
  AC_FUNC_MEMCMP
-@@ -132,6 +136,16 @@ AC_CHECK_FUNCS([\
+-AC_TYPE_SIGNAL
++#AC_TYPE_SIGNAL
+ AC_CHECK_FUNCS([\
+         memset \
+         strcspn \
+         strerror \
          strrchr \
          ])
- 
++AC_CHECK_FUNCS([\
++        atexit \
++        malloc \
++        memmove \
++        realloc \
++        select \
++        strchr \
++        strstr \
++        ])
++
 +# Checks for libraries.
-+old_CPPFLAGS=$CPPFLAGS
++AC_CHECK_LIB([pthread], [pthread_create])
++
++old_CPPFLAGS="$CPPFLAGS"
 +CPPFLAGS="$CUPS_CPPFLAGS $CPPFLAGS"
-+old_LDFLAGS=$LDFLAGS
++old_LDFLAGS="$LDFLAGS"
 +LDFLAGS="$CUPS_LDFLAGS $LDFLAGS"
++
 +AC_CHECK_LIB([cups], [ppdOpenFile])
 +AC_CHECK_LIB([cupsimage], [cupsRasterOpen])
-+LDFLAGS=$old_LDFLAGS
-+CPPFLAGS=$old_CPPFLAGS
 +
++LDFLAGS="$old_LDFLAGS"
++CPPFLAGS="$old_CPPFLAGS"
+ 
  AC_CONFIG_FILES([\
          Makefile \
-         epson-inkjet-printer-escpr.spec \
diff --git a/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am b/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am
new file mode 100644
index 000000000000..576a97da6f02
--- /dev/null
+++ b/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am
@@ -0,0 +1,18 @@
+--- ppd/Makefile.am.orig	2018-11-15 06:21:39 UTC
++++ ppd/Makefile.am
+@@ -596,8 +596,10 @@ EXTRA_DIST = $(cupsppd_DATA)
+ 
+ # LSBビルド環境の場合、~/.rpmmacros %adjust_ppds が担っている処理を実施
+ install-data-hook:
+-if LSB
+-else
+-	echo "Make CUPS filter paths in the PPDs absolute"
+-	sed -i 's,0 epson-escpr-wrapper,0 @CUPS_FILTER_DIR@/epson-escpr-wrapper,' $(DESTDIR)$(cupsppddir)/*.ppd
+-endif
++#if LSB
++#else
++#	echo "Make CUPS filter paths in the PPDs absolute"
++#	sed -i 's,0 epson-escpr-wrapper,0 @CUPS_FILTER_DIR@/epson-escpr-wrapper,' $(DESTDIR)$(cupsppddir)/*.ppd
++#endif
++	@echo "Make CUPS filter paths in the PPDs absolute"
++	$(SED) -i '' 's,0 epson-escpr-wrapper,0 @CUPS_FILTER_DIR@/epson-escpr-wrapper,' $(DESTDIR)$(cupsppddir)/*.ppd
diff --git a/print/epson-inkjet-printer-escpr/pkg-plist b/print/epson-inkjet-printer-escpr/pkg-plist
index 4fbeb142a05e..612378d3ee95 100644
--- a/print/epson-inkjet-printer-escpr/pkg-plist
+++ b/print/epson-inkjet-printer-escpr/pkg-plist
@@ -90,6 +90,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2710_Series-epson-escpr-en.
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2750_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4500_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4550_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4700_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-7700_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-7750_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-M1100_Series-epson-escpr-en.ppd
@@ -101,6 +102,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M770T_Series-epson-escpr-en
 share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M970A3T_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-L1110_Series-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-L3050_Series-epson-escpr-en.ppd
 share/cups/model/epson-inkjet-printer-escpr/Epson-L3060_Series-epson-escpr-en.ppd
@@ -122,11 +124,13 @@ 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-L495_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-L5190_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-L7160_Series-epson-escpr-en.ppd
+share/cups/model/epson-inkjet-printer-escpr/Epson-L7180_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
 share/cups/model/epson-inkjet-printer-escpr/Epson-L850_Series-epson-escpr-en.ppd