- Disable OCTAVE by default as it's broken (on octave-forge side)

- Add more OPTIONS: PPM, EXR, TIFF, QT, IM, GL

PR:		ports/118389
Submitted by:	Iouri V. Ivliev <ii at any.com.ru>
Approved by:	Daniel O'Connor <darius at dons.net.au> (maintainer)

2 files changed, 168 insertions, 63 deletions

diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 265a00cc8a38..276420660ced 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pfstools
 PORTVERSION=	1.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,53 +16,156 @@ MAINTAINER=	darius@dons.net.au
 COMMENT=	Tools for manipulating HDR images and video frames
 
 RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
-		Magick++:${PORTSDIR}/graphics/ImageMagick
 
-BROKEN=		does not build
+PFS_CPPFLAGS=	-I${LOCALBASE}/include
+PFS_LDFLAGS=	-L${LOCALBASE}/lib
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET:=	--build=${CONFIGURE_TARGET}
+CONFIGURE_ARGS=	--disable-jpeghdr --disable-matlab
+CONFIGURE_ENV=	CPPFLAGS="${PFS_CPPFLAGS}" \
+		LDFLAGS="${PFS_LDFLAGS}" \
+		PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	ltverhack
-CONFIGURE_ARGS+=--disable-jpeghdr --disable-ppm
-USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_QT_VER=	3
 USE_GL=		glut
 
-OPTIONS=	OCTAVE "Install Octave interface" on
+USE_LDCONFIG=	yes
+USE_GNOME=	pkgconfig
+
+# on TIFF
+		EXR "Compile programs that use OpenEXR library" off \
+		TIFF "Compile programs that use TIFF library" on \
+		QT "Compile programs that use QT library" off \
+		IM "Compile programs that use ImageMagick library" off \
+		OCTAVE "Compile octave interface functioffs" off \
+		GL "Compile opengl code (pfsglview)" off
 
-MAN1=		pfsabsolute.1 pfscat.1 pfsclamp.1 pfscut.1 pfsextractchannels.1 \
-		pfsflip.1 pfsgamma.1 pfsin.1 pfsindcraw.1 pfsinexr.1 \
-		pfsinimgmagick.1 pfsinjpeghdr.1 pfsinmulti.1 pfsinpfm.1 pfsinppm.1 \
-		pfsinrgbe.1 pfsintiff.1 pfsout.1 pfsoutexr.1 pfsoutffmpeg.1 \
-		pfsoutimgmagick.1 pfsoutjpeghdr.1 pfsoutpfm.1 pfsoutppm.1 pfspad.1 \
-		pfspanoramic.1 pfsrotate.1 pfssize.1 pfsstat.1 pfstag.1 pfsv.1 \
-		pfsview.1
-MLINKS=		pfsoutppm.1 pfsouttiff.1 \
-		pfsoutppm.1 pfsoutrgbe.1
+MAN1=		pfsin.1 \
+		pfsout.1 \
+		pfsinppm.1 \
+		pfsinexr.1 \
+		pfsinrgbe.1 \
+		pfsintiff.1 \
+		pfsoutppm.1 \
+		pfsoutexr.1 \
+		pfsoutffmpeg.1 \
+		pfsinpfm.1 \
+		pfsoutpfm.1 \
+		pfsinmulti.1 \
+		pfsinimgmagick.1 \
+		pfsoutimgmagick.1 \
+		pfsinjpeghdr.1 \
+		pfsoutjpeghdr.1 \
+		pfsindcraw.1 \
+		pfsgamma.1 \
+		pfsclamp.1 \
+		pfstag.1 \
+		pfssize.1 \
+		pfsextractchannels.1 \
+		pfspanoramic.1 \
+		pfsrotate.1 \
+		pfsflip.1 \
+		pfscut.1 \
+		pfspad.1 \
+		pfscat.1 \
+		pfsabsolute.1
+
+MLINKS=		pfsoutppm.1 \
+		pfsouttiff.1 \
+		pfsoutppm.1 \
+		pfsoutrgbe.1
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_PPM)
+CONFIGURE_ARGS+=--enable-ppm
+LIB_DEPENDS+=	netpbm.1:${PORTSDIR}/graphics/netpbm
+PLIST_SUB+=	PPM=""
+.else
+CONFIGURE_ARGS+=--disable-ppm
+PLIST_SUB+=	PPM="@comment "
+.endif
+
+.if defined(WITH_EXR)
+PFS_CPPFLAGS+=	${PTHREAD_CFLAGS}
+PFS_LDFLAGS+=	${PTHREAD_LIBS}
+CONFIGURE_ARGS+=--enable-openexr --with-exrdir=${LOCALBASE}/include/OpenEXR
+LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
+PLIST_SUB+=	EXR=""
+.else
+CONFIGURE_ARGS+=--disable-openexr
+PLIST_SUB+=	EXR="@comment "
+.endif
+
+.if defined(WITH_TIFF)
+CONFIGURE_ARGS+=--enable-tiff
+LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
+PLIST_SUB+=	TIFF=""
+.else
+CONFIGURE_ARGS+=--disable-tiff
+PLIST_SUB+=	TIFF="@comment "
+.endif
+
+.if defined(WITH_QT)
+CONFIGURE_ARGS+=--enable-qt
+USE_QT_VER=	3
+LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
+PLIST_SUB+=	QT=""
+MAN1+=		pfsview.1 \
+		pfsv.1
+.else
+CONFIGURE_ARGS+=--disable-qt
+PLIST_SUB+=	QT="@comment "
+.endif
+
+.if defined(WITH_IM)
+CONFIGURE_ARGS+=--enable-imagemagick
+LIB_DEPENDS+=	Magick++.10:${PORTSDIR}/graphics/ImageMagick
+PLIST_SUB+=	IM=""
+.else
+CONFIGURE_ARGS+=--disable-imagemagick
+PLIST_SUB+=	IM="@comment "
+.endif
+
 .if defined(WITH_OCTAVE)
