Sun Jul 4 07:10:51 2010 UTC ()
Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.


(agc)
diff -r1.12 -r1.12.2.1 pkgsrc/devel/atf/Makefile
diff -r1.11 -r1.11.2.1 pkgsrc/devel/atf/PLIST
diff -r1.9 -r1.9.2.1 pkgsrc/devel/atf/distinfo
diff -r1.1 -r1.1.64.1 pkgsrc/devel/nbitools/patches/patch-aa
diff -r1.1 -r1.1.64.1 pkgsrc/devel/nbitools/patches/patch-ab
diff -r1.1 -r1.1.64.1 pkgsrc/devel/nbitools/patches/patch-ae
diff -r1.12 -r1.12.4.1 pkgsrc/devel/ptlib/Makefile
diff -r1.1.1.1 -r1.1.1.1.2.1 pkgsrc/devel/py-sysctl/Makefile
diff -r1.34 -r1.34.4.1 pkgsrc/devel/subversion/Makefile.common
diff -r1.5 -r1.5.2.1 pkgsrc/devel/swt/Makefile
diff -r1.1.1.1 -r1.1.1.1.4.1 pkgsrc/devel/swt/files/make_pkgsrc.mak
cvs diff -r1.12 -r1.12.2.1 pkgsrc/devel/atf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/atf/Makefile 2010/06/03 16:07:25 1.12
+++ pkgsrc/devel/atf/Makefile 2010/07/04 07:10:50 1.12.2.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.12 2010/06/03 16:07:25 jmmv Exp $ 1# $NetBSD: Makefile,v 1.12.2.1 2010/07/04 07:10:50 agc Exp $
2# 2#
3 3
4DISTNAME= atf-0.9 4DISTNAME= atf-0.10
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/jmmv/atf/0.9/ 6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/jmmv/atf/0.10/
7 7
8MAINTAINER= jmmv@NetBSD.org 8MAINTAINER= jmmv@NetBSD.org
9HOMEPAGE= http://www.NetBSD.org/~jmmv/atf/ 9HOMEPAGE= http://www.NetBSD.org/~jmmv/atf/
10COMMENT= Automated testing framework 10COMMENT= Automated testing framework
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15MAKE_JOBS_SAFE= yes 15MAKE_JOBS_SAFE= yes
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
cvs diff -r1.11 -r1.11.2.1 pkgsrc/devel/atf/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/atf/PLIST 2010/06/03 16:07:25 1.11
+++ pkgsrc/devel/atf/PLIST 2010/07/04 07:10:50 1.11.2.1
@@ -1,412 +1,160 @@ @@ -1,412 +1,160 @@
1@comment $NetBSD: PLIST,v 1.11 2010/06/03 16:07:25 jmmv Exp $ 1@comment $NetBSD: PLIST,v 1.11.2.1 2010/07/04 07:10:50 agc Exp $
2bin/atf-check 2bin/atf-check
3bin/atf-config 3bin/atf-config
4bin/atf-report 4bin/atf-report
5bin/atf-run 5bin/atf-run
6bin/atf-sh 6bin/atf-sh
7bin/atf-version 7bin/atf-version
8include/atf-c++.hpp 8include/atf-c++.hpp
9include/atf-c++/application.hpp 9include/atf-c++/application.hpp
10include/atf-c++/atffile.hpp 
11include/atf-c++/build.hpp 10include/atf-c++/build.hpp
12include/atf-c++/check.hpp 11include/atf-c++/check.hpp
13include/atf-c++/config.hpp 12include/atf-c++/config.hpp
14include/atf-c++/env.hpp 13include/atf-c++/env.hpp
15include/atf-c++/exceptions.hpp 14include/atf-c++/exceptions.hpp
16include/atf-c++/expand.hpp 15include/atf-c++/expand.hpp
17include/atf-c++/formats.hpp 
18include/atf-c++/fs.hpp 16include/atf-c++/fs.hpp
19include/atf-c++/io.hpp 17include/atf-c++/io.hpp
20include/atf-c++/macros.hpp 18include/atf-c++/macros.hpp
21include/atf-c++/parser.hpp 19include/atf-c++/parser.hpp
22include/atf-c++/process.hpp 20include/atf-c++/process.hpp
23include/atf-c++/sanity.hpp 21include/atf-c++/sanity.hpp
24include/atf-c++/signals.hpp 22include/atf-c++/signals.hpp
25include/atf-c++/tests.hpp 23include/atf-c++/tests.hpp
26include/atf-c++/text.hpp 24include/atf-c++/text.hpp
27include/atf-c++/ui.hpp 25include/atf-c++/ui.hpp
28include/atf-c++/user.hpp 26include/atf-c++/user.hpp
29include/atf-c++/utils.hpp 27include/atf-c++/utils.hpp
30include/atf-c.h 28include/atf-c.h
31include/atf-c/build.h 29include/atf-c/build.h
32include/atf-c/check.h 30include/atf-c/check.h
33include/atf-c/config.h 31include/atf-c/config.h
34include/atf-c/defs.h 32include/atf-c/defs.h
35include/atf-c/dynstr.h 33include/atf-c/dynstr.h
36include/atf-c/env.h 34include/atf-c/env.h
37include/atf-c/error.h 35include/atf-c/error.h
38include/atf-c/error_fwd.h 36include/atf-c/error_fwd.h
39include/atf-c/fs.h 37include/atf-c/fs.h
40include/atf-c/io.h 
41include/atf-c/list.h 38include/atf-c/list.h
42include/atf-c/macros.h 39include/atf-c/macros.h
43include/atf-c/map.h 40include/atf-c/map.h
44include/atf-c/process.h 41include/atf-c/process.h
45include/atf-c/sanity.h 42include/atf-c/sanity.h
46include/atf-c/tc.h 43include/atf-c/tc.h
47include/atf-c/tcr.h 
48include/atf-c/text.h 44include/atf-c/text.h
49include/atf-c/tp.h 45include/atf-c/tp.h
50include/atf-c/ui.h 
51include/atf-c/user.h 46include/atf-c/user.h
52lib/libatf-c++.la 47lib/libatf-c++.la
53lib/libatf-c.la 48lib/libatf-c.la
54lib/pkgconfig/atf-c++.pc 49lib/pkgconfig/atf-c++.pc
55lib/pkgconfig/atf-c.pc 50lib/pkgconfig/atf-c.pc
56libexec/atf-cleanup 
57libexec/atf-format 
58man/man1/atf-check.1 51man/man1/atf-check.1
59man/man1/atf-cleanup.1 
60man/man1/atf-config.1 52man/man1/atf-config.1
61man/man1/atf-format.1 
62man/man1/atf-report.1 53man/man1/atf-report.1
63man/man1/atf-run.1 54man/man1/atf-run.1
64man/man1/atf-sh.1 55man/man1/atf-sh.1
65man/man1/atf-test-program.1 56man/man1/atf-test-program.1
66man/man1/atf-version.1 57man/man1/atf-version.1
67man/man3/atf-c++-api.3 58man/man3/atf-c++-api.3
68man/man3/atf-c-api.3 59man/man3/atf-c-api.3
69man/man3/atf-sh-api.3 60man/man3/atf-sh-api.3
70man/man4/atf-test-case.4 61man/man4/atf-test-case.4
71man/man5/atf-formats.5 62man/man5/atf-formats.5
72man/man7/atf.7 63man/man7/atf.7
73share/atf/atf-run.hooks 64share/atf/atf-run.hooks
74share/atf/libatf-sh.subr 65share/atf/libatf-sh.subr
75share/doc/atf/AUTHORS 66share/doc/atf/AUTHORS
76share/doc/atf/COPYING 67share/doc/atf/COPYING
77share/doc/atf/NEWS 68share/doc/atf/NEWS
78share/doc/atf/README 69share/doc/atf/README
79share/examples/atf/atf-run.hooks 70share/examples/atf/atf-run.hooks
80share/examples/atf/tests-results.css 71share/examples/atf/tests-results.css
81share/xml/atf/tests-results.dtd 72share/xml/atf/tests-results.dtd
82share/xsl/atf/tests-results.xsl 73share/xsl/atf/tests-results.xsl
83tests/atf/Atffile 74tests/atf/Atffile
84tests/atf/atf-c++/Atffile 75tests/atf/atf-c++/Atffile
85tests/atf/atf-c++/d_include_application_hpp.cpp 76tests/atf/atf-c++/application_test
86tests/atf/atf-c++/d_include_atf_c++_hpp.cpp 77tests/atf/atf-c++/atf_c++_test
87tests/atf/atf-c++/d_include_atffile_hpp.cpp 78tests/atf/atf-c++/build_test
88tests/atf/atf-c++/d_include_build_hpp.cpp 79tests/atf/atf-c++/check_test
89tests/atf/atf-c++/d_include_check_hpp.cpp 80tests/atf/atf-c++/config_test
90tests/atf/atf-c++/d_include_config_hpp.cpp 81tests/atf/atf-c++/env_test
91tests/atf/atf-c++/d_include_env_hpp.cpp 82tests/atf/atf-c++/exceptions_test
92tests/atf/atf-c++/d_include_exceptions_hpp.cpp 83tests/atf/atf-c++/expand_test
93tests/atf/atf-c++/d_include_expand_hpp.cpp 84tests/atf/atf-c++/fs_test
94tests/atf/atf-c++/d_include_formats_hpp.cpp 85tests/atf/atf-c++/io_test
95tests/atf/atf-c++/d_include_fs_hpp.cpp 86tests/atf/atf-c++/macros_hpp_test.cpp
96tests/atf/atf-c++/d_include_io_hpp.cpp 87tests/atf/atf-c++/macros_test
97tests/atf/atf-c++/d_include_macros_hpp.cpp 88tests/atf/atf-c++/parser_test
98tests/atf/atf-c++/d_include_parser_hpp.cpp 89tests/atf/atf-c++/pkg_config_test
99tests/atf/atf-c++/d_include_process_hpp.cpp 90tests/atf/atf-c++/process_test
100tests/atf/atf-c++/d_include_sanity_hpp.cpp 91tests/atf/atf-c++/sanity_test
101tests/atf/atf-c++/d_include_signals_hpp.cpp 92tests/atf/atf-c++/signals_test
102tests/atf/atf-c++/d_include_tests_hpp.cpp 93tests/atf/atf-c++/tests_test
103tests/atf/atf-c++/d_include_text_hpp.cpp 94tests/atf/atf-c++/text_test
104tests/atf/atf-c++/d_include_ui_hpp.cpp 95tests/atf/atf-c++/ui_test
105tests/atf/atf-c++/d_include_user_hpp.cpp 96tests/atf/atf-c++/user_test
106tests/atf/atf-c++/d_include_utils_hpp.cpp 97tests/atf/atf-c++/utils_test
107tests/atf/atf-c++/d_use_macros_hpp.cpp 
108tests/atf/atf-c++/t_application 
109tests/atf/atf-c++/t_atf_c++ 
110tests/atf/atf-c++/t_atffile 
111tests/atf/atf-c++/t_build 
112tests/atf/atf-c++/t_check 
113tests/atf/atf-c++/t_config 
114tests/atf/atf-c++/t_env 
115tests/atf/atf-c++/t_exceptions 
116tests/atf/atf-c++/t_expand 
117tests/atf/atf-c++/t_formats 
118tests/atf/atf-c++/t_fs 
119tests/atf/atf-c++/t_io 
120tests/atf/atf-c++/t_macros 
121tests/atf/atf-c++/t_parser 
122tests/atf/atf-c++/t_pkg_config 
123tests/atf/atf-c++/t_process 
124tests/atf/atf-c++/t_sanity 
125tests/atf/atf-c++/t_signals 
126tests/atf/atf-c++/t_tests 
127tests/atf/atf-c++/t_text 
128tests/atf/atf-c++/t_ui 
129tests/atf/atf-c++/t_user 
130tests/atf/atf-c++/t_utils 
131tests/atf/atf-c/Atffile 98tests/atf/atf-c/Atffile
132tests/atf/atf-c/d_include_atf_c_h.c 99tests/atf/atf-c/atf_c_test
133tests/atf/atf-c/d_include_build_h.c 100tests/atf/atf-c/build_test
134tests/atf/atf-c/d_include_check_h.c 101tests/atf/atf-c/check_test
135tests/atf/atf-c/d_include_config_h.c 102tests/atf/atf-c/config_test
136tests/atf/atf-c/d_include_dynstr_h.c 103tests/atf/atf-c/dynstr_test
137tests/atf/atf-c/d_include_env_h.c 104tests/atf/atf-c/env_test
138tests/atf/atf-c/d_include_error_fwd_h.c 105tests/atf/atf-c/error_test
139tests/atf/atf-c/d_include_error_h.c 106tests/atf/atf-c/fs_test
140tests/atf/atf-c/d_include_fs_h.c 107tests/atf/atf-c/list_test
141tests/atf/atf-c/d_include_io_h.c 108tests/atf/atf-c/macros_h_test.c
142tests/atf/atf-c/d_include_list_h.c 109tests/atf/atf-c/macros_test
143tests/atf/atf-c/d_include_macros_h.c 110tests/atf/atf-c/map_test
144tests/atf/atf-c/d_include_map_h.c 111tests/atf/atf-c/pkg_config_test
145tests/atf/atf-c/d_include_process_h.c 112tests/atf/atf-c/process_helpers
146tests/atf/atf-c/d_include_sanity_h.c 113tests/atf/atf-c/process_test
147tests/atf/atf-c/d_include_tc_h.c 114tests/atf/atf-c/sanity_test
148tests/atf/atf-c/d_include_tcr_h.c 115tests/atf/atf-c/tc_test
149tests/atf/atf-c/d_include_text_h.c 116tests/atf/atf-c/test_helpers_test
150tests/atf/atf-c/d_include_tp_h.c 117tests/atf/atf-c/text_test
151tests/atf/atf-c/d_include_ui_h.c 118tests/atf/atf-c/tp_test
152tests/atf/atf-c/d_include_user_h.c 119tests/atf/atf-c/user_test
153tests/atf/atf-c/d_use_macros_h.c 
154tests/atf/atf-c/h_processes 
155tests/atf/atf-c/t_atf_c 
156tests/atf/atf-c/t_build 
157tests/atf/atf-c/t_check 
158tests/atf/atf-c/t_config 
159tests/atf/atf-c/t_dynstr 
160tests/atf/atf-c/t_env 
161tests/atf/atf-c/t_error 
162tests/atf/atf-c/t_fs 
163tests/atf/atf-c/t_h_lib 
164tests/atf/atf-c/t_io 
165tests/atf/atf-c/t_list 
166tests/atf/atf-c/t_macros 
167tests/atf/atf-c/t_map 
168tests/atf/atf-c/t_pkg_config 
169tests/atf/atf-c/t_process 
170tests/atf/atf-c/t_sanity 
171tests/atf/atf-c/t_tc 
172tests/atf/atf-c/t_tcr 
173tests/atf/atf-c/t_text 
174tests/atf/atf-c/t_tp 
175tests/atf/atf-c/t_ui 
176tests/atf/atf-c/t_user 
177tests/atf/atf-check/Atffile 120tests/atf/atf-check/Atffile
178tests/atf/atf-check/t_integration 121tests/atf/atf-check/integration_test
179tests/atf/atf-cleanup/Atffile 
180tests/atf/atf-cleanup/t_integration 
181tests/atf/atf-config/Atffile 122tests/atf/atf-config/Atffile
182tests/atf/atf-config/t_integration 123tests/atf/atf-config/integration_test
183tests/atf/atf-report/Atffile 124tests/atf/atf-report/Atffile
184tests/atf/atf-report/h_fail 125tests/atf/atf-report/fail_helper
185tests/atf/atf-report/h_misc 126tests/atf/atf-report/integration_test
186tests/atf/atf-report/h_pass 127tests/atf/atf-report/misc_helpers
187tests/atf/atf-report/t_integration 128tests/atf/atf-report/pass_helper
 129tests/atf/atf-report/reader_test
