diff options
| -rw-r--r-- | chat/xchat/Makefile | 6 | ||||
| -rw-r--r-- | chat/xchat/distinfo | 4 | ||||
| -rw-r--r-- | chat/xchat/patches/patch-ab | 30 |
3 files changed, 17 insertions, 23 deletions
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile index 5b1ac31bfca..e230b3ded2a 100644 --- a/chat/xchat/Makefile +++ b/chat/xchat/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.58 2008/08/05 20:36:42 tron Exp $ +# $NetBSD: Makefile,v 1.59 2008/08/15 17:25:31 tron Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "Makefile.common" -PKGREVISION= 1 +PKGREVISION= 2 OWNER= tron@NetBSD.org COMMENT= X11 (X Window System) IRC client, using the GTK2 toolkit @@ -18,7 +18,6 @@ GCONF_SCHEMAS= apps_xchat_url_handler.schemas CONFIGURE_ARGS+= --enable-tcl=no CONFIGURE_ARGS+= --disable-perl CONFIGURE_ARGS+= --disable-python -CONFIGURE_ARGS+= --enable-xft LDFLAGS.IRIX+= -lX11 @@ -35,6 +34,7 @@ INSTALL_UNSTRIPPED= YES .if empty(PKG_BUILD_OPTIONS.gtk2:Mquartz) LDFLAGS.Darwin+= -lX11 +CONFIGURE_ARGS+= --enable-xft .else CONFIGURE_ARGS+= --disable-xlib .endif diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo index 38f3fdc578f..816a11aab18 100644 --- a/chat/xchat/distinfo +++ b/chat/xchat/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.37 2008/08/05 21:05:55 tron Exp $ +$NetBSD: distinfo,v 1.38 2008/08/15 17:25:31 tron Exp $ SHA1 (xchat-2.8.6.tar.bz2) = 7a7463e65cb26c680ed70dd96cec98bcc05435a4 RMD160 (xchat-2.8.6.tar.bz2) = bc199e3b58a9db3dfd9f2af6bac7fb6162c53d6e Size (xchat-2.8.6.tar.bz2) = 1423645 bytes SHA1 (patch-aa) = 99ec48125bc394745b5e5d0d8ebd8323d1aca4af -SHA1 (patch-ab) = 69e7f50ef12a34826b2daefd8a8cc7b5e31dec74 +SHA1 (patch-ab) = 109d61363f040d4f9716b6698a002b804847da33 diff --git a/chat/xchat/patches/patch-ab b/chat/xchat/patches/patch-ab index c557a76c734..4a379409678 100644 --- a/chat/xchat/patches/patch-ab +++ b/chat/xchat/patches/patch-ab @@ -1,57 +1,51 @@ -$NetBSD: patch-ab,v 1.11 2008/08/05 21:05:55 tron Exp $ +$NetBSD: patch-ab,v 1.12 2008/08/15 17:25:32 tron Exp $ --- src/common/util.c.orig 2008-02-24 02:59:48.000000000 +0000 -+++ src/common/util.c 2008-08-05 21:23:28.000000000 +0100 -@@ -47,8 +47,16 @@ - #define WANTSOCKET - #include "inet.h" ++++ src/common/util.c 2008-08-15 11:16:47.000000000 +0100 +@@ -49,6 +49,10 @@ -+#if defined(__NetBSD__) -+#define USING_NETBSD /**/ -+#endif -+ #if defined (USING_FREEBSD) || defined (__APPLE__) #include <sys/sysctl.h> -+#elif defined(USING_NETBSD) ++#elif defined(__NetBSD__) +#define session NetBSD_session +#include <sys/sysctl.h> +#undef session #endif #ifdef SOCKS #include <socks.h> -@@ -510,7 +518,7 @@ +@@ -510,7 +514,7 @@ return len; } -#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) -+#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (USING_NETBSD) ++#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (__NetBSD__) static void get_cpu_info (double *mhz, int *cpus) -@@ -554,7 +562,7 @@ +@@ -554,7 +558,7 @@ *cpus = 1; #endif -#ifdef USING_FREEBSD -+#if defined(USING_FREEBSD) || defined (USING_NETBSD) ++#if defined(USING_FREEBSD) || defined (__NetBSD__) int mib[2], ncpu; u_long freq; -@@ -656,7 +664,7 @@ +@@ -656,7 +660,7 @@ char * get_cpu_str (void) { -#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) -+#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (USING_NETBSD) ++#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (__NetBSD__) double mhz; #endif int cpus = 1; -@@ -670,7 +678,7 @@ +@@ -670,7 +674,7 @@ uname (&un); -#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) -+#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (USING_NETBSD) ++#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__) || defined (__NetBSD__) get_cpu_info (&mhz, &cpus); if (mhz) { |