diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-04-02 16:10:24 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-04-02 16:10:24 +0800 |
commit | 5ba59a7f26dd1690d4bd639546b5cc7fa83c02d2 (patch) | |
tree | 13c426164b1af39cb549c70c8995b8b76e958669 /net/gaim/files | |
parent | 182888a4c13b033170f61889fbb63e7e0a86b5ec (diff) | |
download | marcuscom-ports-5ba59a7f26dd1690d4bd639546b5cc7fa83c02d2.tar marcuscom-ports-5ba59a7f26dd1690d4bd639546b5cc7fa83c02d2.tar.gz marcuscom-ports-5ba59a7f26dd1690d4bd639546b5cc7fa83c02d2.tar.bz2 marcuscom-ports-5ba59a7f26dd1690d4bd639546b5cc7fa83c02d2.tar.lz marcuscom-ports-5ba59a7f26dd1690d4bd639546b5cc7fa83c02d2.tar.xz marcuscom-ports-5ba59a7f26dd1690d4bd639546b5cc7fa83c02d2.tar.zst marcuscom-ports-5ba59a7f26dd1690d4bd639546b5cc7fa83c02d2.zip |
Add gaim, and update to 0.76.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2240 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'net/gaim/files')
-rw-r--r-- | net/gaim/files/patch-configure | 24 | ||||
-rw-r--r-- | net/gaim/files/patch-ltmain.sh | 51 | ||||
-rw-r--r-- | net/gaim/files/patch-src::util.c | 19 | ||||
-rw-r--r-- | net/gaim/files/patch-src_protocols_oscar_ft.c | 10 |
4 files changed, 104 insertions, 0 deletions
diff --git a/net/gaim/files/patch-configure b/net/gaim/files/patch-configure new file mode 100644 index 000000000..7ae55f0c9 --- /dev/null +++ b/net/gaim/files/patch-configure @@ -0,0 +1,24 @@ +--- configure.orig Thu Oct 9 20:05:15 2003 ++++ configure Fri Oct 10 13:22:18 2003 +@@ -16164,7 +16164,7 @@ + + if test "x$prefix" != "xNONE"; then + prefix=`eval echo $prefix` +- PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=$prefix" ++ PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=%%LOCALBASE%%" + fi + + +@@ -16915,10 +16915,10 @@ + + enable_nss="no" + 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 + + echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5 diff --git a/net/gaim/files/patch-ltmain.sh b/net/gaim/files/patch-ltmain.sh new file mode 100644 index 000000000..bb660972a --- /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/files/patch-src::util.c b/net/gaim/files/patch-src::util.c new file mode 100644 index 000000000..aea0f2dae --- /dev/null +++ b/net/gaim/files/patch-src::util.c @@ -0,0 +1,19 @@ +--- src/util.c.orig Wed Mar 31 17:56:09 2004 ++++ src/util.c Fri Apr 2 02:25:08 2004 +@@ -2119,9 +2119,14 @@ + static size_t + parse_content_len(const char *data, size_t data_len) + { +- size_t content_len = 0; ++ int content_len = 0; ++ char *tmp; + +- sscanf(data, "Content-Length: %d", (int *)&content_len); ++ tmp = g_malloc(data_len + 1); ++ memcpy(tmp, data, data_len); ++ tmp[data_len] = '\0'; ++ sscanf(tmp, "Content-Length: %d", &content_len); ++ g_free(tmp); + + return content_len; + } diff --git a/net/gaim/files/patch-src_protocols_oscar_ft.c b/net/gaim/files/patch-src_protocols_oscar_ft.c new file mode 100644 index 000000000..926db5f44 --- /dev/null +++ b/net/gaim/files/patch-src_protocols_oscar_ft.c @@ -0,0 +1,10 @@ +--- src/protocols/oscar/ft.c.orig Sat Jan 10 14:05:46 2004 ++++ src/protocols/oscar/ft.c Sat Jan 10 14:07:58 2004 +@@ -49,6 +49,7 @@ + #ifndef _WIN32 + #include <stdio.h> + #include <netdb.h> ++#include <limits.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include <sys/utsname.h> /* for aim_odc_initiate */ |