1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

* 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.
This commit is contained in:
Joe Marcus Clarke 2005-05-11 19:03:42 +00:00
parent 67d37ee36f
commit 6d2d615acf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=135084
10 changed files with 46 additions and 60 deletions

View File

@ -6,7 +6,7 @@
# #
PORTNAME= gaim PORTNAME= gaim
PORTVERSION= 1.2.1 PORTVERSION= 1.3.0
CATEGORIES?= net CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} 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 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 \ GTKSPELL "spell checking support" on \
AUDIO "audio support" on \ AUDIO "audio support" on \
GNUTLS "GNUTLS encryption support" off \ 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_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}|' \ -e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \
${WRKSRC}/configure ${WRKSRC}/configure
.if defined(WITH_BIG5)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_gtkconv.c
.endif
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

View File

@ -1,2 +1,2 @@
MD5 (gaim-1.2.1.tar.bz2) = 5ff8161f8d0db48bf302bfb5d7e097ac MD5 (gaim-1.3.0.tar.bz2) = 4816d0e92f7a2622fb66e1b97d3c0b7d
SIZE (gaim-1.2.1.tar.bz2) = 5223019 SIZE (gaim-1.3.0.tar.bz2) = 5355123

View File

@ -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);

View File

@ -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

View File

@ -371,6 +371,7 @@ share/gnome/sounds/gaim/receive.wav
share/gnome/sounds/gaim/redalert.wav share/gnome/sounds/gaim/redalert.wav
share/gnome/sounds/gaim/send.wav share/gnome/sounds/gaim/send.wav
share/locale/am/LC_MESSAGES/gaim.mo share/locale/am/LC_MESSAGES/gaim.mo
share/locale/az/LC_MESSAGES/gaim.mo
share/locale/bg/LC_MESSAGES/gaim.mo share/locale/bg/LC_MESSAGES/gaim.mo
share/locale/ca/LC_MESSAGES/gaim.mo share/locale/ca/LC_MESSAGES/gaim.mo
share/locale/cs/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/hu/LC_MESSAGES/gaim.mo
share/locale/it/LC_MESSAGES/gaim.mo share/locale/it/LC_MESSAGES/gaim.mo
share/locale/ja/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/ko/LC_MESSAGES/gaim.mo
share/locale/lt/LC_MESSAGES/gaim.mo share/locale/lt/LC_MESSAGES/gaim.mo
share/locale/mk/LC_MESSAGES/gaim.mo share/locale/mk/LC_MESSAGES/gaim.mo

View File

@ -6,7 +6,7 @@
# #
PORTNAME= gaim PORTNAME= gaim
PORTVERSION= 1.2.1 PORTVERSION= 1.3.0
CATEGORIES?= net CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} 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 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 \ GTKSPELL "spell checking support" on \
AUDIO "audio support" on \ AUDIO "audio support" on \
GNUTLS "GNUTLS encryption support" off \ 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_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}|' \ -e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \
${WRKSRC}/configure ${WRKSRC}/configure
.if defined(WITH_BIG5)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_gtkconv.c
.endif
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

View File

@ -1,2 +1,2 @@
MD5 (gaim-1.2.1.tar.bz2) = 5ff8161f8d0db48bf302bfb5d7e097ac MD5 (gaim-1.3.0.tar.bz2) = 4816d0e92f7a2622fb66e1b97d3c0b7d
SIZE (gaim-1.2.1.tar.bz2) = 5223019 SIZE (gaim-1.3.0.tar.bz2) = 5355123

View File

@ -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);

View File

@ -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

View File

@ -371,6 +371,7 @@ share/gnome/sounds/gaim/receive.wav
share/gnome/sounds/gaim/redalert.wav share/gnome/sounds/gaim/redalert.wav
share/gnome/sounds/gaim/send.wav share/gnome/sounds/gaim/send.wav
share/locale/am/LC_MESSAGES/gaim.mo share/locale/am/LC_MESSAGES/gaim.mo
share/locale/az/LC_MESSAGES/gaim.mo
share/locale/bg/LC_MESSAGES/gaim.mo share/locale/bg/LC_MESSAGES/gaim.mo
share/locale/ca/LC_MESSAGES/gaim.mo share/locale/ca/LC_MESSAGES/gaim.mo
share/locale/cs/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/hu/LC_MESSAGES/gaim.mo
share/locale/it/LC_MESSAGES/gaim.mo share/locale/it/LC_MESSAGES/gaim.mo
share/locale/ja/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/ko/LC_MESSAGES/gaim.mo
share/locale/lt/LC_MESSAGES/gaim.mo share/locale/lt/LC_MESSAGES/gaim.mo
share/locale/mk/LC_MESSAGES/gaim.mo share/locale/mk/LC_MESSAGES/gaim.mo