aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2002-06-26 08:31:45 +0800
committermarcus <marcus@FreeBSD.org>2002-06-26 08:31:45 +0800
commit2c46eac7eff07a431ee6f5d40bc7ec76f39a81ba (patch)
tree44ffcc9209cebba4da116c3f1d30fbb75e91a523 /net
parent76bbda0e295ca51c765c66e506a4bc5da9ce81a5 (diff)
downloadfreebsd-ports-gnome-2c46eac7eff07a431ee6f5d40bc7ec76f39a81ba.tar.gz
freebsd-ports-gnome-2c46eac7eff07a431ee6f5d40bc7ec76f39a81ba.tar.zst
freebsd-ports-gnome-2c46eac7eff07a431ee6f5d40bc7ec76f39a81ba.zip
Update to 0.59.
Diffstat (limited to 'net')
-rw-r--r--net/gaim-snapshot/Makefile12
-rw-r--r--net/gaim-snapshot/distinfo2
-rw-r--r--net/gaim-snapshot/files/patch-ab30
-rw-r--r--net/gaim-snapshot/files/patch-ac87
-rw-r--r--net/gaim-snapshot/pkg-plist2
-rw-r--r--net/gaim/Makefile12
-rw-r--r--net/gaim/distinfo2
-rw-r--r--net/gaim/files/patch-ab30
-rw-r--r--net/gaim/files/patch-ac87
-rw-r--r--net/gaim/pkg-plist2
10 files changed, 194 insertions, 72 deletions
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index d5b5832734fa..e0c3ea6dc5f4 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gaim
-PORTVERSION= 0.58
+PORTVERSION= 0.59
CATEGORIES?= net
MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \
${MASTER_SITE_SOURCEFORGE}
@@ -17,9 +17,11 @@ MAINTAINER?= marcus@FreeBSD.org
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
USE_GTK= yes
WANT_ESOUND= yes
WANT_GNOME= yes
+USE_PERL5= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
@@ -47,10 +49,10 @@ CONFIGURE_ARGS+= --disable-esd
.endif
pre-patch:
- @${PERL} -pi.orig -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \
+ @${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \
s|-lpthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
- 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
- s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
+ @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+ 's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+ s|[(]datadir[)]/locale|(prefix)/share/locale|g'
.include <bsd.port.post.mk>
diff --git a/net/gaim-snapshot/distinfo b/net/gaim-snapshot/distinfo
index f4164bdf8655..bcf0d7e62e41 100644
--- a/net/gaim-snapshot/distinfo
+++ b/net/gaim-snapshot/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.58.tar.bz2) = fd7b6eeb624810cb23c924802825e1b4
+MD5 (gaim-0.59.tar.bz2) = d32006df4d76095413b4bf0ab2d29351
diff --git a/net/gaim-snapshot/files/patch-ab b/net/gaim-snapshot/files/patch-ab
index 4713c2c845cf..368e0642689e 100644
--- a/net/gaim-snapshot/files/patch-ab
+++ b/net/gaim-snapshot/files/patch-ab
@@ -1,32 +1,32 @@
---- pixmaps/Makefile.in.orig Tue May 14 20:12:32 2002
-+++ pixmaps/Makefile.in Tue May 14 20:14:27 2002
-@@ -150,22 +150,15 @@
- EXTRA_DIST = ab.xpm about_small.xpm add.xpm add_small.xpm admin_icon.xpm aimicon.xpm angel.xpm arrow_down.xpm arrow_right.xpm aol_icon.xpm available-away.xpm available-chat.xpm available-dnd.xpm available-xa.xpm available.xpm away.png away_big.xpm away_icon.xpm away_small.xpm bgcolor.xpm big.xpm bigsmile.xpm block.xpm bold.xpm broken.xpm burp.xpm cancel.xpm close.xpm close_small.xpm connect.png crazy4.xpm crossedlips.xpm cry.xpm dt_icon.xpm download.xpm embarrassed.xpm exit_small.xpm farted.xpm fgcolor.xpm fontface.xpm fontface2.xpm free_icon.xpm gaim.xpm gg_suncloud.xpm gg_sunred.xpm gg_sunwhitered.xpm gg_sunyellow.xpm gnome_add.xpm gnome_preferences.xpm gnome_remove.xpm gnomeicu-away.xpm gnomeicu-dnd.xpm gnomeicu-ffc.xpm gnomeicu-na.xpm gnomeicu-occ.xpm gnomeicu-offline.xpm gnomeicu-online.xpm group.xpm image_icon.xpm import_small.xpm irc_icon.xpm italic.xpm join.xpm kiss.xpm link.xpm login_icon.xpm logo.xpm logout_icon.xpm logout_menu.xpm luke03.xpm moneymouth.xpm mrt.xpm msgpend.png msn_away.xpm msn_occ.xpm msn_online.xpm napster.xpm no_icon.xpm normal.xpm offline.png ok.xpm oneeye.xpm online.png panic.xpm plugins_small.xpm pounce_small.xpm prefs_small.xpm refresh.xpm sad.xpm save.xpm save_small.xpm scream.xpm search_small.xpm send_small.xpm small.xpm smile.xpm smile8.xpm smile_icon.xpm speaker.xpm status-away.xpm status-game.xpm status-here.xpm status-idle.xpm strike.xpm tb_forward.xpm tb_redo.xpm tb_refresh.xpm tb_search.xpm tb_undo.xpm think.xpm tmp_send.xpm tongue.xpm underline.xpm warn.xpm wink.xpm wireless_icon.xpm wood.xpm yell.xpm
+--- pixmaps/Makefile.in.orig Tue Mar 5 21:04:40 2002
++++ pixmaps/Makefile.in Tue Mar 5 21:06:51 2002
+@@ -260,22 +260,15 @@
+ yell.xpm
--@DISTRIB_TRUE@gaimdistpixdir = $(datadir)/pixmaps/gaim
--@DISTRIB_TRUE@gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png
+-@DISTRIB_TRUE@gaimdistpixdir = @DISTRIB_TRUE@$(datadir)/pixmaps/gaim
+-@DISTRIB_TRUE@gaimdistpix_DATA = @DISTRIB_TRUE@away.png connect.png msgpend.png offline.png online.png
+@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
+@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
+@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
+@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
+@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.xpm
--@DISTRIB_TRUE@distpixmapdir = $(datadir)/pixmaps
--@DISTRIB_TRUE@distpixmap_DATA = gaim.xpm
+-@DISTRIB_TRUE@distpixmapdir = @DISTRIB_TRUE@$(datadir)/pixmaps
+-@DISTRIB_TRUE@distpixmap_DATA = @DISTRIB_TRUE@gaim.xpm
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = gaim.xpm
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@`@GNOME_CONFIG@ --datadir`
-
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@$(gnomedata)/pixmaps/gaim
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@away.png connect.png msgpend.png offline.png online.png
-
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.xpm
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@$(gnomedata)/pixmaps
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaim.xpm
-
--@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = $(datadir)/pixmaps
--@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = gaim.xpm
+-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = @DISTRIB_FALSE@@GNOMEAPPLET_FALSE@$(datadir)/pixmaps
+-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_FALSE@gaim.xpm
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
diff --git a/net/gaim-snapshot/files/patch-ac b/net/gaim-snapshot/files/patch-ac
index 271d7294bd83..20c965d88db1 100644
--- a/net/gaim-snapshot/files/patch-ac
+++ b/net/gaim-snapshot/files/patch-ac
@@ -1,20 +1,76 @@
---- src/Makefile.in.orig Fri Mar 15 06:13:34 2002
-+++ src/Makefile.in Fri Mar 15 06:22:03 2002
-@@ -146,16 +146,74 @@
+--- src/Makefile.in.orig Tue Mar 5 21:07:43 2002
++++ src/Makefile.in Tue Mar 5 21:16:14 2002
+@@ -146,72 +146,75 @@
sedpath = @sedpath@
SUBDIRS = protocols
--@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet
+-@GNOMEAPPLET_TRUE@bin_PROGRAMS = @GNOMEAPPLET_TRUE@gaim_applet
+@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim
- @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim
--@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_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@bin_PROGRAMS = @GNOMEAPPLET_FALSE@gaim
+-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = @GNOMEAPPLET_TRUE@about.c \
+-@GNOMEAPPLET_TRUE@ aim.c \
+-@GNOMEAPPLET_TRUE@ applet.c \
+-@GNOMEAPPLET_TRUE@ away.c \
+-@GNOMEAPPLET_TRUE@ browser.c \
+-@GNOMEAPPLET_TRUE@ buddy.c \
+-@GNOMEAPPLET_TRUE@ buddy_chat.c \
+-@GNOMEAPPLET_TRUE@ conversation.c \
+-@GNOMEAPPLET_TRUE@ core.c \
+-@GNOMEAPPLET_TRUE@ dialogs.c \
+-@GNOMEAPPLET_TRUE@ gaimrc.c \
+-@GNOMEAPPLET_TRUE@ gtkimhtml.c \
+-@GNOMEAPPLET_TRUE@ gtkspell.c \
+-@GNOMEAPPLET_TRUE@ gtkticker.c \
+-@GNOMEAPPLET_TRUE@ html.c \
+-@GNOMEAPPLET_TRUE@ idle.c \
+-@GNOMEAPPLET_TRUE@ list.c \
+-@GNOMEAPPLET_TRUE@ md5.c \
+-@GNOMEAPPLET_TRUE@ module.c \
+-@GNOMEAPPLET_TRUE@ multi.c \
+-@GNOMEAPPLET_TRUE@ perl.c \
+-@GNOMEAPPLET_TRUE@ plugins.c \
+-@GNOMEAPPLET_TRUE@ prefs.c \
+-@GNOMEAPPLET_TRUE@ proxy.c \
+-@GNOMEAPPLET_TRUE@ prpl.c \
+-@GNOMEAPPLET_TRUE@ server.c \
+-@GNOMEAPPLET_TRUE@ sound.c \
+-@GNOMEAPPLET_TRUE@ ticker.c \
+-@GNOMEAPPLET_TRUE@ util.c
+-@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @GNOMEAPPLET_TRUE@@LIBOBJS@ $(STATIC_LINK_LIBS)
+-@GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = @GNOMEAPPLET_TRUE@-export-dynamic
+-@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @GNOMEAPPLET_TRUE@@LDADD@ @LIBOBJS@
+-@GNOMEAPPLET_FALSE@gaim_SOURCES = @GNOMEAPPLET_FALSE@about.c \
+-@GNOMEAPPLET_FALSE@ aim.c \
+-@GNOMEAPPLET_FALSE@ applet.c \
+-@GNOMEAPPLET_FALSE@ away.c \
+-@GNOMEAPPLET_FALSE@ browser.c \
+-@GNOMEAPPLET_FALSE@ buddy.c \
+-@GNOMEAPPLET_FALSE@ buddy_chat.c \
+-@GNOMEAPPLET_FALSE@ conversation.c \
+-@GNOMEAPPLET_FALSE@ core.c \
+-@GNOMEAPPLET_FALSE@ dialogs.c \
+-@GNOMEAPPLET_FALSE@ gaimrc.c \
+-@GNOMEAPPLET_FALSE@ gtkimhtml.c \
+-@GNOMEAPPLET_FALSE@ gtkspell.c \
+-@GNOMEAPPLET_FALSE@ gtkticker.c \
+-@GNOMEAPPLET_FALSE@ html.c \
+-@GNOMEAPPLET_FALSE@ idle.c \
+-@GNOMEAPPLET_FALSE@ list.c \
+-@GNOMEAPPLET_FALSE@ md5.c \
+-@GNOMEAPPLET_FALSE@ module.c \
+-@GNOMEAPPLET_FALSE@ multi.c \
+-@GNOMEAPPLET_FALSE@ perl.c \
+-@GNOMEAPPLET_FALSE@ plugins.c \
+-@GNOMEAPPLET_FALSE@ prefs.c \
+-@GNOMEAPPLET_FALSE@ proxy.c \
+-@GNOMEAPPLET_FALSE@ prpl.c \
+-@GNOMEAPPLET_FALSE@ server.c \
+-@GNOMEAPPLET_FALSE@ sound.c \
+-@GNOMEAPPLET_FALSE@ ticker.c \
+-@GNOMEAPPLET_FALSE@ util.c
+-@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @GNOMEAPPLET_FALSE@@LIBOBJS@ $(STATIC_LINK_LIBS)
+-@GNOMEAPPLET_FALSE@gaim_LDFLAGS = @GNOMEAPPLET_FALSE@-export-dynamic
+-@GNOMEAPPLET_FALSE@gaim_LDADD = @GNOMEAPPLET_FALSE@@LDADD@ @LIBOBJS@
+gaim_applet_SOURCES = about.c \
+ aim.c \
+ applet.c \
@@ -81,10 +137,11 @@
+gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
+gaim_LDFLAGS = -export-dynamic
+gaim_LDADD = @LDADD@ @LIBOBJS@
++
CFLAGS = @CFLAGS@ $(PERL_CFLAGS) -DLOCALEDIR=\"$(prefix)/share/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
-@@ -165,6 +223,7 @@
+@@ -235,6 +238,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
@@ -92,7 +149,7 @@
@GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-@@ -172,30 +231,34 @@
+@@ -242,30 +246,34 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
diff --git a/net/gaim-snapshot/pkg-plist b/net/gaim-snapshot/pkg-plist
index 4521eaf01b7a..034e8f7d90e5 100644
--- a/net/gaim-snapshot/pkg-plist
+++ b/net/gaim-snapshot/pkg-plist
@@ -24,11 +24,13 @@ lib/gaim/spellchk.so
%%GNOME:%%share/gnome/pixmaps/gaim/offline.png
%%GNOME:%%share/gnome/pixmaps/gaim/online.png
share/locale/bg/LC_MESSAGES/gaim.mo
+share/locale/cs/LC_MESSAGES/gaim.mo
share/locale/da/LC_MESSAGES/gaim.mo
share/locale/de/LC_MESSAGES/gaim.mo
share/locale/es/LC_MESSAGES/gaim.mo
share/locale/fi/LC_MESSAGES/gaim.mo
share/locale/fr/LC_MESSAGES/gaim.mo
+share/locale/hu/LC_MESSAGES/gaim.mo
share/locale/it/LC_MESSAGES/gaim.mo
share/locale/ja/LC_MESSAGES/gaim.mo
share/locale/ko/LC_MESSAGES/gaim.mo
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index d5b5832734fa..e0c3ea6dc5f4 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gaim
-PORTVERSION= 0.58
+PORTVERSION= 0.59
CATEGORIES?= net
MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \
${MASTER_SITE_SOURCEFORGE}
@@ -17,9 +17,11 @@ MAINTAINER?= marcus@FreeBSD.org
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
USE_GTK= yes
WANT_ESOUND= yes
WANT_GNOME= yes
+USE_PERL5= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
@@ -47,10 +49,10 @@ CONFIGURE_ARGS+= --disable-esd
.endif
pre-patch:
- @${PERL} -pi.orig -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \
+ @${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \
s|-lpthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
- 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
- s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
+ @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+ 's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+ s|[(]datadir[)]/locale|(prefix)/share/locale|g'
.include <bsd.port.post.mk>
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index f4164bdf8655..bcf0d7e62e41 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.58.tar.bz2) = fd7b6eeb624810cb23c924802825e1b4
+MD5 (gaim-0.59.tar.bz2) = d32006df4d76095413b4bf0ab2d29351
diff --git a/net/gaim/files/patch-ab b/net/gaim/files/patch-ab
index 4713c2c845cf..368e0642689e 100644
--- a/net/gaim/files/patch-ab
+++ b/net/gaim/files/patch-ab
@@ -1,32 +1,32 @@
---- pixmaps/Makefile.in.orig Tue May 14 20:12:32 2002
-+++ pixmaps/Makefile.in Tue May 14 20:14:27 2002
-@@ -150,22 +150,15 @@
- EXTRA_DIST = ab.xpm about_small.xpm add.xpm add_small.xpm admin_icon.xpm aimicon.xpm angel.xpm arrow_down.xpm arrow_right.xpm aol_icon.xpm available-away.xpm available-chat.xpm available-dnd.xpm available-xa.xpm available.xpm away.png away_big.xpm away_icon.xpm away_small.xpm bgcolor.xpm big.xpm bigsmile.xpm block.xpm bold.xpm broken.xpm burp.xpm cancel.xpm close.xpm close_small.xpm connect.png crazy4.xpm crossedlips.xpm cry.xpm dt_icon.xpm download.xpm embarrassed.xpm exit_small.xpm farted.xpm fgcolor.xpm fontface.xpm fontface2.xpm free_icon.xpm gaim.xpm gg_suncloud.xpm gg_sunred.xpm gg_sunwhitered.xpm gg_sunyellow.xpm gnome_add.xpm gnome_preferences.xpm gnome_remove.xpm gnomeicu-away.xpm gnomeicu-dnd.xpm gnomeicu-ffc.xpm gnomeicu-na.xpm gnomeicu-occ.xpm gnomeicu-offline.xpm gnomeicu-online.xpm group.xpm image_icon.xpm import_small.xpm irc_icon.xpm italic.xpm join.xpm kiss.xpm link.xpm login_icon.xpm logo.xpm logout_icon.xpm logout_menu.xpm luke03.xpm moneymouth.xpm mrt.xpm msgpend.png msn_away.xpm msn_occ.xpm msn_online.xpm napster.xpm no_icon.xpm normal.xpm offline.png ok.xpm oneeye.xpm online.png panic.xpm plugins_small.xpm pounce_small.xpm prefs_small.xpm refresh.xpm sad.xpm save.xpm save_small.xpm scream.xpm search_small.xpm send_small.xpm small.xpm smile.xpm smile8.xpm smile_icon.xpm speaker.xpm status-away.xpm status-game.xpm status-here.xpm status-idle.xpm strike.xpm tb_forward.xpm tb_redo.xpm tb_refresh.xpm tb_search.xpm tb_undo.xpm think.xpm tmp_send.xpm tongue.xpm underline.xpm warn.xpm wink.xpm wireless_icon.xpm wood.xpm yell.xpm
+--- pixmaps/Makefile.in.orig Tue Mar 5 21:04:40 2002
++++ pixmaps/Makefile.in Tue Mar 5 21:06:51 2002
+@@ -260,22 +260,15 @@
+ yell.xpm
--@DISTRIB_TRUE@gaimdistpixdir = $(datadir)/pixmaps/gaim
--@DISTRIB_TRUE@gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png
+-@DISTRIB_TRUE@gaimdistpixdir = @DISTRIB_TRUE@$(datadir)/pixmaps/gaim
+-@DISTRIB_TRUE@gaimdistpix_DATA = @DISTRIB_TRUE@away.png connect.png msgpend.png offline.png online.png
+@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
+@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
+@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
+@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
+@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.xpm
--@DISTRIB_TRUE@distpixmapdir = $(datadir)/pixmaps
--@DISTRIB_TRUE@distpixmap_DATA = gaim.xpm
+-@DISTRIB_TRUE@distpixmapdir = @DISTRIB_TRUE@$(datadir)/pixmaps
+-@DISTRIB_TRUE@distpixmap_DATA = @DISTRIB_TRUE@gaim.xpm
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = gaim.xpm
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@`@GNOME_CONFIG@ --datadir`
-
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@$(gnomedata)/pixmaps/gaim
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@away.png connect.png msgpend.png offline.png online.png
-
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.xpm
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@$(gnomedata)/pixmaps
+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaim.xpm
-
--@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = $(datadir)/pixmaps
--@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = gaim.xpm
+-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = @DISTRIB_FALSE@@GNOMEAPPLET_FALSE@$(datadir)/pixmaps
+-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_FALSE@gaim.xpm
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
diff --git a/net/gaim/files/patch-ac b/net/gaim/files/patch-ac
index 271d7294bd83..20c965d88db1 100644
--- a/net/gaim/files/patch-ac
+++ b/net/gaim/files/patch-ac
@@ -1,20 +1,76 @@
---- src/Makefile.in.orig Fri Mar 15 06:13:34 2002
-+++ src/Makefile.in Fri Mar 15 06:22:03 2002
-@@ -146,16 +146,74 @@
+--- src/Makefile.in.orig Tue Mar 5 21:07:43 2002
++++ src/Makefile.in Tue Mar 5 21:16:14 2002
+@@ -146,72 +146,75 @@
sedpath = @sedpath@
SUBDIRS = protocols
--@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet
+-@GNOMEAPPLET_TRUE@bin_PROGRAMS = @GNOMEAPPLET_TRUE@gaim_applet
+@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim
- @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim
--@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_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@bin_PROGRAMS = @GNOMEAPPLET_FALSE@gaim
+-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = @GNOMEAPPLET_TRUE@about.c \
+-@GNOMEAPPLET_TRUE@ aim.c \
+-@GNOMEAPPLET_TRUE@ applet.c \
+-@GNOMEAPPLET_TRUE@ away.c \
+-@GNOMEAPPLET_TRUE@ browser.c \
+-@GNOMEAPPLET_TRUE@ buddy.c \
+-@GNOMEAPPLET_TRUE@ buddy_chat.c \
+-@GNOMEAPPLET_TRUE@ conversation.c \
+-@GNOMEAPPLET_TRUE@ core.c \
+-@GNOMEAPPLET_TRUE@ dialogs.c \
+-@GNOMEAPPLET_TRUE@ gaimrc.c \
+-@GNOMEAPPLET_TRUE@ gtkimhtml.c \
+-@GNOMEAPPLET_TRUE@ gtkspell.c \
+-@GNOMEAPPLET_TRUE@ gtkticker.c \
+-@GNOMEAPPLET_TRUE@ html.c \
+-@GNOMEAPPLET_TRUE@ idle.c \
+-@GNOMEAPPLET_TRUE@ list.c \
+-@GNOMEAPPLET_TRUE@ md5.c \
+-@GNOMEAPPLET_TRUE@ module.c \
+-@GNOMEAPPLET_TRUE@ multi.c \
+-@GNOMEAPPLET_TRUE@ perl.c \
+-@GNOMEAPPLET_TRUE@ plugins.c \
+-@GNOMEAPPLET_TRUE@ prefs.c \
+-@GNOMEAPPLET_TRUE@ proxy.c \
+-@GNOMEAPPLET_TRUE@ prpl.c \
+-@GNOMEAPPLET_TRUE@ server.c \
+-@GNOMEAPPLET_TRUE@ sound.c \
+-@GNOMEAPPLET_TRUE@ ticker.c \
+-@GNOMEAPPLET_TRUE@ util.c
+-@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @GNOMEAPPLET_TRUE@@LIBOBJS@ $(STATIC_LINK_LIBS)
+-@GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = @GNOMEAPPLET_TRUE@-export-dynamic
+-@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @GNOMEAPPLET_TRUE@@LDADD@ @LIBOBJS@
+-@GNOMEAPPLET_FALSE@gaim_SOURCES = @GNOMEAPPLET_FALSE@about.c \
+-@GNOMEAPPLET_FALSE@ aim.c \
+-@GNOMEAPPLET_FALSE@ applet.c \
+-@GNOMEAPPLET_FALSE@ away.c \
+-@GNOMEAPPLET_FALSE@ browser.c \
+-@GNOMEAPPLET_FALSE@ buddy.c \
+-@GNOMEAPPLET_FALSE@ buddy_chat.c \
+-@GNOMEAPPLET_FALSE@ conversation.c \
+-@GNOMEAPPLET_FALSE@ core.c \
+-@GNOMEAPPLET_FALSE@ dialogs.c \
+-@GNOMEAPPLET_FALSE@ gaimrc.c \
+-@GNOMEAPPLET_FALSE@ gtkimhtml.c \
+-@GNOMEAPPLET_FALSE@ gtkspell.c \
+-@GNOMEAPPLET_FALSE@ gtkticker.c \
+-@GNOMEAPPLET_FALSE@ html.c \
+-@GNOMEAPPLET_FALSE@ idle.c \
+-@GNOMEAPPLET_FALSE@ list.c \
+-@GNOMEAPPLET_FALSE@ md5.c \
+-@GNOMEAPPLET_FALSE@ module.c \
+-@GNOMEAPPLET_FALSE@ multi.c \
+-@GNOMEAPPLET_FALSE@ perl.c \
+-@GNOMEAPPLET_FALSE@ plugins.c \
+-@GNOMEAPPLET_FALSE@ prefs.c \
+-@GNOMEAPPLET_FALSE@ proxy.c \
+-@GNOMEAPPLET_FALSE@ prpl.c \
+-@GNOMEAPPLET_FALSE@ server.c \
+-@GNOMEAPPLET_FALSE@ sound.c \
+-@GNOMEAPPLET_FALSE@ ticker.c \
+-@GNOMEAPPLET_FALSE@ util.c
+-@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @GNOMEAPPLET_FALSE@@LIBOBJS@ $(STATIC_LINK_LIBS)
+-@GNOMEAPPLET_FALSE@gaim_LDFLAGS = @GNOMEAPPLET_FALSE@-export-dynamic
+-@GNOMEAPPLET_FALSE@gaim_LDADD = @GNOMEAPPLET_FALSE@@LDADD@ @LIBOBJS@
+gaim_applet_SOURCES = about.c \
+ aim.c \
+ applet.c \
@@ -81,10 +137,11 @@
+gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
+gaim_LDFLAGS = -export-dynamic
+gaim_LDADD = @LDADD@ @LIBOBJS@
++
CFLAGS = @CFLAGS@ $(PERL_CFLAGS) -DLOCALEDIR=\"$(prefix)/share/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
-@@ -165,6 +223,7 @@
+@@ -235,6 +238,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
@@ -92,7 +149,7 @@
@GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-@@ -172,30 +231,34 @@
+@@ -242,30 +246,34 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index 4521eaf01b7a..034e8f7d90e5 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -24,11 +24,13 @@ lib/gaim/spellchk.so
%%GNOME:%%share/gnome/pixmaps/gaim/offline.png
%%GNOME:%%share/gnome/pixmaps/gaim/online.png
share/locale/bg/LC_MESSAGES/gaim.mo
+share/locale/cs/LC_MESSAGES/gaim.mo
share/locale/da/LC_MESSAGES/gaim.mo
share/locale/de/LC_MESSAGES/gaim.mo
share/locale/es/LC_MESSAGES/gaim.mo
share/locale/fi/LC_MESSAGES/gaim.mo
share/locale/fr/LC_MESSAGES/gaim.mo
+share/locale/hu/LC_MESSAGES/gaim.mo
share/locale/it/LC_MESSAGES/gaim.mo
share/locale/ja/LC_MESSAGES/gaim.mo
share/locale/ko/LC_MESSAGES/gaim.mo