Changes 2.0.5:

This is a bug fix release, addressing issues in Octave interface, newer compilers and with some HDR file formats.

5 files changed, 28 insertions, 20 deletions

diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 64a6e7b224a..a587add7ffd 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2016/07/09 06:38:22 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2017/02/12 21:50:17 adam Exp $
 
-DISTNAME=	pfstools-2.0.4
-PKGREVISION=	3
+DISTNAME=	pfstools-2.0.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pfstools/}
 EXTRACT_SUFX=	.tgz
@@ -17,7 +16,6 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		bash perl pkg-config
 CMAKE_ARGS+=		-DBASH_EXECUTABLE=${TOOLS_BASH}
 CMAKE_ARGS+=		-DPKGMANDIR=${PKGMANDIR}
-CMAKE_ARGS+=		-DWITH_FFTW=NO
 CMAKE_ARGS+=		-DWITH_MATLAB=NO
 CMAKE_ARGS+=		-DWITH_OpenCV=NO
 
@@ -43,6 +41,6 @@ SUBST_SED.perl=		-e 's,@PERL_PATH@,${PERL5},g'
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-#.include "../../math/fftw/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pfstools/PLIST b/graphics/pfstools/PLIST
index d7194b3c022..ec5843232c5 100644
--- a/graphics/pfstools/PLIST
+++ b/graphics/pfstools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/08/25 20:16:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/02/12 21:50:17 adam Exp $
 bin/dcraw2hdrgen
 bin/jpeg2hdrgen
 bin/pfsabsolute
@@ -15,8 +15,8 @@ bin/pfshdrcalibrate
 bin/pfsin
 bin/pfsindcraw
 bin/pfsinexr
-${PLIST.im}bin/pfsinimgmagick
 bin/pfsinhdrgen
+${PLIST.im}bin/pfsinimgmagick
 bin/pfsinme
 bin/pfsinpfm
 bin/pfsinppm
@@ -40,17 +40,18 @@ bin/pfsrotate
 bin/pfssize
 ${PLIST.octave}bin/pfsstat
 bin/pfstag
-${PLIST.qt}bin/pfsv
-${PLIST.qt}bin/pfsview
 bin/pfstmo_drago03
 bin/pfstmo_durand02
 bin/pfstmo_fattal02
+${PLIST.fftw}bin/pfstmo_ferradans11
 bin/pfstmo_mai11
 bin/pfstmo_mantiuk06
 bin/pfstmo_mantiuk08
 bin/pfstmo_pattanaik00
 bin/pfstmo_reinhard02
 bin/pfstmo_reinhard05
+${PLIST.qt}bin/pfsv
+${PLIST.qt}bin/pfsview
 include/pfs/array2d.h
 include/pfs/pfs.h
 lib/libpfs.a
@@ -106,6 +107,7 @@ man/man1/pfstag.1
 man/man1/pfstmo_drago03.1
 man/man1/pfstmo_durand02.1
 man/man1/pfstmo_fattal02.1
+${PLIST.fftw}man/man1/pfstmo_ferradans11.1
 man/man1/pfstmo_mai11.1
 man/man1/pfstmo_mantiuk06.1
 man/man1/pfstmo_mantiuk08.1
diff --git a/graphics/pfstools/buildlink3.mk b/graphics/pfstools/buildlink3.mk
index 24600026400..26e23581966 100644
--- a/graphics/pfstools/buildlink3.mk
+++ b/graphics/pfstools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/02/12 21:50:17 adam Exp $
 
 BUILDLINK_TREE+=	pfstools
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	pfstools
 PFSTOOLS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pfstools+=	pfstools>=1.7.0
-BUILDLINK_PKGSRCDIR.pfstools?=	../../graphics/pfstools
+BUILDLINK_PKGSRCDIR.pfstools?=		../../graphics/pfstools
 .endif # PFSTOOLS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-pfstools
diff --git a/graphics/pfstools/distinfo b/graphics/pfstools/distinfo
index d4936f74056..e2d6aec4ab8 100644
--- a/graphics/pfstools/distinfo
+++ b/graphics/pfstools/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 21:34:14 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/02/12 21:50:17 adam Exp $
 
-SHA1 (pfstools-2.0.4.tgz) = ef81ee0d55c68fe0925777da16d093f3a4616add
-RMD160 (pfstools-2.0.4.tgz) = 5c6e88c08a80b350cd9cb5a351b60381bd4e4928
-SHA512 (pfstools-2.0.4.tgz) = 6b1789b1c2d9d53e808b52cb3014be4610584a038ef2b56eaf6666496d178fc903dca68b77933f13f128fb1d0b13a53e15f9360914d7e01261b929ece2260c68
-Size (pfstools-2.0.4.tgz) = 581653 bytes
+SHA1 (pfstools-2.0.5.tgz) = 69e01a1079f7a0d764022d59f1463c775c2ad8f5
+RMD160 (pfstools-2.0.5.tgz) = 01679b504f7e8697cc7225878173e52e6c691865
+SHA512 (pfstools-2.0.5.tgz) = 6aec71369f31b25443f11a6d715c43f82ac028cbe2472d1515c6a6fde7afaa32f8fd5856d8330481481e6c84d89b72077edf4d90012ff8e547f7f13b0fc110a4
+Size (pfstools-2.0.5.tgz) = 582119 bytes
 SHA1 (patch-CMakeLists.txt) = 344903c4b26414f75c415a0c00dd520e2d3641dc
 SHA1 (patch-src_octave_pfscrop) = 5291c0ffecb0cf04004c7460d0639618595a9b1a
diff --git a/graphics/pfstools/options.mk b/graphics/pfstools/options.mk
index d10be5a7958..4cedada0c85 100644
--- a/graphics/pfstools/options.mk
+++ b/graphics/pfstools/options.mk
@@ -1,16 +1,24 @@
-# $NetBSD: options.mk,v 1.4 2016/02/25 13:37:48 jperkin Exp $
+# $NetBSD: options.mk,v 1.5 2017/02/12 21:50:17 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pfstools
-PKG_SUPPORTED_OPTIONS=	imagemagick octave qt opengl
+PKG_SUPPORTED_OPTIONS=	fftw imagemagick octave qt opengl
 
 PKG_SUGGESTED_OPTIONS.Darwin+=	opengl
 
-PLIST_VARS+=	im octave qt gl
+PLIST_VARS+=	fftw im octave qt gl
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mfftw)
+.include "../../math/fftwf/buildlink3.mk"
+PLIST.fftw=	yes
+CMAKE_ARGS+=	-DWITH_FFTW=YES
+.else
+CMAKE_ARGS+=	-DWITH_FFTW=NO
+.endif
+
 .if !empty(PKG_OPTIONS:Mimagemagick)
-.include "../../graphics/ImageMagick/buildlink3.mk"
+.include "../../graphics/ImageMagick6/buildlink3.mk"
 PLIST.im=	yes
 CMAKE_ARGS+=	-DWITH_ImageMagick=YES
 .else