Mon Dec 8 16:10:19 2008 UTC ()
regen patch-aa from patch-ak to silence patch warning about missing hunk


(tnn)
diff -r1.107 -r1.108 pkgsrc/devel/glib2/distinfo
diff -r1.44 -r1.45 pkgsrc/devel/glib2/patches/patch-aa
cvs diff -r1.107 -r1.108 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2008/12/01 15:27:52 1.107
+++ pkgsrc/devel/glib2/distinfo 2008/12/08 16:10:19 1.108
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.107 2008/12/01 15:27:52 dmcmahill Exp $ 1$NetBSD: distinfo,v 1.108 2008/12/08 16:10:19 tnn Exp $
2 2
3SHA1 (glib-2.18.3.tar.bz2) = 293f639fb85ea47347eb34e122327c60ef7606e4 3SHA1 (glib-2.18.3.tar.bz2) = 293f639fb85ea47347eb34e122327c60ef7606e4
4RMD160 (glib-2.18.3.tar.bz2) = cf43fbba04250becaabdb7b7f55bcdec584f019e 4RMD160 (glib-2.18.3.tar.bz2) = cf43fbba04250becaabdb7b7f55bcdec584f019e
5Size (glib-2.18.3.tar.bz2) = 4835503 bytes 5Size (glib-2.18.3.tar.bz2) = 4835503 bytes
6SHA1 (patch-aa) = 7cddba48d8ad2616279a5e9fff0c57bcdbba4fba 6SHA1 (patch-aa) = e8d533e6279a537fc536f61ef397165518c4bcd7
7SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 7SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
9SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 9SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
10SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 10SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
11SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c 11SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c
12SHA1 (patch-ag) = f4b1694c19dbddaf8b536c63f73d95f60cbec669 12SHA1 (patch-ag) = f4b1694c19dbddaf8b536c63f73d95f60cbec669
13SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e 13SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
14SHA1 (patch-ai) = 30b371e345a1ab3a07ce1fe2fe9c599398d668eb 14SHA1 (patch-ai) = 30b371e345a1ab3a07ce1fe2fe9c599398d668eb
15SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e 15SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
16SHA1 (patch-ak) = f382189966f073b3b6e6de89ea7709571241a9a0 16SHA1 (patch-ak) = f382189966f073b3b6e6de89ea7709571241a9a0
17SHA1 (patch-al) = de5135c328027b3c4543bb09994d31b6ffedeafa 17SHA1 (patch-al) = de5135c328027b3c4543bb09994d31b6ffedeafa
18SHA1 (patch-ba) = 767a4880a749c5491836510de1011d9c4e8887f0 18SHA1 (patch-ba) = 767a4880a749c5491836510de1011d9c4e8887f0
19SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff 19SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
cvs diff -r1.44 -r1.45 pkgsrc/devel/glib2/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-aa 2008/10/24 15:59:52 1.44
+++ pkgsrc/devel/glib2/patches/Attic/patch-aa 2008/12/08 16:10:19 1.45
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-aa,v 1.44 2008/10/24 15:59:52 wiz Exp $ 1$NetBSD: patch-aa,v 1.45 2008/12/08 16:10:19 tnn Exp $
2 2
3--- configure.orig 2008-10-16 14:41:13.000000000 +0000 3--- configure.orig 2008-11-24 06:50:01.000000000 +0100
4+++ configure 4+++ configure
5@@ -986,6 +986,7 @@ MKDIR_P 5@@ -835,6 +835,7 @@ GIO
6 INSTALL_STRIP_PROGRAM 6 GSPAWN
7 STRIP 7 GLIB_DEBUG_FLAGS
8 install_sh 8 G_MODULE_NEED_USCORE
9+G_MODULE_BROKEN_DLOPEN_NULL 9+G_MODULE_BROKEN_DLOPEN_NULL
10 MAKEINFO 10 G_MODULE_BROKEN_RTLD_GLOBAL
11 AUTOHEADER 11 G_MODULE_HAVE_DLERROR
12 AUTOMAKE 12 G_MODULE_LDFLAGS
13@@ -37256,6 +37257,7 @@ else 13@@ -34079,6 +34080,7 @@ else
14 fi 14 fi
15 G_MODULE_NEED_USCORE=0 15 G_MODULE_NEED_USCORE=0
16 G_MODULE_BROKEN_RTLD_GLOBAL=0 16 G_MODULE_BROKEN_RTLD_GLOBAL=0
17+G_MODULE_BROKEN_DLOPEN_NULL=0 17+G_MODULE_BROKEN_DLOPEN_NULL=0
18 G_MODULE_HAVE_DLERROR=0 18 G_MODULE_HAVE_DLERROR=0
19 if test -z "$G_MODULE_IMPL"; then 19 if test -z "$G_MODULE_IMPL"; then
20 case "$host" in 20 case "$host" in
21@@ -38091,6 +38093,87 @@ fi 21@@ -34914,6 +34916,87 @@ fi
22  22
23 LIBS="$LIBS_orig" 23 LIBS="$LIBS_orig"
24 fi 24 fi
25+ { $as_echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5 25+ { $as_echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5
26+$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; } 26+$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; }
27+if test "${glib_cv_dlopennull_broken+set}" = set; then 27+if test "${glib_cv_dlopennull_broken+set}" = set; then
28+ $as_echo_n "(cached) " >&6 28+ $as_echo_n "(cached) " >&6
29+else 29+else
30+ 30+
31+ if test "$cross_compiling" = yes; then 31+ if test "$cross_compiling" = yes; then
32+ glib_cv_dlopennull_broken=no 32+ glib_cv_dlopennull_broken=no
33+else 33+else
34+ cat >conftest.$ac_ext <<_ACEOF 34+ cat >conftest.$ac_ext <<_ACEOF
@@ -96,36 +96,36 @@ $NetBSD: patch-aa,v 1.44 2008/10/24 15:5 @@ -96,36 +96,36 @@ $NetBSD: patch-aa,v 1.44 2008/10/24 15:5
96+ 96+
97+ 97+
98+fi 98+fi
99+{ $as_echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5 99+{ $as_echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5
100+$as_echo "$glib_cv_dlopennull_broken" >&6; } 100+$as_echo "$glib_cv_dlopennull_broken" >&6; }
101+ if test "x$glib_cv_dlopennull_broken" = "xyes"; then 101+ if test "x$glib_cv_dlopennull_broken" = "xyes"; then
102+ G_MODULE_BROKEN_DLOPEN_NULL=1 102+ G_MODULE_BROKEN_DLOPEN_NULL=1
103+ else 103+ else
104+ G_MODULE_BROKEN_DLOPEN_NULL=0 104+ G_MODULE_BROKEN_DLOPEN_NULL=0
105+ fi 105+ fi
106 if test -z "$G_MODULE_IMPL"; then 106 if test -z "$G_MODULE_IMPL"; then
107 G_MODULE_IMPL=0 107 G_MODULE_IMPL=0
108 G_MODULE_SUPPORTED=false 108 G_MODULE_SUPPORTED=false
109@@ -38127,6 +38210,8 @@ fi 109@@ -34950,6 +35033,8 @@ fi
110  110
111  111
112  112
113+ 113+
114+ 114+
115 { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5 115 { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5
116 $as_echo_n "checking for gspawn implementation... " >&6; } 116 $as_echo_n "checking for gspawn implementation... " >&6; }
117 case "$host" in 117 case "$host" in
118@@ -39873,117 +39958,8 @@ if test x"$have_threads" != xno; then 118@@ -36696,117 +36781,8 @@ if test x"$have_threads" != xno; then
119 G_THREAD_LIBS="-lpthread -lthread" 119 G_THREAD_LIBS="-lpthread -lthread"
120 ;; 120 ;;
121 *) 121 *)
122- for flag in pthread pthreads mt; do 122- for flag in pthread pthreads mt; do
123- glib_save_CFLAGS="$CFLAGS" 123- glib_save_CFLAGS="$CFLAGS"
124- CFLAGS="$CFLAGS -$flag" 124- CFLAGS="$CFLAGS -$flag"
125- if test "$cross_compiling" = yes; then 125- if test "$cross_compiling" = yes; then
126- cat >conftest.$ac_ext <<_ACEOF 126- cat >conftest.$ac_ext <<_ACEOF
127- 127-
128-#include <pthread.h> 128-#include <pthread.h>
129-int check_me = 0; 129-int check_me = 0;
130-void* func(void* data) {check_me = 42; return &check_me;} 130-void* func(void* data) {check_me = 42; return &check_me;}
131-int main() 131-int main()
@@ -225,44 +225,24 @@ $NetBSD: patch-aa,v 1.44 2008/10/24 15:5 @@ -225,44 +225,24 @@ $NetBSD: patch-aa,v 1.44 2008/10/24 15:5
225- 225-
226- CFLAGS="$glib_save_CFLAGS" 226- CFLAGS="$glib_save_CFLAGS"
227- if test $glib_flag_works = yes ; then 227- if test $glib_flag_works = yes ; then
228- G_THREAD_CFLAGS=-$flag 228- G_THREAD_CFLAGS=-$flag
229- G_THREAD_LIBS=-$flag 229- G_THREAD_LIBS=-$flag
230- break; 230- break;
231- fi 231- fi
232- done 232- done
233+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" 233+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
234+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" 234+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
235 ;; 235 ;;
236 esac 236 esac
237 fi 237 fi
238@@ -42177,6 +42153,10 @@ case $host in 238@@ -39000,6 +38976,10 @@ case $host in
239 *) 239 *)
240 G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" 240 G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
241 ;; 241 ;;
242+ *-*-netbsd*) 242+ *-*-netbsd*)
243+ # On NetBSD, pkgsrc's libtool does the right thing. 243+ # On NetBSD, pkgsrc's libtool does the right thing.
244+ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" 244+ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
245+ ;; 245+ ;;
246 esac 246 esac
247  247
248  248
249@@ -47480,9 +47460,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ 
250 } 
251 split(mac1, mac2, "(") #) 
252 macro = mac2[1] 
253- prefix = substr(line, 1, index(line, defundef) - 1) 
254 if (D_is_set[macro]) { 
255 # Preserve the white space surrounding the "#". 
256+ prefix = substr(line, 1, index(line, defundef) - 1) 
257 print prefix "define", macro P[macro] D[macro] 
258 next 
259 } else { 
260@@ -47490,7 +47470,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ 
261 # in the case of _POSIX_SOURCE, which is predefined and required 
262 # on some systems where configure will not decide to define it. 
263 if (defundef == "undef") { 
264- print "/*", prefix defundef, macro, "*/" 
265+ print "/*", line, "*/" 
266 next 
267 } 
268 }