diff --git a/x11/gnome/utils/Makefile b/x11/gnome/utils/Makefile index 89f876f24f4..1dda280a98e 100644 --- a/x11/gnome/utils/Makefile +++ b/x11/gnome/utils/Makefile @@ -1,35 +1,34 @@ -# $OpenBSD: Makefile,v 1.8 2004/12/15 13:57:57 alek Exp $ +# $OpenBSD: Makefile,v 1.9 2005/05/26 22:54:07 marcm Exp $ COMMENT= "GNOME utility programs" -DISTNAME= gnome-utils-2.8.1 +DISTNAME= gnome-utils-2.10.1 CATEGORIES= x11/gnome HOMEPAGE= http://www.gnome.org/ -MAINTAINER= Marc Matteo - # GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE ORBit-2 SM X11 Xcursor Xext Xft Xinerama Xrender \ +WANTLIB= ICE ORBit-2 SM X11 Xext Xft Xrender \ art_lgpl_2 atk-1.0.0.0 bonobo-2 bonobo-activation bonoboui-2 c \ fontconfig freetype gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \ glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 gnome-desktop-2 \ gnomecanvas-2 gnomevfs-2 gobject-2.0.0.0 gthread-2.0.0.0 \ gtk-x11-2.0.0.0 iconv intl m pango-1.0.0.0 pangoft2-1.0.0.0 \ pangox-1.0.0.0 pangoxft-1.0.0.0 popt pthread \ - startup-notification-1 xml2 z + gnomeprint-2-2 glade-2.0.0.0 startup-notification-1 xml2 z -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-utils/2.8/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-utils/2.10/} EXTRACT_SUFX= .tar.bz2 BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \ :p5-XML-Parser-*:textproc/p5-XML-Parser LIB_DEPENDS= gnomeui-2.200::x11/gnome/libgnomeui \ - panel-applet-2::x11/gnome/panel + panel-applet-2::x11/gnome/panel \ + gnomeprintui-2-2::x11/gnome/libgnomeprintui USE_X11= Yes USE_GMAKE= Yes diff --git a/x11/gnome/utils/distinfo b/x11/gnome/utils/distinfo index 7643ef4cb68..fac23ea0c50 100644 --- a/x11/gnome/utils/distinfo +++ b/x11/gnome/utils/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome-utils-2.8.1.tar.bz2) = 048224275454781c7eebc5afd4004069 -RMD160 (gnome-utils-2.8.1.tar.bz2) = f3133d8b84d57d1df009e5cf9007b651ab533f37 -SHA1 (gnome-utils-2.8.1.tar.bz2) = 96a01c3b6e5d1b1abf474918f6d3ab8ffe519c53 -SIZE (gnome-utils-2.8.1.tar.bz2) = 1738576 +MD5 (gnome-utils-2.10.1.tar.bz2) = 78c0afdc112757b13d203fe1ad9c04ad +RMD160 (gnome-utils-2.10.1.tar.bz2) = 5951b162ebed5899586bad9d6521b12377fe7050 +SHA1 (gnome-utils-2.10.1.tar.bz2) = 09b6f6c5d9ff52a8e60f1d251cb59bb0338cb9b0 +SIZE (gnome-utils-2.10.1.tar.bz2) = 2049143 diff --git a/x11/gnome/utils/patches/patch-logview_log_repaint_c b/x11/gnome/utils/patches/patch-logview_log_repaint_c deleted file mode 100644 index 3d71f017296..00000000000 --- a/x11/gnome/utils/patches/patch-logview_log_repaint_c +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-logview_log_repaint_c,v 1.1.1.1 2003/08/07 02:15:50 marcm Exp $ ---- logview/log_repaint.c.orig Sun Jul 13 22:49:36 2003 -+++ logview/log_repaint.c Sun Jul 13 22:50:06 2003 -@@ -24,7 +24,9 @@ - #include - #include - #include -+#ifdef HAVE_MALLOC_H - #include -+#endif - #include - #include - #include "logview.h" diff --git a/x11/gnome/utils/patches/patch-logview_logrtns_c b/x11/gnome/utils/patches/patch-logview_logrtns_c index 96fc66a1973..9fc6dd892ee 100644 --- a/x11/gnome/utils/patches/patch-logview_logrtns_c +++ b/x11/gnome/utils/patches/patch-logview_logrtns_c @@ -1,27 +1,27 @@ -$OpenBSD: patch-logview_logrtns_c,v 1.3 2004/06/23 03:26:20 marcm Exp $ ---- logview/logrtns.c.orig 2003-11-09 19:33:05.000000000 -0700 -+++ logview/logrtns.c 2004-06-21 17:13:22.000000000 -0600 -@@ -792,7 +792,7 @@ ReadLogStats (Log * log) - if (IsLeapYear (curmark->year - lastyear + thisyear)) - curmark->time += 24 * 60 * 60; /* Add one day */ - +$OpenBSD: patch-logview_logrtns_c,v 1.4 2005/05/26 22:54:07 marcm Exp $ +--- logview/logrtns.c.orig Wed Mar 2 07:23:27 2005 ++++ logview/logrtns.c Thu May 26 10:17:08 2005 +@@ -645,7 +645,7 @@ ReadLogStats (Log *log, gchar **buffer_l + if (IsLeapYear (curmark->year - lastyear + thisyear)) + curmark->time += 24 * 60 * 60; /* Add one day */ + -#if defined(__NetBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) - curmark->time += correction - tmptm->tm_gmtoff; + curmark->time += correction - tmptm->tm_gmtoff; #else - curmark->time += correction - timezone; -@@ -818,7 +818,7 @@ ReadLogStats (Log * log) + curmark->time += correction - timezone; +@@ -669,7 +669,7 @@ ReadLogStats (Log *log, gchar **buffer_l if (IsLeapYear (thisyear)) - log->lstats.enddate += 24 * 60 * 60; /* Add one day */ - + log->lstats.enddate += 24 * 60 * 60; /* Add one day */ + -#if defined(__NetBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) log->lstats.enddate += correction - tmptm->tm_gmtoff; #else log->lstats.enddate += correction - timezone; -@@ -829,7 +829,7 @@ ReadLogStats (Log * log) +@@ -680,7 +680,7 @@ ReadLogStats (Log *log, gchar **buffer_l if (IsLeapYear (thisyear - lastyear)) - log->lstats.startdate += 24 * 60 * 60; /* Add one day */ + log->lstats.startdate += 24 * 60 * 60; /* Add one day */ -#if defined(__NetBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) diff --git a/x11/gnome/utils/patches/patch-logview_logrtns_h b/x11/gnome/utils/patches/patch-logview_logrtns_h deleted file mode 100644 index fa8b25baeb0..00000000000 --- a/x11/gnome/utils/patches/patch-logview_logrtns_h +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-logview_logrtns_h,v 1.1.1.1 2003/08/07 02:15:50 marcm Exp $ ---- logview/logrtns.h.orig Sun Jul 13 22:46:52 2003 -+++ logview/logrtns.h Sun Jul 13 22:47:19 2003 -@@ -24,7 +24,9 @@ - #include - #include - #include -+#ifdef HAVE_MALLOC_H - #include -+#endif - #include - #include "logview.h" - diff --git a/x11/gnome/utils/patches/patch-po_Makefile_in_in b/x11/gnome/utils/patches/patch-po_Makefile_in_in deleted file mode 100644 index 67019ca9e30..00000000000 --- a/x11/gnome/utils/patches/patch-po_Makefile_in_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2003/08/07 02:15:50 marcm Exp $ ---- po/Makefile.in.in.orig Sun Jul 13 22:48:08 2003 -+++ po/Makefile.in.in Sun Jul 13 22:48:18 2003 -@@ -28,7 +28,7 @@ prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = @datadir@ - libdir = @libdir@ --localedir = $(libdir)/locale -+localedir = $(datadir)/locale - gnulocaledir = $(datadir)/locale - gettextsrcdir = $(datadir)/glib-2.0/gettext/po - subdir = po diff --git a/x11/gnome/utils/pkg/DESCR b/x11/gnome/utils/pkg/DESCR index 6fcf2419725..0cce5433ac5 100644 --- a/x11/gnome/utils/pkg/DESCR +++ b/x11/gnome/utils/pkg/DESCR @@ -1,3 +1,2 @@ -This package includes some basic GNOME utilities, including a -calculator, character map tool, a dictionary, a search tool and -a system log viewer. +This package includes some basic GNOME utilities, including a a +screenshot tool, a dictionary, a search tool and a system log viewer. diff --git a/x11/gnome/utils/pkg/PLIST b/x11/gnome/utils/pkg/PLIST index f24b819b3e4..be0aa8d1252 100644 --- a/x11/gnome/utils/pkg/PLIST +++ b/x11/gnome/utils/pkg/PLIST @@ -1,5 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.8 2004/12/10 20:36:46 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.9 2005/05/26 22:54:07 marcm Exp $ bin/gnome-dictionary +bin/gnome-panel-screenshot +bin/gnome-screenshot bin/gnome-search-tool bin/gnome-system-log lib/bonobo/ @@ -17,6 +19,9 @@ share/gnome/ share/gnome-2.0/ share/gnome-2.0/ui/ share/gnome-2.0/ui/GNOME_GDictApplet.xml +share/gnome-screenshot/ +share/gnome-screenshot/glade/ +share/gnome-screenshot/glade/gnome-screenshot.glade share/gnome-system-log/ share/gnome-system-log/gnome-system-log-actions.db share/gnome-system-log/gnome-system-log-descript.db @@ -35,6 +40,12 @@ share/gnome/help/gnome-dictionary/ja/figures/gdict_applet.png share/gnome/help/gnome-dictionary/ja/figures/gdict_window.png share/gnome/help/gnome-dictionary/ja/gnome-dictionary.xml share/gnome/help/gnome-dictionary/ja/legal.xml +share/gnome/help/gnome-dictionary/uk/ +share/gnome/help/gnome-dictionary/uk/figures/ +share/gnome/help/gnome-dictionary/uk/figures/gdict_applet.png +share/gnome/help/gnome-dictionary/uk/figures/gdict_window.png +share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml +share/gnome/help/gnome-dictionary/uk/legal.xml share/gnome/help/gnome-search-tool/ share/gnome/help/gnome-search-tool/C/ share/gnome/help/gnome-search-tool/C/figures/ @@ -71,6 +82,11 @@ share/gnome/help/gnome-search-tool/sv/figures/ share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/sv/gnome-search-tool.xml share/gnome/help/gnome-search-tool/sv/legal.xml +share/gnome/help/gnome-search-tool/uk/ +share/gnome/help/gnome-search-tool/uk/figures/ +share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png +share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml +share/gnome/help/gnome-search-tool/uk/legal.xml share/gnome/help/gnome-search-tool/zh_CN/ share/gnome/help/gnome-search-tool/zh_CN/figures/ share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png @@ -127,6 +143,11 @@ share/gnome/help/gnome-system-log/sv/figures/ share/gnome/help/gnome-system-log/sv/figures/syslog_window.png share/gnome/help/gnome-system-log/sv/gnome-system-log.xml share/gnome/help/gnome-system-log/sv/legal.xml +share/gnome/help/gnome-system-log/uk/ +share/gnome/help/gnome-system-log/uk/figures/ +share/gnome/help/gnome-system-log/uk/figures/syslog_window.png +share/gnome/help/gnome-system-log/uk/gnome-system-log.xml +share/gnome/help/gnome-system-log/uk/legal.xml share/gnome/help/gnome-system-log/zh_CN/ share/gnome/help/gnome-system-log/zh_CN/figures/ share/gnome/help/gnome-system-log/zh_CN/figures/syslog_window.png @@ -285,6 +306,9 @@ share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ru/ share/locale/ru/LC_MESSAGES/ share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/rw/ +share/locale/rw/LC_MESSAGES/ +share/locale/rw/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sk/ share/locale/sk/LC_MESSAGES/ share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo @@ -321,6 +345,9 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/wa/ share/locale/wa/LC_MESSAGES/ share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/xh/ +share/locale/xh/LC_MESSAGES/ +share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo share/locale/zh_CN/ share/locale/zh_CN/LC_MESSAGES/ share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo @@ -331,6 +358,7 @@ share/omf/ share/omf/gnome-utils/ share/omf/gnome-utils/gnome-dictionary-C.omf share/omf/gnome-utils/gnome-dictionary-ja.omf +share/omf/gnome-utils/gnome-dictionary-uk.omf share/omf/gnome-utils/gnome-search-tool-C.omf share/omf/gnome-utils/gnome-search-tool-es.omf share/omf/gnome-utils/gnome-search-tool-fr.omf @@ -338,6 +366,7 @@ share/omf/gnome-utils/gnome-search-tool-it.omf share/omf/gnome-utils/gnome-search-tool-ja.omf share/omf/gnome-utils/gnome-search-tool-ko.omf share/omf/gnome-utils/gnome-search-tool-sv.omf +share/omf/gnome-utils/gnome-search-tool-uk.omf share/omf/gnome-utils/gnome-search-tool-zh_CN.omf share/omf/gnome-utils/gnome-search-tool-zh_HK.omf share/omf/gnome-utils/gnome-search-tool-zh_TW.omf @@ -349,11 +378,13 @@ share/omf/gnome-utils/gnome-system-log-it.omf share/omf/gnome-utils/gnome-system-log-ja.omf share/omf/gnome-utils/gnome-system-log-ko.omf share/omf/gnome-utils/gnome-system-log-sv.omf +share/omf/gnome-utils/gnome-system-log-uk.omf share/omf/gnome-utils/gnome-system-log-zh_CN.omf share/omf/gnome-utils/gnome-system-log-zh_TW.omf share/schemas/ share/schemas/gnome-utils/ share/schemas/gnome-utils/gdict.schemas +share/schemas/gnome-utils/gnome-screenshot.schemas share/schemas/gnome-utils/gnome-search-tool.schemas share/schemas/gnome-utils/logview.schemas @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-utils/*.schemas > /dev/null