From owner-freebsd-ports Wed Oct 10 14:50:39 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4631637B406 for ; Wed, 10 Oct 2001 14:50:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f9ALo1C58163; Wed, 10 Oct 2001 14:50:01 -0700 (PDT) (envelope-from gnats) Received: from cc92687-a.wlgrv1.pa.home.com (cc92687-a.wlgrv1.pa.home.com [24.5.63.190]) by hub.freebsd.org (Postfix) with ESMTP id 7F87F37B405; Wed, 10 Oct 2001 14:42:19 -0700 (PDT) Received: (from root@localhost) by cc92687-a.wlgrv1.pa.home.com (8.11.6/8.11.6) id f9ALgIm95851; Wed, 10 Oct 2001 17:42:18 -0400 (EDT) (envelope-from pat) Message-Id: <200110102142.f9ALgIm95851@cc92687-a.wlgrv1.pa.home.com> Date: Wed, 10 Oct 2001 17:42:18 -0400 (EDT) From: Patrick Li Reply-To: Patrick Li To: FreeBSD-gnats-submit@freebsd.org Cc: jim@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/31209: Update port: net/gaim Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 31209 >Category: ports >Synopsis: Update port: net/gaim >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 10 14:50:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Patrick Li >Release: FreeBSD 4.4-STABLE i386 >Organization: N/A >Environment: System: FreeBSD bottlenek 4.4-STABLE FreeBSD 4.4-STABLE #0: Sat Sep 29 17:22:31 EDT 2001 root@bottlenek:/usr/src/sys/compile/BOTTLENEK i386 >Description: - Update gaim to version 0.45 - Delete files/patch-aim.c - Add depends for gdk-pixbuf (for non-gnome users) - Do proper substitution in patch - PR ports/30465 is now obsolete >How-To-Repeat: N/A >Fix: diff -ruN /usr/ports/net/gaim/Makefile gaim/Makefile --- /usr/ports/net/gaim/Makefile Fri Sep 21 05:06:25 2001 +++ gaim/Makefile Wed Oct 10 17:29:58 2001 @@ -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 @@ 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 @@ .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 -ruN /usr/ports/net/gaim/distinfo gaim/distinfo --- /usr/ports/net/gaim/distinfo Fri Sep 21 05:06:25 2001 +++ gaim/distinfo Wed Oct 10 16:31:34 2001 @@ -1 +1 @@ -MD5 (gaim-0.44.tar.bz2) = 1ca340c8ce0d0d704155852906b09fea +MD5 (gaim-0.45.tar.bz2) = 29890833ca0c67fac08f719767347ab9 diff -ruN /usr/ports/net/gaim/files/patch-aa gaim/files/patch-aa --- /usr/ports/net/gaim/files/patch-aa Thu Oct 5 03:22:45 2000 +++ gaim/files/patch-aa Wed Oct 10 16:34:36 2001 @@ -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 -ruN /usr/ports/net/gaim/files/patch-ac gaim/files/patch-ac --- /usr/ports/net/gaim/files/patch-ac Thu Aug 30 16:30:48 2001 +++ gaim/files/patch-ac Wed Oct 10 16:50:52 2001 @@ -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 -ruN /usr/ports/net/gaim/files/patch-aim.c gaim/files/patch-aim.c --- /usr/ports/net/gaim/files/patch-aim.c Sat Sep 1 14:06:26 2001 +++ gaim/files/patch-aim.c Wed Dec 31 19:00:00 1969 @@ -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 --#endif - - static gchar *ispell_cmd[] = { "ispell", "-a", NULL }; - diff -ruN /usr/ports/net/gaim/files/patch-ltmain.sh gaim/files/patch-ltmain.sh --- /usr/ports/net/gaim/files/patch-ltmain.sh Fri Aug 31 21:09:37 2001 +++ gaim/files/patch-ltmain.sh Wed Oct 10 17:00:21 2001 @@ -1,6 +1,3 @@ - -$FreeBSD: ports/net/gaim/files/patch-ltmain.sh,v 1.1 2001/09/01 01:09:37 jim Exp $ - --- ltmain.sh 2001/08/31 17:32:22 1.1 +++ ltmain.sh 2001/08/31 17:32:44 @@ -4673,10 +4673,12 @@ diff -ruN /usr/ports/net/gaim/pkg-plist gaim/pkg-plist --- /usr/ports/net/gaim/pkg-plist Tue Oct 2 05:14:36 2001 +++ gaim/pkg-plist Wed Oct 10 17:23:33 2001 @@ -5,20 +5,14 @@ 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 @@ %%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 @@ %%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/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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message