Index: branches/2019Q1/graphics/openjpeg/Makefile
===================================================================
--- branches/2019Q1/graphics/openjpeg/Makefile	(revision 497362)
+++ branches/2019Q1/graphics/openjpeg/Makefile	(revision 497363)
@@ -1,32 +1,33 @@
 # Created by: trasz <trasz@pin.if.uz.zgora.pl>
 # $FreeBSD$
 
 PORTNAME=	openjpeg
 PORTVERSION=	2.3.0
-PORTREVISION=	3
 DISTVERSIONPREFIX=	v
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Open-source JPEG 2000 codec
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake>=3:devel/cmake
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-USE_LDCONFIG=	yes
 USES=		cmake cpe pkgconfig
+
+USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} VER=${PORTVERSION:R}
 
 GH_ACCOUNT=	uclouvain
 USE_GITHUB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
Index: branches/2019Q1/graphics/openjpeg/files/patch-src-lib-openjp2-t1.c
===================================================================
--- branches/2019Q1/graphics/openjpeg/files/patch-src-lib-openjp2-t1.c	(nonexistent)
+++ branches/2019Q1/graphics/openjpeg/files/patch-src-lib-openjp2-t1.c	(revision 497363)
@@ -0,0 +1,24 @@
+Obtained from:	https://github.com/uclouvain/openjpeg/commit/d6b8aed5612e6be6d3a4053867fbd2ae0cb7c8af
+
+--- src/lib/openjp2/t1.c.orig	2017-10-04 22:23:14 UTC
++++ src/lib/openjp2/t1.c
+@@ -2168,9 +2168,18 @@ OPJ_BOOL opj_t1_encode_cblks(opj_t1_t *t
+                         t1->data = tiledp;
+                         t1->data_stride = tile_w;
+                         if (tccp->qmfbid == 1) {
++                            /* Do multiplication on unsigned type, even if the
++                             * underlying type is signed, to avoid potential
++                             * int overflow on large value (the output will be
++                             * incorrect in such situation, but whatever...)
++                             * This assumes complement-to-2 signed integer
++                             * representation
++                             * Fixes https://github.com/uclouvain/openjpeg/issues/1053
++                             */
++                            OPJ_UINT32* OPJ_RESTRICT tiledp_u = (OPJ_UINT32*) tiledp;
+                             for (j = 0; j < cblk_h; ++j) {
+                                 for (i = 0; i < cblk_w; ++i) {
+-                                    tiledp[tileIndex] *= (1 << T1_NMSEDEC_FRACBITS);
++                                    tiledp_u[tileIndex] <<= T1_NMSEDEC_FRACBITS;
+                                     tileIndex++;
+                                 }
+                                 tileIndex += tileLineAdvance;

Property changes on: branches/2019Q1/graphics/openjpeg/files/patch-src-lib-openjp2-t1.c
___________________________________________________________________
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/2019Q1
===================================================================
--- branches/2019Q1	(revision 497362)
+++ branches/2019Q1	(revision 497363)

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