diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-05-11 19:03:42 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-05-11 19:03:42 +0000 |
commit | 6d2d615acf6429270db752171d20a2c566100987 (patch) | |
tree | deb274a3e53474504b7b1e927dc1ac3b4bf9f68f /net-im | |
parent | 67d37ee36f663b53c279768430a3e3f76d804029 (diff) |
* Update to 1.3.0 which fixes security and other bugs. See
http://gaim.sourceforge.net/ChangeLog for the list of all the changes.
* Add support for enabling better Chinese (well, CJK in general) support [1]
PR: 80801 [1]
Submitted by: chinsan <chinsan@mail2000.com.tw> [1]
Security: See http://gaim.sourceforge.net/security/index.php for the
security issues fixed in this release.
Notes
Notes:
svn path=/head/; revision=135084
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/gaim/Makefile | 8 | ||||
-rw-r--r-- | net-im/gaim/distinfo | 4 | ||||
-rw-r--r-- | net-im/gaim/files/extra-patch-src_gtkconv.c | 13 | ||||
-rw-r--r-- | net-im/gaim/files/patch-configure | 26 | ||||
-rw-r--r-- | net-im/gaim/pkg-plist | 2 |
5 files changed, 23 insertions, 30 deletions
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile index 2047cadf1baf..7c3ac27f39a1 100644 --- a/net-im/gaim/Makefile +++ b/net-im/gaim/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gaim -PORTVERSION= 1.2.1 +PORTVERSION= 1.3.0 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -33,7 +33,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C MAN1= gaim.1 gaim-remote.1 -OPTIONS= SILC "Secure Internet Live Conferencing support" off \ +OPTIONS= BIG5 "With Big5 Chinese input fix" off \ + SILC "Secure Internet Live Conferencing support" off \ GTKSPELL "spell checking support" on \ AUDIO "audio support" on \ GNUTLS "GNUTLS encryption support" off \ @@ -128,5 +129,8 @@ post-patch: -e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCLTK_VER} required|g' \ -e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \ ${WRKSRC}/configure +.if defined(WITH_BIG5) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_gtkconv.c +.endif .include <bsd.port.post.mk> diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo index 190906b04a66..3b783db4dd99 100644 --- a/net-im/gaim/distinfo +++ b/net-im/gaim/distinfo @@ -1,2 +1,2 @@ -MD5 (gaim-1.2.1.tar.bz2) = 5ff8161f8d0db48bf302bfb5d7e097ac -SIZE (gaim-1.2.1.tar.bz2) = 5223019 +MD5 (gaim-1.3.0.tar.bz2) = 4816d0e92f7a2622fb66e1b97d3c0b7d +SIZE (gaim-1.3.0.tar.bz2) = 5355123 diff --git a/net-im/gaim/files/extra-patch-src_gtkconv.c b/net-im/gaim/files/extra-patch-src_gtkconv.c new file mode 100644 index 000000000000..68f770a02096 --- /dev/null +++ b/net-im/gaim/files/extra-patch-src_gtkconv.c @@ -0,0 +1,13 @@ +--- src.orig/gtkconv.c Mon May 9 08:36:54 2005 ++++ src/gtkconv.c Mon May 9 08:37:32 2005 +@@ -6369,8 +6369,8 @@ + /* Conversations */ + gaim_prefs_add_none("/gaim/gtk/conversations"); + gaim_prefs_add_bool("/gaim/gtk/conversations/close_on_tabs", TRUE); +- gaim_prefs_add_bool("/gaim/gtk/conversations/ctrl_enter_sends", FALSE); +- gaim_prefs_add_bool("/gaim/gtk/conversations/enter_sends", TRUE); ++ gaim_prefs_add_bool("/gaim/gtk/conversations/ctrl_enter_sends", TRUE); ++ gaim_prefs_add_bool("/gaim/gtk/conversations/enter_sends", FALSE); + gaim_prefs_add_bool("/gaim/gtk/conversations/escape_closes", FALSE); + gaim_prefs_add_bool("/gaim/gtk/conversations/send_formatting", FALSE); + gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE); diff --git a/net-im/gaim/files/patch-configure b/net-im/gaim/files/patch-configure deleted file mode 100644 index a21e2b844e9f..000000000000 --- a/net-im/gaim/files/patch-configure +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.orig Thu Dec 2 20:24:48 2004 -+++ configure Sun Dec 26 10:49:39 2004 -@@ -30860,3 +30860,3 @@ - if test "x$enable_gevolution" = "xyes"; then -- evo_deps="libxml-2.0 libebook-1.0 libedata-book-1.0" -+ evo_deps="libxml-2.0 libebook-1.2 libedata-book-1.2" - -@@ -30963,3 +30963,3 @@ - echo $ECHO_N "checking libebook version... $ECHO_C" >&6 -- LIBEBOOK_VERSION=`$PKG_CONFIG --modversion libebook-1.0` -+ LIBEBOOK_VERSION=`$PKG_CONFIG --modversion libebook-1.2` - LIBEBOOK_MAJOR_VER=`echo $LIBEBOOK_VERSION | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -@@ -31908,3 +31908,3 @@ - prefix=`eval echo $prefix` -- PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=$prefix" -+ PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=%%LOCALBASE%%" - fi -@@ -32685,6 +32685,6 @@ - else -- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" -+ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" - fi - else -- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" -+ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" - fi diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist index 891980b56e2a..673f2b919969 100644 --- a/net-im/gaim/pkg-plist +++ b/net-im/gaim/pkg-plist @@ -371,6 +371,7 @@ share/gnome/sounds/gaim/receive.wav share/gnome/sounds/gaim/redalert.wav share/gnome/sounds/gaim/send.wav share/locale/am/LC_MESSAGES/gaim.mo +share/locale/az/LC_MESSAGES/gaim.mo share/locale/bg/LC_MESSAGES/gaim.mo share/locale/ca/LC_MESSAGES/gaim.mo share/locale/cs/LC_MESSAGES/gaim.mo @@ -388,6 +389,7 @@ share/locale/hi/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 +share/locale/ka/LC_MESSAGES/gaim.mo share/locale/ko/LC_MESSAGES/gaim.mo share/locale/lt/LC_MESSAGES/gaim.mo share/locale/mk/LC_MESSAGES/gaim.mo |