diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2001-09-16 01:02:46 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2001-09-16 01:02:46 +0000 |
commit | db3dca6dbd32fe6ea3d51bc037e6f9cdc66c343b (patch) | |
tree | 29d590ca0bc9e66d81bc3218a0684c2daf9d4a68 /net-im/gaim/files | |
parent | Fix compilation problems. (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_4_0'.release/4.4.0
Notes
Notes:
svn path=/head/; revision=47856
svn path=/tags/RELEASE_4_4_0/; revision=47857; tag=release/4.4.0
Diffstat (limited to 'net-im/gaim/files')
-rw-r--r-- | net-im/gaim/files/patch-aa | 13 | ||||
-rw-r--r-- | net-im/gaim/files/patch-ab | 22 | ||||
-rw-r--r-- | net-im/gaim/files/patch-ac | 75 | ||||
-rw-r--r-- | net-im/gaim/files/patch-aim.c | 12 | ||||
-rw-r--r-- | net-im/gaim/files/patch-ltmain.sh | 18 |
5 files changed, 0 insertions, 140 deletions
diff --git a/net-im/gaim/files/patch-aa b/net-im/gaim/files/patch-aa deleted file mode 100644 index e01484100cf3..000000000000 --- a/net-im/gaim/files/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 - --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 - ACLOCAL_AMFLAGS = -I m4 diff --git a/net-im/gaim/files/patch-ab b/net-im/gaim/files/patch-ab deleted file mode 100644 index 716dfc9761b5..000000000000 --- a/net-im/gaim/files/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ ---- pixmaps/Makefile.in.orig Tue Oct 3 02:42:15 2000 -+++ pixmaps/Makefile.in Tue Oct 3 02:48:38 2000 -@@ -128,8 +128,8 @@ - EXTRA_DIST = about_small.xpm add.xpm add_small.xpm admin_icon.xpm aimicon.xpm aimicon2.xpm angel.xpm aol_icon.xpm away.xpm away_icon.xpm away_small.xpm bgcolor.xpm big.xpm bigsmile.xpm block.xpm bold.xpm bsmile.xpm buddyadd.xpm buddychat.xpm buddydel.xpm burp.xpm cancel.xpm close.xpm close_small.xpm crossedlips.xpm cry.xpm daemon-buddyadd.xpm daemon-buddychat.xpm daemon-buddydel.xpm daemon-im.xpm daemon-info.xpm daemon-permadd.xpm daemon-permdel.xpm daemon.xpm dt_icon.xpm embarrassed.xpm exit_small.xpm export_small.xpm fgcolor.xpm fontface.xpm fontface2.xpm free_icon.xpm gaim.xpm gnome_add.xpm gnome_close.xpm gnome_preferences.xpm gnome_remove.xpm gnome/devil-connect.png gnome/devil-offline.png gnome/devil-online.png gnome/penguin-connect.png gnome/penguin-offline.png gnome/penguin-online.png group.xpm im.xpm import_small.xpm info.xpm italic.xpm join.xpm kiss.xpm link.xpm login_icon.xpm logo.xpm logout_icon.xpm luke03.xpm moneymouth.xpm msg_pending.xpm no_icon.xpm normal.xpm offline.xpm ok.xpm oneeye.xpm online.xpm palette.xpm peng_frown.xpm peng_smile.xpm peng_wink.xpm permadd.xpm permdel.xpm plugins_small.xpm pounce_small.xpm prefs_small.xpm refresh.xpm sad.xpm save.xpm scream.xpm search_small.xpm signing_on.xpm small.xpm smile.xpm smile8.xpm smile_happy.xpm smile_icon.xpm smile_sad.xpm smile_wink.xpm speaker.xpm strike.xpm tb_forward.xpm tb_search.xpm think.xpm tmp_send.xpm tongue.xpm underline.xpm warn.xpm wink.xpm wood.xpm yell.xpm - - --pixmapdir = $(datadir)/pixmaps --pixmap_DATA = gaim.xpm -+pixmapdir = $(datadir)/pixmaps/gaim -+pixmap_DATA = $(EXTRA_DIST) - - #gnomesysconf = `@GNOME_CONFIG@ --sysconfdir` - @GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir` -@@ -187,7 +187,7 @@ - - install-pixmapDATA: $(pixmap_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(pixmapdir) -+ $(mkinstalldirs) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(pixmapdir)/gnome - @list='$(pixmap_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \ diff --git a/net-im/gaim/files/patch-ac b/net-im/gaim/files/patch-ac deleted file mode 100644 index 810ee8926d7c..000000000000 --- a/net-im/gaim/files/patch-ac +++ /dev/null @@ -1,75 +0,0 @@ ---- 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@ - - 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_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_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_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_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) diff --git a/net-im/gaim/files/patch-aim.c b/net-im/gaim/files/patch-aim.c deleted file mode 100644 index 71b1110a00fe..000000000000 --- a/net-im/gaim/files/patch-aim.c +++ /dev/null @@ -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 deleted file mode 100644 index 293fce173a52..000000000000 --- a/net-im/gaim/files/patch-ltmain.sh +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/31 17:32:22 1.1 -+++ ltmain.sh 2001/08/31 17:32:44 -@@ -4673,10 +4673,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |