Sun Jan 19 02:54:56 2014 UTC ()
Make this build on FreeBSD. Patch addition taken from FreeBSD's ports.


(rodent)
diff -r1.2 -r1.3 pkgsrc/textproc/cityhash/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/cityhash/patches/patch-src_city.cc
cvs diff -r1.2 -r1.3 pkgsrc/textproc/cityhash/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/cityhash/distinfo 2013/07/08 00:56:45 1.2
+++ pkgsrc/textproc/cityhash/distinfo 2014/01/19 02:54:56 1.3
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.2 2013/07/08 00:56:45 rodent Exp $ 1$NetBSD: distinfo,v 1.3 2014/01/19 02:54:56 rodent Exp $
2 2
3SHA1 (cityhash-1.1.1.tar.gz) = 74342b9161bc762e4c14627a9281bef2d3cb5eed 3SHA1 (cityhash-1.1.1.tar.gz) = 74342b9161bc762e4c14627a9281bef2d3cb5eed
4RMD160 (cityhash-1.1.1.tar.gz) = bac8c85686a8153afcc1defd3c93021b1da56f40 4RMD160 (cityhash-1.1.1.tar.gz) = bac8c85686a8153afcc1defd3c93021b1da56f40
5Size (cityhash-1.1.1.tar.gz) = 376456 bytes 5Size (cityhash-1.1.1.tar.gz) = 376456 bytes
6SHA1 (patch-src_city.cc) = 9319333f53808ca6396876630c5d2c08bca15f79 6SHA1 (patch-src_city.cc) = 1620e169d4bbabfcc5fb68ec471b6aeac4ae09cc
cvs diff -r1.1 -r1.2 pkgsrc/textproc/cityhash/patches/patch-src_city.cc (expand / switch to unified diff)

--- pkgsrc/textproc/cityhash/patches/patch-src_city.cc 2013/07/08 00:56:45 1.1
+++ pkgsrc/textproc/cityhash/patches/patch-src_city.cc 2014/01/19 02:54:56 1.2
@@ -1,18 +1,23 @@ @@ -1,18 +1,23 @@
1$NetBSD: patch-src_city.cc,v 1.1 2013/07/08 00:56:45 rodent Exp $ 1$NetBSD: patch-src_city.cc,v 1.2 2014/01/19 02:54:56 rodent Exp $
2 2
3Add support for SunOS. 3Add support for SunOS.
4 4
5--- src/city.cc.orig 2013-06-17 19:45:57.000000000 +0000 5--- src/city.cc.orig 2013-06-17 19:45:57.000000000 +0000
6+++ src/city.cc 6+++ src/city.cc
7@@ -69,6 +69,11 @@ static uint32 UNALIGNED_LOAD32(const cha 7@@ -69,6 +69,16 @@ static uint32 UNALIGNED_LOAD32(const cha
8 #define bswap_64(x) bswap64(x) 8 #define bswap_64(x) bswap64(x)
9 #endif 9 #endif
10  10
11+#elif defined(__sun) 11+#elif defined(__sun)
12+#include <sys/byteorder.h> 12+#include <sys/byteorder.h>
13+#define bswap_32(x) htonl(x) 13+#define bswap_32(x) htonl(x)
14+#define bswap_64(x) htonll(x) 14+#define bswap_64(x) htonll(x)
15+ 15+
 16+#elif defined(__FreeBSD__)
 17+#include <sys/endian.h>
 18+#define bswap_32(x) bswap32(x)
 19+#define bswap_64(x) bswap64(x)
 20+
16 #else 21 #else
17  22
18 #include <byteswap.h> 23 #include <byteswap.h>