188tests/atf/atf-run/Atffile 130tests/atf/atf-run/Atffile
189tests/atf/atf-run/h_bad_metadata 131tests/atf/atf-run/atffile_test
190tests/atf/atf-run/h_fail 132tests/atf/atf-run/bad_metadata_helper
191tests/atf/atf-run/h_misc 133tests/atf/atf-run/config_test
192tests/atf/atf-run/h_pass 134tests/atf/atf-run/expect_helpers
193tests/atf/atf-run/h_several_tcs 135tests/atf/atf-run/fs_test
194tests/atf/atf-run/h_zero_tcs 136tests/atf/atf-run/integration_test
195tests/atf/atf-run/t_config 137tests/atf/atf-run/misc_helpers
196tests/atf/atf-run/t_integration 138tests/atf/atf-run/pass_helper
197tests/atf/atf-run/t_requirements 139tests/atf/atf-run/requirements_test
198tests/atf/atf-run/t_test_program 140tests/atf/atf-run/several_tcs_helper
 141tests/atf/atf-run/test_program_test
 142tests/atf/atf-run/zero_tcs_helper
199tests/atf/atf-sh/Atffile 143tests/atf/atf-sh/Atffile
200tests/atf/atf-sh/h_misc 144tests/atf/atf-sh/atf_check_test
201tests/atf/atf-sh/t_atf_check 145tests/atf/atf-sh/config_test
202tests/atf/atf-sh/t_config 146tests/atf/atf-sh/integration_test
203tests/atf/atf-sh/t_integration 147tests/atf/atf-sh/misc_helpers
204tests/atf/atf-sh/t_normalize 148tests/atf/atf-sh/normalize_test
205tests/atf/atf-sh/t_tc 149tests/atf/atf-sh/tc_test
206tests/atf/atf-sh/t_tp 150tests/atf/atf-sh/tp_test
207tests/atf/formats/Atffile 151tests/atf/test-programs/Atffile
208tests/atf/formats/d_atffile_1 152tests/atf/test-programs/c_helpers
209tests/atf/formats/d_atffile_1.expout 153tests/atf/test-programs/config_test
210tests/atf/formats/d_atffile_2 154tests/atf/test-programs/cpp_helpers
211tests/atf/formats/d_atffile_2.expout 155tests/atf/test-programs/expect_test
212tests/atf/formats/d_atffile_3 156tests/atf/test-programs/fork_test
213tests/atf/formats/d_atffile_3.expout 157tests/atf/test-programs/meta_data_test
214tests/atf/formats/d_atffile_4 158tests/atf/test-programs/result_test
215tests/atf/formats/d_atffile_4.expout 159tests/atf/test-programs/sh_helpers
216tests/atf/formats/d_atffile_5 160tests/atf/test-programs/srcdir_test
217tests/atf/formats/d_atffile_5.expout 
218tests/atf/formats/d_atffile_50 
219tests/atf/formats/d_atffile_50.experr 
220tests/atf/formats/d_atffile_51 
221tests/atf/formats/d_atffile_51.experr 
222tests/atf/formats/d_atffile_52 
223tests/atf/formats/d_atffile_52.experr 
224tests/atf/formats/d_atffile_53 
225tests/atf/formats/d_atffile_53.experr 
226tests/atf/formats/d_atffile_53.expout 
227tests/atf/formats/d_atffile_54 
228tests/atf/formats/d_atffile_54.experr 
229tests/atf/formats/d_atffile_6 
230tests/atf/formats/d_atffile_6.expout 
231tests/atf/formats/d_config_1 
232tests/atf/formats/d_config_1.expout 
233tests/atf/formats/d_config_2 
234tests/atf/formats/d_config_2.expout 
235tests/atf/formats/d_config_3 
236tests/atf/formats/d_config_3.expout 
237tests/atf/formats/d_config_4 
238tests/atf/formats/d_config_4.expout 
239tests/atf/formats/d_config_50 
240tests/atf/formats/d_config_50.experr 
241tests/atf/formats/d_config_51 
242tests/atf/formats/d_config_51.experr 
243tests/atf/formats/d_config_52 
244tests/atf/formats/d_config_52.experr 
245tests/atf/formats/d_config_53 
246tests/atf/formats/d_config_53.experr 
247tests/atf/formats/d_config_53.expout 
248tests/atf/formats/d_config_54 
249tests/atf/formats/d_config_54.experr 
250tests/atf/formats/d_headers_1 
251tests/atf/formats/d_headers_1.experr 
252tests/atf/formats/d_headers_10 
253tests/atf/formats/d_headers_10.experr 
254tests/atf/formats/d_headers_11 
255tests/atf/formats/d_headers_11.experr 
256tests/atf/formats/d_headers_12 
257tests/atf/formats/d_headers_12.experr 
258tests/atf/formats/d_headers_2 
259tests/atf/formats/d_headers_2.experr 
260tests/atf/formats/d_headers_3 
261tests/atf/formats/d_headers_3.experr 
262tests/atf/formats/d_headers_4 
263tests/atf/formats/d_headers_4.experr 
264tests/atf/formats/d_headers_5 
265tests/atf/formats/d_headers_5.experr 
266tests/atf/formats/d_headers_6 
267tests/atf/formats/d_headers_6.experr 
268tests/atf/formats/d_headers_7 
269tests/atf/formats/d_headers_7.experr 
270tests/atf/formats/d_headers_8 
271tests/atf/formats/d_headers_8.experr 
272tests/atf/formats/d_headers_9 
273tests/atf/formats/d_headers_9.experr 
274tests/atf/formats/d_tcr_1 
275tests/atf/formats/d_tcr_1.expout 
276tests/atf/formats/d_tcr_2 
277tests/atf/formats/d_tcr_2.expout 
278tests/atf/formats/d_tcr_3 
279tests/atf/formats/d_tcr_3.expout 
280tests/atf/formats/d_tcr_50 
281tests/atf/formats/d_tcr_50.experr 
282tests/atf/formats/d_tcr_51 
283tests/atf/formats/d_tcr_51.experr 
284tests/atf/formats/d_tcr_52 
285tests/atf/formats/d_tcr_52.experr 
286tests/atf/formats/d_tcr_53 
287tests/atf/formats/d_tcr_53.experr 
288tests/atf/formats/d_tcr_54 
289tests/atf/formats/d_tcr_54.experr 
290tests/atf/formats/d_tcr_60 
291tests/atf/formats/d_tcr_60.experr 
292tests/atf/formats/d_tcr_61 
293tests/atf/formats/d_tcr_61.experr 
294tests/atf/formats/d_tcr_61.expout 
295tests/atf/formats/d_tcr_70 
296tests/atf/formats/d_tcr_70.experr 
297tests/atf/formats/d_tcr_70.expout 
298tests/atf/formats/d_tcr_71 
299tests/atf/formats/d_tcr_71.experr 
300tests/atf/formats/d_tcr_71.expout 
301tests/atf/formats/d_tcr_72 
302tests/atf/formats/d_tcr_72.experr 
303tests/atf/formats/d_tcr_72.expout 
304tests/atf/formats/d_tcr_73 
305tests/atf/formats/d_tcr_73.experr 
306tests/atf/formats/d_tcr_73.expout 
307tests/atf/formats/d_tcr_74 
308tests/atf/formats/d_tcr_74.experr 
309tests/atf/formats/d_tcr_74.expout 
310tests/atf/formats/d_tcr_75 
311tests/atf/formats/d_tcr_75.experr 
312tests/atf/formats/d_tcr_75.expout 
313tests/atf/formats/d_tcr_76 
314tests/atf/formats/d_tcr_76.experr 
315tests/atf/formats/d_tcr_76.expout 
316tests/atf/formats/d_tcr_77 
317tests/atf/formats/d_tcr_77.experr 
318tests/atf/formats/d_tp_1 
319tests/atf/formats/d_tp_1.expout 
320tests/atf/formats/d_tp_2 
321tests/atf/formats/d_tp_2.expout 
322tests/atf/formats/d_tp_3 
323tests/atf/formats/d_tp_3.expout 
324tests/atf/formats/d_tp_4 
325tests/atf/formats/d_tp_4.expout 
326tests/atf/formats/d_tp_50 
327tests/atf/formats/d_tp_50.experr 
328tests/atf/formats/d_tp_51 
329tests/atf/formats/d_tp_51.experr 
330tests/atf/formats/d_tp_52 
331tests/atf/formats/d_tp_52.expout 
332tests/atf/formats/d_tp_53 
333tests/atf/formats/d_tp_53.experr 
334tests/atf/formats/d_tp_54 
335tests/atf/formats/d_tp_54.experr 
336tests/atf/formats/d_tp_55 
337tests/atf/formats/d_tp_55.experr 
338tests/atf/formats/d_tp_56 
339tests/atf/formats/d_tp_56.experr 
340tests/atf/formats/d_tp_57 
341tests/atf/formats/d_tp_57.experr 
342tests/atf/formats/d_tp_58 
343tests/atf/formats/d_tp_58.experr 
344tests/atf/formats/d_tp_59 
345tests/atf/formats/d_tp_59.experr 
346tests/atf/formats/d_tps_1 
347tests/atf/formats/d_tps_1.expout 
348tests/atf/formats/d_tps_2 
349tests/atf/formats/d_tps_2.expout 
350tests/atf/formats/d_tps_3 
351tests/atf/formats/d_tps_3.expout 
352tests/atf/formats/d_tps_4 
353tests/atf/formats/d_tps_4.expout 
354tests/atf/formats/d_tps_5 
355tests/atf/formats/d_tps_5.expout 
356tests/atf/formats/d_tps_50 
357tests/atf/formats/d_tps_50.experr 
358tests/atf/formats/d_tps_51 
359tests/atf/formats/d_tps_51.experr 
360tests/atf/formats/d_tps_52 
361tests/atf/formats/d_tps_52.experr 
362tests/atf/formats/d_tps_53 
363tests/atf/formats/d_tps_53.experr 
364tests/atf/formats/d_tps_53.expout 
365tests/atf/formats/d_tps_54 
366tests/atf/formats/d_tps_54.experr 
367tests/atf/formats/d_tps_54.expout 
368tests/atf/formats/d_tps_55 
369tests/atf/formats/d_tps_55.experr 
370tests/atf/formats/d_tps_55.expout 
371tests/atf/formats/d_tps_56 
372tests/atf/formats/d_tps_56.experr 
373tests/atf/formats/d_tps_56.expout 
374tests/atf/formats/d_tps_57 
375tests/atf/formats/d_tps_57.experr 
376tests/atf/formats/d_tps_57.expout 
377tests/atf/formats/d_tps_58 
378tests/atf/formats/d_tps_58.experr 
379tests/atf/formats/d_tps_58.expout 
380tests/atf/formats/d_tps_59 
381tests/atf/formats/d_tps_59.experr 
382tests/atf/formats/d_tps_60 
383tests/atf/formats/d_tps_60.experr 
384tests/atf/formats/d_tps_61 
385tests/atf/formats/d_tps_61.experr 
386tests/atf/formats/d_tps_62 
387tests/atf/formats/d_tps_62.experr 
388tests/atf/formats/d_tps_62.expout 
389tests/atf/formats/d_tps_63 
390tests/atf/formats/d_tps_63.experr 
391tests/atf/formats/d_tps_63.expout 
392tests/atf/formats/d_tps_64 
393tests/atf/formats/d_tps_64.experr 
394tests/atf/formats/d_tps_64.expout 
395tests/atf/formats/d_tps_65 
396tests/atf/formats/d_tps_65.experr 
397tests/atf/formats/d_tps_65.expout 
398tests/atf/formats/d_tps_66 
399tests/atf/formats/d_tps_66.experr 
400tests/atf/formats/d_tps_66.expout 
401tests/atf/formats/h_parser 
402tests/atf/formats/t_parsers 
403tests/atf/formats/t_writers 
404tests/atf/test_programs/Atffile 
405tests/atf/test_programs/h_c 
406tests/atf/test_programs/h_cpp 
407tests/atf/test_programs/h_sh 
408tests/atf/test_programs/t_config 
409tests/atf/test_programs/t_fork 
410tests/atf/test_programs/t_meta_data 
411tests/atf/test_programs/t_srcdir 
412tests/atf/test_programs/t_status 
cvs diff -r1.9 -r1.9.2.1 pkgsrc/devel/atf/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/atf/distinfo 2010/06/03 16:07:26 1.9
+++ pkgsrc/devel/atf/distinfo 2010/07/04 07:10:50 1.9.2.1
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.9 2010/06/03 16:07:26 jmmv Exp $ 1$NetBSD: distinfo,v 1.9.2.1 2010/07/04 07:10:50 agc Exp $
2 2
3SHA1 (atf-0.9.tar.gz) = 10a3dee3543ee9e8b5d2b67bcd3f4b2a8921f21f 3SHA1 (atf-0.10.tar.gz) = f3d1a689204c69dc40211d2ecce0eb4f09f8ad75
4RMD160 (atf-0.9.tar.gz) = e4868246512a815469f7b3cd35971795f23e5d0d 4RMD160 (atf-0.10.tar.gz) = 2f0e2e499b87090f81a15f8f756cc48b1e8b9486
5Size (atf-0.9.tar.gz) = 674458 bytes 5Size (atf-0.10.tar.gz) = 599208 bytes
cvs diff -r1.1 -r1.1.64.1 pkgsrc/devel/nbitools/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/nbitools/patches/Attic/patch-aa 2002/06/03 09:53:47 1.1
+++ pkgsrc/devel/nbitools/patches/Attic/patch-aa 1.1.64.1
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1$NetBSD: patch-aa,v 1.1 2002/06/03 09:53:47 sakamoto Exp $ 
2 
3--- include/Imakefile.orig Thu May 29 22:59:31 1997 
4+++ include/Imakefile 
5@@ -14,7 +14,7 @@ 
6  
7 BuildIncludes($(HEADERS),X11,..) 
8  
9-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS)) 
10+InstallMultipleFlags($(HEADERS),$(INCDIR)/itools/X11,$(INSTINCFLAGS)) 
11  
12 InstallLinkKitNonExecFile(X.h,$(LINKKITDIR)/include) 
13 InstallLinkKitNonExecFile(Xmd.h,$(LINKKITDIR)/include) 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/devel/nbitools/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/nbitools/patches/Attic/patch-ab 2002/06/03 09:53:47 1.1
+++ pkgsrc/devel/nbitools/patches/Attic/patch-ab 1.1.64.1
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1$NetBSD: patch-ab,v 1.1 2002/06/03 09:53:47 sakamoto Exp $ 
2 
3--- config/extras/extras.tmpl.orig Thu May 29 22:59:30 1997 
4+++ config/extras/extras.tmpl 
5@@ -16,7 +16,7 @@ 
6 * version of xmkmf. Comment it out if you want to use the sh version. 
7 */ 
8  
9- PERLPATH = /usr/local/bin/perl 
10+ PERLPATH = /usr/bin/env perl 
11  
12 /*#define UsePerlImboot YES*/ 
13 /*#define UsePerlXmkmf YES*/ 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/devel/nbitools/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/devel/nbitools/patches/Attic/patch-ae 2002/06/03 09:53:47 1.1
+++ pkgsrc/devel/nbitools/patches/Attic/patch-ae 1.1.64.1
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1$NetBSD: patch-ae,v 1.1 2002/06/03 09:53:47 sakamoto Exp $ 
2 
3--- config/cf/X11.tmpl.orig Thu Jan 21 21:50:39 1999 
4+++ config/cf/X11.tmpl 
5@@ -628,7 +628,7 @@ 
6 #endif 
7 #ifndef BinDir 
8 #ifdef ProjectRoot 
9-#define BinDir Concat(ProjectRoot,/bin) 
10+#define BinDir Concat(ProjectRoot,/libexec/itools) 
11 #else 
12 #define BinDir /usr/bin/X11 
13 #endif 
14@@ -678,7 +678,7 @@ 
15 #define BuildLibTop ../.. /* relative to BuildLibDir */ 
16 #endif 
17 #ifndef LibDir 
18-#define LibDir $(USRLIBDIR)/X11 
19+#define LibDir $(USRLIBDIR)/itools/X11 
20 #endif 
21 #ifndef ConfigDir 
22 #define ConfigDir $(LIBDIR)/config 
cvs diff -r1.12 -r1.12.4.1 pkgsrc/devel/ptlib/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ptlib/Attic/Makefile 2010/01/17 12:02:14 1.12
+++ pkgsrc/devel/ptlib/Attic/Makefile 2010/07/04 07:10:50 1.12.4.1
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.12 2010/01/17 12:02:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.12.4.1 2010/07/04 07:10:50 agc Exp $
2 2
3DISTNAME= ptlib-2.6.5 3DISTNAME= ptlib-2.6.5
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ptlib/2.6/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ptlib/2.6/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.ekiga.net/ 10HOMEPAGE= http://www.ekiga.net/
11COMMENT= Portable Windows Libary 11COMMENT= Portable Windows Libary
12# modified-bsd stands for Spencer's regex license, quite similar 12# modified-bsd stands for Spencer's regex license, quite similar
13LICENSE= mpl-1.0 AND modified-bsd 13LICENSE= mpl-1.0 AND modified-bsd
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17CONFLICTS+= pwlib-[0-9]* 17CONFLICTS+= pwlib-[0-9]*
18 18
19USE_TOOLS+= bison gmake pkg-config 19USE_TOOLS+= bison flex gmake pkg-config
20BUILD_TARGET= optshared 20BUILD_TARGET= optshared
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_LIBTOOL= yes 22USE_LIBTOOL= yes
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
24CONFIGURE_ARGS+= --enable-httpforms 24CONFIGURE_ARGS+= --enable-httpforms
25CONFIGURE_ARGS+= --enable-httpsvc 25CONFIGURE_ARGS+= --enable-httpsvc
26CONFIGURE_ARGS+= --enable-plugins 26CONFIGURE_ARGS+= --enable-plugins
27CONFIGURE_ARGS+= --enable-jabber 27CONFIGURE_ARGS+= --enable-jabber
28CONFIGURE_ARGS+= --enable-vxml 28CONFIGURE_ARGS+= --enable-vxml
29CONFIGURE_ARGS+= --enable-xmlrpc 29CONFIGURE_ARGS+= --enable-xmlrpc
30CONFIGURE_ARGS+= --enable-soap 30CONFIGURE_ARGS+= --enable-soap
31CONFIGURE_ARGS+= --enable-oss 31CONFIGURE_ARGS+= --enable-oss
32CONFIGURE_ARGS+= --enable-v4l2 32CONFIGURE_ARGS+= --enable-v4l2
cvs diff -r1.1.1.1 -r1.1.1.1.2.1 pkgsrc/devel/py-sysctl/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-sysctl/Makefile 2010/04/11 06:48:41 1.1.1.1
+++ pkgsrc/devel/py-sysctl/Makefile 2010/07/04 07:10:50 1.1.1.1.2.1
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.1.1.1 2010/04/11 06:48:41 cherry Exp $ 1# $NetBSD: Makefile,v 1.1.1.1.2.1 2010/07/04 07:10:50 agc Exp $
2 2
3DISTNAME= py-sysctl-0.1 3DISTNAME= py-sysctl-0.1
4PKGNAME= ${PYPKGPREFIX}-sysctl-0.1 4PKGNAME= ${PYPKGPREFIX}-sysctl-0.1
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel python 6CATEGORIES= devel python
7MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cherry/ 7MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cherry/
8 8
9ONLY_FOR_PLATFORM+= NetBSD-*-* 9ONLY_FOR_PLATFORM+= NetBSD-*-*
10 10
11MAINTAINER= cherry@zyx.in 11MAINTAINER= cherry@zyx.in
12COMMENT= Python interface to sysctl(3) 12COMMENT= Python interface to sysctl(3)
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
 16PYTHON_VERSIONS_ACCEPTED= 26 25
