Date: 09 Dec 2002 00:05:50 +0100 From: Koop Mast <einekoai@chello.nl> To: Joe Marcus Clarke <marcus@FreeBSD.org> Cc: FreeBSD gnome <gnome@FreeBSD.org> Subject: Re: What to do durning the ports freeze Message-ID: <1039388749.583.20.camel@lapbeest.bogus> In-Reply-To: <1039383305.44177.14.camel@shumai.marcuscom.com> References: <1039383305.44177.14.camel@shumai.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-0e7irUNFkWQCdIguwvjd Content-Type: text/plain Content-Transfer-Encoding: 7bit On Sun, 2002-12-08 at 22:35, Joe Marcus Clarke wrote: > Just so you guys don't think I've gotten lazy, I've decided to post the > diffs I've accumulated during the ports freeze. These will be applied > to the main tree as soon as the freeze lifts. They include the Mozilla > 1.2.1 update. Note, for mozilla-gtk2.diff, you will first need to copy > mozilla-devel-gtk2 to mozilla-gtk2, and change the CVS header in > Makefile. Enjoy. > > http://www.marcuscom.com/downloads/freeze/ > > Joe great, i have a little problem with gnome-terminal. will try is tomorrow if it still exists after upgrading i will let you know. i have a little donation to make to the gnome_stuff_to_commit_after_port_freeze :) attached is an update for xchat2 1.9.4 -> 1.9.6. (hope its correct, first try) i know of 1 problem: if you look at pkg-plist you will notice that *.la files are installed can you fix that? -Koop --=-0e7irUNFkWQCdIguwvjd Content-Disposition: attachment; filename=xchat2.diff Content-Type: text/x-patch; name=xchat2.diff; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit diff -ruN xchat2.orig/Makefile xchat2/Makefile --- xchat2.orig/Makefile Sun Dec 8 23:40:56 2002 +++ xchat2/Makefile Sun Dec 8 23:13:21 2002 @@ -6,8 +6,7 @@ # PORTNAME= xchat2 -PORTVERSION= 1.9.4 -PORTREVISION= 1 +PORTVERSION= 1.9.6 CATEGORIES= irc gnome ipv6 MASTER_SITES= http://xchat.org/files/source/1.9/ \ http://xchat.linuxpower.org/files/source/1.9/ diff -ruN xchat2.orig/distinfo xchat2/distinfo --- xchat2.orig/distinfo Sun Dec 8 23:42:07 2002 +++ xchat2/distinfo Sun Dec 8 23:14:05 2002 @@ -1 +1 @@ -MD5 (xchat-1.9.4.tar.bz2) = ed0820b35e5a9c7c5860108a1555236f +MD5 (xchat-1.9.6.tar.bz2) = dc81d4440ac3dac3b30129f0b28c1433 diff -ruN xchat2.orig/files/patch-Makefile.in xchat2/files/patch-Makefile.in --- xchat2.orig/files/patch-Makefile.in Sun Dec 8 23:42:39 2002 +++ xchat2/files/patch-Makefile.in Sun Dec 8 23:38:52 2002 @@ -1,11 +1,11 @@ ---- Makefile.in.orig Sat Aug 17 23:57:01 2002 -+++ Makefile.in Sat Aug 17 23:57:45 2002 -@@ -122,7 +122,7 @@ +--- Makefile.in.orig Sun Dec 8 23:16:00 2002 ++++ Makefile.in Sun Dec 8 23:16:41 2002 +@@ -145,7 +145,7 @@ icondir = $(datadir)/pixmaps util_DATA = xchat.desktop --utildir = $(sysconfdir)/X11/applnk/Internet +-utildir = $(datadir)/applications +utildir = $(datadir)/apps/Internet + subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h diff -ruN xchat2.orig/files/patch-configure xchat2/files/patch-configure --- xchat2.orig/files/patch-configure Sun Dec 8 23:42:30 2002 +++ xchat2/files/patch-configure Sun Dec 8 23:19:12 2002 @@ -1,51 +1,20 @@ ---- configure.orig Sat Aug 17 23:42:13 2002 -+++ configure Sat Aug 17 23:42:55 2002 -@@ -3211,10 +3211,10 @@ +--- configure.orig Sun Dec 8 23:17:31 2002 ++++ configure Sun Dec 8 23:18:21 2002 +@@ -10381,7 +10381,7 @@ #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() { + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" +@@ -10392,7 +10392,7 @@ + main () + { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings +return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings - ; return 0; } - EOF - if { (eval echo configure:3221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -3600,7 +3600,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" -@@ -3608,7 +3608,7 @@ - const char *_nl_expand_alias (); - int main() { - bindtextdomain ("", ""); --return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0) -+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings + *_nl_expand_alias (0) - ; return 0; } - EOF - if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -3628,7 +3628,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" -@@ -3636,7 +3636,7 @@ - const char *_nl_expand_alias (); - int main() { - bindtextdomain ("", ""); --return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0) -+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings + *_nl_expand_alias (0) - ; return 0; } - EOF - if { (eval echo configure:3643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ; + return 0; + } diff -ruN xchat2.orig/pkg-plist xchat2/pkg-plist --- xchat2.orig/pkg-plist Sun Dec 8 23:41:49 2002 +++ xchat2/pkg-plist Sun Dec 8 23:39:05 2002 @@ -1,6 +1,8 @@ bin/xchat bin/xchat-text +lib/xchat/plugins/perl.la lib/xchat/plugins/perl.so +%%PYTHON%%lib/xchat/plugins/python.la %%PYTHON%%lib/xchat/plugins/python.so share/gnome/apps/Internet/xchat.desktop share/gnome/pixmaps/xchat.png @@ -10,6 +12,7 @@ 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/fi/LC_MESSAGES/xchat.mo share/locale/fr/LC_MESSAGES/xchat.mo share/locale/he/LC_MESSAGES/xchat.mo --=-0e7irUNFkWQCdIguwvjd-- 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?1039388749.583.20.camel>