svn commit: r514488 - head/textproc/zxing-cpp

[Yuri Victorovich]

Author: yuri
Date: Tue Oct 15 01:55:13 2019
New Revision: 514488
URL: https://svnweb.freebsd.org/changeset/ports/514488

Log:
  textproc/zxing-cpp: Make OpenCV optional and off by default by adding the port option OPENCV
  
  While here add USE_LDCONFIG=yes that was missing.
  
  Reported by:	Leo Cherepanov <grey.leo at gmail.com>

Modified:
  head/textproc/zxing-cpp/Makefile
  head/textproc/zxing-cpp/distinfo
  head/textproc/zxing-cpp/pkg-plist

Modified: head/textproc/zxing-cpp/Makefile
==============================================================================
--- head/textproc/zxing-cpp/Makefile	Tue Oct 15 01:45:19 2019	(r514487)
+++ head/textproc/zxing-cpp/Makefile	Tue Oct 15 01:55:13 2019	(r514488)
@@ -3,7 +3,7 @@
 
 PORTNAME=	zxing-cpp
 DISTVERSION=	0.20190320
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
@@ -15,14 +15,21 @@ COMMENT=	ZXing C++ Library for QR code recognition
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libopencv_core.so:graphics/opencv-core \
-		libopencv_photo.so:graphics/opencv
-
 USES=		cmake compiler:c++11-lang iconv
 USE_GITHUB=	yes
 GH_ACCOUNT=	glassechidna
 GH_TAGNAME=	e0e40dd
+USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
+
+OPTIONS_DEFINE=		OPENCV # only one .cpp module in the project depends on OpenCV
+OPTIONS_SUB=		yes
+
+OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv-core \
+			libopencv_photo.so:graphics/opencv
+
+post-patch-OPENCV-off:
+	@${REINPLACE_CMD} 's|find_package(OpenCV)|#&|' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>

Modified: head/textproc/zxing-cpp/distinfo
==============================================================================
--- head/textproc/zxing-cpp/distinfo	Tue Oct 15 01:45:19 2019	(r514487)
+++ head/textproc/zxing-cpp/distinfo	Tue Oct 15 01:55:13 2019	(r514488)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1555794546
+TIMESTAMP = 1571103733
 SHA256 (glassechidna-zxing-cpp-0.20190320-e0e40dd_GH0.tar.gz) = 699ed1e08812631d40730bd96a7e314d1ad8adf28f45770d8ae8e57a536ba33b
 SIZE (glassechidna-zxing-cpp-0.20190320-e0e40dd_GH0.tar.gz) = 312377
 SHA256 (9e5dfa57f3b998bc3049bfa893b20e81dea656df.patch) = a9afdcaed3ac3026eb471e371431d23b9353a58807c7b5c863f33253f31f128b

Modified: head/textproc/zxing-cpp/pkg-plist
==============================================================================
--- head/textproc/zxing-cpp/pkg-plist	Tue Oct 15 01:45:19 2019	(r514487)
+++ head/textproc/zxing-cpp/pkg-plist	Tue Oct 15 01:55:13 2019	(r514488)
@@ -9,7 +9,7 @@ include/zxing/FormatException.h
 include/zxing/IllegalStateException.h
 include/zxing/InvertedLuminanceSource.h
 include/zxing/LuminanceSource.h
-include/zxing/MatSource.h
+%%OPENCV%%include/zxing/MatSource.h
 include/zxing/MultiFormatReader.h
 include/zxing/NotFoundException.h
 include/zxing/Reader.h
@@ -106,4 +106,3 @@ lib/libzxing.so
 lib/zxing/cmake/zxing-config.cmake
 lib/zxing/cmake/zxing-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/zxing/cmake/zxing-targets.cmake
-