16PYDISTUTILSPKG= # yes 17PYDISTUTILSPKG= # yes
17 18
18.include "../../lang/python/extension.mk" 19.include "../../lang/python/extension.mk"
19.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.34 -r1.34.4.1 pkgsrc/devel/subversion/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/subversion/Makefile.common 2010/03/03 16:33:08 1.34
+++ pkgsrc/devel/subversion/Makefile.common 2010/07/04 07:10:51 1.34.4.1
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile.common,v 1.34 2010/03/03 16:33:08 gdt Exp $ 1# $NetBSD: Makefile.common,v 1.34.4.1 2010/07/04 07:10:51 agc Exp $
2# used by devel/java-subversion/Makefile 2# used by devel/java-subversion/Makefile
3# used by devel/p5-subversion/Makefile 3# used by devel/p5-subversion/Makefile
4# used by devel/py-subversion/Makefile 4# used by devel/py-subversion/Makefile
5# used by devel/ruby-subversion/Makefile 5# used by devel/ruby-subversion/Makefile
6# used by devel/subversion-base/Makefile 6# used by devel/subversion-base/Makefile
7# used by devel/subversion/Makefile 7# used by devel/subversion/Makefile
8# used by www/ap2-subversion/Makefile 8# used by www/ap2-subversion/Makefile
9 9
10DISTNAME= subversion-${SVNVER} 10DISTNAME= subversion-${SVNVER}
11CATEGORIES= devel scm 11CATEGORIES= devel scm
12MASTER_SITES= http://subversion.tigris.org/downloads/ 12MASTER_SITES= http://subversion.tigris.org/downloads/
13 13
14MAINTAINER= gdt@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= http://subversion.tigris.org/ 15HOMEPAGE= http://subversion.tigris.org/
16LICENSE= apache-1.1 16LICENSE= apache-1.1
17 17
18# gdt isn't set up to test ruby/python/perl and java bindings, and 18# gdt isn't set up to test ruby/python/perl and java bindings, and
19# testing ap2-subversion is awkward. If you object to updates without 19# testing ap2-subversion is awkward. If you object to updates without
20# these tests, please volunteer to test patches and I'll record your 20# these tests, please volunteer to test patches and I'll record your
21# email address here. 21# email address here.
22MAINTAINER_TEST_VOLUNTEERS= 22MAINTAINER_TEST_VOLUNTEERS=
23 23
24.include "../../devel/subversion/Makefile.version" 24.include "../../devel/subversion/Makefile.version"
25 25
26SVNEXAMPLES= ${PREFIX}/share/examples/subversion 26SVNEXAMPLES= ${PREFIX}/share/examples/subversion
27SVNDOC= ${PREFIX}/share/doc/subversion 27SVNDOC= ${PREFIX}/share/doc/subversion
cvs diff -r1.5 -r1.5.2.1 pkgsrc/devel/swt/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/swt/Attic/Makefile 2010/06/13 22:44:10 1.5
+++ pkgsrc/devel/swt/Attic/Makefile 2010/07/04 07:10:51 1.5.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.5.2.1 2010/07/04 07:10:51 agc Exp $
2# 2#
3 3
4SWTREL= 3.5.1 4SWTREL= 3.5.1
5SWTVER= 3555 5SWTVER= 3555
6SWTDATE= 200909170800 6SWTDATE= 200909170800
7 7
8PKGNAME= swt-${SWTREL}.${SWTVER} 8PKGNAME= swt-${SWTREL}.${SWTVER}
9DISTNAME= swt-${SWTREL}-gtk-linux-x86 9DISTNAME= swt-${SWTREL}-gtk-linux-x86
10PKGREVISION= 1 10PKGREVISION= 1
11CATEGORIES= devel 11CATEGORIES= devel
12MASTER_SITES= http://download.eclipse.org/eclipse/downloads/drops/R-${SWTREL}-${SWTDATE}/ 12MASTER_SITES= http://download.eclipse.org/eclipse/downloads/drops/R-${SWTREL}-${SWTDATE}/
13EXTRACT_SUFX= .zip 13EXTRACT_SUFX= .zip
14 14
@@ -25,35 +25,43 @@ USE_LANGUAGES= c c++ @@ -25,35 +25,43 @@ USE_LANGUAGES= c c++
25USE_JAVA2= yes 25USE_JAVA2= yes
26 26
27BUILD_DEPENDS+= apache-ant>=1.7.1:../../devel/apache-ant 27BUILD_DEPENDS+= apache-ant>=1.7.1:../../devel/apache-ant
28 28
29BUILD_TARGETS= all make_awt make_cairo make_xulrunner 29BUILD_TARGETS= all make_awt make_cairo make_xulrunner
30BUILD_LIBS= swt-atk-gtk swt-awt-gtk swt-cairo-gtk swt-glx-gtk \ 30BUILD_LIBS= swt-atk-gtk swt-awt-gtk swt-cairo-gtk swt-glx-gtk \
31 swt-gnome-gtk swt-gtk swt-pi-gtk swt-xulrunner-gtk 31 swt-gnome-gtk swt-gtk swt-pi-gtk swt-xulrunner-gtk
32 32
33PLIST_SUBST+= SWTVER=${SWTVER} 33PLIST_SUBST+= SWTVER=${SWTVER}
34 34
35INSTALLATION_DIRS+= share/java 35INSTALLATION_DIRS+= share/java
36INSTALLATION_DIRS+= lib/jni 36INSTALLATION_DIRS+= lib/jni
37 37
 38.include "../../mk/bsd.prefs.mk"
 39
 40.if ${OPSYS} == "NetBSD" && ${LOWER_ARCH} == "x86_64"
 41MY_LOWER_ARCH= amd64
 42.endif
 43MY_LOWER_ARCH?= ${LOWER_ARCH}
 44
