diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-06-29 23:05:55 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-06-29 23:05:55 +0000 |
commit | 3882cfb6962085928f0d58413b06f9ea0b7ec2a0 (patch) | |
tree | 107577b11fbcb5f9bebd6fa6353a8455518a4cb8 /irc/xchat2/files | |
parent | Fix a bug where by "yes" would still be included in USE_GNOME for older (diff) |
Update to 2.0.3.
Notes
Notes:
svn path=/head/; revision=83868
Diffstat (limited to 'irc/xchat2/files')
-rw-r--r-- | irc/xchat2/files/patch-configure | 32 | ||||
-rw-r--r-- | irc/xchat2/files/patch-ltmain.sh | 51 |
2 files changed, 72 insertions, 11 deletions
diff --git a/irc/xchat2/files/patch-configure b/irc/xchat2/files/patch-configure index 5b4eed1dd35b..674516a44029 100644 --- a/irc/xchat2/files/patch-configure +++ b/irc/xchat2/files/patch-configure @@ -1,14 +1,6 @@ ---- configure.orig Mon Apr 21 19:10:14 2003 -+++ configure Wed Apr 23 09:39:19 2003 -@@ -7793,6 +7793,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' -@@ -10816,12 +10817,12 @@ +--- configure.orig Sun Jun 29 18:53:35 2003 ++++ configure Sun Jun 29 19:01:02 2003 +@@ -10816,12 +10816,12 @@ /* end confdefs.h. */ #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -23,3 +15,21 @@ ; return 0; } +@@ -12799,7 +12799,7 @@ + echo "$as_me:$LINENO: checking Python version" >&5 + echo $ECHO_N "checking Python version... $ECHO_C" >&6 + PY_VERSION=`$pythonpath -c 'import sys; print sys.version[:3]'` +- PY_PATH=`$pythonpath -c 'import sys ; print sys.path[1][5:]'` ++ PY_PATH=`$pythonpath -c 'import sys ; print sys.path[1][10:]'` + $pythonpath -c "import sys; map(int,sys.version[:3].split('.')) >= [2,2] or sys.exit(1)" + echo "$as_me:$LINENO: result: $PY_VERSION" >&5 + echo "${ECHO_T}$PY_VERSION" >&6 +@@ -12809,7 +12809,7 @@ + PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'` + PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'` + if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then +- PY_LIBS="-L$PY_EXEC_PREFIX/$PY_PATH/config -lpython$PY_VERSION -pthread -lutil" ++ PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION -pthread -lutil" + PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION" + echo "$as_me:$LINENO: result: ok" >&5 + echo "${ECHO_T}ok" >&6 diff --git a/irc/xchat2/files/patch-ltmain.sh b/irc/xchat2/files/patch-ltmain.sh new file mode 100644 index 000000000000..8afc42e3986c --- /dev/null +++ b/irc/xchat2/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Fri Apr 25 15:18:44 2003 ++++ ltmain.sh Sun May 11 02:27:13 2003 +@@ -1061,7 +1061,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 + ;; +@@ -1071,8 +1071,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 + ;; + +@@ -2471,6 +2479,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 +@@ -4280,10 +4291,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" |