Update gaim to 0.61, based on the package provided by mjl@luckie.org.nz in

pkgsrc-wip.  This new version includes lots of changes since 0.59.x, but
maybe the most important is the switch to GTK v2.

7 files changed, 345 insertions, 254 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 75bda2eee24..bcd1af6eeef 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,19 +1,42 @@
-# $NetBSD: Makefile,v 1.25 2003/01/10 07:36:25 cjep Exp $
+# $NetBSD: Makefile,v 1.26 2003/04/11 15:41:37 jmmv Exp $
 #
 
-.include "Makefile.common"
+DISTNAME=	gaim-0.61
+CATEGORIES=	chat x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
+		ftp://ftp.marko.net/pub/gaim/
 
-CONFLICTS+=		gaim-gnome-[0-9]*
+MAINTAINER=	mjl@luckie.org.nz
+HOMEPAGE=	http://gaim.sourceforge.net/
+COMMENT=	GTK2 based client for the AOL Instant Messenger chat system
 
+DEPENDS+=	gnome2-dirs>=1.1:../../misc/gnome2-dirs
+
+CONFLICTS+=	gaim-gtk1-[0-9]* gaim-gnome-[0-9]*
+
+GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+USE_PKGLOCALEDIR=	YES
+USE_X11=		YES
 
-CONFIGURE_ARGS+=	--disable-gnome
-CONFIGURE_ARGS+=	--disable-panel
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-PLIST_SRC+=		${.CURDIR}/../gaim/PLIST
+CONFIGURE_ARGS+=	--disable-nas
+CONFIGURE_ARGS+=	--enable-perl
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../mk/bsd.prefs.mk"
 
+.if !exists(${X11BASE}/include/X11/extensions/scrnsaver.h)
+CONFIGURE_ARGS+=	--disable-screensaver
+.endif
+
+.include "../../audio/libao/buildlink2.mk"
+.include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../textproc/gtkspell/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common
deleted file mode 100644
index c4bb184f748..00000000000
--- a/chat/gaim/Makefile.common
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile.common,v 1.12 2003/02/05 05:06:33 jlam Exp $
-#
-
-DISTNAME=	gaim-0.59.8
-PKGREVISION=	2
-CATEGORIES=	chat x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
-		ftp://ftp.marko.net/pub/gaim/
-
-MAINTAINER=	rafal@netbsd.org
-HOMEPAGE=	http://gaim.sourceforge.net/
-COMMENT=	GTK+-based client for AOL's Instant Messenger chat system
-
-DISTINFO_FILE=	${.CURDIR}/../gaim/distinfo
-FILESDIR=	${.CURDIR}/../gaim/files
-PATCHDIR=	${.CURDIR}/../gaim/patches
-PKGDIR=		${.CURDIR}/../gaim
-PLIST_SRC=      ${.CURDIR}/../gaim/PLIST.common
-
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
-
-USE_GMAKE=		YES
-USE_X11BASE=		YES
-USE_PKGLOCALEDIR=	YES
-
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--disable-artsc
-CONFIGURE_ARGS+=	--disable-nas
-CONFIGURE_ARGS+=	--disable-perl
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv}
-
-CONFIGURE_ARGS+=	--enable-esd
-CONFIGURE_ARGS+=	--enable-perl
-CONFIGURE_ARGS+=	--enable-pixbuf
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !exists(${X11BASE}/include/X11/extensions/scrnsaver.h)
-CONFIGURE_ARGS+=	--disable-screensaver
-.endif
-
-# Newer versions of gaim use gettext checks that gettext-lib/buildlink2.mk
-# can't currently handle.
-#
-CONFIGURE_ARGS+=	--without-included-gettext
-CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libc=yes
-
-.include "../../converters/libiconv/buildlink2.mk"
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index 57b9d4c6815..9bdbd398ab9 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,2 +1,288 @@
-@comment $NetBSD: PLIST,v 1.10 2002/08/25 21:49:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2003/04/11 15:41:38 jmmv Exp $
 bin/gaim
