Wed Oct 17 08:39:13 2018 UTC ()
*: Replace custom tool setup with new ggrep.


(jperkin)
diff -r1.3 -r1.4 pkgsrc/lang/compiler-rt/Makefile
diff -r1.58 -r1.59 pkgsrc/lang/rust/Makefile
diff -r1.14 -r1.15 pkgsrc/misc/xdg-utils/Makefile
diff -r1.299 -r1.300 pkgsrc/x11/gtk2/Makefile
diff -r1.118 -r1.119 pkgsrc/x11/gtk3/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/lang/compiler-rt/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/compiler-rt/Makefile 2018/08/10 15:57:54 1.3
+++ pkgsrc/lang/compiler-rt/Makefile 2018/10/17 08:39:13 1.4
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.3 2018/08/10 15:57:54 jperkin Exp $ 1# $NetBSD: Makefile,v 1.4 2018/10/17 08:39:13 jperkin Exp $
2 2
3DISTNAME= compiler-rt-6.0.1.src 3DISTNAME= compiler-rt-6.0.1.src
4PKGNAME= ${DISTNAME:S/.src//} 4PKGNAME= ${DISTNAME:S/.src//}
5CATEGORIES= lang devel 5CATEGORIES= lang devel
6MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/ 6MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://compiler-rt.llvm.org/ 10HOMEPAGE= http://compiler-rt.llvm.org/
11COMMENT= LLVM runtime libraries 11COMMENT= LLVM runtime libraries
12LICENSE= modified-bsd OR mit 12LICENSE= modified-bsd OR mit
13 13
14USE_LANGUAGES= c99 c++11 14USE_LANGUAGES= c99 c++11
15USE_CMAKE= yes 15USE_CMAKE= yes
 16USE_TOOLS+= ggrep
16GCC_REQD+= 4.8 17GCC_REQD+= 4.8
17SSP_SUPPORTED= no 18SSP_SUPPORTED= no
18 19
19CONFIGURE_DIRS= ${WRKDIR}/build 20CONFIGURE_DIRS= ${WRKDIR}/build
20CMAKE_ARG_PATH= ${WRKSRC} 21CMAKE_ARG_PATH= ${WRKSRC}
21 22
22OS_DIR.SunOS-5.11= solaris2.11 23OS_DIR.SunOS-5.11= solaris2.11
23OS_DIR= ${OS_DIR.${OPSYS}-${OS_VERSION}} 24OS_DIR= ${OS_DIR.${OPSYS}-${OS_VERSION}}
24 25
25CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 26CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
26CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q} 27CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
27CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q} 28CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
28CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q} 29CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
@@ -30,24 +31,17 @@ CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING @@ -30,24 +31,17 @@ CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING
30CMAKE_ARGS+= -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${PKGVERSION_NOREV} 31CMAKE_ARGS+= -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${PKGVERSION_NOREV}
31CMAKE_ARGS+= -DCOMPILER_RT_INCLUDE_TESTS:BOOL=ON 32CMAKE_ARGS+= -DCOMPILER_RT_INCLUDE_TESTS:BOOL=ON
32CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q} 33CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
33 34
34PLIST_SUBST+= COMPILER_RT_OS_DIR=${OS_DIR} 35PLIST_SUBST+= COMPILER_RT_OS_DIR=${OS_DIR}
35 36
36TEST_TARGET= check-compiler-rt 37TEST_TARGET= check-compiler-rt
37 38
38PYTHON_FOR_BUILD_ONLY= yes 39PYTHON_FOR_BUILD_ONLY= yes
39 40
40post-extract: 41post-extract:
41 ${RUN} mkdir -p ${WRKDIR}/build 42 ${RUN} mkdir -p ${WRKDIR}/build
42 43
43.include "../../mk/bsd.prefs.mk" 
44 
45.if ${OPSYS} == "SunOS" 
46BUILD_DEPENDS+= grep>=0:../../textproc/grep 
47TOOLS_PATH.grep= ${PREFIX}/bin/ggrep 
48.endif 
49 
50.include "../../devel/googletest/buildlink3.mk" 44.include "../../devel/googletest/buildlink3.mk"
51.include "../../lang/llvm/buildlink3.mk" 45.include "../../lang/llvm/buildlink3.mk"
52.include "../../lang/python/tool.mk" 46.include "../../lang/python/tool.mk"
53.include "../../mk/bsd.pkg.mk" 47.include "../../mk/bsd.pkg.mk"
cvs diff -r1.58 -r1.59 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2018/10/15 11:22:23 1.58
+++ pkgsrc/lang/rust/Makefile 2018/10/17 08:39:13 1.59
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.58 2018/10/15 11:22:23 he Exp $ 1# $NetBSD: Makefile,v 1.59 2018/10/17 08:39:13 jperkin Exp $
2 2
3DISTNAME= rustc-1.29.1-src 3DISTNAME= rustc-1.29.1-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://static.rust-lang.org/dist/ 7MASTER_SITES= http://static.rust-lang.org/dist/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.rust-lang.org/ 10HOMEPAGE= https://www.rust-lang.org/
11COMMENT= Safe, concurrent, practical language 11COMMENT= Safe, concurrent, practical language
12LICENSE= mit OR apache-2.0 12LICENSE= mit OR apache-2.0
13 13
14USE_GCC_RUNTIME= yes 14USE_GCC_RUNTIME= yes
15USE_LANGUAGES= c c++11 15USE_LANGUAGES= c c++11
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= bash gmake perl:build pkg-config 17USE_TOOLS+= bash ggrep gmake perl:build pkg-config
18# For internal llvm 18# For internal llvm
19BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake 19BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
20 20
21HAS_CONFIGURE= yes 21HAS_CONFIGURE= yes
22CONFIGURE_ARGS+= --prefix=${PREFIX} 22CONFIGURE_ARGS+= --prefix=${PREFIX}
23CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 23CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
25CONFIGURE_ARGS+= --python=${PYTHONBIN} 25CONFIGURE_ARGS+= --python=${PYTHONBIN}
26CONFIGURE_ARGS+= --release-channel=stable 26CONFIGURE_ARGS+= --release-channel=stable
27#CONFIGURE_ARGS+= --enable-local-rust 27#CONFIGURE_ARGS+= --enable-local-rust
28CONFIGURE_ARGS+= --local-rust-root=${RUST_BOOTSTRAP_PATH} 28CONFIGURE_ARGS+= --local-rust-root=${RUST_BOOTSTRAP_PATH}
29CONFIGURE_ARGS+= --enable-extended # Build and install cargo too. 29CONFIGURE_ARGS+= --enable-extended # Build and install cargo too.
30CONFIGURE_ARGS+= --enable-rpath 30CONFIGURE_ARGS+= --enable-rpath
@@ -220,29 +220,27 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} @@ -220,29 +220,27 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0}
220SITES.${RUST_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/ 220SITES.${RUST_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/
221SITES.${RUST_STD_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/ 221SITES.${RUST_STD_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/
222pre-build-fix: 222pre-build-fix:
223.endif 223.endif
224 224
225# You may override RUST_BOOTSTRAP_PATH and RUST_ARCH in mk.conf if you have a local bootstrap compiler. 225# You may override RUST_BOOTSTRAP_PATH and RUST_ARCH in mk.conf if you have a local bootstrap compiler.
226.if !defined(RUST_ARCH) && !defined(RUST_BOOTSTRAP_PATH) 226.if !defined(RUST_ARCH) && !defined(RUST_BOOTSTRAP_PATH)
227NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM} 227NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM}
228.else 228.else
229RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap 229RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap
230.endif 230.endif
231 231
232.if ${OPSYS} == "SunOS" 232.if ${OPSYS} == "SunOS"
233BUILD_DEPENDS+= grep>=0:../../textproc/grep 
234BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils 233BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils
235TOOLS_PATH.grep= ${PREFIX}/bin/ggrep 
236TOOLS_CREATE+= md5sum 234TOOLS_CREATE+= md5sum
237TOOLS_PATH.md5sum= ${PREFIX}/bin/gmd5sum 235TOOLS_PATH.md5sum= ${PREFIX}/bin/gmd5sum
238.endif 236.endif
239 237
240SUBST_CLASSES+= rpath 238SUBST_CLASSES+= rpath
241SUBST_STAGE.rpath= pre-configure 239SUBST_STAGE.rpath= pre-configure
242SUBST_FILES.rpath= src/bootstrap/bin/rustc.rs 240SUBST_FILES.rpath= src/bootstrap/bin/rustc.rs
243SUBST_VARS.rpath= PREFIX 241SUBST_VARS.rpath= PREFIX
244 242
245post-extract: 243post-extract:
246 set -e; \ 244 set -e; \
247 if ${TEST} -e ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/install.sh \ 245 if ${TEST} -e ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/install.sh \
248 -a ! -e ${RUST_BOOTSTRAP_PATH}/bin/rustc; then \ 246 -a ! -e ${RUST_BOOTSTRAP_PATH}/bin/rustc; then \
cvs diff -r1.14 -r1.15 pkgsrc/misc/xdg-utils/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/xdg-utils/Makefile 2018/08/20 00:43:33 1.14
+++ pkgsrc/misc/xdg-utils/Makefile 2018/10/17 08:39:13 1.15
@@ -1,43 +1,37 @@ @@ -1,43 +1,37 @@
1# $NetBSD: Makefile,v 1.14 2018/08/20 00:43:33 leot Exp $ 1# $NetBSD: Makefile,v 1.15 2018/10/17 08:39:13 jperkin Exp $
2 2
3DISTNAME= xdg-utils-1.1.3 3DISTNAME= xdg-utils-1.1.3
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= misc 5CATEGORIES= misc
6MASTER_SITES= https://portland.freedesktop.org/download/ 6MASTER_SITES= https://portland.freedesktop.org/download/
7 7
8MAINTAINER= leot@NetBSD.org 8MAINTAINER= leot@NetBSD.org
9HOMEPAGE= https://www.freedesktop.org/wiki/Software/xdg-utils/ 9HOMEPAGE= https://www.freedesktop.org/wiki/Software/xdg-utils/
10COMMENT= Tools to assist applications with various desktop integration tasks 10COMMENT= Tools to assist applications with various desktop integration tasks
11LICENSE= mit 11LICENSE= mit
12 12
13BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto 13BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
14BUILD_DEPENDS+= w3m-[0-9]*:../../www/w3m 14BUILD_DEPENDS+= w3m-[0-9]*:../../www/w3m
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LANGUAGES= # none 17USE_LANGUAGES= # none
18USE_TOOLS+= bash:run gmake grep:run gsed:run 18USE_TOOLS+= bash:run gmake ggrep:run gsed:run
19 19
20SUBST_CLASSES+= gsed 20SUBST_CLASSES+= gsed
21SUBST_FILES.gsed= scripts/xdg-*.in 21SUBST_FILES.gsed= scripts/xdg-*.in
22SUBST_STAGE.gsed= pre-configure 22SUBST_STAGE.gsed= pre-configure
23SUBST_MESSAGE.gsed= Use GNU grep/sed instead of grep/sed. 23SUBST_MESSAGE.gsed= Use GNU grep/sed instead of grep/sed.
24SUBST_SED.gsed+= -e "s, sed , ${TOOLS_PATH.gsed} ,g" 24SUBST_SED.gsed+= -e "s, sed , ${TOOLS_PATH.gsed} ,g"
25SUBST_SED.gsed+= -e "s, grep , ${TOOLS_PATH.grep} ,g" 25SUBST_SED.gsed+= -e "s, grep , ${TOOLS_PATH.ggrep} ,g"
26 26
27SUBST_CLASSES+= paths 27SUBST_CLASSES+= paths
28SUBST_FILES.paths= scripts/xdg-*.in 28SUBST_FILES.paths= scripts/xdg-*.in
29SUBST_STAGE.paths= pre-configure 29SUBST_STAGE.paths= pre-configure
30SUBST_MESSAGE.paths= Avoid hardcoded paths. 30SUBST_MESSAGE.paths= Avoid hardcoded paths.
31SUBST_SED.paths+= -e "s,/usr/local,${PREFIX},g" 31SUBST_SED.paths+= -e "s,/usr/local,${PREFIX},g"
32SUBST_SED.paths+= -e "s,/etc,${PKG_SYSCONFDIR},g" 32SUBST_SED.paths+= -e "s,/etc,${PKG_SYSCONFDIR},g"
33 33
34# "foo > /dev/null 2> /dev/null" gives "foo: not found" with NetBSD's sh 34# "foo > /dev/null 2> /dev/null" gives "foo: not found" with NetBSD's sh
35REPLACE_BASH+= scripts/xdg-* 35REPLACE_BASH+= scripts/xdg-*
36 36
37.include "../../mk/bsd.prefs.mk" 
38 
39.if ${OPSYS} == "SunOS" 
40TOOLS_PLATFORM.grep= # use pkgsrc ggrep 
41.endif 
42 
43.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.299 -r1.300 pkgsrc/x11/gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk2/Makefile 2018/08/22 09:48:01 1.299
+++ pkgsrc/x11/gtk2/Makefile 2018/10/17 08:39:13 1.300
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.299 2018/08/22 09:48:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.300 2018/10/17 08:39:13 jperkin Exp $
2 2
3DISTNAME= gtk+-2.24.32 3DISTNAME= gtk+-2.24.32
4PKGNAME= ${DISTNAME:S/gtk/gtk2/} 4PKGNAME= ${DISTNAME:S/gtk/gtk2/}
5PKGREVISION= 5 5PKGREVISION= 5
6CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.24/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.gtk.org/ 11HOMEPAGE= https://www.gtk.org/
12COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces 12COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15# gtk-builder-convert uses minidom from xml.dom, which needs expat 15# gtk-builder-convert uses minidom from xml.dom, which needs expat
16DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 16DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
17 17
18CONFLICTS= gtk2-engines<2.6.0 18CONFLICTS= gtk2-engines<2.6.0
19CONFLICTS+= gail-[0-9]* 19CONFLICTS+= gail-[0-9]*
20 20
21SUPERSEDES= gail-[0-9]* 21SUPERSEDES= gail-[0-9]*
22 22
23USE_PKGLOCALEDIR= yes 23USE_PKGLOCALEDIR= yes
24USE_TOOLS+= gmake msgfmt perl pkg-config 24USE_TOOLS+= ggrep gmake msgfmt perl pkg-config
25USE_LANGUAGES= c c++ 25USE_LANGUAGES= c c++
26USE_LIBTOOL= yes 26USE_LIBTOOL= yes
27PTHREAD_AUTO_VARS= yes 27PTHREAD_AUTO_VARS= yes
28 28
29GNU_CONFIGURE= yes 29GNU_CONFIGURE= yes
30# bashism in "configure" (illegal variable substitution), patched 30# bashism in "configure" (illegal variable substitution), patched
31#CONFIG_SHELL= bash 31#CONFIG_SHELL= bash
32CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata 32CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata
33# Work around build problems, disable unstable PAPI, PR #41608: 33# Work around build problems, disable unstable PAPI, PR #41608:
34CONFIGURE_ARGS+= --disable-papi 34CONFIGURE_ARGS+= --disable-papi
35# Not to unwanted pick up of db2html, PR#44908 35# Not to unwanted pick up of db2html, PR#44908
36CONFIGURE_ENV+= ac_cv_prog_DB2HTML=false 36CONFIGURE_ENV+= ac_cv_prog_DB2HTML=false
37MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 37MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
@@ -49,33 +49,26 @@ PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0 @@ -49,33 +49,26 @@ PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0
49INSTALLATION_DIRS+= lib/gtk-2.0/immodules 49INSTALLATION_DIRS+= lib/gtk-2.0/immodules
50INSTALLATION_DIRS+= lib/gtk-2.0/modules 50INSTALLATION_DIRS+= lib/gtk-2.0/modules
51INSTALLATION_DIRS+= lib/gtk-2.0/2.10.0/filesystems 51INSTALLATION_DIRS+= lib/gtk-2.0/2.10.0/filesystems
52 52
53REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0 53REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0
54 54
55BUILD_DIRS= . demos/gtk-demo 55BUILD_DIRS= . demos/gtk-demo
56 56
57# fix for 'only weak aliases are supported on darwin' error 57# fix for 'only weak aliases are supported on darwin' error
58CONFIGURE_ARGS.Darwin+= --disable-visibility 58CONFIGURE_ARGS.Darwin+= --disable-visibility
59 59
60.include "../../mk/bsd.prefs.mk" 60.include "../../mk/bsd.prefs.mk"
61 61
62# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms 
63# which do not have it. 
64.if ${OPSYS} == "SunOS" 
65BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep 
66TOOLS_PATH.grep= ${PREFIX}/bin/ggrep 
67.endif 
68 
69CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 62CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
70 63
71#SUBST_CLASSES+= pthread 64#SUBST_CLASSES+= pthread
72#SUBST_STAGE.pthread= pre-configure 65#SUBST_STAGE.pthread= pre-configure
73#SUBST_MESSAGE.pthread= Fixing pthread flags. 66#SUBST_MESSAGE.pthread= Fixing pthread flags.
74#SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g' 67#SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
75#SUBST_FILES.pthread= gdk-pixbuf/Makefile.in 68#SUBST_FILES.pthread= gdk-pixbuf/Makefile.in
76 69
77SUBST_CLASSES+= iconcache 70SUBST_CLASSES+= iconcache
78SUBST_STAGE.iconcache= pre-configure 71SUBST_STAGE.iconcache= pre-configure
79SUBST_MESSAGE.iconcache= Renaming gtk-icon-cache-update. 72SUBST_MESSAGE.iconcache= Renaming gtk-icon-cache-update.
80SUBST_SED.iconcache= -e 's,gtk-update-icon-cache,gtk2-update-icon-cache,g' 73SUBST_SED.iconcache= -e 's,gtk-update-icon-cache,gtk2-update-icon-cache,g'
81SUBST_FILES.iconcache= gtk/Makefile.in 74SUBST_FILES.iconcache= gtk/Makefile.in
cvs diff -r1.118 -r1.119 pkgsrc/x11/gtk3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/Makefile 2018/08/22 09:48:01 1.118
+++ pkgsrc/x11/gtk3/Makefile 2018/10/17 08:39:13 1.119
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.118 2018/08/22 09:48:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.119 2018/10/17 08:39:13 jperkin Exp $
2 2
3DISTNAME= gtk+-3.22.30 3DISTNAME= gtk+-3.22.30
4PKGNAME= ${DISTNAME:S/gtk/gtk3/} 4PKGNAME= ${DISTNAME:S/gtk/gtk3/}
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.gtk.org/ 11HOMEPAGE= https://www.gtk.org/
12COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces 12COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16USE_TOOLS+= gmake perl pkg-config bash xgettext msgmerge 16USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19PTHREAD_AUTO_VARS= yes 19PTHREAD_AUTO_VARS= yes
20TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 20TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
21TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools 21TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools
22# There is no logic in gettext.mk to detect the native version of xgettext, 22# There is no logic in gettext.mk to detect the native version of xgettext,
23# and we do need it to be compiled with Glade support. 23# and we do need it to be compiled with Glade support.
24_TOOLS_USE_PKGSRC.xgettext=yes 24_TOOLS_USE_PKGSRC.xgettext=yes
25 25
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh 27# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh
28CONFIG_SHELL= ${TOOLS_PATH.bash} 28CONFIG_SHELL= ${TOOLS_PATH.bash}
29CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata 29CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata
@@ -37,32 +37,26 @@ TEST_TARGET= check @@ -37,32 +37,26 @@ TEST_TARGET= check
37PKGCONFIG_OVERRIDE+= gdk-3.0.pc.in 37PKGCONFIG_OVERRIDE+= gdk-3.0.pc.in
38PKGCONFIG_OVERRIDE+= gtk+-3.0.pc.in 38PKGCONFIG_OVERRIDE+= gtk+-3.0.pc.in
39PKGCONFIG_OVERRIDE+= gtk+-unix-print-3.0.pc.in 39PKGCONFIG_OVERRIDE+= gtk+-unix-print-3.0.pc.in
40PKGCONFIG_OVERRIDE+= gail-3.0.pc.in 40PKGCONFIG_OVERRIDE+= gail-3.0.pc.in
41 41
42INSTALLATION_DIRS+= lib/gtk-3.0/immodules 42INSTALLATION_DIRS+= lib/gtk-3.0/immodules
43INSTALLATION_DIRS+= lib/gtk-3.0/modules 43INSTALLATION_DIRS+= lib/gtk-3.0/modules
44INSTALLATION_DIRS+= lib/gtk-3.0/3.0.0/filesystems 44INSTALLATION_DIRS+= lib/gtk-3.0/3.0.0/filesystems
45 45
46BUILD_DIRS= . demos/gtk-demo 46BUILD_DIRS= . demos/gtk-demo
47 47
48.include "../../mk/bsd.prefs.mk" 48.include "../../mk/bsd.prefs.mk"
49 49
50# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms 
51# which do not have it. 
52.if ${OPSYS} == "SunOS" 
53BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep 
54TOOLS_PATH.grep= ${PREFIX}/bin/ggrep 
55.endif 
56# isnan and isinf are part of libc, not libm on DragonFly 50# isnan and isinf are part of libc, not libm on DragonFly
57# conf tests fail detection due to conflicting definitions, just skip them 51# conf tests fail detection due to conflicting definitions, just skip them
58CONFIGURE_ENV.DragonFly+= ac_cv_func_isinf=yes 52CONFIGURE_ENV.DragonFly+= ac_cv_func_isinf=yes
59CONFIGURE_ENV.DragonFly+= ac_cv_func_isnan=yes 53CONFIGURE_ENV.DragonFly+= ac_cv_func_isnan=yes
60 54
61CFLAGS.SunOS+= -std=gnu99 55CFLAGS.SunOS+= -std=gnu99
62 56
63CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 57CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
64 58
65# We remove the module databases during post-install since we create them 59# We remove the module databases during post-install since we create them
66# anew in the +INSTALL script as part of the POST-INSTALL action. 60# anew in the +INSTALL script as part of the POST-INSTALL action.
67# 61#
68post-install: 62post-install: