diff options
| -rw-r--r-- | graphics/pfstools/Makefile | 48 | ||||
| -rw-r--r-- | graphics/pfstools/distinfo | 6 | ||||
| -rw-r--r-- | graphics/pfstools/files/epatch-src-octave-pfsopen.cpp | 23 | ||||
| -rw-r--r-- | graphics/pfstools/files/patch-src-pfs-Makefile.in (renamed from graphics/pfstools/files/patch-pkgconfig-install.diff) | 10 | ||||
| -rw-r--r-- | graphics/pfstools/pkg-plist | 51 |
5 files changed, 84 insertions, 54 deletions
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile index 627a23481a43..41696f41770f 100644 --- a/graphics/pfstools/Makefile +++ b/graphics/pfstools/Makefile @@ -6,11 +6,9 @@ # PORTNAME= pfstools -PORTVERSION= 1.6.2 -PORTREVISION= 3 +PORTVERSION= 1.6.4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= darius@dons.net.au COMMENT= Tools for manipulating HDR images and video frames @@ -19,26 +17,27 @@ RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash PFS_CPPFLAGS= -I${LOCALBASE}/include PFS_LDFLAGS= -L${LOCALBASE}/lib +PFS_BUILD= ${MACHINE_ARCH}-portbld-freebsd${OSREL} +PLIST_SUB+= PFS_BASE=${PREFIX} GNU_CONFIGURE= yes -CONFIGURE_TARGET:= --build=${CONFIGURE_TARGET} -CONFIGURE_ARGS= --disable-jpeghdr --disable-matlab +CONFIGURE_TARGET= --build=${PFS_BUILD} +CONFIGURE_ARGS= --disable-jpeghdr --disable-matlab \ + --with-bash=${LOCALBASE}/bin/bash CONFIGURE_ENV= CPPFLAGS="${PFS_CPPFLAGS}" \ LDFLAGS="${PFS_LDFLAGS}" \ PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig" USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -USE_GL= glut - USE_LDCONFIG= yes USE_GNOME= pkgconfig -OPTIONS= +PPM "Compile programs that use PPM (NetPBM)" off \ +OPTIONS= PPM "Compile programs that use PPM (NetPBM)" off \ 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 \ + OCTAVE "Compile octave interface functions" off \ GL "Compile opengl code (pfsglview)" off MAN1= pfsin.1 \ @@ -70,7 +69,6 @@ MAN1= pfsin.1 \ pfspad.1 \ pfscat.1 \ pfsabsolute.1 - MLINKS= pfsoutppm.1 \ pfsouttiff.1 \ pfsoutppm.1 \ @@ -110,7 +108,7 @@ PLIST_SUB+= TIFF="@comment " .if defined(WITH_QT) CONFIGURE_ARGS+=--enable-qt USE_QT_VER= 3 -LIB_DEPENDS+= qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 +.include "${PORTSDIR}/Mk/bsd.kde.mk" PLIST_SUB+= QT="" MAN1+= pfsview.1 \ pfsv.1 @@ -131,11 +129,21 @@ PLIST_SUB+= IM="@comment " .if defined(WITH_OCTAVE) CONFIGURE_ARGS+=--enable-octave USE_FORTRAN= yes + +# need to determine which octave installed which patching +PATCH_DEPENDS+= mkoctfile:${PORTSDIR}/math/octave BUILD_DEPENDS+= mkoctfile:${PORTSDIR}/math/octave RUN_DEPENDS+= octave:${PORTSDIR}/math/octave + +OCTAVE_BASE?= ${LOCALBASE} +OCTAVE_VERSION!=${OCTAVE_BASE}/bin/octave-config -v 2>&1 || ${ECHO} "0" PLIST_SUB+= OCTAVE="" \ - OCTAVE_VERSION="`${LOCALBASE}/bin/octave-config -v`" \ - BUILD=${CONFIGURE_TARGET:S/--build//} + OCTAVE_VERSION=${OCTAVE_VERSION} \ + OCTAVE_BASE=${OCTAVE_BASE} \ + BUILD=${PFS_BUILD} +.if (!empty(OCTAVE_VERSION:M[3-9].*)) +EXTRA_PATCHES+= ${PATCHDIR}/epatch-src-octave-pfsopen.cpp +.endif MAN1+= pfsoctavelum.1 \ pfsoctavergb.1 \ pfsstat.1 @@ -145,24 +153,16 @@ 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 +USE_GL= glut PLIST_SUB+= GL="" .else CONFIGURE_ARGS+=--disable-opengl PLIST_SUB+= GL="@comment " .endif +.if defined(WITH_OCTAVE) pre-configure: - @${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/* diff --git a/graphics/pfstools/distinfo b/graphics/pfstools/distinfo index 40e797f00387..6ece83a93b33 100644 --- a/graphics/pfstools/distinfo +++ b/graphics/pfstools/distinfo @@ -1,3 +1,3 @@ -MD5 (pfstools-1.6.2.tar.gz) = 6c39c0bfb72ff59787f4ed4396272297 -SHA256 (pfstools-1.6.2.tar.gz) = 9241d0cec09b20a5ac672adc4a58cf06d6f7a71d8787621e85195219a39af6ce -SIZE (pfstools-1.6.2.tar.gz) = 569121 +MD5 (pfstools-1.6.4.tar.gz) = 5c465af4c7a1979d60d4992b0d554628 +SHA256 (pfstools-1.6.4.tar.gz) = 18d2d8fe64fd88ceda5b61cd7504f801c859989b6220965eb5c254e3d902dfe8 +SIZE (pfstools-1.6.4.tar.gz) = 588801 diff --git a/graphics/pfstools/files/epatch-src-octave-pfsopen.cpp b/graphics/pfstools/files/epatch-src-octave-pfsopen.cpp new file mode 100644 index 000000000000..c697f03103b8 --- /dev/null +++ b/graphics/pfstools/files/epatch-src-octave-pfsopen.cpp @@ -0,0 +1,23 @@ +--- src/octave/pfsopen.cpp.orig 2006-04-06 12:33:02.000000000 +0000 ++++ src/octave/pfsopen.cpp 2008-02-12 10:59:44.000000000 +0000 +@@ -54,8 +54,9 @@ + return retval; + } + +- if( !args(0).is_string() && !args(0).is_stream() ) { ++ if( !args(0).is_string() && !args(0).is_real_scalar() ) { + error( SCRIPT_NAME ": expected file name or file descriptor as the first argument!"); ++ // file descriptors are represented as integers (stored as doubles) in Octave 3.0 + return retval; + } + +@@ -120,8 +121,7 @@ + } + } else { + // File descriptor given +- octave_stream fid = args(0).stream_value(); +- int fd = dup( fid.file_number() ); ++ int fd = dup( (int) args(0).scalar_value() ); + if( writeMode ) { + fh = fdopen( fd, "wb" ); + if( fh == NULL ) { diff --git a/graphics/pfstools/files/patch-pkgconfig-install.diff b/graphics/pfstools/files/patch-src-pfs-Makefile.in index c444717095b2..0f3aa7a07be7 100644 --- a/graphics/pfstools/files/patch-pkgconfig-install.diff +++ b/graphics/pfstools/files/patch-src-pfs-Makefile.in @@ -1,11 +1,11 @@ ---- src/pfs/Makefile.in.orig 2007-09-30 11:07:52.000000000 +0930 -+++ src/pfs/Makefile.in 2007-09-30 11:10:14.000000000 +0930 -@@ -183,7 +183,7 @@ +--- src/pfs/Makefile.in.orig 2008-01-01 14:27:14.000000000 +0000 ++++ src/pfs/Makefile.in 2008-02-12 10:59:44.000000000 +0000 +@@ -243,7 +243,7 @@ library_includedir = $(includedir)/pfs-1.2 library_include_HEADERS = pfs.h array2d.h #INCLUDES = -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = pfs.pc - subdir = src/pfs - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + all: all-am + diff --git a/graphics/pfstools/pkg-plist b/graphics/pfstools/pkg-plist index f824255238bf..4b4719f33eb7 100644 --- a/graphics/pfstools/pkg-plist +++ b/graphics/pfstools/pkg-plist @@ -1,24 +1,24 @@ -bin/pfsabsolute -bin/pfscat -bin/pfsclamp -bin/pfscut -bin/pfsextractchannels -bin/pfsflip -bin/pfsgamma -bin/pfsin -bin/pfsindcraw -bin/pfsinmulti -bin/pfsinpfm bin/pfsinrgbe +bin/pfsoutrgbe +bin/pfsinpfm +bin/pfsoutpfm +bin/pfsin bin/pfsout bin/pfsoutffmpeg -bin/pfsoutpfm -bin/pfsoutrgbe -bin/pfspad +bin/pfsinmulti +bin/pfsindcraw +bin/pfsclamp +bin/pfsgamma +bin/pfstag +bin/pfssize +bin/pfsextractchannels bin/pfspanoramic bin/pfsrotate -bin/pfssize -bin/pfstag +bin/pfsflip +bin/pfscut +bin/pfspad +bin/pfscat +bin/pfsabsolute %%PPM%%bin/pfsinppm %%PPM%%bin/pfsoutppm %%EXR%%bin/pfsinexr @@ -27,19 +27,20 @@ bin/pfstag %%TIFF%%bin/pfsouttiff %%IM%%bin/pfsinimgmagick %%IM%%bin/pfsoutimgmagick -%%QT%%bin/pfsv %%QT%%bin/pfsview -%%GL%%bin/pfsglview +%%QT%%bin/pfsv %%OCTAVE%%bin/pfsoctavelum %%OCTAVE%%bin/pfsoctavergb %%OCTAVE%%bin/pfsstat -include/pfs-1.2/array2d.h +%%GL%%bin/pfsglview include/pfs-1.2/pfs.h +include/pfs-1.2/array2d.h 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%%@cwd %%OCTAVE_BASE%% %%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 @@ -57,12 +58,18 @@ libdata/pkgconfig/pfs.pc %%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%%@cwd %%PFS_BASE%% +@dirrm include/pfs-1.2 +%%OCTAVE%%@cwd %%OCTAVE_BASE%% +%%OCTAVE%%@dirrm share/octave/%%OCTAVE_VERSION%%/site/m/pfstools +%%OCTAVE%%@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/m +%%OCTAVE%%@dirrmtry share/octave/%%OCTAVE_VERSION%%/site +%%OCTAVE%%@dirrmtry share/octave/%%OCTAVE_VERSION%% +%%OCTAVE%%@dirrmtry share/octave %%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 +%%OCTAVE%%@cwd %%PFS_BASE%% |