Index: branches/2017Q1/print/hpijs/Makefile
===================================================================
--- branches/2017Q1/print/hpijs/Makefile	(revision 430747)
+++ branches/2017Q1/print/hpijs/Makefile	(revision 430748)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	hpijs
 PORTVERSION=	2.1.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	print
 MASTER_SITES=	SF/hpinkjet/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drivers and support resources for HP Inkjet Printers
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	hplip-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-cups-install
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 USES=		jpeg shebangfix
 SHEBANG_FILES=	foomatic-rip
 
 OPTIONS_DEFINE=	CUPS DOCS
 OPTIONS_DEFAULT=CUPS
 OPTIONS_SUB=	yes
 
 CUPS_RUN_DEPENDS=	foomatic-rip:print/cups-filters
 CUPS_USES_OFF=		ghostscript:run perl5
 
 post-patch:
 	@${REINPLACE_CMD} '/^docdir =/s|=.*|= ${DOCSDIR}|' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
Index: branches/2017Q1/print/hpijs/files/patch-dj3320.cpp
===================================================================
--- branches/2017Q1/print/hpijs/files/patch-dj3320.cpp	(nonexistent)
+++ branches/2017Q1/print/hpijs/files/patch-dj3320.cpp	(revision 430748)
@@ -0,0 +1,11 @@
+--- dj3320.cpp.orig	2005-08-22 18:47:00 UTC
++++ dj3320.cpp
+@@ -400,7 +400,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE 
+ {
+     DRIVER_ERROR err = NO_ERROR;
+     BYTE byDevIDBuffer[DevIDBuffSize];
+-    char *pcStr = NULL;
++    const char *pcStr = NULL;
+     BYTE byStatus1, byStatus2;
+ 
+     memset(byDevIDBuffer, 0, sizeof(byDevIDBuffer));

Property changes on: branches/2017Q1/print/hpijs/files/patch-dj3320.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q1/print/hpijs/files/patch-registry.cpp
===================================================================
--- branches/2017Q1/print/hpijs/files/patch-registry.cpp	(nonexistent)
+++ branches/2017Q1/print/hpijs/files/patch-registry.cpp	(revision 430748)
@@ -0,0 +1,11 @@
+--- registry.cpp.orig	2005-08-22 18:47:00 UTC
++++ registry.cpp
+@@ -246,7 +246,7 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
+             device = eDJ3320;
+             match = TRUE;
+         }
+-		char	*cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
++		const char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
+ 		if (!cmdStr)
+ 		{
+ 			cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");

Property changes on: branches/2017Q1/print/hpijs/files/patch-registry.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 430747)
+++ branches/2017Q1	(revision 430748)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r430521