View | Details | Raw Unified | Return to bug 121862
Collapse All | Expand All

(-)pfstools/Makefile (-23 / +22 lines)
Lines 6-15 Link Here
6
#
6
#
7
7
8
PORTNAME=	pfstools
8
PORTNAME=	pfstools
9
PORTVERSION=	1.6.2
9
PORTVERSION=	1.6.4
10
PORTREVISION=	3
10
PORTREVISION=	0
11
CATEGORIES=	graphics
11
CATEGORIES=	graphics
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	SF
13
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
14
14
15
MAINTAINER=	darius@dons.net.au
15
MAINTAINER=	darius@dons.net.au
Lines 19-44 Link Here
19
19
20
PFS_CPPFLAGS=	-I${LOCALBASE}/include
20
PFS_CPPFLAGS=	-I${LOCALBASE}/include
21
PFS_LDFLAGS=	-L${LOCALBASE}/lib
21
PFS_LDFLAGS=	-L${LOCALBASE}/lib
22
PFS_BUILD=	${MACHINE_ARCH}-portbld-freebsd${OSREL}
23
PLIST_SUB+=	PFS_BASE=${PREFIX}
22
24
23
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
24
CONFIGURE_TARGET:=	--build=${CONFIGURE_TARGET}
26
CONFIGURE_TARGET=	--build=${PFS_BUILD}
25
CONFIGURE_ARGS=	--disable-jpeghdr --disable-matlab
27
CONFIGURE_ARGS=	--disable-jpeghdr --disable-matlab \
28
		--with-bash=${LOCALBASE}/bin/bash
26
CONFIGURE_ENV=	CPPFLAGS="${PFS_CPPFLAGS}" \
29
CONFIGURE_ENV=	CPPFLAGS="${PFS_CPPFLAGS}" \
27
		LDFLAGS="${PFS_LDFLAGS}" \
30
		LDFLAGS="${PFS_LDFLAGS}" \
28
		PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
31
		PKG_CONFIG_PATH=${X11BASE}/libdata/pkgconfig
29
USE_AUTOTOOLS=	libtool:15
32
USE_AUTOTOOLS=	libtool:15
30
USE_GMAKE=	yes
33
USE_GMAKE=	yes
31
USE_GL=		glut
32
33
USE_LDCONFIG=	yes
34
USE_LDCONFIG=	yes
34
USE_GNOME=	pkgconfig
35
USE_GNOME=	pkgconfig
35
36
36
OPTIONS=	+PPM "Compile programs that use PPM (NetPBM)" off \
37
OPTIONS=	PPM "Compile programs that use PPM (NetPBM)" off \
37
		EXR "Compile programs that use OpenEXR library" off \
38
		EXR "Compile programs that use OpenEXR library" off \
38
		TIFF "Compile programs that use TIFF library" on \
39
		TIFF "Compile programs that use TIFF library" on \
39
		QT "Compile programs that use QT library" off \
40
		QT "Compile programs that use QT library" off \
40
		IM "Compile programs that use ImageMagick library" off \
41
		IM "Compile programs that use ImageMagick library" off \
41
		OCTAVE "Compile octave interface functioffs" off \
42
		OCTAVE "Compile octave interface functions" off \
42
		GL "Compile opengl code (pfsglview)" off
43
		GL "Compile opengl code (pfsglview)" off
43
44
44
MAN1=		pfsin.1 \
45
MAN1=		pfsin.1 \
Lines 70-76 Link Here
70
		pfspad.1 \
71
		pfspad.1 \
71
		pfscat.1 \
72
		pfscat.1 \
72
		pfsabsolute.1
73
		pfsabsolute.1
73
74
MLINKS=		pfsoutppm.1 \
74
MLINKS=		pfsoutppm.1 \
75
		pfsouttiff.1 \
75
		pfsouttiff.1 \
76
		pfsoutppm.1 \
76
		pfsoutppm.1 \
