Hi, This is a diff for xchat-2.8.8.
I don't feel particularly confident about libtool/libintl bits, so please let me know if I've done stupid errors... Cheers, David Index: Makefile =================================================================== RCS file: /cvs/ports/net/xchat/Makefile,v retrieving revision 1.77 diff -u -p -r1.77 Makefile --- Makefile 12 Jul 2010 22:07:42 -0000 1.77 +++ Makefile 20 Sep 2010 09:35:23 -0000 @@ -3,9 +3,8 @@ COMMENT= GTK+2 IRC client MAJOR= 2.8 -VERSION= ${MAJOR}.6 +VERSION= ${MAJOR}.8 DISTNAME= xchat-${VERSION} -REVISION= 6 CATEGORIES= net x11 @@ -21,10 +20,11 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto dbus-1 -WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 -WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pcre perl pixman-1 png pthread pthread-stubs -WANTLIB += ssl util xcb xcb-render xcb-render-util xml2 z +WANTLIB += dbus-glib-1 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 +WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB += pcre perl pixman-1 png pthread pthread-stubs sexy ssl util xcb +WANTLIB += xcb-render xcb-render-util xml2 z MASTER_SITES= ${HOMEPAGE}files/source/${MAJOR}/ \ ${MASTER_SITE_SOURCEFORGE:=xchat/} @@ -33,9 +33,9 @@ MODULES= devel/gettext \ devel/gconf2 RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils -LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \ - dbus-glib-1.>=4::x11/dbus-glib \ - sexy::x11/libsexy +LIB_DEPENDS= ::x11/gtk+2 \ + ::x11/dbus-glib \ + ::x11/libsexy USE_X11= Yes USE_LIBTOOL= Yes @@ -45,6 +45,8 @@ MODGCONF2_LIBDEP= No CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --with-libiconv-prefix=${LOCALBASE} \ + --with-libintl-prefix=${LOCALBASE} \ --enable-perl \ --enable-ipv6 \ --enable-dbus \ Index: distinfo =================================================================== RCS file: /cvs/ports/net/xchat/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 29 Oct 2008 11:31:29 -0000 1.14 +++ distinfo 20 Sep 2010 09:35:23 -0000 @@ -1,5 +1,5 @@ -MD5 (xchat-2.8.6.tar.bz2) = HyZwhl1DojqavFlt3pmayg== -RMD160 (xchat-2.8.6.tar.bz2) = vBmeO1ip2z39nyr2usf7YWLFPW4= -SHA1 (xchat-2.8.6.tar.bz2) = enRj5lyybGgO1w3ZbOyYvMBUNaQ= -SHA256 (xchat-2.8.6.tar.bz2) = jInb82MEuZNjp/CQ1pVEdlMQK0UoyiqjZ6Kr5c/xdG0= -SIZE (xchat-2.8.6.tar.bz2) = 1423645 +MD5 (xchat-2.8.8.tar.bz2) = Z3XETzjoTQbAbDNrMsSkUg== +RMD160 (xchat-2.8.8.tar.bz2) = G8Pg/wDhXINYjdIaPvPo40+VMzE= +SHA1 (xchat-2.8.8.tar.bz2) = pKwWHk5A9LurxJJnWh/0OA26jWg= +SHA256 (xchat-2.8.8.tar.bz2) = DW1pQ3teHkXz5mJw/jaTRJQ96KEZDkmPr6UpYxWifbA= +SIZE (xchat-2.8.8.tar.bz2) = 1509993 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/net/xchat/patches/patch-Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-Makefile_in --- patches/patch-Makefile_in 29 Oct 2008 11:31:29 -0000 1.1 +++ patches/patch-Makefile_in 20 Sep 2010 09:35:23 -0000 @@ -1,11 +1,11 @@ $OpenBSD: patch-Makefile_in,v 1.1 2008/10/29 11:31:29 ajacoutot Exp $ ---- Makefile.in.orig Wed Oct 29 11:04:40 2008 -+++ Makefile.in Wed Oct 29 11:04:52 2008 -@@ -310,7 +310,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config +--- Makefile.in.orig Mon Sep 20 10:23:38 2010 ++++ Makefile.in Mon Sep 20 10:23:44 2010 +@@ -365,7 +365,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/net/xchat/patches/patch-configure,v retrieving revision 1.5 diff -u -p -r1.5 patch-configure --- patches/patch-configure 29 Oct 2008 11:31:29 -0000 1.5 +++ patches/patch-configure 20 Sep 2010 09:35:23 -0000 @@ -1,26 +1,52 @@ $OpenBSD: patch-configure,v 1.5 2008/10/29 11:31:29 ajacoutot Exp $ ---- configure.orig Wed Jun 11 10:34:27 2008 -+++ configure Wed Oct 29 11:01:55 2008 -@@ -22291,13 +22291,13 @@ fi +--- configure.orig Mon Sep 20 10:02:51 2010 ++++ configure Mon Sep 20 10:08:38 2010 +@@ -12694,13 +12694,13 @@ rm -f core conftest.err conftest.$ac_objext \ + if test -n "$gl_have_pthread"; then + # The program links fine without libpthread. But it may actually + # need to link with libpthread in order to create multiple threads. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -pthread" >&5 ++$as_echo_n "checking for pthread_kill in -pthread... " >&6; } + if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpthread $LIBS" ++LIBS="-pthread $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -12731,7 +12731,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 + $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } + if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then : +- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread ++ LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread + # On Solaris and HP-UX, most pthread functions exist also in libc. + # Therefore pthread_in_use() needs to actually try to create a + # thread: pthread_create from libc will fail, whereas +@@ -12747,13 +12747,13 @@ fi else # Some library is needed. Try libpthread and libc_r. -- { echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5 --echo $ECHO_N "checking for pthread_kill in -lpthread... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for pthread_kill in -pthread" >&5 -+echo $ECHO_N "checking for pthread_kill in -pthread... $ECHO_C" >&6; } - if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -pthread" >&5 ++$as_echo_n "checking for pthread_kill in -pthread... " >&6; } + if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="-pthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22354,8 +22354,8 @@ fi - echo "${ECHO_T}$ac_cv_lib_pthread_pthread_kill" >&6; } - if test $ac_cv_lib_pthread_pthread_kill = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -12785,8 +12785,8 @@ fi + $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } + if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then : gl_have_pthread=yes - LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread @@ -29,7 +55,7 @@ $OpenBSD: patch-configure,v 1.5 2008/10/ fi if test -z "$gl_have_pthread"; then -@@ -27602,7 +27602,7 @@ _ACEOF +@@ -16130,7 +16130,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h @@ -38,23 +64,12 @@ $OpenBSD: patch-configure,v 1.5 2008/10/ -@@ -33409,7 +33409,7 @@ LIBTHREAD!$LIBTHREAD$ac_delim - LTLIBTHREAD!$LTLIBTHREAD$ac_delim - LIBMULTITHREAD!$LIBMULTITHREAD$ac_delim - LTLIBMULTITHREAD!$LTLIBMULTITHREAD$ac_delim --LIBICONV!$LIBICONV$ac_delim -+LIBICONV!$LTLIBICONV$ac_delim - LTLIBICONV!$LTLIBICONV$ac_delim - INTLBISON!$INTLBISON$ac_delim - GLIBC21!$GLIBC21$ac_delim -@@ -33427,8 +33427,8 @@ INSTOBJEXT!$INSTOBJEXT$ac_delim - GENCAT!$GENCAT$ac_delim - INTLOBJS!$INTLOBJS$ac_delim - INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim --INTLLIBS!$INTLLIBS$ac_delim --LIBINTL!$LIBINTL$ac_delim -+INTLLIBS!$LTLIBINTL$ac_delim -+LIBINTL!$LTLIBINTL$ac_delim - LTLIBINTL!$LTLIBINTL$ac_delim - POSUB!$POSUB$ac_delim - sedpath!$sedpath$ac_delim +@@ -17414,7 +17414,7 @@ $as_echo_n "checking Python compile flags... " >&6; } + PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'` + PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'` + if test -f $PY_INC/Python.h; then +- PY_LIBS="-L$PY_LIB/config -lpython$PY_VER -lpthread -lutil" ++ PY_LIBS="-L$PY_LIB/config -lpython$PY_VER -pthread -lutil" + PY_CFLAGS="-I$PY_INC" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } Index: patches/patch-src_common_dbus_Makefile_in =================================================================== RCS file: /cvs/ports/net/xchat/patches/patch-src_common_dbus_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_common_dbus_Makefile_in --- patches/patch-src_common_dbus_Makefile_in 29 Oct 2008 11:31:29 -0000 1.1 +++ patches/patch-src_common_dbus_Makefile_in 20 Sep 2010 09:35:23 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_common_dbus_Makefile_in,v 1.1 2008/10/29 11:31:29 ajacoutot Exp $ ---- src/common/dbus/Makefile.in.orig Wed Jun 11 10:34:23 2008 -+++ src/common/dbus/Makefile.in Wed Oct 29 12:24:39 2008 -@@ -301,7 +301,7 @@ servicedir = $(DBUS_SERVICES_DIR) +--- src/common/dbus/Makefile.in.orig Mon Sep 20 10:24:49 2010 ++++ src/common/dbus/Makefile.in Mon Sep 20 10:25:46 2010 +@@ -329,7 +329,7 @@ servicedir = $(DBUS_SERVICES_DIR) service_in_files = org.xchat.service.service.in service_DATA = $(service_in_files:.service.in=.service) @do_gconf_t...@gconf_schema_config_source = `$(GCONFTOOL) --get-default-source` @@ -10,7 +10,7 @@ $OpenBSD: patch-src_common_dbus_Makefile @do_gconf_t...@schemadir = $(GCONF_SCHEMA_FILE_DIR) @do_gconf_t...@schema_data = apps_xchat_url_handler.schemas all: $(BUILT_SOURCES) -@@ -560,7 +560,7 @@ info: info-am +@@ -608,7 +608,7 @@ info: info-am info-am: Index: patches/patch-src_fe-gtk_fe-gtk_c =================================================================== RCS file: patches/patch-src_fe-gtk_fe-gtk_c diff -N patches/patch-src_fe-gtk_fe-gtk_c --- patches/patch-src_fe-gtk_fe-gtk_c 27 Apr 2010 21:22:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_fe-gtk_fe-gtk_c,v 1.1 2010/04/27 21:22:00 jasper Exp $ - -"Fix" with gtk+ 2.20. - ---- src/fe-gtk/fe-gtk.c.orig Tue Apr 27 23:07:39 2010 -+++ src/fe-gtk/fe-gtk.c Tue Apr 27 23:09:53 2010 -@@ -16,8 +16,6 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - --#define GTK_DISABLE_DEPRECATED -- - #include <stdio.h> - #include <string.h> - #include <stdlib.h> Index: patches/patch-src_fe-gtk_maingui_c =================================================================== RCS file: patches/patch-src_fe-gtk_maingui_c diff -N patches/patch-src_fe-gtk_maingui_c --- patches/patch-src_fe-gtk_maingui_c 27 Apr 2010 21:22:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_fe-gtk_maingui_c,v 1.1 2010/04/27 21:22:00 jasper Exp $ - -"Fix" with gtk+ 2.20. - ---- src/fe-gtk/maingui.c.orig Tue Apr 27 23:10:00 2010 -+++ src/fe-gtk/maingui.c Tue Apr 27 23:10:05 2010 -@@ -16,8 +16,6 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - --#define GTK_DISABLE_DEPRECATED -- - #include <stdlib.h> - #include <string.h> - #include <stdio.h> Index: patches/patch-src_fe-gtk_menu_c =================================================================== RCS file: patches/patch-src_fe-gtk_menu_c diff -N patches/patch-src_fe-gtk_menu_c --- patches/patch-src_fe-gtk_menu_c 27 Apr 2010 21:22:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_fe-gtk_menu_c,v 1.1 2010/04/27 21:22:00 jasper Exp $ - -"Fix" with gtk+ 2.20. - ---- src/fe-gtk/menu.c.orig Tue Apr 27 23:10:27 2010 -+++ src/fe-gtk/menu.c Tue Apr 27 23:10:32 2010 -@@ -16,8 +16,6 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - --#define GTK_DISABLE_DEPRECATED -- - #include <stdio.h> - #include <stdlib.h> - #include <fcntl.h> Index: patches/patch-src_fe-gtk_xtext_h =================================================================== RCS file: patches/patch-src_fe-gtk_xtext_h diff -N patches/patch-src_fe-gtk_xtext_h --- patches/patch-src_fe-gtk_xtext_h 29 Oct 2008 11:31:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_fe-gtk_xtext_h,v 1.1 2008/10/29 11:31:29 ajacoutot Exp $ ---- src/fe-gtk/xtext.h.orig Sun Feb 24 05:48:02 2008 -+++ src/fe-gtk/xtext.h Wed Oct 29 10:25:26 2008 -@@ -270,6 +270,6 @@ void gtk_xtext_set_wordwrap (GtkXText *xtext, gboolean - xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext); - void gtk_xtext_buffer_free (xtext_buffer *buf); - void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render); --GtkType gtk_xtext_get_type (void); -+GType gtk_xtext_get_type (void); - - #endif Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/xchat/pkg/PLIST,v retrieving revision 1.26 diff -u -p -r1.26 PLIST --- pkg/PLIST 22 Dec 2009 00:31:23 -0000 1.26 +++ pkg/PLIST 20 Sep 2010 09:35:23 -0000 @@ -6,8 +6,6 @@ lib/xchat/plugins/ @comment lib/xchat/plugins/perl.a @comment lib/xchat/plugins/perl.la share/applications/xchat.desktop -share/dbus-1/ -share/dbus-1/services/ share/dbus-1/services/org.xchat.service.service share/locale/be/LC_MESSAGES/xchat.mo share/locale/ca/LC_MESSAGES/xchat.mo @@ -21,11 +19,13 @@ share/locale/gl/LC_MESSAGES/xchat.mo share/locale/hu/LC_MESSAGES/xchat.mo share/locale/it/LC_MESSAGES/xchat.mo share/locale/ja/LC_MESSAGES/xchat.mo +share/locale/kn/LC_MESSAGES/xchat.mo share/locale/ko/LC_MESSAGES/xchat.mo share/locale/lt/LC_MESSAGES/xchat.mo share/locale/mk/LC_MESSAGES/xchat.mo share/locale/nl/LC_MESSAGES/xchat.mo share/locale/pa/LC_MESSAGES/xchat.mo +share/locale/pl/LC_MESSAGES/xchat.mo share/locale/pt/LC_MESSAGES/xchat.mo share/locale/ru/LC_MESSAGES/xchat.mo share/locale/sq/LC_MESSAGES/xchat.mo