Date: Sun, 22 Dec 2013 18:16:00 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337207 - head/graphics/nomacs Message-ID: <201312221816.rBMIG09L067543@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd@tuxproject.de> (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 <bsd.port.options.mk> +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312221816.rBMIG09L067543>