From 6ef33717a5bb44e03f6c0609040ecb4a37888253 Mon Sep 17 00:00:00 2001 From: Patrick Li Date: Fri, 22 Feb 2002 06:33:55 +0000 Subject: Update to 0.52 PR: 35202 Submitted by: maintainer --- net/gaim-snapshot/Makefile | 4 +- net/gaim-snapshot/distinfo | 2 +- net/gaim-snapshot/files/patch-ab | 14 +- net/gaim-snapshot/files/patch-ac | 320 +++++++++++++++------------------------ net/gaim-snapshot/pkg-plist | 5 +- 5 files changed, 137 insertions(+), 208 deletions(-) (limited to 'net/gaim-snapshot') diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile index 82e3639cb15b..4d7b94745bf3 100644 --- a/net/gaim-snapshot/Makefile +++ b/net/gaim-snapshot/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gaim -PORTVERSION= 0.51 +PORTVERSION= 0.52 CATEGORIES= net MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ ${MASTER_SITE_SOURCEFORGE} @@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --disable-esd pre-patch: @${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 \ + @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 eb7dce950fea..18a4b7ece774 100644 --- a/net/gaim-snapshot/distinfo +++ b/net/gaim-snapshot/distinfo @@ -1 +1 @@ -MD5 (gaim-0.51.tar.bz2) = cf2607d90727a75658e5f1a0b9c999b4 +MD5 (gaim-0.52.tar.bz2) = 06b0fe6ec27439466de666a43cee9d11 diff --git a/net/gaim-snapshot/files/patch-ab b/net/gaim-snapshot/files/patch-ab index b1b4e5b3febc..cbd1975dc110 100644 --- a/net/gaim-snapshot/files/patch-ab +++ b/net/gaim-snapshot/files/patch-ab @@ -1,8 +1,8 @@ ---- pixmaps/Makefile.in.orig Fri Nov 2 06:17:38 2001 -+++ pixmaps/Makefile.in Fri Nov 2 06:21:12 2001 -@@ -260,23 +260,15 @@ - wood.xpm \ - yell.xpm +--- pixmaps/Makefile.in.orig Fri Feb 22 01:18:27 2002 ++++ pixmaps/Makefile.in Fri Feb 22 01:18:27 2002 +@@ -149,23 +149,15 @@ + + EXTRA_DIST = ab.xpm about_small.xpm add.xpm add_small.xpm admin_icon.xpm aimicon.xpm angel.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 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 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_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-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 wood.xpm yell.xpm +@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir` +@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim @@ -28,6 +28,6 @@ - -@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = $(datadir)/pixmaps -@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = gaim.xpm - subdir = pixmaps mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/net/gaim-snapshot/files/patch-ac b/net/gaim-snapshot/files/patch-ac index 2d29a772142f..29f7516ca567 100644 --- a/net/gaim-snapshot/files/patch-ac +++ b/net/gaim-snapshot/files/patch-ac @@ -1,219 +1,147 @@ ---- src/Makefile.in.orig Fri Dec 14 22:38:10 2001 -+++ src/Makefile.in Fri Dec 14 22:46:20 2001 -@@ -155,74 +155,74 @@ +--- src/Makefile.in.orig Thu Feb 21 10:23:44 2002 ++++ src/Makefile.in Thu Feb 21 22:33:34 2002 +@@ -146,16 +146,75 @@ + sedpath = @sedpath@ 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 \ --@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_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 \ --@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_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@ +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 ++ 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 + +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 \ -+ 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 ++ 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 + +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) - EXTRA_DIST = applet.h \ - convo.h \ -@@ -244,44 +244,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@ md5.$(OBJEXT) module.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@ multi.$(OBJEXT) perl.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@ plugins.$(OBJEXT) prefs.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@ proxy.$(OBJEXT) prpl.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@ server.$(OBJEXT) sound.$(OBJEXT) \ --@GNOMEAPPLET_FALSE@ ticker.$(OBJEXT) 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) \ -+ md5.$(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@ md5.$(OBJEXT) module.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@ multi.$(OBJEXT) perl.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@ plugins.$(OBJEXT) prefs.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@ proxy.$(OBJEXT) prpl.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@ server.$(OBJEXT) sound.$(OBJEXT) \ --@GNOMEAPPLET_TRUE@ ticker.$(OBJEXT) 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) \ -+ md5.$(OBJEXT) module.$(OBJEXT) \ -+ multi.$(OBJEXT) perl.$(OBJEXT) \ -+ plugins.$(OBJEXT) prefs.$(OBJEXT) \ -+ proxy.$(OBJEXT) prpl.$(OBJEXT) \ -+ server.$(OBJEXT) sound.$(OBJEXT) \ -+ ticker.$(OBJEXT) util.$(OBJEXT) + LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS) +@@ -172,30 +231,35 @@ + 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) core.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@dialogs.$(OBJEXT) gaimrc.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@gtkimhtml.$(OBJEXT) gtkspell.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@gtkticker.$(OBJEXT) html.$(OBJEXT) idle.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@list.$(OBJEXT) md5.$(OBJEXT) module.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@multi.$(OBJEXT) perl.$(OBJEXT) plugins.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@prefs.$(OBJEXT) proxy.$(OBJEXT) prpl.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@server.$(OBJEXT) sound.$(OBJEXT) ticker.$(OBJEXT) \ +-@GNOMEAPPLET_TRUE@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) core.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@dialogs.$(OBJEXT) gaimrc.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@gtkimhtml.$(OBJEXT) gtkspell.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@gtkticker.$(OBJEXT) html.$(OBJEXT) idle.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@list.$(OBJEXT) md5.$(OBJEXT) module.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@multi.$(OBJEXT) perl.$(OBJEXT) plugins.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@prefs.$(OBJEXT) proxy.$(OBJEXT) prpl.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@server.$(OBJEXT) sound.$(OBJEXT) ticker.$(OBJEXT) \ +-@GNOMEAPPLET_FALSE@util.$(OBJEXT) ++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) \ ++ md5.$(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 = 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) \ ++ md5.$(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) + 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) diff --git a/net/gaim-snapshot/pkg-plist b/net/gaim-snapshot/pkg-plist index 3402d446088e..942f0427b472 100644 --- a/net/gaim-snapshot/pkg-plist +++ b/net/gaim-snapshot/pkg-plist @@ -14,7 +14,7 @@ lib/gaim/libyahoo.so lib/gaim/libzephyr.so lib/gaim/notify.so lib/gaim/spellchk.so -%%DATADIR%%/pixmaps/gaim.xpm +%%NOGNOME:%%%%DATADIR%%/pixmaps/gaim.xpm %%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop %%GNOME:%%share/gnome/apps/Internet/gaim.desktop %%GNOME:%%share/gnome/pixmaps/gaim.xpm @@ -33,5 +33,6 @@ share/locale/pl/LC_MESSAGES/gaim.mo share/locale/ru/LC_MESSAGES/gaim.mo share/locale/sv/LC_MESSAGES/gaim.mo share/locale/zh_CN/LC_MESSAGES/gaim.mo -@dirrm %%DATADIR%%/pixmaps +%%GNOME:%%@dirrm share/gnome/pixmaps/gaim +%%NOGNOME:%%@dirrm %%DATADIR%%/pixmaps @dirrm lib/gaim -- cgit v1.2.3