pfstools 2.0.4

        * fixed: added installation of octave-based scripts: pfsoctavelum pfsoctavergb pfsstat
        * fixed: libraries installed in lib64 if needed (thanks to Orion for the patch)
        * fixed: added "so" version to the pfs.so library (thanks to Orion for the patch)
        * fixed: Replaced depreciated OctaveMap for compatibility with octave 4.0.0

7 files changed, 152 insertions, 94 deletions

diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 7843b4e3ec1..b4dee2fb94a 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -1,33 +1,47 @@
-# $NetBSD: Makefile,v 1.35 2015/08/17 17:11:24 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.36 2015/08/25 20:16:31 adam Exp $
 
-DISTNAME=	pfstools-1.7.0
-PKGREVISION=	32
+DISTNAME=	pfstools-2.0.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pfstools/}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pfstools.sourceforge.net/
 COMMENT=	Tools for manipulating HDR images and video frames
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
-
-CONFIGURE_ARGS+=	--enable-ppm
-CONFIGURE_ARGS+=	--enable-tiff
-CONFIGURE_ARGS+=	--disable-jpeghdr
-CONFIGURE_ARGS+=	--disable-matlab
-# patch-aa
-CONFIGURE_ENV+=		NETPBM_CFLAGS=-I${BUILDLINK_PREFIX.netpbm}/include/netpbm
+LICENSE=	gnu-lgpl-v2.1
+
+USE_CMAKE=		yes
+USE_LANGUAGES=		c c++
+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
 
 PKGCONFIG_OVERRIDE+=	src/pfs/pfs.pc.in
 
 DEPENDS+=	dcraw-[0-9]*:../../graphics/dcraw
 
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_MESSAGE.paths=	Fixing paths in CMake modules.
+SUBST_FILES.paths=	cmake/Find*.cmake
+SUBST_SED.paths=	-e 's,/usr/local,${LOCALBASE},g'
+
+SUBST_CLASSES+=		perl
+SUBST_STAGE.perl=	pre-configure
+SUBST_MESSAGE.perl=	Imprinting Perl path.
+SUBST_FILES.perl=	src/camera/pfsinhdrgen.in
+SUBST_SED.perl=		-e 's,@PERL_PATH@,${PERL5},g'
+
 .include "options.mk"
 
+.include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/netpbm/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/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 87d74a7a004..d7194b3c022 100644
--- a/graphics/pfstools/PLIST
+++ b/graphics/pfstools/PLIST
@@ -1,19 +1,23 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/08/25 20:16:31 adam Exp $
+bin/dcraw2hdrgen
+bin/jpeg2hdrgen
 bin/pfsabsolute
 bin/pfscat
 bin/pfsclamp
+bin/pfscolortransform
 bin/pfscut
 bin/pfsdisplayfunction
 bin/pfsextractchannels
 bin/pfsflip
 bin/pfsgamma
 ${PLIST.gl}bin/pfsglview
+bin/pfshdrcalibrate
 bin/pfsin
 bin/pfsindcraw
-${PLIST.exr}bin/pfsinexr
-${PLIST.gdal}bin/pfsingdal
+bin/pfsinexr
 ${PLIST.im}bin/pfsinimgmagick
-bin/pfsinmulti
+bin/pfsinhdrgen
+bin/pfsinme
 bin/pfsinpfm
 bin/pfsinppm
 bin/pfsinrgbe
@@ -21,8 +25,8 @@ bin/pfsintiff
 ${PLIST.octave}bin/pfsoctavelum
 ${PLIST.octave}bin/pfsoctavergb
 bin/pfsout
-${PLIST.exr}bin/pfsoutexr
-bin/pfsoutffmpeg
+bin/pfsoutexr
+${PLIST.im}bin/pfsouthdrhtml
 ${PLIST.im}bin/pfsoutimgmagick
 bin/pfsoutpfm
 bin/pfsoutppm
@@ -30,15 +34,26 @@ bin/pfsoutrgbe
 bin/pfsouttiff
 bin/pfspad
 bin/pfspanoramic
+bin/pfsplotresponse
+bin/pfsretime
 bin/pfsrotate
 bin/pfssize
 ${PLIST.octave}bin/pfsstat
 bin/pfstag
