Fix compiling against NetBSD popcount libc function.

7 files changed, 89 insertions, 2 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 165a0c7a057..cc1a0f4e8a2 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/05/19 19:41:18 snj Exp $
+# $NetBSD: Makefile,v 1.27 2009/09/03 19:29:26 roy Exp $
 
 DISTNAME=		rxvt-unicode-9.06
 PKGREVISION=		1
@@ -10,6 +10,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://software.schmorp.de/pkg/rxvt-unicode.html
 COMMENT=		rxvt clone supporting Xft fonts and Unicode
+LICENSE=		gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 61b40223cb8..8e4d0aee8ca 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2009/05/19 19:41:19 snj Exp $
+$NetBSD: distinfo,v 1.14 2009/09/03 19:29:26 roy Exp $
 
 SHA1 (rxvt-unicode-9.06.tar.bz2) = df623ebdad001de534781721f8298ba1add0df2c
 RMD160 (rxvt-unicode-9.06.tar.bz2) = ae737ed07e943303318bd81b566146d5426f36bd
@@ -7,3 +7,8 @@ SHA1 (patch-aa) = 2d93a4717f7f3a0e833a5b13a8b6c4f9301b7680
 SHA1 (patch-ab) = f711bd5046fd9523b88b7a73ab9981a3bb7172fb
 SHA1 (patch-ac) = 22c2e28a5b0ece42fbdbbafa85a8cec80f1d8277
 SHA1 (patch-ad) = ac5e3b32b9668288a71c091f6b30fcfc4e3ef5ab
+SHA1 (patch-ba) = ef5beea8eb1052ffae6a1d8b78b85696148d0d76
+SHA1 (patch-bb) = 409b6966166513d00b850a528595ab74ba376208
+SHA1 (patch-bc) = 2ee71d3037de6cb3b371c35fb5ed3c1d0e386ad5
+SHA1 (patch-bd) = 1948d910cecde1f10c53c7e83fbae6c972a39811
+SHA1 (patch-be) = c271ecf0027b6338c1b2bb484e8960a1c73fe7be
diff --git a/x11/rxvt-unicode/patches/patch-ba b/x11/rxvt-unicode/patches/patch-ba
new file mode 100644
index 00000000000..22ba51e1339
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-ba
@@ -0,0 +1,14 @@
+$NetBSD: patch-ba,v 1.1 2009/09/03 19:29:26 roy Exp $
+
+Check for popcount in libc
+
+--- configure	2009-09-03 20:08:10.000000000 +0100
++++ configure	2009-09-03 20:08:24.000000000 +0100
+@@ -10617,6 +10617,7 @@
+   revoke \
+   _getpty \
+   getpt \
++  popcount \
+   posix_openpt \
+   isastream \
+   setuid \
diff --git a/x11/rxvt-unicode/patches/patch-bb b/x11/rxvt-unicode/patches/patch-bb
new file mode 100644
index 00000000000..21e90cffe7e
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-bb
@@ -0,0 +1,23 @@
+$NetBSD: patch-bb,v 1.1 2009/09/03 19:29:26 roy Exp $
+
+Check for popcount in libc
+
+--- src/rxvtutil.h	2008-11-05 14:43:24.000000000 +0000
++++ src/rxvtutil.h	2009-09-03 20:19:38.000000000 +0100
+@@ -94,12 +94,16 @@
+ // some bit functions, xft fuck me plenty
+ #if HAVE_GCC_BUILTINS
+ static inline int ctz      (unsigned int x) { return __builtin_ctz      (x); }
++#if !HAVE_POPCOUNT
+ static inline int popcount (unsigned int x) { return __builtin_popcount (x); }
++#endif
+ #else
+ // count trailing zero bits and count # of one bits
+ int ctz      (unsigned int x) CONST;
++#if !HAVE_POPCOUNT
+ int popcount (unsigned int x) CONST;
+ #endif
++#endif
+ 
+ // in range including end
+ #define IN_RANGE_INC(val,beg,end) \
diff --git a/x11/rxvt-unicode/patches/patch-bc b/x11/rxvt-unicode/patches/patch-bc
new file mode 100644
index 00000000000..9a387681fe7
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-bc
@@ -0,0 +1,14 @@
+$NetBSD: patch-bc,v 1.1 2009/09/03 19:29:26 roy Exp $
+
+Check for popcount in libc
+
+--- src/rxvtdaemon.C	2008-02-19 12:17:46.000000000 +0000
++++ src/rxvtdaemon.C	2009-09-03 17:57:27.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include <sys/utsname.h>
+ #include <limits.h>
+ 
++#include "../config.h"
+ #include "rxvtdaemon.h"
+ 
+ char *rxvt_connection::unix_sockname ()
diff --git a/x11/rxvt-unicode/patches/patch-bd b/x11/rxvt-unicode/patches/patch-bd
new file mode 100644
index 00000000000..2a1af2cd6f7
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-bd
@@ -0,0 +1,14 @@
+$NetBSD: patch-bd,v 1.1 2009/09/03 19:29:26 roy Exp $
+
+Check for popcount in libc
+
+--- src/rxvtutil.C	2008-02-19 12:17:46.000000000 +0000
++++ src/rxvtutil.C	2009-09-03 17:57:27.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <cstring>
+ #include <inttypes.h>
+ 
++#include "../config.h"
+ #include "rxvtutil.h"
+ 
+ class byteorder byteorder;
diff --git a/x11/rxvt-unicode/patches/patch-be b/x11/rxvt-unicode/patches/patch-be
new file mode 100644
index 00000000000..51a9804da39
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-be
@@ -0,0 +1,16 @@
+$NetBSD: patch-be,v 1.1 2009/09/03 19:29:26 roy Exp $
+
+Check for popcount in libc
+
+--- config.h.in	2009-09-03 20:14:02.000000000 +0100
++++ config.h.in	2009-09-03 20:13:30.000000000 +0100
+@@ -269,6 +269,9 @@
+ /* Define to 1 if you have the `_getpty' function. */
+ #undef HAVE__GETPTY
+ 
++/* Define to 1 if you have the `popcount' function. */
++#undef HAVE_POPCOUNT
++
+ /* Define if you want ISO 14755 extended support */
+ #undef ISO_14755
+