Sat May 1 15:16:06 2010 UTC ()
Remove pkgsrc hack from patch-aa, it shouldn't be there.


(tonnerre)
diff -r1.1.1.1 -r1.2 pkgsrc/databases/libcassandra/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/databases/libcassandra/patches/patch-aa
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/libcassandra/distinfo (switch to unified diff)

--- pkgsrc/databases/libcassandra/distinfo 2010/05/01 15:09:44 1.1.1.1
+++ pkgsrc/databases/libcassandra/distinfo 2010/05/01 15:16:06 1.2
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2010/05/01 15:09:44 tonnerre Exp $ 1$NetBSD: distinfo,v 1.2 2010/05/01 15:16:06 tonnerre Exp $
2 2
3SHA1 (libcassandra-20100501.tar.gz) = 95136e5cd96f2bc63cd170b791e23853edde6fde 3SHA1 (libcassandra-20100501.tar.gz) = 95136e5cd96f2bc63cd170b791e23853edde6fde
4RMD160 (libcassandra-20100501.tar.gz) = ceaa80c5a9abab7d5a0c0a42e19bd303799cb483 4RMD160 (libcassandra-20100501.tar.gz) = ceaa80c5a9abab7d5a0c0a42e19bd303799cb483
5Size (libcassandra-20100501.tar.gz) = 1081501 bytes 5Size (libcassandra-20100501.tar.gz) = 1081501 bytes
6SHA1 (patch-aa) = e1845f5d62862c778fd249598bbfc7a6bd098788 6SHA1 (patch-aa) = 0df36269318a8a422f2c3d4eabbf3e1e02a87fcc
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/libcassandra/patches/patch-aa (switch to unified diff)

