Update to 2.0.3.

10 files changed, 166 insertions, 40 deletions

diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index cb9e225b7554..fb0012c9d7f5 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xchat2
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://xchat.org/files/source/2.0/ \
 		http://xchat.linuxpower.org/files/source/2.0/
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -38,24 +38,24 @@ CONFIGURE_ARGS+=	--enable-socks
 # openssl in now default in configure
 
 .if defined(WITH_PYTHON)
-USE_PYTHON=    yes
+USE_PYTHON=		yes
 CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=	PYTHON=""
+PLIST_SUB+=		PYTHON=""
 .else
 CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=	PYTHON="@comment "
+PLIST_SUB+=		PYTHON="@comment "
 .endif
 
 .if defined(WITH_TCL)
-LIB_DEPENDS=    tcl83.1:${PORTSDIR}/lang/tcl83
-CONFIGURE_ARGS+=	--enable-tcl=${LOCALBASE}/lib/tcl8.3
+LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
+CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include/tcl8.3" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
 		-L${LOCALBASE}/lib/tcl8.3"
 PLIST_SUB+=	TCL=""
 .else
-CONFIGURE_ARGS+=	--enable-tcl=no
+CONFIGURE_ARGS+=--enable-tcl=no
 PLIST_SUB+=	TCL="@comment "
 .endif
 
diff --git a/irc/xchat-gnome/distinfo b/irc/xchat-gnome/distinfo
index ccec63ca6287..eb3f6b91279d 100644
--- a/irc/xchat-gnome/distinfo
+++ b/irc/xchat-gnome/distinfo
@@ -1 +1 @@
-MD5 (xchat-2.0.2.tar.bz2) = 909a2855c891d7649e73bf9dfd628e1d
+MD5 (xchat-2.0.3.tar.bz2) = 8a7a981bf2401e09efdfe278713a2c6c
diff --git a/irc/xchat-gnome/files/patch-configure b/irc/xchat-gnome/files/patch-configure
index 5b4eed1dd35b..674516a44029 100644
--- a/irc/xchat-gnome/files/patch-configure
+++ b/irc/xchat-gnome/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/xchat-gnome/files/patch-ltmain.sh b/irc/xchat-gnome/files/patch-ltmain.sh
new file mode 100644
index 000000000000..8afc42e3986c
--- /dev/null
+++ b/irc/xchat-gnome/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"
diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist
index e3c4de615dbe..4915a1da576b 100644
--- a/irc/xchat-gnome/pkg-plist
+++ b/irc/xchat-gnome/pkg-plist
@@ -11,6 +11,8 @@ share/locale/de/LC_MESSAGES/xchat.mo
 share/locale/el/LC_MESSAGES/xchat.mo
 share/locale/es/LC_MESSAGES/xchat.mo
 share/locale/et/LC_MESSAGES/xchat.mo
+share/locale/fr/LC_MESSAGES/xchat.mo
+share/locale/ja/LC_MESSAGES/xchat.mo
 share/locale/lt/LC_MESSAGES/xchat.mo
 share/locale/lv/LC_MESSAGES/xchat.mo
 share/locale/ms/LC_MESSAGES/xchat.mo
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index cb9e225b7554..fb0012c9d7f5 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xchat2
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://xchat.org/files/source/2.0/ \
 		http://xchat.linuxpower.org/files/source/2.0/
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -38,24 +38,24 @@ CONFIGURE_ARGS+=	--enable-socks
 # openssl in now default in configure
 
 .if defined(WITH_PYTHON)
-USE_PYTHON=    yes
+USE_PYTHON=		yes
 CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=	PYTHON=""
+PLIST_SUB+=		PYTHON=""
 .else
 CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=	PYTHON="@comment "
+PLIST_SUB+=		PYTHON="@comment "
 .endif
 
 .if defined(WITH_TCL)
-LIB_DEPENDS=    tcl83.1:${PORTSDIR}/lang/tcl83
-CONFIGURE_ARGS+=	--enable-tcl=${LOCALBASE}/lib/tcl8.3
+LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
+CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
 		-I${LOCALBASE}/include/tcl8.3" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
 		-L${LOCALBASE}/lib/tcl8.3"
 PLIST_SUB+=	TCL=""
 .else
-CONFIGURE_ARGS+=	--enable-tcl=no
+CONFIGURE_ARGS+=--enable-tcl=no
 PLIST_SUB+=	TCL="@comment "
 .endif
 
diff --git a/irc/xchat2/distinfo b/irc/xchat2/distinfo
index ccec63ca6287..eb3f6b91279d 100644
--- a/irc/xchat2/distinfo
+++ b/irc/xchat2/distinfo
@@ -1 +1 @@
-MD5 (xchat-2.0.2.tar.bz2) = 909a2855c891d7649e73bf9dfd628e1d
+MD5 (xchat-2.0.3.tar.bz2) = 8a7a981bf2401e09efdfe278713a2c6c
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"
diff --git a/irc/xchat2/pkg-plist b/irc/xchat2/pkg-plist
index e3c4de615dbe..4915a1da576b 100644
--- a/irc/xchat2/pkg-plist
+++ b/irc/xchat2/pkg-plist
@@ -11,6 +11,8 @@ share/locale/de/LC_MESSAGES/xchat.mo
 share/locale/el/LC_MESSAGES/xchat.mo
 share/locale/es/LC_MESSAGES/xchat.mo
 share/locale/et/LC_MESSAGES/xchat.mo
+share/locale/fr/LC_MESSAGES/xchat.mo
+share/locale/ja/LC_MESSAGES/xchat.mo
 share/locale/lt/LC_MESSAGES/xchat.mo
 share/locale/lv/LC_MESSAGES/xchat.mo
 share/locale/ms/LC_MESSAGES/xchat.mo