Date: Tue, 5 Mar 2002 22:02:41 -0500 (EST) From: Joe Marcus Clarke <marcus@marcuscom.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/35574: [MAINTAINER UPDATE] Update net/gaim to 0.53 Message-ID: <200203060302.g2632f876911@shumai.marcuscom.com>
next in thread | raw e-mail | index | archive | help
>Number: 35574 >Category: ports >Synopsis: [MAINTAINER UPDATE] Update net/gaim to 0.53 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Mar 05 19:10:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Joe Marcus Clarke >Release: FreeBSD 4.5-STABLE i386 >Organization: MarcusCom, Inc. >Environment: System: FreeBSD shumai.marcuscom.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Mon Mar 4 23:37:10 EST 2002 marcus@shumai.marcuscom.com:/usr/obj/usr/src/sys/SHUMAI i386 >Description: Update the gaim port to 0.53. >How-To-Repeat: >Fix: --- gaim.diff begins here --- --- Makefile.orig Tue Mar 5 21:59:02 2002 +++ Makefile Tue Mar 5 20:49:40 2002 @@ -6,7 +6,7 @@ # PORTNAME= gaim -PORTVERSION= 0.52 +PORTVERSION= 0.53 CATEGORIES= net MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ ${MASTER_SITE_SOURCEFORGE} --- distinfo.orig Tue Mar 5 21:59:08 2002 +++ distinfo Tue Mar 5 20:51:28 2002 @@ -1 +1 @@ -MD5 (gaim-0.52.tar.bz2) = 06b0fe6ec27439466de666a43cee9d11 +MD5 (gaim-0.53.tar.bz2) = 3d27eaaff67e3f0f909313a0513ae207 --- pkg-plist.orig Tue Mar 5 21:59:15 2002 +++ pkg-plist Tue Mar 5 21:23:28 2002 @@ -31,6 +31,7 @@ share/locale/nl/LC_MESSAGES/gaim.mo share/locale/pl/LC_MESSAGES/gaim.mo share/locale/ru/LC_MESSAGES/gaim.mo +share/locale/sk/LC_MESSAGES/gaim.mo share/locale/sv/LC_MESSAGES/gaim.mo share/locale/zh_CN/LC_MESSAGES/gaim.mo %%GNOME:%%@dirrm share/gnome/pixmaps/gaim --- files/patch-ab.orig Tue Mar 5 21:59:26 2002 +++ files/patch-ab Tue Mar 5 21:07:13 2002 @@ -1,33 +1,32 @@ ---- 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 @@ +--- pixmaps/Makefile.in.orig Tue Mar 5 21:04:40 2002 ++++ pixmaps/Makefile.in Tue Mar 5 21:06:51 2002 +@@ -260,22 +260,15 @@ + yell.xpm - 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 i! mport_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 +-@DISTRIB_TRUE@gaimdistpixdir = @DISTRIB_TRUE@$(datadir)/pixmaps/gaim +-@DISTRIB_TRUE@gaimdistpix_DATA = @DISTRIB_TRUE@away.png connect.png msgpend.png offline.png online.png +@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir` +@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim +@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png +@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps +@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.xpm --@DISTRIB_TRUE@gaimdistpixdir = $(datadir)/pixmaps/gaim --@DISTRIB_TRUE@gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png +-@DISTRIB_TRUE@distpixmapdir = @DISTRIB_TRUE@$(datadir)/pixmaps +-@DISTRIB_TRUE@distpixmap_DATA = @DISTRIB_TRUE@gaim.xpm +pixmapdir = $(datadir)/pixmaps +pixmap_DATA = gaim.xpm --@DISTRIB_TRUE@distpixmapdir = $(datadir)/pixmaps --@DISTRIB_TRUE@distpixmap_DATA = gaim.xpm +-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@`@GNOME_CONFIG@ --datadir` - --@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir` +-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@$(gnomedata)/pixmaps/gaim +-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@away.png connect.png msgpend.png offline.png online.png - --@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim --@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png +-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@$(gnomedata)/pixmaps +-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaim.xpm - --@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps --@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.xpm -- --@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = $(datadir)/pixmaps --@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = gaim.xpm +-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = @DISTRIB_FALSE@@GNOMEAPPLET_FALSE@$(datadir)/pixmaps +-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = @DISTRIB_FALSE@@GNOMEAPPLET_FALSE@gaim.xpm mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = --- files/patch-ac.orig Tue Mar 5 21:59:33 2002 +++ files/patch-ac Tue Mar 5 21:16:39 2002 @@ -1,20 +1,76 @@ ---- 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 @@ +--- src/Makefile.in.orig Tue Mar 5 21:07:43 2002 ++++ src/Makefile.in Tue Mar 5 21:16:14 2002 +@@ -146,72 +146,75 @@ sedpath = @sedpath@ SUBDIRS = protocols --@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet +-@GNOMEAPPLET_TRUE@bin_PROGRAMS = @GNOMEAPPLET_TRUE@gaim_applet +@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim - @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim --@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c conversation.c core.c dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c list.c md5.c module.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c --@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) --@GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = -export-dynamic --@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@ --@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c conversation.c core.c dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c list.c md5.c module.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c --@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) --@GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic --@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@ + @GNOMEAPPLET_FALSE@bin_PROGRAMS = @GNOMEAPPLET_FALSE@gaim +-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = @GNOMEAPPLET_TRUE@about.c \ +-@GNOMEAPPLET_TRUE@ aim.c \ +-@GNOMEAPPLET_TRUE@ applet.c \ +-@GNOMEAPPLET_TRUE@ away.c \ +-@GNOMEAPPLET_TRUE@ browser.c \ +-@GNOMEAPPLET_TRUE@ buddy.c \ +-@GNOMEAPPLET_TRUE@ buddy_chat.c \ +-@GNOMEAPPLET_TRUE@ conversation.c \ +-@GNOMEAPPLET_TRUE@ core.c \ +-@GNOMEAPPLET_TRUE@ dialogs.c \ +-@GNOMEAPPLET_TRUE@ gaimrc.c \ +-@GNOMEAPPLET_TRUE@ gtkimhtml.c \ +-@GNOMEAPPLET_TRUE@ gtkspell.c \ +-@GNOMEAPPLET_TRUE@ gtkticker.c \ +-@GNOMEAPPLET_TRUE@ html.c \ +-@GNOMEAPPLET_TRUE@ idle.c \ +-@GNOMEAPPLET_TRUE@ list.c \ +-@GNOMEAPPLET_TRUE@ md5.c \ +-@GNOMEAPPLET_TRUE@ module.c \ +-@GNOMEAPPLET_TRUE@ multi.c \ +-@GNOMEAPPLET_TRUE@ perl.c \ +-@GNOMEAPPLET_TRUE@ plugins.c \ +-@GNOMEAPPLET_TRUE@ prefs.c \ +-@GNOMEAPPLET_TRUE@ proxy.c \ +-@GNOMEAPPLET_TRUE@ prpl.c \ +-@GNOMEAPPLET_TRUE@ server.c \ +-@GNOMEAPPLET_TRUE@ sound.c \ +-@GNOMEAPPLET_TRUE@ ticker.c \ +-@GNOMEAPPLET_TRUE@ util.c +-@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @GNOMEAPPLET_TRUE@@LIBOBJS@ $(STATIC_LINK_LIBS) +-@GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = @GNOMEAPPLET_TRUE@-export-dynamic +-@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @GNOMEAPPLET_TRUE@@LDADD@ @LIBOBJS@ +-@GNOMEAPPLET_FALSE@gaim_SOURCES = @GNOMEAPPLET_FALSE@about.c \ +-@GNOMEAPPLET_FALSE@ aim.c \ +-@GNOMEAPPLET_FALSE@ applet.c \ +-@GNOMEAPPLET_FALSE@ away.c \ +-@GNOMEAPPLET_FALSE@ browser.c \ +-@GNOMEAPPLET_FALSE@ buddy.c \ +-@GNOMEAPPLET_FALSE@ buddy_chat.c \ +-@GNOMEAPPLET_FALSE@ conversation.c \ +-@GNOMEAPPLET_FALSE@ core.c \ +-@GNOMEAPPLET_FALSE@ dialogs.c \ +-@GNOMEAPPLET_FALSE@ gaimrc.c \ +-@GNOMEAPPLET_FALSE@ gtkimhtml.c \ +-@GNOMEAPPLET_FALSE@ gtkspell.c \ +-@GNOMEAPPLET_FALSE@ gtkticker.c \ +-@GNOMEAPPLET_FALSE@ html.c \ +-@GNOMEAPPLET_FALSE@ idle.c \ +-@GNOMEAPPLET_FALSE@ list.c \ +-@GNOMEAPPLET_FALSE@ md5.c \ +-@GNOMEAPPLET_FALSE@ module.c \ +-@GNOMEAPPLET_FALSE@ multi.c \ +-@GNOMEAPPLET_FALSE@ perl.c \ +-@GNOMEAPPLET_FALSE@ plugins.c \ +-@GNOMEAPPLET_FALSE@ prefs.c \ +-@GNOMEAPPLET_FALSE@ proxy.c \ +-@GNOMEAPPLET_FALSE@ prpl.c \ +-@GNOMEAPPLET_FALSE@ server.c \ +-@GNOMEAPPLET_FALSE@ sound.c \ +-@GNOMEAPPLET_FALSE@ ticker.c \ +-@GNOMEAPPLET_FALSE@ util.c +-@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @GNOMEAPPLET_FALSE@@LIBOBJS@ $(STATIC_LINK_LIBS) +-@GNOMEAPPLET_FALSE@gaim_LDFLAGS = @GNOMEAPPLET_FALSE@-export-dynamic +-@GNOMEAPPLET_FALSE@gaim_LDADD = @GNOMEAPPLET_FALSE@@LDADD@ @LIBOBJS@ +gaim_applet_SOURCES = about.c \ + aim.c \ + applet.c \ @@ -48,7 +104,6 @@ +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 \ @@ -82,10 +137,19 @@ +gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) +gaim_LDFLAGS = -export-dynamic +gaim_LDADD = @LDADD@ @LIBOBJS@ ++ CFLAGS = @CFLAGS@ $(PERL_CFLAGS) -DLOCALEDIR=\"$(prefix)/share/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS) LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS) -@@ -172,30 +231,35 @@ +@@ -235,6 +238,7 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = ++@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT) gaim$(EXEEXT) + @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +@@ -242,30 +246,34 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -141,7 +205,6 @@ + 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) --- gaim.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203060302.g2632f876911>