38post-extract: 45post-extract:
39 cd ${WRKSRC} && jar -xf ${WRKSRC}/src.zip 46 cd ${WRKSRC} && jar -xf ${WRKSRC}/src.zip
40 cp ${FILESDIR}/make_pkgsrc.mak ${WRKSRC} 47 cp ${FILESDIR}/make_pkgsrc.mak ${WRKSRC}
41 48
42do-build: 49do-build:
43.for target in ${BUILD_TARGETS} 50.for target in ${BUILD_TARGETS}
44 cd ${WRKSRC} && ${GMAKE} \ 51 cd ${WRKSRC} && ${GMAKE} \
45 JAVA_HOME=${PKG_JAVA_HOME} \ 52 JAVA_HOME=${PKG_JAVA_HOME} \
46 LOWER_OPSYS=${LOWER_OPSYS} \ 53 LOWER_OPSYS=${LOWER_OPSYS} \
 54 LOWER_ARCH=${MY_LOWER_ARCH} \
47 -f make_pkgsrc.mak ${target} 55 -f make_pkgsrc.mak ${target}
48.endfor 56.endfor
49 ${TEST} -d ${WRKSRC}/bin || mkdir ${WRKSRC}/bin 57 ${TEST} -d ${WRKSRC}/bin || mkdir ${WRKSRC}/bin
50 cd ${WRKSRC} && find org/eclipse/swt -type f -name \*.java | \ 58 cd ${WRKSRC} && find org/eclipse/swt -type f -name \*.java | \
51 xargs ${JAVA_BINPREFIX}-javac -source 1.4 -target 1.4 -d bin 59 xargs ${JAVA_BINPREFIX}-javac -source 1.4 -target 1.4 -d bin
52 cd ${WRKSRC}/bin && ${JAVA_BINPREFIX}-jar -cf ${WRKSRC}/swt.jar . 60 cd ${WRKSRC}/bin && ${JAVA_BINPREFIX}-jar -cf ${WRKSRC}/swt.jar .
53 61
54do-install: 62do-install:
55 ${INSTALL_DATA} ${WRKSRC}/swt.jar \ 63 ${INSTALL_DATA} ${WRKSRC}/swt.jar \
56 ${DESTDIR}${PREFIX}/share/java/swt.jar 64 ${DESTDIR}${PREFIX}/share/java/swt.jar
57.for libname in ${BUILD_LIBS} 65.for libname in ${BUILD_LIBS}
58 ${INSTALL_LIB} ${WRKSRC}/lib${libname}-${SWTVER}.so \ 66 ${INSTALL_LIB} ${WRKSRC}/lib${libname}-${SWTVER}.so \
59 ${DESTDIR}${PREFIX}/lib/jni/lib${libname}-${SWTVER}.so 67 ${DESTDIR}${PREFIX}/lib/jni/lib${libname}-${SWTVER}.so
cvs diff -r1.1.1.1 -r1.1.1.1.4.1 pkgsrc/devel/swt/files/Attic/make_pkgsrc.mak (expand / switch to unified diff)