-${PLIST.qt}bin/pfsview
 ${PLIST.qt}bin/pfsv
-include/pfs-1.2/array2d.h
-include/pfs-1.2/pfs.h
-lib/libpfs-1.2.la
+${PLIST.qt}bin/pfsview
+bin/pfstmo_drago03
+bin/pfstmo_durand02
+bin/pfstmo_fattal02
+bin/pfstmo_mai11
+bin/pfstmo_mantiuk06
+bin/pfstmo_mantiuk08
+bin/pfstmo_pattanaik00
+bin/pfstmo_reinhard02
+bin/pfstmo_reinhard05
+include/pfs/array2d.h
+include/pfs/pfs.h
+lib/libpfs.a
 lib/pkgconfig/pfs.pc
 ${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsclose.oct
 ${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsget.oct
@@ -47,22 +62,25 @@ ${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsput.oct
 ${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsread.oct
 ${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfstransform_colorspace.oct
 ${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfswrite.oct
+man/man1/dcraw2hdrgen.1
+man/man1/jpeg2hdrgen.1
 man/man1/pfsabsolute.1
 man/man1/pfscat.1
 man/man1/pfsclamp.1
+man/man1/pfscolortransform.1
 man/man1/pfscut.1
 man/man1/pfsdisplayfunction.1
 man/man1/pfsextractchannels.1
 man/man1/pfsflip.1
 man/man1/pfsgamma.1
 ${PLIST.gl}man/man1/pfsglview.1
+man/man1/pfshdrcalibrate.1
 man/man1/pfsin.1
 man/man1/pfsindcraw.1
 man/man1/pfsinexr.1
-man/man1/pfsingdal.1
-man/man1/pfsinimgmagick.1
-man/man1/pfsinjpeghdr.1
-man/man1/pfsinmulti.1
+man/man1/pfsinhdrgen.1
+${PLIST.im}man/man1/pfsinimgmagick.1
+man/man1/pfsinme.1
 man/man1/pfsinpfm.1
 man/man1/pfsinppm.1
 man/man1/pfsinrgbe.1
@@ -71,21 +89,54 @@ ${PLIST.octave}man/man1/pfsoctavelum.1
 ${PLIST.octave}man/man1/pfsoctavergb.1
 man/man1/pfsout.1
 man/man1/pfsoutexr.1
-man/man1/pfsoutffmpeg.1
-man/man1/pfsoutimgmagick.1
-man/man1/pfsoutjpeghdr.1
+${PLIST.im}man/man1/pfsouthdrhtml.1
+${PLIST.im}man/man1/pfsoutimgmagick.1
 man/man1/pfsoutpfm.1
 man/man1/pfsoutppm.1
 man/man1/pfsoutrgbe.1
 man/man1/pfsouttiff.1
 man/man1/pfspad.1
 man/man1/pfspanoramic.1
+man/man1/pfsplotresponse.1
+man/man1/pfsretime.1
 man/man1/pfsrotate.1
 man/man1/pfssize.1
 ${PLIST.octave}man/man1/pfsstat.1
 man/man1/pfstag.1
+man/man1/pfstmo_drago03.1
+man/man1/pfstmo_durand02.1
+man/man1/pfstmo_fattal02.1
+man/man1/pfstmo_mai11.1
+man/man1/pfstmo_mantiuk06.1
+man/man1/pfstmo_mantiuk08.1
+man/man1/pfstmo_pattanaik00.1
+man/man1/pfstmo_reinhard02.1
+man/man1/pfstmo_reinhard05.1
 ${PLIST.qt}man/man1/pfsview.1
-${PLIST.qt}man/man1/pfsv.1
+${PLIST.im}share/pfstools/hdrhtml_c_b2.csv
+${PLIST.im}share/pfstools/hdrhtml_c_b3.csv
+${PLIST.im}share/pfstools/hdrhtml_c_b4.csv
+${PLIST.im}share/pfstools/hdrhtml_c_b5.csv
+${PLIST.im}share/pfstools/hdrhtml_default_templ/hdrhtml_image_templ.html
+${PLIST.im}share/pfstools/hdrhtml_default_templ/hdrhtml_page_templ.html
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_assets/hdr_viewer.css
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_assets/hdr_viewer.js
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_assets/information-red.png
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_assets/information.png
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_assets/loading-spinner.gif
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_assets/mootools-1.2.4.js
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_assets/mouse2touch.js
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_assets/slider-black.png
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_assets/slider-red.png
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_assets/slider-white.png
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_image_templ.html
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_image_templ_slider-above.html
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_page_templ.html
+${PLIST.im}share/pfstools/hdrhtml_hdrlabs_templ/hdrhtml_page_templ_short.html
+${PLIST.im}share/pfstools/hdrhtml_t_b2.csv
+${PLIST.im}share/pfstools/hdrhtml_t_b3.csv
+${PLIST.im}share/pfstools/hdrhtml_t_b4.csv
+${PLIST.im}share/pfstools/hdrhtml_t_b5.csv
 ${PLIST.octave}${OCT_LOCALVERFCNFILEDIR}/pfstools/pfs_close_frames.m
 ${PLIST.octave}${OCT_LOCALVERFCNFILEDIR}/pfstools/pfs_open_frames.m
 ${PLIST.octave}${OCT_LOCALVERFCNFILEDIR}/pfstools/pfs_read_luminance.m
diff --git a/graphics/pfstools/distinfo b/graphics/pfstools/distinfo
index c451971ffb7..51d667b0d5e 100644
--- a/graphics/pfstools/distinfo
+++ b/graphics/pfstools/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/18 12:46:39 obache Exp $
+$NetBSD: distinfo,v 1.2 2015/08/25 20:16:31 adam Exp $
 
-SHA1 (pfstools-1.7.0.tar.gz) = 46f89567f3c822f4fddf51214f62fa106efc0d5e
-RMD160 (pfstools-1.7.0.tar.gz) = be4c9f42ac59583ec69ec7d6330e0e1b6033a4ae
-Size (pfstools-1.7.0.tar.gz) = 611821 bytes
-SHA1 (patch-aa) = 01ea784a8db2d9f58ed0f5f7825e9ccc38103bcb
+SHA1 (pfstools-2.0.4.tgz) = ef81ee0d55c68fe0925777da16d093f3a4616add
+RMD160 (pfstools-2.0.4.tgz) = 5c6e88c08a80b350cd9cb5a351b60381bd4e4928
+Size (pfstools-2.0.4.tgz) = 581653 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 333736dc110..c938ade258f 100644
--- a/graphics/pfstools/options.mk
+++ b/graphics/pfstools/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2010/07/30 10:36:25 asau Exp $
+# $NetBSD: options.mk,v 1.3 2015/08/25 20:16:31 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pfstools
-PKG_SUPPORTED_OPTIONS=	gdal imagemagick openexr octave qt opengl
+PKG_SUPPORTED_OPTIONS=	imagemagick octave qt opengl
 
-PLIST_VARS+=	gdal im exr octave qt gl
+PLIST_VARS+=	im octave qt gl
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -13,28 +13,12 @@ PKG_SUGGESTED_OPTIONS+=	opengl
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mgdal)
-.include "../../geography/gdal-lib/buildlink3.mk"
-PLIST.gdal=	yes
-CONFIGURE_ARGS+=	--enable-gdal
-.else
-CONFIGURE_ARGS+=	--disable-gdal
-.endif
-
 .if !empty(PKG_OPTIONS:Mimagemagick)
 .include "../../graphics/ImageMagick/buildlink3.mk"
 PLIST.im=	yes
-CONFIGURE_ARGS+=	--enable-imagemagick
+CMAKE_ARGS+=	-DWITH_ImageMagick=YES
 .else
-CONFIGURE_ARGS+=	--disable-imagemagick
-.endif
-
-.if !empty(PKG_OPTIONS:Mopenexr)
-.include "../../graphics/openexr/buildlink3.mk"
-PLIST.exr=	yes
-CONFIGURE_ARGS+=	--enable-openexr
-.else
-CONFIGURE_ARGS+=	--disable-openexr
+CMAKE_ARGS+=	-DWITH_ImageMagick=NO
 .endif
 
 .if !empty(PKG_OPTIONS:Moctave)
@@ -45,28 +29,30 @@ REPLACE_OCTAVE+=	src/octave/pfsstat
 PLIST.octave=	yes
 PLIST_SUBST+=	OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR:S/${BUILDLINK_PREFIX.octave}\///}
 PLIST_SUBST+=	OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR:S/${BUILDLINK_PREFIX.octave}\///}
-USE_TOOLS+=	gmake
-USE_LANGUAGES+=	fortran77
-CONFIGURE_ARGS+=	--enable-octave
+CMAKE_ARGS+=	-DWITH_Octave=YES
 .else
-CONFIGURE_ARGS+=	--disable-octave
+CMAKE_ARGS+=	-DWITH_Octave=NO
 .endif
 
 .if !empty(PKG_OPTIONS:Mqt)
-.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
 PLIST.qt=	yes
-USE_TOOLS+=	gmake
-CONFIGURE_ARGS+=	--enable-qt
+CMAKE_ARGS+=	-DWITH_QT=YES
 .else
-CONFIGURE_ARGS+=	--disable-qt
+CMAKE_ARGS+=	-DWITH_QT=NO
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
 .  if ${OPSYS} != "Darwin"
 .include "../../graphics/glut/buildlink3.mk"
 .  endif
-CONFIGURE_ARGS+=	--enable-opengl
+# XXX nasty hack
+.  if ${OPSYS} == "NetBSD"
+CXXFLAGS+=	-lpthread
+.  endif
 PLIST.gl=	yes
+CMAKE_ARGS+=	-DWITH_pfsglview=YES
 .else
-CONFIGURE_ARGS+=	--disable-opengl
+CMAKE_ARGS+=	-DWITH_pfsglview=NO
 .endif
diff --git a/graphics/pfstools/patches/patch-CMakeLists.txt b/graphics/pfstools/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..88077c7a8d1
--- /dev/null
+++ b/graphics/pfstools/patches/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2015/08/25 20:16:31 adam Exp $
+
+Make use of PKGMANDIR.
+
+--- CMakeLists.txt.orig	2015-07-16 20:53:21.000000000 +0000
++++ CMakeLists.txt
+@@ -29,7 +29,7 @@ set (pfstools_VERSION_MINOR 0.0)
+ set (pfslib_version 1.2)
+ set(CMAKE_LEGACY_CYGWIN_WIN32 0)
+  
+-set (MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man/man1" CACHE PATH "The directory where the man pages are")
++set (MAN_DIR "${CMAKE_INSTALL_PREFIX}/${PKGMANDIR}/man1" CACHE PATH "The directory where the man pages are")
+ 
+ include( CheckCXXSourceCompiles )
+ 
diff --git a/graphics/pfstools/patches/patch-aa b/graphics/pfstools/patches/patch-aa
deleted file mode 100644
index b197e11d63d..00000000000
--- a/graphics/pfstools/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/18 12:46:39 obache Exp $
-
-Broken detection of header location of netpbm.
-Kill it and pass with CONFIGURE_ENV instead.
-
---- configure.orig	2008-10-14 22:39:03.000000000 +0000
-+++ configure
-@@ -19908,16 +19908,6 @@ fi
- 
- fi
- 
--if test "$ppm_support" = "yes"; then
--
--   NETPBM_PPMH=`find /usr/include /usr/local/include/ $CPATH -name ppm.h`
--   if test -n "$NETPBM_PPMH"; then
--        NETPBM_CFLAGS="-I ${NETPBM_PPMH%%ppm.h}"
--   else
--        ppm_support="no"
--   fi
--fi
--
- else
-   ppm_support="no"
- fi
diff --git a/graphics/pfstools/patches/patch-src_octave_pfscrop b/graphics/pfstools/patches/patch-src_octave_pfscrop
new file mode 100644
index 00000000000..35e52534add
--- /dev/null
+++ b/graphics/pfstools/patches/patch-src_octave_pfscrop
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_octave_pfscrop,v 1.1 2015/08/25 20:16:31 adam Exp $
+
+Portability fix.
+
+--- src/octave/pfscrop.orig	2015-07-16 20:06:44.000000000 +0000
++++ src/octave/pfscrop
+@@ -15,7 +15,7 @@ EOF
+     exit 1
+ fi
+ 
+-if test $# == "2"; then
++if test $# = "2"; then
+     CW_X=1
+     CW_Y=1
+     CW_W=$1