+bin/gaim-remote
+lib/gaim/autorecon.a
+lib/gaim/autorecon.la
+lib/gaim/autorecon.so
+lib/gaim/docklet.a
+lib/gaim/docklet.la
+lib/gaim/docklet.so
+lib/gaim/gestures.a
+lib/gaim/gestures.la
+lib/gaim/gestures.so
+lib/gaim/history.a
+lib/gaim/history.la
+lib/gaim/history.so
+lib/gaim/iconaway.a
+lib/gaim/iconaway.la
+lib/gaim/iconaway.so
+lib/gaim/idle.a
+lib/gaim/idle.la
+lib/gaim/idle.so
+lib/gaim/libgg.a
+lib/gaim/libgg.la
+lib/gaim/libgg.so
+lib/gaim/libicq.a
+lib/gaim/libicq.la
+lib/gaim/libicq.so
+lib/gaim/libirc.a
+lib/gaim/libirc.la
+lib/gaim/libirc.so
+lib/gaim/libjabber.a
+lib/gaim/libjabber.la
+lib/gaim/libjabber.so
+lib/gaim/libmsn.a
+lib/gaim/libmsn.la
+lib/gaim/libmsn.so
+lib/gaim/libnapster.a
+lib/gaim/libnapster.la
+lib/gaim/libnapster.so
+lib/gaim/liboscar.a
+lib/gaim/liboscar.la
+lib/gaim/liboscar.so
+lib/gaim/libtoc.a
+lib/gaim/libtoc.la
+lib/gaim/libtoc.so
+lib/gaim/libyahoo.a
+lib/gaim/libyahoo.la
+lib/gaim/libyahoo.so
+lib/gaim/libzephyr.a
+lib/gaim/libzephyr.la
+lib/gaim/libzephyr.so
+lib/gaim/notify.a
+lib/gaim/notify.la
+lib/gaim/notify.so
+lib/gaim/spellchk.a
+lib/gaim/spellchk.la
+lib/gaim/spellchk.so
+lib/gaim/ticker.a
+lib/gaim/ticker.la
+lib/gaim/ticker.so
+lib/gaim/timestamp.a
+lib/gaim/timestamp.la
+lib/gaim/timestamp.so
+man/man1/gaim.1
+share/applications/gaim.desktop
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
+share/pixmaps/gaim.png
+share/pixmaps/gaim/buttons/about_menu.png
+share/pixmaps/gaim/buttons/accounts.png
+share/pixmaps/gaim/buttons/change-bgcolor-small.png
+share/pixmaps/gaim/buttons/change-fgcolor-small.png
+share/pixmaps/gaim/buttons/edit.png
+share/pixmaps/gaim/buttons/insert-image-small.png
+share/pixmaps/gaim/buttons/insert-link-small.png
+share/pixmaps/gaim/buttons/insert-smiley-small.png
+share/pixmaps/gaim/buttons/text_bigger.png
+share/pixmaps/gaim/buttons/text_normal.png
+share/pixmaps/gaim/buttons/text_smaller.png
+share/pixmaps/gaim/dialogs/gaim_auth.png
+share/pixmaps/gaim/dialogs/gaim_cool.png
+share/pixmaps/gaim/dialogs/gaim_error.png
+share/pixmaps/gaim/dialogs/gaim_info.png
+share/pixmaps/gaim/dialogs/gaim_question.png
+share/pixmaps/gaim/dialogs/gaim_warning.png
+share/pixmaps/gaim/icons/away.png
+share/pixmaps/gaim/icons/connect.png
+share/pixmaps/gaim/icons/msgpend.png
+share/pixmaps/gaim/icons/msgunread.png
+share/pixmaps/gaim/icons/offline.png
+share/pixmaps/gaim/icons/online.png
+share/pixmaps/gaim/logo.png
+share/pixmaps/gaim/smileys/default/angel.png
+share/pixmaps/gaim/smileys/default/bigsmile.png
+share/pixmaps/gaim/smileys/default/burp.png
+share/pixmaps/gaim/smileys/default/cool.png
+share/pixmaps/gaim/smileys/default/crazy.png
+share/pixmaps/gaim/smileys/default/crossedlips.png
+share/pixmaps/gaim/smileys/default/cry.png
+share/pixmaps/gaim/smileys/default/download.png
+share/pixmaps/gaim/smileys/default/embarrassed.png
+share/pixmaps/gaim/smileys/default/farted.png
+share/pixmaps/gaim/smileys/default/kiss.png
+share/pixmaps/gaim/smileys/default/luke.png
+share/pixmaps/gaim/smileys/default/moneymouth.png
+share/pixmaps/gaim/smileys/default/mrt.png
+share/pixmaps/gaim/smileys/default/msn_angel.png
+share/pixmaps/gaim/smileys/default/msn_angry.png
+share/pixmaps/gaim/smileys/default/msn_away.png
+share/pixmaps/gaim/smileys/default/msn_bat.png
+share/pixmaps/gaim/smileys/default/msn_beer.png
+share/pixmaps/gaim/smileys/default/msn_boy.png
+share/pixmaps/gaim/smileys/default/msn_brheart.png
+share/pixmaps/gaim/smileys/default/msn_cake.png
+share/pixmaps/gaim/smileys/default/msn_cat.png
+share/pixmaps/gaim/smileys/default/msn_clock.png
+share/pixmaps/gaim/smileys/default/msn_coffee.png
+share/pixmaps/gaim/smileys/default/msn_cry.png
+share/pixmaps/gaim/smileys/default/msn_deadflower.png
+share/pixmaps/gaim/smileys/default/msn_devil.png
+share/pixmaps/gaim/smileys/default/msn_dog.png
+share/pixmaps/gaim/smileys/default/msn_drink.png
+share/pixmaps/gaim/smileys/default/msn_email.png
+share/pixmaps/gaim/smileys/default/msn_embarrassed.png
+share/pixmaps/gaim/smileys/default/msn_film.png
+share/pixmaps/gaim/smileys/default/msn_flower.png
+share/pixmaps/gaim/smileys/default/msn_gift.png
+share/pixmaps/gaim/smileys/default/msn_girl.png
+share/pixmaps/gaim/smileys/default/msn_handcuffs.png
+share/pixmaps/gaim/smileys/default/msn_heart.png
+share/pixmaps/gaim/smileys/default/msn_hot.png
+share/pixmaps/gaim/smileys/default/msn_icon.png
+share/pixmaps/gaim/smileys/default/msn_idea.png
+share/pixmaps/gaim/smileys/default/msn_kiss.png
+share/pixmaps/gaim/smileys/default/msn_laugh.png
+share/pixmaps/gaim/smileys/default/msn_neutral.png
+share/pixmaps/gaim/smileys/default/msn_note.png
+share/pixmaps/gaim/smileys/default/msn_occ.png
+share/pixmaps/gaim/smileys/default/msn_online.png
+share/pixmaps/gaim/smileys/default/msn_ooooh.png
+share/pixmaps/gaim/smileys/default/msn_phone.png
+share/pixmaps/gaim/smileys/default/msn_photo.png
+share/pixmaps/gaim/smileys/default/msn_question.png
+share/pixmaps/gaim/smileys/default/msn_rainbow.png
+share/pixmaps/gaim/smileys/default/msn_run.png
+share/pixmaps/gaim/smileys/default/msn_runback.png
+share/pixmaps/gaim/smileys/default/msn_sad.png
+share/pixmaps/gaim/smileys/default/msn_sleep.png
+share/pixmaps/gaim/smileys/default/msn_smiley.png
+share/pixmaps/gaim/smileys/default/msn_star.png
+share/pixmaps/gaim/smileys/default/msn_sun.png
+share/pixmaps/gaim/smileys/default/msn_thumbdown.png
+share/pixmaps/gaim/smileys/default/msn_thumbup.png
+share/pixmaps/gaim/smileys/default/msn_tongue.png
+share/pixmaps/gaim/smileys/default/msn_weird.png
+share/pixmaps/gaim/smileys/default/msn_wink.png
+share/pixmaps/gaim/smileys/default/oneeye.png
+share/pixmaps/gaim/smileys/default/sad.png
+share/pixmaps/gaim/smileys/default/scream.png
+share/pixmaps/gaim/smileys/default/smile.png
+share/pixmaps/gaim/smileys/default/theme
+share/pixmaps/gaim/smileys/default/think.png
+share/pixmaps/gaim/smileys/default/tongue.png
+share/pixmaps/gaim/smileys/default/wink.png
+share/pixmaps/gaim/smileys/default/yahoo_alien.gif
+share/pixmaps/gaim/smileys/default/yahoo_alien2.gif
+share/pixmaps/gaim/smileys/default/yahoo_angel.gif
+share/pixmaps/gaim/smileys/default/yahoo_angry.gif
+share/pixmaps/gaim/smileys/default/yahoo_batting.gif
+share/pixmaps/gaim/smileys/default/yahoo_beatup.gif
+share/pixmaps/gaim/smileys/default/yahoo_bigsmile.gif
+share/pixmaps/gaim/smileys/default/yahoo_blush.gif
+share/pixmaps/gaim/smileys/default/yahoo_bye.gif
+share/pixmaps/gaim/smileys/default/yahoo_chicken.gif
+share/pixmaps/gaim/smileys/default/yahoo_clap.gif
+share/pixmaps/gaim/smileys/default/yahoo_clown.gif
+share/pixmaps/gaim/smileys/default/yahoo_coffee.gif
+share/pixmaps/gaim/smileys/default/yahoo_confused.gif
+share/pixmaps/gaim/smileys/default/yahoo_cry.gif
+share/pixmaps/gaim/smileys/default/yahoo_dance.gif
+share/pixmaps/gaim/smileys/default/yahoo_devil.gif
+share/pixmaps/gaim/smileys/default/yahoo_doh.gif
+share/pixmaps/gaim/smileys/default/yahoo_drool.gif
+share/pixmaps/gaim/smileys/default/yahoo_eyebrow.gif
+share/pixmaps/gaim/smileys/default/yahoo_eyeroll.gif
+share/pixmaps/gaim/smileys/default/yahoo_flag.gif
+share/pixmaps/gaim/smileys/default/yahoo_flower.gif
+share/pixmaps/gaim/smileys/default/yahoo_frustrated.gif
+share/pixmaps/gaim/smileys/default/yahoo_ghost.gif
+share/pixmaps/gaim/smileys/default/yahoo_glasses.gif
+share/pixmaps/gaim/smileys/default/yahoo_huggs.gif
+share/pixmaps/gaim/smileys/default/yahoo_hypnotized.gif
+share/pixmaps/gaim/smileys/default/yahoo_idea.gif
+share/pixmaps/gaim/smileys/default/yahoo_kiss.gif
+share/pixmaps/gaim/smileys/default/yahoo_laughloud.gif
+share/pixmaps/gaim/smileys/default/yahoo_liar.gif
+share/pixmaps/gaim/smileys/default/yahoo_love.gif
+share/pixmaps/gaim/smileys/default/yahoo_mean.gif
+share/pixmaps/gaim/smileys/default/yahoo_moneyeyes.gif
+share/pixmaps/gaim/smileys/default/yahoo_monkey.gif
+share/pixmaps/gaim/smileys/default/yahoo_neutral.gif
+share/pixmaps/gaim/smileys/default/yahoo_ooooh.gif
+share/pixmaps/gaim/smileys/default/yahoo_peace.gif
+share/pixmaps/gaim/smileys/default/yahoo_pig.gif
+share/pixmaps/gaim/smileys/default/yahoo_pray.gif
+share/pixmaps/gaim/smileys/default/yahoo_pumpkin.gif
+share/pixmaps/gaim/smileys/default/yahoo_question.gif
+share/pixmaps/gaim/smileys/default/yahoo_sad.gif
+share/pixmaps/gaim/smileys/default/yahoo_shame.gif
+share/pixmaps/gaim/smileys/default/yahoo_shamrock.gif
+share/pixmaps/gaim/smileys/default/yahoo_shhhh.gif
+share/pixmaps/gaim/smileys/default/yahoo_sick.gif
+share/pixmaps/gaim/smileys/default/yahoo_silent.gif
+share/pixmaps/gaim/smileys/default/yahoo_silly.gif
+share/pixmaps/gaim/smileys/default/yahoo_sleep.gif
+share/pixmaps/gaim/smileys/default/yahoo_smiley.gif
+share/pixmaps/gaim/smileys/default/yahoo_sunglas.gif
+share/pixmaps/gaim/smileys/default/yahoo_think.gif
+share/pixmaps/gaim/smileys/default/yahoo_tired.gif
+share/pixmaps/gaim/smileys/default/yahoo_tongue.gif
+share/pixmaps/gaim/smileys/default/yahoo_whistling.gif
+share/pixmaps/gaim/smileys/default/yahoo_wink.gif
+share/pixmaps/gaim/smileys/default/yahoo_worried.gif
+share/pixmaps/gaim/smileys/default/yell.png
+share/pixmaps/gaim/status/default/activebuddy.png
+share/pixmaps/gaim/status/default/admin.png
+share/pixmaps/gaim/status/default/aim.png
+share/pixmaps/gaim/status/default/aol.png
+share/pixmaps/gaim/status/default/away.png
+share/pixmaps/gaim/status/default/dnd.png
+share/pixmaps/gaim/status/default/freeforchat.png
+share/pixmaps/gaim/status/default/gadu-gadu.png
+share/pixmaps/gaim/status/default/game.png
+share/pixmaps/gaim/status/default/icq.png
+share/pixmaps/gaim/status/default/invisible.png
+share/pixmaps/gaim/status/default/irc.png
+share/pixmaps/gaim/status/default/jabber.png
+share/pixmaps/gaim/status/default/login.png
+share/pixmaps/gaim/status/default/logout.png
+share/pixmaps/gaim/status/default/msn.png
+share/pixmaps/gaim/status/default/na.png
+share/pixmaps/gaim/status/default/napster.png
+share/pixmaps/gaim/status/default/occupied.png
+share/pixmaps/gaim/status/default/offline.png
+share/pixmaps/gaim/status/default/wireless.png
+share/pixmaps/gaim/status/default/yahoo.png
+share/pixmaps/gaim/tb_drag_arrow_down.xpm
+share/pixmaps/gaim/tb_drag_arrow_left.xpm
+share/pixmaps/gaim/tb_drag_arrow_right.xpm
+share/pixmaps/gaim/tb_drag_arrow_up.xpm
+share/pixmaps/gaim/typed.png
+share/pixmaps/gaim/typing.png
+share/sounds/gaim/arrive.wav
+share/sounds/gaim/leave.wav
+share/sounds/gaim/receive.wav
+share/sounds/gaim/redalert.wav
+share/sounds/gaim/send.wav
+@dirrm share/sounds/gaim
+@unexec ${RMDIR} %D/share/sounds 2>/dev/null || ${TRUE}
+@dirrm share/pixmaps/gaim/status/default
+@dirrm share/pixmaps/gaim/status
+@dirrm share/pixmaps/gaim/smileys/default
+@dirrm share/pixmaps/gaim/smileys
+@dirrm share/pixmaps/gaim/icons
+@dirrm share/pixmaps/gaim/dialogs
+@dirrm share/pixmaps/gaim/buttons
+@dirrm share/pixmaps/gaim
+@comment in gnome-dirs: @dirrm share/gnome/apps/Internet
+@comment in gnome2-dirs: @dirrm share/applications
+@dirrm lib/gaim
diff --git a/chat/gaim/PLIST.common b/chat/gaim/PLIST.common
deleted file mode 100644
index 2799045eef5..00000000000
--- a/chat/gaim/PLIST.common
+++ /dev/null
@@ -1,53 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.4 2003/01/27 12:54:55 jmmv Exp $
-lib/gaim/autorecon.so
-lib/gaim/chatlist.so
-lib/gaim/iconaway.so
-lib/gaim/libgg.a
-lib/gaim/libgg.la
-lib/gaim/libgg.so
-lib/gaim/libicq.a
-lib/gaim/libicq.la
-lib/gaim/libicq.so
-lib/gaim/libirc.a
-lib/gaim/libirc.la
-lib/gaim/libirc.so
-lib/gaim/libjabber.a
-lib/gaim/libjabber.la
-lib/gaim/libjabber.so
-lib/gaim/libmsn.a
-lib/gaim/libmsn.la
-lib/gaim/libmsn.so
-lib/gaim/libnapster.a
-lib/gaim/libnapster.la
-lib/gaim/libnapster.so
-lib/gaim/libyahoo.a
-lib/gaim/libyahoo.la
-lib/gaim/libyahoo.so
-lib/gaim/libzephyr.a
-lib/gaim/libzephyr.la
-lib/gaim/libzephyr.so
-lib/gaim/notify.so
-lib/gaim/spellchk.so
-man/man1/gaim.1
-share/gnome/apps/Internet/gaim.desktop
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
-share/pixmaps/gaim.png
-@comment in gnome-dirs: @dirrm share/gnome/apps/Internet
-@dirrm lib/gaim
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index f987e5b074a..bd6d6b1ca6d 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.20 2003/01/09 16:15:08 mycroft Exp $
+$NetBSD: distinfo,v 1.21 2003/04/11 15:41:39 jmmv Exp $
 