--- pkgsrc/devel/swt/files/Attic/make_pkgsrc.mak 2010/02/03 13:51:29 1.1.1.1
+++ pkgsrc/devel/swt/files/Attic/make_pkgsrc.mak 2010/07/04 07:10:51 1.1.1.1.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: make_pkgsrc.mak,v 1.1.1.1 2010/02/03 13:51:29 jmcneill Exp $ 1# $NetBSD: make_pkgsrc.mak,v 1.1.1.1.4.1 2010/07/04 07:10:51 agc Exp $
2#******************************************************************************* 2#*******************************************************************************
3# Copyright (c) 2000, 2009 IBM Corporation and others. 3# Copyright (c) 2000, 2009 IBM Corporation and others.
4# All rights reserved. This program and the accompanying materials 4# All rights reserved. This program and the accompanying materials
5# are made available under the terms of the Eclipse Public License v1.0 5# are made available under the terms of the Eclipse Public License v1.0
6# which accompanies this distribution, and is available at 6# which accompanies this distribution, and is available at
7# http://www.eclipse.org/legal/epl-v10.html 7# http://www.eclipse.org/legal/epl-v10.html
8# 8#
9# Contributors: 9# Contributors:
10# IBM Corporation - initial API and implementation 10# IBM Corporation - initial API and implementation
11#******************************************************************************* 11#*******************************************************************************
12 12
13# Makefile for creating SWT libraries for Linux GTK 13# Makefile for creating SWT libraries for Linux GTK
14 14
@@ -41,27 +41,27 @@ MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_ @@ -41,27 +41,27 @@ MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_
41XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 41XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
42XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 42XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
43GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 43GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
44 44
45CAIROCFLAGS = `pkg-config --cflags cairo` 45CAIROCFLAGS = `pkg-config --cflags cairo`
46CAIROLIBS = `pkg-config --libs-only-L cairo` `pkg-config --libs-only-other cairo` -lcairo 46CAIROLIBS = `pkg-config --libs-only-L cairo` `pkg-config --libs-only-other cairo` -lcairo
47 47
48# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) 48# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
49GTKCFLAGS = `pkg-config --cflags gtk+-2.0` 49GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
50GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` `pkg-config --libs-only-other gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -lXtst 50GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` `pkg-config --libs-only-other gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -lXtst
51 51
52CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc 52CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
53 53
54AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared 54AWT_LIBS = -L$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -R$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -ljawt -shared
55 55
56ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` 56ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
57ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` `pkg-config --libs-only-other atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 57ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` `pkg-config --libs-only-other atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
58 58
59GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` 59GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
60GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` `pkg-config --libs-only-other gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 60GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` `pkg-config --libs-only-other gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
61 61
62GLXCFLAGS = `pkg-config --cflags gl` 62GLXCFLAGS = `pkg-config --cflags gl`
63GLXLIBS = -shared -fPIC `pkg-config --libs gl x11` -lGLU -lm 63GLXLIBS = -shared -fPIC `pkg-config --libs gl x11` -lGLU -lm
64 64
65# Uncomment for Native Stats tool 65# Uncomment for Native Stats tool
66#NATIVE_STATS = -DNATIVE_STATS 66#NATIVE_STATS = -DNATIVE_STATS
67 67