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 (expand / 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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -73,22 +73,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/05/01 1 @@ -73,22 +73,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/05/01 1
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 ;;