From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 2 18:20:01 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FB5E16A418 for ; Sun, 2 Dec 2007 18:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 57D5F13C4F3 for ; Sun, 2 Dec 2007 18:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id lB2IK1jQ019092 for ; Sun, 2 Dec 2007 18:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id lB2IK17R019086; Sun, 2 Dec 2007 18:20:01 GMT (envelope-from gnats) Resent-Date: Sun, 2 Dec 2007 18:20:01 GMT Resent-Message-Id: <200712021820.lB2IK17R019086@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Iouri V. Ivliev" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3465116A417 for ; Sun, 2 Dec 2007 18:14:40 +0000 (UTC) (envelope-from yury@esterdev.com) Received: from smaug.esterdev.com (cable-235.kazan.ru [212.22.81.235]) by mx1.freebsd.org (Postfix) with ESMTP id 0423113C442 for ; Sun, 2 Dec 2007 18:13:37 +0000 (UTC) (envelope-from yury@esterdev.com) Received: from smaug.esterdev.com (localhost [127.0.0.1]) by smaug.esterdev.com (8.13.8/8.13.8) with ESMTP id lB2Hhqlp041509; Sun, 2 Dec 2007 20:43:52 +0300 (MSK) (envelope-from yury@smaug.esterdev.com) Received: (from root@localhost) by smaug.esterdev.com (8.13.8/8.13.8/Submit) id lB2HhWNC041508; Sun, 2 Dec 2007 20:43:32 +0300 (MSK) (envelope-from yury) Message-Id: <200712021743.lB2HhWNC041508@smaug.esterdev.com> Date: Sun, 2 Dec 2007 20:43:32 +0300 (MSK) From: "Iouri V. Ivliev" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: darius@dons.net.au Subject: ports/118389: Update port: graphics/pfstools More options X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Iouri V. Ivliev" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Dec 2007 18:20:01 -0000 >Number: 118389 >Category: ports >Synopsis: Update port: graphics/pfstools More options >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Dec 02 18:20:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Iouri V. Ivliev >Release: FreeBSD 6.2-RELEASE-p7 i386 >Organization: EsterDev, Ltd. >Environment: System: FreeBSD smaug.esterdev.com 6.2-RELEASE-p7 FreeBSD 6.2-RELEASE-p7 #0: Sun Sep 23 17:28:25 UTC 2007 root@smaug.esterdev.com:/usr/obj/usr/src/sys/SMAUG i386 >Description: Add the following options to control port dependencies: PPM - Compile programs that use PPM (NetPBM) EXR - Compile programs that use OpenEXR library TIFF - Compile programs that use TIFF library QT - Compile programs that use QT library IM - Compile programs that use ImageMagick library GL - Compile opengl code (pfsglview) >How-To-Repeat: >Fix: --- pfstools.diff begins here --- diff -ruN pfstools.orig/Makefile pfstools/Makefile --- pfstools.orig/Makefile Fri Nov 23 19:13:35 2007 +++ pfstools/Makefile Sun Dec 2 16:03:33 2007 @@ -7,59 +7,164 @@ PORTNAME= pfstools PORTVERSION= 1.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME} 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 + +PFS_CPPFLAGS= -I${LOCALBASE}/include +PFS_LDFLAGS= -L${LOCALBASE}/lib +PFS_BUILD= ${MACHINE_ARCH}-portbld-freebsd${OSREL} GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${PFS_BUILD} +CONFIGURE_ARGS= --disable-jpeghdr --disable-matlab +CONFIGURE_ENV= CPPFLAGS="${PFS_CPPFLAGS}" \ + LDFLAGS="${PFS_LDFLAGS}" \ + PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig:${X11BASE}/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 - -OPTIONS= OCTAVE "Install Octave interface" on +USE_LDCONFIG= yes +USE_GNOME= pkgconfig -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 +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 \ + OCT "Compile octave interface functions" off \ + GL "Compile opengl code (pfsglview)" off + +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 -.if defined(WITH_OCTAVE) +.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_OCT) +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+= OCT="" +PLIST_SUB+= OCTAVE_VERSION="`${LOCALBASE}/bin/octave-config -v`" +PLIST_SUB+= BUILD=${PFS_BUILD} +MAN1+= pfsoctavelum.1 \ + pfsoctavergb.1 \ + pfsstat.1 .else -PLIST_SUB= OCTAVE_PLIST=# CONFIGURE_ARGS+=--disable-octave +PLIST_SUB+= OCT="@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 diff -ruN pfstools.orig/pkg-plist pfstools/pkg-plist --- pfstools.orig/pkg-plist Tue Oct 2 07:44:42 2007 +++ pfstools/pkg-plist Sun Dec 2 14:46:33 2007 @@ -1,65 +1,71 @@ -bin/pfsouttiff -bin/pfsintiff -bin/pfsglview -bin/pfsabsolute -bin/pfscat -bin/pfsclamp -bin/pfscut -bin/pfsextractchannels -bin/pfsflip -bin/pfsgamma -bin/pfsin -bin/pfsindcraw -bin/pfsinexr -bin/pfsinimgmagick -bin/pfsinmulti -bin/pfsinpfm bin/pfsinrgbe -bin/pfsoctavelum -bin/pfsoctavergb +bin/pfsoutrgbe +bin/pfsinpfm +bin/pfsoutpfm +bin/pfsin bin/pfsout -bin/pfsoutexr bin/pfsoutffmpeg -bin/pfsoutimgmagick -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/pfsstat -bin/pfstag -bin/pfsv -bin/pfsview -include/pfs-1.2/array2d.h +bin/pfsflip +bin/pfscut +bin/pfspad +bin/pfscat +bin/pfsabsolute +%%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/pfsview +%%QT%%bin/pfsv +%%OCT%%bin/pfsoctavelum +%%OCT%%bin/pfsoctavergb +%%OCT%%bin/pfsstat +%%GL%%bin/pfsglview include/pfs-1.2/pfs.h -@dirrm include/pfs-1.2 -lib/libpfs-1.2.a -lib/libpfs-1.2.la +include/pfs-1.2/array2d.h lib/libpfs-1.2.so.0 +lib/libpfs-1.2.so +lib/libpfs-1.2.la +lib/libpfs-1.2.a 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 +%%OCT%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsclose.oct +%%OCT%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsget.oct +%%OCT%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsopen.oct +%%OCT%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsput.oct +%%OCT%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsread.oct +%%OCT%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfstransform_colorspace.oct +%%OCT%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfswrite.oct +%%OCT%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_close_frames.m +%%OCT%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_open_frames.m +%%OCT%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_read_luminance.m +%%OCT%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_read_rgb.m +%%OCT%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_read_xyz.m +%%OCT%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfs_write_rgb.m +%%OCT%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfssize.m +%%OCT%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview.m +%%OCT%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview_list.m +%%OCT%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview_rgb.m +@dirrm include/pfs-1.2 +%%OCT%%@dirrm share/octave/%%OCTAVE_VERSION%%/site/m/pfstools +%%OCT%%@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/m +%%OCT%%@dirrmtry share/octave/%%OCTAVE_VERSION%%/site +%%OCT%%@dirrmtry share/octave/%%OCTAVE_VERSION%% +%%OCT%%@dirrmtry share/octave +%%OCT%%@dirrm libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools +%%OCT%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%% +%%OCT%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct +%%OCT%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site +%%OCT%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%% +%%OCT%%@dirrmtry libexec/octave --- pfstools.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: