From a697e30c14d70548e50df7c5b5ec79db9d6eefef Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 17 Jul 2003 04:54:47 +0000 Subject: Update to 0.65. Submitted by: Matthew Luckie (based on) --- net/gaim/Makefile | 11 ++++----- net/gaim/distinfo | 3 +-- net/gaim/files/patch-configure | 10 -------- net/gaim/files/patch-internal-h | 13 +++++++++++ net/gaim/files/patch-ltmain.sh | 51 +++++++++++++++++++++++++++++++++++++++++ net/gaim/pkg-plist | 16 ++++++++++++- 6 files changed, 84 insertions(+), 20 deletions(-) delete mode 100644 net/gaim/files/patch-configure create mode 100644 net/gaim/files/patch-internal-h create mode 100644 net/gaim/files/patch-ltmain.sh (limited to 'net') diff --git a/net/gaim/Makefile b/net/gaim/Makefile index 6d8ed82e9231..e9c44f293eff 100644 --- a/net/gaim/Makefile +++ b/net/gaim/Makefile @@ -5,16 +5,11 @@ # PORTNAME= gaim -PORTVERSION= 0.64 -PORTREVISION= 2 +PORTVERSION= 0.65 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -PATCH_SITES= http://www.chipx86.com/ -PATCHFILES= ${DISTNAME}-msncrashes-20030705-0044.diff -PATCH_DIST_STRIP= -p0 - MAINTAINER?= marcus@FreeBSD.org COMMENT= Gtk+-2.0 open-source 'clone' of AOL's Instant Messenger client @@ -23,7 +18,9 @@ USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack gtk20 USE_PERL5= yes -USE_LIBTOOL= yes +INSTALLS_SHLIB= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-static=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/net/gaim/distinfo b/net/gaim/distinfo index 62e17ab7c7fa..b0cf92b8c9c5 100644 --- a/net/gaim/distinfo +++ b/net/gaim/distinfo @@ -1,2 +1 @@ -MD5 (gaim-0.64.tar.gz) = eca0919cdf92a6c78556983b87ce4fa1 -MD5 (gaim-0.64-msncrashes-20030705-0044.diff) = e486c7a8cf2dc79d03a0a08c6aeaab64 +MD5 (gaim-0.65.tar.gz) = 8abcf286ef98874ef68a9c285ed076b2 diff --git a/net/gaim/files/patch-configure b/net/gaim/files/patch-configure deleted file mode 100644 index 61019f6818c5..000000000000 --- a/net/gaim/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Fri Apr 26 19:31:31 2002 -+++ configure Fri Apr 26 19:31:57 2002 -@@ -5165,6 +5165,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/gaim/files/patch-internal-h b/net/gaim/files/patch-internal-h new file mode 100644 index 000000000000..4d25a6d4f71b --- /dev/null +++ b/net/gaim/files/patch-internal-h @@ -0,0 +1,13 @@ +--- src/internal.h.orig Thu Jul 17 10:20:34 2003 ++++ src/internal.h Thu Jul 17 10:21:02 2003 +@@ -88,9 +88,9 @@ + #endif + + #ifndef _WIN32 +-# include + # include + # include ++# include + # include + # include + # include diff --git a/net/gaim/files/patch-ltmain.sh b/net/gaim/files/patch-ltmain.sh new file mode 100644 index 000000000000..bb660972a6d1 --- /dev/null +++ b/net/gaim/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Thu May 22 16:42:22 2003 ++++ ltmain.sh Tue May 27 12:12:52 2003 +@@ -1072,7 +1072,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1082,8 +1082,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2498,6 +2506,9 @@ + *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4325,10 +4336,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" diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist index 693087b3b399..81c92462568c 100644 --- a/net/gaim/pkg-plist +++ b/net/gaim/pkg-plist @@ -1,7 +1,10 @@ bin/gaim bin/gaim-remote +include/gaim-remote/remote-socket.h +include/gaim-remote/remote.h lib/gaim/autorecon.so lib/gaim/docklet.so +lib/gaim/gaim-remote.so lib/gaim/gestures.so lib/gaim/history.so lib/gaim/iconaway.so @@ -15,12 +18,14 @@ lib/gaim/liboscar.so lib/gaim/libtoc.so lib/gaim/libyahoo.so lib/gaim/libzephyr.so -lib/gaim/notify.so lib/gaim/perl.so lib/gaim/spellchk.so lib/gaim/statenotify.so lib/gaim/ticker.so lib/gaim/timestamp.so +lib/libgaim-remote.a +lib/libgaim-remote.so +lib/libgaim-remote.so.0 share/gnome/applications/gaim.desktop share/gnome/pixmaps/gaim.png share/gnome/pixmaps/gaim/buttons/about_menu.png @@ -31,6 +36,8 @@ share/gnome/pixmaps/gaim/buttons/edit.png share/gnome/pixmaps/gaim/buttons/insert-image-small.png share/gnome/pixmaps/gaim/buttons/insert-link-small.png share/gnome/pixmaps/gaim/buttons/insert-smiley-small.png +share/gnome/pixmaps/gaim/buttons/pause.png +share/gnome/pixmaps/gaim/buttons/send-im.png share/gnome/pixmaps/gaim/buttons/text_bigger.png share/gnome/pixmaps/gaim/buttons/text_normal.png share/gnome/pixmaps/gaim/buttons/text_smaller.png @@ -132,6 +139,8 @@ share/gnome/pixmaps/gaim/smileys/default/yahoo_chicken.gif share/gnome/pixmaps/gaim/smileys/default/yahoo_clap.gif share/gnome/pixmaps/gaim/smileys/default/yahoo_clown.gif share/gnome/pixmaps/gaim/smileys/default/yahoo_coffee.gif +share/gnome/pixmaps/gaim/smileys/default/yahoo_cow.gif +share/gnome/pixmaps/gaim/smileys/default/yahoo_cowboy.gif share/gnome/pixmaps/gaim/smileys/default/yahoo_cry.gif share/gnome/pixmaps/gaim/smileys/default/yahoo_dance.gif share/gnome/pixmaps/gaim/smileys/default/yahoo_devil.gif @@ -185,6 +194,7 @@ share/gnome/pixmaps/gaim/status/default/aol.png share/gnome/pixmaps/gaim/status/default/away.png share/gnome/pixmaps/gaim/status/default/dnd.png share/gnome/pixmaps/gaim/status/default/extendedaway.png +share/gnome/pixmaps/gaim/status/default/female.png share/gnome/pixmaps/gaim/status/default/freeforchat.png share/gnome/pixmaps/gaim/status/default/gadu-gadu.png share/gnome/pixmaps/gaim/status/default/game.png @@ -194,12 +204,14 @@ share/gnome/pixmaps/gaim/status/default/irc.png share/gnome/pixmaps/gaim/status/default/jabber.png share/gnome/pixmaps/gaim/status/default/login.png share/gnome/pixmaps/gaim/status/default/logout.png +share/gnome/pixmaps/gaim/status/default/male.png share/gnome/pixmaps/gaim/status/default/msn.png share/gnome/pixmaps/gaim/status/default/na.png share/gnome/pixmaps/gaim/status/default/napster.png share/gnome/pixmaps/gaim/status/default/notauthorized.png share/gnome/pixmaps/gaim/status/default/occupied.png share/gnome/pixmaps/gaim/status/default/offline.png +share/gnome/pixmaps/gaim/status/default/trepia.png share/gnome/pixmaps/gaim/status/default/wireless.png share/gnome/pixmaps/gaim/status/default/yahoo.png share/gnome/pixmaps/gaim/tb_drag_arrow_down.xpm @@ -222,6 +234,7 @@ share/locale/de/LC_MESSAGES/gaim.mo share/locale/es/LC_MESSAGES/gaim.mo share/locale/fi/LC_MESSAGES/gaim.mo share/locale/fr/LC_MESSAGES/gaim.mo +share/locale/he/LC_MESSAGES/gaim.mo share/locale/hu/LC_MESSAGES/gaim.mo share/locale/it/LC_MESSAGES/gaim.mo share/locale/ja/LC_MESSAGES/gaim.mo @@ -229,6 +242,7 @@ share/locale/ko/LC_MESSAGES/gaim.mo share/locale/nl/LC_MESSAGES/gaim.mo share/locale/no/LC_MESSAGES/gaim.mo share/locale/pl/LC_MESSAGES/gaim.mo +share/locale/pt_BR/LC_MESSAGES/gaim.mo share/locale/ro/LC_MESSAGES/gaim.mo share/locale/ru/LC_MESSAGES/gaim.mo share/locale/sk/LC_MESSAGES/gaim.mo -- cgit