--- pkgsrc/databases/libcassandra/patches/patch-aa 2010/05/01 15:09:44 1.1.1.1
+++ pkgsrc/databases/libcassandra/patches/patch-aa 2010/05/01 15:16:06 1.2
@@ -1,94 +1,85 @@ @@ -1,94 +1,85 @@
1$NetBSD: patch-aa,v 1.1.1.1 2010/05/01 15:09:44 tonnerre Exp $ 1$NetBSD: patch-aa,v 1.2 2010/05/01 15:16:06 tonnerre Exp $
2 2
3--- configure.orig 2010-04-30 23:25:08.000000000 +0000 3--- configure.orig 2010-04-30 23:25:08.000000000 +0000
4+++ configure 4+++ configure
5@@ -17830,7 +17830,7 @@ if test "${ac_cv_safe_to_use_wconversion 5@@ -17830,7 +17830,7 @@ if test "${ac_cv_safe_to_use_wconversion
6 $as_echo_n "(cached) " >&6 6 $as_echo_n "(cached) " >&6
7 else 7 else
8 save_CFLAGS="$CFLAGS" 8 save_CFLAGS="$CFLAGS"
9- CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS} ${CFLAGS}" 9- CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS} ${CFLAGS}"
10+ CFLAGS="-Wconversion -Werror ${AM_CFLAGS} ${CFLAGS}" 10+ CFLAGS="-Wconversion -Werror ${AM_CFLAGS} ${CFLAGS}"
11 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12 /* end confdefs.h. */ 12 /* end confdefs.h. */
13  13
14@@ -17869,7 +17869,7 @@ if test "${ac_cv_safe_to_use_Wconversion 14@@ -17869,7 +17869,7 @@ if test "${ac_cv_safe_to_use_Wconversion
15 $as_echo_n "(cached) " >&6 15 $as_echo_n "(cached) " >&6
16 else 16 else
17 save_CFLAGS="$CFLAGS" 17 save_CFLAGS="$CFLAGS"
18- CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS} ${CFLAGS}" 18- CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS} ${CFLAGS}"
19+ CFLAGS="-Wconversion -Werror ${AM_CFLAGS} ${CFLAGS}" 19+ CFLAGS="-Wconversion -Werror ${AM_CFLAGS} ${CFLAGS}"
20 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 20 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21 /* end confdefs.h. */ 21 /* end confdefs.h. */
22  22
23@@ -17929,7 +17929,7 @@ if test "${ac_cv_safe_to_use_Wextra_+set 23@@ -17929,7 +17929,7 @@ if test "${ac_cv_safe_to_use_Wextra_+set
24 $as_echo_n "(cached) " >&6 24 $as_echo_n "(cached) " >&6
25 else 25 else
26 save_CFLAGS="$CFLAGS" 26 save_CFLAGS="$CFLAGS"
27- CFLAGS="${W_FAIL} -pedantic -Wextra ${AM_CFLAGS} ${CFLAGS}" 27- CFLAGS="${W_FAIL} -pedantic -Wextra ${AM_CFLAGS} ${CFLAGS}"
28+ CFLAGS="${W_FAIL} -Wextra ${AM_CFLAGS} ${CFLAGS}" 28+ CFLAGS="${W_FAIL} -Wextra ${AM_CFLAGS} ${CFLAGS}"
29 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 29 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
30 /* end confdefs.h. */ 30 /* end confdefs.h. */
31  31
32@@ -17956,7 +17956,7 @@ fi 32@@ -17956,7 +17956,7 @@ fi
33 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_use_Wextra_" >&5 33 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_use_Wextra_" >&5
34 $as_echo "$ac_cv_safe_to_use_Wextra_" >&6; } 34 $as_echo "$ac_cv_safe_to_use_Wextra_" >&6; }
35  35
36- BASE_WARNINGS="${W_FAIL} -pedantic -Wall -Wundef -Wshadow ${NO_UNUSED} ${F_DIAGNOSTICS_SHOW_OPTION} ${CFLAG_VISIBILITY} ${BASE_WARNINGS_FULL}" 36- BASE_WARNINGS="${W_FAIL} -pedantic -Wall -Wundef -Wshadow ${NO_UNUSED} ${F_DIAGNOSTICS_SHOW_OPTION} ${CFLAG_VISIBILITY} ${BASE_WARNINGS_FULL}"
37+ BASE_WARNINGS="${W_FAIL} -Wall -Wundef -Wshadow ${NO_UNUSED} ${F_DIAGNOSTICS_SHOW_OPTION} ${CFLAG_VISIBILITY} ${BASE_WARNINGS_FULL}" 37+ BASE_WARNINGS="${W_FAIL} -Wall -Wundef -Wshadow ${NO_UNUSED} ${F_DIAGNOSTICS_SHOW_OPTION} ${CFLAG_VISIBILITY} ${BASE_WARNINGS_FULL}"
38 if test "$ac_cv_safe_to_use_Wextra_" = "yes"; then : 38 if test "$ac_cv_safe_to_use_Wextra_" = "yes"; then :
39 BASE_WARNINGS="${BASE_WARNINGS} -Wextra" 39 BASE_WARNINGS="${BASE_WARNINGS} -Wextra"
40 else 40 else
41@@ -17978,7 +17978,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX 41@@ -17978,7 +17978,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
42 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 42 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
43  43
44 save_CXXFLAGS="$CXXFLAGS" 44 save_CXXFLAGS="$CXXFLAGS"
45- CXXFLAGS="-Werror -pedantic -Wmissing-declarations ${AM_CXXFLAGS}" 45- CXXFLAGS="-Werror -pedantic -Wmissing-declarations ${AM_CXXFLAGS}"
46+ CXXFLAGS="-Werror -Wmissing-declarations ${AM_CXXFLAGS}" 46+ CXXFLAGS="-Werror -Wmissing-declarations ${AM_CXXFLAGS}"
47 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 47 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
48 /* end confdefs.h. */ 48 /* end confdefs.h. */
49  49
50@@ -18021,7 +18021,7 @@ if test "${ac_cv_safe_to_use_Wlogical_op 50@@ -18021,7 +18021,7 @@ if test "${ac_cv_safe_to_use_Wlogical_op
51 $as_echo_n "(cached) " >&6 51 $as_echo_n "(cached) " >&6
52 else 52 else
53 save_CFLAGS="$CFLAGS" 53 save_CFLAGS="$CFLAGS"
54- CFLAGS="${W_FAIL} -pedantic -Wlogical-op ${AM_CFLAGS} ${CFLAGS}" 54- CFLAGS="${W_FAIL} -pedantic -Wlogical-op ${AM_CFLAGS} ${CFLAGS}"
55+ CFLAGS="${W_FAIL} -Wlogical-op ${AM_CFLAGS} ${CFLAGS}" 55+ CFLAGS="${W_FAIL} -Wlogical-op ${AM_CFLAGS} ${CFLAGS}"
56 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 56 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
57 /* end confdefs.h. */ 57 /* end confdefs.h. */
58  58
59@@ -18063,7 +18063,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX 59@@ -18063,7 +18063,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
60 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 60 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
61  61
62 save_CXXFLAGS="${CXXFLAGS}" 62 save_CXXFLAGS="${CXXFLAGS}"
63- CXXFLAGS="${W_FAIL} -pedantic -Wredundant-decls ${AM_CXXFLAGS}" 63- CXXFLAGS="${W_FAIL} -pedantic -Wredundant-decls ${AM_CXXFLAGS}"
64+ CXXFLAGS="${W_FAIL} -Wredundant-decls ${AM_CXXFLAGS}" 64+ CXXFLAGS="${W_FAIL} -Wredundant-decls ${AM_CXXFLAGS}"
65 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 65 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
66 /* end confdefs.h. */ 66 /* end confdefs.h. */
67  67
68@@ -18113,7 +18113,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX 68@@ -18113,7 +18113,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
69 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 69 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
70  70
71 save_CXXFLAGS="${CXXFLAGS}" 71 save_CXXFLAGS="${CXXFLAGS}"
72- CXXFLAGS="${W_FAIL} -pedantic -Wattributes -fvisibility=hidden ${AM_CXXFLAGS}" 72- CXXFLAGS="${W_FAIL} -pedantic -Wattributes -fvisibility=hidden ${AM_CXXFLAGS}"
73+ CXXFLAGS="${W_FAIL} -Wattributes -fvisibility=hidden ${AM_CXXFLAGS}" 73+ CXXFLAGS="${W_FAIL} -Wattributes -fvisibility=hidden ${AM_CXXFLAGS}"
74 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 74 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
75 /* end confdefs.h. */ 75 /* end confdefs.h. */
76  76
77@@ -18171,7 +18171,7 @@ if test "${ac_cv_safe_to_use_Wno_attribu 77@@ -18171,7 +18171,7 @@ if test "${ac_cv_safe_to_use_Wno_attribu
78 $as_echo_n "(cached) " >&6 78 $as_echo_n "(cached) " >&6
79 else 79 else
80 save_CFLAGS="$CFLAGS" 80 save_CFLAGS="$CFLAGS"
81- CFLAGS="${W_FAIL} -pedantic -Wno_attributes_ ${AM_CFLAGS} ${CFLAGS}" 81- CFLAGS="${W_FAIL} -pedantic -Wno_attributes_ ${AM_CFLAGS} ${CFLAGS}"
82+ CFLAGS="${W_FAIL} -Wno_attributes_ ${AM_CFLAGS} ${CFLAGS}" 82+ CFLAGS="${W_FAIL} -Wno_attributes_ ${AM_CFLAGS} ${CFLAGS}"
83 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 83 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
84 /* end confdefs.h. */ 84 /* end confdefs.h. */
85  85
86@@ -23315,6 +23315,8 @@ do 
87 case $ac_option in 
88 # Handling of the options. 
89 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) 
90+ : Avoid regenerating within pkgsrc 
91+ exit 0 
92 ac_cs_recheck=: ;; 
93 --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) 
94 $as_echo "$ac_cs_version"; exit ;;