Pullup ticket #4693 - requested by joerg

print/hpijs: build fix

Revisions pulled up:
- print/hpijs/Makefile                                          1.31
- print/hpijs/distinfo                                          1.11
- print/hpijs/patches/patch-djgenericvip.cpp                    1.1
- print/hpijs/patches/patch-hpijs.cpp                           1.1
- print/hpijs/patches/patch-ldlencap.h                          1.1
- print/hpijs/patches/patch-ljfastraster.cpp                    1.1
- print/hpijs/patches/patch-ljjetready.cpp                      1.1

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Sun Apr 26 13:28:23 UTC 2015

   Modified Files:
        pkgsrc/print/hpijs: Makefile distinfo
   Added Files:
        pkgsrc/print/hpijs/patches: patch-djgenericvip.cpp patch-hpijs.cpp
            patch-ldlencap.h patch-ljfastraster.cpp

   Log Message:
   Drop ONLY_FOR_COMPILER. Fix a bunch of warnings from clang, missing
   includes warranting a revision bump.

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Mon Apr 27 23:52:34 UTC 2015

   Modified Files:
        pkgsrc/print/hpijs: distinfo
   Added Files:
        pkgsrc/print/hpijs/patches: patch-ljjetready.cpp

   Log Message:
   Don't add incompatible redefines of jpeg functions.

6 files changed, 102 insertions, 1 deletions

diff --git a/print/hpijs/distinfo b/print/hpijs/distinfo
index 2326f4f7368..63c591ed4f4 100644
--- a/print/hpijs/distinfo
+++ b/print/hpijs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/01/29 01:51:23 gavan Exp $
+$NetBSD: distinfo,v 1.9.78.1 2015/05/03 04:46:11 hiramatsu Exp $
 
 SHA1 (hpijs-2.1.4.tar.gz) = 8b8baa2d410f8918ae2b8381811983c923b29703
 RMD160 (hpijs-2.1.4.tar.gz) = b498a578d89bdd2dcc12d2df846f9950df67db8d
@@ -6,3 +6,8 @@ Size (hpijs-2.1.4.tar.gz) = 1928371 bytes
 SHA1 (patch-aa) = 1d89574d8f54cec6493304a663c0f546bd8df111
 SHA1 (patch-ab) = cf2224faf7bb81b6d656a3fe19c668413a54707c
 SHA1 (patch-ac) = b6bd6df7a30152df93d579e12d2b465f15c130c8
