Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Aug 2016 03:06:18 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r420443 - head/graphics/nomacs
Message-ID:  <201608190306.u7J36Ikq096224@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Fri Aug 19 03:06:18 2016
New Revision: 420443
URL: https://svnweb.freebsd.org/changeset/ports/420443

Log:
  graphics/nomacs: Fix build when RAW option turned off
  
  The opencv-core dependency is not limited to the RAW option.  The build
  fails in a clean jail if the RAW option is turned off due to the missing
  opencv dependency.  Change it to an unconditional LIB_DEPENDS to fix
  the build in the RAW-off configuration.
  
  PR:		202497
  Reported by:	serpent7776 (gmail)
  Approved by:	maintainer timeout / just-fix-it

Modified:
  head/graphics/nomacs/Makefile

Modified: head/graphics/nomacs/Makefile
==============================================================================
--- head/graphics/nomacs/Makefile	Fri Aug 19 02:52:24 2016	(r420442)
+++ head/graphics/nomacs/Makefile	Fri Aug 19 03:06:18 2016	(r420443)
@@ -2,7 +2,7 @@
 
 PORTNAME=	nomacs
 PORTVERSION=	2.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/nomacs/nomacs-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -13,8 +13,8 @@ COMMENT=	Small, fast, and free image vie
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
-		libsysinfo.so:devel/libsysinfo
-
+		libsysinfo.so:devel/libsysinfo \
+		libopencv_core.so:graphics/opencv-core
 USES=		cmake desktop-file-utils dos2unix pkgconfig tar:bzip2
 USE_QT4=	gui network linguist_build moc_build \
 		qmake_build rcc_build uic_build
@@ -27,14 +27,14 @@ WRKSRC=		${WRKTOP}/${WRKSUBDIR}
 OPTIONS_DEFINE=	RAW TIFF
 OPTIONS_DEFAULT=	RAW TIFF
 
-RAW_LIB_DEPENDS=	libraw.so:graphics/libraw \
-			libopencv_core.so:graphics/opencv-core
+RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
 RAW_CMAKE_OFF=		-DENABLE_RAW=0
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CMAKE_OFF=		-DENABLE_TIFF=0
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
+		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608190306.u7J36Ikq096224>