Lines 88-95 Link Here
88
.endif
88
.endif
89
89
90
.if defined(WITH_EXR)
90
.if defined(WITH_EXR)
91
PFS_CPPFLAGS+=	${PTHREAD_CFLAGS}
92
PFS_LDFLAGS+=	${PTHREAD_LIBS}
93
CONFIGURE_ARGS+=--enable-openexr --with-exrdir=${LOCALBASE}/include/OpenEXR
91
CONFIGURE_ARGS+=--enable-openexr --with-exrdir=${LOCALBASE}/include/OpenEXR
94
LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
92
LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
95
PLIST_SUB+=	EXR=""
93
PLIST_SUB+=	EXR=""
Lines 133-141 Link Here
133
USE_FORTRAN=	yes
131
USE_FORTRAN=	yes
134
BUILD_DEPENDS+=	mkoctfile:${PORTSDIR}/math/octave
132
BUILD_DEPENDS+=	mkoctfile:${PORTSDIR}/math/octave
135
RUN_DEPENDS+=	octave:${PORTSDIR}/math/octave
133
RUN_DEPENDS+=	octave:${PORTSDIR}/math/octave
134
OCTAVE_BASE?=	${LOCALBASE}
135
OCTAVE_VERSION!=${OCTAVE_BASE}/bin/octave-config -v
136
PLIST_SUB+=	OCTAVE="" \
136
PLIST_SUB+=	OCTAVE="" \
137
		OCTAVE_VERSION="`${LOCALBASE}/bin/octave-config -v`" \
137
		OCTAVE_VERSION=${OCTAVE_VERSION} \
138
		BUILD=${CONFIGURE_TARGET:S/--build//}
138
		OCTAVE_BASE=${OCTAVE_BASE} \
139
		BUILD=${PFS_BUILD}
140
.if (!empty(OCTAVE_VERSION:M[3-9].*))
141
EXTRA_PATCHES+=	${PATCHDIR}/epatch-src-octave-pfsopen.cpp
142
.endif
139
MAN1+=		pfsoctavelum.1 \
143
MAN1+=		pfsoctavelum.1 \
140
		pfsoctavergb.1 \
144
		pfsoctavergb.1 \
141
		pfsstat.1
145
		pfsstat.1
Lines 148-168 Link Here
148
PFS_CPPFLAGS+=	-I${X11BASE}/include
152
PFS_CPPFLAGS+=	-I${X11BASE}/include
149
PFS_LDFLAGS+=	-L${X11BASE}/lib
153
PFS_LDFLAGS+=	-L${X11BASE}/lib
150
CONFIGURE_ARGS+=--enable-opengl
154
CONFIGURE_ARGS+=--enable-opengl
151
LIB_DEPENDS+=	glut.4:${PORTSDIR}/graphics/libglut
155
USE_GL=		glut
152
PLIST_SUB+=	GL=""
156
PLIST_SUB+=	GL=""
153
.else
157
.else
154
CONFIGURE_ARGS+=--disable-opengl
158
CONFIGURE_ARGS+=--disable-opengl
155
PLIST_SUB+=	GL="@comment "
159
PLIST_SUB+=	GL="@comment "
156
.endif
160
.endif
157
161
162
163
.if defined(WITH_OCTAVE)
158
pre-configure:
164
pre-configure:
159
	@${REINPLACE_CMD} -e "s,#!/bin/bash,#!${LOCALBASE}/bin/bash," \
160
		${WRKSRC}/src/fileformat/pfsin \
161
		${WRKSRC}/src/fileformat/pfsout \
162
		${WRKSRC}/src/fileformat/pfsinmulti \
163
		${WRKSRC}/src/fileformat/pfsindcraw \
164
		${WRKSRC}/src/pfsview/pfsv
165
.if defined(WITH_OCT)
166
	@${REINPLACE_CMD} \
165
	@${REINPLACE_CMD} \
167
		-e 's|/usr/bin/octave|${LOCALBASE}/bin/octave|' \
166
		-e 's|/usr/bin/octave|${LOCALBASE}/bin/octave|' \
168
		${WRKSRC}/src/octave/*
167
		${WRKSRC}/src/octave/*
(-)pfstools/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (pfstools-1.6.2.tar.gz) = 6c39c0bfb72ff59787f4ed4396272297
1
MD5 (pfstools-1.6.4.tar.gz) = 5c465af4c7a1979d60d4992b0d554628
2
SHA256 (pfstools-1.6.2.tar.gz) = 9241d0cec09b20a5ac672adc4a58cf06d6f7a71d8787621e85195219a39af6ce
2
SHA256 (pfstools-1.6.4.tar.gz) = 18d2d8fe64fd88ceda5b61cd7504f801c859989b6220965eb5c254e3d902dfe8
3
SIZE (pfstools-1.6.2.tar.gz) = 569121
3
SIZE (pfstools-1.6.4.tar.gz) = 588801
(-)pfstools/files/epatch-src-octave-pfsopen.cpp (+23 lines)
Line 0 Link Here
1
--- src/octave/pfsopen.cpp.orig	2006-04-06 12:33:02.000000000 +0000
2
+++ src/octave/pfsopen.cpp	2008-02-12 10:59:44.000000000 +0000
3
@@ -54,8 +54,9 @@
4
     return retval;
5
   }
6
 
7
-  if( !args(0).is_string() && !args(0).is_stream() ) {
8
+  if( !args(0).is_string() && !args(0).is_real_scalar() ) {
9
     error( SCRIPT_NAME ": expected file name or file descriptor as the first argument!");
10
+    // file descriptors are represented as integers (stored as doubles) in Octave 3.0
11
     return retval;
12
   }
13
 
14
@@ -120,8 +121,7 @@
15
     }
16
   } else {
17
     // File descriptor given
18
-    octave_stream fid = args(0).stream_value();
19
-    int fd = dup( fid.file_number() );
20
+    int fd = dup( (int) args(0).scalar_value() );
21
     if( writeMode ) {
22
       fh = fdopen( fd, "wb" );
23
       if( fh == NULL ) {
(-)pfstools/files/patch-pkgconfig-install.diff (-11 lines)
Lines 1-11 Link Here
1
--- src/pfs/Makefile.in.orig	2007-09-30 11:07:52.000000000 +0930
2
+++ src/pfs/Makefile.in	2007-09-30 11:10:14.000000000 +0930
3
@@ -183,7 +183,7 @@
4
 library_includedir = $(includedir)/pfs-1.2
5
 library_include_HEADERS = pfs.h array2d.h
6
 #INCLUDES = 
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+pkgconfigdir = $(prefix)/libdata/pkgconfig
9
 pkgconfig_DATA = pfs.pc
10
 subdir = src/pfs
11
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
(-)pfstools/files/patch-src-pfs-Makefile.in (+11 lines)
Line 0 Link Here
1
--- src/pfs/Makefile.in.orig	2008-01-01 14:27:14.000000000 +0000
2
+++ src/pfs/Makefile.in	2008-02-12 10:59:44.000000000 +0000
3
@@ -243,7 +243,7 @@
4
 library_includedir = $(includedir)/pfs-1.2
5
 library_include_HEADERS = pfs.h array2d.h
6
 #INCLUDES = 
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+pkgconfigdir = $(prefix)/libdata/pkgconfig
9
 pkgconfig_DATA = pfs.pc
10
 all: all-am
11
 
(-)pfstools/pkg-plist (-25 / +32 lines)
Lines 1-24 Link Here
1
bin/pfsabsolute
2
bin/pfscat
3
bin/pfsclamp
4
bin/pfscut
5
bin/pfsextractchannels
6
bin/pfsflip
7
bin/pfsgamma
8
bin/pfsin
9
bin/pfsindcraw
10
bin/pfsinmulti
11
bin/pfsinpfm
12
bin/pfsinrgbe
1
bin/pfsinrgbe
2
bin/pfsoutrgbe
3
bin/pfsinpfm
4
bin/pfsoutpfm
5
bin/pfsin
13
bin/pfsout
6
bin/pfsout
14
bin/pfsoutffmpeg
7
bin/pfsoutffmpeg
15
bin/pfsoutpfm
8
bin/pfsinmulti
16
bin/pfsoutrgbe
9
bin/pfsindcraw
17
bin/pfspad
10
bin/pfsclamp
11
bin/pfsgamma
12
bin/pfstag
13
bin/pfssize
14
bin/pfsextractchannels
18
bin/pfspanoramic
15
bin/pfspanoramic
19
bin/pfsrotate
16
bin/pfsrotate
20
bin/pfssize
17
bin/pfsflip
21
bin/pfstag
18
bin/pfscut
19
bin/pfspad
20
bin/pfscat
21
bin/pfsabsolute
22
%%PPM%%bin/pfsinppm
22
%%PPM%%bin/pfsinppm
23
%%PPM%%bin/pfsoutppm
23
%%PPM%%bin/pfsoutppm
24
%%EXR%%bin/pfsinexr
24
%%EXR%%bin/pfsinexr
Lines 27-45 Link Here
27
%%TIFF%%bin/pfsouttiff
27
%%TIFF%%bin/pfsouttiff
28
%%IM%%bin/pfsinimgmagick
28
%%IM%%bin/pfsinimgmagick
29
%%IM%%bin/pfsoutimgmagick
29
%%IM%%bin/pfsoutimgmagick
30
%%QT%%bin/pfsv
31
%%QT%%bin/pfsview
30
%%QT%%bin/pfsview
32
%%GL%%bin/pfsglview
31
%%QT%%bin/pfsv
33
%%OCTAVE%%bin/pfsoctavelum
32
%%OCTAVE%%bin/pfsoctavelum
34
%%OCTAVE%%bin/pfsoctavergb
33
%%OCTAVE%%bin/pfsoctavergb
35
%%OCTAVE%%bin/pfsstat
34
%%OCTAVE%%bin/pfsstat
36
include/pfs-1.2/array2d.h
35
%%GL%%bin/pfsglview
37
include/pfs-1.2/pfs.h
36
include/pfs-1.2/pfs.h
38
lib/libpfs-1.2.a
37
include/pfs-1.2/array2d.h
39
lib/libpfs-1.2.la
40
lib/libpfs-1.2.so
41
lib/libpfs-1.2.so.0
38
lib/libpfs-1.2.so.0
39
lib/libpfs-1.2.so
40
lib/libpfs-1.2.la
41
lib/libpfs-1.2.a
42
libdata/pkgconfig/pfs.pc
42
libdata/pkgconfig/pfs.pc
43
%%OCTAVE%%@cwd %%OCTAVE_BASE%%
43
%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsclose.oct
44
%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsclose.oct
44
%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsget.oct
45
%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsget.oct
45
%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsopen.oct
46
%%OCTAVE%%libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools/pfsopen.oct
Lines 57-68 Link Here
57
%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview.m
58
%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview.m
58
%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview_list.m
59
%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview_list.m
59
%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview_rgb.m
60
%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/pfstools/pfsview_rgb.m
60
@dirrmtry include/pfs-1.2
61
%%OCTAVE%%@cwd %%PFS_BASE%%
62
@dirrm include/pfs-1.2
63
%%OCTAVE%%@cwd %%OCTAVE_BASE%%
64
%%OCTAVE%%@dirrm share/octave/%%OCTAVE_VERSION%%/site/m/pfstools
65
%%OCTAVE%%@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/m
66
%%OCTAVE%%@dirrmtry share/octave/%%OCTAVE_VERSION%%/site
67
%%OCTAVE%%@dirrmtry share/octave/%%OCTAVE_VERSION%%
68
%%OCTAVE%%@dirrmtry share/octave
61
%%OCTAVE%%@dirrm libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools
69
%%OCTAVE%%@dirrm libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%/pfstools
62
%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%
70
%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%BUILD%%
63
%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct
71
%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct
64
%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site
72
%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site
65
%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%
73
%%OCTAVE%%@dirrmtry libexec/octave/%%OCTAVE_VERSION%%
66
%%OCTAVE%%@dirrmtry libexec/octave
74
%%OCTAVE%%@dirrmtry libexec/octave
67
%%OCTAVE%%@dirrm share/octave/%%OCTAVE_VERSION%%/site/m/pfstools
75
%%OCTAVE%%@cwd %%PFS_BASE%%
68
%%OCTAVE%%@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/m

Return to bug 121862