Thu Feb 25 13:37:48 2016 UTC ()
Use OPSYSVARS.


(jperkin)
diff -r1.48 -r1.49 pkgsrc/graphics/MesaLib/options.mk
diff -r1.4 -r1.5 pkgsrc/graphics/MesaLib7/Makefile
diff -r1.64 -r1.65 pkgsrc/graphics/aqsis/Makefile
diff -r1.20 -r1.21 pkgsrc/graphics/asymptote/Makefile
diff -r1.6 -r1.7 pkgsrc/graphics/cairo/hacks.mk
diff -r1.9 -r1.10 pkgsrc/graphics/clutter/options.mk
diff -r1.3 -r1.4 pkgsrc/graphics/cogl/options.mk
diff -r1.42 -r1.43 pkgsrc/graphics/cqcam/Makefile
diff -r1.57 -r1.58 pkgsrc/graphics/darktable/Makefile
diff -r1.20 -r1.21 pkgsrc/graphics/evas/Makefile
diff -r1.101 -r1.102 pkgsrc/graphics/freetype2/Makefile
diff -r1.27 -r1.28 pkgsrc/graphics/glitz/Makefile
diff -r1.16 -r1.17 pkgsrc/graphics/impress/Makefile
diff -r1.34 -r1.35 pkgsrc/graphics/libcaca/Makefile
diff -r1.84 -r1.85 pkgsrc/graphics/librsvg/Makefile
diff -r1.204 -r1.205 pkgsrc/graphics/netpbm/Makefile
diff -r1.7 -r1.8 pkgsrc/graphics/opencsg/Makefile
diff -r1.3 -r1.4 pkgsrc/graphics/pfstools/options.mk
diff -r1.84 -r1.85 pkgsrc/graphics/tuxpaint/Makefile
diff -r1.88 -r1.89 pkgsrc/graphics/xv/Makefile
cvs diff -r1.48 -r1.49 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2016/02/23 14:40:36 1.48
+++ pkgsrc/graphics/MesaLib/options.mk 2016/02/25 13:37:46 1.49
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.48 2016/02/23 14:40:36 tnn Exp $ 1# $NetBSD: options.mk,v 1.49 2016/02/25 13:37:46 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4PKG_SUPPORTED_OPTIONS= llvm dri 4PKG_SUPPORTED_OPTIONS= llvm dri
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7# The LLVM option enables JIT accelerated software rendering and 7# The LLVM option enables JIT accelerated software rendering and
8# is also required to support the latest RADEON GPUs, so enable it 8# is also required to support the latest RADEON GPUs, so enable it
9# by default on platforms where such GPUs might be encountered. 9# by default on platforms where such GPUs might be encountered.
10.if \ 10.if \
11 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \ 11 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \
12 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) || \ 12 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) || \
13 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) || \ 13 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) || \
14 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*arm*) 14 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*arm*)
@@ -56,29 +56,27 @@ CONFIGURE_ARGS+= --enable-gles2 @@ -56,29 +56,27 @@ CONFIGURE_ARGS+= --enable-gles2
56.if \ 56.if \
57 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \ 57 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \
58 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) || \ 58 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) || \
59 !empty(MACHINE_PLATFORM:MLinux-*-i386) || \ 59 !empty(MACHINE_PLATFORM:MLinux-*-i386) || \
60 !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \ 60 !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \
61 !empty(MACHINE_PLATFORM:MFreeBSD-1[0-9].*-x86_64) || \ 61 !empty(MACHINE_PLATFORM:MFreeBSD-1[0-9].*-x86_64) || \
62 !empty(MACHINE_PLATFORM:MDragonFly-*-x86_64) 62 !empty(MACHINE_PLATFORM:MDragonFly-*-x86_64)
63CONFIGURE_ARGS+= --enable-glx-tls 63CONFIGURE_ARGS+= --enable-glx-tls
64.else 64.else
65CONFIGURE_ARGS+= --disable-glx-tls 65CONFIGURE_ARGS+= --disable-glx-tls
66.endif 66.endif
67 67
68# DRI on Linux needs either sysfs or udev 68# DRI on Linux needs either sysfs or udev
69.if ${OPSYS} == "Linux" 69CONFIGURE_ARGS.Linux+= --enable-sysfs
70CONFIGURE_ARGS+= --enable-sysfs 
71.endif 
72 70
73PLIST.dri= yes 71PLIST.dri= yes
74 72
75.if ${OPSYS} != "Darwin" 73.if ${OPSYS} != "Darwin"
76BUILDLINK_DEPMETHOD.libpciaccess= full 74BUILDLINK_DEPMETHOD.libpciaccess= full
77.include "../../sysutils/libpciaccess/buildlink3.mk" 75.include "../../sysutils/libpciaccess/buildlink3.mk"
78.endif 76.endif
79.include "../../graphics/MesaLib/dri.mk" 77.include "../../graphics/MesaLib/dri.mk"
80 78
81DRI_DRIVERS= # 79DRI_DRIVERS= #
82GALLIUM_DRIVERS= # 80GALLIUM_DRIVERS= #
83 81
84# Software rasterizer 82# Software rasterizer
cvs diff -r1.4 -r1.5 pkgsrc/graphics/MesaLib7/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib7/Attic/Makefile 2015/12/05 21:25:45 1.4
+++ pkgsrc/graphics/MesaLib7/Attic/Makefile 2016/02/25 13:37:46 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2015/12/05 21:25:45 adam Exp $ 1# $NetBSD: Makefile,v 1.5 2016/02/25 13:37:46 jperkin Exp $
2 2
3DISTNAME?= ${MESA_DISTNAME} 3DISTNAME?= ${MESA_DISTNAME}
4PKGNAME= MesaLib7-${MESA_PKGVERSION} 4PKGNAME= MesaLib7-${MESA_PKGVERSION}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= ${MESA_SITES} 7MASTER_SITES= ${MESA_SITES}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mesa3d.org/ 11HOMEPAGE= http://www.mesa3d.org/
12COMMENT= Graphics library similar to SGI's OpenGL 12COMMENT= Graphics library similar to SGI's OpenGL
13 13
14GNU_CONFIGURE_PREFIX= ${LOCALBASE}/MesaLib7 14GNU_CONFIGURE_PREFIX= ${LOCALBASE}/MesaLib7
@@ -44,31 +44,32 @@ CONFIGURE_ARGS+= --disable-egl @@ -44,31 +44,32 @@ CONFIGURE_ARGS+= --disable-egl
44.include "glx-config.mk" 44.include "glx-config.mk"
45 45
46PYTHON_FOR_BUILD_ONLY= tool 46PYTHON_FOR_BUILD_ONLY= tool
47PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 7.11.2 47PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 7.11.2
48 48
49MAKE_ENV+= MAKE=${GMAKE:Q} 49MAKE_ENV+= MAKE=${GMAKE:Q}
50 50
51.include "../../mk/compiler.mk" 51.include "../../mk/compiler.mk"
52 52
53.if !empty(PKGSRC_COMPILER:Mccc) 53.if !empty(PKGSRC_COMPILER:Mccc)
54CFLAGS+= -D__FUNCTION__=__FILE__ 54CFLAGS+= -D__FUNCTION__=__FILE__
55.endif 55.endif
56 56
57.include "../../mk/bsd.prefs.mk" 57.if !empty(PKGSRC_COMPILER:Mclang)
58.if ${OPSYS} == "MirBSD" 58CFLAGS+= -no-integrated-as -fvisibility=hidden
59BUILDLINK_TRANSFORM+= rm:-fvisibility=hidden 
60.endif 59.endif
61 60
 61BUILDLINK_TRANSFORM.MirBSD+= rm:-fvisibility=hidden
 62
