From owner-freebsd-gnome@FreeBSD.ORG Fri Mar 5 23:31:32 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 EE6E716A4CE for ; Fri, 5 Mar 2004 23:31:31 -0800 (PST) Received: from lakemtao06.cox.net (lakemtao06.cox.net [68.1.17.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E57143D2D for ; Fri, 5 Mar 2004 23:31:31 -0800 (PST) (envelope-from mezz7@cox.net) Received: from mezz.mezzweb.com ([68.103.32.11]) by lakemtao06.cox.net (InterMail vM.5.01.06.08 201-253-122-130-108-20031117) with ESMTP id <20040306073129.BXWA20509.lakemtao06.cox.net@mezz.mezzweb.com> for ; Sat, 6 Mar 2004 02:31:29 -0500 Date: Sat, 06 Mar 2004 01:30:25 -0600 To: freebsd-gnome@freebsd.org From: Jeremy Messenger Content-Type: multipart/mixed; boundary=----------kmSWNae0DBjqbG3mnxykjj MIME-Version: 1.0 Message-ID: User-Agent: Opera7.23/Linux M2 build 518 Subject: 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:31:32 -0000 ------------kmSWNae0DBjqbG3mnxykjj Content-Type: text/plain; format=flowed; charset=iso-8859-1 Content-Transfer-Encoding: 8bit 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. ------------kmSWNae0DBjqbG3mnxykjj Content-Disposition: attachment; filename=ORBit2.diff Content-Type: text/plain; name=ORBit2.diff Content-Transfer-Encoding: 8bit diff -urN ORBit2.orig/Makefile ORBit2/Makefile --- ORBit2.orig/Makefile Tue Feb 17 21:12:20 2004 +++ ORBit2/Makefile Fri Mar 5 23:44:24 2004 @@ -6,10 +6,10 @@ # PORTNAME= ORBit2 -PORTVERSION= 2.9.8 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.9 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,7 +22,7 @@ USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes -USE_GNOME= gnomehack libidl +USE_GNOME= gnomehack lthack libidl CONFIGURE_ARGS= --disable-indent \ --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff -urN ORBit2.orig/distinfo ORBit2/distinfo --- ORBit2.orig/distinfo Tue Feb 17 21:12:20 2004 +++ ORBit2/distinfo Fri Mar 5 23:31:27 2004 @@ -1,2 +1,2 @@ -MD5 (gnome2/ORBit2-2.9.8.tar.bz2) = 41d73750e8477c793621d22b86cb3827 -SIZE (gnome2/ORBit2-2.9.8.tar.bz2) = 643208 +MD5 (gnome2/ORBit2-2.10.0.tar.bz2) = fe86ec038fc51ee0e90e84169a8dda6c +SIZE (gnome2/ORBit2-2.10.0.tar.bz2) = 643687 diff -urN ORBit2.orig/files/patch-ab ORBit2/files/patch-ab --- ORBit2.orig/files/patch-ab Thu Oct 23 11:33:58 2003 +++ ORBit2/files/patch-ab Fri Mar 5 23:36:25 2004 @@ -1,17 +1,17 @@ ---- Makefile.in.orig Sat Jun 14 01:50:29 2003 -+++ Makefile.in Sat Jun 14 01:51:03 2003 -@@ -35,7 +35,7 @@ - DESTDIR = - +--- Makefile.in.orig Fri Mar 5 23:34:38 2004 ++++ Makefile.in Fri Mar 5 23:35:59 2004 +@@ -34,7 +34,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(prefix)/libdata/pkgconfig pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . -@@ -115,7 +115,7 @@ - AUTOMAKE_OPTIONS = 1.3 +@@ -125,7 +125,7 @@ + + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -SUBDIRS = linc2 src include test docs +SUBDIRS = linc2 src include docs diff -urN ORBit2.orig/files/patch-configure ORBit2/files/patch-configure --- ORBit2.orig/files/patch-configure Thu Oct 23 11:33:58 2003 +++ ORBit2/files/patch-configure Wed Dec 31 18:00:00 1969 @@ -1,13 +0,0 @@ - -$FreeBSD: ports/devel/ORBit2/files/patch-configure,v 1.3 2003/09/18 06:49:20 marcus Exp $ - ---- configure 2002/04/26 07:38:33 1.1 -+++ configure 2002/04/26 07:38:42 -@@ -6201,6 +6201,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 ORBit2.orig/files/patch-src::orb::util::Makefile.in ORBit2/files/patch-src::orb::util::Makefile.in --- ORBit2.orig/files/patch-src::orb::util::Makefile.in Thu Oct 23 11:33:58 2003 +++ ORBit2/files/patch-src::orb::util::Makefile.in Fri Mar 5 23:40:22 2004 @@ -1,6 +1,6 @@ ---- src/orb/util/Makefile.in.orig Tue Jul 15 13:16:53 2003 -+++ src/orb/util/Makefile.in Tue Jul 15 13:17:32 2003 -@@ -189,7 +189,7 @@ +--- src/orb/util/Makefile.in.orig Fri Mar 5 23:39:16 2004 ++++ src/orb/util/Makefile.in Fri Mar 5 23:39:43 2004 +@@ -126,7 +126,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ diff -urN ORBit2.orig/files/patch-src_orb_orb-core_orbit-typelib.c ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c --- ORBit2.orig/files/patch-src_orb_orb-core_orbit-typelib.c Thu Oct 23 11:33:58 2003 +++ ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c Fri Mar 5 23:43:47 2004 @@ -1,6 +1,6 @@ ---- src/orb/orb-core/orbit-typelib.c.orig Sun May 11 20:37:14 2003 -+++ src/orb/orb-core/orbit-typelib.c Sun May 11 20:40:42 2003 -@@ -215,6 +215,8 @@ +--- src/orb/orb-core/orbit-typelib.c.orig Fri Mar 5 23:42:33 2004 ++++ src/orb/orb-core/orbit-typelib.c Fri Mar 5 23:43:00 2004 +@@ -218,6 +218,8 @@ paths = g_ptr_array_sized_new (8); g_ptr_array_add (paths, g_strdup (ORBIT_TYPELIB_DIR)); ------------kmSWNae0DBjqbG3mnxykjj 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 00:47:42 2004 @@ -1,41 +1,17 @@ ---- 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 00:45:10 2004 ++++ po/zh_CN.po Sat Mar 6 00:47:08 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" ++msgstr "%m月%-d日 %H:%M" # gal/e-table/e-cell-date.c:106 #: gal/e-table/e-cell-date.c:98 msgid "%b %d %Y" -msgstr "%Y年%-m月%-d日" -+msgstr "%Y年%m月%d日" ++msgstr "%Y年%m月%-d日" #: gal/e-table/e-cell-pixbuf.c:392 msgid "Selected Column" 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 @@ -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 ------------kmSWNae0DBjqbG3mnxykjj Content-Disposition: attachment; filename=ggv2.diff Content-Type: text/plain; name=ggv2.diff Content-Transfer-Encoding: 8bit diff -ur ggv2.orig/Makefile ggv2/Makefile --- ggv2.orig/Makefile Fri Feb 13 16:58:04 2004 +++ ggv2/Makefile Sat Mar 6 00:05:19 2004 @@ -6,7 +6,7 @@ # PORTNAME= ggv2 -PORTVERSION= 2.5.4 +PORTVERSION= 2.5.99 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 diff -ur ggv2.orig/distinfo ggv2/distinfo --- ggv2.orig/distinfo Fri Feb 13 16:58:04 2004 +++ ggv2/distinfo Sat Mar 6 00:05:35 2004 @@ -1,2 +1,2 @@ -MD5 (gnome2/ggv-2.5.4.tar.bz2) = 41494014589822d6f605be1b7f834d4f -SIZE (gnome2/ggv-2.5.4.tar.bz2) = 1170337 +MD5 (gnome2/ggv-2.5.99.tar.bz2) = 7f75b4b30165f1e1ea3be0ec6e8b5c46 +SIZE (gnome2/ggv-2.5.99.tar.bz2) = 1175214 diff -ur ggv2.orig/files/patch-src_Makefile.in ggv2/files/patch-src_Makefile.in --- ggv2.orig/files/patch-src_Makefile.in Mon Dec 29 16:22:54 2003 +++ ggv2/files/patch-src_Makefile.in Sat Mar 6 00:11:04 2004 @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Mon Dec 29 17:22:01 2003 -+++ src/Makefile.in Mon Dec 29 17:22:21 2003 -@@ -145,7 +145,7 @@ +--- src/Makefile.in.orig Sat Mar 6 00:07:03 2004 ++++ src/Makefile.in Sat Mar 6 00:10:34 2004 +@@ -133,7 +133,7 @@ SUBDIRS = recent-files stock cursors ------------kmSWNae0DBjqbG3mnxykjj Content-Disposition: attachment; filename=libsoup.diff Content-Type: text/plain; name=libsoup.diff Content-Transfer-Encoding: 8bit diff -ur libsoup.orig/Makefile libsoup/Makefile --- libsoup.orig/Makefile Wed Mar 3 02:57:06 2004 +++ libsoup/Makefile Sat Mar 6 00:27:08 2004 @@ -6,8 +6,7 @@ # PORTNAME= libsoup -PORTVERSION= 2.1.7 -PORTREVISION= 1 +PORTVERSION= 2.1.8 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.1 diff -ur libsoup.orig/distinfo libsoup/distinfo --- libsoup.orig/distinfo Thu Feb 12 01:27:40 2004 +++ libsoup/distinfo Sat Mar 6 00:27:36 2004 @@ -1,2 +1,2 @@ -MD5 (gnome2/libsoup-2.1.7.tar.bz2) = 20241712388ad3df842109f4c0194674 -SIZE (gnome2/libsoup-2.1.7.tar.bz2) = 336118 +MD5 (gnome2/libsoup-2.1.8.tar.bz2) = 93f682b84339e307ffaa860c4c325507 +SIZE (gnome2/libsoup-2.1.8.tar.bz2) = 336798 diff -ur libsoup.orig/pkg-plist libsoup/pkg-plist --- libsoup.orig/pkg-plist Thu Feb 12 01:27:40 2004 +++ libsoup/pkg-plist Sat Mar 6 00:32:50 2004 @@ -21,7 +21,7 @@ include/libsoup-%%VERSION%%/libsoup/soup.h lib/libsoup-%%VERSION%%.a lib/libsoup-%%VERSION%%.so -lib/libsoup-%%VERSION%%.so.2 +lib/libsoup-%%VERSION%%.so.3 libdata/pkgconfig/libsoup-%%VERSION%%.pc @dirrm %%DOCSDIR%% @dirrm include/libsoup-%%VERSION%%/libsoup ------------kmSWNae0DBjqbG3mnxykjj--