Mon Oct 28 09:42:28 2019 UTC ()
pfstools: Remove qt (qt4) build option (it was disabled by default)


(kamil)
diff -r1.53 -r1.54 pkgsrc/graphics/pfstools/Makefile
diff -r1.6 -r1.7 pkgsrc/graphics/pfstools/options.mk
cvs diff -r1.53 -r1.54 pkgsrc/graphics/pfstools/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/pfstools/Makefile 2019/08/11 13:21:16 1.53
+++ pkgsrc/graphics/pfstools/Makefile 2019/10/28 09:42:28 1.54
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: Makefile,v 1.53 2019/08/11 13:21:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.54 2019/10/28 09:42:28 kamil Exp $
2 2
3DISTNAME= pfstools-2.0.5 3DISTNAME= pfstools-2.0.5
4PKGREVISION= 13 4PKGREVISION= 14
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfstools/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfstools/}
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://pfstools.sourceforge.net/ 10HOMEPAGE= http://pfstools.sourceforge.net/
11COMMENT= Tools for manipulating HDR images and video frames 11COMMENT= Tools for manipulating HDR images and video frames
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= bash perl pkg-config 17USE_TOOLS+= bash perl pkg-config
18CMAKE_ARGS+= -DBASH_EXECUTABLE=${TOOLS_BASH} 18CMAKE_ARGS+= -DBASH_EXECUTABLE=${TOOLS_BASH}
19CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR} 19CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
20CMAKE_ARGS+= -DWITH_MATLAB=NO 20CMAKE_ARGS+= -DWITH_MATLAB=NO
21CMAKE_ARGS+= -DWITH_OpenCV=NO 21CMAKE_ARGS+= -DWITH_OpenCV=NO
 22CMAKE_ARGS+= -DWITH_QT=NO
