From owner-svn-ports-all@freebsd.org Fri Aug 19 03:06:19 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BACBDBBF204; Fri, 19 Aug 2016 03:06:19 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7243F1CC0; Fri, 19 Aug 2016 03:06:19 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7J36IG5096225; Fri, 19 Aug 2016 03:06:18 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7J36Ikq096224; Fri, 19 Aug 2016 03:06:18 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201608190306.u7J36Ikq096224@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 19 Aug 2016 03:06:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420443 - head/graphics/nomacs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 03:06:19 -0000 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