From 10eb4e207a932db64d0ed1f3d161f799f22d14ab Mon Sep 17 00:00:00 2001 From: adamw Date: Thu, 31 Jul 2003 18:01:41 +0000 Subject: Update to 2.0.4. PR: ports/55123 Submitted by: Sebastian Yepes F. --- irc/xchat-gnome/Makefile | 6 +--- irc/xchat-gnome/distinfo | 3 +- irc/xchat-gnome/files/patch-Makefile.in | 6 ++-- irc/xchat-gnome/files/patch-configure | 6 ++-- irc/xchat-gnome/files/patch-ltmain.sh | 57 ++++++++++++++++++--------------- irc/xchat-gnome/pkg-plist | 1 - irc/xchat2/Makefile | 6 +--- irc/xchat2/distinfo | 3 +- irc/xchat2/files/patch-Makefile.in | 6 ++-- irc/xchat2/files/patch-configure | 6 ++-- irc/xchat2/files/patch-ltmain.sh | 57 ++++++++++++++++++--------------- irc/xchat2/pkg-plist | 1 - 12 files changed, 80 insertions(+), 78 deletions(-) (limited to 'irc') diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index 31f42c6..e784c56 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -6,16 +6,12 @@ # PORTNAME= xchat2 -PORTVERSION= 2.0.3 -PORTREVISION= 1 +PORTVERSION= 2.0.4 CATEGORIES= irc gnome ipv6 MASTER_SITES= http://xchat.org/files/source/2.0/ \ http://xchat.linuxpower.org/files/source/2.0/ DISTNAME= xchat-${PORTVERSION} -PATCH_SITES= ${MASTER_SITES:S/$/patches\//} -PATCHFILES= xc203-fixtint.diff - MAINTAINER= gnome@FreeBSD.org COMMENT= An X11 IRC client using the GTK+ 2 toolkit diff --git a/irc/xchat-gnome/distinfo b/irc/xchat-gnome/distinfo index 945ef22..5ce2876 100644 --- a/irc/xchat-gnome/distinfo +++ b/irc/xchat-gnome/distinfo @@ -1,2 +1 @@ -MD5 (xchat-2.0.3.tar.bz2) = 8a7a981bf2401e09efdfe278713a2c6c -MD5 (xc203-fixtint.diff) = ecfeedae2da4ba7867a2f62227db355b +MD5 (xchat-2.0.4.tar.bz2) = bd987cd3b49cc16e875cfd8cb9b77c29 diff --git a/irc/xchat-gnome/files/patch-Makefile.in b/irc/xchat-gnome/files/patch-Makefile.in index 796ecc2..5625f2e 100644 --- a/irc/xchat-gnome/files/patch-Makefile.in +++ b/irc/xchat-gnome/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sun Dec 8 23:16:00 2002 -+++ Makefile.in Sun Dec 8 23:16:41 2002 -@@ -145,7 +145,7 @@ +--- Makefile.in.old Thu Jul 31 05:24:26 2003 ++++ Makefile.in Thu Jul 31 19:03:06 2003 +@@ -211,7 +211,7 @@ icondir = $(datadir)/pixmaps util_DATA = xchat.desktop diff --git a/irc/xchat-gnome/files/patch-configure b/irc/xchat-gnome/files/patch-configure index 0547a1b..05ac82b 100644 --- a/irc/xchat-gnome/files/patch-configure +++ b/irc/xchat-gnome/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sun Jun 29 18:53:35 2003 -+++ configure Sun Jun 29 19:01:02 2003 -@@ -10816,12 +10816,12 @@ +--- configure.old Thu Jul 31 05:24:30 2003 ++++ configure Thu Jul 31 19:03:06 2003 +@@ -21482,12 +21482,12 @@ /* end confdefs.h. */ #include extern int _nl_msg_cat_cntr; diff --git a/irc/xchat-gnome/files/patch-ltmain.sh b/irc/xchat-gnome/files/patch-ltmain.sh index 8afc42e..2162ffd 100644 --- a/irc/xchat-gnome/files/patch-ltmain.sh +++ b/irc/xchat-gnome/files/patch-ltmain.sh @@ -1,24 +1,24 @@ ---- ltmain.sh.orig Fri Apr 25 15:18:44 2003 -+++ ltmain.sh Sun May 11 02:27:13 2003 -@@ -1061,7 +1061,7 @@ +--- ltmain.sh.old Thu Jun 12 05:09:04 2003 ++++ ltmain.sh Thu Jul 31 19:03:06 2003 +@@ -1280,7 +1280,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + 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 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ continue ;; + -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; + -module) module=yes @@ -26,17 +26,24 @@ 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 @@ +@@ -4305,11 +4313,11 @@ + $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + +- # Clean up the generated files. +- $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" +- $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" +- +- # Transform the symbol file into the correct name. ++ # Clean up the generated files. ++ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" ++ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" ++ ++ # Transform the symbol file into the correct name. + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + ;; +@@ -5428,10 +5436,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist index 4915a1d..12194fb 100644 --- a/irc/xchat-gnome/pkg-plist +++ b/irc/xchat-gnome/pkg-plist @@ -1,5 +1,4 @@ bin/xchat -bin/xchat-text lib/xchat/plugins/perl.so %%PYTHON%%lib/xchat/plugins/python.so %%TCL%%lib/xchat/plugins/tcl.so diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index 31f42c6..e784c56 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -6,16 +6,12 @@ # PORTNAME= xchat2 -PORTVERSION= 2.0.3 -PORTREVISION= 1 +PORTVERSION= 2.0.4 CATEGORIES= irc gnome ipv6 MASTER_SITES= http://xchat.org/files/source/2.0/ \ http://xchat.linuxpower.org/files/source/2.0/ DISTNAME= xchat-${PORTVERSION} -PATCH_SITES= ${MASTER_SITES:S/$/patches\//} -PATCHFILES= xc203-fixtint.diff - MAINTAINER= gnome@FreeBSD.org COMMENT= An X11 IRC client using the GTK+ 2 toolkit diff --git a/irc/xchat2/distinfo b/irc/xchat2/distinfo index 945ef22..5ce2876 100644 --- a/irc/xchat2/distinfo +++ b/irc/xchat2/distinfo @@ -1,2 +1 @@ -MD5 (xchat-2.0.3.tar.bz2) = 8a7a981bf2401e09efdfe278713a2c6c -MD5 (xc203-fixtint.diff) = ecfeedae2da4ba7867a2f62227db355b +MD5 (xchat-2.0.4.tar.bz2) = bd987cd3b49cc16e875cfd8cb9b77c29 diff --git a/irc/xchat2/files/patch-Makefile.in b/irc/xchat2/files/patch-Makefile.in index 796ecc2..5625f2e 100644 --- a/irc/xchat2/files/patch-Makefile.in +++ b/irc/xchat2/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sun Dec 8 23:16:00 2002 -+++ Makefile.in Sun Dec 8 23:16:41 2002 -@@ -145,7 +145,7 @@ +--- Makefile.in.old Thu Jul 31 05:24:26 2003 ++++ Makefile.in Thu Jul 31 19:03:06 2003 +@@ -211,7 +211,7 @@ icondir = $(datadir)/pixmaps util_DATA = xchat.desktop diff --git a/irc/xchat2/files/patch-configure b/irc/xchat2/files/patch-configure index 0547a1b..05ac82b 100644 --- a/irc/xchat2/files/patch-configure +++ b/irc/xchat2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sun Jun 29 18:53:35 2003 -+++ configure Sun Jun 29 19:01:02 2003 -@@ -10816,12 +10816,12 @@ +--- configure.old Thu Jul 31 05:24:30 2003 ++++ configure Thu Jul 31 19:03:06 2003 +@@ -21482,12 +21482,12 @@ /* end confdefs.h. */ #include extern int _nl_msg_cat_cntr; diff --git a/irc/xchat2/files/patch-ltmain.sh b/irc/xchat2/files/patch-ltmain.sh index 8afc42e..2162ffd 100644 --- a/irc/xchat2/files/patch-ltmain.sh +++ b/irc/xchat2/files/patch-ltmain.sh @@ -1,24 +1,24 @@ ---- ltmain.sh.orig Fri Apr 25 15:18:44 2003 -+++ ltmain.sh Sun May 11 02:27:13 2003 -@@ -1061,7 +1061,7 @@ +--- ltmain.sh.old Thu Jun 12 05:09:04 2003 ++++ ltmain.sh Thu Jul 31 19:03:06 2003 +@@ -1280,7 +1280,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + 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 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ continue ;; + -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; + -module) module=yes @@ -26,17 +26,24 @@ 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 @@ +@@ -4305,11 +4313,11 @@ + $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + +- # Clean up the generated files. +- $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" +- $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" +- +- # Transform the symbol file into the correct name. ++ # Clean up the generated files. ++ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" ++ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" ++ ++ # Transform the symbol file into the correct name. + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + ;; +@@ -5428,10 +5436,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/irc/xchat2/pkg-plist b/irc/xchat2/pkg-plist index 4915a1d..12194fb 100644 --- a/irc/xchat2/pkg-plist +++ b/irc/xchat2/pkg-plist @@ -1,5 +1,4 @@ bin/xchat -bin/xchat-text lib/xchat/plugins/perl.so %%PYTHON%%lib/xchat/plugins/python.so %%TCL%%lib/xchat/plugins/tcl.so -- cgit v1.1