From 8bd19127323ed1d9d4e2a020048ef658123457da Mon Sep 17 00:00:00 2001 From: augustss Date: Tue, 6 Jun 2000 22:17:47 +0000 Subject: Apply patch from PR 10298 so gaim works again. --- net/gaim/Makefile | 7 +++++-- net/gaim/files/md5 | 4 ++-- net/gaim/files/patch-sum | 3 +++ net/gaim/patches/patch-aa | 13 +++++++++++++ net/gaim/pkg/PLIST | 16 +++++++++++++--- 5 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 net/gaim/files/patch-sum create mode 100644 net/gaim/patches/patch-aa diff --git a/net/gaim/Makefile b/net/gaim/Makefile index 2fe1697ddf0..6e786d0041b 100644 --- a/net/gaim/Makefile +++ b/net/gaim/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2000/01/07 01:30:45 garbled Exp $ +# $NetBSD: Makefile,v 1.11 2000/06/06 22:17:47 augustss Exp $ # -DISTNAME= gaim-0.9.10 +DISTNAME= gaim-0.9.18 CATEGORIES= x11 MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ @@ -15,4 +15,7 @@ USE_X11BASE= YES USE_GMAKE= YES GNU_CONFIGURE= yes +# for pthread.h +CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include + .include "../../mk/bsd.pkg.mk" diff --git a/net/gaim/files/md5 b/net/gaim/files/md5 index 0c11849caf9..68525685353 100644 --- a/net/gaim/files/md5 +++ b/net/gaim/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 2000/01/05 02:00:32 garbled Exp $ +$NetBSD: md5,v 1.3 2000/06/06 22:17:47 augustss Exp $ -MD5 (gaim-0.9.10.tar.gz) = 793d21402cc778defa6d32b224a7c75f +MD5 (gaim-0.9.18.tar.gz) = 0645359f18d20c06aadabdf9254242a2 diff --git a/net/gaim/files/patch-sum b/net/gaim/files/patch-sum new file mode 100644 index 00000000000..6d1e422604e --- /dev/null +++ b/net/gaim/files/patch-sum @@ -0,0 +1,3 @@ +$NetBSD: patch-sum,v 1.1 2000/06/06 22:17:47 augustss Exp $ + +MD5 (patch-aa) = d03692b436ab8fabc88db64336c069db diff --git a/net/gaim/patches/patch-aa b/net/gaim/patches/patch-aa new file mode 100644 index 00000000000..80735480ff3 --- /dev/null +++ b/net/gaim/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2000/06/06 22:17:47 augustss Exp $ + +--- src/prefs.c.orig Wed May 31 19:24:34 2000 ++++ src/prefs.c Tue Jun 6 11:20:16 2000 +@@ -788,7 +788,7 @@ + gaim_button("Transparent text window (experimental)", &transparent, appbox ); + #endif + gaim_button("Show logon/logoffs in conversation windows", &display_options, OPT_DISP_SHOW_LOGON, appbox ); +- gaim_button("Use devil icons", &display_options, OPT_DISP_DEVIL_PIXMAPS, appbox ); ++ gaim_button("Use daemon icons", &display_options, OPT_DISP_DEVIL_PIXMAPS, appbox ); + + + diff --git a/net/gaim/pkg/PLIST b/net/gaim/pkg/PLIST index 0b0f517100c..7c1a85245d5 100644 --- a/net/gaim/pkg/PLIST +++ b/net/gaim/pkg/PLIST @@ -1,5 +1,15 @@ -@comment $NetBSD: PLIST,v 1.2 2000/01/05 02:00:32 garbled Exp $ -share/applets/Amusements/gaim_applet.desktop -etc/CORBA/servers/gaim_applet.gnorba +@comment $NetBSD: PLIST,v 1.3 2000/06/06 22:17:48 augustss Exp $ +lib/gaim/autorecon.so +lib/gaim/iconaway.so +lib/gaim/notify.so +lib/gaim/spellchk.so bin/au2h bin/gaim +man/man1/gaim.1 +share/pixmaps/gaim.xpm +share/gnome/apps/Internet/gaim.desktop +@unexec rmdir %D/share/gnome/apps/Internet 2>/dev/null || true +@unexec rmdir %D/share/gnome/apps 2>/dev/null || true +@unexec rmdir %D/share/gnome 2>/dev/null || true +@unexec rmdir %D/share/pixmaps 2>/dev/null || true +@unexec rmdir %D/lib/gaim 2>/dev/null || true -- cgit v1.2.3