Fix patch to work on non-glibc systems, inttypes seems to be needed there, too.

Package-Manager: portage-2.0.52-r1

3 files changed, 19 insertions, 17 deletions

diff --git a/app-arch/bsdsfv/ChangeLog b/app-arch/bsdsfv/ChangeLog
index 6a76ac5795dc..3da8668904d3 100644
--- a/app-arch/bsdsfv/ChangeLog
+++ b/app-arch/bsdsfv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/bsdsfv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdsfv/ChangeLog,v 1.17 2005/09/19 17:53:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdsfv/ChangeLog,v 1.18 2005/09/20 12:32:55 flameeyes Exp $
+
+  20 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/bsdsfv-1.18-64bit.patch:
+  Fix patch to work on non-glibc systems, inttypes seems to be needed there, too.
 
 *bsdsfv-1.18-r1 (19 Sep 2005)
 
diff --git a/app-arch/bsdsfv/Manifest b/app-arch/bsdsfv/Manifest
index 6b944895d0c3..73b474be863f 100644
--- a/app-arch/bsdsfv/Manifest
+++ b/app-arch/bsdsfv/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c52d01216cb87f6bb74f74a1832e8905 ChangeLog 1941
+MD5 66992edf88cab5f342e194422bdff7f0 ChangeLog 2110
 MD5 5272193c1cffbd0d714721be1ebaa5a9 bsdsfv-1.18-r1.ebuild 719
 MD5 def713ebb472d3e5bb941ab3723802d1 bsdsfv-1.18.ebuild 526
-MD5 9cdf8f8e27eabb71f8dce2d0ffcc5da4 files/bsdsfv-1.18-64bit.patch 2392
+MD5 20aa8110089872b2c4ae292a254e8dad files/bsdsfv-1.18-64bit.patch 2388
 MD5 edec83a4548c43916e86bf0263c41b9c files/digest-bsdsfv-1.18-r1 62
 MD5 edec83a4548c43916e86bf0263c41b9c files/digest-bsdsfv-1.18 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDLvsrj5H05b2HAEkRAkz4AJwLttR8YRUtuPwizV1vcD3rcHz/CgCdG2Nk
-ya4OvqcgfSjJSPdDhN03Ayw=
-=/7RO
+iD8DBQFDMAGaj5H05b2HAEkRAnuUAKCco2Ga22TN1R2mJiOUQb4prJbUjQCfUK/+
+9QWJ9+o0idMfajxF718Fn0g=
+=9xZN
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch b/app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch
index 651b419ed6fe..d55b42d01b86 100644
--- a/app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch
+++ b/app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch
@@ -2,15 +2,13 @@ Index: bsdsfv/bsdsfv.c
 ===================================================================
 --- bsdsfv.orig/bsdsfv.c
 +++ bsdsfv/bsdsfv.c
-@@ -60,9 +60,13 @@ typedef struct sfvtable {
+@@ -59,10 +59,10 @@ typedef struct sfvtable {
+ #include <sys/stat.h>
  #include <sys/mman.h>
  #include <dirent.h>
- 
-+#ifdef __GLIBC__
 +#include <inttypes.h>
-+#endif
-+
  
+-
 -long
 -UpdateCRC(unsigned long CRC, const char *buffer, long count)
 +int32_t
@@ -18,7 +16,7 @@ Index: bsdsfv/bsdsfv.c
  {
  	/*
  	 * Note: if you want to know how CRC32-checking works, I
-@@ -70,7 +74,7 @@ UpdateCRC(unsigned long CRC, const char 
+@@ -70,7 +70,7 @@ UpdateCRC(unsigned long CRC, const char 
  	 * There is not much you can change in this function, so
  	 * if you need a CRC32-check yourself, feel free to rip.
  	 */
@@ -27,7 +25,7 @@ Index: bsdsfv/bsdsfv.c
  		0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
  		    0x706af48f,
  		0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e,
-@@ -175,13 +179,13 @@ UpdateCRC(unsigned long CRC, const char 
+@@ -175,13 +175,13 @@ UpdateCRC(unsigned long CRC, const char 
  
  
  
@@ -45,7 +43,7 @@ Index: bsdsfv/bsdsfv.c
  
  	/*
  	 * Note: different buffer sizes may result in noticable 
-@@ -306,7 +310,7 @@ main(int argc, char *argv[])
+@@ -306,7 +306,7 @@ main(int argc, char *argv[])
  	FILE *missingfile;
  	DIR *dirp;
  	struct dirent *dp;
@@ -54,7 +52,7 @@ Index: bsdsfv/bsdsfv.c
  	int cnt;
  	int dothisone;
  	char cfname[FNAMELEN];
-@@ -487,8 +491,8 @@ main(int argc, char *argv[])
+@@ -487,8 +487,8 @@ main(int argc, char *argv[])
  				printf("Adding file: %s ... ", cfname);
  				fflush(stdout);
  				mycrc = GetFileCRC(cfname);
@@ -65,7 +63,7 @@ Index: bsdsfv/bsdsfv.c
  
  				// uncomment next 2 lines to 
  				// convert filename to upper case, for whatever reason
-@@ -516,7 +520,7 @@ main(int argc, char *argv[])
+@@ -516,7 +516,7 @@ main(int argc, char *argv[])
  			printf("Testing %s ... ", cfname);
  			fflush(stdout);
  			mycrc = GetFileCRC(cfname);
@@ -74,7 +72,7 @@ Index: bsdsfv/bsdsfv.c
  			fflush(stdout);
  
  			sfvfile = fopen(sfvname, "rt");
-@@ -675,7 +679,7 @@ main(int argc, char *argv[])
+@@ -675,7 +675,7 @@ main(int argc, char *argv[])
  
  					mycrc = GetFileCRC(dp->d_name);