From 9579171b96ea321ad4a5fa2305f0451001e15814 Mon Sep 17 00:00:00 2001 From: jim Date: Sat, 3 Nov 2001 11:32:40 +0000 Subject: Update to version 0.47. PR: 31715 Submitted by: Patrick Li --- net-im/gaim/Makefile | 7 ++- net-im/gaim/distinfo | 2 +- net-im/gaim/files/patch-aa | 12 ++--- net-im/gaim/files/patch-ab | 49 +++++++++++------- net-im/gaim/files/patch-aim.c | 0 net-im/gaim/pkg-plist | 114 +++--------------------------------------- 6 files changed, 48 insertions(+), 136 deletions(-) delete mode 100644 net-im/gaim/files/patch-aim.c (limited to 'net-im/gaim') diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile index 7680aae..f883700 100644 --- a/net-im/gaim/Makefile +++ b/net-im/gaim/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gaim -PORTVERSION= 0.45 +PORTVERSION= 0.47 CATEGORIES= net MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ ${MASTER_SITE_SOURCEFORGE} @@ -14,8 +14,6 @@ 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 @@ -37,6 +35,7 @@ RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+= --enable-panel .else CONFIGURE_ARGS+= --disable-gnome +BUILD_DEPENDS= ${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf .endif .if defined(HAVE_ESOUND) USE_ESOUND= yes @@ -49,6 +48,6 @@ pre-patch: 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' + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' .include diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo index e469b54..28a84c6 100644 --- a/net-im/gaim/distinfo +++ b/net-im/gaim/distinfo @@ -1 +1 @@ -MD5 (gaim-0.45.tar.bz2) = 29890833ca0c67fac08f719767347ab9 +MD5 (gaim-0.47.tar.bz2) = 1640e140ad9531f7f1ddc7bee080502e diff --git a/net-im/gaim/files/patch-aa b/net-im/gaim/files/patch-aa index 9a25212..77386c4 100644 --- a/net-im/gaim/files/patch-aa +++ b/net-im/gaim/files/patch-aa @@ -1,9 +1,9 @@ ---- 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 +--- Makefile.in.orig Fri Nov 2 05:31:32 2001 ++++ Makefile.in Fri Nov 2 05:33:10 2001 +@@ -171,8 +171,8 @@ + @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdesktopdir = $(gnomedata)/applets/Network + @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdesktop_DATA = $(gaim_DESKTOP) + -pixmapdir = $(datadir)/apps/Internet -pixmap_DATA = gaim.desktop +@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet diff --git a/net-im/gaim/files/patch-ab b/net-im/gaim/files/patch-ab index 716dfc9..b1b4e5b 100644 --- a/net-im/gaim/files/patch-ab +++ b/net-im/gaim/files/patch-ab @@ -1,22 +1,33 @@ ---- 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 +--- 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 ++@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 --pixmapdir = $(datadir)/pixmaps --pixmap_DATA = gaim.xpm -+pixmapdir = $(datadir)/pixmaps/gaim -+pixmap_DATA = $(EXTRA_DIST) +-@DISTRIB_TRUE@gaimdistpixdir = $(datadir)/pixmaps/gaim +-@DISTRIB_TRUE@gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png ++pixmapdir = $(datadir)/pixmaps ++pixmap_DATA = gaim.xpm - #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"; \ +-@DISTRIB_TRUE@distpixmapdir = $(datadir)/pixmaps +-@DISTRIB_TRUE@distpixmap_DATA = gaim.xpm +- +-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir` +- +-@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 = $(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 + subdir = pixmaps + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h diff --git a/net-im/gaim/files/patch-aim.c b/net-im/gaim/files/patch-aim.c deleted file mode 100644 index e69de29..0000000 diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist index e50df35..0aad9af 100644 --- a/net-im/gaim/pkg-plist +++ b/net-im/gaim/pkg-plist @@ -15,120 +15,22 @@ lib/gaim/libyahoo.so lib/gaim/libzephyr.so lib/gaim/notify.so lib/gaim/spellchk.so -%%DATADIR%%/pixmaps/gaim/ab.xpm -%%DATADIR%%/pixmaps/gaim/about_small.xpm -%%DATADIR%%/pixmaps/gaim/add.xpm -%%DATADIR%%/pixmaps/gaim/add_small.xpm -%%DATADIR%%/pixmaps/gaim/admin_icon.xpm -%%DATADIR%%/pixmaps/gaim/aimicon.xpm -%%DATADIR%%/pixmaps/gaim/angel.xpm -%%DATADIR%%/pixmaps/gaim/aol_icon.xpm -%%DATADIR%%/pixmaps/gaim/available-away.xpm -%%DATADIR%%/pixmaps/gaim/available-chat.xpm -%%DATADIR%%/pixmaps/gaim/available-dnd.xpm -%%DATADIR%%/pixmaps/gaim/available-xa.xpm -%%DATADIR%%/pixmaps/gaim/available.xpm -%%DATADIR%%/pixmaps/gaim/away_big.xpm -%%DATADIR%%/pixmaps/gaim/away_icon.xpm -%%DATADIR%%/pixmaps/gaim/away_small.xpm -%%DATADIR%%/pixmaps/gaim/bgcolor.xpm -%%DATADIR%%/pixmaps/gaim/big.xpm -%%DATADIR%%/pixmaps/gaim/bigsmile.xpm -%%DATADIR%%/pixmaps/gaim/block.xpm -%%DATADIR%%/pixmaps/gaim/bold.xpm -%%DATADIR%%/pixmaps/gaim/burp.xpm -%%DATADIR%%/pixmaps/gaim/cancel.xpm -%%DATADIR%%/pixmaps/gaim/close.xpm -%%DATADIR%%/pixmaps/gaim/close_small.xpm -%%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 -%%DATADIR%%/pixmaps/gaim/fgcolor.xpm -%%DATADIR%%/pixmaps/gaim/fontface.xpm -%%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 -%%DATADIR%%/pixmaps/gaim/gnomeicu-na.xpm -%%DATADIR%%/pixmaps/gaim/gnomeicu-occ.xpm -%%DATADIR%%/pixmaps/gaim/gnomeicu-online.xpm -%%DATADIR%%/pixmaps/gaim/gnome_add.xpm -%%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm -%%DATADIR%%/pixmaps/gaim/gnome_remove.xpm -%%DATADIR%%/pixmaps/gaim/group.xpm -%%DATADIR%%/pixmaps/gaim/import_small.xpm -%%DATADIR%%/pixmaps/gaim/irc_icon.xpm -%%DATADIR%%/pixmaps/gaim/italic.xpm -%%DATADIR%%/pixmaps/gaim/join.xpm -%%DATADIR%%/pixmaps/gaim/kiss.xpm -%%DATADIR%%/pixmaps/gaim/link.xpm -%%DATADIR%%/pixmaps/gaim/login_icon.xpm -%%DATADIR%%/pixmaps/gaim/logo.xpm -%%DATADIR%%/pixmaps/gaim/logout_icon.xpm -%%DATADIR%%/pixmaps/gaim/luke03.xpm -%%DATADIR%%/pixmaps/gaim/moneymouth.xpm -%%DATADIR%%/pixmaps/gaim/mrt.xpm -%%DATADIR%%/pixmaps/gaim/msn_away.xpm -%%DATADIR%%/pixmaps/gaim/msn_online.xpm -%%DATADIR%%/pixmaps/gaim/napster.xpm -%%DATADIR%%/pixmaps/gaim/no_icon.xpm -%%DATADIR%%/pixmaps/gaim/normal.xpm -%%DATADIR%%/pixmaps/gaim/ok.xpm -%%DATADIR%%/pixmaps/gaim/oneeye.xpm -%%DATADIR%%/pixmaps/gaim/panic.xpm -%%DATADIR%%/pixmaps/gaim/plugins_small.xpm -%%DATADIR%%/pixmaps/gaim/pounce_small.xpm -%%DATADIR%%/pixmaps/gaim/prefs_small.xpm -%%DATADIR%%/pixmaps/gaim/refresh.xpm -%%DATADIR%%/pixmaps/gaim/sad.xpm -%%DATADIR%%/pixmaps/gaim/save.xpm -%%DATADIR%%/pixmaps/gaim/save_small.xpm -%%DATADIR%%/pixmaps/gaim/scream.xpm -%%DATADIR%%/pixmaps/gaim/search_small.xpm -%%DATADIR%%/pixmaps/gaim/send_small.xpm -%%DATADIR%%/pixmaps/gaim/small.xpm -%%DATADIR%%/pixmaps/gaim/smile.xpm -%%DATADIR%%/pixmaps/gaim/smile8.xpm -%%DATADIR%%/pixmaps/gaim/smile_icon.xpm -%%DATADIR%%/pixmaps/gaim/speaker.xpm -%%DATADIR%%/pixmaps/gaim/status-away.xpm -%%DATADIR%%/pixmaps/gaim/status-here.xpm -%%DATADIR%%/pixmaps/gaim/status-idle.xpm -%%DATADIR%%/pixmaps/gaim/strike.xpm -%%DATADIR%%/pixmaps/gaim/tb_forward.xpm -%%DATADIR%%/pixmaps/gaim/tb_redo.xpm -%%DATADIR%%/pixmaps/gaim/tb_refresh.xpm -%%DATADIR%%/pixmaps/gaim/tb_search.xpm -%%DATADIR%%/pixmaps/gaim/tb_undo.xpm -%%DATADIR%%/pixmaps/gaim/think.xpm -%%DATADIR%%/pixmaps/gaim/tmp_send.xpm -%%DATADIR%%/pixmaps/gaim/tongue.xpm -%%DATADIR%%/pixmaps/gaim/underline.xpm -%%DATADIR%%/pixmaps/gaim/warn.xpm -%%DATADIR%%/pixmaps/gaim/wink.xpm -%%DATADIR%%/pixmaps/gaim/wood.xpm -%%DATADIR%%/pixmaps/gaim/yell.xpm +%%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 +%%GNOME:%%share/gnome/pixmaps/gaim/away.png +%%GNOME:%%share/gnome/pixmaps/gaim/connect.png +%%GNOME:%%share/gnome/pixmaps/gaim/msgpend.png +%%GNOME:%%share/gnome/pixmaps/gaim/offline.png +%%GNOME:%%share/gnome/pixmaps/gaim/online.png 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/nl/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 -@dirrm %%DATADIR%%/pixmaps/gaim -%%NOGNOME:%%@dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%%/pixmaps @dirrm lib/gaim -- cgit v1.1