aboutsummaryrefslogtreecommitdiff
path: root/graphics/nomacs
diff options
context:
space:
mode:
authorDanilo Egea Gondolfo <danilo@FreeBSD.org>2013-12-22 18:16:00 +0000
committerDanilo Egea Gondolfo <danilo@FreeBSD.org>2013-12-22 18:16:00 +0000
commitdc0365bcf346eb8bd56255bf888f3f295fd2a2ee (patch)
tree11db02669220e1292b97e124555be4dd42aae7b6 /graphics/nomacs
parentb7fb6909bde146849976e7f0f25f37f5a7f9a053 (diff)
downloadports-dc0365bcf346eb8bd56255bf888f3f295fd2a2ee.tar.gz
ports-dc0365bcf346eb8bd56255bf888f3f295fd2a2ee.zip
- 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)
Notes
Notes: svn path=/head/; revision=337207
Diffstat (limited to 'graphics/nomacs')
-rw-r--r--graphics/nomacs/Makefile24
-rw-r--r--graphics/nomacs/distinfo4
2 files changed, 9 insertions, 19 deletions
diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
index 44c8f5cb7052..93aea622733a 100644
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@@ -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}/graphics/exiv2 \
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
diff --git a/graphics/nomacs/distinfo b/graphics/nomacs/distinfo
index 74d77de67096..e5c6937640e1 100644
--- a/graphics/nomacs/distinfo
+++ b/graphics/nomacs/distinfo
@@ -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