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 (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,53 +1,47 @@ @@ -1,53 +1,47 @@
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}
29CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=${OS_DIR} 30CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=${OS_DIR}
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 (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,409 +1,407 @@ @@ -1,409 +1,407 @@
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
31CONFIGURE_ARGS+= --disable-codegen-tests 31CONFIGURE_ARGS+= --disable-codegen-tests
32CONFIGURE_ARGS+= --disable-dist-src 32CONFIGURE_ARGS+= --disable-dist-src
33CONFIGURE_ARGS+= --disable-llvm-static-stdcpp 33CONFIGURE_ARGS+= --disable-llvm-static-stdcpp
34CONFIGURE_ARGS+= --disable-ninja 34CONFIGURE_ARGS+= --disable-ninja
35CONFIGURE_ARGS.SunOS+= --disable-jemalloc 35CONFIGURE_ARGS.SunOS+= --disable-jemalloc
36 36
37# The gcc-wrap / c++-wrap script takes CROSS_ROOT environment variable 37# The gcc-wrap / c++-wrap script takes CROSS_ROOT environment variable
38# to do a cross-build. The wrapper script assumes dest/ and tools/ 38# to do a cross-build. The wrapper script assumes dest/ and tools/
39# as a result of a cross-build as subdirectories of this root 39# as a result of a cross-build as subdirectories of this root
40#CROSS_ROOT= /u/evbarm-armv7hf 40#CROSS_ROOT= /u/evbarm-armv7hf
41#MAKE_ENV+= CROSS_ROOT=${CROSS_ROOT} 41#MAKE_ENV+= CROSS_ROOT=${CROSS_ROOT}
42 42
43# The GNU cross target designation 43# The GNU cross target designation
44#GNU_CROSS_TARGET= armv7--netbsdelf-eabihf 44#GNU_CROSS_TARGET= armv7--netbsdelf-eabihf
45#MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET} 45#MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
46 46
47# To cross-build rust, you need to specify 47# To cross-build rust, you need to specify
48# the ultimate target to built for, as well as the 48# the ultimate target to built for, as well as the
49# host the compiler is supposed to run on. 49# host the compiler is supposed to run on.
50# Rust's target designation 50# Rust's target designation
51#TARGET= armv7-unknown-netbsd-eabihf 51#TARGET= armv7-unknown-netbsd-eabihf
52#CONFIGURE_ARGS+= --host=${TARGET} 52#CONFIGURE_ARGS+= --host=${TARGET}
53#CONFIGURE_ARGS+= --target=${TARGET} 53#CONFIGURE_ARGS+= --target=${TARGET}
54#CONFIGURE_ARGS+= --set=target.${TARGET}.cc=${.CURDIR}/files/gcc-wrap 54#CONFIGURE_ARGS+= --set=target.${TARGET}.cc=${.CURDIR}/files/gcc-wrap
55#CONFIGURE_ARGS+= --set=target.${TARGET}.cxx=${.CURDIR}/files/c++-wrap 55#CONFIGURE_ARGS+= --set=target.${TARGET}.cxx=${.CURDIR}/files/c++-wrap
56#CONFIGURE_ARGS+= --set=target.${TARGET}.linker=${.CURDIR}/files/gcc-wrap 56#CONFIGURE_ARGS+= --set=target.${TARGET}.linker=${.CURDIR}/files/gcc-wrap
57#CONFIGURE_ARGS+= --set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar 57#CONFIGURE_ARGS+= --set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar
58 58
59# May be required when cross-building on NetBSD 59# May be required when cross-building on NetBSD
60#MAKE_ENV+= OPENSSL_DIR=/usr 60#MAKE_ENV+= OPENSSL_DIR=/usr
61 61
62# Getting RPATH with $ORIGIN into bootstrap may be troublesome, so  62# Getting RPATH with $ORIGIN into bootstrap may be troublesome, so
63# uncommenting the LD_LIBRARY_PATH setting may be required to run 63# uncommenting the LD_LIBRARY_PATH setting may be required to run
64# the bootstrap 64# the bootstrap
65MAKE_ENV+= LD_LIBRARY_PATH=${.CURDIR}/work/rust-bootstrap/lib 65MAKE_ENV+= LD_LIBRARY_PATH=${.CURDIR}/work/rust-bootstrap/lib
66 66
67.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) 67.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
68# Bootstrapping on NetBSD/powerpc requires no debug-info from rustc 68# Bootstrapping on NetBSD/powerpc requires no debug-info from rustc
69# (both for amd64->powerpc built and powerpc->powerpc built bootstrap bits) 69# (both for amd64->powerpc built and powerpc->powerpc built bootstrap bits)
70CONFIGURE_ARGS+= --disable-debug 70CONFIGURE_ARGS+= --disable-debug
71CONFIGURE_ARGS+= --disable-debuginfo-tests 71CONFIGURE_ARGS+= --disable-debuginfo-tests
72CONFIGURE_ARGS+= --disable-debug-assertions 72CONFIGURE_ARGS+= --disable-debug-assertions
73CONFIGURE_ARGS+= --disable-debuginfo 73CONFIGURE_ARGS+= --disable-debuginfo
74CONFIGURE_ARGS+= --disable-debuginfo-lines 74CONFIGURE_ARGS+= --disable-debuginfo-lines
75CONFIGURE_ARGS+= --disable-debuginfo-only-std 75CONFIGURE_ARGS+= --disable-debuginfo-only-std
76CONFIGURE_ARGS+= --disable-debuginfo-tools 76CONFIGURE_ARGS+= --disable-debuginfo-tools
77.endif 77.endif
78 78
79# This should allow us to perform "offline" builds (so cargo doesn't fetch 79# This should allow us to perform "offline" builds (so cargo doesn't fetch
80# dependencies during the build stage) but this isn't hooked up yet. 80# dependencies during the build stage) but this isn't hooked up yet.
81CONFIGURE_ARGS+= --enable-vendor 81CONFIGURE_ARGS+= --enable-vendor
82 82
83# cargo defaults to using the number of available CPUs 83# cargo defaults to using the number of available CPUs
84MAKE_ENV+= CARGO_BUILD_JOBS=${MAKE_JOBS:U1} 84MAKE_ENV+= CARGO_BUILD_JOBS=${MAKE_JOBS:U1}
85 85
86UNLIMIT_RESOURCES+= cputime 86UNLIMIT_RESOURCES+= cputime
87 87
88PYTHON_VERSIONS_ACCEPTED= 27 88PYTHON_VERSIONS_ACCEPTED= 27
89 89
90TEST_TARGET= check 90TEST_TARGET= check
91 91
92# bin/* lib/*, but names vary 92# bin/* lib/*, but names vary
93CHECK_RELRO_SUPPORTED= no 93CHECK_RELRO_SUPPORTED= no
94CHECK_SSP_SUPPORTED= no 94CHECK_SSP_SUPPORTED= no
95 95
96CHECK_PORTABILITY_SKIP+= src/vendor/openssl-src/openssl/.travis-create-release.sh 96CHECK_PORTABILITY_SKIP+= src/vendor/openssl-src/openssl/.travis-create-release.sh
97 97
98# Required for LLVM (-std=c++11) 98# Required for LLVM (-std=c++11)
99GCC_REQD+= 4.8 99GCC_REQD+= 4.8
100 100
101.include "../../mk/bsd.prefs.mk" 101.include "../../mk/bsd.prefs.mk"
102 102
103# 103#
104# Under NetBSD, do not use DT_RUNPATH 104# Under NetBSD, do not use DT_RUNPATH
105# 105#
106BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags 106BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
107 107
108.PHONY: pre-build-fix 108.PHONY: pre-build-fix
109# 109#
110# Rust unfortunately requires itself to build. On platforms which aren't 110# Rust unfortunately requires itself to build. On platforms which aren't
111# supported by upstream (where they offer binary bootstraps), or where we do 111# supported by upstream (where they offer binary bootstraps), or where we do
112# not trust random binaries from the Internet, we need to build and provide our 112# not trust random binaries from the Internet, we need to build and provide our
113# own bootstrap. See the stage0-bootstrap below for more details. 113# own bootstrap. See the stage0-bootstrap below for more details.
114# 114#
115DISTFILES:= ${DEFAULT_DISTFILES} 115DISTFILES:= ${DEFAULT_DISTFILES}
116RUST_STAGE0_VER= 1.28.0 116RUST_STAGE0_VER= 1.28.0
117# 117#
118.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make (makesum) || make(mdi) 118.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make (makesum) || make(mdi)
119RUST_ARCH:= i686-apple-darwin 119RUST_ARCH:= i686-apple-darwin
120RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 120RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
121RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 121RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
122DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 122DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
123pre-build-fix: 123pre-build-fix:
124.endif 124.endif
125.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 125.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
126RUST_ARCH:= x86_64-apple-darwin 126RUST_ARCH:= x86_64-apple-darwin
127RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 127RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
128RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 128RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
129DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 129DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
130pre-build-fix: 130pre-build-fix:
131.endif 131.endif
132.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi) 132.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
133RUST_ARCH:= i686-unknown-linux-gnu 133RUST_ARCH:= i686-unknown-linux-gnu
134RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 134RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
135RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 135RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
136DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 136DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
137pre-build-fix: 137pre-build-fix:
138.endif 138.endif
139.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 139.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
140RUST_ARCH:= x86_64-unknown-linux-gnu 140RUST_ARCH:= x86_64-unknown-linux-gnu
141RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 141RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
142RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 142RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
143DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 143DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
144pre-build-fix: 144pre-build-fix:
145.endif 145.endif
146.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 146.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
147RUST_ARCH:= x86_64-sun-solaris 147RUST_ARCH:= x86_64-sun-solaris
148RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 148RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
149SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/ 149SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
150DISTFILES:= ${DISTFILES} ${RUST_STAGE0} 150DISTFILES:= ${DISTFILES} ${RUST_STAGE0}
151RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH} 151RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}
152pre-build-fix: 152pre-build-fix:
153.endif 153.endif
154.if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) 154.if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
155RUST_ARCH:= i686-unknown-freebsd 155RUST_ARCH:= i686-unknown-freebsd
156RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 156RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
157RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 157RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
158DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 158DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
159pre-build-fix: 159pre-build-fix:
160.endif 160.endif
161.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 161.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
162RUST_ARCH:= x86_64-unknown-freebsd 162RUST_ARCH:= x86_64-unknown-freebsd
163RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 163RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
164RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 164RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
165DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 165DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
166pre-build-fix: 166pre-build-fix:
167.endif 167.endif
168.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) 168.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
169RUST_ARCH= i686-unknown-netbsd 169RUST_ARCH= i686-unknown-netbsd
170RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 170RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
171RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 171RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
172# Do not trust ryoon@. 172# Do not trust ryoon@.
173SITES.${RUST_STAGE0}= https://www.ryoon.net/pub/rust/ 173SITES.${RUST_STAGE0}= https://www.ryoon.net/pub/rust/
174SITES.${RUST_STD_STAGE0}= https://www.ryoon.net/pub/rust/ 174SITES.${RUST_STD_STAGE0}= https://www.ryoon.net/pub/rust/
175DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 175DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
176# Setting this changes it for every distfile, which doesn't match what is 176# Setting this changes it for every distfile, which doesn't match what is
177# currently in distinfo. 177# currently in distinfo.
178#DIST_SUBDIR= ${PKGNAME} 178#DIST_SUBDIR= ${PKGNAME}
179# For atomic ops 179# For atomic ops
180CFLAGS+= -march=i586 180CFLAGS+= -march=i586
181pre-build-fix: 181pre-build-fix:
182 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo 182 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo
183.endif 183.endif
184.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 184.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
185RUST_ARCH= x86_64-unknown-netbsd 185RUST_ARCH= x86_64-unknown-netbsd
186RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 186RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
187RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 187RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
188DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 188DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
189pre-build-fix: 189pre-build-fix:
190.endif 190.endif
191.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi) 191.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
192RUST_ARCH= powerpc-unknown-netbsd 192RUST_ARCH= powerpc-unknown-netbsd
193RUST_STAGE0_VER= 1.28.0 193RUST_STAGE0_VER= 1.28.0
194RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 194RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
195RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 195RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
196DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 196DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
197# Do not trust he@. 197# Do not trust he@.
198SITES.${RUST_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/ 198SITES.${RUST_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/
199SITES.${RUST_STD_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/ 199SITES.${RUST_STD_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/
200pre-build-fix: 200pre-build-fix:
201.endif 201.endif
202.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi) 202.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
203RUST_ARCH= sparc64-unknown-netbsd 203RUST_ARCH= sparc64-unknown-netbsd
204RUST_STAGE0_VER= 1.29.1 204RUST_STAGE0_VER= 1.29.1
205RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 205RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
206RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 206RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
207DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 207DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
208# Do not trust he@. 208# Do not trust he@.
209SITES.${RUST_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/ 209SITES.${RUST_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/
210SITES.${RUST_STD_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/ 210SITES.${RUST_STD_STAGE0}= ftp://golden-delicious.urc.uninett.no/pub/rust/
211pre-build-fix: 211pre-build-fix:
212.endif 212.endif
213.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi) 213.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
214RUST_ARCH= armv7-unknown-netbsd-eabihf 214RUST_ARCH= armv7-unknown-netbsd-eabihf
215RUST_STAGE0_VER= 1.29.1 215RUST_STAGE0_VER= 1.29.1
216RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 216RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
217RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 217RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
218DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 218DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
219# Do not trust he@. 219# Do not trust he@.
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 \
249 cd ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}; \ 247 cd ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}; \
250 ${TOOLS_BASH} ./install.sh --prefix=${RUST_BOOTSTRAP_PATH}; \ 248 ${TOOLS_BASH} ./install.sh --prefix=${RUST_BOOTSTRAP_PATH}; \
251 cd ${WRKDIR}/rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}; \ 249 cd ${WRKDIR}/rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}; \
252 ${TOOLS_BASH} ./install.sh --prefix=${RUST_BOOTSTRAP_PATH}; \ 250 ${TOOLS_BASH} ./install.sh --prefix=${RUST_BOOTSTRAP_PATH}; \
253 fi 251 fi
254# patch(1) in NetBSD does not handle .cargo-checksum.json like long width file. 252# patch(1) in NetBSD does not handle .cargo-checksum.json like long width file.
255 cat ${WRKSRC}/src/vendor/libc/.cargo-checksum.json | \ 253 cat ${WRKSRC}/src/vendor/libc/.cargo-checksum.json | \
256 ${SED} -e 's/9c6af198a2f80da827054784faf70bc404673d9568fb45664b4f73c46245fdbd/c3851969a854d6ccaa8a94369f1288025149d1ebdc74b36f224423f35b18f7a7/' > \ 254 ${SED} -e 's/9c6af198a2f80da827054784faf70bc404673d9568fb45664b4f73c46245fdbd/c3851969a854d6ccaa8a94369f1288025149d1ebdc74b36f224423f35b18f7a7/' > \
257 ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched 255 ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched
258 ${CP} -f ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched \ 256 ${CP} -f ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched \
259 ${WRKSRC}/src/vendor/libc/.cargo-checksum.json 257 ${WRKSRC}/src/vendor/libc/.cargo-checksum.json
260.if ${OPSYS} == "NetBSD" 258.if ${OPSYS} == "NetBSD"
261 ${RM} -f ${.CURDIR}/files/c++-wrap 259 ${RM} -f ${.CURDIR}/files/c++-wrap
262 ${RM} -f ${.CURDIR}/files/clang++-wrap 260 ${RM} -f ${.CURDIR}/files/clang++-wrap
263 ${RM} -f ${.CURDIR}/files/clang-wrap 261 ${RM} -f ${.CURDIR}/files/clang-wrap
264 ${LN} -s ${.CURDIR}/files/gcc-wrap ${.CURDIR}/files/c++-wrap 262 ${LN} -s ${.CURDIR}/files/gcc-wrap ${.CURDIR}/files/c++-wrap
265 ${LN} -s ${.CURDIR}/files/gcc-wrap ${.CURDIR}/files/clang++-wrap 263 ${LN} -s ${.CURDIR}/files/gcc-wrap ${.CURDIR}/files/clang++-wrap
266 ${LN} -s ${.CURDIR}/files/gcc-wrap ${.CURDIR}/files/clang-wrap 264 ${LN} -s ${.CURDIR}/files/gcc-wrap ${.CURDIR}/files/clang-wrap
267 ${CHMOD} +x ${.CURDIR}/files/gcc-wrap 265 ${CHMOD} +x ${.CURDIR}/files/gcc-wrap
268.endif 266.endif
269 267
270.if ${OPSYS} != "SunOS" 268.if ${OPSYS} != "SunOS"
271LD_LIBRARY_PATH= ${RUST_BOOTSTRAP_PATH}/lib 269LD_LIBRARY_PATH= ${RUST_BOOTSTRAP_PATH}/lib
272PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH:Q} 270PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH:Q}
273.endif 271.endif
274 272
275.if ${OPSYS} == "FreeBSD" 273.if ${OPSYS} == "FreeBSD"
276MAKE_ENV+= OPENSSL_DIR=${SSLBASE} 274MAKE_ENV+= OPENSSL_DIR=${SSLBASE}
277.endif 275.endif
278 276
279pre-build: pre-build-fix 277pre-build: pre-build-fix
280 # Requires libssh2 defines only available in master. 278 # Requires libssh2 defines only available in master.
281 ${CP} -f ${WRKSRC}/src/vendor/libssh2-sys/libssh2/include/libssh2.h \ 279 ${CP} -f ${WRKSRC}/src/vendor/libssh2-sys/libssh2/include/libssh2.h \
282 ${BUILDLINK_DIR}/include/ 280 ${BUILDLINK_DIR}/include/
283 281
284do-build: 282do-build:
285 cd ${WRKSRC} \ 283 cd ${WRKSRC} \
286 && env ${MAKE_ENV} \ 284 && env ${MAKE_ENV} \
287 ${PYTHONBIN} ./x.py -v dist 285 ${PYTHONBIN} ./x.py -v dist
288 286
289do-install: 287do-install:
290 cd ${WRKSRC} \ 288 cd ${WRKSRC} \
291 && env ${MAKE_ENV} ${INSTALL_ENV} \ 289 && env ${MAKE_ENV} ${INSTALL_ENV} \
292 ${PYTHONBIN} ./x.py -v install 290 ${PYTHONBIN} ./x.py -v install
293 291
294post-install: 292post-install:
295 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/install.log 293 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/install.log
296 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/uninstall.sh 294 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/uninstall.sh
297 ${RM} -rf ${DESTDIR}${PREFIX}/lib/rustlib/src 295 ${RM} -rf ${DESTDIR}${PREFIX}/lib/rustlib/src
298 296
299GENERATE_PLIST+= find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \ 297GENERATE_PLIST+= find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
300 sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ; 298 sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
301 299
302.if ${OPSYS} == "Darwin" 300.if ${OPSYS} == "Darwin"
303.PHONY: fix-darwin-install-name 301.PHONY: fix-darwin-install-name
304post-install: fix-darwin-install-name 302post-install: fix-darwin-install-name
305fix-darwin-install-name: 303fix-darwin-install-name:
306. for bin in clippy-driver rls rustc rustdoc 304. for bin in clippy-driver rls rustc rustdoc
307 otool -XL ${DESTDIR}${PREFIX}/bin/${bin} \ 305 otool -XL ${DESTDIR}${PREFIX}/bin/${bin} \
308 | ${GREP} '@rpath' | while read rpath rest; do \ 306 | ${GREP} '@rpath' | while read rpath rest; do \
309 install_name_tool -change $$rpath \ 307 install_name_tool -change $$rpath \
310 `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \ 308 `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
311 ${DESTDIR}${PREFIX}/bin/${bin}; \ 309 ${DESTDIR}${PREFIX}/bin/${bin}; \
312 done 310 done
313. endfor 311. endfor
314. for libdir in lib lib/rustlib/${RUST_ARCH}/lib lib/rustlib/${RUST_ARCH}/codegen-backends 312. for libdir in lib lib/rustlib/${RUST_ARCH}/lib lib/rustlib/${RUST_ARCH}/codegen-backends
315 for f in ${DESTDIR}${PREFIX}/${libdir}/lib*.dylib; do \ 313 for f in ${DESTDIR}${PREFIX}/${libdir}/lib*.dylib; do \
316 [ ! -f $$f ] && continue; \ 314 [ ! -f $$f ] && continue; \
317 install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \ 315 install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
318 otool -XL $$f | grep '@rpath' | while read rpath rest; do \ 316 otool -XL $$f | grep '@rpath' | while read rpath rest; do \
319 install_name_tool -change $$rpath \ 317 install_name_tool -change $$rpath \
320 `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \ 318 `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
321 $$f; \ 319 $$f; \
322 done; \ 320 done; \
323 done 321 done
324. endfor 322. endfor
325.endif 323.endif
326 324
327# 325#
328# Create a relocatable stage2 bootstrap from the bits we just built that can be 326# Create a relocatable stage2 bootstrap from the bits we just built that can be
329# used to build the next version of rust. Currently only tested on SmartOS. 327# used to build the next version of rust. Currently only tested on SmartOS.
330# 328#
331BOOTSTRAP_TMPDIR= ${WRKDIR}/${PKGNAME_NOREV}-${RUST_ARCH} 329BOOTSTRAP_TMPDIR= ${WRKDIR}/${PKGNAME_NOREV}-${RUST_ARCH}
332USE_TOOLS+= gtar 330USE_TOOLS+= gtar
333 331
334# The NetBSD part is so far untested, because I could not convince 332# The NetBSD part is so far untested, because I could not convince
335# the rust build to use the gcc wrapper when building natively, 333# the rust build to use the gcc wrapper when building natively,
336# so that I could get a placeholder in the RPATH, because chrpath 334# so that I could get a placeholder in the RPATH, because chrpath
337# cannot extend the length of the RPATH... 335# cannot extend the length of the RPATH...
338 336
339stage0-bootstrap: install 337stage0-bootstrap: install
340 ${RM} -rf ${BOOTSTRAP_TMPDIR} 338 ${RM} -rf ${BOOTSTRAP_TMPDIR}
341 ${MKDIR} ${BOOTSTRAP_TMPDIR} 339 ${MKDIR} ${BOOTSTRAP_TMPDIR}
342.if ${OPSYS} == "NetBSD" 340.if ${OPSYS} == "NetBSD"
343 (cd ${BOOTSTRAP_TMPDIR}; \ 341 (cd ${BOOTSTRAP_TMPDIR}; \
344 DISTDIR=${WRKSRC}/bild/dist; \ 342 DISTDIR=${WRKSRC}/bild/dist; \
345 VER_ARCH=${PKGVERSION}-${RUST_ARCH}; \ 343 VER_ARCH=${PKGVERSION}-${RUST_ARCH}; \
346 RUSTC=rustc-$${VER_ARCH}; \ 344 RUSTC=rustc-$${VER_ARCH}; \
347 RUSTC_FILE=$${RUSTC}.tar.gz; \ 345 RUSTC_FILE=$${RUSTC}.tar.gz; \
348 RUST_STD=rust-std-$${VER_ARCH}; \ 346 RUST_STD=rust-std-$${VER_ARCH}; \
349 RUST_STD_FILE=$${RUST_STD}.tar.gz; \ 347 RUST_STD_FILE=$${RUST_STD}.tar.gz; \
350 ${GTAR} -xzf $${DISTDIR}/$${RUSTC_FILE}; \ 348 ${GTAR} -xzf $${DISTDIR}/$${RUSTC_FILE}; \
351 (cd ${RUSTC}; \ 349 (cd ${RUSTC}; \
352 RPATH='/usr/pkg/lib:/lib:/usr/lib:$$ORIGIN/../lib'; \ 350 RPATH='/usr/pkg/lib:/lib:/usr/lib:$$ORIGIN/../lib'; \
353 for f in rls-preview/bin/rls rustc/bin/rustc rustc/bin/rustdoc; do \ 351 for f in rls-preview/bin/rls rustc/bin/rustc rustc/bin/rustdoc; do \
354 chrpath -r $$RPATH $$f; \ 352 chrpath -r $$RPATH $$f; \
355 done; \ 353 done; \
356 RPATH='/usr/pkg/lib:/lib:/usr/lib:$$ORIGIN'; \ 354 RPATH='/usr/pkg/lib:/lib:/usr/lib:$$ORIGIN'; \
357 for f in rustc/lib/*.so*; do \ 355 for f in rustc/lib/*.so*; do \
358 chrpath -r $$RPATH $$f; \ 356 chrpath -r $$RPATH $$f; \
359 done; \ 357 done; \
360 RPATH='/usr/pkg/lib:/lib:/usr/lib:$$ORIGIN:$$ORIGIN/../../..'; \ 358 RPATH='/usr/pkg/lib:/lib:/usr/lib:$$ORIGIN:$$ORIGIN/../../..'; \
361 for f in rustc/lib/rustlib/*/*/*.so*; do \ 359 for f in rustc/lib/rustlib/*/*/*.so*; do \
362 chrpath -r $$RPATH $$f; \ 360 chrpath -r $$RPATH $$f; \
363 done;); \ 361 done;); \
364 ${GTAR} -czf $${RUSTC_FILE} $${RUSTC}; \ 362 ${GTAR} -czf $${RUSTC_FILE} $${RUSTC}; \
365 ${CP} $${DISTDIR}/$${RUST_STD_FILE} .; \ 363 ${CP} $${DISTDIR}/$${RUST_STD_FILE} .; \
366 echo "Fixed stage0 bootstrap in ${BOOTSTRAP_TMPDIR}:"; \ 364 echo "Fixed stage0 bootstrap in ${BOOTSTRAP_TMPDIR}:"; \
367 echo "$${RUSTC_FILE}"; \ 365 echo "$${RUSTC_FILE}"; \
368 echo "$${RUST_STD_FILE}"; \ 366 echo "$${RUST_STD_FILE}"; \
369 ) 367 )
370.endif 368.endif
371.if ${OS_VARIANT} == "SmartOS" 369.if ${OS_VARIANT} == "SmartOS"
372 ${CP} -R ${DESTDIR}/${PREFIX}/bin ${BOOTSTRAP_TMPDIR}/ 370 ${CP} -R ${DESTDIR}/${PREFIX}/bin ${BOOTSTRAP_TMPDIR}/
373 ${CP} -R ${DESTDIR}/${PREFIX}/lib ${BOOTSTRAP_TMPDIR}/ 371 ${CP} -R ${DESTDIR}/${PREFIX}/lib ${BOOTSTRAP_TMPDIR}/
374 ${MKDIR} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc 372 ${MKDIR} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc
375 for lib in libgcc_s.so.1 libssp.so.0 libstdc++.so.6; do \ 373 for lib in libgcc_s.so.1 libssp.so.0 libstdc++.so.6; do \
376 ${CP} `${PKG_CC} -print-file-name=$${lib}` \ 374 ${CP} `${PKG_CC} -print-file-name=$${lib}` \
377 ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \ 375 ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
378 done 376 done
379 for lib in libcrypto.so.1.0.0 libcurl.so.4 libhttp_parser.so.2 \ 377 for lib in libcrypto.so.1.0.0 libcurl.so.4 libhttp_parser.so.2 \
380 libiconv.so.2 libidn2.so.0 libintl.so.8 liblber-2.4.so.2 \ 378 libiconv.so.2 libidn2.so.0 libintl.so.8 liblber-2.4.so.2 \
381 libldap-2.4.so.2 libnghttp2.so.14 libsasl2.so.3 \ 379 libldap-2.4.so.2 libnghttp2.so.14 libsasl2.so.3 \
382 libssh2.so.1 libssl.so.1.0.0 libunistring.so.2 libz.so.1; do \ 380 libssh2.so.1 libssl.so.1.0.0 libunistring.so.2 libz.so.1; do \
383 ${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \ 381 ${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
384 done 382 done
385 for f in ${BOOTSTRAP_TMPDIR}/bin/{cargo,rls,rustc,rustdoc}; do \ 383 for f in ${BOOTSTRAP_TMPDIR}/bin/{cargo,rls,rustc,rustdoc}; do \
386 /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN/../lib:$$ORIGIN/../lib/pkgsrc' $$f; \ 384 /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN/../lib:$$ORIGIN/../lib/pkgsrc' $$f; \
387 done 385 done
388 for f in ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/*.so*; do \ 386 for f in ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/*.so*; do \
389 /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN' $$f; \ 387 /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN' $$f; \
390 done 388 done
391 for f in ${BOOTSTRAP_TMPDIR}/lib/*.so*; do \ 389 for f in ${BOOTSTRAP_TMPDIR}/lib/*.so*; do \
392 /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN:$$ORIGIN/pkgsrc' $$f; \ 390 /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN:$$ORIGIN/pkgsrc' $$f; \
393 done 391 done
394 for f in ${BOOTSTRAP_TMPDIR}/lib/rustlib/${RUST_ARCH}/*/*.so*; do \ 392 for f in ${BOOTSTRAP_TMPDIR}/lib/rustlib/${RUST_ARCH}/*/*.so*; do \
395 /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN:$$ORIGIN/../../..:$$ORIGIN/../../../pkgsrc' $$f; \ 393 /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN:$$ORIGIN/../../..:$$ORIGIN/../../../pkgsrc' $$f; \
396 done 394 done
397 (cd ${WRKDIR}; \ 395 (cd ${WRKDIR}; \
398 ${GTAR} -zcf ${PKGNAME_NOREV}-${RUST_ARCH}.tar.gz ${PKGNAME_NOREV}-${RUST_ARCH}) 396 ${GTAR} -zcf ${PKGNAME_NOREV}-${RUST_ARCH}.tar.gz ${PKGNAME_NOREV}-${RUST_ARCH})
399.endif 397.endif
400 398
401.include "../../devel/cmake/buildlink3.mk" 399.include "../../devel/cmake/buildlink3.mk"
402.include "../../devel/libgit2/buildlink3.mk" 400.include "../../devel/libgit2/buildlink3.mk"
403.include "../../devel/zlib/buildlink3.mk" 401.include "../../devel/zlib/buildlink3.mk"
404.include "../../lang/python/tool.mk" 402.include "../../lang/python/tool.mk"
405.include "../../security/libssh2/buildlink3.mk" 403.include "../../security/libssh2/buildlink3.mk"
406.include "../../security/openssl/buildlink3.mk" 404.include "../../security/openssl/buildlink3.mk"
407.include "../../www/curl/buildlink3.mk" 405.include "../../www/curl/buildlink3.mk"
408.include "../../www/http-parser/buildlink3.mk" 406.include "../../www/http-parser/buildlink3.mk"
409.include "../../mk/bsd.pkg.mk" 407.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/misc/xdg-utils/Makefile (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 (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,123 +1,116 @@ @@ -1,123 +1,116 @@
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}
38TEST_TARGET= check 38TEST_TARGET= check
39 39
40PKGCONFIG_OVERRIDE= gdk-2.0-uninstalled.pc.in 40PKGCONFIG_OVERRIDE= gdk-2.0-uninstalled.pc.in
41PKGCONFIG_OVERRIDE+= gdk-2.0.pc.in 41PKGCONFIG_OVERRIDE+= gdk-2.0.pc.in
42PKGCONFIG_OVERRIDE+= gtk+-2.0-uninstalled.pc.in 42PKGCONFIG_OVERRIDE+= gtk+-2.0-uninstalled.pc.in
43PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in 43PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in
44PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0.pc.in 44PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0.pc.in
45#PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0-uninstalled.pc.in 45#PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0-uninstalled.pc.in
46#PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in 46#PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
47#PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in 47#PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
48 48
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
82 75
83PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # not yet ported as of 2.24.22 76PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # not yet ported as of 2.24.22
84REPLACE_PYTHON= gtk/gtk-builder-convert 77REPLACE_PYTHON= gtk/gtk-builder-convert
85 78
86# We remove the module databases during post-install since we create them 79# We remove the module databases during post-install since we create them
87# anew in the +INSTALL script as part of the POST-INSTALL action. 80# anew in the +INSTALL script as part of the POST-INSTALL action.
88# 81#
89post-install: 82post-install:
90 ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB} 83 ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB}
91 84
92FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk2-update-icon-cache" 85FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk2-update-icon-cache"
93FILES_SUBST+= ICON_THEME_DIR="${LOCALBASE}/share/icons" 86FILES_SUBST+= ICON_THEME_DIR="${LOCALBASE}/share/icons"
94INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl 87INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl
95 88
96_BUILDING_GTK2= yes 89_BUILDING_GTK2= yes
97.include "modules.mk" 90.include "modules.mk"
98 91
99.include "../../databases/shared-mime-info/buildlink3.mk" 92.include "../../databases/shared-mime-info/buildlink3.mk"
100BUILDLINK_API_DEPENDS.atk+= atk>=1.30.0 93BUILDLINK_API_DEPENDS.atk+= atk>=1.30.0
101.include "../../devel/atk/buildlink3.mk" 94.include "../../devel/atk/buildlink3.mk"
102.include "../../devel/gettext-lib/buildlink3.mk" 95.include "../../devel/gettext-lib/buildlink3.mk"
103BUILDLINK_API_DEPENDS.glib2+= glib2>=2.28.0 96BUILDLINK_API_DEPENDS.glib2+= glib2>=2.28.0
104.include "../../devel/glib2/buildlink3.mk" 97.include "../../devel/glib2/buildlink3.mk"
105.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 98.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
106BUILDLINK_DEPMETHOD.gobject-introspection:= build 99BUILDLINK_DEPMETHOD.gobject-introspection:= build
107BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.3 100BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.3
108.include "../../devel/gobject-introspection/buildlink3.mk" 101.include "../../devel/gobject-introspection/buildlink3.mk"
109 102
110.include "options.mk" 103.include "options.mk"
111 104
112BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0 105BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0
113.include "../../devel/pango/buildlink3.mk" 106.include "../../devel/pango/buildlink3.mk"
114.include "../../fonts/fontconfig/buildlink3.mk" 107.include "../../fonts/fontconfig/buildlink3.mk"
115BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.0 108BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.0
116.include "../../graphics/cairo/buildlink3.mk" 109.include "../../graphics/cairo/buildlink3.mk"
117.include "../../graphics/freetype2/buildlink3.mk" 110.include "../../graphics/freetype2/buildlink3.mk"
118#.include "../../mk/jpeg.buildlink3.mk" 111#.include "../../mk/jpeg.buildlink3.mk"
119#.include "../../graphics/png/buildlink3.mk" 112#.include "../../graphics/png/buildlink3.mk"
120#.include "../../graphics/tiff/buildlink3.mk" 113#.include "../../graphics/tiff/buildlink3.mk"
121.include "../../lang/python/application.mk" 114.include "../../lang/python/application.mk"
122 115
123.include "../../mk/bsd.pkg.mk" 116.include "../../mk/bsd.pkg.mk"
cvs diff -r1.118 -r1.119 pkgsrc/x11/gtk3/Makefile (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,106 +1,100 @@ @@ -1,106 +1,100 @@
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
30# Work around build problems, disable unstable PAPI, PR #41608: 30# Work around build problems, disable unstable PAPI, PR #41608:
31CONFIGURE_ARGS+= --disable-papi 31CONFIGURE_ARGS+= --disable-papi
32# Avoid regeneration of Makefile.in after configure.ac patch 32# Avoid regeneration of Makefile.in after configure.ac patch
33CONFIGURE_ARGS+= --disable-maintainer-mode 33CONFIGURE_ARGS+= --disable-maintainer-mode
34MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 34MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
35TEST_TARGET= check 35TEST_TARGET= check
36 36
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:
69 ${RM} -f ${DESTDIR}${GTK3_IMMODULES_DB} 63 ${RM} -f ${DESTDIR}${GTK3_IMMODULES_DB}
70 64
71FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache" 65FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache"
72FILES_SUBST+= ICON_THEME_DIR="${PREFIX}/share/icons" 66FILES_SUBST+= ICON_THEME_DIR="${PREFIX}/share/icons"
73INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl 67INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl
74 68
75_BUILDING_GTK3= yes 69_BUILDING_GTK3= yes
76.include "modules.mk" 70.include "modules.mk"
77 71
78.include "../../databases/shared-mime-info/buildlink3.mk" 72.include "../../databases/shared-mime-info/buildlink3.mk"
79BUILDLINK_API_DEPENDS.atk+= atk>=2.15.1 73BUILDLINK_API_DEPENDS.atk+= atk>=2.15.1
80.include "../../devel/atk/buildlink3.mk" 74.include "../../devel/atk/buildlink3.mk"
81.include "../../devel/gettext-lib/buildlink3.mk" 75.include "../../devel/gettext-lib/buildlink3.mk"
82BUILDLINK_API_DEPENDS.glib2+= glib2>=2.49.4 76BUILDLINK_API_DEPENDS.glib2+= glib2>=2.49.4
83.include "../../devel/glib2/buildlink3.mk" 77.include "../../devel/glib2/buildlink3.mk"
84BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.30.0 78BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.30.0
85.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 79.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
86BUILDLINK_DEPMETHOD.gobject-introspection:= build 80BUILDLINK_DEPMETHOD.gobject-introspection:= build
87BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.39.0 81BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.39.0
88.include "../../devel/gobject-introspection/buildlink3.mk" 82.include "../../devel/gobject-introspection/buildlink3.mk"
89 83
90.include "options.mk" 84.include "options.mk"
91 85
92.include "../../devel/glib2/schemas.mk" 86.include "../../devel/glib2/schemas.mk"
93 87
94BUILDLINK_API_DEPENDS.pango+= pango>=1.37.3 88BUILDLINK_API_DEPENDS.pango+= pango>=1.37.3
95.include "../../devel/pango/buildlink3.mk" 89.include "../../devel/pango/buildlink3.mk"
96.include "../../fonts/fontconfig/buildlink3.mk" 90.include "../../fonts/fontconfig/buildlink3.mk"
97BUILDLINK_API_DEPENDS.cairo+= cairo>=1.14.0 91BUILDLINK_API_DEPENDS.cairo+= cairo>=1.14.0
98.include "../../graphics/cairo/buildlink3.mk" 92.include "../../graphics/cairo/buildlink3.mk"
99.include "../../graphics/cairo-gobject/buildlink3.mk" 93.include "../../graphics/cairo-gobject/buildlink3.mk"
100.include "../../graphics/freetype2/buildlink3.mk" 94.include "../../graphics/freetype2/buildlink3.mk"
101BUILDLINK_API_DEPENDS.libepoxy+= libepoxy>=1.2nb2 95BUILDLINK_API_DEPENDS.libepoxy+= libepoxy>=1.2nb2
102.include "../../graphics/libepoxy/buildlink3.mk" 96.include "../../graphics/libepoxy/buildlink3.mk"
103.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 97.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
104.include "../../sysutils/desktop-file-utils/desktopdb.mk" 98.include "../../sysutils/desktop-file-utils/desktopdb.mk"
105 99
106.include "../../mk/bsd.pkg.mk" 100.include "../../mk/bsd.pkg.mk"