22 23
23PKGCONFIG_OVERRIDE+= src/pfs/pfs.pc.in 24PKGCONFIG_OVERRIDE+= src/pfs/pfs.pc.in
24 25
25DEPENDS+= dcraw-[0-9]*:../../graphics/dcraw 26DEPENDS+= dcraw-[0-9]*:../../graphics/dcraw
26 27
27SUBST_CLASSES+= paths 28SUBST_CLASSES+= paths
28SUBST_STAGE.paths= pre-configure 29SUBST_STAGE.paths= pre-configure
29SUBST_MESSAGE.paths= Fixing paths in CMake modules. 30SUBST_MESSAGE.paths= Fixing paths in CMake modules.
30SUBST_FILES.paths= cmake/Find*.cmake 31SUBST_FILES.paths= cmake/Find*.cmake
31SUBST_SED.paths= -e 's,/usr/local,${LOCALBASE},g' 32SUBST_SED.paths= -e 's,/usr/local,${LOCALBASE},g'
32 33
33SUBST_CLASSES+= perl 34SUBST_CLASSES+= perl
34SUBST_STAGE.perl= pre-configure 35SUBST_STAGE.perl= pre-configure
cvs diff -r1.6 -r1.7 pkgsrc/graphics/pfstools/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/pfstools/options.mk 2019/08/30 17:01:34 1.6
+++ pkgsrc/graphics/pfstools/options.mk 2019/10/28 09:42:28 1.7
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: options.mk,v 1.6 2019/08/30 17:01:34 nia Exp $ 1# $NetBSD: options.mk,v 1.7 2019/10/28 09:42:28 kamil Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pfstools 3PKG_OPTIONS_VAR= PKG_OPTIONS.pfstools
4PKG_SUPPORTED_OPTIONS= fftw imagemagick octave qt opengl 4PKG_SUPPORTED_OPTIONS= fftw imagemagick octave opengl
5 5
6PKG_SUGGESTED_OPTIONS.Darwin+= opengl 6PKG_SUGGESTED_OPTIONS.Darwin+= opengl
7 7
8PLIST_VARS+= fftw im octave qt gl 8PLIST_VARS+= fftw im octave gl
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12.if !empty(PKG_OPTIONS:Mfftw) 12.if !empty(PKG_OPTIONS:Mfftw)
13.include "../../math/fftwf/buildlink3.mk" 13.include "../../math/fftwf/buildlink3.mk"
14PLIST.fftw= yes 14PLIST.fftw= yes
15CMAKE_ARGS+= -DWITH_FFTW=YES 15CMAKE_ARGS+= -DWITH_FFTW=YES
16.else 16.else
17CMAKE_ARGS+= -DWITH_FFTW=NO 17CMAKE_ARGS+= -DWITH_FFTW=NO
18.endif 18.endif
19 19
20.if !empty(PKG_OPTIONS:Mimagemagick) 20.if !empty(PKG_OPTIONS:Mimagemagick)
21.include "../../graphics/ImageMagick6/buildlink3.mk" 21.include "../../graphics/ImageMagick6/buildlink3.mk"
@@ -28,33 +28,24 @@ CMAKE_ARGS+= -DWITH_ImageMagick=NO @@ -28,33 +28,24 @@ CMAKE_ARGS+= -DWITH_ImageMagick=NO
28.if !empty(PKG_OPTIONS:Moctave) 28.if !empty(PKG_OPTIONS:Moctave)
29.include "../../math/octave/buildlink3.mk" 29.include "../../math/octave/buildlink3.mk"
30REPLACE_OCTAVE+= src/octave/pfsoctavelum src/octave/pfsoctavergb 30REPLACE_OCTAVE+= src/octave/pfsoctavelum src/octave/pfsoctavergb
31REPLACE_OCTAVE+= src/octave/pfsstat 31REPLACE_OCTAVE+= src/octave/pfsstat
32.include "../../math/octave/octave.mk" 32.include "../../math/octave/octave.mk"
33PLIST.octave= yes 33PLIST.octave= yes
34PLIST_SUBST+= OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR:S/${BUILDLINK_PREFIX.octave}\///} 34PLIST_SUBST+= OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR:S/${BUILDLINK_PREFIX.octave}\///}
35PLIST_SUBST+= OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR:S/${BUILDLINK_PREFIX.octave}\///} 35PLIST_SUBST+= OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR:S/${BUILDLINK_PREFIX.octave}\///}
36CMAKE_ARGS+= -DWITH_Octave=YES 36CMAKE_ARGS+= -DWITH_Octave=YES
37.else 37.else
38CMAKE_ARGS+= -DWITH_Octave=NO 38CMAKE_ARGS+= -DWITH_Octave=NO
39.endif 39.endif
40 40
41.if !empty(PKG_OPTIONS:Mqt) 
42.include "../../x11/qt4-libs/buildlink3.mk" 
43.include "../../x11/qt4-tools/buildlink3.mk" 
44PLIST.qt= yes 
45CMAKE_ARGS+= -DWITH_QT=YES 
46.else 
47CMAKE_ARGS+= -DWITH_QT=NO 
48.endif 
49 
50.if !empty(PKG_OPTIONS:Mopengl) 41.if !empty(PKG_OPTIONS:Mopengl)
51. if ${OPSYS} != "Darwin" 42. if ${OPSYS} != "Darwin"
52.include "../../graphics/freeglut/buildlink3.mk" 43.include "../../graphics/freeglut/buildlink3.mk"
53. endif 44. endif
54# XXX nasty hack 45# XXX nasty hack
55CXXFLAGS.NetBSD+= -lpthread 46CXXFLAGS.NetBSD+= -lpthread
56PLIST.gl= yes 47PLIST.gl= yes
57CMAKE_ARGS+= -DWITH_pfsglview=YES 48CMAKE_ARGS+= -DWITH_pfsglview=YES
58.else 49.else
59CMAKE_ARGS+= -DWITH_pfsglview=NO 50CMAKE_ARGS+= -DWITH_pfsglview=NO
60.endif 51.endif