From owner-freebsd-gnome@FreeBSD.ORG Fri Mar 5 23:58:49 2004 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B88516A4CE for ; Fri, 5 Mar 2004 23:58:49 -0800 (PST) Received: from lakemtao05.cox.net (lakemtao05.cox.net [68.1.17.116]) by mx1.FreeBSD.org (Postfix) with ESMTP id C704543D39 for ; Fri, 5 Mar 2004 23:58:48 -0800 (PST) (envelope-from mezz7@cox.net) Received: from mezz.mezzweb.com ([68.103.32.11]) by lakemtao05.cox.net (InterMail vM.5.01.06.08 201-253-122-130-108-20031117) with ESMTP id <20040306075846.XYD24099.lakemtao05.cox.net@mezz.mezzweb.com> for ; Sat, 6 Mar 2004 02:58:46 -0500 To: freebsd-gnome@freebsd.org References: Message-ID: From: Jeremy Messenger Content-Type: multipart/mixed; boundary=----------UPAtKd29QRX32MzNGlzGgd MIME-Version: 1.0 Date: Sat, 06 Mar 2004 01:57:38 -0600 In-Reply-To: User-Agent: Opera7.23/Linux M2 build 518 Subject: Re: Update port: Update four ports for MarcusCom CVS... X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Mar 2004 07:58:49 -0000 ------------UPAtKd29QRX32MzNGlzGgd Content-Type: text/plain; format=flowed; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Correct on gal2.diff, because I made a small mistake on create patch-po_zh_CN.po.. Dodging on the '-' part, I hope I didn't miss anything.. Cheers, Mezz On Sat, 06 Mar 2004 01:30:25 -0600, Jeremy Messenger wrote: > Here are four attaches of ORBit2.diff, gal2.diff, ggv2.diff and > libsoup.diff.. Before, you touch the libsoup.diff you might want to > update > gtkhtml3 too at the same time. I haven't touch anything with gtkhtml3 > yet, > I need sleep and I don't think I will be able to do it tomorrow so one of > you should go ahead update it. :-) > > Cheers, > Mezz -- bsdforums.org 's moderator, mezz. ------------UPAtKd29QRX32MzNGlzGgd Content-Disposition: attachment; filename=gal2.diff Content-Type: text/plain; name=gal2.diff Content-Transfer-Encoding: 8bit diff -urN gal2.orig/Makefile gal2/Makefile --- gal2.orig/Makefile Mon Feb 9 17:54:28 2004 +++ gal2/Makefile Sat Mar 6 00:39:35 2004 @@ -6,7 +6,7 @@ # PORTNAME= gal2 -PORTVERSION= 2.1.5 +PORTVERSION= 2.1.6 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.1 @@ -20,8 +20,8 @@ USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix gnomehier intlhack libgnomeui \ - libgnomeprintui +USE_GNOME= gnomehack gnomeprefix gnomehier lthack intlhack \ + libgnomeui libgnomeprintui INSTALLS_SHLIB= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-static --with-libiconv diff -urN gal2.orig/distinfo gal2/distinfo --- gal2.orig/distinfo Mon Feb 9 17:54:28 2004 +++ gal2/distinfo Sat Mar 6 00:38:45 2004 @@ -1,2 +1,2 @@ -MD5 (gnome2/gal-2.1.5.tar.bz2) = 6a6f4d76d3b06c56ca01b8d5a09d9431 -SIZE (gnome2/gal-2.1.5.tar.bz2) = 1022128 +MD5 (gnome2/gal-2.1.6.tar.bz2) = 8121fd66132846d643b13720ade3c05b +SIZE (gnome2/gal-2.1.6.tar.bz2) = 1073544 diff -urN gal2.orig/files/patch-ab gal2/files/patch-ab --- gal2.orig/files/patch-ab Tue Dec 9 02:08:15 2003 +++ gal2/files/patch-ab Sat Mar 6 00:41:07 2004 @@ -1,11 +1,11 @@ ---- Makefile.in.orig Mon Dec 8 15:44:58 2003 -+++ Makefile.in Mon Dec 8 15:45:28 2003 -@@ -139,7 +139,7 @@ - YACC = @YACC@ - gnomelocaledir = @gnomelocaledir@ +--- Makefile.in.orig Sat Mar 6 00:40:30 2004 ++++ Makefile.in Sat Mar 6 00:40:40 2004 +@@ -136,7 +136,7 @@ + + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -SUBDIRS = po gal tests docs art +SUBDIRS = po gal docs art - pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gal-2.2.pc diff -urN gal2.orig/files/patch-configure gal2/files/patch-configure --- gal2.orig/files/patch-configure Tue Dec 9 02:08:15 2003 +++ gal2/files/patch-configure Wed Dec 31 18:00:00 1969 @@ -1,10 +0,0 @@ ---- configure.orig Mon Aug 26 00:06:18 2002 -+++ configure Mon Aug 26 00:06:32 2002 -@@ -8242,6 +8242,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' diff -urN gal2.orig/files/patch-po_zh_CN.po gal2/files/patch-po_zh_CN.po --- gal2.orig/files/patch-po_zh_CN.po Sat Dec 27 20:05:04 2003 +++ gal2/files/patch-po_zh_CN.po Sat Mar 6 01:54:45 2004 @@ -1,34 +1,10 @@ ---- po/zh_CN.po.orig Sat Dec 27 21:03:52 2003 -+++ po/zh_CN.po Sat Dec 27 21:04:17 2003 -@@ -31,32 +31,32 @@ - # gal/e-table/e-cell-date.c:58 - #: gal/e-table/e-cell-date.c:58 - msgid "%l:%M %p" --msgstr "%-H:%M" -+msgstr "%H:%M" - - # gal/e-table/e-cell-date.c:66 - #: gal/e-table/e-cell-date.c:66 - msgid "Today %l:%M %p" --msgstr "今天 %-H:%M" -+msgstr "今天 %H:%M" - - # gal/e-table/e-cell-date.c:81 - #: gal/e-table/e-cell-date.c:76 - msgid "Yesterday %l:%M %p" --msgstr "昨天 %-H:%M" -+msgstr "昨天 %H:%M" - - # gal/e-table/e-cell-date.c:96 - #: gal/e-table/e-cell-date.c:88 - msgid "%a %l:%M %p" --msgstr "%A %-H:%M" -+msgstr "%A %H:%M" - +--- po/zh_CN.po.orig Sat Mar 6 01:54:02 2004 ++++ po/zh_CN.po Sat Mar 6 01:54:05 2004 +@@ -51,12 +51,12 @@ # gal/e-table/e-cell-date.c:104 #: gal/e-table/e-cell-date.c:96 msgid "%b %d %l:%M %p" --msgstr "%-m月%-d日 %-H:%M" +-msgstr "%-m月%-d日 %H:%M" +msgstr "%m月%d日 %H:%M" # gal/e-table/e-cell-date.c:106 diff -urN gal2.orig/pkg-plist gal2/pkg-plist --- gal2.orig/pkg-plist Mon Feb 9 17:54:28 2004 +++ gal2/pkg-plist Sat Mar 6 00:58:59 2004 @@ -150,9 +150,9 @@ lib/libgal-%%VERSION%%.a lib/libgal-%%VERSION%%.so lib/libgal-%%VERSION%%.so.0 -lib/libgal-a11y-%%VERSION%%.a -lib/libgal-a11y-%%VERSION%%.so -lib/libgal-a11y-%%VERSION%%.so.0 +lib/libgal-a11y-2.2.a +lib/libgal-a11y-2.2.so +lib/libgal-a11y-2.2.so.0 libdata/pkgconfig/gal-%%VERSION%%.pc share/doc/gal-%%VERSION%%/gal-api.html share/doc/gal-%%VERSION%%/gal-api.sgml @@ -195,6 +195,7 @@ share/locale/da/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/de/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/el/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/es/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/eu/LC_MESSAGES/gal-%%VERSION%%.mo ------------UPAtKd29QRX32MzNGlzGgd--