Date: 15 Oct 2002 12:22:05 -0400 From: Joe Marcus Clarke <marcus@marcuscom.com> To: jim@FreeBSD.ORG Cc: Christian Laursen <xi@borderworlds.dk>, FreeBSD-gnats-submit@FreeBSD.ORG, gnome@FreeBSD.ORG Subject: Re: ports/44051: Update X-Chat to 1.8.10 Message-ID: <1034698926.335.25.camel@gyros.marcuscom.com> In-Reply-To: <20021015080415.GA55696@soupnazi.org> References: <200210141420.g9EEKAOw067593@freefall.freebsd.org> <m37kgk98hm.fsf@borg.borderworlds.dk> <20021015080415.GA55696@soupnazi.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-plIAe3YJy7neL7W92Zrt Content-Type: text/plain Content-Transfer-Encoding: 7bit On Tue, 2002-10-15 at 04:04, Jim Mock wrote: > On Mon, 14 Oct 2002 at 20:32:37 +0200, Christian Laursen wrote: > > Christian Laursen <xi@borderworlds.dk> writes: > > > > >Number: 44051 > > > > >Category: ports > > > > >Synopsis: Update X-Chat to 1.8.10 > > > > > > Hmm, this doesn't seem to work. The build is broken somehow. > > > I'll need to figure it out and send an updated diff. > > > > It seems to be NLS that is broken somehow. > > > > Either someone needs to fix that, or it can just be disabled. > > This is exactly why it hasn't been updated yet. Also, the fact that > none of the about 10 people who "let me know" 1.8.10 was out didn't > include any diffs. I currently don't have access to a FreeBSD machine > with X on it, so no working diffs == no update. I did have the ability > to test it a month or two ago (shortly after 1.8.10 came out) but didn't > get a chance to look into the NLS issue before I lost my connectivity > and boxes with X. > > Disabling NLS support does (or did when I tested it) seem to work, but > that seems like a fairly crappy option when the current ported version > actually builds with NLS support. > > I've Cc'd gnome@FreeBSD.org on this to see if anybody shows interest in > looking into the NLS stuff. If not, and there's enough demand where > users want the upgrade and don't care about the NLS support, I'll commit > it. I'll give it a week or so. > Here you go. This will update the port to 1.8.10, fix the NLS issues, and add two plist entries. Joe -- PGP Key : http://www.marcuscom.com/pgp.asc --=-plIAe3YJy7neL7W92Zrt Content-Disposition: attachment; filename=xchat.diff Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; name=xchat.diff; charset=ISO8859-1 diff -ruN xchat.orig/Makefile xchat/Makefile --- xchat.orig/Makefile Tue Oct 15 12:21:10 2002 +++ xchat/Makefile Tue Oct 15 12:19:39 2002 @@ -6,7 +6,7 @@ # =20 PORTNAME=3D xchat -PORTVERSION=3D 1.8.9 +PORTVERSION=3D 1.8.10 CATEGORIES+=3D irc gnome ipv6 MASTER_SITES=3D http://xchat.org/files/source/1.8/ \ http://xchat.linuxpower.org/files/source/1.8/ diff -ruN xchat.orig/distinfo xchat/distinfo --- xchat.orig/distinfo Tue Oct 15 12:21:10 2002 +++ xchat/distinfo Tue Oct 15 12:13:21 2002 @@ -1 +1 @@ -MD5 (xchat-1.8.9.tar.bz2) =3D a7d3723053fbee23399647f88afd15fa +MD5 (xchat-1.8.10.tar.bz2) =3D 9295830df5d040d7723620322a65f89c diff -ruN xchat.orig/files/patch-configure xchat/files/patch-configure --- xchat.orig/files/patch-configure Wed Dec 31 19:00:00 1969 +++ xchat/files/patch-configure Tue Oct 15 12:19:00 2002 @@ -0,0 +1,51 @@ +--- configure.orig Tue Oct 15 12:18:08 2002 ++++ configure Tue Oct 15 12:18:50 2002 +@@ -3221,10 +3221,10 @@ + #include "confdefs.h" + #include <libintl.h> + extern int _nl_msg_cat_cntr; +-extern int *_nl_domain_bindings; ++extern int *libintl_nl_domain_bindings; + int main() { + bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings ++return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_binding= s + ; return 0; } + EOF + if { (eval echo configure:3231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5;= } && test -s conftest${ac_exeext}; then +@@ -3610,7 +3610,7 @@ + #include "confdefs.h" + #include <libintl.h> + extern int _nl_msg_cat_cntr; +-extern int *_nl_domain_bindings; ++extern int *libintl_nl_domain_bindings; + extern + #ifdef __cplusplus + "C" +@@ -3618,7 +3618,7 @@ + const char *_nl_expand_alias (); + int main() { + bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_n= l_expand_alias (0) ++return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_binding= s + *_nl_expand_alias (0) + ; return 0; } + EOF + if { (eval echo configure:3625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5;= } && test -s conftest${ac_exeext}; then +@@ -3638,7 +3638,7 @@ + #include "confdefs.h" + #include <libintl.h> + extern int _nl_msg_cat_cntr; +-extern int *_nl_domain_bindings; ++extern int *libintl_nl_domain_bindings; + extern + #ifdef __cplusplus + "C" +@@ -3646,7 +3646,7 @@ + const char *_nl_expand_alias (); + int main() { + bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_n= l_expand_alias (0) ++return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_binding= s + *_nl_expand_alias (0) + ; return 0; } + EOF + if { (eval echo configure:3653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5;= } && test -s conftest${ac_exeext}; then diff -ruN xchat.orig/pkg-plist xchat/pkg-plist --- xchat.orig/pkg-plist Tue Oct 15 12:21:10 2002 +++ xchat/pkg-plist Tue Oct 15 12:20:50 2002 @@ -34,6 +34,7 @@ share/locale/lv/LC_MESSAGES/xchat.mo share/locale/nl/LC_MESSAGES/xchat.mo share/locale/no/LC_MESSAGES/xchat.mo +share/locale/pl/LC_MESSAGES/xchat.mo share/locale/pt/LC_MESSAGES/xchat.mo share/locale/pt_BR/LC_MESSAGES/xchat.mo share/locale/ro/LC_MESSAGES/xchat.mo @@ -44,5 +45,6 @@ share/locale/sv/LC_MESSAGES/xchat.mo share/locale/tr/LC_MESSAGES/xchat.mo share/locale/uk/LC_MESSAGES/xchat.mo +share/locale/vi/LC_MESSAGES/xchat.mo share/locale/zh_CN/LC_MESSAGES/xchat.mo share/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo --=-plIAe3YJy7neL7W92Zrt-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1034698926.335.25.camel>