+CONFIGURE_ARGS+=--enable-octave
 USE_FORTRAN=	yes
-BUILD_DEPENDS+=	octave:${PORTSDIR}/math/octave
+BUILD_DEPENDS+=	mkoctfile:${PORTSDIR}/math/octave
 RUN_DEPENDS+=	octave:${PORTSDIR}/math/octave
-PLIST_SUB=	OCTAVE_VERSION="`${LOCALBASE}/bin/octave-config -v`" \
-		GNU_HOST=${ARCH}-portbld-freebsd${OSREL} \
-		OCTAVE_PLIST=
-MAN1+=		pfsoctavelum.1 pfsoctavergb.1
+PLIST_SUB+=	OCTAVE="" \
+		OCTAVE_VERSION="`${LOCALBASE}/bin/octave-config -v`" \
+		BUILD=${CONFIGURE_TARGET:S/--build//}
+MAN1+=		pfsoctavelum.1 \
+		pfsoctavergb.1 \
+		pfsstat.1
 .else
-PLIST_SUB=	OCTAVE_PLIST=#
 CONFIGURE_ARGS+=--disable-octave
+PLIST_SUB+=	OCTAVE="@comment "
+.endif
+
+.if defined(WITH_GL)
+PFS_CPPFLAGS+=	-I${X11BASE}/include
+PFS_LDFLAGS+=	-L${X11BASE}/lib
+CONFIGURE_ARGS+=--enable-opengl
+LIB_DEPENDS+=	glut.4:${PORTSDIR}/graphics/libglut
+PLIST_SUB+=	GL=""
+.else
+CONFIGURE_ARGS+=--disable-opengl
+PLIST_SUB+=	GL="@comment "
 .endif
 
 pre-configure:
-	${REINPLACE_CMD} -e "s,#!/bin/bash,#!${LOCALBASE}/bin/bash," \
+	@${REINPLACE_CMD} -e "s,#!/bin/bash,#!${LOCALBASE}/bin/bash," \
 		${WRKSRC}/src/fileformat/pfsin \
 		${WRKSRC}/src/fileformat/pfsout \
 		${WRKSRC}/src/fileformat/pfsinmulti \
 		${WRKSRC}/src/fileformat/pfsindcraw \
 		${WRKSRC}/src/pfsview/pfsv
+.if defined(WITH_OCT)
+	@${REINPLACE_CMD} \
+		-e 's|/usr/bin/octave|${LOCALBASE}/bin/octave|' \
+		${WRKSRC}/src/octave/*
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/pfstools/pkg-plist b/graphics/pfstools/pkg-plist
index 5a0d1b70f025..f824255238bf 100644
--- a/graphics/pfstools/pkg-plist
+++ b/graphics/pfstools/pkg-plist
@@ -1,6 +1,3 @@
-bin/pfsouttiff
-bin/pfsintiff
-bin/pfsglview
 bin/pfsabsolute
 bin/pfscat
 bin/pfsclamp
@@ -10,57 +7,62 @@ bin/pfsflip
 bin/pfsgamma
 bin/pfsin
 bin/pfsindcraw
-bin/pfsinexr
-bin/pfsinimgmagick
 bin/pfsinmulti
 bin/pfsinpfm
 bin/pfsinrgbe
-bin/pfsoctavelum
-bin/pfsoctavergb
 bin/pfsout
-bin/pfsoutexr
 bin/pfsoutffmpeg
-bin/pfsoutimgmagick
 bin/pfsoutpfm
 bin/pfsoutrgbe
 bin/pfspad
 bin/pfspanoramic
 bin/pfsrotate
 bin/pfssize
-bin/pfsstat
 bin/pfstag
-bin/pfsv
-bin/pfsview
+%%PPM%%bin/pfsinppm
+%%PPM%%bin/pfsoutppm
+%%EXR%%bin/pfsinexr
+%%EXR%%bin/pfsoutexr
+%%TIFF%%bin/pfsintiff
+%%TIFF%%bin/pfsouttiff
+%%IM%%bin/pfsinimgmagick
+%%IM%%bin/pfsoutimgmagick
+%%QT%%bin/pfsv
+%%QT%%bin/pfsview
+%%GL%%bin/pfsglview
+%%OCTAVE%%bin/pfsoctavelum
+%%OCTAVE%%bin/pfsoctavergb
+%%OCTAVE%%bin/pfsstat
 include/pfs-1.2/array2d.h
 include/pfs-1.2/pfs.h
-@dirrm include/pfs-1.2
 lib/libpfs-1.2.a
 lib/libpfs-1.2.la
 lib/libpfs-1.2.so
 lib/libpfs-1.2.so.0
 libdata/pkgconfig/pfs.pc
-%%OCTAVE_PLIST%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/pfstools/pfsclose.oct
-%%OCTAVE_PLIST%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/pfstools/pfsget.oct
-%%OCTAVE_PLIST%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/pfstools/pfsopen.oct
-%%OCTAVE_PLIST%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/pfstools/pfsput.oct
-%%OCTAVE_PLIST%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/pfstools/pfsread.oct
-%%OCTAVE_PLIST%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/pfstools/pfstransform_colorspace.oct
-%%OCTAVE_PLIST%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/pfstools/pfswrite.oct
-%%OCTAVE_PLIST%%@dirrm libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/pfstools
-%%OCTAVE_PLIST%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%
-%%OCTAVE_PLIST%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct
-%%OCTAVE_PLIST%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site
-%%OCTAVE_PLIST%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%
-%%OCTAVE_PLIST%%@dirrmtry libexec/octave
-%%OCTAVE_PLIST%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_close_frames.m
-%%OCTAVE_PLIST%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_open_frames.m
-%%OCTAVE_PLIST%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_read_luminance.m
-%%OCTAVE_PLIST%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_read_rgb.m
-%%OCTAVE_PLIST%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_read_xyz.m
-%%OCTAVE_PLIST%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_write_rgb.m
-%%OCTAVE_PLIST%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfssize.m
-%%OCTAVE_PLIST%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview.m
-%%OCTAVE_PLIST%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview_list.m
-%%OCTAVE_PLIST%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview_rgb.m
-%%OCTAVE_PLIST%%@dirrm share/octave/%%OCTAVE_VERSION%%/site/m/pfstools
-%%OCTAVE_PLIST%%@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/m
+%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsclose.oct
+%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsget.oct
+%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsopen.oct
+%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsput.oct
+%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsread.oct
+%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfstransform_colorspace.oct
+%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfswrite.oct
+%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_close_frames.m
+%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_open_frames.m
+%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_read_luminance.m
+%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_read_rgb.m
+%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_read_xyz.m
+%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_write_rgb.m
+%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfssize.m
+%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview.m
+%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview_list.m
+%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview_rgb.m
+@dirrmtry include/pfs-1.2
+%%OCTAVE%%@dirrm libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools
+%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%
+%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct
+%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site
+%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%
+%%OCTAVE%%@dirrmtry libexec/octave
+%%OCTAVE%%@dirrm share/octave/%%OCTAVE_VERSION%%/site/m/pfstools
+%%OCTAVE%%@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/m