From owner-svn-ports-all@FreeBSD.ORG Sun Dec 22 18:16:00 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E263696C; Sun, 22 Dec 2013 18:16:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B4BDF1F0C; Sun, 22 Dec 2013 18:16:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMIG0ev067546; Sun, 22 Dec 2013 18:16:00 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMIG09L067543; Sun, 22 Dec 2013 18:16:00 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201312221816.rBMIG09L067543@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Sun, 22 Dec 2013 18:16:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337207 - 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.17 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: Sun, 22 Dec 2013 18:16:01 -0000 Author: danilo Date: Sun Dec 22 18:16:00 2013 New Revision: 337207 URL: http://svnweb.freebsd.org/changeset/ports/337207 Log: - Update from 1.6.0 to 1.6.2 while here - Convert USE_DOS2UNIX to USES - Convert all "if's" in options helpers PR: ports/185036 Submitted by: Jens K. Loewe (maintainer) Modified: head/graphics/nomacs/Makefile head/graphics/nomacs/distinfo Modified: head/graphics/nomacs/Makefile ============================================================================== --- head/graphics/nomacs/Makefile Sun Dec 22 18:10:52 2013 (r337206) +++ head/graphics/nomacs/Makefile Sun Dec 22 18:16:00 2013 (r337207) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= nomacs -PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTVERSION= 1.6.2 CATEGORIES= graphics MASTER_SITES= SF/nomacs/nomacs-${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -16,10 +15,9 @@ LIB_DEPENDS= libexiv2.so:${PORTSDIR}/gra libsysinfo.so:${PORTSDIR}/devel/libsysinfo USE_BZIP2= yes -USES= cmake desktop-file-utils pkgconfig +USES= cmake desktop-file-utils dos2unix pkgconfig USE_QT4= gui network linguist_build moc_build \ qmake_build rcc_build uic_build -USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.(cpp|h|txt) WRKTOP= ${WRKDIR} @@ -29,20 +27,12 @@ WRKSRC= ${WRKTOP}/${WRKSUBDIR} OPTIONS_DEFINE= RAW TIFF OPTIONS_DEFAULT= RAW TIFF -.include +RAW_LIB_DEPENDS= libraw.so:${PORTSDIR}/graphics/libraw \ + libopencv_core.so:${PORTSDIR}/graphics/opencv-core +RAW_CMAKE_OFF= -DENABLE_RAW=0 -.if ${PORT_OPTIONS:MRAW} -LIB_DEPENDS+= libraw.so:${PORTSDIR}/graphics/libraw \ - libopencv_core.so:${PORTSDIR}/graphics/opencv-core -.else -CMAKE_ARGS+= -DENABLE_RAW=0 -.endif - -.if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff -.else -CMAKE_ARGS+= -DENABLE_TIFF=0 -.endif +TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff +TIFF_CMAKE_OFF= -DENABLE_TIFF=0 post-patch: @${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt Modified: head/graphics/nomacs/distinfo ============================================================================== --- head/graphics/nomacs/distinfo Sun Dec 22 18:10:52 2013 (r337206) +++ head/graphics/nomacs/distinfo Sun Dec 22 18:16:00 2013 (r337207) @@ -1,2 +1,2 @@ -SHA256 (nomacs-1.6.0-source.tar.bz2) = 39e25542c8cef90578864e2a2e98a8c6723872cddf82f12f17f6caf9b426683d -SIZE (nomacs-1.6.0-source.tar.bz2) = 1169739 +SHA256 (nomacs-1.6.2-source.tar.bz2) = c9a7bea91db1f12513b43d5d194009f9281f6084ffc30ceeadb5ec4a598a6c71 +SIZE (nomacs-1.6.2-source.tar.bz2) = 1168631