-SHA1 (gaim-0.59.8.tar.gz) = d1d81fd634bc206433982eb19cd76492a79a1834
-Size (gaim-0.59.8.tar.gz) = 2126403 bytes
-SHA1 (patch-aa) = d1eba622e65507f657d602e497601e38140c5963
-SHA1 (patch-ab) = 0a635d9c7b89b5ce87c3a0bb37fa05280c66c6c2
+SHA1 (gaim-0.61.tar.gz) = abfb78a0b81e39ed744fbe0ac088abdd47601f90
+Size (gaim-0.61.tar.gz) = 2959190 bytes
+SHA1 (patch-aa) = 0428b0cd5c97d061b58fe4bf5bc0514a2aa5ce74
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
index 80a1ffbfe5e..e6f98204803 100644
--- a/chat/gaim/patches/patch-aa
+++ b/chat/gaim/patches/patch-aa
@@ -1,18 +1,24 @@
-$NetBSD: patch-aa,v 1.11 2002/10/28 19:39:28 jmc Exp $
+$NetBSD: patch-aa,v 1.12 2003/04/11 15:41:40 jmmv Exp $
 
---- src/Makefile.in.orig	Sat Sep 14 22:28:40 2002
-+++ src/Makefile.in	Mon Oct 28 19:24:10 2002
-@@ -150,11 +150,11 @@
- @GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c 			aim.c 			applet.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			core.c 			dialogs.c 			gaimrc.c 			gtkimhtml.c 			gtkspell.c 			gtkticker.c 			html.c 			idle.c 			list.c 			md5.c 			module.c 			multi.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			prpl.c 			server.c 			sound.c 			ticker.c 			util.c
- @GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
- @GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = -export-dynamic
--@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@
-+@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@ -liconv
- @GNOMEAPPLET_FALSE@gaim_SOURCES = about.c 		aim.c 		applet.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		core.c 		dialogs.c 		gaimrc.c 		gtkimhtml.c 		gtkspell.c 		gtkticker.c 		html.c 		idle.c 		list.c 		md5.c 		module.c 		multi.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		prpl.c 		server.c 		sound.c 		ticker.c 		util.c
- @GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
- @GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic
--@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@
-+@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@ -liconv
- CFLAGS = @CFLAGS@ $(PERL_CFLAGS) -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
+--- src/buddy.c.orig	Thu Apr 10 18:11:40 2003
++++ src/buddy.c	Thu Apr 10 18:11:54 2003
+@@ -1112,6 +1112,7 @@
+ 	GtkWidget *sw;
+ 	GtkWidget *button;
+ 	GtkSizeGroup *sg;
++	GtkAccelGroup *accel_group;
+ 	GtkTreeSelection *selection;
+ 	GtkTargetEntry gte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
+ 				{"application/x-im-contact", 0, DRAG_BUDDY}};
+@@ -1136,7 +1137,10 @@
+ 	gtk_widget_add_events(gtkblist->window, GDK_VISIBILITY_NOTIFY_MASK);
  
- LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
+ 	/******************************* Menu bar *************************************/
+-	ift = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<GaimMain>", NULL);
++	accel_group = gtk_accel_group_new();
++	gtk_window_add_accel_group(GTK_WINDOW (gtkblist->window), accel_group);
++	g_object_unref(accel_group);
++	ift = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<GaimMain>", accel_group);
+ 	gtk_item_factory_set_translate_func (ift,
+ 					     item_factory_translate_func,
+ 					     NULL, NULL);
diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab
deleted file mode 100644
index 370bb93119f..00000000000
--- a/chat/gaim/patches/patch-ab
+++ /dev/null
@@ -1,119 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2003/01/09 16:15:09 mycroft Exp $
-
---- src/perl.c.orig	Sat Dec 21 20:08:19 2002
-+++ src/perl.c	Thu Jan  9 16:03:03 2003
-@@ -178,15 +178,13 @@
- {
- 	DIR *dir;
- 	struct dirent *ent;
--	struct dirent *dirent_buf;
- 	char *buf;
- 	char *path;
- 
- 	path = gaim_user_dir();
- 	dir = opendir(path);
- 	if (dir) {
--		dirent_buf = g_malloc(sizeof(struct dirent) + NAME_MAX);
--		while ((readdir_r(dir,dirent_buf,&ent),ent)) {
-+ 		while ((ent = readdir(dir))) {
- 			if (strcmp(ent->d_name, ".") && strcmp(ent->d_name, "..")) {
- 				if (is_pl_file(ent->d_name)) {
- 					buf = g_malloc(strlen(path) + strlen(ent->d_name) + 2);
-@@ -197,7 +195,6 @@
- 			}
- 		}
- 		closedir(dir);
--		g_free(dirent_buf);
- 	}
- 	g_free(path);
- }
-@@ -295,7 +292,7 @@
- XS (XS_GAIM_register)
- {
- 	char *name, *ver, *callback, *unused; /* exactly like X-Chat, eh? :) */
--	unsigned int junk;
-+	STRLEN junk;
- 	struct perlscript *scp;
- 	dXSARGS;
- 	items = 0;
-@@ -406,7 +403,7 @@
- {
- 	char *title;
- 	char *message;
--	unsigned int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 	items = 0;
- 
-@@ -474,7 +471,7 @@
- 
- XS (XS_GAIM_command)
- {
--	unsigned int junk;
-+	STRLEN junk;
- 	char *command = NULL;
- 	dXSARGS;
- 	items = 0;
-@@ -526,7 +523,7 @@
- XS (XS_GAIM_user_info)
- {
- 	struct gaim_connection *gc;
--	unsigned int junk;
-+	STRLEN junk;
- 	struct buddy *buddy = NULL;
- 	dXSARGS;
- 	items = 0;
-@@ -552,7 +549,7 @@
- {
- 	char *nick, *who, *what;
- 	struct conversation *c;
--	int junk;
-+	STRLEN junk;
- 	int send, wflags;
- 	dXSARGS;
- 	items = 0;
-@@ -584,7 +581,7 @@
- 	struct gaim_connection *gc;
- 	char *nick, *what;
- 	int isauto;
--	int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 	items = 0;
- 
-@@ -607,7 +604,7 @@
- 	char *nick, *what;
- 	int isauto;
- 	struct conversation *c;
--	unsigned int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 	items = 0;
- 
-@@ -637,7 +634,7 @@
- 	char *what;
- 	struct conversation *b = NULL;
- 	GSList *bcs;
--	unsigned int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 	items = 0;
- 
-@@ -803,7 +800,7 @@
- 
- XS (XS_GAIM_add_event_handler)
- {
--	unsigned int junk;
-+	STRLEN junk;
- 	struct _perl_event_handlers *handler;
- 	dXSARGS;
- 	items = 0;
-@@ -830,7 +827,7 @@
- 
- XS (XS_GAIM_add_timeout_handler)
- {
--	unsigned int junk;
-+	STRLEN junk;
- 	long timeout;
- 	struct _perl_timeout_handlers *handler;
- 	dXSARGS;