From owner-svn-ports-all@freebsd.org Sat Apr 13 01:04:48 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11FD4154EF40; Sat, 13 Apr 2019 01:04:48 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A863094E8C; Sat, 13 Apr 2019 01:04:47 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67A5816FD; Sat, 13 Apr 2019 01:04:47 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3D14ltf026304; Sat, 13 Apr 2019 01:04:47 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3D14j9n026295; Sat, 13 Apr 2019 01:04:45 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201904130104.x3D14j9n026295@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 13 Apr 2019 01:04:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498786 - in head/print/epson-inkjet-printer-escpr: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/print/epson-inkjet-printer-escpr: . files X-SVN-Commit-Revision: 498786 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A863094E8C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 01:04:48 -0000 Author: swills Date: Sat Apr 13 01:04:45 2019 New Revision: 498786 URL: https://svnweb.freebsd.org/changeset/ports/498786 Log: print/epson-inkjet-printer-escpr: Update to 1.6.38 PR: 236796 Submitted by: Tatsuki Makino (maintainer) Added: head/print/epson-inkjet-printer-escpr/files/patch-lib_epson-typedefs.h (contents, props changed) Modified: head/print/epson-inkjet-printer-escpr/Makefile (contents, props changed) head/print/epson-inkjet-printer-escpr/distinfo (contents, props changed) head/print/epson-inkjet-printer-escpr/files/patch-configure.ac (contents, props changed) head/print/epson-inkjet-printer-escpr/files/patch-lib_epson-escpr-api.c (contents, props changed) head/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am (contents, props changed) head/print/epson-inkjet-printer-escpr/files/patch-src_filter.c (contents, props changed) head/print/epson-inkjet-printer-escpr/pkg-plist (contents, props changed) Modified: head/print/epson-inkjet-printer-escpr/Makefile ============================================================================== --- head/print/epson-inkjet-printer-escpr/Makefile Sat Apr 13 01:01:15 2019 (r498785) +++ head/print/epson-inkjet-printer-escpr/Makefile Sat Apr 13 01:04:45 2019 (r498786) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= epson-inkjet-printer-escpr -PORTVERSION= 1.6.33 +PORTVERSION= 1.6.38 DISTVERSIONSUFFIX= -1lsb3.2 CATEGORIES= print -MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/08/70/14/e33b7a89e843b3ac97dcab773f03fbac7769f147/ +MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/09/25/30/1b345288d691386af8a0314a9b11ecbc400522ec/ MAINTAINER= tatsuki_makino@hotmail.com COMMENT= Epson Inkjet Printer Driver (ESC/P-R) for Linux @@ -16,6 +16,7 @@ FETCH_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= autoreconf dos2unix gmake libtool USE_LDCONFIG= yes + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-lsb Modified: head/print/epson-inkjet-printer-escpr/distinfo ============================================================================== --- head/print/epson-inkjet-printer-escpr/distinfo Sat Apr 13 01:01:15 2019 (r498785) +++ head/print/epson-inkjet-printer-escpr/distinfo Sat Apr 13 01:04:45 2019 (r498786) @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1554865200 +SHA256 (epson-inkjet-printer-escpr-1.6.38-1lsb3.2.tar.gz) = 9b2ad2b2b47bbedb911b4389ea22ec0bda294ef77b44f7aeca152c3eb6b30dac +SIZE (epson-inkjet-printer-escpr-1.6.38-1lsb3.2.tar.gz) = 4471609 Modified: head/print/epson-inkjet-printer-escpr/files/patch-configure.ac ============================================================================== --- head/print/epson-inkjet-printer-escpr/files/patch-configure.ac Sat Apr 13 01:01:15 2019 (r498785) +++ head/print/epson-inkjet-printer-escpr/files/patch-configure.ac Sat Apr 13 01:04:45 2019 (r498786) @@ -1,4 +1,4 @@ ---- configure.ac.orig 2018-11-15 06:09:26 UTC +--- configure.ac.orig 2019-04-08 05:14:01 UTC +++ configure.ac @@ -58,9 +58,9 @@ AC_ARG_WITH([cupsfilterdir], if test "xno" = "x${with_cupsfilterdir}"; then @@ -29,10 +29,10 @@ fi else CUPS_PPD_DIR="${with_cupsppddir}" -@@ -100,6 +98,16 @@ esac],[lsb=true]) - AM_CONDITIONAL(LSB, test x$lsb = xtrue) +@@ -109,6 +107,16 @@ AC_ARG_WITH([internal], + AC_SUBST([INTERNAL_PPD]) + AC_SUBST([INTERNAL_PPD_OPTION]) - +if test "xyes" = "x$have_cups_config" ; then + CUPS_CPPFLAGS=`cups-config --cflags` + CUPS_LDFLAGS=`cups-config --ldflags` @@ -46,15 +46,15 @@ dnl Checks for header files. AC_HEADER_STDC AC_HEADER_STAT -@@ -107,17 +115,23 @@ AC_HEADER_TIME +@@ -116,17 +124,23 @@ AC_HEADER_TIME AC_STRUCT_TM AC_TYPE_PID_T AC_TYPE_SIZE_T +AC_TYPE_SSIZE_T -+ + +old_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CUPS_CPPFLAGS $CPPFLAGS" - ++ AC_CHECK_HEADERS([\ cups/cups.h \ cups/ppd.h \ @@ -71,20 +71,20 @@ signal.h \ stdarg.h \ stddef.h \ -@@ -128,21 +142,45 @@ AC_CHECK_HEADERS([\ +@@ -137,21 +151,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 libraries. +-AC_CHECK_LIB([cups], [ppdOpenFile]) +-AC_CHECK_LIB([cupsimage], [cupsRasterOpen]) +- # Checks for library functions. #AC_FUNC_MALLOC avoiding rpl_malloc stupidness AC_FUNC_MEMCMP Modified: head/print/epson-inkjet-printer-escpr/files/patch-lib_epson-escpr-api.c ============================================================================== --- head/print/epson-inkjet-printer-escpr/files/patch-lib_epson-escpr-api.c Sat Apr 13 01:01:15 2019 (r498785) +++ head/print/epson-inkjet-printer-escpr/files/patch-lib_epson-escpr-api.c Sat Apr 13 01:04:45 2019 (r498786) @@ -1,4 +1,4 @@ ---- lib/epson-escpr-api.c.orig 2017-03-24 04:35:04 UTC +--- lib/epson-escpr-api.c.orig 2019-04-08 01:01:18 UTC +++ lib/epson-escpr-api.c @@ -62,6 +62,7 @@ @@ -8,7 +8,7 @@ #include "epson-escpr-pvt.h" #include "epson-escpr-services.h" #include "epson-escpr-pm.h" -@@ -231,7 +232,7 @@ static const EPS_UINT8 PrintQualityCmd[] +@@ -231,7 +232,7 @@ static const EPS_UINT8 PrintQualityCmd[] = { /*** ESC/P-R Commands (Print Num) */ /*** -------------------------------------------------------------------------------*/ @@ -17,7 +17,7 @@ 0x1B, 'n', 0x02, 0x00, 0x00, 0x00, 's', 'e', 't', 'n', 0x00, 0x00}; -@@ -244,7 +245,7 @@ static const EPS_UINT8 PrintNumCmd2[] = +@@ -244,7 +245,7 @@ static const EPS_UINT8 PrintNumCmd2[] = { /*** ESC/P-R Commands (custom setting) */ /*** -------------------------------------------------------------------------------*/ @@ -26,7 +26,7 @@ 0x1B, 'm', 0x01, 0x00, 0x00, 0x00, 's', 'e', 't', 'c', 0x00 }; -@@ -4463,7 +4464,7 @@ EPS_UINT8 array4[4] = {0, 0, 0, 0} +@@ -4474,7 +4475,7 @@ EPS_UINT8 array4[4] = {0, 0, 0, 0}; /* Tempora /*======================================================================================*/ /*** Set up ESC/PR "Print Num" Command */ /*======================================================================================*/ Added: head/print/epson-inkjet-printer-escpr/files/patch-lib_epson-typedefs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/epson-inkjet-printer-escpr/files/patch-lib_epson-typedefs.h Sat Apr 13 01:04:45 2019 (r498786) @@ -0,0 +1,11 @@ +--- lib/epson-typedefs.h.orig 2019-04-08 01:01:26 UTC ++++ lib/epson-typedefs.h +@@ -41,7 +41,7 @@ extern "C" { + typedef unsigned char EPS_UINT8; /* unsigned 8-bit Min: 0 Max: 255 */ + typedef unsigned short EPS_UINT16; /* unsigned 16-bit Min: 0 Max: 65535 */ + typedef unsigned int EPS_UINT32; /* unsigned 32-bit Min: 0 Max: 4294967295 */ +-typedef signed char EPS_INT8; /* signed 8-bit Min: -128 Max: 127 */ ++typedef char EPS_INT8; /* signed 8-bit Min: -128 Max: 127 */ + typedef short EPS_INT16; /* signed 16-bit Min: -32768 Max: 32767 */ + typedef int EPS_INT32; /* signed 32-bit Min:-2147483648 Max: 2147483647 */ + typedef float EPS_FLOAT; /* float 32-bit Min:3.4E-38 Max: 3.4E+38 */ Modified: head/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am ============================================================================== --- head/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am Sat Apr 13 01:01:15 2019 (r498785) +++ head/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am Sat Apr 13 01:04:45 2019 (r498786) @@ -1,6 +1,6 @@ ---- ppd/Makefile.am.orig 2018-11-15 06:21:39 UTC +--- ppd/Makefile.am.orig 2019-04-08 05:29:11 UTC +++ ppd/Makefile.am -@@ -596,8 +596,10 @@ EXTRA_DIST = $(cupsppd_DATA) +@@ -605,8 +605,10 @@ EXTRA_DIST = $(cupsppd_DATA) # LSBビルド環境の場合、~/.rpmmacros %adjust_ppds が担っている処理を実施 install-data-hook: Modified: head/print/epson-inkjet-printer-escpr/files/patch-src_filter.c ============================================================================== --- head/print/epson-inkjet-printer-escpr/files/patch-src_filter.c Sat Apr 13 01:01:15 2019 (r498785) +++ head/print/epson-inkjet-printer-escpr/files/patch-src_filter.c Sat Apr 13 01:04:45 2019 (r498786) @@ -1,4 +1,4 @@ ---- src/filter.c.orig 2018-03-08 04:25:24 UTC +--- src/filter.c.orig 2019-01-17 09:25:18 UTC +++ src/filter.c @@ -33,7 +33,10 @@ @@ -92,7 +92,7 @@ bandBmp.bits += band_line_count; } -@@ -880,7 +900,7 @@ EPS_INT32 print_spool_fnc(void* hParam, +@@ -880,7 +900,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT // fwrite (pBuf, cbBuf, 1, outfp); Modified: head/print/epson-inkjet-printer-escpr/pkg-plist ============================================================================== --- head/print/epson-inkjet-printer-escpr/pkg-plist Sat Apr 13 01:01:15 2019 (r498785) +++ head/print/epson-inkjet-printer-escpr/pkg-plist Sat Apr 13 01:04:45 2019 (r498786) @@ -79,6 +79,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EP-9 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-1110_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 @@ -87,7 +88,9 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2 share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2650_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2700_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2710_Series-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2720_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2750_Series-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2760_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 @@ -110,6 +113,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-L307 share/cups/model/epson-inkjet-printer-escpr/Epson-L3100_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-L3110_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-L3150_Series-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-L3160_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-L364_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-L385_Series-epson-escpr-en.ppd @@ -257,6 +261,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-Pict share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_PM_290-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_PM_300-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_PM_310-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-ST-2000_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-Stylus_CX2800-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-Stylus_CX2900-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-Stylus_CX3700-epson-escpr-en.ppd @@ -422,7 +427,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-WF-5 share/cups/model/epson-inkjet-printer-escpr/Epson-WF-5620_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-WF-5690_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-WF-6090_Series-epson-escpr-en.ppd -share/cups/model/epson-inkjet-printer-escpr/Epson-WF-6530-epson-escpr-en.ppd +share/cups/model/epson-inkjet-printer-escpr/Epson-WF-6530_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-WF-6590_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-WF-7110_Series-epson-escpr-en.ppd share/cups/model/epson-inkjet-printer-escpr/Epson-WF-7510_Series-epson-escpr-en.ppd