diff options
-rw-r--r-- | net-im/gaim/Makefile | 8 | ||||
-rw-r--r-- | net-im/gaim/distinfo | 2 | ||||
-rw-r--r-- | net-im/gaim/files/patch-aa | 14 | ||||
-rw-r--r-- | net-im/gaim/files/patch-ac | 254 | ||||
-rw-r--r-- | net-im/gaim/files/patch-aim.c | 12 | ||||
-rw-r--r-- | net-im/gaim/files/patch-ltmain.sh | 3 | ||||
-rw-r--r-- | net-im/gaim/pkg-plist | 16 | ||||
-rw-r--r-- | net/gaim-snapshot/Makefile | 8 | ||||
-rw-r--r-- | net/gaim-snapshot/distinfo | 2 | ||||
-rw-r--r-- | net/gaim-snapshot/files/patch-aa | 14 | ||||
-rw-r--r-- | net/gaim-snapshot/files/patch-ac | 254 | ||||
-rw-r--r-- | net/gaim-snapshot/files/patch-aim.c | 12 | ||||
-rw-r--r-- | net/gaim-snapshot/files/patch-ltmain.sh | 3 | ||||
-rw-r--r-- | net/gaim-snapshot/pkg-plist | 16 | ||||
-rw-r--r-- | net/gaim/Makefile | 8 | ||||
-rw-r--r-- | net/gaim/distinfo | 2 | ||||
-rw-r--r-- | net/gaim/files/patch-aa | 14 | ||||
-rw-r--r-- | net/gaim/files/patch-ac | 254 | ||||
-rw-r--r-- | net/gaim/files/patch-aim.c | 12 | ||||
-rw-r--r-- | net/gaim/files/patch-ltmain.sh | 3 | ||||
-rw-r--r-- | net/gaim/pkg-plist | 16 |
21 files changed, 654 insertions, 273 deletions
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile index 31eff3e45d3e..7680aae53fc4 100644 --- a/net-im/gaim/Makefile +++ b/net-im/gaim/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gaim -PORTVERSION= 0.44 +PORTVERSION= 0.45 CATEGORIES= net MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ ${MASTER_SITE_SOURCEFORGE} @@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= jim@FreeBSD.org +BUILD_DEPENDS= ${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf + USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes @@ -43,8 +45,8 @@ CONFIGURE_ARGS+= --disable-esd .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${PERL} -pi.orig -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' diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo index bd7d6c1e9f30..e469b54c66d7 100644 --- a/net-im/gaim/distinfo +++ b/net-im/gaim/distinfo @@ -1 +1 @@ -MD5 (gaim-0.44.tar.bz2) = 1ca340c8ce0d0d704155852906b09fea +MD5 (gaim-0.45.tar.bz2) = 29890833ca0c67fac08f719767347ab9 diff --git a/net-im/gaim/files/patch-aa b/net-im/gaim/files/patch-aa index e01484100cf3..9a2521265f90 100644 --- a/net-im/gaim/files/patch-aa +++ b/net-im/gaim/files/patch-aa @@ -1,13 +1,13 @@ ---- Makefile.in.orig Tue Oct 3 03:12:14 2000 -+++ Makefile.in Tue Oct 3 03:13:14 2000 -@@ -156,8 +156,8 @@ - @GNOMEBITS_TRUE@bitssounddir = $(bitssysconf)/sound/events - @GNOMEBITS_TRUE@bitssound_DATA = gaim.soundlist - +--- Makefile.in.orig Wed Oct 10 16:33:04 2001 ++++ Makefile.in Wed Oct 10 16:34:22 2001 +@@ -191,8 +191,8 @@ + #bitssound_DATA = gaim.soundlist + # + #endif -pixmapdir = $(datadir)/apps/Internet -pixmap_DATA = gaim.desktop +@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet +@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop - SUBDIRS = m4 libfaim sounds plugins pixmaps doc po intl src + SUBDIRS = m4 sounds plugins pixmaps doc po intl src ACLOCAL_AMFLAGS = -I m4 diff --git a/net-im/gaim/files/patch-ac b/net-im/gaim/files/patch-ac index 810ee8926d7c..0cb9e3ab5d3a 100644 --- a/net-im/gaim/files/patch-ac +++ b/net-im/gaim/files/patch-ac @@ -1,75 +1,215 @@ ---- src/Makefile.in.orig Thu Aug 30 13:09:31 2001 -+++ src/Makefile.in Thu Aug 30 13:12:34 2001 -@@ -149,16 +149,16 @@ - sedpath = @sedpath@ +--- src/Makefile.in.orig Wed Oct 10 16:34:51 2001 ++++ src/Makefile.in Wed Oct 10 16:50:23 2001 +@@ -154,72 +154,72 @@ SUBDIRS = protocols + -@GNOMEAPPLET_TRUE@bin_PROGRAMS = 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 dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.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_SOURCES = 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@ 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 = @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 dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c +-@GNOMEAPPLET_FALSE@gaim_SOURCES = 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@ 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 = @LIBOBJS@ $(STATIC_LINK_LIBS) -@GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic -@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@ -+gaim_applet_SOURCES = about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c ++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 \ ++ module.c \ ++ multi.c \ ++ perl.c \ ++ plugins.c \ ++ prefs.c \ ++ proxy.c \ ++ prpl.c \ ++ server.c \ ++ sound.c \ ++ ticker.c \ ++ util.c ++ +gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) +gaim_applet_LDFLAGS = -export-dynamic +gaim_applet_LDADD = @LDADD@ @LIBOBJS@ -+gaim_SOURCES = about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c ++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 \ ++ module.c \ ++ multi.c \ ++ perl.c \ ++ plugins.c \ ++ prefs.c \ ++ proxy.c \ ++ prpl.c \ ++ server.c \ ++ sound.c \ ++ ticker.c \ ++ util.c ++ +gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) +gaim_LDFLAGS = -export-dynamic +gaim_LDADD = @LDADD@ @LIBOBJS@ - LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS) - # any other stuff -@@ -176,26 +176,26 @@ - DEFS = @DEFS@ -I. -I$(srcdir) -I.. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@conversation.$(OBJEXT) dialogs.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) html.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@idle.$(OBJEXT) multi.$(OBJEXT) perl.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@plugins.$(OBJEXT) prefs.$(OBJEXT) proxy.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@prpl.$(OBJEXT) server.$(OBJEXT) sound.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@ticker.$(OBJEXT) util.$(OBJEXT) --@GNOMEAPPLET_FALSE@gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@conversation.$(OBJEXT) dialogs.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@html.$(OBJEXT) idle.$(OBJEXT) multi.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@perl.$(OBJEXT) plugins.$(OBJEXT) prefs.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@proxy.$(OBJEXT) prpl.$(OBJEXT) server.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@sound.$(OBJEXT) ticker.$(OBJEXT) util.$(OBJEXT) -+gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ -+applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ -+buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ -+conversation.$(OBJEXT) dialogs.$(OBJEXT) \ -+gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ -+gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) html.$(OBJEXT) \ -+idle.$(OBJEXT) multi.$(OBJEXT) perl.$(OBJEXT) \ -+plugins.$(OBJEXT) prefs.$(OBJEXT) proxy.$(OBJEXT) \ -+prpl.$(OBJEXT) server.$(OBJEXT) sound.$(OBJEXT) \ -+ticker.$(OBJEXT) util.$(OBJEXT) -+gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ -+applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ -+buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ -+conversation.$(OBJEXT) dialogs.$(OBJEXT) \ -+gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ -+gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ -+html.$(OBJEXT) idle.$(OBJEXT) multi.$(OBJEXT) \ -+perl.$(OBJEXT) plugins.$(OBJEXT) prefs.$(OBJEXT) \ -+proxy.$(OBJEXT) prpl.$(OBJEXT) server.$(OBJEXT) \ -+sound.$(OBJEXT) ticker.$(OBJEXT) util.$(OBJEXT) - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) + EXTRA_DIST = applet.h \ + convo.h \ +@@ -240,44 +240,41 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT) ++@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT) gaim$(EXEEXT) + @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-@GNOMEAPPLET_TRUE@am_gaim_OBJECTS = +-@GNOMEAPPLET_FALSE@am_gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ applet.$(OBJEXT) away.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ browser.$(OBJEXT) buddy.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ core.$(OBJEXT) dialogs.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ module.$(OBJEXT) multi.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ perl.$(OBJEXT) plugins.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ prefs.$(OBJEXT) proxy.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ prpl.$(OBJEXT) server.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ sound.$(OBJEXT) ticker.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ util.$(OBJEXT) ++am_gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ ++ applet.$(OBJEXT) away.$(OBJEXT) \ ++ browser.$(OBJEXT) buddy.$(OBJEXT) \ ++ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ ++ core.$(OBJEXT) dialogs.$(OBJEXT) \ ++ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ ++ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ ++ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ ++ module.$(OBJEXT) multi.$(OBJEXT) \ ++ perl.$(OBJEXT) plugins.$(OBJEXT) \ ++ prefs.$(OBJEXT) proxy.$(OBJEXT) \ ++ prpl.$(OBJEXT) server.$(OBJEXT) \ ++ sound.$(OBJEXT) ticker.$(OBJEXT) \ ++ util.$(OBJEXT) + gaim_OBJECTS = $(am_gaim_OBJECTS) +-@GNOMEAPPLET_TRUE@gaim_DEPENDENCIES = +-@GNOMEAPPLET_TRUE@am_gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ applet.$(OBJEXT) away.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ browser.$(OBJEXT) buddy.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ core.$(OBJEXT) dialogs.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ module.$(OBJEXT) multi.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ perl.$(OBJEXT) plugins.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ prefs.$(OBJEXT) proxy.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ prpl.$(OBJEXT) server.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ sound.$(OBJEXT) ticker.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ util.$(OBJEXT) +-@GNOMEAPPLET_FALSE@am_gaim_applet_OBJECTS = ++ ++am_gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ ++ applet.$(OBJEXT) away.$(OBJEXT) \ ++ browser.$(OBJEXT) buddy.$(OBJEXT) \ ++ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ ++ core.$(OBJEXT) dialogs.$(OBJEXT) \ ++ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ ++ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ ++ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ ++ module.$(OBJEXT) multi.$(OBJEXT) \ ++ perl.$(OBJEXT) plugins.$(OBJEXT) \ ++ prefs.$(OBJEXT) proxy.$(OBJEXT) \ ++ prpl.$(OBJEXT) server.$(OBJEXT) \ ++ sound.$(OBJEXT) ticker.$(OBJEXT) \ ++ util.$(OBJEXT) + gaim_applet_OBJECTS = $(am_gaim_applet_OBJECTS) +-@GNOMEAPPLET_FALSE@gaim_applet_DEPENDENCIES = + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) diff --git a/net-im/gaim/files/patch-aim.c b/net-im/gaim/files/patch-aim.c index 71b1110a00fe..e69de29bb2d1 100644 --- a/net-im/gaim/files/patch-aim.c +++ b/net-im/gaim/files/patch-aim.c @@ -1,12 +0,0 @@ ---- src/aim.c.orig Fri Aug 31 20:15:17 2001 -+++ src/aim.c Fri Aug 31 20:15:39 2001 -@@ -54,9 +54,7 @@ - #include "locale.h" - #include "gtkticker.h" - #include "gtkspell.h" --#ifndef USE_APPLET - #include <getopt.h> --#endif - - static gchar *ispell_cmd[] = { "ispell", "-a", NULL }; - diff --git a/net-im/gaim/files/patch-ltmain.sh b/net-im/gaim/files/patch-ltmain.sh index 293fce173a52..0facf3ef6cdf 100644 --- a/net-im/gaim/files/patch-ltmain.sh +++ b/net-im/gaim/files/patch-ltmain.sh @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- ltmain.sh 2001/08/31 17:32:22 1.1 +++ ltmain.sh 2001/08/31 17:32:44 @@ -4673,10 +4673,12 @@ diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist index 34c245cc896d..e50df356ad66 100644 --- a/net-im/gaim/pkg-plist +++ b/net-im/gaim/pkg-plist @@ -5,20 +5,14 @@ lib/gaim/autorecon.so lib/gaim/chatlist.so lib/gaim/iconaway.so lib/gaim/lagmeter.so +lib/gaim/libgg.so lib/gaim/libicq.so -lib/gaim/libicq.so.0 lib/gaim/libirc.so -lib/gaim/libirc.so.0 lib/gaim/libjabber.so -lib/gaim/libjabber.so.0 +lib/gaim/libmsn.so lib/gaim/libnapster.so -lib/gaim/libnapster.so.0 lib/gaim/libyahoo.so -lib/gaim/libyahoo.so.0 -lib/gaim/libmsn.so -lib/gaim/libmsn.so.0 lib/gaim/libzephyr.so -lib/gaim/libzephyr.so.0 lib/gaim/notify.so lib/gaim/spellchk.so %%DATADIR%%/pixmaps/gaim/ab.xpm @@ -49,6 +43,7 @@ lib/gaim/spellchk.so %%DATADIR%%/pixmaps/gaim/crazy4.xpm %%DATADIR%%/pixmaps/gaim/crossedlips.xpm %%DATADIR%%/pixmaps/gaim/cry.xpm +%%DATADIR%%/pixmaps/gaim/download.xpm %%DATADIR%%/pixmaps/gaim/dt_icon.xpm %%DATADIR%%/pixmaps/gaim/embarrassed.xpm %%DATADIR%%/pixmaps/gaim/exit_small.xpm @@ -57,6 +52,10 @@ lib/gaim/spellchk.so %%DATADIR%%/pixmaps/gaim/fontface2.xpm %%DATADIR%%/pixmaps/gaim/free_icon.xpm %%DATADIR%%/pixmaps/gaim/gaim.xpm +%%DATADIR%%/pixmaps/gaim/gg_suncloud.xpm +%%DATADIR%%/pixmaps/gaim/gg_sunred.xpm +%%DATADIR%%/pixmaps/gaim/gg_sunwhitered.xpm +%%DATADIR%%/pixmaps/gaim/gg_sunyellow.xpm %%DATADIR%%/pixmaps/gaim/gnomeicu-away.xpm %%DATADIR%%/pixmaps/gaim/gnomeicu-dnd.xpm %%DATADIR%%/pixmaps/gaim/gnomeicu-ffc.xpm @@ -126,6 +125,7 @@ share/locale/de/LC_MESSAGES/gaim.mo share/locale/es/LC_MESSAGES/gaim.mo share/locale/fr/LC_MESSAGES/gaim.mo share/locale/ko/LC_MESSAGES/gaim.mo +share/locale/pl/LC_MESSAGES/gaim.mo share/locale/ru/LC_MESSAGES/gaim.mo share/locale/zh_CN/LC_MESSAGES/gaim.mo @dirrm %%DATADIR%%/pixmaps/gaim/gnome diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile index 31eff3e45d3e..7680aae53fc4 100644 --- a/net/gaim-snapshot/Makefile +++ b/net/gaim-snapshot/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gaim -PORTVERSION= 0.44 +PORTVERSION= 0.45 CATEGORIES= net MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ ${MASTER_SITE_SOURCEFORGE} @@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= jim@FreeBSD.org +BUILD_DEPENDS= ${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf + USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes @@ -43,8 +45,8 @@ CONFIGURE_ARGS+= --disable-esd .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${PERL} -pi.orig -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' diff --git a/net/gaim-snapshot/distinfo b/net/gaim-snapshot/distinfo index bd7d6c1e9f30..e469b54c66d7 100644 --- a/net/gaim-snapshot/distinfo +++ b/net/gaim-snapshot/distinfo @@ -1 +1 @@ -MD5 (gaim-0.44.tar.bz2) = 1ca340c8ce0d0d704155852906b09fea +MD5 (gaim-0.45.tar.bz2) = 29890833ca0c67fac08f719767347ab9 diff --git a/net/gaim-snapshot/files/patch-aa b/net/gaim-snapshot/files/patch-aa index e01484100cf3..9a2521265f90 100644 --- a/net/gaim-snapshot/files/patch-aa +++ b/net/gaim-snapshot/files/patch-aa @@ -1,13 +1,13 @@ ---- Makefile.in.orig Tue Oct 3 03:12:14 2000 -+++ Makefile.in Tue Oct 3 03:13:14 2000 -@@ -156,8 +156,8 @@ - @GNOMEBITS_TRUE@bitssounddir = $(bitssysconf)/sound/events - @GNOMEBITS_TRUE@bitssound_DATA = gaim.soundlist - +--- Makefile.in.orig Wed Oct 10 16:33:04 2001 ++++ Makefile.in Wed Oct 10 16:34:22 2001 +@@ -191,8 +191,8 @@ + #bitssound_DATA = gaim.soundlist + # + #endif -pixmapdir = $(datadir)/apps/Internet -pixmap_DATA = gaim.desktop +@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet +@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop - SUBDIRS = m4 libfaim sounds plugins pixmaps doc po intl src + SUBDIRS = m4 sounds plugins pixmaps doc po intl src ACLOCAL_AMFLAGS = -I m4 diff --git a/net/gaim-snapshot/files/patch-ac b/net/gaim-snapshot/files/patch-ac index 810ee8926d7c..0cb9e3ab5d3a 100644 --- a/net/gaim-snapshot/files/patch-ac +++ b/net/gaim-snapshot/files/patch-ac @@ -1,75 +1,215 @@ ---- src/Makefile.in.orig Thu Aug 30 13:09:31 2001 -+++ src/Makefile.in Thu Aug 30 13:12:34 2001 -@@ -149,16 +149,16 @@ - sedpath = @sedpath@ +--- src/Makefile.in.orig Wed Oct 10 16:34:51 2001 ++++ src/Makefile.in Wed Oct 10 16:50:23 2001 +@@ -154,72 +154,72 @@ SUBDIRS = protocols + -@GNOMEAPPLET_TRUE@bin_PROGRAMS = 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 dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.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_SOURCES = 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@ 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 = @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 dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c +-@GNOMEAPPLET_FALSE@gaim_SOURCES = 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@ 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 = @LIBOBJS@ $(STATIC_LINK_LIBS) -@GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic -@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@ -+gaim_applet_SOURCES = about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c ++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 \ ++ module.c \ ++ multi.c \ ++ perl.c \ ++ plugins.c \ ++ prefs.c \ ++ proxy.c \ ++ prpl.c \ ++ server.c \ ++ sound.c \ ++ ticker.c \ ++ util.c ++ +gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) +gaim_applet_LDFLAGS = -export-dynamic +gaim_applet_LDADD = @LDADD@ @LIBOBJS@ -+gaim_SOURCES = about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c ++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 \ ++ module.c \ ++ multi.c \ ++ perl.c \ ++ plugins.c \ ++ prefs.c \ ++ proxy.c \ ++ prpl.c \ ++ server.c \ ++ sound.c \ ++ ticker.c \ ++ util.c ++ +gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) +gaim_LDFLAGS = -export-dynamic +gaim_LDADD = @LDADD@ @LIBOBJS@ - LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS) - # any other stuff -@@ -176,26 +176,26 @@ - DEFS = @DEFS@ -I. -I$(srcdir) -I.. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@conversation.$(OBJEXT) dialogs.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) html.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@idle.$(OBJEXT) multi.$(OBJEXT) perl.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@plugins.$(OBJEXT) prefs.$(OBJEXT) proxy.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@prpl.$(OBJEXT) server.$(OBJEXT) sound.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@ticker.$(OBJEXT) util.$(OBJEXT) --@GNOMEAPPLET_FALSE@gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@conversation.$(OBJEXT) dialogs.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@html.$(OBJEXT) idle.$(OBJEXT) multi.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@perl.$(OBJEXT) plugins.$(OBJEXT) prefs.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@proxy.$(OBJEXT) prpl.$(OBJEXT) server.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@sound.$(OBJEXT) ticker.$(OBJEXT) util.$(OBJEXT) -+gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ -+applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ -+buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ -+conversation.$(OBJEXT) dialogs.$(OBJEXT) \ -+gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ -+gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) html.$(OBJEXT) \ -+idle.$(OBJEXT) multi.$(OBJEXT) perl.$(OBJEXT) \ -+plugins.$(OBJEXT) prefs.$(OBJEXT) proxy.$(OBJEXT) \ -+prpl.$(OBJEXT) server.$(OBJEXT) sound.$(OBJEXT) \ -+ticker.$(OBJEXT) util.$(OBJEXT) -+gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ -+applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ -+buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ -+conversation.$(OBJEXT) dialogs.$(OBJEXT) \ -+gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ -+gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ -+html.$(OBJEXT) idle.$(OBJEXT) multi.$(OBJEXT) \ -+perl.$(OBJEXT) plugins.$(OBJEXT) prefs.$(OBJEXT) \ -+proxy.$(OBJEXT) prpl.$(OBJEXT) server.$(OBJEXT) \ -+sound.$(OBJEXT) ticker.$(OBJEXT) util.$(OBJEXT) - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) + EXTRA_DIST = applet.h \ + convo.h \ +@@ -240,44 +240,41 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT) ++@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT) gaim$(EXEEXT) + @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-@GNOMEAPPLET_TRUE@am_gaim_OBJECTS = +-@GNOMEAPPLET_FALSE@am_gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ applet.$(OBJEXT) away.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ browser.$(OBJEXT) buddy.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ core.$(OBJEXT) dialogs.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ module.$(OBJEXT) multi.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ perl.$(OBJEXT) plugins.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ prefs.$(OBJEXT) proxy.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ prpl.$(OBJEXT) server.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ sound.$(OBJEXT) ticker.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ util.$(OBJEXT) ++am_gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ ++ applet.$(OBJEXT) away.$(OBJEXT) \ ++ browser.$(OBJEXT) buddy.$(OBJEXT) \ ++ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ ++ core.$(OBJEXT) dialogs.$(OBJEXT) \ ++ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ ++ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ ++ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ ++ module.$(OBJEXT) multi.$(OBJEXT) \ ++ perl.$(OBJEXT) plugins.$(OBJEXT) \ ++ prefs.$(OBJEXT) proxy.$(OBJEXT) \ ++ prpl.$(OBJEXT) server.$(OBJEXT) \ ++ sound.$(OBJEXT) ticker.$(OBJEXT) \ ++ util.$(OBJEXT) + gaim_OBJECTS = $(am_gaim_OBJECTS) +-@GNOMEAPPLET_TRUE@gaim_DEPENDENCIES = +-@GNOMEAPPLET_TRUE@am_gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ applet.$(OBJEXT) away.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ browser.$(OBJEXT) buddy.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ core.$(OBJEXT) dialogs.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ module.$(OBJEXT) multi.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ perl.$(OBJEXT) plugins.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ prefs.$(OBJEXT) proxy.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ prpl.$(OBJEXT) server.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ sound.$(OBJEXT) ticker.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ util.$(OBJEXT) +-@GNOMEAPPLET_FALSE@am_gaim_applet_OBJECTS = ++ ++am_gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ ++ applet.$(OBJEXT) away.$(OBJEXT) \ ++ browser.$(OBJEXT) buddy.$(OBJEXT) \ ++ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ ++ core.$(OBJEXT) dialogs.$(OBJEXT) \ ++ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ ++ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ ++ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ ++ module.$(OBJEXT) multi.$(OBJEXT) \ ++ perl.$(OBJEXT) plugins.$(OBJEXT) \ ++ prefs.$(OBJEXT) proxy.$(OBJEXT) \ ++ prpl.$(OBJEXT) server.$(OBJEXT) \ ++ sound.$(OBJEXT) ticker.$(OBJEXT) \ ++ util.$(OBJEXT) + gaim_applet_OBJECTS = $(am_gaim_applet_OBJECTS) +-@GNOMEAPPLET_FALSE@gaim_applet_DEPENDENCIES = + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) diff --git a/net/gaim-snapshot/files/patch-aim.c b/net/gaim-snapshot/files/patch-aim.c index 71b1110a00fe..e69de29bb2d1 100644 --- a/net/gaim-snapshot/files/patch-aim.c +++ b/net/gaim-snapshot/files/patch-aim.c @@ -1,12 +0,0 @@ ---- src/aim.c.orig Fri Aug 31 20:15:17 2001 -+++ src/aim.c Fri Aug 31 20:15:39 2001 -@@ -54,9 +54,7 @@ - #include "locale.h" - #include "gtkticker.h" - #include "gtkspell.h" --#ifndef USE_APPLET - #include <getopt.h> --#endif - - static gchar *ispell_cmd[] = { "ispell", "-a", NULL }; - diff --git a/net/gaim-snapshot/files/patch-ltmain.sh b/net/gaim-snapshot/files/patch-ltmain.sh index 293fce173a52..0facf3ef6cdf 100644 --- a/net/gaim-snapshot/files/patch-ltmain.sh +++ b/net/gaim-snapshot/files/patch-ltmain.sh @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- ltmain.sh 2001/08/31 17:32:22 1.1 +++ ltmain.sh 2001/08/31 17:32:44 @@ -4673,10 +4673,12 @@ diff --git a/net/gaim-snapshot/pkg-plist b/net/gaim-snapshot/pkg-plist index 34c245cc896d..e50df356ad66 100644 --- a/net/gaim-snapshot/pkg-plist +++ b/net/gaim-snapshot/pkg-plist @@ -5,20 +5,14 @@ lib/gaim/autorecon.so lib/gaim/chatlist.so lib/gaim/iconaway.so lib/gaim/lagmeter.so +lib/gaim/libgg.so lib/gaim/libicq.so -lib/gaim/libicq.so.0 lib/gaim/libirc.so -lib/gaim/libirc.so.0 lib/gaim/libjabber.so -lib/gaim/libjabber.so.0 +lib/gaim/libmsn.so lib/gaim/libnapster.so -lib/gaim/libnapster.so.0 lib/gaim/libyahoo.so -lib/gaim/libyahoo.so.0 -lib/gaim/libmsn.so -lib/gaim/libmsn.so.0 lib/gaim/libzephyr.so -lib/gaim/libzephyr.so.0 lib/gaim/notify.so lib/gaim/spellchk.so %%DATADIR%%/pixmaps/gaim/ab.xpm @@ -49,6 +43,7 @@ lib/gaim/spellchk.so %%DATADIR%%/pixmaps/gaim/crazy4.xpm %%DATADIR%%/pixmaps/gaim/crossedlips.xpm %%DATADIR%%/pixmaps/gaim/cry.xpm +%%DATADIR%%/pixmaps/gaim/download.xpm %%DATADIR%%/pixmaps/gaim/dt_icon.xpm %%DATADIR%%/pixmaps/gaim/embarrassed.xpm %%DATADIR%%/pixmaps/gaim/exit_small.xpm @@ -57,6 +52,10 @@ lib/gaim/spellchk.so %%DATADIR%%/pixmaps/gaim/fontface2.xpm %%DATADIR%%/pixmaps/gaim/free_icon.xpm %%DATADIR%%/pixmaps/gaim/gaim.xpm +%%DATADIR%%/pixmaps/gaim/gg_suncloud.xpm +%%DATADIR%%/pixmaps/gaim/gg_sunred.xpm +%%DATADIR%%/pixmaps/gaim/gg_sunwhitered.xpm +%%DATADIR%%/pixmaps/gaim/gg_sunyellow.xpm %%DATADIR%%/pixmaps/gaim/gnomeicu-away.xpm %%DATADIR%%/pixmaps/gaim/gnomeicu-dnd.xpm %%DATADIR%%/pixmaps/gaim/gnomeicu-ffc.xpm @@ -126,6 +125,7 @@ share/locale/de/LC_MESSAGES/gaim.mo share/locale/es/LC_MESSAGES/gaim.mo share/locale/fr/LC_MESSAGES/gaim.mo share/locale/ko/LC_MESSAGES/gaim.mo +share/locale/pl/LC_MESSAGES/gaim.mo share/locale/ru/LC_MESSAGES/gaim.mo share/locale/zh_CN/LC_MESSAGES/gaim.mo @dirrm %%DATADIR%%/pixmaps/gaim/gnome diff --git a/net/gaim/Makefile b/net/gaim/Makefile index 31eff3e45d3e..7680aae53fc4 100644 --- a/net/gaim/Makefile +++ b/net/gaim/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gaim -PORTVERSION= 0.44 +PORTVERSION= 0.45 CATEGORIES= net MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ ${MASTER_SITE_SOURCEFORGE} @@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= jim@FreeBSD.org +BUILD_DEPENDS= ${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf + USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes @@ -43,8 +45,8 @@ CONFIGURE_ARGS+= --disable-esd .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${PERL} -pi.orig -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' diff --git a/net/gaim/distinfo b/net/gaim/distinfo index bd7d6c1e9f30..e469b54c66d7 100644 --- a/net/gaim/distinfo +++ b/net/gaim/distinfo @@ -1 +1 @@ -MD5 (gaim-0.44.tar.bz2) = 1ca340c8ce0d0d704155852906b09fea +MD5 (gaim-0.45.tar.bz2) = 29890833ca0c67fac08f719767347ab9 diff --git a/net/gaim/files/patch-aa b/net/gaim/files/patch-aa index e01484100cf3..9a2521265f90 100644 --- a/net/gaim/files/patch-aa +++ b/net/gaim/files/patch-aa @@ -1,13 +1,13 @@ ---- Makefile.in.orig Tue Oct 3 03:12:14 2000 -+++ Makefile.in Tue Oct 3 03:13:14 2000 -@@ -156,8 +156,8 @@ - @GNOMEBITS_TRUE@bitssounddir = $(bitssysconf)/sound/events - @GNOMEBITS_TRUE@bitssound_DATA = gaim.soundlist - +--- Makefile.in.orig Wed Oct 10 16:33:04 2001 ++++ Makefile.in Wed Oct 10 16:34:22 2001 +@@ -191,8 +191,8 @@ + #bitssound_DATA = gaim.soundlist + # + #endif -pixmapdir = $(datadir)/apps/Internet -pixmap_DATA = gaim.desktop +@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet +@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop - SUBDIRS = m4 libfaim sounds plugins pixmaps doc po intl src + SUBDIRS = m4 sounds plugins pixmaps doc po intl src ACLOCAL_AMFLAGS = -I m4 diff --git a/net/gaim/files/patch-ac b/net/gaim/files/patch-ac index 810ee8926d7c..0cb9e3ab5d3a 100644 --- a/net/gaim/files/patch-ac +++ b/net/gaim/files/patch-ac @@ -1,75 +1,215 @@ ---- src/Makefile.in.orig Thu Aug 30 13:09:31 2001 -+++ src/Makefile.in Thu Aug 30 13:12:34 2001 -@@ -149,16 +149,16 @@ - sedpath = @sedpath@ +--- src/Makefile.in.orig Wed Oct 10 16:34:51 2001 ++++ src/Makefile.in Wed Oct 10 16:50:23 2001 +@@ -154,72 +154,72 @@ SUBDIRS = protocols + -@GNOMEAPPLET_TRUE@bin_PROGRAMS = 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 dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.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_SOURCES = 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@ 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 = @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 dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c +-@GNOMEAPPLET_FALSE@gaim_SOURCES = 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@ 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 = @LIBOBJS@ $(STATIC_LINK_LIBS) -@GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic -@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@ -+gaim_applet_SOURCES = about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c ++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 \ ++ module.c \ ++ multi.c \ ++ perl.c \ ++ plugins.c \ ++ prefs.c \ ++ proxy.c \ ++ prpl.c \ ++ server.c \ ++ sound.c \ ++ ticker.c \ ++ util.c ++ +gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) +gaim_applet_LDFLAGS = -export-dynamic +gaim_applet_LDADD = @LDADD@ @LIBOBJS@ -+gaim_SOURCES = about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c ++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 \ ++ module.c \ ++ multi.c \ ++ perl.c \ ++ plugins.c \ ++ prefs.c \ ++ proxy.c \ ++ prpl.c \ ++ server.c \ ++ sound.c \ ++ ticker.c \ ++ util.c ++ +gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) +gaim_LDFLAGS = -export-dynamic +gaim_LDADD = @LDADD@ @LIBOBJS@ - LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS) - # any other stuff -@@ -176,26 +176,26 @@ - DEFS = @DEFS@ -I. -I$(srcdir) -I.. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@conversation.$(OBJEXT) dialogs.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) html.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@idle.$(OBJEXT) multi.$(OBJEXT) perl.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@plugins.$(OBJEXT) prefs.$(OBJEXT) proxy.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@prpl.$(OBJEXT) server.$(OBJEXT) sound.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@ticker.$(OBJEXT) util.$(OBJEXT) --@GNOMEAPPLET_FALSE@gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@conversation.$(OBJEXT) dialogs.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@html.$(OBJEXT) idle.$(OBJEXT) multi.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@perl.$(OBJEXT) plugins.$(OBJEXT) prefs.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@proxy.$(OBJEXT) prpl.$(OBJEXT) server.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@sound.$(OBJEXT) ticker.$(OBJEXT) util.$(OBJEXT) -+gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ -+applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ -+buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ -+conversation.$(OBJEXT) dialogs.$(OBJEXT) \ -+gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ -+gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) html.$(OBJEXT) \ -+idle.$(OBJEXT) multi.$(OBJEXT) perl.$(OBJEXT) \ -+plugins.$(OBJEXT) prefs.$(OBJEXT) proxy.$(OBJEXT) \ -+prpl.$(OBJEXT) server.$(OBJEXT) sound.$(OBJEXT) \ -+ticker.$(OBJEXT) util.$(OBJEXT) -+gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ -+applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \ -+buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \ -+conversation.$(OBJEXT) dialogs.$(OBJEXT) \ -+gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ -+gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ -+html.$(OBJEXT) idle.$(OBJEXT) multi.$(OBJEXT) \ -+perl.$(OBJEXT) plugins.$(OBJEXT) prefs.$(OBJEXT) \ -+proxy.$(OBJEXT) prpl.$(OBJEXT) server.$(OBJEXT) \ -+sound.$(OBJEXT) ticker.$(OBJEXT) util.$(OBJEXT) - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) + EXTRA_DIST = applet.h \ + convo.h \ +@@ -240,44 +240,41 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT) ++@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT) gaim$(EXEEXT) + @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-@GNOMEAPPLET_TRUE@am_gaim_OBJECTS = +-@GNOMEAPPLET_FALSE@am_gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ applet.$(OBJEXT) away.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ browser.$(OBJEXT) buddy.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ core.$(OBJEXT) dialogs.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ module.$(OBJEXT) multi.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ perl.$(OBJEXT) plugins.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ prefs.$(OBJEXT) proxy.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ prpl.$(OBJEXT) server.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ sound.$(OBJEXT) ticker.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@ util.$(OBJEXT) ++am_gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ ++ applet.$(OBJEXT) away.$(OBJEXT) \ ++ browser.$(OBJEXT) buddy.$(OBJEXT) \ ++ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ ++ core.$(OBJEXT) dialogs.$(OBJEXT) \ ++ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ ++ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ ++ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ ++ module.$(OBJEXT) multi.$(OBJEXT) \ ++ perl.$(OBJEXT) plugins.$(OBJEXT) \ ++ prefs.$(OBJEXT) proxy.$(OBJEXT) \ ++ prpl.$(OBJEXT) server.$(OBJEXT) \ ++ sound.$(OBJEXT) ticker.$(OBJEXT) \ ++ util.$(OBJEXT) + gaim_OBJECTS = $(am_gaim_OBJECTS) +-@GNOMEAPPLET_TRUE@gaim_DEPENDENCIES = +-@GNOMEAPPLET_TRUE@am_gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ applet.$(OBJEXT) away.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ browser.$(OBJEXT) buddy.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ core.$(OBJEXT) dialogs.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ module.$(OBJEXT) multi.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ perl.$(OBJEXT) plugins.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ prefs.$(OBJEXT) proxy.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ prpl.$(OBJEXT) server.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ sound.$(OBJEXT) ticker.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@ util.$(OBJEXT) +-@GNOMEAPPLET_FALSE@am_gaim_applet_OBJECTS = ++ ++am_gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \ ++ applet.$(OBJEXT) away.$(OBJEXT) \ ++ browser.$(OBJEXT) buddy.$(OBJEXT) \ ++ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \ ++ core.$(OBJEXT) dialogs.$(OBJEXT) \ ++ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \ ++ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \ ++ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \ ++ module.$(OBJEXT) multi.$(OBJEXT) \ ++ perl.$(OBJEXT) plugins.$(OBJEXT) \ ++ prefs.$(OBJEXT) proxy.$(OBJEXT) \ ++ prpl.$(OBJEXT) server.$(OBJEXT) \ ++ sound.$(OBJEXT) ticker.$(OBJEXT) \ ++ util.$(OBJEXT) + gaim_applet_OBJECTS = $(am_gaim_applet_OBJECTS) +-@GNOMEAPPLET_FALSE@gaim_applet_DEPENDENCIES = + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) diff --git a/net/gaim/files/patch-aim.c b/net/gaim/files/patch-aim.c index 71b1110a00fe..e69de29bb2d1 100644 --- a/net/gaim/files/patch-aim.c +++ b/net/gaim/files/patch-aim.c @@ -1,12 +0,0 @@ ---- src/aim.c.orig Fri Aug 31 20:15:17 2001 -+++ src/aim.c Fri Aug 31 20:15:39 2001 -@@ -54,9 +54,7 @@ - #include "locale.h" - #include "gtkticker.h" - #include "gtkspell.h" --#ifndef USE_APPLET - #include <getopt.h> --#endif - - static gchar *ispell_cmd[] = { "ispell", "-a", NULL }; - diff --git a/net/gaim/files/patch-ltmain.sh b/net/gaim/files/patch-ltmain.sh index 293fce173a52..0facf3ef6cdf 100644 --- a/net/gaim/files/patch-ltmain.sh +++ b/net/gaim/files/patch-ltmain.sh @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- ltmain.sh 2001/08/31 17:32:22 1.1 +++ ltmain.sh 2001/08/31 17:32:44 @@ -4673,10 +4673,12 @@ diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist index 34c245cc896d..e50df356ad66 100644 --- a/net/gaim/pkg-plist +++ b/net/gaim/pkg-plist @@ -5,20 +5,14 @@ lib/gaim/autorecon.so lib/gaim/chatlist.so lib/gaim/iconaway.so lib/gaim/lagmeter.so +lib/gaim/libgg.so lib/gaim/libicq.so -lib/gaim/libicq.so.0 lib/gaim/libirc.so -lib/gaim/libirc.so.0 lib/gaim/libjabber.so -lib/gaim/libjabber.so.0 +lib/gaim/libmsn.so lib/gaim/libnapster.so -lib/gaim/libnapster.so.0 lib/gaim/libyahoo.so -lib/gaim/libyahoo.so.0 -lib/gaim/libmsn.so -lib/gaim/libmsn.so.0 lib/gaim/libzephyr.so -lib/gaim/libzephyr.so.0 lib/gaim/notify.so lib/gaim/spellchk.so %%DATADIR%%/pixmaps/gaim/ab.xpm @@ -49,6 +43,7 @@ lib/gaim/spellchk.so %%DATADIR%%/pixmaps/gaim/crazy4.xpm %%DATADIR%%/pixmaps/gaim/crossedlips.xpm %%DATADIR%%/pixmaps/gaim/cry.xpm +%%DATADIR%%/pixmaps/gaim/download.xpm %%DATADIR%%/pixmaps/gaim/dt_icon.xpm %%DATADIR%%/pixmaps/gaim/embarrassed.xpm %%DATADIR%%/pixmaps/gaim/exit_small.xpm @@ -57,6 +52,10 @@ lib/gaim/spellchk.so %%DATADIR%%/pixmaps/gaim/fontface2.xpm %%DATADIR%%/pixmaps/gaim/free_icon.xpm %%DATADIR%%/pixmaps/gaim/gaim.xpm +%%DATADIR%%/pixmaps/gaim/gg_suncloud.xpm +%%DATADIR%%/pixmaps/gaim/gg_sunred.xpm +%%DATADIR%%/pixmaps/gaim/gg_sunwhitered.xpm +%%DATADIR%%/pixmaps/gaim/gg_sunyellow.xpm %%DATADIR%%/pixmaps/gaim/gnomeicu-away.xpm %%DATADIR%%/pixmaps/gaim/gnomeicu-dnd.xpm %%DATADIR%%/pixmaps/gaim/gnomeicu-ffc.xpm @@ -126,6 +125,7 @@ share/locale/de/LC_MESSAGES/gaim.mo share/locale/es/LC_MESSAGES/gaim.mo share/locale/fr/LC_MESSAGES/gaim.mo share/locale/ko/LC_MESSAGES/gaim.mo +share/locale/pl/LC_MESSAGES/gaim.mo share/locale/ru/LC_MESSAGES/gaim.mo share/locale/zh_CN/LC_MESSAGES/gaim.mo @dirrm %%DATADIR%%/pixmaps/gaim/gnome |