+SHA1 (patch-djgenericvip.cpp) = 1ad602d1086c7972e240646e5eaed199b60c63a5
+SHA1 (patch-hpijs.cpp) = 0be9dce9ba7470ff5ddf1d74a02e058aaea6605e
+SHA1 (patch-ldlencap.h) = e768093c0208f850ca0500259f8539dcf028be91
+SHA1 (patch-ljfastraster.cpp) = 34860e7daafcd47ae5a8506b477e320ee3f7eb2e
+SHA1 (patch-ljjetready.cpp) = 7a6ee8e7261a376e3ce53c4375ede2bb1b6f2b8c
diff --git a/print/hpijs/patches/patch-djgenericvip.cpp b/print/hpijs/patches/patch-djgenericvip.cpp
new file mode 100644
index 00000000000..d472220fe9b
--- /dev/null
+++ b/print/hpijs/patches/patch-djgenericvip.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-djgenericvip.cpp,v 1.1.2.2 2015/05/03 04:46:11 hiramatsu Exp $
+
+--- djgenericvip.cpp.orig	2015-04-26 12:32:41.000000000 +0000
++++ djgenericvip.cpp
+@@ -371,7 +371,7 @@ BOOL DJGenericVIP::HagakiFeedPresent(BOO
+     // skip over ";S:<version=2bytes><topcover><inklid><duplexer>"
+     pStr += 8;
+     BYTE b = *pStr;
+-    return (b & 4 == 4);
++    return (b & 4) == 4;
+ }
+ 
+ #ifdef APDK_AUTODUPLEX
+@@ -402,7 +402,7 @@ BOOL DJGenericVIP::HagakiFeedDuplexerPre
+     // skip over ";S:<version=2bytes><topcover><inklid>"
+     pStr += 6;
+     BYTE b = *pStr;
+-    return (b & 4 == 4);
++    return (b & 4) == 4;
+ }
+ #endif
+ 
diff --git a/print/hpijs/patches/patch-hpijs.cpp b/print/hpijs/patches/patch-hpijs.cpp
new file mode 100644
index 00000000000..c387f99608d
--- /dev/null
+++ b/print/hpijs/patches/patch-hpijs.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-hpijs.cpp,v 1.1.2.2 2015/05/03 04:46:11 hiramatsu Exp $
+
+--- hpijs.cpp.orig	2015-04-26 12:31:06.000000000 +0000
++++ hpijs.cpp
+@@ -56,8 +56,8 @@ int bug(const char *fmt, ...)
+    if ((n = vsnprintf(buf, 256, fmt, args)) == -1)
+       buf[255] = 0;     /* output was truncated */
+ 
+-   fprintf(stderr, buf);
+-   syslog(LOG_WARNING, buf);
++   fprintf(stderr, "%s", buf);
++   syslog(LOG_WARNING, "%s", buf);
+ 
+    fflush(stderr);
+    va_end(args);
+@@ -357,7 +357,7 @@ int hpijs_get_cb(void *get_cb_data, IjsS
+    }
+    else if (!strcmp (key, "ColorSpace"))
+    {
+-      return snprintf(value_buf, value_size, pSS->ph.cs);
++      return snprintf(value_buf, value_size, "%s", pSS->ph.cs);
+    }
+    else if (!strcmp (key, "PageImageFormat"))
+    {
diff --git a/print/hpijs/patches/patch-ldlencap.h b/print/hpijs/patches/patch-ldlencap.h
new file mode 100644
index 00000000000..2dfb407897a
--- /dev/null
+++ b/print/hpijs/patches/patch-ldlencap.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-ldlencap.h,v 1.1.2.2 2015/05/03 04:46:11 hiramatsu Exp $
+
+--- ldlencap.h.orig	2015-04-26 12:32:01.000000000 +0000
++++ ldlencap.h
+@@ -28,7 +28,7 @@
+   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   \***************************************************************************/
+ #ifndef _LDLENCAP
+-#define _LDLECNAP
++#define _LDLENCAP
+ 
+ // Wait times
+ #define PACKET_WAIT                 5
diff --git a/print/hpijs/patches/patch-ljfastraster.cpp b/print/hpijs/patches/patch-ljfastraster.cpp
new file mode 100644
index 00000000000..4739427b0a1
--- /dev/null
+++ b/print/hpijs/patches/patch-ljfastraster.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-ljfastraster.cpp,v 1.1.2.2 2015/05/03 04:46:11 hiramatsu Exp $
+
+--- ljfastraster.cpp.orig	2015-04-26 12:33:48.000000000 +0000
++++ ljfastraster.cpp
+@@ -412,13 +412,13 @@ DRIVER_ERROR HeaderLJFastRaster::SendCAP
+ //** this enumeration is for specifying the current color plane that is being
+ //** sent via fast raster path.  Toucan ordering is YMCK
+ 
+-typedef enum TonerColor
++typedef enum
+ {
+ 	eYellow = 0,
+ 	eMagenta,
+ 	eCyan,
+ 	eK
+-};
++} TonerColor;
+ 
+ typedef enum
+ {
diff --git a/print/hpijs/patches/patch-ljjetready.cpp b/print/hpijs/patches/patch-ljjetready.cpp
new file mode 100644
index 00000000000..0b4801e6b30
--- /dev/null
+++ b/print/hpijs/patches/patch-ljjetready.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-ljjetready.cpp,v 1.1.2.2 2015/05/03 04:46:11 hiramatsu Exp $
+
+--- ljjetready.cpp.orig	2015-04-27 23:38:32.000000000 +0000
++++ ljjetready.cpp
+@@ -801,12 +801,8 @@ extern "C"
+ {
+ void jpeg_finish_compress (j_compress_ptr cinfo);
+ JDIMENSION jpeg_write_scanlines (j_compress_ptr cinfo, JSAMPARRAY scanlines, JDIMENSION num_lines);
+-void jpeg_start_compress(struct jpeg_compress_struct *,unsigned char);
+-void jpeg_suppress_tables(struct jpeg_compress_struct *,unsigned char);
+-void jpeg_add_quant_table(struct jpeg_compress_struct *,int,unsigned int const *,int,unsigned char);
+ void jpeg_default_colorspace(struct jpeg_compress_struct *);
+ void jpeg_set_defaults(struct jpeg_compress_struct *);
+-void jpeg_CreateCompress(struct jpeg_compress_struct *,int,unsigned int);
+ void jpeg_destroy_compress(struct jpeg_compress_struct *);
+ void jpeg_buffer_dest (j_compress_ptr cinfo, JOCTET* outbuff, void* flush_output_buffer_callback);
+ struct jpeg_error_mgr * jpeg_std_error(struct jpeg_error_mgr * err);