62.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 63.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
63# XXX This is not quite enough: we will need to patch the makefile 64# XXX This is not quite enough: we will need to patch the makefile
64# because it bogusly tries to reuse objects for native tools and target 65# because it bogusly tries to reuse objects for native tools and target
65# libraries, and for cross-compiling the objects need to be built 66# libraries, and for cross-compiling the objects need to be built
66# separately. Alternatively, we could just update Mesa to something 67# separately. Alternatively, we could just update Mesa to something
67# less prehistoric... 68# less prehistoric...
68SUBST_CLASSES+= nativecc 69SUBST_CLASSES+= nativecc
69SUBST_STAGE.nativecc= pre-configure 70SUBST_STAGE.nativecc= pre-configure
70SUBST_MESSAGE.nativecc= Fix makefiles to compile tools with native cc. 71SUBST_MESSAGE.nativecc= Fix makefiles to compile tools with native cc.
71SUBST_FILES.nativecc+= src/glsl/Makefile 72SUBST_FILES.nativecc+= src/glsl/Makefile
72SUBST_SED.nativecc+= -e 's,$$(CC),$$(APP_CC),g' 73SUBST_SED.nativecc+= -e 's,$$(CC),$$(APP_CC),g'
73SUBST_SED.nativecc+= -e 's,$$(CXX),$$(APP_CXX),g' 74SUBST_SED.nativecc+= -e 's,$$(CXX),$$(APP_CXX),g'
74MAKE_FLAGS+= APP_CC=${NATIVE_CC:Q} 75MAKE_FLAGS+= APP_CC=${NATIVE_CC:Q}
@@ -113,34 +114,24 @@ post-extract: @@ -113,34 +114,24 @@ post-extract:
113.if !empty(PKG_OPTIONS:Mdri) && (${OPSYS} == "SunOS") 114.if !empty(PKG_OPTIONS:Mdri) && (${OPSYS} == "SunOS")
114 ${CP} ${FILESDIR}/mapfile.externs ${WRKSRC}/src/mesa/drivers/dri/ 115 ${CP} ${FILESDIR}/mapfile.externs ${WRKSRC}/src/mesa/drivers/dri/
115.endif 116.endif
116 ${CP} ${FILESDIR}/gen_matypes.awk ${WRKSRC}/src/mesa/x86 117 ${CP} ${FILESDIR}/gen_matypes.awk ${WRKSRC}/src/mesa/x86
117 ${CP} ${FILESDIR}/gen_matypes.sh ${WRKSRC}/src/mesa/x86 118 ${CP} ${FILESDIR}/gen_matypes.sh ${WRKSRC}/src/mesa/x86
118 ${CHMOD} a+x ${WRKSRC}/src/mesa/x86/gen_matypes.sh 119 ${CHMOD} a+x ${WRKSRC}/src/mesa/x86/gen_matypes.sh
119 120
120# 121#
121# remove include files installed respectively by ../glu and ../glut 122# remove include files installed respectively by ../glu and ../glut
122# 123#
123pre-install: 124pre-install:
124 ${RM} -f ${WRKSRC}/include/GL/glu*.h 125 ${RM} -f ${WRKSRC}/include/GL/glu*.h
125 126
126.include "../../mk/compiler.mk" 
127 
128.if !empty(PKGSRC_COMPILER:Mclang) 
129CFLAGS+= -no-integrated-as -fvisibility=hidden 
130.endif 
131 
132.if ${OPSYS} == "MirBSD" 
133BUILDLINK_TRANSFORM+= rm:-fvisibility=hidden 
134.endif 
135 
136.include "../../lang/python/tool.mk" 127.include "../../lang/python/tool.mk"
137BUILDLINK_DEPMETHOD.libxml2?= build 128BUILDLINK_DEPMETHOD.libxml2?= build
138.include "../../textproc/libxml2/buildlink3.mk" 129.include "../../textproc/libxml2/buildlink3.mk"
139BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.11 130BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.11
140.include "../../x11/glproto/buildlink3.mk" 131.include "../../x11/glproto/buildlink3.mk"
141.include "../../x11/libX11/buildlink3.mk" 132.include "../../x11/libX11/buildlink3.mk"
142.include "../../x11/libXi/buildlink3.mk" 133.include "../../x11/libXi/buildlink3.mk"
143.include "../../x11/libXmu/buildlink3.mk" 134.include "../../x11/libXmu/buildlink3.mk"
144.include "../../x11/libXext/buildlink3.mk" 135.include "../../x11/libXext/buildlink3.mk"
145.include "../../x11/libXt/buildlink3.mk" 136.include "../../x11/libXt/buildlink3.mk"
146.include "../../mk/bsd.pkg.mk" 137.include "../../mk/bsd.pkg.mk"
cvs diff -r1.64 -r1.65 pkgsrc/graphics/aqsis/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/aqsis/Attic/Makefile 2015/06/07 13:58:08 1.64
+++ pkgsrc/graphics/aqsis/Attic/Makefile 2016/02/25 13:37:46 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.64 2015/06/07 13:58:08 wiedi Exp $ 1# $NetBSD: Makefile,v 1.65 2016/02/25 13:37:46 jperkin Exp $
2# 2#
3 3
4DISTNAME= aqsis-1.8.1 4DISTNAME= aqsis-1.8.1
5PKGREVISION= 24 5PKGREVISION= 24
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqsis/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqsis/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.aqsis.org/ 10HOMEPAGE= http://www.aqsis.org/
11COMMENT= Renderman clone 11COMMENT= Renderman clone
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND modified-bsd
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
@@ -27,30 +27,27 @@ CMAKE_ARG_PATH= .. @@ -27,30 +27,27 @@ CMAKE_ARG_PATH= ..
27pre-configure: 27pre-configure:
28 mkdir ${WRKSRC}/build 28 mkdir ${WRKSRC}/build
29 29
30# 30#
31# Something in cmake issues -ldl regardless of whether it's appropriate. 31# Something in cmake issues -ldl regardless of whether it's appropriate.
32# Kludge around it. 32# Kludge around it.
33# 33#
34 34
35# This does not work; it sets CMAKE_DL_LIBS which the cmake documentation 35# This does not work; it sets CMAKE_DL_LIBS which the cmake documentation
36# says is where -ldl comes from, but this does not apparently prevent 36# says is where -ldl comes from, but this does not apparently prevent
37# cmake from issuing -ldl. 37# cmake from issuing -ldl.
38#CMAKE_ARGS+= -D CMAKE_DL_LIBS:STRING='${DL_LIBS}' 38#CMAKE_ARGS+= -D CMAKE_DL_LIBS:STRING='${DL_LIBS}'
39 39
40.include "../../mk/bsd.prefs.mk" 40BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl
41.if ${OPSYS} == "NetBSD" 
42BUILDLINK_TRANSFORM+= rm:-ldl 
43.endif 
44 41
45# 42#
46# Forcibly reprogram cmake's rpath substitution. 43# Forcibly reprogram cmake's rpath substitution.
47# 44#
48 45
49BLDIR= ${WRKDIR}/.buildlink/lib 46BLDIR= ${WRKDIR}/.buildlink/lib
50 47
51SUBST_CLASSES+= rpath 48SUBST_CLASSES+= rpath
52SUBST_STAGE.rpath= post-configure 49SUBST_STAGE.rpath= post-configure
53SUBST_FILES.rpath+= build/libs/math/cmake_install.cmake 50SUBST_FILES.rpath+= build/libs/math/cmake_install.cmake
54SUBST_FILES.rpath+= build/libs/util/cmake_install.cmake 51SUBST_FILES.rpath+= build/libs/util/cmake_install.cmake
55SUBST_FILES.rpath+= build/libs/riutil/cmake_install.cmake 52SUBST_FILES.rpath+= build/libs/riutil/cmake_install.cmake
56SUBST_FILES.rpath+= build/libs/slcomp/cmake_install.cmake 53SUBST_FILES.rpath+= build/libs/slcomp/cmake_install.cmake
cvs diff -r1.20 -r1.21 pkgsrc/graphics/asymptote/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/asymptote/Makefile 2015/12/12 20:44:13 1.20
+++ pkgsrc/graphics/asymptote/Makefile 2016/02/25 13:37:47 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2015/12/12 20:44:13 markd Exp $ 1# $NetBSD: Makefile,v 1.21 2016/02/25 13:37:47 jperkin Exp $
2# 2#
3 3
4DISTNAME= asymptote-2.15 4DISTNAME= asymptote-2.15
5PKGREVISION= 10 5PKGREVISION= 10
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asymptote/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asymptote/}
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9DISTFILES= ${DISTNAME}.src${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}.src${EXTRACT_SUFX}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://asymptote.sourceforge.net/ 12HOMEPAGE= http://asymptote.sourceforge.net/
13COMMENT= Powerful descriptive vector graphics language for technical drawings 13COMMENT= Powerful descriptive vector graphics language for technical drawings
14LICENSE= gnu-gpl-v3 AND gnu-lgpl-v3 14LICENSE= gnu-gpl-v3 AND gnu-lgpl-v3
@@ -34,37 +34,34 @@ USE_LANGUAGES= c c++ @@ -34,37 +34,34 @@ USE_LANGUAGES= c c++
34CONFIGURE_ARGS+= --enable-gc=system 34CONFIGURE_ARGS+= --enable-gc=system
35CONFIGURE_ARGS+= --infodir=${PREFIX}/info 35CONFIGURE_ARGS+= --infodir=${PREFIX}/info
36USE_TOOLS+= gmake makeinfo perl 36USE_TOOLS+= gmake makeinfo perl
37CFLAGS+= -DGC_NO_THREAD_REDIRECTS 37CFLAGS+= -DGC_NO_THREAD_REDIRECTS
38 38
39REPLACE_PYTHON+= GUI/*.py 39REPLACE_PYTHON+= GUI/*.py
40 40
41SUBST_CLASSES+= python 41SUBST_CLASSES+= python
42SUBST_STAGE.python= post-patch 42SUBST_STAGE.python= post-patch
43SUBST_FILES.python= Makefile.in 43SUBST_FILES.python= Makefile.in
44SUBST_MESSAGE.python= Fixing path to python interpreter. 44SUBST_MESSAGE.python= Fixing path to python interpreter.
45SUBST_SED.python+= -e "s|/usr/bin/env python|${PYTHONBIN:Q}|g" 45SUBST_SED.python+= -e "s|/usr/bin/env python|${PYTHONBIN:Q}|g"
46 46
 47# DragonFly has stripped makeinfo in the base - without texi2dvi.
 48OPSYSVARS+= BUILD_DEPENDS
 49BUILD_DEPENDS.DragonFly+= gtexinfo-[0-9]*:../../devel/gtexinfo
 50
47post-install: 51post-install:
48 ${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xasy.1x \ 52 ${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xasy.1x \
49 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xasy.1 53 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xasy.1
50 54
51.include "../../mk/bsd.prefs.mk" 
52 
53# DragonFly has stripped makeinfo in the base - without texi2dvi. 
54.if ${OPSYS} == "DragonFly" 
55BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo 
56.endif 
57 
58.include "../../devel/boehm-gc/buildlink3.mk" 55.include "../../devel/boehm-gc/buildlink3.mk"
59.include "../../devel/readline/buildlink3.mk" 56.include "../../devel/readline/buildlink3.mk"
60.include "../../devel/zlib/buildlink3.mk" 57.include "../../devel/zlib/buildlink3.mk"
61.include "../../lang/python/application.mk" 58.include "../../lang/python/application.mk"
62# next two could be split off into options 59# next two could be split off into options
63.include "../../math/fftw/buildlink3.mk" 60.include "../../math/fftw/buildlink3.mk"
64.include "../../math/gsl/buildlink3.mk" 61.include "../../math/gsl/buildlink3.mk"
65# freeglut too old, not recognized 62# freeglut too old, not recognized
66#.include "../../graphics/freeglut/buildlink3.mk" 63#.include "../../graphics/freeglut/buildlink3.mk"
67# recognized, but makes asy dump core during creation of documentation 64# recognized, but makes asy dump core during creation of documentation
68#.include "../../graphics/glut/buildlink3.mk" 65#.include "../../graphics/glut/buildlink3.mk"
69 66
70.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/graphics/cairo/hacks.mk (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/hacks.mk 2012/08/04 04:00:49 1.6
+++ pkgsrc/graphics/cairo/hacks.mk 2016/02/25 13:37:47 1.7
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1# $NetBSD: hacks.mk,v 1.6 2012/08/04 04:00:49 riastradh Exp $ 1# $NetBSD: hacks.mk,v 1.7 2016/02/25 13:37:47 jperkin Exp $
2 2
3.if !defined(CAIRO_HACKS_MK) 3.if !defined(CAIRO_HACKS_MK)
4CAIRO_HACKS_MK= defined 4CAIRO_HACKS_MK= defined
5 5
6### 6###
7### A workaround for MacPorts Ticket #31469 7### A workaround for MacPorts Ticket #31469
8### https://trac.macports.org/ticket/31469 8### https://trac.macports.org/ticket/31469
9### 9###
10.if ${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mgcc) 10.if ${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mgcc)
11_BAD_GCC_BUILD!= ${CC} --version | (${GREP} -c 'i686-apple-darwin11-llvm-gcc-4\.2\ .*build\ 5658' || ${TRUE}) 11_BAD_GCC_BUILD!= ${CC} --version | (${GREP} -c 'i686-apple-darwin11-llvm-gcc-4\.2\ .*build\ 5658' || ${TRUE})
12. if ${_BAD_GCC_BUILD} == "1" 12. if ${_BAD_GCC_BUILD} == "1"
13PKG_HACKS+= llvm-lto-hack 13PKG_HACKS+= llvm-lto-hack
14BUILDLINK_TRANSFORM+= rm:-flto 14BUILDLINK_TRANSFORM+= rm:-flto
15. endif 15. endif
16.endif 16.endif
17 17
18# Workaround so that pthread is found on MirBSD 18# Workaround so that pthread is found on MirBSD
19.if ${OPSYS} == "MirBSD" 19OPSYSVARS+= PTHREAD_CFLAGS
20PTHREAD_CFLAGS=-fhonour-copts 20PTHREAD_CFLAGS.MirBSD= -fhonour-copts
21.endif 
22 21
23# 22#
24# Workaround for "the pixman problem" with netbsd-5 native X. The 23# Workaround for "the pixman problem" with netbsd-5 native X. The
25# problem is that if the order of rpath options isn't right when 24# problem is that if the order of rpath options isn't right when
26# linking client programs (right being /usr/pkg before /usr/X11R7), 25# linking client programs (right being /usr/pkg before /usr/X11R7),
27# the native pixman library gets pulled in instead of the pkgsrc one, 26# the native pixman library gets pulled in instead of the pkgsrc one,
28# and then the link fails with undefined symbols from cairo; these are 27# and then the link fails with undefined symbols from cairo; these are
29# symbols that are present only in the newer pkgsrc pixman. The 28# symbols that are present only in the newer pkgsrc pixman. The
30# problem with rpath options and ordering is complicated by there 29# problem with rpath options and ordering is complicated by there
31# being multiple ways of writing them (-R, -Wl,-rpath, etc.) and as 30# being multiple ways of writing them (-R, -Wl,-rpath, etc.) and as
32# many packages just blat out flags from various sources they don't 31# many packages just blat out flags from various sources they don't
33# necessarily match or come out in the right order. 32# necessarily match or come out in the right order.
34# 33#
cvs diff -r1.9 -r1.10 pkgsrc/graphics/clutter/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/clutter/options.mk 2015/08/31 10:59:04 1.9
+++ pkgsrc/graphics/clutter/options.mk 2016/02/25 13:37:47 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.9 2015/08/31 10:59:04 jperkin Exp $ 1# $NetBSD: options.mk,v 1.10 2016/02/25 13:37:47 jperkin Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.clutter 4PKG_OPTIONS_VAR= PKG_OPTIONS.clutter
5PKG_SUPPORTED_OPTIONS= introspection x11 5PKG_SUPPORTED_OPTIONS= introspection x11
6PKG_SUGGESTED_OPTIONS= introspection x11 6PKG_SUGGESTED_OPTIONS= introspection x11
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10PLIST_VARS+= introspection x11 osx 10PLIST_VARS+= introspection x11 osx
11 11
12.if !empty(PKG_OPTIONS:Mintrospection) 12.if !empty(PKG_OPTIONS:Mintrospection)
13PLIST.introspection= yes 13PLIST.introspection= yes
14BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5 14BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5
@@ -28,17 +28,15 @@ PLIST.x11= yes @@ -28,17 +28,15 @@ PLIST.x11= yes
28CONFIGURE_ARGS+= --enable-x11-backend 28CONFIGURE_ARGS+= --enable-x11-backend
29CONFIGURE_ARGS+= --with-imagebackend=gdk-pixbuf 29CONFIGURE_ARGS+= --with-imagebackend=gdk-pixbuf
30CONFIGURE_ARGS+= --enable-xinput 30CONFIGURE_ARGS+= --enable-xinput
31BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.0 31BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.0
32.include "../../graphics/MesaLib/buildlink3.mk" 32.include "../../graphics/MesaLib/buildlink3.mk"
33.include "../../x11/libX11/buildlink3.mk" 33.include "../../x11/libX11/buildlink3.mk"
34.include "../../x11/libXdamage/buildlink3.mk" 34.include "../../x11/libXdamage/buildlink3.mk"
35BUILDLINK_API_DEPENDS.libXcomposite+= libXcomposite>=0.4 35BUILDLINK_API_DEPENDS.libXcomposite+= libXcomposite>=0.4
36.include "../../x11/libXcomposite/buildlink3.mk" 36.include "../../x11/libXcomposite/buildlink3.mk"
37.include "../../x11/libXi/buildlink3.mk" 37.include "../../x11/libXi/buildlink3.mk"
38.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 38.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
39.else 39.else
40CONFIGURE_ARGS+= --without-x 40CONFIGURE_ARGS+= --without-x
41. if ${OPSYS} == "Darwin" 41CONFIGURE_ARGS.Darwin+= --with-quartz-backend
42CONFIGURE_ARGS+= --with-quartz-backend 
43. endif 
44.endif 42.endif
cvs diff -r1.3 -r1.4 pkgsrc/graphics/cogl/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/cogl/options.mk 2014/01/26 08:43:29 1.3
+++ pkgsrc/graphics/cogl/options.mk 2016/02/25 13:37:47 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2014/01/26 08:43:29 obache Exp $ 1# $NetBSD: options.mk,v 1.4 2016/02/25 13:37:47 jperkin Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.cogl 4PKG_OPTIONS_VAR= PKG_OPTIONS.cogl
5PKG_SUPPORTED_OPTIONS= introspection x11 5PKG_SUPPORTED_OPTIONS= introspection x11
6PKG_SUGGESTED_OPTIONS= introspection x11 6PKG_SUGGESTED_OPTIONS= introspection x11
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10PLIST_VARS+= introspection x11 10PLIST_VARS+= introspection x11
11 11
12.if !empty(PKG_OPTIONS:Mintrospection) 12.if !empty(PKG_OPTIONS:Mintrospection)
13PLIST.introspection= yes 13PLIST.introspection= yes
14BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5 14BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5
@@ -27,19 +27,19 @@ CONFIGURE_ARGS+= --with-gl-libname=libGL @@ -27,19 +27,19 @@ CONFIGURE_ARGS+= --with-gl-libname=libGL
27.include "../../graphics/MesaLib/buildlink3.mk" 27.include "../../graphics/MesaLib/buildlink3.mk"
28.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXext/buildlink3.mk" 29.include "../../x11/libXext/buildlink3.mk"
30.include "../../x11/libXdamage/buildlink3.mk" 30.include "../../x11/libXdamage/buildlink3.mk"
31BUILDLINK_API_DEPENDS.libXfixes+= libXfixes>=3 31BUILDLINK_API_DEPENDS.libXfixes+= libXfixes>=3
32.include "../../x11/libXfixes/buildlink3.mk" 32.include "../../x11/libXfixes/buildlink3.mk"
33BUILDLINK_API_DEPENDS.libXcomposite+= libXcomposite>=0.4 33BUILDLINK_API_DEPENDS.libXcomposite+= libXcomposite>=0.4
34.include "../../x11/libXcomposite/buildlink3.mk" 34.include "../../x11/libXcomposite/buildlink3.mk"
35BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.2 35BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.2
36.include "../../x11/libXrandr/buildlink3.mk" 36.include "../../x11/libXrandr/buildlink3.mk"
37.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 37.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
38.else 38.else
39CONFIGURE_ARGS+= --without-x 39CONFIGURE_ARGS+= --without-x
 40CONFIGURE_ARGS.Darwin+= --with-quartz-image
40.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
41. if ${OPSYS} == Darwin 42. if ${OPSYS} == Darwin
42PLIST.osx= yes 43PLIST.osx= yes
43CONFIGURE_ARGS+= --with-quartz-image 
44. endif 44. endif
45.endif 45.endif
cvs diff -r1.42 -r1.43 pkgsrc/graphics/cqcam/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cqcam/Makefile 2014/01/11 14:42:03 1.42
+++ pkgsrc/graphics/cqcam/Makefile 2016/02/25 13:37:47 1.43
@@ -1,33 +1,31 @@ @@ -1,33 +1,31 @@
1# $NetBSD: Makefile,v 1.42 2014/01/11 14:42:03 adam Exp $ 1# $NetBSD: Makefile,v 1.43 2016/02/25 13:37:47 jperkin Exp $
2# 2#
3 3
4DISTNAME= cqcam-0.91 4DISTNAME= cqcam-0.91
5PKGREVISION= 8 5PKGREVISION= 8
6CATEGORIES= graphics x11 6CATEGORIES= graphics x11
7MASTER_SITES= http://piki.org/patrick/cqcam/ 7MASTER_SITES= http://piki.org/patrick/cqcam/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://piki.org/patrick/cqcam/ 10HOMEPAGE= http://piki.org/patrick/cqcam/
11COMMENT= Free Color QuickCam control program 11COMMENT= Free Color QuickCam control program
12 12
13.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
14 14
15#NOT_FOR_UNPRIVILEGED= yes # seems to need setuid for everything 
16.if ${OPSYS} == "SunOS" 
17# Tries to install a device driver with unrestricted access to all 15# Tries to install a device driver with unrestricted access to all
18# hardware ports, which is also specific to i86pc platforms. 16# hardware ports, which is also specific to i86pc platforms.
19NOT_FOR_UNPRIVILEGED= yes 17OPSYSVARS+= NOT_FOR_UNPRIVILEGED
20.endif 18NOT_FOR_UNPRIVILEGED.SunOS= yes
21 19
22.if ${MACHINE_ARCH} != "i386" 20.if ${MACHINE_ARCH} != "i386"
23CONFIGURE_ARGS+= --disable-asm 21CONFIGURE_ARGS+= --disable-asm
24.endif 22.endif
25 23
26GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
27CONFIGURE_ARGS+= --without-xview 25CONFIGURE_ARGS+= --without-xview
28USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
29 27
30CONFIGURE_ENV+= TCLCONFIG_SH=${TCLCONFIG_SH:Q} 28CONFIGURE_ENV+= TCLCONFIG_SH=${TCLCONFIG_SH:Q}
31CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include 29CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include
32CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib 30CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib
33 31
cvs diff -r1.57 -r1.58 pkgsrc/graphics/darktable/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/Makefile 2015/10/10 01:58:09 1.57
+++ pkgsrc/graphics/darktable/Makefile 2016/02/25 13:37:47 1.58
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.57 2015/10/10 01:58:09 ryoon Exp $ 1# $NetBSD: Makefile,v 1.58 2016/02/25 13:37:47 jperkin Exp $
2 2
3DISTNAME= darktable-1.2.3 3DISTNAME= darktable-1.2.3
4PKGREVISION= 12 4PKGREVISION= 12
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=darktable/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=darktable/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.darktable.org/ 10HOMEPAGE= http://www.darktable.org/
11COMMENT= Photography workflow application 11COMMENT= Photography workflow application
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
@@ -39,29 +39,27 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX @@ -39,29 +39,27 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX
39# NetBSD 6 libm is the first with exp2f(3) 39# NetBSD 6 libm is the first with exp2f(3)
40#NOT_FOR_PLATFORM= NetBSD-4*-* NetBSD-5.[0-8]*-* 40#NOT_FOR_PLATFORM= NetBSD-4*-* NetBSD-5.[0-8]*-*
41 41
42# Hard-coded use of SSE2 42# Hard-coded use of SSE2
43ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 43ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64
44 44
45.include "../../mk/bsd.fast.prefs.mk" 45.include "../../mk/bsd.fast.prefs.mk"
46.if ${MACHINE_ARCH} == "i386" 46.if ${MACHINE_ARCH} == "i386"
47# SSE alignment issues 47# SSE alignment issues
48GCC_REQD+= 4.2 48GCC_REQD+= 4.2
49CFLAGS+= -mstackrealign -msse2 -march=i686 49CFLAGS+= -mstackrealign -msse2 -march=i686
50.endif 50.endif
51 51
52.if ${OPSYS} == "NetBSD" 52CFLAGS.NetBSD+= -D_NETBSD_SOURCE
53CFLAGS+= -D_NETBSD_SOURCE 
54.endif 
55 53
56CHECK_PORTABILITY_SKIP+= packaging/macosx/start 54CHECK_PORTABILITY_SKIP+= packaging/macosx/start
57 55
58pre-configure: 56pre-configure:
59 ${MKDIR} ${WRKSRC}/pkgsrc_build 57 ${MKDIR} ${WRKSRC}/pkgsrc_build
60 58
61# wants Clearlooks at runtime 59# wants Clearlooks at runtime
62DEPENDS+= gtk2-engines-[0-9]*:../../x11/gtk2-engines 60DEPENDS+= gtk2-engines-[0-9]*:../../x11/gtk2-engines
63 61
64BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1 62BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1
65 63
66.include "../../databases/sqlite3/buildlink3.mk" 64.include "../../databases/sqlite3/buildlink3.mk"
67.include "../../devel/GConf/buildlink3.mk" 65.include "../../devel/GConf/buildlink3.mk"
cvs diff -r1.20 -r1.21 pkgsrc/graphics/evas/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/evas/Makefile 2016/02/14 13:14:06 1.20
+++ pkgsrc/graphics/evas/Makefile 2016/02/25 13:37:47 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2016/02/14 13:14:06 jperkin Exp $ 1# $NetBSD: Makefile,v 1.21 2016/02/25 13:37:47 jperkin Exp $
2 2
3PKGREVISION= 2 3PKGREVISION= 2
4 4
5COMMENT= Enlightened Canvas Library 5COMMENT= Enlightened Canvas Library
6 6
7.include "Makefile.common" 7.include "Makefile.common"
8 8
9CONFIGURE_ARGS+= --enable-font-loader-eet 9CONFIGURE_ARGS+= --enable-font-loader-eet
10CONFIGURE_ENV+= EET_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.eet}/lib -L${BUILDLINK_PREFIX.eet}/lib -leet" 10CONFIGURE_ENV+= EET_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.eet}/lib -L${BUILDLINK_PREFIX.eet}/lib -leet"
11 11
12PKGCONFIG_OVERRIDE= evas.pc.in 12PKGCONFIG_OVERRIDE= evas.pc.in
13 13
14INSTALLATION_DIRS= lib/evas/modules/loaders lib/evas/modules/savers \ 14INSTALLATION_DIRS= lib/evas/modules/loaders lib/evas/modules/savers \
@@ -24,29 +24,27 @@ PLIST_SRC+= PLIST.cserve @@ -24,29 +24,27 @@ PLIST_SRC+= PLIST.cserve
24. endif 24. endif
25.elif ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD" || ${OPSYS} == "Linux" 25.elif ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD" || ${OPSYS} == "Linux"
26# No shm_open on OpenBSD/MirBSD 26# No shm_open on OpenBSD/MirBSD
27.else 27.else
28# Assume shm_open exists as sane default. 28# Assume shm_open exists as sane default.
29PLIST_SRC+= PLIST.cserve 29PLIST_SRC+= PLIST.cserve
30.endif 30.endif
31 31
32.if ${OPSYS} == "Darwin" 32.if ${OPSYS} == "Darwin"
33PLIST_SRC+= PLIST.Darwin 33PLIST_SRC+= PLIST.Darwin
34.endif 34.endif
35 35
36# Explicitly select cserve, avoids epoll/inotify. 36# Explicitly select cserve, avoids epoll/inotify.
37.if ${OPSYS} == "SunOS" 37CONFIGURE_ARGS.SunOS+= --enable-evas-cserve
38CONFIGURE_ARGS+= --enable-evas-cserve 38CONFIGURE_ARGS.SunOS+= --disable-evas-cserve2
39CONFIGURE_ARGS+= --disable-evas-cserve2 
40.endif 
41 39
42LIBS.SunOS+= -lsocket 40LIBS.SunOS+= -lsocket
43 41
44post-install: 42post-install:
45 ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING \ 43 ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING \
46 ${DESTDIR}${PREFIX}/share/doc/evas 44 ${DESTDIR}${PREFIX}/share/doc/evas
47 45
48.include "../../devel/eet/buildlink3.mk" 46.include "../../devel/eet/buildlink3.mk"
49.include "../../devel/eina/buildlink3.mk" 47.include "../../devel/eina/buildlink3.mk"
50.include "../../fonts/fontconfig/buildlink3.mk" 48.include "../../fonts/fontconfig/buildlink3.mk"
51.include "../../graphics/freetype2/buildlink3.mk" 49.include "../../graphics/freetype2/buildlink3.mk"
52.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.101 -r1.102 pkgsrc/graphics/freetype2/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/freetype2/Makefile 2016/01/10 21:16:33 1.101
+++ pkgsrc/graphics/freetype2/Makefile 2016/02/25 13:37:47 1.102
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.101 2016/01/10 21:16:33 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.102 2016/02/25 13:37:47 jperkin Exp $
2 2
3DISTNAME= freetype-2.6.2 3DISTNAME= freetype-2.6.2
4PKGNAME= ${DISTNAME:S/-/2-/} 4PKGNAME= ${DISTNAME:S/-/2-/}
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \ 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \
7 http://download.savannah.gnu.org/releases/freetype/ 7 http://download.savannah.gnu.org/releases/freetype/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.freetype.org/ 11HOMEPAGE= http://www.freetype.org/
12COMMENT= Font rendering engine and library API 12COMMENT= Font rendering engine and library API
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -29,29 +29,27 @@ LDFLAGS+= -framework Carbon @@ -29,29 +29,27 @@ LDFLAGS+= -framework Carbon
29PKGCONFIG_OVERRIDE= builds/unix/freetype2.in 29PKGCONFIG_OVERRIDE= builds/unix/freetype2.in
30 30
31.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
32.include "../../mk/compiler.mk" 32.include "../../mk/compiler.mk"
33 33
34.include "options.mk" 34.include "options.mk"
35 35
36# source code breaks strict aliasing in gcc>=2.95 36# source code breaks strict aliasing in gcc>=2.95
37.if !empty(CC_VERSION:Mgcc-[3-9]*) || !empty(CC_VERSION:Mgcc-2.95*) 37.if !empty(CC_VERSION:Mgcc-[3-9]*) || !empty(CC_VERSION:Mgcc-2.95*)
38CFLAGS+= -fno-strict-aliasing 38CFLAGS+= -fno-strict-aliasing
39.endif 39.endif
40 40
41# tell configure not to use unix-specific version of ftsystem.c on OpenBSD 41# tell configure not to use unix-specific version of ftsystem.c on OpenBSD
42.if ${OPSYS} == "OpenBSD" 42CONFIGURE_ENV.OpenBSD+= ac_cv_func_mmap_fixed_mapped=no
43CONFIGURE_ENV+= ac_cv_func_mmap_fixed_mapped=no 
44.endif 
45 43
46.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 44.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
47CONFIGURE_ENV+= CC_BUILD=${NATIVE_CC:Q} 45CONFIGURE_ENV+= CC_BUILD=${NATIVE_CC:Q}
48.endif 46.endif
49 47
50post-configure: 48post-configure:
51 cd ${WRKSRC} && ${LN} -s builds/unix/unix.mk config.mk 49 cd ${WRKSRC} && ${LN} -s builds/unix/unix.mk config.mk
52.if ${OPSYS} == "IRIX" 50.if ${OPSYS} == "IRIX"
53 ${MKDIR} ${WRKSRC}/.libs 51 ${MKDIR} ${WRKSRC}/.libs
54.endif 52.endif
55 53
56.include "../../archivers/bzip2/buildlink3.mk" 54.include "../../archivers/bzip2/buildlink3.mk"
57.include "../../devel/zlib/buildlink3.mk" 55.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.27 -r1.28 pkgsrc/graphics/glitz/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/glitz/Makefile 2015/04/25 14:23:11 1.27
+++ pkgsrc/graphics/glitz/Makefile 2016/02/25 13:37:47 1.28
@@ -1,35 +1,31 @@ @@ -1,35 +1,31 @@
1# $NetBSD: Makefile,v 1.27 2015/04/25 14:23:11 tnn Exp $ 1# $NetBSD: Makefile,v 1.28 2016/02/25 13:37:47 jperkin Exp $
2 2
3DISTNAME= glitz-0.5.6 3DISTNAME= glitz-0.5.6
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://cairographics.org/snapshots/ 6MASTER_SITES= http://cairographics.org/snapshots/
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://freedesktop.org/Software/glitz 9HOMEPAGE= http://freedesktop.org/Software/glitz
10COMMENT= OpenGL 2D graphics library and a backend for gl output in cairo 10COMMENT= OpenGL 2D graphics library and a backend for gl output in cairo
11 11
12USE_LANGUAGES+= c99 12USE_LANGUAGES+= c99
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15PKGCONFIG_OVERRIDE= src/agl/glitz-agl.pc.in src/glx/glitz-glx.pc.in \ 15PKGCONFIG_OVERRIDE= src/agl/glitz-agl.pc.in src/glx/glitz-glx.pc.in \
16 src/glitz.pc.in 16 src/glitz.pc.in
17 17
18PLIST_VARS+= agl 18PLIST_VARS+= agl
19.if exists(/System/Library/Frameworks/AGL.framework) 19.if exists(/System/Library/Frameworks/AGL.framework)
20PLIST.agl= yes 20PLIST.agl= yes
21CONFIGURE_ENV+= AGL_LIBS="-framework AGL" 21CONFIGURE_ENV+= AGL_LIBS="-framework AGL"
22.endif 22.endif
23 23
24.include "../../mk/bsd.prefs.mk" 
25 
26# This is for the benefit of the configure test; libglitz-glx already 24# This is for the benefit of the configure test; libglitz-glx already
27# links against libpthread. 25# links against libpthread.
28.if ${OPSYS} == "IRIX" 26BUILDLINK_TRANSFORM.IRIX+= l:GL:GL:pthread
29BUILDLINK_TRANSFORM+= l:GL:GL:pthread 
30.endif 
31 27
32.include "options.mk" 28.include "options.mk"
33 29
34.include "../../mk/pthread.buildlink3.mk" 30.include "../../mk/pthread.buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/graphics/impress/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/impress/Makefile 2014/01/09 12:11:12 1.16
+++ pkgsrc/graphics/impress/Makefile 2016/02/25 13:37:47 1.17
@@ -1,35 +1,31 @@ @@ -1,35 +1,31 @@
1# $NetBSD: Makefile,v 1.16 2014/01/09 12:11:12 jperkin Exp $ 1# $NetBSD: Makefile,v 1.17 2016/02/25 13:37:47 jperkin Exp $
2# 2#
3 3
4DISTNAME= imp1.1b9 4DISTNAME= imp1.1b9
5PKGNAME= impress-1.1b9 5PKGNAME= impress-1.1b9
6PKGREVISION= 3 6PKGREVISION= 3
7CATEGORIES= graphics 7CATEGORIES= graphics
8MASTER_SITES= http://www.ntlug.org/~ccox/impress/ 8MASTER_SITES= http://www.ntlug.org/~ccox/impress/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11# HOMEPAGE= http://www.ntlug.org/~ccox/impress/ 11# HOMEPAGE= http://www.ntlug.org/~ccox/impress/
12# AWOL, but ccox@ is listed as board member of ntlug.org 12# AWOL, but ccox@ is listed as board member of ntlug.org
13COMMENT= WYSIWYG vector graphics application 13COMMENT= WYSIWYG vector graphics application
14 14
15DEPENDS+= pstoedit>=3.19:../../graphics/pstoedit 15DEPENDS+= pstoedit>=3.19:../../graphics/pstoedit
16DEPENDS+= tcl>=8.3.2nb2:../../lang/tcl 16DEPENDS+= tcl>=8.3.2nb2:../../lang/tcl
17DEPENDS+= tk>=8.3.2nb1:../../x11/tk 17DEPENDS+= tk>=8.3.2nb1:../../x11/tk
18 18
19WRKSRC= ${WRKDIR}/impress-1.1b9 19WRKSRC= ${WRKDIR}/impress-1.1b9
20 20
21USE_LANGUAGES= c++ 21USE_LANGUAGES= c++
22 22
23INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} 23INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX}
24INSTALLATION_DIRS+= bin 24INSTALLATION_DIRS+= bin
25 25
26.include "../../mk/bsd.prefs.mk" 26BUILDLINK_TRANSFORM.SunOS+= rm:-static
27 
28.if ${OPSYS} == "SunOS" 
29BUILDLINK_TRANSFORM+= rm:-static 
30.endif 
31 27
32do-build: 28do-build:
33 cd ${WRKSRC} && make make_impress make_font3d 29 cd ${WRKSRC} && make make_impress make_font3d
34 30
35.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.34 -r1.35 pkgsrc/graphics/libcaca/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/libcaca/Makefile 2015/09/08 11:57:49 1.34
+++ pkgsrc/graphics/libcaca/Makefile 2016/02/25 13:37:47 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.34 2015/09/08 11:57:49 jperkin Exp $ 1# $NetBSD: Makefile,v 1.35 2016/02/25 13:37:47 jperkin Exp $
2 2
3DISTNAME= libcaca-0.99.beta18 3DISTNAME= libcaca-0.99.beta18
4PKGNAME= ${DISTNAME:S/beta//} 4PKGNAME= ${DISTNAME:S/beta//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://caca.zoy.org/files/libcaca/ 7MASTER_SITES= http://caca.zoy.org/files/libcaca/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://caca.zoy.org/ 10HOMEPAGE= http://caca.zoy.org/
11COMMENT= Graphics library that outputs text instead of pixels, in colour 11COMMENT= Graphics library that outputs text instead of pixels, in colour
12# LICENSE= wtfpl 12# LICENSE= wtfpl
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -17,21 +17,17 @@ USE_TOOLS+= pkg-config @@ -17,21 +17,17 @@ USE_TOOLS+= pkg-config
17USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19PKGCONFIG_OVERRIDE+= caca/caca.pc.in 19PKGCONFIG_OVERRIDE+= caca/caca.pc.in
20 20
21CHECK_FILES_SKIP+= ${PREFIX}/lib/libcucul.* 21CHECK_FILES_SKIP+= ${PREFIX}/lib/libcucul.*
22 22
23CONFIG_GUESS_OVERRIDE+= .auto/config.guess 23CONFIG_GUESS_OVERRIDE+= .auto/config.guess
24CONFIG_SUB_OVERRIDE+= .auto/config.sub 24CONFIG_SUB_OVERRIDE+= .auto/config.sub
25 25
26.include "options.mk" 26.include "options.mk"
27 27
28CONFIGURE_ARGS+= --disable-doc 28CONFIGURE_ARGS+= --disable-doc
29 29
30.include "../../mk/bsd.prefs.mk" 30LDFLAGS.Linux+= -ldl
31 
32.if ${OPSYS} == "Linux" 
33LDFLAGS+= -ldl 
34.endif 
35LDFLAGS.SunOS+= -lsocket -lnsl 31LDFLAGS.SunOS+= -lsocket -lnsl
36 32
37.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.84 -r1.85 pkgsrc/graphics/librsvg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/librsvg/Makefile 2015/09/27 02:03:54 1.84
+++ pkgsrc/graphics/librsvg/Makefile 2016/02/25 13:37:47 1.85
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.84 2015/09/27 02:03:54 tnn Exp $ 1# $NetBSD: Makefile,v 1.85 2016/02/25 13:37:47 jperkin Exp $
2 2
3DISTNAME= librsvg-2.40.9 3DISTNAME= librsvg-2.40.9
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= graphics gnome 5CATEGORIES= graphics gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/LibRsvg 10HOMEPAGE= https://wiki.gnome.org/LibRsvg
11COMMENT= SVG library for GNOME 11COMMENT= SVG library for GNOME
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14CONFLICTS+= librsvg2-gtk-[0-9]* librsvg2-[0-9]* 14CONFLICTS+= librsvg2-gtk-[0-9]* librsvg2-[0-9]*
@@ -19,31 +19,27 @@ USE_TOOLS+= pkg-config gmake @@ -19,31 +19,27 @@ USE_TOOLS+= pkg-config gmake
19USE_LANGUAGES+= c c++ 19USE_LANGUAGES+= c c++
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21CONFIGURE_ARGS+= --disable-tools 21CONFIGURE_ARGS+= --disable-tools
22CONFIGURE_ARGS+= --enable-introspection 22CONFIGURE_ARGS+= --enable-introspection
23CONFIGURE_ARGS+= --enable-Bsymbolic=auto 23CONFIGURE_ARGS+= --enable-Bsymbolic=auto
24 24
25PKGCONFIG_OVERRIDE= librsvg.pc.in 25PKGCONFIG_OVERRIDE= librsvg.pc.in
26 26
27TEST_TARGET= check 27TEST_TARGET= check
28 28
29BUILDLINK_API_DEPENDS.cairo+= cairo>=1.2.0 29BUILDLINK_API_DEPENDS.cairo+= cairo>=1.2.0
30BUILDLINK_API_DEPENDS.glib2+= glib2>=2.24.0 30BUILDLINK_API_DEPENDS.glib2+= glib2>=2.24.0
31 31
32.include "../../mk/bsd.prefs.mk" 32CONFIGURE_ARGS.Darwin+= --disable-Bsymbolic
33 
34.if ${OPSYS} == "Darwin" 
35CONFIGURE_ARGS+= --disable-Bsymbolic 
36.endif 
37 33
38BUILDLINK_DEPMETHOD.gobject-introspection+= build 34BUILDLINK_DEPMETHOD.gobject-introspection+= build
39.include "../../devel/gobject-introspection/buildlink3.mk" 35.include "../../devel/gobject-introspection/buildlink3.mk"
40.include "../../devel/glib2/buildlink3.mk" 36.include "../../devel/glib2/buildlink3.mk"
41.include "../../devel/pango/buildlink3.mk" 37.include "../../devel/pango/buildlink3.mk"
42.include "../../graphics/cairo/buildlink3.mk" 38.include "../../graphics/cairo/buildlink3.mk"
43BUILDLINK_DEPMETHOD.cairo-gobject+= build 39BUILDLINK_DEPMETHOD.cairo-gobject+= build
44.include "../../graphics/cairo-gobject/buildlink3.mk" 40.include "../../graphics/cairo-gobject/buildlink3.mk"
45.include "../../graphics/freetype2/buildlink3.mk" 41.include "../../graphics/freetype2/buildlink3.mk"
46.include "../../fonts/fontconfig/buildlink3.mk" 42.include "../../fonts/fontconfig/buildlink3.mk"
47BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.1 43BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.1
48.include "../../textproc/libcroco/buildlink3.mk" 44.include "../../textproc/libcroco/buildlink3.mk"
49.include "../../textproc/libxml2/buildlink3.mk" 45.include "../../textproc/libxml2/buildlink3.mk"
cvs diff -r1.204 -r1.205 pkgsrc/graphics/netpbm/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/netpbm/Makefile 2015/06/12 10:50:11 1.204
+++ pkgsrc/graphics/netpbm/Makefile 2016/02/25 13:37:47 1.205
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.204 2015/06/12 10:50:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.205 2016/02/25 13:37:47 jperkin Exp $
2 2
3DISTNAME= netpbm-10.68.02 3DISTNAME= netpbm-10.68.02
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= # 5MASTER_SITES= #
6PKGREVISION= 2 6PKGREVISION= 2
7# manually created from svn checkout of 7# manually created from svn checkout of
8# svn checkout http://svn.code.sf.net/p/netpbm/code/advanced netpbm 8# svn checkout http://svn.code.sf.net/p/netpbm/code/advanced netpbm
9# tar --exclude netpbm/.svn/\* -cvzf /archive/distfiles/netpbm-$VERSION.tar.gz netpbm 9# tar --exclude netpbm/.svn/\* -cvzf /archive/distfiles/netpbm-$VERSION.tar.gz netpbm
10# where VERSION comes from reading netpbm/doc/HISTORY 10# where VERSION comes from reading netpbm/doc/HISTORY
11# for the documentation: 11# for the documentation:
12# svn checkout http://svn.code.sf.net/p/netpbm/code/userguide netpbm-userguide 12# svn checkout http://svn.code.sf.net/p/netpbm/code/userguide netpbm-userguide
13# cd netpbm-userguide && for i in *.html; do python2.7 ../netpbm/buildtools/makeman $i; done && cd .. 13# cd netpbm-userguide && for i in *.html; do python2.7 ../netpbm/buildtools/makeman $i; done && cd ..
14# tar -cvzf /archive/distfiles/netpbm-docs-r${SVN_REVISION}.tar.gz netpbm-userguide/*.[0-9] 14# tar -cvzf /archive/distfiles/netpbm-docs-r${SVN_REVISION}.tar.gz netpbm-userguide/*.[0-9]
@@ -41,36 +41,35 @@ WRKSRC= ${WRKDIR}/netpbm @@ -41,36 +41,35 @@ WRKSRC= ${WRKDIR}/netpbm
41WRAPPER_REORDER_CMDS+= reorder:l:rle:netpbm 41WRAPPER_REORDER_CMDS+= reorder:l:rle:netpbm
42 42
43SUBST_CLASSES+= rgb_txt 43SUBST_CLASSES+= rgb_txt
44SUBST_STAGE.rgb_txt= post-patch 44SUBST_STAGE.rgb_txt= post-patch
45SUBST_MESSAGE.rgb_txt= Configure RGB_TXT 45SUBST_MESSAGE.rgb_txt= Configure RGB_TXT
46SUBST_FILES.rgb_txt= config.mk 46SUBST_FILES.rgb_txt= config.mk
47SUBST_SED.rgb_txt+= -e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.txt,' 47SUBST_SED.rgb_txt+= -e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.txt,'
48 48
49.include "../../mk/bsd.prefs.mk" 49.include "../../mk/bsd.prefs.mk"
50 50
51# only used if NEED_RUNTIME_PATH is set, so set it unconditionally 51# only used if NEED_RUNTIME_PATH is set, so set it unconditionally
52MAKE_FLAGS+= NETPBMLIB_RUNTIME_PATH=${PREFIX} 52MAKE_FLAGS+= NETPBMLIB_RUNTIME_PATH=${PREFIX}
53 53
54.if ${OPSYS} == "NetBSD" 54OPSYSVARS+= MAKE_FLAGS
55MAKE_FLAGS+= NEED_RUNTIME_PATH=Y 55MAKE_FLAGS.NetBSD+= NEED_RUNTIME_PATH=Y
56.elif ${OPSYS} == "Darwin" 56MAKE_FLAGS.Darwin+= NETPBMLIBTYPE=dylib
57MAKE_FLAGS+= NETPBMLIBTYPE=dylib 57MAKE_FLAGS.Darwin+= NETPBMLIBSUFFIX=dylib
58MAKE_FLAGS+= NETPBMLIBSUFFIX=dylib 58MAKE_FLAGS.SunOS+= LDSHLIB=-shared
59.elif ${OPSYS} == "SunOS" 59MAKE_FLAGS.SunOS+= NEED_RUNTIME_PATH=Y
60MAKE_FLAGS+= LDSHLIB=-shared 60MAKE_FLAGS.SunOS+= NETWORKLD="-lsocket -lnsl"
61MAKE_FLAGS+= NEED_RUNTIME_PATH=Y 61
62MAKE_FLAGS+= NETWORKLD="-lsocket -lnsl" 62.if ${OS_VARIANT} == "SCOOSR5"
63.elif ${OS_VARIANT} == "SCOOSR5" 
64MAKE_FLAGS+= NETWORKLD="-lsocket -lresolv" 63MAKE_FLAGS+= NETWORKLD="-lsocket -lresolv"
65.endif 64.endif
66 65
67INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 share/netpbm 66INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 share/netpbm
68 67
69post-extract: 68post-extract:
70 cd ${WRKSRC} && ${CP} config.mk.in config.mk 69 cd ${WRKSRC} && ${CP} config.mk.in config.mk
71 ${ECHO} "CFLAGS_SHLIB = -fPIC" >> ${WRKSRC}/config.mk 70 ${ECHO} "CFLAGS_SHLIB = -fPIC" >> ${WRKSRC}/config.mk
72 ${ECHO} "JPEGLIB = ${BUILDLINK_PREFIX.jpeg}/lib/libjpeg.so" >> ${WRKSRC}/config.mk 71 ${ECHO} "JPEGLIB = ${BUILDLINK_PREFIX.jpeg}/lib/libjpeg.so" >> ${WRKSRC}/config.mk
73 ${ECHO} "JPEGHDR_DIR = ${BUILDLINK_PREFIX.jpeg}/include" >> ${WRKSRC}/config.mk 72 ${ECHO} "JPEGHDR_DIR = ${BUILDLINK_PREFIX.jpeg}/include" >> ${WRKSRC}/config.mk
74 ${ECHO} "TIFFLIB = ${BUILDLINK_PREFIX.tiff}/lib/libtiff.so" >> ${WRKSRC}/config.mk 73 ${ECHO} "TIFFLIB = ${BUILDLINK_PREFIX.tiff}/lib/libtiff.so" >> ${WRKSRC}/config.mk
75 ${ECHO} "TIFFHDR_DIR = ${BUILDLINK_PREFIX.tiff}/include" >> ${WRKSRC}/config.mk 74 ${ECHO} "TIFFHDR_DIR = ${BUILDLINK_PREFIX.tiff}/include" >> ${WRKSRC}/config.mk
76 ${ECHO} "ZLIB = ${BUILDLINK_PREFIX.zlib}/lib/libz.so" >> ${WRKSRC}/config.mk 75 ${ECHO} "ZLIB = ${BUILDLINK_PREFIX.zlib}/lib/libz.so" >> ${WRKSRC}/config.mk
cvs diff -r1.7 -r1.8 pkgsrc/graphics/opencsg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/opencsg/Makefile 2015/04/25 14:23:17 1.7
+++ pkgsrc/graphics/opencsg/Makefile 2016/02/25 13:37:48 1.8
@@ -1,34 +1,31 @@ @@ -1,34 +1,31 @@
1# $NetBSD: Makefile,v 1.7 2015/04/25 14:23:17 tnn Exp $ 1# $NetBSD: Makefile,v 1.8 2016/02/25 13:37:48 jperkin Exp $
2 2
3DISTNAME= OpenCSG-1.3.2 3DISTNAME= OpenCSG-1.3.2
4PKGNAME= ${DISTNAME:tl} 4PKGNAME= ${DISTNAME:tl}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://www.opencsg.org/ 7MASTER_SITES= http://www.opencsg.org/
8 8
9MAINTAINER= reinoud@tomaatnet.nl 9MAINTAINER= reinoud@tomaatnet.nl
10HOMEPAGE= http://www.opencsg.org/ 10HOMEPAGE= http://www.opencsg.org/
11COMMENT= Image based CSG rendering library using OpenGL 11COMMENT= Image based CSG rendering library using OpenGL
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17BUILD_DIRS= src 17BUILD_DIRS= src
18 18
19INSTALLATION_DIRS= include lib 19INSTALLATION_DIRS= include lib
20 20
 21LDFLAGS.Darwin+= -framework OpenGL
 22LDFLAGS.*+= -lGL -lGLU -lXmu
 23
21do-install: 24do-install:
22 ${INSTALL_DATA} ${WRKSRC}/include/* ${DESTDIR}${PREFIX}/include/ 25 ${INSTALL_DATA} ${WRKSRC}/include/* ${DESTDIR}${PREFIX}/include/
23 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 26 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
24 ${WRKSRC}/src/libopencsg.la ${DESTDIR}${PREFIX}/lib 27 ${WRKSRC}/src/libopencsg.la ${DESTDIR}${PREFIX}/lib
25 28
26.include "../../mk/bsd.prefs.mk" 
27.if ${OPSYS} == "Darwin" 
28LDFLAGS+= -framework OpenGL 
29.else 
30LDFLAGS+= -lGL -lGLU -lXmu 
31.include "../../graphics/glut/buildlink3.mk" 29.include "../../graphics/glut/buildlink3.mk"
32.include "../../x11/libXmu/buildlink3.mk" 30.include "../../x11/libXmu/buildlink3.mk"
33.endif 
34.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/graphics/pfstools/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/pfstools/options.mk 2015/08/25 20:16:31 1.3
+++ pkgsrc/graphics/pfstools/options.mk 2016/02/25 13:37:48 1.4
@@ -1,25 +1,21 @@ @@ -1,25 +1,21 @@
1# $NetBSD: options.mk,v 1.3 2015/08/25 20:16:31 adam Exp $ 1# $NetBSD: options.mk,v 1.4 2016/02/25 13:37:48 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pfstools 3PKG_OPTIONS_VAR= PKG_OPTIONS.pfstools
4PKG_SUPPORTED_OPTIONS= imagemagick octave qt opengl 4PKG_SUPPORTED_OPTIONS= imagemagick octave qt opengl
5 5
6PLIST_VARS+= im octave qt gl 6PKG_SUGGESTED_OPTIONS.Darwin+= opengl
7 
8.include "../../mk/bsd.prefs.mk" 
9 7
10.if ${OPSYS} == "Darwin" 8PLIST_VARS+= im octave qt gl
11PKG_SUGGESTED_OPTIONS+= opengl 
12.endif 
13 9
14.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
15 11
16.if !empty(PKG_OPTIONS:Mimagemagick) 12.if !empty(PKG_OPTIONS:Mimagemagick)
17.include "../../graphics/ImageMagick/buildlink3.mk" 13.include "../../graphics/ImageMagick/buildlink3.mk"
18PLIST.im= yes 14PLIST.im= yes
19CMAKE_ARGS+= -DWITH_ImageMagick=YES 15CMAKE_ARGS+= -DWITH_ImageMagick=YES
20.else 16.else
21CMAKE_ARGS+= -DWITH_ImageMagick=NO 17CMAKE_ARGS+= -DWITH_ImageMagick=NO
22.endif 18.endif
23 19
24.if !empty(PKG_OPTIONS:Moctave) 20.if !empty(PKG_OPTIONS:Moctave)
25.include "../../math/octave/buildlink3.mk" 21.include "../../math/octave/buildlink3.mk"
@@ -38,21 +34,19 @@ CMAKE_ARGS+= -DWITH_Octave=NO @@ -38,21 +34,19 @@ CMAKE_ARGS+= -DWITH_Octave=NO
38.include "../../x11/qt4-libs/buildlink3.mk" 34.include "../../x11/qt4-libs/buildlink3.mk"
39.include "../../x11/qt4-tools/buildlink3.mk" 35.include "../../x11/qt4-tools/buildlink3.mk"
40PLIST.qt= yes 36PLIST.qt= yes
41CMAKE_ARGS+= -DWITH_QT=YES 37CMAKE_ARGS+= -DWITH_QT=YES
42.else 38.else
43CMAKE_ARGS+= -DWITH_QT=NO 39CMAKE_ARGS+= -DWITH_QT=NO
44.endif 40.endif
45 41
46.if !empty(PKG_OPTIONS:Mopengl) 42.if !empty(PKG_OPTIONS:Mopengl)
47. if ${OPSYS} != "Darwin" 43. if ${OPSYS} != "Darwin"
48.include "../../graphics/glut/buildlink3.mk" 44.include "../../graphics/glut/buildlink3.mk"
49. endif 45. endif
50# XXX nasty hack 46# XXX nasty hack
51. if ${OPSYS} == "NetBSD" 47CXXFLAGS.NetBSD+= -lpthread
52CXXFLAGS+= -lpthread 
53. endif 
54PLIST.gl= yes 48PLIST.gl= yes
55CMAKE_ARGS+= -DWITH_pfsglview=YES 49CMAKE_ARGS+= -DWITH_pfsglview=YES
56.else 50.else
57CMAKE_ARGS+= -DWITH_pfsglview=NO 51CMAKE_ARGS+= -DWITH_pfsglview=NO
58.endif 52.endif
cvs diff -r1.84 -r1.85 pkgsrc/graphics/tuxpaint/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/tuxpaint/Makefile 2015/04/30 11:37:42 1.84
+++ pkgsrc/graphics/tuxpaint/Makefile 2016/02/25 13:37:48 1.85
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.84 2015/04/30 11:37:42 joerg Exp $ 1# $NetBSD: Makefile,v 1.85 2016/02/25 13:37:48 jperkin Exp $
2 2
3DISTNAME= tuxpaint-0.9.22 3DISTNAME= tuxpaint-0.9.22
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.tuxpaint.org/ 9HOMEPAGE= http://www.tuxpaint.org/
10COMMENT= Drawing program for small children 10COMMENT= Drawing program for small children
11# program itself is gnu-gpl-v2, other licenses are packaged fonts 11# program itself is gnu-gpl-v2, other licenses are packaged fonts
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND public-domain AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND public-domain AND modified-bsd
13 13
14BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf 14BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
@@ -29,31 +29,27 @@ MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} @@ -29,31 +29,27 @@ MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
29MAKE_FLAGS+= CPPFLAGS=${CPPFLAGS:Q} 29MAKE_FLAGS+= CPPFLAGS=${CPPFLAGS:Q}
30MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 30MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
31MAKE_FLAGS+= CHMOD=${CHMOD:Q} 31MAKE_FLAGS+= CHMOD=${CHMOD:Q}
32MAKE_FLAGS+= PREFIX=${PREFIX} 32MAKE_FLAGS+= PREFIX=${PREFIX}
33MAKE_FLAGS+= LOCALE_PREFIX=$(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale 33MAKE_FLAGS+= LOCALE_PREFIX=$(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale
34MAKE_FLAGS+= MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/ 34MAKE_FLAGS+= MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/
35MAKE_FLAGS+= GPERF=${PREFIX}/bin/gperf 35MAKE_FLAGS+= GPERF=${PREFIX}/bin/gperf
36EGDIR= ${PREFIX}/share/examples/tuxpaint 36EGDIR= ${PREFIX}/share/examples/tuxpaint
37CONF_FILES= ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf 37CONF_FILES= ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
38 38
39INSTALL_MAKE_FLAGS+= PKG_ROOT=${DESTDIR} 39INSTALL_MAKE_FLAGS+= PKG_ROOT=${DESTDIR}
40INSTALL_MAKE_FLAGS+= CONFDIR=${DESTDIR}${PREFIX}/share/examples/tuxpaint 40INSTALL_MAKE_FLAGS+= CONFDIR=${DESTDIR}${PREFIX}/share/examples/tuxpaint
41 41
42.include "../../mk/bsd.fast.prefs.mk" 42CPPFLAGS.NetBSD+= -DHAVE_STRCASESTR
43 
44.if ${OPSYS} == "NetBSD" 
45CPPFLAGS+= -DHAVE_STRCASESTR 
46.endif 
47 43
48# this uses iconv and png functions directly, so link against them 44# this uses iconv and png functions directly, so link against them
49# explicitly. 45# explicitly.
50MAKE_FLAGS+= LIBS=${LIBS:M*:Q} 46MAKE_FLAGS+= LIBS=${LIBS:M*:Q}
51LIBS+= -liconv 47LIBS+= -liconv
52LIBS+= -lpng 48LIBS+= -lpng
53LIBS.SunOS+= -lsocket -lnsl 49LIBS.SunOS+= -lsocket -lnsl
54LDFLAGS.SunOS+= -lsocket 50LDFLAGS.SunOS+= -lsocket
55 51
56pre-build: 52pre-build:
57 ${MKDIR} ${WRKSRC}/trans 53 ${MKDIR} ${WRKSRC}/trans
58 54
59post-install: 55post-install:
cvs diff -r1.88 -r1.89 pkgsrc/graphics/xv/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/xv/Makefile 2015/11/22 19:17:01 1.88
+++ pkgsrc/graphics/xv/Makefile 2016/02/25 13:37:48 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.88 2015/11/22 19:17:01 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.89 2016/02/25 13:37:48 jperkin Exp $
2 2
3DISTNAME= xv-3.10a 3DISTNAME= xv-3.10a
4PKGREVISION= 22 4PKGREVISION= 22
5CATEGORIES= graphics x11 5CATEGORIES= graphics x11
6MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ 6MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/
7DISTFILES= ${DEFAULT_DISTFILES} ${JUMBO_PATCHES} 7DISTFILES= ${DEFAULT_DISTFILES} ${JUMBO_PATCHES}
8 8
9PATCHFILES= ${JUMBO_PATCHES} 9PATCHFILES= ${JUMBO_PATCHES}
10JUMBO_PATCHES= xv-3.10a-jumbo-patches-20070520.tar.gz 10JUMBO_PATCHES= xv-3.10a-jumbo-patches-20070520.tar.gz
11PATCH_DIST_CAT.${JUMBO_PATCHES}= ${CAT} ${WRKDIR}/*-patch-* 11PATCH_DIST_CAT.${JUMBO_PATCHES}= ${CAT} ${WRKDIR}/*-patch-*
12PATCH_DIST_STRIP.${JUMBO_PATCHES}= -p1 12PATCH_DIST_STRIP.${JUMBO_PATCHES}= -p1
13SITES.${JUMBO_PATCHES}= ${MASTER_SITE_SOURCEFORGE:=png-mng/} 13SITES.${JUMBO_PATCHES}= ${MASTER_SITE_SOURCEFORGE:=png-mng/}
14PATCHFILES+= xv-3.10a-enhancements.20070520-20081216.diff 14PATCHFILES+= xv-3.10a-enhancements.20070520-20081216.diff
@@ -34,35 +34,33 @@ CPPFLAGS+= -DDOCDIR=\""${PREFIX:Q}/share @@ -34,35 +34,33 @@ CPPFLAGS+= -DDOCDIR=\""${PREFIX:Q}/share
34 34
35BUILD_TARGET= depend all 35BUILD_TARGET= depend all
36 36
37SUBST_CLASSES+= gspath 37SUBST_CLASSES+= gspath
38SUBST_FILES.gspath= config.h 38SUBST_FILES.gspath= config.h
39SUBST_SED.gspath= -e 's|@PREFIX@|${PREFIX}|g' 39SUBST_SED.gspath= -e 's|@PREFIX@|${PREFIX}|g'
40SUBST_STAGE.gspath= post-configure 40SUBST_STAGE.gspath= post-configure
41SUBST_MESSAGE.gspath= Fixing path to ghostscript interpreter. 41SUBST_MESSAGE.gspath= Fixing path to ghostscript interpreter.
42 42
43INSTALLATION_DIRS+= share/doc/xv 43INSTALLATION_DIRS+= share/doc/xv
44 44
45.include "../../mk/bsd.prefs.mk" 45.include "../../mk/bsd.prefs.mk"
46 46
47.if ${OPSYS} == "SunOS" 47SUBST_CLASSES.SunOS+= ccflags
48SUBST_CLASSES+= ccflags 
49SUBST_FILES.ccflags= Makefile 48SUBST_FILES.ccflags= Makefile
50SUBST_SED.ccflags= -e 's| CC = .*| CC = ${CC:Q}|' 49SUBST_SED.ccflags= -e 's| CC = .*| CC = ${CC:Q}|'
51SUBST_SED.ccflags+= -e 's| CCOPTIONS = .*| CCOPTIONS = ${CFLAGS:Q}|' 50SUBST_SED.ccflags+= -e 's| CCOPTIONS = .*| CCOPTIONS = ${CFLAGS:Q}|'
52SUBST_SED.ccflags+= -e 's| CDEBUGFLAGS = .*| CDEBUGFLAGS =|' 51SUBST_SED.ccflags+= -e 's| CDEBUGFLAGS = .*| CDEBUGFLAGS =|'
53SUBST_STAGE.ccflags= post-configure 52SUBST_STAGE.ccflags= post-configure
54SUBST_MESSAGE.ccflags= Fixing compiler flags for Solaris. 53SUBST_MESSAGE.ccflags= Fixing compiler flags for Solaris.
55.endif 
56 54
57.if ${OPSYS} == "SunOS" || !empty(MACHINE_PLATFORM:MIRIX-5*) 55.if ${OPSYS} == "SunOS" || !empty(MACHINE_PLATFORM:MIRIX-5*)
58CPPFLAGS+= -DNEED_ALLOCA_H 56CPPFLAGS+= -DNEED_ALLOCA_H
59.endif 57.endif
60 58
61post-install: 59post-install:
62 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xv 60 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xv
63 ${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${DESTDIR}${PREFIX}/share/doc/xv 61 ${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${DESTDIR}${PREFIX}/share/doc/xv
64 62
65BUILDLINK_DEPMETHOD.libXt?= build 63BUILDLINK_DEPMETHOD.libXt?= build
66 64
67.include "../../graphics/png/buildlink3.mk" 65.include "../../graphics/png/buildlink3.mk"
68.include "../../graphics/tiff/buildlink3.mk" 66.include "../../graphics/tiff/buildlink3.mk"