Index: branches/2018Q1/graphics/libraw/Makefile
===================================================================
--- branches/2018Q1/graphics/libraw/Makefile	(revision 462249)
+++ branches/2018Q1/graphics/libraw/Makefile	(revision 462250)
@@ -1,72 +1,75 @@
 # Created by: Sergey A. Osokin <osa@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libraw
-PORTVERSION=	0.18.5
+PORTVERSION=	0.18.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libraw.org/data/
 DISTNAME=	LibRaw-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Library for manipulating raw images
 
 LICENSE=	LGPL21 CDDL
 LICENSE_COMB=	dual
 
 USE_LDCONFIG=	yes
 USES=		cpe libtool localbase pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-examples
 INSTALL_TARGET=	install-strip
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		DEMOSAIC_PACK_GPL2 DEMOSAIC_PACK_GPL3 \
 			DOCS EXAMPLES JASPER JPEG LCMS2 OPENMP
 OPTIONS_DEFINE_i386=	OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=	JPEG LCMS2
 
 DEMOSAIC_PACK_GPL2_DESC=		GPLv2 demosaic pack
 DEMOSAIC_PACK_GPL2_CONFIGURE_OFF=	--disable-demosaic-pack-gpl2
 DEMOSAIC_PACK_GPL2_CONFIGURE_ON=	--enable-demosaic-pack-gpl2=../LibRaw-demosaic-pack-GPL2-${PORTVERSION}
 DEMOSAIC_PACK_GPL2_DISTFILES=		LibRaw-demosaic-pack-GPL2-${PORTVERSION}.tar.gz
 DEMOSAIC_PACK_GPL2_VARS=		LICENSE=GPLv2+ \
 					LICENSE_COMB=single
 
 DEMOSAIC_PACK_GPL3_DESC=		GPLv3 demosaic pack
 DEMOSAIC_PACK_GPL3_CONFIGURE_OFF=	--disable-demosaic-pack-gpl3
 DEMOSAIC_PACK_GPL3_CONFIGURE_ON=	--enable-demosaic-pack-gpl3=../LibRaw-demosaic-pack-GPL3-${PORTVERSION}
 DEMOSAIC_PACK_GPL3_DISTFILES=		LibRaw-demosaic-pack-GPL3-${PORTVERSION}.tar.gz
 DEMOSAIC_PACK_GPL3_VARS=		LICENSE=GPLv3+ \
 					LICENSE_COMB=single
 
 JASPER_CONFIGURE_ENABLE=		jasper
 JASPER_LIB_DEPENDS=			libjasper.so:graphics/jasper
 
 JPEG_CONFIGURE_ENABLE=			jpeg
 JPEG_USES=				jpeg
 
 LCMS2_CONFIGURE_ENABLE=			lcms
 LCMS2_LIB_DEPENDS=			liblcms2.so:graphics/lcms2
 
 OPENMP_DESC=				OpenMP support (implies GCC)
 OPENMP_CONFIGURE_ENABLE=		openmp
 OPENMP_USES=				compiler:openmp
 
 OPTIMIZED_CFLAGS_CFLAGS=		-O3
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/*.pc.in
 
 # Use "\*" instead of "." in COPYTREE_SHARE commands as "." has
 # the undesired effect of copying ".deps" directory
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: branches/2018Q1/graphics/libraw/distinfo
===================================================================
--- branches/2018Q1/graphics/libraw/distinfo	(revision 462249)
+++ branches/2018Q1/graphics/libraw/distinfo	(revision 462250)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1506714254
-SHA256 (LibRaw-0.18.5.tar.gz) = fa2a7d14d9dfaf6b368f958a76d79266b3f58c2bc367bebab56e11baa94da178
-SIZE (LibRaw-0.18.5.tar.gz) = 1280046
-SHA256 (LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz) = 2ae7923868c3e927eee72cf2e4d91384560b7cfe76a386ecf319c069d343c674
-SIZE (LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz) = 30449
-SHA256 (LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz) = b0ec998c4884cedd86a0627481a18144f0024a35c7a6fa5ae836182c16975c2b
-SIZE (LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz) = 38899
+TIMESTAMP = 1518696954
+SHA256 (LibRaw-0.18.7.tar.gz) = 87e347c261a8e87935d9a23afd750d27676b99f540e8552314d40db0ea315771
+SIZE (LibRaw-0.18.7.tar.gz) = 1280935
+SHA256 (LibRaw-demosaic-pack-GPL2-0.18.7.tar.gz) = 4264c6fb586dade28a3a05e46d2b189938700117cb91ec19c7f826b9c7b6b08a
+SIZE (LibRaw-demosaic-pack-GPL2-0.18.7.tar.gz) = 30659
+SHA256 (LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz) = dca6166456d73bf57be1102a6c46308da2f1969073f5af936c7dc85c33803de0
+SIZE (LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz) = 39229
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 462249)
+++ branches/2018Q1	(revision 462250)

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