diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-11-07 22:24:32 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-11-07 22:24:32 +0000 |
| commit | 58406bee8938178fc317574c4236434b0dd11a25 (patch) | |
| tree | b4fa34eca69e23769c548b4436cbf65d765e5fe2 | |
| parent | 98eb5c95a29c8dd1a76435744e5316092835f696 (diff) | |
| download | ports-58406bee8938178fc317574c4236434b0dd11a25.tar.gz ports-58406bee8938178fc317574c4236434b0dd11a25.zip | |
Presenting GNOME 2.8 for FreeBSD (2.8.1 to be exact).
This release notes detailing all of the new goodies in GNOME 2.8 can
be found at http://www.gnome.org/start/2.8/notes/, and the list of what
was fixed in GNOME 2.8.1 can be found at
http://lists.gnome.org/archives/gnome-announce-list/2004-October/msg00056.html.
This release, as well as all of our others, would not have been possible
without the great efforts of our FreeBSD GNOME Team. The list of
current members can be found at http://www.freebsd.org/gnome/contact.html
(including our newest member, Michael Johnson <ahze@FreeBSD.org>).
Special thanks also goes out to all of the loyal FreeBSD GNOME users that
put up with crashes and hangs to test and debug GNOME on FreeBSD. We would
especially like to thank those users that provided patches for GNOME 2.7 and
2.8:
Franz Klammer <klammer@webonaut.com>
Piotr Smyrak <piotr.smyrak@heron.pl>
Radek Kozlowski <radek@raadradd.com>
Khairil Yusof <kaeru@pd.jaring.my>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Vladimir Grebenschikov <vova@fbsd.ru>
GNOME 2.8 also features a new, FreeBSD-specific splashscreen that
was designed by jimmac for GNOME 2.8, then daemonized by
Franz Klammer <klammer@webonaut.com> and Radek Kozlowski
<radek@raadradd.com>.
As with GNOME 2.6, you cannot just "portupgrade" to GNOME 2.8. There is
a script provided at http://www.marcuscom.com/downloads/gnome_upgrade28.sh
that will aid in the upgrade process. Full documentation on the GNOME 2.8
upgrade is coming following this commit.
From all of us at FreeBSD GNOME, ENJOY!
Notes
Notes:
svn path=/head/; revision=121068
477 files changed, 8090 insertions, 6565 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index cf2e5045f255..aa26be62c223 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -24,6 +24,16 @@ Gnome_Pre_Include= bsd.gnome.mk # # As a result proper LIB_DEPENDS/RUN_DEPENDS will be added and CONFIGURE_ENV # and MAKE_ENV defined. +# +# +# GCONF_SCHEMAS - Set the following to list of all schema files +# that your port installs. These schema files and +# %gconf.xml files will be automatically added to +# ${PLIST}. For example, if your port has +# "etc/gconf/schemas/(foo.schemas and bar.schemas)", add +# add the following to your Makefile: +# "GCONF_SCHEMAS=foo.schemas bar.schemas". +# # non-version specific components _USE_GNOME_ALL= gnomehack lthack gnomeprefix gnomehier esound gnomemimedata \ @@ -43,7 +53,8 @@ _USE_GNOME_ALL+=glib20 atk pango gtk20 linc libidl orbit2 \ libgtkhtml gnomedesktop libwnck vte libzvt librsvg2 eel2 \ gnomepanel nautilus2 metacity gal2 gnomecontrolcenter2 libgda2 \ libgnomedb gtksourceview libgsf libgsf_gnome pygtk2 pygnome2 \ - gstreamerplugins gtkhtml3 gnomespeech desktopfileutils + gstreamerplugins gtkhtml3 gnomespeech evolutiondataserver \ + desktopfileutils SCROLLKEEPER_DIR= /var/db/scrollkeeper gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ @@ -70,12 +81,14 @@ gnomehier_DETECT= ${X11BASE}/share/gnome/.keep_me gnomehier_RUN_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier GNOME_HTML_DIR?= ${PREFIX}/share/doc +GCONF_CONFIG_OPTIONS?= +GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/etc/gconf/gconf.xml.defaults gnomeprefix_CONFIGURE_ENV=GTKDOC="false" gnomeprefix_CONFIGURE_ARGS=--localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --with-html-dir=${GNOME_HTML_DIR} \ --disable-gtk-doc \ - --with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults + --with-gconf-source=${GCONF_CONFIG_SOURCE} gnomeprefix_USE_GNOME_IMPL=gnomehier gnometarget_CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -227,11 +240,11 @@ glib20_LIB_DEPENDS= glib-2.0.400:${PORTSDIR}/devel/glib20 glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc glib20_USE_GNOME_IMPL=gnometarget pkgconfig -atk_LIB_DEPENDS= atk-1.0.600:${PORTSDIR}/accessibility/atk +atk_LIB_DEPENDS= atk-1.0.800:${PORTSDIR}/accessibility/atk atk_DETECT= ${LOCALBASE}/libdata/pkgconfig/atk.pc atk_USE_GNOME_IMPL= glib20 -pango_LIB_DEPENDS= pango-1.0.399:${PORTSDIR}/x11-toolkits/pango +pango_LIB_DEPENDS= pango-1.0.600:${PORTSDIR}/x11-toolkits/pango pango_DETECT= ${X11BASE}/libdata/pkgconfig/pango.pc pango_USE_GNOME_IMPL= glib20 @@ -271,7 +284,7 @@ gconf2_LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 gconf2_DETECT= ${X11BASE}/libdata/pkgconfig/gconf-2.0.pc gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20 linc -gnomevfs2_LIB_DEPENDS= gnomevfs-2.600:${PORTSDIR}/devel/gnomevfs2 +gnomevfs2_LIB_DEPENDS= gnomevfs-2.800:${PORTSDIR}/devel/gnomevfs2 gnomevfs2_DETECT= ${X11BASE}/libdata/pkgconfig/gnome-vfs-2.0.pc gnomevfs2_USE_GNOME_IMPL=gconf2 libbonobo gnomemimedata @@ -279,7 +292,7 @@ gail_LIB_DEPENDS= gailutil.17:${PORTSDIR}/accessibility/gail gail_DETECT= ${X11BASE}/libdata/pkgconfig/gail.pc gail_USE_GNOME_IMPL= libgnomecanvas -libgnomecanvas_LIB_DEPENDS= gnomecanvas-2.600:${PORTSDIR}/graphics/libgnomecanvas +libgnomecanvas_LIB_DEPENDS= gnomecanvas-2.800:${PORTSDIR}/graphics/libgnomecanvas libgnomecanvas_DETECT= ${X11BASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 @@ -295,7 +308,7 @@ libgnomeprintui_LIB_DEPENDS= gnomeprintui-2-2.1:${PORTSDIR}/x11-toolkits/libgnom libgnomeprintui_DETECT= ${X11BASE}/libdata/pkgconfig/libgnomeprintui-2.2.pc libgnomeprintui_USE_GNOME_IMPL= libgnomeprint libgnomecanvas -libgnome_LIB_DEPENDS= gnome-2.600:${PORTSDIR}/x11/libgnome +libgnome_LIB_DEPENDS= gnome-2.800:${PORTSDIR}/x11/libgnome libgnome_DETECT= ${X11BASE}/libdata/pkgconfig/libgnome-2.0.pc libgnome_USE_GNOME_IMPL=libxslt gnomevfs2 esound @@ -303,11 +316,11 @@ libbonoboui_LIB_DEPENDS= bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui libbonoboui_DETECT= ${X11BASE}/libdata/pkgconfig/libbonoboui-2.0.pc libbonoboui_USE_GNOME_IMPL= libgnomecanvas libgnome -libgnomeui_LIB_DEPENDS= gnomeui-2.600:${PORTSDIR}/x11-toolkits/libgnomeui +libgnomeui_LIB_DEPENDS= gnomeui-2.800:${PORTSDIR}/x11-toolkits/libgnomeui libgnomeui_DETECT= ${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc libgnomeui_USE_GNOME_IMPL= libbonoboui -atspi_LIB_DEPENDS= spi.9:${PORTSDIR}/accessibility/at-spi +atspi_LIB_DEPENDS= spi.10:${PORTSDIR}/accessibility/at-spi atspi_DETECT= ${X11BASE}/libdata/pkgconfig/cspi-1.0.pc atspi_USE_GNOME_IMPL= gail libbonobo @@ -336,11 +349,11 @@ libzvt_LIB_DEPENDS= zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt libzvt_DETECT= ${X11BASE}/libdata/pkgconfig/libzvt-2.0.pc libzvt_USE_GNOME_IMPL= gtk20 -librsvg2_LIB_DEPENDS= rsvg-2.8:${PORTSDIR}/graphics/librsvg2 +librsvg2_LIB_DEPENDS= rsvg-2.10:${PORTSDIR}/graphics/librsvg2 librsvg2_DETECT= ${X11BASE}/libdata/pkgconfig/librsvg-2.0.pc -librsvg2_USE_GNOME_IMPL=libartlgpl2 libxml2 gtk20 libgsf +librsvg2_USE_GNOME_IMPL=libartlgpl2 libgsf gnomevfs2 -eel2_LIB_DEPENDS= eel-2.8:${PORTSDIR}/x11-toolkits/eel2 +eel2_LIB_DEPENDS= eel-2.10:${PORTSDIR}/x11-toolkits/eel2 eel2_DETECT= ${X11BASE}/libdata/pkgconfig/eel-2.0.pc eel2_USE_GNOME_IMPL= gnomevfs2 libgnomeui gail @@ -358,8 +371,8 @@ metacity_LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity metacity_DETECT= ${X11BASE}/libdata/pkgconfig/libmetacity-private.pc metacity_USE_GNOME_IMPL=gconf2 glade2 -gal2_LIB_DEPENDS= gal-2.0.6:${PORTSDIR}/x11-toolkits/gal2 -gal2_DETECT= ${X11BASE}/libdata/pkgconfig/gal-2.0.pc +gal2_LIB_DEPENDS= gal-2.2.1:${PORTSDIR}/x11-toolkits/gal2 +gal2_DETECT= ${X11BASE}/libdata/pkgconfig/gal-2.2.pc gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnomecontrolcenter2 @@ -370,7 +383,7 @@ libgda2_LIB_DEPENDS= gda-2.2:${PORTSDIR}/databases/libgda2 libgda2_DETECT= ${X11BASE}/libdata/pkgconfig/libgda.pc libgda2_USE_GNOME_IMPL= glib20 libxslt -libgnomedb_LIB_DEPENDS= gnomedb-2.3:${PORTSDIR}/databases/libgnomedb +libgnomedb_LIB_DEPENDS= gnomedb-2.2:${PORTSDIR}/databases/libgnomedb libgnomedb_DETECT= ${X11BASE}/libdata/pkgconfig/libgnomedb.pc libgnomedb_USE_GNOME_IMPL=libgnomeui libgda2 @@ -410,17 +423,22 @@ intltool_BUILD_DEPENDS= ${intltool_DETECT}:${PORTSDIR}/textproc/intltool intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \ - s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";|' + s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \ + s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|' intlhack_USE_GNOME_IMPL=intltool -gtkhtml3_LIB_DEPENDS= gtkhtml-3.0.4:${PORTSDIR}/www/gtkhtml3 -gtkhtml3_DETECT= ${X11BASE}/libdata/pkgconfig/libgtkhtml-3.0.pc -gtkhtml3_USE_GNOME_IMPL=gal2 gail +gtkhtml3_LIB_DEPENDS= gtkhtml-3.1.11:${PORTSDIR}/www/gtkhtml3 +gtkhtml3_DETECT= ${X11BASE}/libdata/pkgconfig/libgtkhtml-3.1.pc +gtkhtml3_USE_GNOME_IMPL=gail libgnomeui libgnomeprintui gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnomespeech gnomespeech_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc gnomespeech_USE_GNOME_IMPL=libbonobo +evolutiondataserver_LIB_DEPENDS=edataserver.5:${PORTSDIR}/databases/evolution-data-server +evolutiondataserver_DETECT= ${X11BASE}/libdata/pkgconfig/evolution-data-server-1.0.pc +evolutiondataserver_USE_GNOME_IMPL=libgnome + desktopfileutils_RUN_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils desktopfileutils_DETECT= ${X11BASE}/bin/update-desktop-database desktopfileutils_USE_GNOME_IMPL=glib20 diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index 6ef7247bf96a..6b1226e80119 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -6,10 +6,10 @@ # PORTNAME= at-spi -PORTVERSION= 1.4.2 +PORTVERSION= 1.6.0 CATEGORIES= accessibility x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -17,10 +17,11 @@ COMMENT= An Assistive Technology Service Provider Interface USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intltool gail libbonobo lthack intlhack +USE_GNOME= gnomeprefix gnomehack gnomehier intltool gail libbonobo \ + intlhack USE_X_PREFIX= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes CONFIGURE_ARGS= --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo index 9f11d0c53cda..0ccda013665f 100644 --- a/accessibility/at-spi/distinfo +++ b/accessibility/at-spi/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/at-spi-1.4.2.tar.bz2) = e36683a6e55fcb5ef2e6ef05806f9c3e -SIZE (gnome2/at-spi-1.4.2.tar.bz2) = 510355 +MD5 (gnome2/at-spi-1.6.0.tar.bz2) = 950fc9bb66cf90b720739f3ea5ad8b18 +SIZE (gnome2/at-spi-1.6.0.tar.bz2) = 503948 diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist index 7e8b4ce0fb29..3764751a51b3 100644 --- a/accessibility/at-spi/pkg-plist +++ b/accessibility/at-spi/pkg-plist @@ -27,16 +27,23 @@ include/at-spi-1.0/libspi/streamablecontent.h include/at-spi-1.0/libspi/table.h include/at-spi-1.0/libspi/text.h include/at-spi-1.0/libspi/value.h +include/at-spi-1.0/login-helper/Accessibility_LoginHelper.h +include/at-spi-1.0/login-helper/login-helper.h lib/libcspi.a lib/libcspi.so -lib/libcspi.so.9 +lib/libcspi.so.10 +lib/libloginhelper.a +lib/libloginhelper.so +lib/libloginhelper.so.0 lib/libspi.a lib/libspi.so -lib/libspi.so.9 +lib/libspi.so.10 lib/gtk-2.0/modules/libatk-bridge.so +lib/orbit-2.0/Accessibility_LoginHelper_module.so lib/orbit-2.0/Accessibility_module.so libdata/bonobo/servers/Accessibility_Registry.server libdata/pkgconfig/cspi-1.0.pc +libdata/pkgconfig/libloginhelper-1.0.pc libdata/pkgconfig/libspi-1.0.pc libexec/at-spi-registryd share/doc/at-spi-cspi/at-spi-cspi-Accessible-Objects.html @@ -79,6 +86,7 @@ share/gnome/idl/at-spi-1.0/Accessibility_Event.idl share/gnome/idl/at-spi-1.0/Accessibility_Hyperlink.idl share/gnome/idl/at-spi-1.0/Accessibility_Hypertext.idl share/gnome/idl/at-spi-1.0/Accessibility_Image.idl +share/gnome/idl/at-spi-1.0/Accessibility_LoginHelper.idl share/gnome/idl/at-spi-1.0/Accessibility_Registry.idl share/gnome/idl/at-spi-1.0/Accessibility_Relation.idl share/gnome/idl/at-spi-1.0/Accessibility_Role.idl @@ -91,6 +99,7 @@ share/gnome/idl/at-spi-1.0/Accessibility_Value.idl @dirrm share/gnome/idl/at-spi-1.0 @dirrm share/doc/at-spi-cspi @dirrm lib/orbit-2.0 +@dirrm include/at-spi-1.0/login-helper @dirrm include/at-spi-1.0/libspi @dirrm include/at-spi-1.0/cspi @dirrm include/at-spi-1.0 diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index be46b0402422..107c9cf45786 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -6,11 +6,11 @@ # PORTNAME= atk -PORTVERSION= 1.6.1 +PORTVERSION= 1.8.0 CATEGORIES= accessibility devel MASTER_SITES= ${MASTER_SITE_GNOME} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,8 +18,8 @@ COMMENT= A GNOME accessibility toolkit (ATK) USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 -USE_GNOME= gnomehack lthack glib20 +USE_LIBTOOL_VER=15 +USE_GNOME= gnomehack glib20 CONFIGURE_ARGS= --enable-static \ --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index f096173d5fa9..ac7f3c0887bc 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/atk-1.6.1.tar.bz2) = f77be7e128c957bd3056c2e270b5f283 -SIZE (gnome2/atk-1.6.1.tar.bz2) = 493415 +MD5 (gnome2/atk-1.8.0.tar.bz2) = fc46940febb0e91427b77457e6356f3d +SIZE (gnome2/atk-1.8.0.tar.bz2) = 500156 diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist index ee9f857ffc86..1a3bf58c5786 100644 --- a/accessibility/atk/pkg-plist +++ b/accessibility/atk/pkg-plist @@ -26,7 +26,7 @@ include/atk-1.0/atk/atkutil.h include/atk-1.0/atk/atkvalue.h lib/libatk-1.0.a lib/libatk-1.0.so -lib/libatk-1.0.so.600 +lib/libatk-1.0.so.800 libdata/pkgconfig/atk.pc %%DOCSDIR%%/AtkAction.html %%DOCSDIR%%/AtkComponent.html @@ -65,6 +65,7 @@ share/locale/az/LC_MESSAGES/atk10.mo share/locale/be/LC_MESSAGES/atk10.mo share/locale/bg/LC_MESSAGES/atk10.mo share/locale/bn/LC_MESSAGES/atk10.mo +share/locale/bs/LC_MESSAGES/atk10.mo share/locale/ca/LC_MESSAGES/atk10.mo share/locale/cs/LC_MESSAGES/atk10.mo share/locale/cy/LC_MESSAGES/atk10.mo @@ -100,6 +101,7 @@ share/locale/ml/LC_MESSAGES/atk10.mo share/locale/mn/LC_MESSAGES/atk10.mo share/locale/mr/LC_MESSAGES/atk10.mo share/locale/ms/LC_MESSAGES/atk10.mo +share/locale/nb/LC_MESSAGES/atk10.mo share/locale/ne/LC_MESSAGES/atk10.mo share/locale/nl/LC_MESSAGES/atk10.mo share/locale/nn/LC_MESSAGES/atk10.mo @@ -118,6 +120,7 @@ share/locale/sr@Latn/LC_MESSAGES/atk10.mo share/locale/sr@ije/LC_MESSAGES/atk10.mo share/locale/sv/LC_MESSAGES/atk10.mo share/locale/ta/LC_MESSAGES/atk10.mo +share/locale/tk/LC_MESSAGES/atk10.mo share/locale/tr/LC_MESSAGES/atk10.mo share/locale/uk/LC_MESSAGES/atk10.mo share/locale/vi/LC_MESSAGES/atk10.mo diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile index 6e6c2b7c4863..94a50f9c4789 100644 --- a/accessibility/gail/Makefile +++ b/accessibility/gail/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gail -PORTVERSION= 1.6.6 +PORTVERSION= 1.8.0 CATEGORIES= accessibility x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,11 +19,16 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes USE_GNOME= gnomehack libgnomecanvas lthack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc +post-patch: + @${REINPLACE_CMD} -e "/^SUBDIRS =/s|tests||" ${WRKSRC}/configure \ + ${WRKSRC}/Makefile.in + .include <bsd.port.mk> diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo index 10e331f382e2..306b6d18d866 100644 --- a/accessibility/gail/distinfo +++ b/accessibility/gail/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gail-1.6.6.tar.bz2) = 0741e06cd58088d4973dda98d3995a99 -SIZE (gnome2/gail-1.6.6.tar.bz2) = 519879 +MD5 (gnome2/gail-1.8.0.tar.bz2) = 58a0520361a47634f19ea271f5a5d8aa +SIZE (gnome2/gail-1.8.0.tar.bz2) = 549085 diff --git a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in index 6008612e13c6..39407901dc28 100644 --- a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in +++ b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in @@ -1,11 +1,11 @@ ---- docs/reference/libgail-util/Makefile.in.orig Wed Feb 25 13:45:04 2004 -+++ docs/reference/libgail-util/Makefile.in Wed Feb 25 13:55:28 2004 -@@ -476,8 +476,6 @@ +--- docs/reference/libgail-util/Makefile.in.orig Mon Sep 13 12:27:31 2004 ++++ docs/reference/libgail-util/Makefile.in Mon Sep 13 12:28:21 2004 +@@ -474,8 +474,6 @@ echo '-- Installing '$$i ; \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - fi + fi) uninstall-local: diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist index 6ee4adb1f929..9ee4141b4ba5 100644 --- a/accessibility/gail/pkg-plist +++ b/accessibility/gail/pkg-plist @@ -1,7 +1,6 @@ include/gail-1.0/libgail-util/gail-util.h include/gail-1.0/libgail-util/gailmisc.h include/gail-1.0/libgail-util/gailtextutil.h -lib/gtk-2.0/modules/libferret.so lib/gtk-2.0/modules/libgail.so lib/libgailutil.a lib/libgailutil.so @@ -16,13 +15,13 @@ share/doc/gail-libgail-util/index.sgml share/doc/gail-libgail-util/left.png share/doc/gail-libgail-util/libgail-util-main.html share/doc/gail-libgail-util/right.png -share/doc/gail-libgail-util/style.css share/doc/gail-libgail-util/up.png share/locale/ar/LC_MESSAGES/gail.mo share/locale/az/LC_MESSAGES/gail.mo share/locale/be/LC_MESSAGES/gail.mo share/locale/bg/LC_MESSAGES/gail.mo share/locale/bn/LC_MESSAGES/gail.mo +share/locale/bs/LC_MESSAGES/gail.mo share/locale/ca/LC_MESSAGES/gail.mo share/locale/cs/LC_MESSAGES/gail.mo share/locale/cy/LC_MESSAGES/gail.mo @@ -37,8 +36,10 @@ share/locale/fa/LC_MESSAGES/gail.mo share/locale/fi/LC_MESSAGES/gail.mo share/locale/fr/LC_MESSAGES/gail.mo share/locale/ga/LC_MESSAGES/gail.mo +share/locale/gu/LC_MESSAGES/gail.mo share/locale/hi/LC_MESSAGES/gail.mo share/locale/hr/LC_MESSAGES/gail.mo +share/locale/hu/LC_MESSAGES/gail.mo share/locale/id/LC_MESSAGES/gail.mo share/locale/is/LC_MESSAGES/gail.mo share/locale/it/LC_MESSAGES/gail.mo @@ -48,9 +49,12 @@ share/locale/lt/LC_MESSAGES/gail.mo share/locale/mi/LC_MESSAGES/gail.mo share/locale/mn/LC_MESSAGES/gail.mo share/locale/ms/LC_MESSAGES/gail.mo +share/locale/nb/LC_MESSAGES/gail.mo +share/locale/ne/LC_MESSAGES/gail.mo share/locale/nl/LC_MESSAGES/gail.mo share/locale/nn/LC_MESSAGES/gail.mo share/locale/no/LC_MESSAGES/gail.mo +share/locale/or/LC_MESSAGES/gail.mo share/locale/pa/LC_MESSAGES/gail.mo share/locale/pl/LC_MESSAGES/gail.mo share/locale/pt/LC_MESSAGES/gail.mo @@ -62,6 +66,8 @@ share/locale/sr/LC_MESSAGES/gail.mo share/locale/sr@Latn/LC_MESSAGES/gail.mo share/locale/sv/LC_MESSAGES/gail.mo share/locale/ta/LC_MESSAGES/gail.mo +share/locale/th/LC_MESSAGES/gail.mo +share/locale/tk/LC_MESSAGES/gail.mo share/locale/tr/LC_MESSAGES/gail.mo share/locale/uk/LC_MESSAGES/gail.mo share/locale/zh_CN/LC_MESSAGES/gail.mo diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile index 5416df80c64e..49873638cdf9 100644 --- a/accessibility/gnome-mag/Makefile +++ b/accessibility/gnome-mag/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomemag -PORTVERSION= 0.10.11 +PORTVERSION= 0.11.10 CATEGORIES= accessibility gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-mag/0.10 +MASTER_SITE_SUBDIR= sources/gnome-mag/0.11 DISTNAME= gnome-mag-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,9 +18,9 @@ COMMENT= GNOME screen magnifier USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack gnomeprefix atspi libbonobo lthack intlhack +USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack USE_GMAKE= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo index 6fd1495a3472..b8b7a1de6253 100644 --- a/accessibility/gnome-mag/distinfo +++ b/accessibility/gnome-mag/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-mag-0.10.11.tar.bz2) = 8a117fc965c792a3b4a8ae0d8fa5a33e -SIZE (gnome2/gnome-mag-0.10.11.tar.bz2) = 291851 +MD5 (gnome2/gnome-mag-0.11.10.tar.bz2) = 2603ef3349a8bbadcc1f3b36b467a9bf +SIZE (gnome2/gnome-mag-0.11.10.tar.bz2) = 311253 diff --git a/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c b/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c deleted file mode 100644 index d4557ae47457..000000000000 --- a/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c +++ /dev/null @@ -1,10 +0,0 @@ ---- magnifier/zoom-region.c.orig Tue Dec 9 16:54:22 2003 -+++ magnifier/zoom-region.c Tue Dec 9 16:56:18 2003 -@@ -20,6 +20,7 @@ - * Boston, MA 02111-1307, USA. - */ - -+#include <sys/time.h> - #include <stdlib.h> - #include <string.h> - #include <popt.h> diff --git a/accessibility/gnome-mag/pkg-descr b/accessibility/gnome-mag/pkg-descr index 534934091f1b..090a256b20f6 100644 --- a/accessibility/gnome-mag/pkg-descr +++ b/accessibility/gnome-mag/pkg-descr @@ -1,3 +1,2 @@ -Gnome-mag is an accessibility tool that magnifies the screen for easier -reading. This package includes the magnifier Bonobo service as well as a -sample implementation. +Gnome-Mag magnifies the screen for easier reading. This package includes a +magnification Bonobo service. diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist index ebac5bf8c9ec..bd9c1e05c343 100644 --- a/accessibility/gnome-mag/pkg-plist +++ b/accessibility/gnome-mag/pkg-plist @@ -2,18 +2,38 @@ bin/magnifier include/gnome-mag-1.0/magnifier/GNOME_Magnifier.h lib/libgnome-mag.a lib/libgnome-mag.so -lib/libgnome-mag.so.1 +lib/libgnome-mag.so.2 libdata/bonobo/servers/GNOME_Magnifier.server libdata/pkgconfig/gnome-mag-1.0.pc -share/gnome/gnome-mag/crosshair-cursor.xpm +share/gnome/gnome-mag/1_32/appstart.xpm +share/gnome/gnome-mag/1_32/bottom_left_corner.xpm +share/gnome/gnome-mag/1_32/bottom_side.xpm +share/gnome/gnome-mag/1_32/busy.xpm +share/gnome/gnome-mag/1_32/crosshair.xpm +share/gnome/gnome-mag/1_32/default.xpm +share/gnome/gnome-mag/1_32/fleur.xpm +share/gnome/gnome-mag/1_32/hand.xpm +share/gnome/gnome-mag/1_32/left_ptr.xpm +share/gnome/gnome-mag/1_32/left_side.xpm +share/gnome/gnome-mag/1_32/no.xpm +share/gnome/gnome-mag/1_32/right_side.xpm +share/gnome/gnome-mag/1_32/sb_h_double_arrow.xpm +share/gnome/gnome-mag/1_32/sb_v_double_arrow.xpm +share/gnome/gnome-mag/1_32/top_left_corner.xpm +share/gnome/gnome-mag/1_32/top_right_corner.xpm +share/gnome/gnome-mag/1_32/top_side.xpm +share/gnome/gnome-mag/1_32/up.xpm +share/gnome/gnome-mag/1_32/xterm.xpm share/gnome/gnome-mag/default-cursor.xpm share/gnome/idl/gnome-mag-1.0/GNOME_Magnifier.idl +share/locale/ang/LC_MESSAGES/gnome-mag.mo share/locale/ar/LC_MESSAGES/gnome-mag.mo share/locale/az/LC_MESSAGES/gnome-mag.mo share/locale/be/LC_MESSAGES/gnome-mag.mo share/locale/bg/LC_MESSAGES/gnome-mag.mo share/locale/bn/LC_MESSAGES/gnome-mag.mo share/locale/br/LC_MESSAGES/gnome-mag.mo +share/locale/bs/LC_MESSAGES/gnome-mag.mo share/locale/ca/LC_MESSAGES/gnome-mag.mo share/locale/cs/LC_MESSAGES/gnome-mag.mo share/locale/cy/LC_MESSAGES/gnome-mag.mo @@ -29,22 +49,27 @@ share/locale/fa/LC_MESSAGES/gnome-mag.mo share/locale/fi/LC_MESSAGES/gnome-mag.mo share/locale/fr/LC_MESSAGES/gnome-mag.mo share/locale/ga/LC_MESSAGES/gnome-mag.mo +share/locale/gu/LC_MESSAGES/gnome-mag.mo share/locale/he/LC_MESSAGES/gnome-mag.mo share/locale/hi/LC_MESSAGES/gnome-mag.mo share/locale/hr/LC_MESSAGES/gnome-mag.mo share/locale/hu/LC_MESSAGES/gnome-mag.mo +share/locale/id/LC_MESSAGES/gnome-mag.mo share/locale/is/LC_MESSAGES/gnome-mag.mo share/locale/it/LC_MESSAGES/gnome-mag.mo share/locale/ja/LC_MESSAGES/gnome-mag.mo +share/locale/ka/LC_MESSAGES/gnome-mag.mo share/locale/ko/LC_MESSAGES/gnome-mag.mo share/locale/lt/LC_MESSAGES/gnome-mag.mo share/locale/lv/LC_MESSAGES/gnome-mag.mo share/locale/mi/LC_MESSAGES/gnome-mag.mo share/locale/mn/LC_MESSAGES/gnome-mag.mo share/locale/ms/LC_MESSAGES/gnome-mag.mo +share/locale/nb/LC_MESSAGES/gnome-mag.mo share/locale/nl/LC_MESSAGES/gnome-mag.mo share/locale/nn/LC_MESSAGES/gnome-mag.mo share/locale/no/LC_MESSAGES/gnome-mag.mo +share/locale/or/LC_MESSAGES/gnome-mag.mo share/locale/pa/LC_MESSAGES/gnome-mag.mo share/locale/pl/LC_MESSAGES/gnome-mag.mo share/locale/pt/LC_MESSAGES/gnome-mag.mo @@ -57,6 +82,7 @@ share/locale/sq/LC_MESSAGES/gnome-mag.mo share/locale/sr/LC_MESSAGES/gnome-mag.mo share/locale/sr@Latn/LC_MESSAGES/gnome-mag.mo share/locale/sv/LC_MESSAGES/gnome-mag.mo +share/locale/ta/LC_MESSAGES/gnome-mag.mo share/locale/th/LC_MESSAGES/gnome-mag.mo share/locale/tk/LC_MESSAGES/gnome-mag.mo share/locale/tr/LC_MESSAGES/gnome-mag.mo @@ -65,6 +91,7 @@ share/locale/vi/LC_MESSAGES/gnome-mag.mo share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo @dirrm share/gnome/idl/gnome-mag-1.0 +@dirrm share/gnome/gnome-mag/1_32 @dirrm share/gnome/gnome-mag @dirrm include/gnome-mag-1.0/magnifier @dirrm include/gnome-mag-1.0 diff --git a/accessibility/gnomemag/Makefile b/accessibility/gnomemag/Makefile index 5416df80c64e..49873638cdf9 100644 --- a/accessibility/gnomemag/Makefile +++ b/accessibility/gnomemag/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomemag -PORTVERSION= 0.10.11 +PORTVERSION= 0.11.10 CATEGORIES= accessibility gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-mag/0.10 +MASTER_SITE_SUBDIR= sources/gnome-mag/0.11 DISTNAME= gnome-mag-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,9 +18,9 @@ COMMENT= GNOME screen magnifier USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack gnomeprefix atspi libbonobo lthack intlhack +USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack USE_GMAKE= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/accessibility/gnomemag/distinfo b/accessibility/gnomemag/distinfo index 6fd1495a3472..b8b7a1de6253 100644 --- a/accessibility/gnomemag/distinfo +++ b/accessibility/gnomemag/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-mag-0.10.11.tar.bz2) = 8a117fc965c792a3b4a8ae0d8fa5a33e -SIZE (gnome2/gnome-mag-0.10.11.tar.bz2) = 291851 +MD5 (gnome2/gnome-mag-0.11.10.tar.bz2) = 2603ef3349a8bbadcc1f3b36b467a9bf +SIZE (gnome2/gnome-mag-0.11.10.tar.bz2) = 311253 diff --git a/accessibility/gnomemag/files/patch-magnifier_zoom-region.c b/accessibility/gnomemag/files/patch-magnifier_zoom-region.c deleted file mode 100644 index d4557ae47457..000000000000 --- a/accessibility/gnomemag/files/patch-magnifier_zoom-region.c +++ /dev/null @@ -1,10 +0,0 @@ ---- magnifier/zoom-region.c.orig Tue Dec 9 16:54:22 2003 -+++ magnifier/zoom-region.c Tue Dec 9 16:56:18 2003 -@@ -20,6 +20,7 @@ - * Boston, MA 02111-1307, USA. - */ - -+#include <sys/time.h> - #include <stdlib.h> - #include <string.h> - #include <popt.h> diff --git a/accessibility/gnomemag/pkg-descr b/accessibility/gnomemag/pkg-descr index 534934091f1b..090a256b20f6 100644 --- a/accessibility/gnomemag/pkg-descr +++ b/accessibility/gnomemag/pkg-descr @@ -1,3 +1,2 @@ -Gnome-mag is an accessibility tool that magnifies the screen for easier -reading. This package includes the magnifier Bonobo service as well as a -sample implementation. +Gnome-Mag magnifies the screen for easier reading. This package includes a +magnification Bonobo service. diff --git a/accessibility/gnomemag/pkg-plist b/accessibility/gnomemag/pkg-plist index ebac5bf8c9ec..bd9c1e05c343 100644 --- a/accessibility/gnomemag/pkg-plist +++ b/accessibility/gnomemag/pkg-plist @@ -2,18 +2,38 @@ bin/magnifier include/gnome-mag-1.0/magnifier/GNOME_Magnifier.h lib/libgnome-mag.a lib/libgnome-mag.so -lib/libgnome-mag.so.1 +lib/libgnome-mag.so.2 libdata/bonobo/servers/GNOME_Magnifier.server libdata/pkgconfig/gnome-mag-1.0.pc -share/gnome/gnome-mag/crosshair-cursor.xpm +share/gnome/gnome-mag/1_32/appstart.xpm +share/gnome/gnome-mag/1_32/bottom_left_corner.xpm +share/gnome/gnome-mag/1_32/bottom_side.xpm +share/gnome/gnome-mag/1_32/busy.xpm +share/gnome/gnome-mag/1_32/crosshair.xpm +share/gnome/gnome-mag/1_32/default.xpm +share/gnome/gnome-mag/1_32/fleur.xpm +share/gnome/gnome-mag/1_32/hand.xpm +share/gnome/gnome-mag/1_32/left_ptr.xpm +share/gnome/gnome-mag/1_32/left_side.xpm +share/gnome/gnome-mag/1_32/no.xpm +share/gnome/gnome-mag/1_32/right_side.xpm +share/gnome/gnome-mag/1_32/sb_h_double_arrow.xpm +share/gnome/gnome-mag/1_32/sb_v_double_arrow.xpm +share/gnome/gnome-mag/1_32/top_left_corner.xpm +share/gnome/gnome-mag/1_32/top_right_corner.xpm +share/gnome/gnome-mag/1_32/top_side.xpm +share/gnome/gnome-mag/1_32/up.xpm +share/gnome/gnome-mag/1_32/xterm.xpm share/gnome/gnome-mag/default-cursor.xpm share/gnome/idl/gnome-mag-1.0/GNOME_Magnifier.idl +share/locale/ang/LC_MESSAGES/gnome-mag.mo share/locale/ar/LC_MESSAGES/gnome-mag.mo share/locale/az/LC_MESSAGES/gnome-mag.mo share/locale/be/LC_MESSAGES/gnome-mag.mo share/locale/bg/LC_MESSAGES/gnome-mag.mo share/locale/bn/LC_MESSAGES/gnome-mag.mo share/locale/br/LC_MESSAGES/gnome-mag.mo +share/locale/bs/LC_MESSAGES/gnome-mag.mo share/locale/ca/LC_MESSAGES/gnome-mag.mo share/locale/cs/LC_MESSAGES/gnome-mag.mo share/locale/cy/LC_MESSAGES/gnome-mag.mo @@ -29,22 +49,27 @@ share/locale/fa/LC_MESSAGES/gnome-mag.mo share/locale/fi/LC_MESSAGES/gnome-mag.mo share/locale/fr/LC_MESSAGES/gnome-mag.mo share/locale/ga/LC_MESSAGES/gnome-mag.mo +share/locale/gu/LC_MESSAGES/gnome-mag.mo share/locale/he/LC_MESSAGES/gnome-mag.mo share/locale/hi/LC_MESSAGES/gnome-mag.mo share/locale/hr/LC_MESSAGES/gnome-mag.mo share/locale/hu/LC_MESSAGES/gnome-mag.mo +share/locale/id/LC_MESSAGES/gnome-mag.mo share/locale/is/LC_MESSAGES/gnome-mag.mo share/locale/it/LC_MESSAGES/gnome-mag.mo share/locale/ja/LC_MESSAGES/gnome-mag.mo +share/locale/ka/LC_MESSAGES/gnome-mag.mo share/locale/ko/LC_MESSAGES/gnome-mag.mo share/locale/lt/LC_MESSAGES/gnome-mag.mo share/locale/lv/LC_MESSAGES/gnome-mag.mo share/locale/mi/LC_MESSAGES/gnome-mag.mo share/locale/mn/LC_MESSAGES/gnome-mag.mo share/locale/ms/LC_MESSAGES/gnome-mag.mo +share/locale/nb/LC_MESSAGES/gnome-mag.mo share/locale/nl/LC_MESSAGES/gnome-mag.mo share/locale/nn/LC_MESSAGES/gnome-mag.mo share/locale/no/LC_MESSAGES/gnome-mag.mo +share/locale/or/LC_MESSAGES/gnome-mag.mo share/locale/pa/LC_MESSAGES/gnome-mag.mo share/locale/pl/LC_MESSAGES/gnome-mag.mo share/locale/pt/LC_MESSAGES/gnome-mag.mo @@ -57,6 +82,7 @@ share/locale/sq/LC_MESSAGES/gnome-mag.mo share/locale/sr/LC_MESSAGES/gnome-mag.mo share/locale/sr@Latn/LC_MESSAGES/gnome-mag.mo share/locale/sv/LC_MESSAGES/gnome-mag.mo +share/locale/ta/LC_MESSAGES/gnome-mag.mo share/locale/th/LC_MESSAGES/gnome-mag.mo share/locale/tk/LC_MESSAGES/gnome-mag.mo share/locale/tr/LC_MESSAGES/gnome-mag.mo @@ -65,6 +91,7 @@ share/locale/vi/LC_MESSAGES/gnome-mag.mo share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo @dirrm share/gnome/idl/gnome-mag-1.0 +@dirrm share/gnome/gnome-mag/1_32 @dirrm share/gnome/gnome-mag @dirrm include/gnome-mag-1.0/magnifier @dirrm include/gnome-mag-1.0 diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile index 1363a295b5e0..eb20cc957de1 100644 --- a/accessibility/gnopernicus/Makefile +++ b/accessibility/gnopernicus/Makefile @@ -6,25 +6,28 @@ # PORTNAME= gnopernicus -PORTVERSION= 0.8.4 +PORTVERSION= 0.9.16 CATEGORIES= accessibility x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Collection of accessibility apps for GNOME 2 -LIB_DEPENDS= gnome-mag.1:${PORTSDIR}/accessibility/gnomemag +LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnomemag USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack lthack libgnomeui atspi \ - gnomespeech -USE_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= SED="${SED}" +GCONF_SCHEMAS= brlmonitor.schemas gnopernicus.schemas remote.schemas +SHLIB_VERSION= 16 +PLIST_SUB= SHLIB_VERSION=${SHLIB_VERSION} + .include <bsd.port.mk> diff --git a/accessibility/gnopernicus/distinfo b/accessibility/gnopernicus/distinfo index c4d1d3c27edb..a40466bc5a0d 100644 --- a/accessibility/gnopernicus/distinfo +++ b/accessibility/gnopernicus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnopernicus-0.8.4.tar.bz2) = ec8cc57606b2568e621e6e7434a4f73b -SIZE (gnome2/gnopernicus-0.8.4.tar.bz2) = 1520946 +MD5 (gnome2/gnopernicus-0.9.16.tar.bz2) = 7870ad0df8edcfd01c4f16c49755db35 +SIZE (gnome2/gnopernicus-0.9.16.tar.bz2) = 1905537 diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist index 27bf9af40f8f..547b86846442 100644 --- a/accessibility/gnopernicus/pkg-plist +++ b/accessibility/gnopernicus/pkg-plist @@ -1,15 +1,5 @@ -bin/brlmonitor bin/gnopernicus bin/srcore -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/brlmonitor.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/brlmonitor.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/brlmonitor.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnopernicus.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnopernicus.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnopernicus.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/remote.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/remote.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/remote.schemas > /dev/null || /usr/bin/true etc/gnopernicus-1.0/translation_tables/de.a2b etc/gnopernicus-1.0/translation_tables/en_US.a2b etc/gnopernicus-1.0/translation_tables/es.a2b @@ -21,37 +11,35 @@ include/gnopernicus-1.0/libsrconf/libsrconf.h include/gnopernicus-1.0/libsrlow/SRLow.h include/gnopernicus-1.0/libsrlow/SRObject.h include/gnopernicus-1.0/libsrlow/screen-review.h -include/gnopernicus-1.0/libsrs/srsxmlapi.h +include/gnopernicus-1.0/libsrs/srs-xml.h include/gnopernicus-1.0/libsrutil/SREvent.h include/gnopernicus-1.0/libsrutil/SRMessages.h include/gnopernicus-1.0/libsrutil/srintl.h include/gnopernicus-1.0/libsrutil/util.h lib/gnopernicus-1.0/libbrl.a lib/gnopernicus-1.0/libbrl.so -lib/gnopernicus-1.0/libbrl.so.4 +lib/gnopernicus-1.0/libbrl.so.%%SHLIB_VERSION%% lib/gnopernicus-1.0/libke.a lib/gnopernicus-1.0/libke.so -lib/gnopernicus-1.0/libke.so.4 +lib/gnopernicus-1.0/libke.so.%%SHLIB_VERSION%% lib/gnopernicus-1.0/libmag.a lib/gnopernicus-1.0/libmag.so -lib/gnopernicus-1.0/libmag.so.4 +lib/gnopernicus-1.0/libmag.so.%%SHLIB_VERSION%% lib/gnopernicus-1.0/libsrconf.a lib/gnopernicus-1.0/libsrconf.so -lib/gnopernicus-1.0/libsrconf.so.4 +lib/gnopernicus-1.0/libsrconf.so.%%SHLIB_VERSION%% lib/gnopernicus-1.0/libsrlow.a lib/gnopernicus-1.0/libsrlow.so -lib/gnopernicus-1.0/libsrlow.so.4 +lib/gnopernicus-1.0/libsrlow.so.%%SHLIB_VERSION%% lib/gnopernicus-1.0/libsrs.a lib/gnopernicus-1.0/libsrs.so -lib/gnopernicus-1.0/libsrs.so.4 +lib/gnopernicus-1.0/libsrs.so.%%SHLIB_VERSION%% lib/gnopernicus-1.0/libsrutil.a lib/gnopernicus-1.0/libsrutil.so -lib/gnopernicus-1.0/libsrutil.so.4 +lib/gnopernicus-1.0/libsrutil.so.%%SHLIB_VERSION%% libdata/pkgconfig/gnopernicus-1.0.pc +libexec/brlmonitor share/gnome/applications/gnopernicus.desktop -share/gnome/gnopernicus/fonts/braillehc.afm -share/gnome/gnopernicus/fonts/braillehc.pfb -share/gnome/gnopernicus/fonts/braillehc.pfm share/gnome/gnopernicus/glade/gnopi_files/Braille_Monitor_Settings/braille_monitor_settings.glade2 share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/attribute_settings.glade2 share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/braille_device.glade2 @@ -83,24 +71,26 @@ share/gnome/gnopernicus/presentation/default.xml share/gnome/gnopernicus/presentation/verbose.xml share/gnome/help/brlmonitor/C/brlmonitor.xml share/gnome/help/brlmonitor/C/legal.xml -share/gnome/help/gnopernicus/C/gnopernicus.xml -share/gnome/help/gnopernicus/C/legal.xml share/gnome/help/brlmonitor/es/brlmonitor.xml share/gnome/help/brlmonitor/es/legal.xml +share/gnome/help/gnopernicus/C/gnopernicus.xml +share/gnome/help/gnopernicus/C/legal.xml share/gnome/help/gnopernicus/es/gnopernicus.xml share/gnome/help/gnopernicus/es/legal.xml share/gnome/omf/gnopernicus/brlmonitor-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/brlmonitor-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/gnopernicus/gnopernicus-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnopernicus/brlmonitor-es.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/brlmonitor-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnopernicus/gnopernicus-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnopernicus/gnopernicus-es.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/gnopernicus-es.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnopernicus.png share/locale/ar/LC_MESSAGES/gnopernicus.mo share/locale/az/LC_MESSAGES/gnopernicus.mo share/locale/be/LC_MESSAGES/gnopernicus.mo +share/locale/bg/LC_MESSAGES/gnopernicus.mo +share/locale/bn/LC_MESSAGES/gnopernicus.mo share/locale/ca/LC_MESSAGES/gnopernicus.mo share/locale/cs/LC_MESSAGES/gnopernicus.mo share/locale/cy/LC_MESSAGES/gnopernicus.mo @@ -123,6 +113,7 @@ share/locale/ko/LC_MESSAGES/gnopernicus.mo share/locale/lt/LC_MESSAGES/gnopernicus.mo share/locale/mn/LC_MESSAGES/gnopernicus.mo share/locale/ms/LC_MESSAGES/gnopernicus.mo +share/locale/nb/LC_MESSAGES/gnopernicus.mo share/locale/nl/LC_MESSAGES/gnopernicus.mo share/locale/no/LC_MESSAGES/gnopernicus.mo share/locale/pa/LC_MESSAGES/gnopernicus.mo @@ -130,12 +121,18 @@ share/locale/pl/LC_MESSAGES/gnopernicus.mo share/locale/pt/LC_MESSAGES/gnopernicus.mo share/locale/pt_BR/LC_MESSAGES/gnopernicus.mo share/locale/ro/LC_MESSAGES/gnopernicus.mo +share/locale/ru/LC_MESSAGES/gnopernicus.mo +share/locale/sk/LC_MESSAGES/gnopernicus.mo share/locale/sq/LC_MESSAGES/gnopernicus.mo share/locale/sr/LC_MESSAGES/gnopernicus.mo share/locale/sr@Latn/LC_MESSAGES/gnopernicus.mo share/locale/sv/LC_MESSAGES/gnopernicus.mo +share/locale/ta/LC_MESSAGES/gnopernicus.mo +share/locale/tr/LC_MESSAGES/gnopernicus.mo share/locale/uk/LC_MESSAGES/gnopernicus.mo +share/locale/vi/LC_MESSAGES/gnopernicus.mo share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo +share/locale/zh_TW/LC_MESSAGES/gnopernicus.mo @dirrm share/gnome/omf/gnopernicus @dirrm share/gnome/help/gnopernicus/es @dirrm share/gnome/help/gnopernicus/C @@ -158,7 +155,6 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo @dirrm share/gnome/gnopernicus/glade/gnopi_files/Braille_Monitor_Settings @dirrm share/gnome/gnopernicus/glade/gnopi_files @dirrm share/gnome/gnopernicus/glade -@dirrm share/gnome/gnopernicus/fonts @dirrm share/gnome/gnopernicus @dirrm lib/gnopernicus-1.0 @dirrm include/gnopernicus-1.0/libsrutil @@ -172,6 +168,6 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo @dirrm etc/gnopernicus-1.0/translation_tables @dirrm etc/gnopernicus-1.0 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/brlmonitor-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/brlmonitor-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/gnopernicus-es.omf 2>/dev/null || /usr/bin/true diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile index 9a948c813aab..f4b5744dfa56 100644 --- a/accessibility/gok/Makefile +++ b/accessibility/gok/Makefile @@ -6,24 +6,28 @@ # PORTNAME= gok -PORTVERSION= 0.10.2 +PORTVERSION= 0.11.16 CATEGORIES= accessibility sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME On-Screen Keyboard (GOK) +LIB_DEPENDS= gnomespeech.7:${PORTSDIR}/accessibility/gnomespeech + USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack gnomeprefix intlhack lthack libgnomeui atspi libwnck +USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +GCONF_SCHEMAS= gok.schemas + post-patch: @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \ ${WRKSRC}/gok/word-complete.c diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo index 7044bb4e8a89..4f079a91e4b9 100644 --- a/accessibility/gok/distinfo +++ b/accessibility/gok/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gok-0.10.2.tar.bz2) = 35605f8f8c32832c3406be92c05cc1f4 -SIZE (gnome2/gok-0.10.2.tar.bz2) = 1125549 +MD5 (gnome2/gok-0.11.16.tar.bz2) = 6bfe9d4efb35ae20ef1c05c191dc8ad7 +SIZE (gnome2/gok-0.11.16.tar.bz2) = 1244123 diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist index 40122da7c73c..80443a4b0d4e 100644 --- a/accessibility/gok/pkg-plist +++ b/accessibility/gok/pkg-plist @@ -1,7 +1,5 @@ +bin/create-branching-keyboard bin/gok -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gok.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gok.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gok.schemas > /dev/null || /usr/bin/true libdata/bonobo/servers/GNOME_Gok.server libdata/pkgconfig/gok-1.0.pc share/gnome/applications/gok.desktop @@ -20,16 +18,20 @@ share/gnome/gok/am/launcher.kbd share/gnome/gok/am/main.kbd share/gnome/gok/am/mouse.kbd share/gnome/gok/am/move-resize.kbd +share/gnome/gok/am/numberpad.kbd share/gnome/gok/am/quit.kbd share/gnome/gok/am/text-operations.kbd +share/gnome/gok/am/valuator.kbd share/gnome/gok/ar/gok-controls.kbd share/gnome/gok/ar/hide.kbd share/gnome/gok/ar/launcher.kbd share/gnome/gok/ar/main.kbd share/gnome/gok/ar/mouse.kbd share/gnome/gok/ar/move-resize.kbd +share/gnome/gok/ar/numberpad.kbd share/gnome/gok/ar/quit.kbd share/gnome/gok/ar/text-operations.kbd +share/gnome/gok/ar/valuator.kbd share/gnome/gok/automatic-scanning.xam share/gnome/gok/az/gok-controls.kbd share/gnome/gok/az/hide.kbd @@ -37,66 +39,93 @@ share/gnome/gok/az/launcher.kbd share/gnome/gok/az/main.kbd share/gnome/gok/az/mouse.kbd share/gnome/gok/az/move-resize.kbd +share/gnome/gok/az/numberpad.kbd share/gnome/gok/az/quit.kbd share/gnome/gok/az/text-operations.kbd +share/gnome/gok/az/valuator.kbd share/gnome/gok/be/gok-controls.kbd share/gnome/gok/be/hide.kbd share/gnome/gok/be/launcher.kbd share/gnome/gok/be/main.kbd share/gnome/gok/be/mouse.kbd share/gnome/gok/be/move-resize.kbd +share/gnome/gok/be/numberpad.kbd share/gnome/gok/be/quit.kbd share/gnome/gok/be/text-operations.kbd +share/gnome/gok/be/valuator.kbd +share/gnome/gok/bg/gok-controls.kbd +share/gnome/gok/bg/hide.kbd +share/gnome/gok/bg/launcher.kbd +share/gnome/gok/bg/main.kbd +share/gnome/gok/bg/mouse.kbd +share/gnome/gok/bg/move-resize.kbd +share/gnome/gok/bg/numberpad.kbd +share/gnome/gok/bg/quit.kbd +share/gnome/gok/bg/text-operations.kbd +share/gnome/gok/bg/valuator.kbd share/gnome/gok/bn/gok-controls.kbd share/gnome/gok/bn/hide.kbd share/gnome/gok/bn/launcher.kbd share/gnome/gok/bn/main.kbd share/gnome/gok/bn/mouse.kbd share/gnome/gok/bn/move-resize.kbd +share/gnome/gok/bn/numberpad.kbd share/gnome/gok/bn/quit.kbd share/gnome/gok/bn/text-operations.kbd +share/gnome/gok/bn/valuator.kbd share/gnome/gok/ca/gok-controls.kbd share/gnome/gok/ca/hide.kbd share/gnome/gok/ca/launcher.kbd share/gnome/gok/ca/main.kbd share/gnome/gok/ca/mouse.kbd share/gnome/gok/ca/move-resize.kbd +share/gnome/gok/ca/numberpad.kbd share/gnome/gok/ca/quit.kbd share/gnome/gok/ca/text-operations.kbd +share/gnome/gok/ca/valuator.kbd share/gnome/gok/cs/gok-controls.kbd share/gnome/gok/cs/hide.kbd share/gnome/gok/cs/launcher.kbd share/gnome/gok/cs/main.kbd share/gnome/gok/cs/mouse.kbd share/gnome/gok/cs/move-resize.kbd +share/gnome/gok/cs/numberpad.kbd share/gnome/gok/cs/quit.kbd share/gnome/gok/cs/text-operations.kbd +share/gnome/gok/cs/valuator.kbd share/gnome/gok/cy/gok-controls.kbd share/gnome/gok/cy/hide.kbd share/gnome/gok/cy/launcher.kbd share/gnome/gok/cy/main.kbd share/gnome/gok/cy/mouse.kbd share/gnome/gok/cy/move-resize.kbd +share/gnome/gok/cy/numberpad.kbd share/gnome/gok/cy/quit.kbd share/gnome/gok/cy/text-operations.kbd +share/gnome/gok/cy/valuator.kbd share/gnome/gok/da/gok-controls.kbd share/gnome/gok/da/hide.kbd share/gnome/gok/da/launcher.kbd share/gnome/gok/da/main.kbd share/gnome/gok/da/mouse.kbd share/gnome/gok/da/move-resize.kbd +share/gnome/gok/da/numberpad.kbd share/gnome/gok/da/quit.kbd share/gnome/gok/da/text-operations.kbd +share/gnome/gok/da/valuator.kbd share/gnome/gok/de/gok-controls.kbd share/gnome/gok/de/hide.kbd share/gnome/gok/de/launcher.kbd share/gnome/gok/de/main.kbd share/gnome/gok/de/mouse.kbd share/gnome/gok/de/move-resize.kbd +share/gnome/gok/de/numberpad.kbd share/gnome/gok/de/quit.kbd share/gnome/gok/de/text-operations.kbd +share/gnome/gok/de/valuator.kbd share/gnome/gok/dictionary.txt share/gnome/gok/direct-selection.xam +share/gnome/gok/directed.xam share/gnome/gok/dwell-selection.xam share/gnome/gok/el/gok-controls.kbd share/gnome/gok/el/hide.kbd @@ -104,52 +133,75 @@ share/gnome/gok/el/launcher.kbd share/gnome/gok/el/main.kbd share/gnome/gok/el/mouse.kbd share/gnome/gok/el/move-resize.kbd +share/gnome/gok/el/numberpad.kbd share/gnome/gok/el/quit.kbd share/gnome/gok/el/text-operations.kbd +share/gnome/gok/el/valuator.kbd +share/gnome/gok/empty.png share/gnome/gok/en_CA/gok-controls.kbd share/gnome/gok/en_CA/hide.kbd share/gnome/gok/en_CA/launcher.kbd share/gnome/gok/en_CA/main.kbd share/gnome/gok/en_CA/mouse.kbd share/gnome/gok/en_CA/move-resize.kbd +share/gnome/gok/en_CA/numberpad.kbd share/gnome/gok/en_CA/quit.kbd share/gnome/gok/en_CA/text-operations.kbd +share/gnome/gok/en_CA/valuator.kbd share/gnome/gok/en_GB/gok-controls.kbd share/gnome/gok/en_GB/hide.kbd share/gnome/gok/en_GB/launcher.kbd share/gnome/gok/en_GB/main.kbd share/gnome/gok/en_GB/mouse.kbd share/gnome/gok/en_GB/move-resize.kbd +share/gnome/gok/en_GB/numberpad.kbd share/gnome/gok/en_GB/quit.kbd share/gnome/gok/en_GB/text-operations.kbd -share/gnome/gok/empty.png +share/gnome/gok/en_GB/valuator.kbd share/gnome/gok/es/gok-controls.kbd share/gnome/gok/es/hide.kbd share/gnome/gok/es/launcher.kbd share/gnome/gok/es/main.kbd share/gnome/gok/es/mouse.kbd share/gnome/gok/es/move-resize.kbd +share/gnome/gok/es/numberpad.kbd share/gnome/gok/es/quit.kbd share/gnome/gok/es/text-operations.kbd +share/gnome/gok/es/valuator.kbd +share/gnome/gok/fi/gok-controls.kbd +share/gnome/gok/fi/hide.kbd +share/gnome/gok/fi/launcher.kbd +share/gnome/gok/fi/main.kbd +share/gnome/gok/fi/mouse.kbd +share/gnome/gok/fi/move-resize.kbd +share/gnome/gok/fi/numberpad.kbd +share/gnome/gok/fi/quit.kbd +share/gnome/gok/fi/text-operations.kbd +share/gnome/gok/fi/valuator.kbd share/gnome/gok/fr/gok-controls.kbd share/gnome/gok/fr/hide.kbd share/gnome/gok/fr/launcher.kbd share/gnome/gok/fr/main.kbd share/gnome/gok/fr/mouse.kbd share/gnome/gok/fr/move-resize.kbd +share/gnome/gok/fr/numberpad.kbd share/gnome/gok/fr/quit.kbd share/gnome/gok/fr/text-operations.kbd +share/gnome/gok/fr/valuator.kbd share/gnome/gok/ga/gok-controls.kbd share/gnome/gok/ga/hide.kbd share/gnome/gok/ga/launcher.kbd share/gnome/gok/ga/main.kbd share/gnome/gok/ga/mouse.kbd share/gnome/gok/ga/move-resize.kbd +share/gnome/gok/ga/numberpad.kbd share/gnome/gok/ga/quit.kbd share/gnome/gok/ga/text-operations.kbd +share/gnome/gok/ga/valuator.kbd +share/gnome/gok/glade/gok.glade2 +share/gnome/gok/gok-controls.kbd share/gnome/gok/gok.png share/gnome/gok/gok.rc -share/gnome/gok/gok-controls.kbd share/gnome/gok/goklogo.png share/gnome/gok/goksound1.wav share/gnome/gok/goksound2.wav @@ -159,16 +211,20 @@ share/gnome/gok/gu/launcher.kbd share/gnome/gok/gu/main.kbd share/gnome/gok/gu/mouse.kbd share/gnome/gok/gu/move-resize.kbd +share/gnome/gok/gu/numberpad.kbd share/gnome/gok/gu/quit.kbd share/gnome/gok/gu/text-operations.kbd +share/gnome/gok/gu/valuator.kbd share/gnome/gok/hi/gok-controls.kbd share/gnome/gok/hi/hide.kbd share/gnome/gok/hi/launcher.kbd share/gnome/gok/hi/main.kbd share/gnome/gok/hi/mouse.kbd share/gnome/gok/hi/move-resize.kbd +share/gnome/gok/hi/numberpad.kbd share/gnome/gok/hi/quit.kbd share/gnome/gok/hi/text-operations.kbd +share/gnome/gok/hi/valuator.kbd share/gnome/gok/hide.kbd share/gnome/gok/hr/gok-controls.kbd share/gnome/gok/hr/hide.kbd @@ -176,16 +232,30 @@ share/gnome/gok/hr/launcher.kbd share/gnome/gok/hr/main.kbd share/gnome/gok/hr/mouse.kbd share/gnome/gok/hr/move-resize.kbd +share/gnome/gok/hr/numberpad.kbd share/gnome/gok/hr/quit.kbd share/gnome/gok/hr/text-operations.kbd +share/gnome/gok/hr/valuator.kbd share/gnome/gok/hu/gok-controls.kbd share/gnome/gok/hu/hide.kbd share/gnome/gok/hu/launcher.kbd share/gnome/gok/hu/main.kbd share/gnome/gok/hu/mouse.kbd share/gnome/gok/hu/move-resize.kbd +share/gnome/gok/hu/numberpad.kbd share/gnome/gok/hu/quit.kbd share/gnome/gok/hu/text-operations.kbd +share/gnome/gok/hu/valuator.kbd +share/gnome/gok/id/gok-controls.kbd +share/gnome/gok/id/hide.kbd +share/gnome/gok/id/launcher.kbd +share/gnome/gok/id/main.kbd +share/gnome/gok/id/mouse.kbd +share/gnome/gok/id/move-resize.kbd +share/gnome/gok/id/numberpad.kbd +share/gnome/gok/id/quit.kbd +share/gnome/gok/id/text-operations.kbd +share/gnome/gok/id/valuator.kbd share/gnome/gok/inverse-scanning.xam share/gnome/gok/it/gok-controls.kbd share/gnome/gok/it/hide.kbd @@ -193,24 +263,30 @@ share/gnome/gok/it/launcher.kbd share/gnome/gok/it/main.kbd share/gnome/gok/it/mouse.kbd share/gnome/gok/it/move-resize.kbd +share/gnome/gok/it/numberpad.kbd share/gnome/gok/it/quit.kbd share/gnome/gok/it/text-operations.kbd +share/gnome/gok/it/valuator.kbd share/gnome/gok/ja/gok-controls.kbd share/gnome/gok/ja/hide.kbd share/gnome/gok/ja/launcher.kbd share/gnome/gok/ja/main.kbd share/gnome/gok/ja/mouse.kbd share/gnome/gok/ja/move-resize.kbd +share/gnome/gok/ja/numberpad.kbd share/gnome/gok/ja/quit.kbd share/gnome/gok/ja/text-operations.kbd +share/gnome/gok/ja/valuator.kbd share/gnome/gok/ko/gok-controls.kbd share/gnome/gok/ko/hide.kbd share/gnome/gok/ko/launcher.kbd share/gnome/gok/ko/main.kbd share/gnome/gok/ko/mouse.kbd share/gnome/gok/ko/move-resize.kbd +share/gnome/gok/ko/numberpad.kbd share/gnome/gok/ko/quit.kbd share/gnome/gok/ko/text-operations.kbd +share/gnome/gok/ko/valuator.kbd share/gnome/gok/latched.png share/gnome/gok/launcher.kbd share/gnome/gok/locked.png @@ -220,8 +296,10 @@ share/gnome/gok/lt/launcher.kbd share/gnome/gok/lt/main.kbd share/gnome/gok/lt/mouse.kbd share/gnome/gok/lt/move-resize.kbd +share/gnome/gok/lt/numberpad.kbd share/gnome/gok/lt/quit.kbd share/gnome/gok/lt/text-operations.kbd +share/gnome/gok/lt/valuator.kbd share/gnome/gok/main.kbd share/gnome/gok/manage.kbd share/gnome/gok/mk/gok-controls.kbd @@ -230,24 +308,30 @@ share/gnome/gok/mk/launcher.kbd share/gnome/gok/mk/main.kbd share/gnome/gok/mk/mouse.kbd share/gnome/gok/mk/move-resize.kbd +share/gnome/gok/mk/numberpad.kbd share/gnome/gok/mk/quit.kbd share/gnome/gok/mk/text-operations.kbd +share/gnome/gok/mk/valuator.kbd share/gnome/gok/ml/gok-controls.kbd share/gnome/gok/ml/hide.kbd share/gnome/gok/ml/launcher.kbd share/gnome/gok/ml/main.kbd share/gnome/gok/ml/mouse.kbd share/gnome/gok/ml/move-resize.kbd +share/gnome/gok/ml/numberpad.kbd share/gnome/gok/ml/quit.kbd share/gnome/gok/ml/text-operations.kbd +share/gnome/gok/ml/valuator.kbd share/gnome/gok/mn/gok-controls.kbd share/gnome/gok/mn/hide.kbd share/gnome/gok/mn/launcher.kbd share/gnome/gok/mn/main.kbd share/gnome/gok/mn/mouse.kbd share/gnome/gok/mn/move-resize.kbd +share/gnome/gok/mn/numberpad.kbd share/gnome/gok/mn/quit.kbd share/gnome/gok/mn/text-operations.kbd +share/gnome/gok/mn/valuator.kbd share/gnome/gok/mouse.kbd share/gnome/gok/move-resize.kbd share/gnome/gok/ms/gok-controls.kbd @@ -256,56 +340,81 @@ share/gnome/gok/ms/launcher.kbd share/gnome/gok/ms/main.kbd share/gnome/gok/ms/mouse.kbd share/gnome/gok/ms/move-resize.kbd +share/gnome/gok/ms/numberpad.kbd share/gnome/gok/ms/quit.kbd share/gnome/gok/ms/text-operations.kbd +share/gnome/gok/ms/valuator.kbd +share/gnome/gok/nb/gok-controls.kbd +share/gnome/gok/nb/hide.kbd +share/gnome/gok/nb/launcher.kbd +share/gnome/gok/nb/main.kbd +share/gnome/gok/nb/mouse.kbd +share/gnome/gok/nb/move-resize.kbd +share/gnome/gok/nb/numberpad.kbd +share/gnome/gok/nb/quit.kbd +share/gnome/gok/nb/text-operations.kbd +share/gnome/gok/nb/valuator.kbd share/gnome/gok/nl/gok-controls.kbd share/gnome/gok/nl/hide.kbd share/gnome/gok/nl/launcher.kbd share/gnome/gok/nl/main.kbd share/gnome/gok/nl/mouse.kbd share/gnome/gok/nl/move-resize.kbd +share/gnome/gok/nl/numberpad.kbd share/gnome/gok/nl/quit.kbd share/gnome/gok/nl/text-operations.kbd +share/gnome/gok/nl/valuator.kbd share/gnome/gok/no/gok-controls.kbd share/gnome/gok/no/hide.kbd share/gnome/gok/no/launcher.kbd share/gnome/gok/no/main.kbd share/gnome/gok/no/mouse.kbd share/gnome/gok/no/move-resize.kbd +share/gnome/gok/no/numberpad.kbd share/gnome/gok/no/quit.kbd share/gnome/gok/no/text-operations.kbd +share/gnome/gok/no/valuator.kbd +share/gnome/gok/numberpad.kbd share/gnome/gok/pa/gok-controls.kbd share/gnome/gok/pa/hide.kbd share/gnome/gok/pa/launcher.kbd share/gnome/gok/pa/main.kbd share/gnome/gok/pa/mouse.kbd share/gnome/gok/pa/move-resize.kbd +share/gnome/gok/pa/numberpad.kbd share/gnome/gok/pa/quit.kbd share/gnome/gok/pa/text-operations.kbd +share/gnome/gok/pa/valuator.kbd share/gnome/gok/pl/gok-controls.kbd share/gnome/gok/pl/hide.kbd share/gnome/gok/pl/launcher.kbd share/gnome/gok/pl/main.kbd share/gnome/gok/pl/mouse.kbd share/gnome/gok/pl/move-resize.kbd +share/gnome/gok/pl/numberpad.kbd share/gnome/gok/pl/quit.kbd share/gnome/gok/pl/text-operations.kbd +share/gnome/gok/pl/valuator.kbd share/gnome/gok/pt/gok-controls.kbd share/gnome/gok/pt/hide.kbd share/gnome/gok/pt/launcher.kbd share/gnome/gok/pt/main.kbd share/gnome/gok/pt/mouse.kbd share/gnome/gok/pt/move-resize.kbd +share/gnome/gok/pt/numberpad.kbd share/gnome/gok/pt/quit.kbd share/gnome/gok/pt/text-operations.kbd +share/gnome/gok/pt/valuator.kbd share/gnome/gok/pt_BR/gok-controls.kbd share/gnome/gok/pt_BR/hide.kbd share/gnome/gok/pt_BR/launcher.kbd share/gnome/gok/pt_BR/main.kbd share/gnome/gok/pt_BR/mouse.kbd share/gnome/gok/pt_BR/move-resize.kbd +share/gnome/gok/pt_BR/numberpad.kbd share/gnome/gok/pt_BR/quit.kbd share/gnome/gok/pt_BR/text-operations.kbd +share/gnome/gok/pt_BR/valuator.kbd share/gnome/gok/quit.kbd share/gnome/gok/qwerty.kbd share/gnome/gok/singlekey-automatic-scanning.xam @@ -316,8 +425,10 @@ share/gnome/gok/sl/launcher.kbd share/gnome/gok/sl/main.kbd share/gnome/gok/sl/mouse.kbd share/gnome/gok/sl/move-resize.kbd +share/gnome/gok/sl/numberpad.kbd share/gnome/gok/sl/quit.kbd share/gnome/gok/sl/text-operations.kbd +share/gnome/gok/sl/valuator.kbd share/gnome/gok/small-empty.png share/gnome/gok/sq/gok-controls.kbd share/gnome/gok/sq/hide.kbd @@ -325,40 +436,50 @@ share/gnome/gok/sq/launcher.kbd share/gnome/gok/sq/main.kbd share/gnome/gok/sq/mouse.kbd share/gnome/gok/sq/move-resize.kbd +share/gnome/gok/sq/numberpad.kbd share/gnome/gok/sq/quit.kbd share/gnome/gok/sq/text-operations.kbd +share/gnome/gok/sq/valuator.kbd share/gnome/gok/sr/gok-controls.kbd share/gnome/gok/sr/hide.kbd share/gnome/gok/sr/launcher.kbd share/gnome/gok/sr/main.kbd share/gnome/gok/sr/mouse.kbd share/gnome/gok/sr/move-resize.kbd +share/gnome/gok/sr/numberpad.kbd share/gnome/gok/sr/quit.kbd share/gnome/gok/sr/text-operations.kbd +share/gnome/gok/sr/valuator.kbd share/gnome/gok/sr@Latn/gok-controls.kbd share/gnome/gok/sr@Latn/hide.kbd share/gnome/gok/sr@Latn/launcher.kbd share/gnome/gok/sr@Latn/main.kbd share/gnome/gok/sr@Latn/mouse.kbd share/gnome/gok/sr@Latn/move-resize.kbd +share/gnome/gok/sr@Latn/numberpad.kbd share/gnome/gok/sr@Latn/quit.kbd share/gnome/gok/sr@Latn/text-operations.kbd +share/gnome/gok/sr@Latn/valuator.kbd share/gnome/gok/sv/gok-controls.kbd share/gnome/gok/sv/hide.kbd share/gnome/gok/sv/launcher.kbd share/gnome/gok/sv/main.kbd share/gnome/gok/sv/mouse.kbd share/gnome/gok/sv/move-resize.kbd +share/gnome/gok/sv/numberpad.kbd share/gnome/gok/sv/quit.kbd share/gnome/gok/sv/text-operations.kbd +share/gnome/gok/sv/valuator.kbd share/gnome/gok/ta/gok-controls.kbd share/gnome/gok/ta/hide.kbd share/gnome/gok/ta/launcher.kbd share/gnome/gok/ta/main.kbd share/gnome/gok/ta/mouse.kbd share/gnome/gok/ta/move-resize.kbd +share/gnome/gok/ta/numberpad.kbd share/gnome/gok/ta/quit.kbd share/gnome/gok/ta/text-operations.kbd +share/gnome/gok/ta/valuator.kbd share/gnome/gok/text-operations.kbd share/gnome/gok/uk/gok-controls.kbd share/gnome/gok/uk/hide.kbd @@ -366,40 +487,59 @@ share/gnome/gok/uk/launcher.kbd share/gnome/gok/uk/main.kbd share/gnome/gok/uk/mouse.kbd share/gnome/gok/uk/move-resize.kbd +share/gnome/gok/uk/numberpad.kbd share/gnome/gok/uk/quit.kbd share/gnome/gok/uk/text-operations.kbd +share/gnome/gok/uk/valuator.kbd +share/gnome/gok/valuator.kbd +share/gnome/gok/value-fast-less.png +share/gnome/gok/value-fast-more.png +share/gnome/gok/value-less.png +share/gnome/gok/value-max.png +share/gnome/gok/value-min.png +share/gnome/gok/value-more.png share/gnome/gok/vi/gok-controls.kbd share/gnome/gok/vi/hide.kbd share/gnome/gok/vi/launcher.kbd share/gnome/gok/vi/main.kbd share/gnome/gok/vi/mouse.kbd share/gnome/gok/vi/move-resize.kbd +share/gnome/gok/vi/numberpad.kbd share/gnome/gok/vi/quit.kbd share/gnome/gok/vi/text-operations.kbd +share/gnome/gok/vi/valuator.kbd share/gnome/gok/zh_CN/gok-controls.kbd share/gnome/gok/zh_CN/hide.kbd share/gnome/gok/zh_CN/launcher.kbd share/gnome/gok/zh_CN/main.kbd share/gnome/gok/zh_CN/mouse.kbd share/gnome/gok/zh_CN/move-resize.kbd +share/gnome/gok/zh_CN/numberpad.kbd share/gnome/gok/zh_CN/quit.kbd share/gnome/gok/zh_CN/text-operations.kbd +share/gnome/gok/zh_CN/valuator.kbd share/gnome/gok/zh_TW/gok-controls.kbd share/gnome/gok/zh_TW/hide.kbd share/gnome/gok/zh_TW/launcher.kbd share/gnome/gok/zh_TW/main.kbd share/gnome/gok/zh_TW/mouse.kbd share/gnome/gok/zh_TW/move-resize.kbd +share/gnome/gok/zh_TW/numberpad.kbd share/gnome/gok/zh_TW/quit.kbd share/gnome/gok/zh_TW/text-operations.kbd +share/gnome/gok/zh_TW/valuator.kbd share/gnome/help/gok/C/gok.xml +share/gnome/help/gok/C/keyboards.xml +share/gnome/help/gok/C/legal.xml +share/gnome/help/gok/C/prefs.xml share/gnome/omf/gok/gok-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true +@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gok.png share/locale/am/LC_MESSAGES/gok.mo share/locale/ar/LC_MESSAGES/gok.mo share/locale/az/LC_MESSAGES/gok.mo share/locale/be/LC_MESSAGES/gok.mo +share/locale/bg/LC_MESSAGES/gok.mo share/locale/bn/LC_MESSAGES/gok.mo share/locale/ca/LC_MESSAGES/gok.mo share/locale/cs/LC_MESSAGES/gok.mo @@ -410,12 +550,14 @@ share/locale/el/LC_MESSAGES/gok.mo share/locale/en_CA/LC_MESSAGES/gok.mo share/locale/en_GB/LC_MESSAGES/gok.mo share/locale/es/LC_MESSAGES/gok.mo +share/locale/fi/LC_MESSAGES/gok.mo share/locale/fr/LC_MESSAGES/gok.mo share/locale/ga/LC_MESSAGES/gok.mo share/locale/gu/LC_MESSAGES/gok.mo share/locale/hi/LC_MESSAGES/gok.mo share/locale/hr/LC_MESSAGES/gok.mo share/locale/hu/LC_MESSAGES/gok.mo +share/locale/id/LC_MESSAGES/gok.mo share/locale/it/LC_MESSAGES/gok.mo share/locale/ja/LC_MESSAGES/gok.mo share/locale/ko/LC_MESSAGES/gok.mo @@ -424,6 +566,7 @@ share/locale/mk/LC_MESSAGES/gok.mo share/locale/ml/LC_MESSAGES/gok.mo share/locale/mn/LC_MESSAGES/gok.mo share/locale/ms/LC_MESSAGES/gok.mo +share/locale/nb/LC_MESSAGES/gok.mo share/locale/nl/LC_MESSAGES/gok.mo share/locale/no/LC_MESSAGES/gok.mo share/locale/pa/LC_MESSAGES/gok.mo @@ -459,6 +602,7 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo @dirrm share/gnome/gok/pa @dirrm share/gnome/gok/no @dirrm share/gnome/gok/nl +@dirrm share/gnome/gok/nb @dirrm share/gnome/gok/ms @dirrm share/gnome/gok/mn @dirrm share/gnome/gok/ml @@ -467,12 +611,15 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo @dirrm share/gnome/gok/ko @dirrm share/gnome/gok/ja @dirrm share/gnome/gok/it +@dirrm share/gnome/gok/id @dirrm share/gnome/gok/hu @dirrm share/gnome/gok/hr @dirrm share/gnome/gok/hi @dirrm share/gnome/gok/gu +@dirrm share/gnome/gok/glade @dirrm share/gnome/gok/ga @dirrm share/gnome/gok/fr +@dirrm share/gnome/gok/fi @dirrm share/gnome/gok/es @dirrm share/gnome/gok/en_GB @dirrm share/gnome/gok/en_CA @@ -483,9 +630,10 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo @dirrm share/gnome/gok/cs @dirrm share/gnome/gok/ca @dirrm share/gnome/gok/bn +@dirrm share/gnome/gok/bg @dirrm share/gnome/gok/be @dirrm share/gnome/gok/az @dirrm share/gnome/gok/ar @dirrm share/gnome/gok/am @dirrm share/gnome/gok -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf 2>/dev/null || /usr/bin/true diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 35ef9f1d2aca..853254c9f638 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -6,11 +6,11 @@ # PORTNAME= fileroller -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.3 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/file-roller/2.6 +MASTER_SITE_SUBDIR= sources/file-roller/2.8 DISTNAME= file-roller-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,19 +20,19 @@ COMMENT= An archive manager for zip files, tar, etc USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui lthack -USE_INC_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.include <bsd.port.pre.mk> +GCONF_SCHEMAS= file-roller.schemas -post-install: .if !defined(NOPORTDOCS) +post-install: ${MKDIR} ${DOCSDIR} .for f in AUTHORS NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index afb572af693d..4f9d1f2f4db7 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/file-roller-2.6.2.tar.bz2) = 88c6441d286c8f0810a37a3f3107f985 -SIZE (gnome2/file-roller-2.6.2.tar.bz2) = 1294588 +MD5 (gnome2/file-roller-2.8.3.tar.bz2) = 841f0cc0eab979d98c25c16725c18745 +SIZE (gnome2/file-roller-2.8.3.tar.bz2) = 1380060 diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index cd59ae511d26..72fa8d19f8fd 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -1,7 +1,4 @@ bin/file-roller -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/file-roller.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/file-roller.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/file-roller.schemas > /dev/null || /usr/bin/true lib/bonobo/libfile-roller-component.so libdata/bonobo/servers/File_Roller_Component.server %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -10,8 +7,8 @@ libdata/bonobo/servers/File_Roller_Component.server %%PORTDOCS%%%%DOCSDIR%%/TODO share/gnome/application-registry/file-roller.applications share/gnome/applications/file-roller.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/file-roller/glade/file_roller.glade -share/gnome/file-roller/glade/file_roller_prop.glade share/gnome/help/file-roller/C/figures/file-roller_home.png share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png share/gnome/help/file-roller/C/figures/file-roller_main_window.png @@ -22,7 +19,11 @@ share/gnome/help/file-roller/C/legal.xml share/gnome/help/file-roller/de/figures/file-roller_main_window.png share/gnome/help/file-roller/de/file-roller.xml share/gnome/help/file-roller/de/legal.xml +share/gnome/help/file-roller/es/figures/file-roller_home.png +share/gnome/help/file-roller/es/figures/file-roller_leftarrow.png share/gnome/help/file-roller/es/figures/file-roller_main_window.png +share/gnome/help/file-roller/es/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/es/figures/file-roller_uparrow.png share/gnome/help/file-roller/es/file-roller.xml share/gnome/help/file-roller/es/legal.xml share/gnome/help/file-roller/fr/figures/file-roller_main_window.png @@ -96,6 +97,7 @@ share/locale/az/LC_MESSAGES/file-roller.mo share/locale/be/LC_MESSAGES/file-roller.mo share/locale/bg/LC_MESSAGES/file-roller.mo share/locale/bn/LC_MESSAGES/file-roller.mo +share/locale/bs/LC_MESSAGES/file-roller.mo share/locale/ca/LC_MESSAGES/file-roller.mo share/locale/cs/LC_MESSAGES/file-roller.mo share/locale/cy/LC_MESSAGES/file-roller.mo @@ -128,6 +130,8 @@ share/locale/mk/LC_MESSAGES/file-roller.mo share/locale/ml/LC_MESSAGES/file-roller.mo share/locale/mn/LC_MESSAGES/file-roller.mo share/locale/ms/LC_MESSAGES/file-roller.mo +share/locale/nb/LC_MESSAGES/file-roller.mo +share/locale/ne/LC_MESSAGES/file-roller.mo share/locale/nl/LC_MESSAGES/file-roller.mo share/locale/nn/LC_MESSAGES/file-roller.mo share/locale/no/LC_MESSAGES/file-roller.mo @@ -146,6 +150,7 @@ share/locale/sr@ije/LC_MESSAGES/file-roller.mo share/locale/sv/LC_MESSAGES/file-roller.mo share/locale/ta/LC_MESSAGES/file-roller.mo share/locale/th/LC_MESSAGES/file-roller.mo +share/locale/tk/LC_MESSAGES/file-roller.mo share/locale/tr/LC_MESSAGES/file-roller.mo share/locale/uk/LC_MESSAGES/file-roller.mo share/locale/vi/LC_MESSAGES/file-roller.mo @@ -195,3 +200,4 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile index 35ef9f1d2aca..853254c9f638 100644 --- a/archivers/fileroller/Makefile +++ b/archivers/fileroller/Makefile @@ -6,11 +6,11 @@ # PORTNAME= fileroller -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.3 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/file-roller/2.6 +MASTER_SITE_SUBDIR= sources/file-roller/2.8 DISTNAME= file-roller-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,19 +20,19 @@ COMMENT= An archive manager for zip files, tar, etc USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui lthack -USE_INC_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.include <bsd.port.pre.mk> +GCONF_SCHEMAS= file-roller.schemas -post-install: .if !defined(NOPORTDOCS) +post-install: ${MKDIR} ${DOCSDIR} .for f in AUTHORS NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo index afb572af693d..4f9d1f2f4db7 100644 --- a/archivers/fileroller/distinfo +++ b/archivers/fileroller/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/file-roller-2.6.2.tar.bz2) = 88c6441d286c8f0810a37a3f3107f985 -SIZE (gnome2/file-roller-2.6.2.tar.bz2) = 1294588 +MD5 (gnome2/file-roller-2.8.3.tar.bz2) = 841f0cc0eab979d98c25c16725c18745 +SIZE (gnome2/file-roller-2.8.3.tar.bz2) = 1380060 diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist index cd59ae511d26..72fa8d19f8fd 100644 --- a/archivers/fileroller/pkg-plist +++ b/archivers/fileroller/pkg-plist @@ -1,7 +1,4 @@ bin/file-roller -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/file-roller.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/file-roller.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/file-roller.schemas > /dev/null || /usr/bin/true lib/bonobo/libfile-roller-component.so libdata/bonobo/servers/File_Roller_Component.server %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -10,8 +7,8 @@ libdata/bonobo/servers/File_Roller_Component.server %%PORTDOCS%%%%DOCSDIR%%/TODO share/gnome/application-registry/file-roller.applications share/gnome/applications/file-roller.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/file-roller/glade/file_roller.glade -share/gnome/file-roller/glade/file_roller_prop.glade share/gnome/help/file-roller/C/figures/file-roller_home.png share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png share/gnome/help/file-roller/C/figures/file-roller_main_window.png @@ -22,7 +19,11 @@ share/gnome/help/file-roller/C/legal.xml share/gnome/help/file-roller/de/figures/file-roller_main_window.png share/gnome/help/file-roller/de/file-roller.xml share/gnome/help/file-roller/de/legal.xml +share/gnome/help/file-roller/es/figures/file-roller_home.png +share/gnome/help/file-roller/es/figures/file-roller_leftarrow.png share/gnome/help/file-roller/es/figures/file-roller_main_window.png +share/gnome/help/file-roller/es/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/es/figures/file-roller_uparrow.png share/gnome/help/file-roller/es/file-roller.xml share/gnome/help/file-roller/es/legal.xml share/gnome/help/file-roller/fr/figures/file-roller_main_window.png @@ -96,6 +97,7 @@ share/locale/az/LC_MESSAGES/file-roller.mo share/locale/be/LC_MESSAGES/file-roller.mo share/locale/bg/LC_MESSAGES/file-roller.mo share/locale/bn/LC_MESSAGES/file-roller.mo +share/locale/bs/LC_MESSAGES/file-roller.mo share/locale/ca/LC_MESSAGES/file-roller.mo share/locale/cs/LC_MESSAGES/file-roller.mo share/locale/cy/LC_MESSAGES/file-roller.mo @@ -128,6 +130,8 @@ share/locale/mk/LC_MESSAGES/file-roller.mo share/locale/ml/LC_MESSAGES/file-roller.mo share/locale/mn/LC_MESSAGES/file-roller.mo share/locale/ms/LC_MESSAGES/file-roller.mo +share/locale/nb/LC_MESSAGES/file-roller.mo +share/locale/ne/LC_MESSAGES/file-roller.mo share/locale/nl/LC_MESSAGES/file-roller.mo share/locale/nn/LC_MESSAGES/file-roller.mo share/locale/no/LC_MESSAGES/file-roller.mo @@ -146,6 +150,7 @@ share/locale/sr@ije/LC_MESSAGES/file-roller.mo share/locale/sv/LC_MESSAGES/file-roller.mo share/locale/ta/LC_MESSAGES/file-roller.mo share/locale/th/LC_MESSAGES/file-roller.mo +share/locale/tk/LC_MESSAGES/file-roller.mo share/locale/tr/LC_MESSAGES/file-roller.mo share/locale/uk/LC_MESSAGES/file-roller.mo share/locale/vi/LC_MESSAGES/file-roller.mo @@ -195,3 +200,4 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 7eeb0111b18d..d32b2c82c54d 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.6.2 -PORTREVISION= 6 +PORTVERSION= 2.8.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.6 +MASTER_SITE_SUBDIR= sources/gnome-media/2.8 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -29,6 +28,9 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomedesktop \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= CDDB-Slave2.schemas gnome-audio-profiles.schemas \ + gnome-cd.schemas gnome-sound-recorder.schemas + .include <bsd.port.pre.mk> post-patch: diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index e7537e8abaa2..57f2938ee07f 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.6.2.tar.bz2) = 1eb2d95f29ae908a6fd3c5295e3d740d -SIZE (gnome2/gnome-media-2.6.2.tar.bz2) = 2970530 +MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1 +SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171 diff --git a/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h b/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h new file mode 100644 index 000000000000..1ec1fc50f5d5 --- /dev/null +++ b/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h @@ -0,0 +1,11 @@ +--- cddb-slave2/gnet-private.h.orig Tue Aug 31 19:58:18 2004 ++++ cddb-slave2/gnet-private.h Tue Aug 31 20:02:23 2004 +@@ -68,7 +68,7 @@ + #include <resolv.h> + #include <netdb.h> + +-#ifndef __socklen_t_defined ++#if !defined(__socklen_t_defined) && !defined(__FreeBSD__) + typedef guint32 socklen_t; + #endif + diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure index 2c6ea537ce3a..e2224d9308de 100644 --- a/audio/gnome-media/files/patch-configure +++ b/audio/gnome-media/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Wed Dec 31 00:49:17 2003 -+++ configure Wed Dec 31 00:49:57 2003 -@@ -23190,7 +23190,7 @@ +--- configure.orig Tue Jun 1 17:42:05 2004 ++++ configure Tue Jun 1 18:38:15 2004 +@@ -24584,7 +24584,7 @@ *FreeBSD*) - CDROM_HOST=freebsd - CDROM_HOST_FREEBSD=true + CDROM_HOST=bsd + CDROM_HOST_BSD=true - default_cd_device="/dev/acd0c" + default_cd_device="/dev/%%CDROM%%" ;; - *Linux*) - CDROM_HOST=linux + *NetBSD*) + CDROM_HOST=bsd diff --git a/audio/gnome-media/files/patch-gnome-cd_cddb.c b/audio/gnome-media/files/patch-gnome-cd_cddb.c deleted file mode 100644 index 45422866cac8..000000000000 --- a/audio/gnome-media/files/patch-gnome-cd_cddb.c +++ /dev/null @@ -1,19 +0,0 @@ ---- gnome-cd/cddb.c.orig Sun May 9 11:19:57 2004 -+++ gnome-cd/cddb.c Sun Aug 22 16:18:18 2004 -@@ -197,7 +197,6 @@ - } - - info = g_hash_table_lookup (cddb_cache, discid); -- g_free (discid); - - if (info != NULL) { - gcd->disc_info = info; -@@ -228,6 +227,8 @@ - data->nsecs, "GnomeCD", VERSION); - - gnome_cdrom_free_cddb_data (data); -+ g_free (discid); -+ g_free (offsets); - } - - int diff --git a/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c deleted file mode 100644 index 47ce9e0aa32b..000000000000 --- a/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c +++ /dev/null @@ -1,47 +0,0 @@ ---- gnome-cd/freebsd-cdrom.c.orig Mon Jan 5 23:12:49 2004 -+++ gnome-cd/freebsd-cdrom.c Sun Aug 22 01:06:01 2004 -@@ -896,6 +896,8 @@ - - ASSIGN_MSF (realstatus->relative, blank_msf); - ASSIGN_MSF (realstatus->absolute, blank_msf); -+ ASSIGN_MSF (realstatus->length, blank_msf); -+ - realstatus->track = 1; - switch (subchnl.data->header.audio_status) { - case CD_AS_PLAY_IN_PROGRESS: -@@ -903,6 +905,11 @@ - ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); - ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); - realstatus->track = subchnl.data->what.position.track_number; -+ if(priv && realstatus->track>0 && -+ realstatus->track<=priv->number_tracks){ -+ /* track_info may not be initialized */ -+ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); -+ } - break; - - case CD_AS_PLAY_PAUSED: -@@ -910,6 +917,11 @@ - ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); - ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); - realstatus->track = subchnl.data->what.position.track_number; -+ if(priv && realstatus->track>0 && -+ realstatus->track<=priv->number_tracks){ -+ /* track_info may not be initialized */ -+ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); -+ } - break; - - case CD_AS_PLAY_COMPLETED: -@@ -917,6 +929,11 @@ - ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); - ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); - realstatus->track = subchnl.data->what.position.track_number; -+ if(priv && realstatus->track>0 && -+ realstatus->track<=priv->number_tracks){ -+ /* track_info may not be initialized */ -+ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); -+ } - break; - - case CD_AS_AUDIO_INVALID: diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index 4b4de1a7d70a..df50a2c387c1 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -5,18 +5,6 @@ bin/gnome-sound-recorder bin/gnome-volume-control bin/gstreamer-properties bin/vumeter -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/CDDB-Slave2.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/CDDB-Slave2.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/CDDB-Slave2.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-audio-profiles.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-audio-profiles.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-audio-profiles.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-cd.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-cd.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-cd.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-sound-recorder.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-sound-recorder.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-sound-recorder.schemas > /dev/null || /usr/bin/true include/cddb-slave2/cddb-slave-client.h include/gnome-media/profiles/audio-profile-choose.h include/gnome-media/profiles/audio-profile-edit.h @@ -435,6 +423,7 @@ share/locale/az/LC_MESSAGES/gnome-media-2.0.mo share/locale/be/LC_MESSAGES/gnome-media-2.0.mo share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo +share/locale/bs/LC_MESSAGES/gnome-media-2.0.mo share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo @@ -466,6 +455,7 @@ share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo share/locale/no/LC_MESSAGES/gnome-media-2.0.mo @@ -483,6 +473,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo share/locale/ta/LC_MESSAGES/gnome-media-2.0.mo share/locale/th/LC_MESSAGES/gnome-media-2.0.mo +share/locale/tk/LC_MESSAGES/gnome-media-2.0.mo share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 7eeb0111b18d..d32b2c82c54d 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.6.2 -PORTREVISION= 6 +PORTVERSION= 2.8.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.6 +MASTER_SITE_SUBDIR= sources/gnome-media/2.8 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -29,6 +28,9 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomedesktop \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= CDDB-Slave2.schemas gnome-audio-profiles.schemas \ + gnome-cd.schemas gnome-sound-recorder.schemas + .include <bsd.port.pre.mk> post-patch: diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo index e7537e8abaa2..57f2938ee07f 100644 --- a/audio/gnomemedia2/distinfo +++ b/audio/gnomemedia2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.6.2.tar.bz2) = 1eb2d95f29ae908a6fd3c5295e3d740d -SIZE (gnome2/gnome-media-2.6.2.tar.bz2) = 2970530 +MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1 +SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171 diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_gnet-private.h b/audio/gnomemedia2/files/patch-cddb-slave2_gnet-private.h new file mode 100644 index 000000000000..1ec1fc50f5d5 --- /dev/null +++ b/audio/gnomemedia2/files/patch-cddb-slave2_gnet-private.h @@ -0,0 +1,11 @@ +--- cddb-slave2/gnet-private.h.orig Tue Aug 31 19:58:18 2004 ++++ cddb-slave2/gnet-private.h Tue Aug 31 20:02:23 2004 +@@ -68,7 +68,7 @@ + #include <resolv.h> + #include <netdb.h> + +-#ifndef __socklen_t_defined ++#if !defined(__socklen_t_defined) && !defined(__FreeBSD__) + typedef guint32 socklen_t; + #endif + diff --git a/audio/gnomemedia2/files/patch-configure b/audio/gnomemedia2/files/patch-configure index 2c6ea537ce3a..e2224d9308de 100644 --- a/audio/gnomemedia2/files/patch-configure +++ b/audio/gnomemedia2/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Wed Dec 31 00:49:17 2003 -+++ configure Wed Dec 31 00:49:57 2003 -@@ -23190,7 +23190,7 @@ +--- configure.orig Tue Jun 1 17:42:05 2004 ++++ configure Tue Jun 1 18:38:15 2004 +@@ -24584,7 +24584,7 @@ *FreeBSD*) - CDROM_HOST=freebsd - CDROM_HOST_FREEBSD=true + CDROM_HOST=bsd + CDROM_HOST_BSD=true - default_cd_device="/dev/acd0c" + default_cd_device="/dev/%%CDROM%%" ;; - *Linux*) - CDROM_HOST=linux + *NetBSD*) + CDROM_HOST=bsd diff --git a/audio/gnomemedia2/files/patch-gnome-cd_cddb.c b/audio/gnomemedia2/files/patch-gnome-cd_cddb.c deleted file mode 100644 index 45422866cac8..000000000000 --- a/audio/gnomemedia2/files/patch-gnome-cd_cddb.c +++ /dev/null @@ -1,19 +0,0 @@ ---- gnome-cd/cddb.c.orig Sun May 9 11:19:57 2004 -+++ gnome-cd/cddb.c Sun Aug 22 16:18:18 2004 -@@ -197,7 +197,6 @@ - } - - info = g_hash_table_lookup (cddb_cache, discid); -- g_free (discid); - - if (info != NULL) { - gcd->disc_info = info; -@@ -228,6 +227,8 @@ - data->nsecs, "GnomeCD", VERSION); - - gnome_cdrom_free_cddb_data (data); -+ g_free (discid); -+ g_free (offsets); - } - - int diff --git a/audio/gnomemedia2/files/patch-gnome-cd_freebsd-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_freebsd-cdrom.c deleted file mode 100644 index 47ce9e0aa32b..000000000000 --- a/audio/gnomemedia2/files/patch-gnome-cd_freebsd-cdrom.c +++ /dev/null @@ -1,47 +0,0 @@ ---- gnome-cd/freebsd-cdrom.c.orig Mon Jan 5 23:12:49 2004 -+++ gnome-cd/freebsd-cdrom.c Sun Aug 22 01:06:01 2004 -@@ -896,6 +896,8 @@ - - ASSIGN_MSF (realstatus->relative, blank_msf); - ASSIGN_MSF (realstatus->absolute, blank_msf); -+ ASSIGN_MSF (realstatus->length, blank_msf); -+ - realstatus->track = 1; - switch (subchnl.data->header.audio_status) { - case CD_AS_PLAY_IN_PROGRESS: -@@ -903,6 +905,11 @@ - ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); - ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); - realstatus->track = subchnl.data->what.position.track_number; -+ if(priv && realstatus->track>0 && -+ realstatus->track<=priv->number_tracks){ -+ /* track_info may not be initialized */ -+ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); -+ } - break; - - case CD_AS_PLAY_PAUSED: -@@ -910,6 +917,11 @@ - ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); - ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); - realstatus->track = subchnl.data->what.position.track_number; -+ if(priv && realstatus->track>0 && -+ realstatus->track<=priv->number_tracks){ -+ /* track_info may not be initialized */ -+ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); -+ } - break; - - case CD_AS_PLAY_COMPLETED: -@@ -917,6 +929,11 @@ - ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); - ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); - realstatus->track = subchnl.data->what.position.track_number; -+ if(priv && realstatus->track>0 && -+ realstatus->track<=priv->number_tracks){ -+ /* track_info may not be initialized */ -+ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); -+ } - break; - - case CD_AS_AUDIO_INVALID: diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist index 4b4de1a7d70a..df50a2c387c1 100644 --- a/audio/gnomemedia2/pkg-plist +++ b/audio/gnomemedia2/pkg-plist @@ -5,18 +5,6 @@ bin/gnome-sound-recorder bin/gnome-volume-control bin/gstreamer-properties bin/vumeter -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/CDDB-Slave2.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/CDDB-Slave2.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/CDDB-Slave2.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-audio-profiles.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-audio-profiles.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-audio-profiles.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-cd.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-cd.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-cd.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-sound-recorder.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-sound-recorder.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-sound-recorder.schemas > /dev/null || /usr/bin/true include/cddb-slave2/cddb-slave-client.h include/gnome-media/profiles/audio-profile-choose.h include/gnome-media/profiles/audio-profile-edit.h @@ -435,6 +423,7 @@ share/locale/az/LC_MESSAGES/gnome-media-2.0.mo share/locale/be/LC_MESSAGES/gnome-media-2.0.mo share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo +share/locale/bs/LC_MESSAGES/gnome-media-2.0.mo share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo @@ -466,6 +455,7 @@ share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo share/locale/no/LC_MESSAGES/gnome-media-2.0.mo @@ -483,6 +473,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo share/locale/ta/LC_MESSAGES/gnome-media-2.0.mo share/locale/th/LC_MESSAGES/gnome-media-2.0.mo +share/locale/tk/LC_MESSAGES/gnome-media-2.0.mo share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile new file mode 100644 index 000000000000..fcb72f81917b --- /dev/null +++ b/databases/evolution-data-server/Makefile @@ -0,0 +1,47 @@ +# New ports collection makefile for: evolution-data-server +# Date created: 09 December 2003 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= evolution-data-server +PORTVERSION= 1.0.2 +CATEGORIES= databases gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= The data backends for the Evolution integrated mail/PIM suite + +LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup + +USE_BZIP2= yes +USE_GMAKE= yes +USE_BISON= yes +USE_X_PREFIX= yes +USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnome +USE_REINPLACE= yes +USE_LIBTOOL_VER=15 +INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --enable-static +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +PLIST_SUB= VERSION="1.0" EVO_VERSION="1.5" + +.if !defined(WITHOUT_LDAP) +USE_OPENLDAP= yes +CONFIGURE_ARGS+=--with-openldap=yes +.else +CONFIGURE_ARGS+=--with-openldap=no +.endif + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "evolution-data-server has the following configurable option(s):" + @${ECHO_MSG} " WITHOUT_LDAP Disable LDAP support" + @${ECHO_MSG} "" + +.include <bsd.port.mk> diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo new file mode 100644 index 000000000000..f693e6f169c5 --- /dev/null +++ b/databases/evolution-data-server/distinfo @@ -0,0 +1,2 @@ +MD5 (gnome2/evolution-data-server-1.0.2.tar.bz2) = ca13b5dd751cd30c55e889d9a07e70fb +SIZE (gnome2/evolution-data-server-1.0.2.tar.bz2) = 4939846 diff --git a/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c b/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c new file mode 100644 index 000000000000..3c594c62b44c --- /dev/null +++ b/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c @@ -0,0 +1,11 @@ +--- calendar/backends/groupwise/e-cal-backend-groupwise.c.orig Wed Sep 29 13:51:58 2004 ++++ calendar/backends/groupwise/e-cal-backend-groupwise.c Wed Sep 29 13:52:10 2004 +@@ -518,7 +518,7 @@ + CAL_STATIC_CAPABILITY_NO_THISANDPRIOR "," \ + CAL_STATIC_CAPABILITY_NO_THISANDFUTURE "," \ + CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK "," \ +- CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR "," \ ++ CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR "," \ + CAL_STATIC_CAPABILITY_SAVE_SCHEDULES); + + return GNOME_Evolution_Calendar_Success; diff --git a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltime.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltime.c new file mode 100644 index 000000000000..ea585bb2be6a --- /dev/null +++ b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltime.c @@ -0,0 +1,11 @@ +--- calendar/libical/src/libical/icaltime.c.orig Wed Aug 11 16:37:41 2004 ++++ calendar/libical/src/libical/icaltime.c Wed Aug 11 16:38:01 2004 +@@ -334,7 +334,7 @@ + if(tzstr!=0){ + putenv(tzstr); + } else { +- putenv("TZ"); /* Delete from environment */ ++ unsetenv("TZ"); /* Delete from environment */ + } + + /* Free any previous TZ environment string we have used. */ diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure new file mode 100644 index 000000000000..4959297daf85 --- /dev/null +++ b/databases/evolution-data-server/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Thu Jan 29 16:02:10 2004 ++++ configure Thu Jan 29 16:02:39 2004 +@@ -23783,7 +23783,7 @@ + idldir="$datadir/idl/evolution-data-server-$BASE_VERSION" + + +-serverdir="$libdir/bonobo/servers" ++serverdir="$prefix/libdata/bonobo/servers" + + + diff --git a/databases/evolution-data-server/pkg-descr b/databases/evolution-data-server/pkg-descr new file mode 100644 index 000000000000..076bb0ef7609 --- /dev/null +++ b/databases/evolution-data-server/pkg-descr @@ -0,0 +1,3 @@ +Evolution-data-server provides the various backend components for the +Evolution integrated mail/PIM suite, including the Berkeley database +backend and the libical calendar components. diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist new file mode 100644 index 000000000000..8417797e1bbc --- /dev/null +++ b/databases/evolution-data-server/pkg-plist @@ -0,0 +1,638 @@ +include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h +include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h +include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h +include/evolution-data-server-%%VERSION%%/groupwise/e-gw-item.h +include/evolution-data-server-%%VERSION%%/groupwise/e-gw-message.h +include/evolution-data-server-%%VERSION%%/libebook/Evolution-DataServer-Addressbook.h +include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h +include/evolution-data-server-%%VERSION%%/libebook/e-book-listener.h +include/evolution-data-server-%%VERSION%%/libebook/e-book-query.h +include/evolution-data-server-%%VERSION%%/libebook/e-book-types.h +include/evolution-data-server-%%VERSION%%/libebook/e-book-view-listener.h +include/evolution-data-server-%%VERSION%%/libebook/e-book-view.h +include/evolution-data-server-%%VERSION%%/libebook/e-book.h +include/evolution-data-server-%%VERSION%%/libebook/e-contact.h +include/evolution-data-server-%%VERSION%%/libebook/e-name-western-tables.h +include/evolution-data-server-%%VERSION%%/libebook/e-name-western.h +include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h +include/evolution-data-server-%%VERSION%%/libecal/Evolution-DataServer-Calendar.h +include/evolution-data-server-%%VERSION%%/libecal/e-cal-component.h +include/evolution-data-server-%%VERSION%%/libecal/e-cal-listener.h +include/evolution-data-server-%%VERSION%%/libecal/e-cal-recur.h +include/evolution-data-server-%%VERSION%%/libecal/e-cal-time-util.h +include/evolution-data-server-%%VERSION%%/libecal/e-cal-types.h +include/evolution-data-server-%%VERSION%%/libecal/e-cal-util.h +include/evolution-data-server-%%VERSION%%/libecal/e-cal-view-listener.h +include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h +include/evolution-data-server-%%VERSION%%/libecal/e-cal.h +include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sexp.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-summary.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sync.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-factory.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-types.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-view.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h +include/evolution-data-server-%%VERSION%%/libedata-cal/Evolution-DataServer-Calendar.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-common.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-factory.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-view.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-component-listener.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-db3-utils.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-iterator.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-list-iterator.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-list.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-memory.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-sexp.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-source-group.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-source-list.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-source.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-url.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-util.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-hash-utils.h +include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h +include/evolution-data-server-%%VERSION%%/libical/ical.h +include/evolution-data-server-%%VERSION%%/libical/icalarray.h +include/evolution-data-server-%%VERSION%%/libical/icalattach.h +include/evolution-data-server-%%VERSION%%/libical/icalcalendar.h +include/evolution-data-server-%%VERSION%%/libical/icalclassify.h +include/evolution-data-server-%%VERSION%%/libical/icalcluster.h +include/evolution-data-server-%%VERSION%%/libical/icalcomponent.h +include/evolution-data-server-%%VERSION%%/libical/icalderivedparameter.h +include/evolution-data-server-%%VERSION%%/libical/icalderivedproperty.h +include/evolution-data-server-%%VERSION%%/libical/icalderivedvalue.h +include/evolution-data-server-%%VERSION%%/libical/icaldirset.h +include/evolution-data-server-%%VERSION%%/libical/icaldirsetimpl.h +include/evolution-data-server-%%VERSION%%/libical/icalduration.h +include/evolution-data-server-%%VERSION%%/libical/icalenums.h +include/evolution-data-server-%%VERSION%%/libical/icalerror.h +include/evolution-data-server-%%VERSION%%/libical/icalfileset.h +include/evolution-data-server-%%VERSION%%/libical/icalfilesetimpl.h +include/evolution-data-server-%%VERSION%%/libical/icalgauge.h +include/evolution-data-server-%%VERSION%%/libical/icalgaugeimpl.h +include/evolution-data-server-%%VERSION%%/libical/icallangbind.h +include/evolution-data-server-%%VERSION%%/libical/icalmemory.h +include/evolution-data-server-%%VERSION%%/libical/icalmessage.h +include/evolution-data-server-%%VERSION%%/libical/icalmime.h +include/evolution-data-server-%%VERSION%%/libical/icalparameter.h +include/evolution-data-server-%%VERSION%%/libical/icalparser.h +include/evolution-data-server-%%VERSION%%/libical/icalperiod.h +include/evolution-data-server-%%VERSION%%/libical/icalproperty.h +include/evolution-data-server-%%VERSION%%/libical/icalrecur.h +include/evolution-data-server-%%VERSION%%/libical/icalrestriction.h +include/evolution-data-server-%%VERSION%%/libical/icalset.h +include/evolution-data-server-%%VERSION%%/libical/icalspanlist.h +include/evolution-data-server-%%VERSION%%/libical/icalss.h +include/evolution-data-server-%%VERSION%%/libical/icalssyacc.h +include/evolution-data-server-%%VERSION%%/libical/icaltime.h +include/evolution-data-server-%%VERSION%%/libical/icaltimezone.h +include/evolution-data-server-%%VERSION%%/libical/icaltypes.h +include/evolution-data-server-%%VERSION%%/libical/icalvalue.h +include/evolution-data-server-%%VERSION%%/libical/icalvcal.h +include/evolution-data-server-%%VERSION%%/libical/port.h +include/evolution-data-server-%%VERSION%%/libical/pvl.h +include/evolution-data-server-%%VERSION%%/libical/sspm.h +include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h +include/evolution-data-server-%%VERSION%%/libical/vcc.h +include/evolution-data-server-%%VERSION%%/libical/vobject.h +lib/libebook.a +lib/libebook.so +lib/libebook.so.8 +lib/libecal.a +lib/libecal.so +lib/libecal.so.8 +lib/libedata-book.a +lib/libedata-book.so +lib/libedata-book.so.1 +lib/libedata-cal.a +lib/libedata-cal.so +lib/libedata-cal.so.6 +lib/libedataserver.a +lib/libedataserver.so +lib/libedataserver.so.5 +lib/libegroupwise.a +lib/libegroupwise.so +lib/libegroupwise.so.6 +libdata/bonobo/servers/GNOME_Evolution_DataServer_%%VERSION%%.server +libdata/pkgconfig/evolution-data-server-%%VERSION%%.pc +libdata/pkgconfig/libebook-%%VERSION%%.pc +libdata/pkgconfig/libecal-%%VERSION%%.pc +libdata/pkgconfig/libedata-book-%%VERSION%%.pc +libdata/pkgconfig/libedata-cal-%%VERSION%%.pc +libdata/pkgconfig/libedataserver-%%VERSION%%.pc +libdata/pkgconfig/libegroupwise-%%VERSION%%.pc +libexec/evolution-data-server-%%VERSION%% +share/doc/libebook/EBook.html +share/doc/libebook/EBookListener.html +share/doc/libebook/EBookView.html +share/doc/libebook/EBookViewListener.html +share/doc/libebook/EContact.html +share/doc/libebook/EVCard.html +share/doc/libebook/ch01.html +share/doc/libebook/home.png +share/doc/libebook/index.html +share/doc/libebook/index.sgml +share/doc/libebook/left.png +share/doc/libebook/libebook-EAddressWestern.html +share/doc/libebook/libebook-ENameWestern.html +share/doc/libebook/libebook-e-book-async.html +share/doc/libebook/libebook-e-book-query.html +share/doc/libebook/libebook-e-book-types.html +share/doc/libebook/libebook.devhelp +share/doc/libebook/right.png +share/doc/libebook/style.css +share/doc/libebook/up.png +share/doc/libecal/ECal.html +share/doc/libecal/ECalComponent.html +share/doc/libecal/ch01.html +share/doc/libecal/home.png +share/doc/libecal/index.html +share/doc/libecal/index.sgml +share/doc/libecal/left.png +share/doc/libecal/libecal-ECalListener.html +share/doc/libecal/libecal-ECalView.html +share/doc/libecal/libecal-ECalViewListener.html +share/doc/libecal/libecal-e-cal-recur.html +share/doc/libecal/libecal-e-cal-time-util.html +share/doc/libecal/libecal-e-cal-types.html +share/doc/libecal/libecal-e-cal-util.html +share/doc/libecal/libecal.devhelp +share/doc/libecal/right.png +share/doc/libecal/style.css +share/doc/libecal/up.png +share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Abidjan.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Accra.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Addis_Ababa.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Algiers.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Asmera.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bamako.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bangui.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Banjul.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bissau.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Blantyre.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Brazzaville.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Bujumbura.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Cairo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Casablanca.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Ceuta.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Conakry.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Dakar.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Dar_es_Salaam.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Djibouti.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Douala.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/El_Aaiun.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Freetown.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Gaborone.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Harare.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Johannesburg.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Kampala.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Khartoum.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Kigali.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Kinshasa.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lagos.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Libreville.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lome.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Luanda.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lubumbashi.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Lusaka.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Malabo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Maputo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Maseru.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Mbabane.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Mogadishu.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Monrovia.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Nairobi.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Ndjamena.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Niamey.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Nouakchott.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Ouagadougou.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Porto-Novo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Sao_Tome.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Timbuktu.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Tripoli.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Tunis.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Windhoek.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Adak.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Anchorage.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Anguilla.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Antigua.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Araguaina.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Aruba.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Asuncion.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Barbados.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Belem.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Belize.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Boa_Vista.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Bogota.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Boise.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Buenos_Aires.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cambridge_Bay.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cancun.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Caracas.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Catamarca.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cayenne.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cayman.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Chicago.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Chihuahua.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cordoba.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Costa_Rica.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Cuiaba.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Curacao.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Danmarkshavn.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Dawson.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Dawson_Creek.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Denver.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Detroit.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Dominica.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Edmonton.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Eirunepe.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/El_Salvador.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Fortaleza.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Glace_Bay.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Godthab.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Goose_Bay.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Grand_Turk.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Grenada.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guadeloupe.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guatemala.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guayaquil.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Guyana.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Halifax.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Havana.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Hermosillo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Indianapolis.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Knox.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Marengo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana/Vevay.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indianapolis.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Inuvik.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Iqaluit.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Jamaica.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Jujuy.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Juneau.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Kentucky/Louisville.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Kentucky/Monticello.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/La_Paz.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Lima.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Los_Angeles.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Louisville.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Maceio.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Managua.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Manaus.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Martinique.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Mazatlan.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Mendoza.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Menominee.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Merida.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Mexico_City.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Miquelon.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Monterrey.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Montevideo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Montreal.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Montserrat.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Nassau.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/New_York.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Nipigon.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Nome.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Noronha.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/North_Dakota/Center.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Panama.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Pangnirtung.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Paramaribo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Phoenix.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Port-au-Prince.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Port_of_Spain.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Porto_Velho.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Puerto_Rico.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rainy_River.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rankin_Inlet.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Recife.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Regina.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rio_Branco.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Rosario.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Santiago.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Santo_Domingo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Sao_Paulo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Scoresbysund.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Shiprock.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Johns.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Kitts.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Lucia.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Thomas.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/St_Vincent.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Swift_Current.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Tegucigalpa.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Thule.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Thunder_Bay.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Tijuana.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Tortola.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Vancouver.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Whitehorse.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Winnipeg.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Yakutat.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Yellowknife.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Casey.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Davis.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/DumontDUrville.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Mawson.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/McMurdo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Palmer.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/South_Pole.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Syowa.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica/Vostok.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Arctic/Longyearbyen.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Aden.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Almaty.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Amman.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Anadyr.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Aqtau.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Aqtobe.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Ashgabat.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Baghdad.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Bahrain.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Baku.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Bangkok.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Beirut.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Bishkek.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Brunei.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Calcutta.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Choibalsan.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Chongqing.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Chungking.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Colombo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Damascus.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dhaka.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dili.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dubai.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Dushanbe.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Gaza.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Harbin.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Hong_Kong.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Hovd.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Irkutsk.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Istanbul.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Jakarta.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Jayapura.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Jerusalem.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kabul.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kamchatka.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Karachi.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kashgar.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Katmandu.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Krasnoyarsk.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kuala_Lumpur.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kuching.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Kuwait.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Macao.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Magadan.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Manila.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Muscat.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Nicosia.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Novosibirsk.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Omsk.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Phnom_Penh.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Pontianak.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Pyongyang.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Qatar.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Rangoon.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Riyadh.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Saigon.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Sakhalin.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Samarkand.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Seoul.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Shanghai.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Singapore.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Taipei.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tashkent.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tbilisi.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tehran.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Thimphu.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Tokyo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Ujung_Pandang.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Ulaanbaatar.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Urumqi.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Vientiane.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Vladivostok.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Yakutsk.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Yekaterinburg.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia/Yerevan.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Azores.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Bermuda.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Canary.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Cape_Verde.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Faeroe.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Jan_Mayen.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Madeira.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Reykjavik.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/South_Georgia.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/St_Helena.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic/Stanley.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Adelaide.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Brisbane.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Broken_Hill.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Darwin.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Hobart.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Lindeman.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Lord_Howe.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Melbourne.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Perth.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia/Sydney.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Amsterdam.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Andorra.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Athens.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Belfast.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Belgrade.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Berlin.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Bratislava.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Brussels.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Bucharest.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Budapest.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Chisinau.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Copenhagen.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Dublin.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Gibraltar.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Helsinki.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Istanbul.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Kaliningrad.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Kiev.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Lisbon.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Ljubljana.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/London.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Luxembourg.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Madrid.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Malta.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Minsk.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Monaco.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Moscow.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Nicosia.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Oslo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Paris.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Prague.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Riga.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Rome.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Samara.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/San_Marino.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Sarajevo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Simferopol.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Skopje.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Sofia.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Stockholm.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Tallinn.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Tirane.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Uzhgorod.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vaduz.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vatican.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vienna.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Vilnius.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Warsaw.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Zagreb.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Zaporozhye.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe/Zurich.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Antananarivo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Chagos.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Christmas.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Cocos.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Comoro.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Kerguelen.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Mahe.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Maldives.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Mauritius.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Mayotte.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian/Reunion.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Apia.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Auckland.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Chatham.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Easter.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Efate.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Enderbury.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Fakaofo.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Fiji.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Funafuti.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Galapagos.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Gambier.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Guadalcanal.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Guam.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Honolulu.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Johnston.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Kiritimati.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Kosrae.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Kwajalein.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Majuro.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Marquesas.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Midway.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Nauru.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Niue.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Norfolk.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Noumea.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Pago_Pago.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Palau.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Pitcairn.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Ponape.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Port_Moresby.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Rarotonga.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Saipan.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Tahiti.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Tarawa.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Tongatapu.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Truk.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Wake.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Wallis.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific/Yap.ics +share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/zones.tab +share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Addressbook.idl +share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Calendar.idl +share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer.idl +share/locale/am/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/ar/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/az/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/be/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/bg/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/bn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/ca/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/cs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/cy/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/da/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/de/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/el/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/en_AU/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/es/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/et/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/eu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/fa/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/fi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/fr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/ga/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/gl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/gu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/hr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/hu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/id/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/it/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/ja/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/ko/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/lt/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/lv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/mn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/ms/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/nb/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/nl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/nn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/no/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/pa/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/pl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/pt/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/ro/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/ru/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/sk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/sl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/sq/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/sr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/sv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/tr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/uk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/vi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +@dirrm share/gnome/idl/evolution-data-server-%%VERSION%% +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Europe +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Australia +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Atlantic +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Asia +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Arctic +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Antarctica +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/North_Dakota +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Kentucky +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America/Indiana +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa +@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo +@dirrm share/gnome/evolution-data-server-%%VERSION%% +@dirrm share/doc/libecal +@dirrm share/doc/libebook +@dirrm include/evolution-data-server-%%VERSION%%/libical +@dirrm include/evolution-data-server-%%VERSION%%/libedataserver +@dirrm include/evolution-data-server-%%VERSION%%/libedata-cal +@dirrm include/evolution-data-server-%%VERSION%%/libedata-book +@dirrm include/evolution-data-server-%%VERSION%%/libecal +@dirrm include/evolution-data-server-%%VERSION%%/libebook +@dirrm include/evolution-data-server-%%VERSION%%/groupwise +@dirrm include/evolution-data-server-%%VERSION%% diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index d91ca1e212f4..d51925c8735a 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 2.8.1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.6 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.8 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,11 +22,12 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack lthack intlhack gnomehier gnomepanel -USE_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomepanel +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 +MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 +GCONF_SCHEMAS= gdict.schemas gnome-search-tool.schemas logview.schemas .include <bsd.port.mk> diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index 68c17473d366..a5647e87561d 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-utils-2.6.2.tar.bz2) = b2325307fd311c8ba1bd045d7432830e -SIZE (gnome2/gnome-utils-2.6.2.tar.bz2) = 1625287 +MD5 (gnome2/gnome-utils-2.8.1.tar.bz2) = 048224275454781c7eebc5afd4004069 +SIZE (gnome2/gnome-utils-2.8.1.tar.bz2) = 1738576 diff --git a/deskutils/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c index 1155fdb97624..942ed8a02d6b 100644 --- a/deskutils/gnome-utils/files/patch-logview_logview.c +++ b/deskutils/gnome-utils/files/patch-logview_logview.c @@ -1,6 +1,6 @@ ---- logview/logview.c.orig Sun Feb 16 15:36:07 2003 -+++ logview/logview.c Thu Apr 24 12:53:35 2003 -@@ -774,7 +774,7 @@ +--- logview/logview.c.orig Fri May 7 21:47:59 2004 ++++ logview/logview.c Wed Aug 4 18:40:24 2004 +@@ -781,7 +781,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -9,7 +9,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -797,7 +797,7 @@ +@@ -804,7 +804,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -18,7 +18,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -831,7 +831,7 @@ +@@ -838,7 +838,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -27,3 +27,11 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); +@@ -922,6 +922,7 @@ + /* remove trailing newline */ + if (logfile[strlen(logfile)-1] == '\n') + logfile[strlen(logfile)-1] = '\0'; ++ if (strcmp (logfile, "/dev/console") == 0) continue; + fprintf(stderr, "Found a logfile: (%s)\n", logfile); + return logfile; + } diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist index c687a6206f15..ff9d54341346 100644 --- a/deskutils/gnome-utils/pkg-plist +++ b/deskutils/gnome-utils/pkg-plist @@ -1,15 +1,6 @@ bin/gnome-dictionary bin/gnome-search-tool bin/gnome-system-log -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gdict.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gdict.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gdict.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-search-tool.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-search-tool.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-search-tool.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/logview.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/logview.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/logview.schemas > /dev/null || /usr/bin/true libdata/bonobo/servers/GNOME_GDictApplet.server libexec/gdict-applet share/gnome/applications/gnome-dictionary.desktop @@ -137,6 +128,7 @@ share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/bs/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo @@ -168,6 +160,8 @@ share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ml/LC_MESSAGES/gnome-utils-2.0.mo share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/no/LC_MESSAGES/gnome-utils-2.0.mo diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index d91ca1e212f4..d51925c8735a 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 2.8.1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.6 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.8 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,11 +22,12 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack lthack intlhack gnomehier gnomepanel -USE_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomepanel +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 +MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 +GCONF_SCHEMAS= gdict.schemas gnome-search-tool.schemas logview.schemas .include <bsd.port.mk> diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo index 68c17473d366..a5647e87561d 100644 --- a/deskutils/gnomeutils2/distinfo +++ b/deskutils/gnomeutils2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-utils-2.6.2.tar.bz2) = b2325307fd311c8ba1bd045d7432830e -SIZE (gnome2/gnome-utils-2.6.2.tar.bz2) = 1625287 +MD5 (gnome2/gnome-utils-2.8.1.tar.bz2) = 048224275454781c7eebc5afd4004069 +SIZE (gnome2/gnome-utils-2.8.1.tar.bz2) = 1738576 diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c index 1155fdb97624..942ed8a02d6b 100644 --- a/deskutils/gnomeutils2/files/patch-logview_logview.c +++ b/deskutils/gnomeutils2/files/patch-logview_logview.c @@ -1,6 +1,6 @@ ---- logview/logview.c.orig Sun Feb 16 15:36:07 2003 -+++ logview/logview.c Thu Apr 24 12:53:35 2003 -@@ -774,7 +774,7 @@ +--- logview/logview.c.orig Fri May 7 21:47:59 2004 ++++ logview/logview.c Wed Aug 4 18:40:24 2004 +@@ -781,7 +781,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -9,7 +9,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -797,7 +797,7 @@ +@@ -804,7 +804,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -18,7 +18,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -831,7 +831,7 @@ +@@ -838,7 +838,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -27,3 +27,11 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); +@@ -922,6 +922,7 @@ + /* remove trailing newline */ + if (logfile[strlen(logfile)-1] == '\n') + logfile[strlen(logfile)-1] = '\0'; ++ if (strcmp (logfile, "/dev/console") == 0) continue; + fprintf(stderr, "Found a logfile: (%s)\n", logfile); + return logfile; + } diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist index c687a6206f15..ff9d54341346 100644 --- a/deskutils/gnomeutils2/pkg-plist +++ b/deskutils/gnomeutils2/pkg-plist @@ -1,15 +1,6 @@ bin/gnome-dictionary bin/gnome-search-tool bin/gnome-system-log -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gdict.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gdict.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gdict.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-search-tool.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-search-tool.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-search-tool.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/logview.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/logview.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/logview.schemas > /dev/null || /usr/bin/true libdata/bonobo/servers/GNOME_GDictApplet.server libexec/gdict-applet share/gnome/applications/gnome-dictionary.desktop @@ -137,6 +128,7 @@ share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/bs/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo @@ -168,6 +160,8 @@ share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ml/LC_MESSAGES/gnome-utils-2.0.mo share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/no/LC_MESSAGES/gnome-utils-2.0.mo diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 43916eadff12..a801a0e9ea4c 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ORBit2 -PORTVERSION= 2.10.4 +PORTVERSION= 2.12.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index cc35867b6227..d71eaba0cfa7 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/ORBit2-2.10.4.tar.bz2) = 5f65c08f101c8b5e3706ec9d491f332c -SIZE (gnome2/ORBit2-2.10.4.tar.bz2) = 644357 +MD5 (gnome2/ORBit2-2.12.0.tar.bz2) = d7f0c2b9bee73b89978a9968c10f81fe +SIZE (gnome2/ORBit2-2.12.0.tar.bz2) = 666898 diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index 48c28cd3c8a2..41bfc92d7cc5 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -66,7 +66,6 @@ libdata/pkgconfig/ORBit-imodule-2.0.pc share/aclocal/ORBit2.m4 share/idl/orbit-2.0/CosNaming.idl @dirrm share/idl/orbit-2.0 -@dirrm %%DOCSDIR%% @unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/lib/orbit-2.0 2>/dev/null || /usr/bin/true @dirrm include/orbit-2.0/orbit/util diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile index 0abee6dfdfe0..83f0bfc0892d 100644 --- a/devel/bugbuddy2/Makefile +++ b/devel/bugbuddy2/Makefile @@ -6,10 +6,11 @@ # PORTNAME= bugbuddy2 -PORTVERSION= 2.6.1 +PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.6 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.8 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,12 +21,13 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 -USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomedesktop +USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= bug-buddy.1 +MAN1= bug-buddy.1 +GCONF_SCHEMAS= bug-buddy.schemas .include <bsd.port.mk> diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo index 76da9191bb27..0b776637feb8 100644 --- a/devel/bugbuddy2/distinfo +++ b/devel/bugbuddy2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.6.1.tar.bz2) = a9a8fb40fc762fb09ab587c2e0460653 -SIZE (gnome2/bug-buddy-2.6.1.tar.bz2) = 858940 +MD5 (gnome2/bug-buddy-2.8.0.tar.bz2) = b4c90bb9e1762803d083026b000349ea +SIZE (gnome2/bug-buddy-2.8.0.tar.bz2) = 711303 diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist index 47734bac3ca0..5e430bc98565 100644 --- a/devel/bugbuddy2/pkg-plist +++ b/devel/bugbuddy2/pkg-plist @@ -1,8 +1,6 @@ bin/bug-buddy -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/bug-buddy.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/bug-buddy.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/bug-buddy.schemas > /dev/null || /usr/bin/true share/gnome/application-registry/bug-buddy.applications +share/gnome/applications/bug-buddy-core.desktop share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade share/gnome/bug-buddy/bug-buddy.png @@ -19,59 +17,9 @@ share/gnome/bug-buddy/gnome.png share/gnome/bug-buddy/ximian.png share/gnome/help/bug-buddy/C/bug-buddy.xml share/gnome/help/bug-buddy/C/legal.xml -share/gnome/help/bug-buddy/de/bug-buddy.xml -share/gnome/help/bug-buddy/de/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/de/legal.xml -share/gnome/help/bug-buddy/es/bug-buddy.xml -share/gnome/help/bug-buddy/es/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/es/legal.xml -share/gnome/help/bug-buddy/fr/bug-buddy.xml -share/gnome/help/bug-buddy/fr/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/fr/legal.xml -share/gnome/help/bug-buddy/it/bug-buddy.xml -share/gnome/help/bug-buddy/it/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/it/legal.xml -share/gnome/help/bug-buddy/ja/bug-buddy.xml -share/gnome/help/bug-buddy/ja/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/ja/legal.xml -share/gnome/help/bug-buddy/ko/bug-buddy.xml -share/gnome/help/bug-buddy/ko/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/ko/legal.xml -share/gnome/help/bug-buddy/sv/bug-buddy.xml -share/gnome/help/bug-buddy/sv/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/sv/legal.xml -share/gnome/help/bug-buddy/zh_CN/bug-buddy.xml -share/gnome/help/bug-buddy/zh_CN/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/zh_CN/legal.xml -share/gnome/help/bug-buddy/zh_HK/bug-buddy.xml -share/gnome/help/bug-buddy/zh_HK/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/zh_HK/legal.xml -share/gnome/help/bug-buddy/zh_TW/bug-buddy.xml -share/gnome/help/bug-buddy/zh_TW/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/zh_TW/legal.xml share/gnome/mime-info/bug-buddy.keys share/gnome/omf/bug-buddy/bug-buddy-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-de.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-es.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-fr.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -79,6 +27,7 @@ share/locale/az/LC_MESSAGES/bug-buddy.mo share/locale/be/LC_MESSAGES/bug-buddy.mo share/locale/bg/LC_MESSAGES/bug-buddy.mo share/locale/bn/LC_MESSAGES/bug-buddy.mo +share/locale/bs/LC_MESSAGES/bug-buddy.mo share/locale/ca/LC_MESSAGES/bug-buddy.mo share/locale/cs/LC_MESSAGES/bug-buddy.mo share/locale/cy/LC_MESSAGES/bug-buddy.mo @@ -111,9 +60,11 @@ share/locale/mk/LC_MESSAGES/bug-buddy.mo share/locale/ml/LC_MESSAGES/bug-buddy.mo share/locale/mn/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo +share/locale/nb/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo share/locale/no/LC_MESSAGES/bug-buddy.mo +share/locale/or/LC_MESSAGES/bug-buddy.mo share/locale/pa/LC_MESSAGES/bug-buddy.mo share/locale/pl/LC_MESSAGES/bug-buddy.mo share/locale/pt/LC_MESSAGES/bug-buddy.mo @@ -135,26 +86,6 @@ share/locale/wa/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrm share/gnome/omf/bug-buddy -@dirrm share/gnome/help/bug-buddy/zh_TW/figures -@dirrm share/gnome/help/bug-buddy/zh_TW -@dirrm share/gnome/help/bug-buddy/zh_HK/figures -@dirrm share/gnome/help/bug-buddy/zh_HK -@dirrm share/gnome/help/bug-buddy/zh_CN/figures -@dirrm share/gnome/help/bug-buddy/zh_CN -@dirrm share/gnome/help/bug-buddy/sv/figures -@dirrm share/gnome/help/bug-buddy/sv -@dirrm share/gnome/help/bug-buddy/ko/figures -@dirrm share/gnome/help/bug-buddy/ko -@dirrm share/gnome/help/bug-buddy/ja/figures -@dirrm share/gnome/help/bug-buddy/ja -@dirrm share/gnome/help/bug-buddy/it/figures -@dirrm share/gnome/help/bug-buddy/it -@dirrm share/gnome/help/bug-buddy/fr/figures -@dirrm share/gnome/help/bug-buddy/fr -@dirrm share/gnome/help/bug-buddy/es/figures -@dirrm share/gnome/help/bug-buddy/es -@dirrm share/gnome/help/bug-buddy/de/figures -@dirrm share/gnome/help/bug-buddy/de @dirrm share/gnome/help/bug-buddy/C @dirrm share/gnome/help/bug-buddy @dirrm share/gnome/bug-buddy/bugzilla/ximian @@ -162,13 +93,3 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrm share/gnome/bug-buddy/bugzilla @dirrm share/gnome/bug-buddy @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile index 763a4e32fd96..708aee02b218 100644 --- a/devel/desktop-file-utils/Makefile +++ b/devel/desktop-file-utils/Makefile @@ -6,8 +6,7 @@ # PORTNAME= desktop-file-utils -PORTVERSION= 0.7 -PORTREVISION= 1 +PORTVERSION= 0.9 CATEGORIES= devel MASTER_SITES= http://freedesktop.org/Software/desktop-file-utils/releases/ diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo index 264c66a82a05..a68f8fb01aba 100644 --- a/devel/desktop-file-utils/distinfo +++ b/devel/desktop-file-utils/distinfo @@ -1,2 +1,2 @@ -MD5 (desktop-file-utils-0.7.tar.gz) = 32b948c2676170dc01ac4849c00bc5d6 -SIZE (desktop-file-utils-0.7.tar.gz) = 415348 +MD5 (desktop-file-utils-0.9.tar.gz) = d1f3e0ff6681dba1624b3c57a2d60d38 +SIZE (desktop-file-utils-0.9.tar.gz) = 424432 diff --git a/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c b/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c index 13db021e7ba8..291b9ecef923 100644 --- a/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c +++ b/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c @@ -1,11 +1,11 @@ ---- src/eggdirfuncs.c.orig Sat Jul 24 01:53:05 2004 -+++ src/eggdirfuncs.c Sat Jul 24 01:53:31 2004 +--- src/eggdirfuncs.c.orig Thu Sep 2 15:44:39 2004 ++++ src/eggdirfuncs.c Tue Sep 21 01:24:07 2004 @@ -106,7 +106,7 @@ data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); if (!data_dirs || !data_dirs[0]) -- data_dirs = (char *) "/usr/local/share/:/usr/share/"; -+ data_dirs = (char *) "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; +- data_dirs = "/usr/local/share/:/usr/share/"; ++ data_dirs = "%%X11BASE%%/share/:/usr/local/share/:/usr/share/:%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:/usr/share/gnome/"; data_dir_vector = g_strsplit (data_dirs, ":", 0); diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index e4bfe7a9efdb..23495787a660 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gconf2 -PORTVERSION= 2.6.4 +PORTVERSION= 2.8.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/2.6 +MASTER_SITE_SUBDIR= sources/GConf/2.8 DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,9 +19,9 @@ COMMENT= A configuration database system for GNOME USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack lthack gnomehier orbit2 gtk20 libxml2 linc +USE_GNOME= gnomehack gnomehier orbit2 gtk20 libxml2 linc INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index fb77307a65fe..aca3f01b6deb 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/GConf-2.6.4.tar.bz2) = 7a24af8dd5f3e810a7f8cc21a7c88ded -SIZE (gnome2/GConf-2.6.4.tar.bz2) = 1524559 +MD5 (gnome2/GConf-2.8.1.tar.bz2) = b1173cbe33404bcbcc15710ce2a28f67 +SIZE (gnome2/GConf-2.8.1.tar.bz2) = 1730812 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 35f210be5fae..eb4b1a71a6a9 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -20,19 +20,7 @@ libexec/gconf-sanity-check-2 libexec/gconfd-2 share/aclocal/gconf-2.m4 share/doc/gconf/ch01.html -share/doc/gconf/ch01s02.html -share/doc/gconf/ch02.html -share/doc/gconf/ch02s02.html -share/doc/gconf/ch02s03.html -share/doc/gconf/ch02s04.html -share/doc/gconf/ch06.html -share/doc/gconf/ch06s02.html -share/doc/gconf/ch06s03.html -share/doc/gconf/ch07.html -share/doc/gconf/conventions.html share/doc/gconf/gconf-GConfClient.html -share/doc/gconf/gconf-client-reference.html -share/doc/gconf/gconf-client.html share/doc/gconf/gconf-gconf-backend.html share/doc/gconf/gconf-gconf-changeset.html share/doc/gconf/gconf-gconf-engine.html @@ -44,10 +32,7 @@ share/doc/gconf/gconf-gconf-schema.html share/doc/gconf/gconf-gconf-sources.html share/doc/gconf/gconf-gconf-value.html share/doc/gconf/gconf-gconf.html -share/doc/gconf/gconf-internals-reference.html -share/doc/gconf/gconf-reference.html share/doc/gconf/gconf.devhelp -share/doc/gconf/gconftool.html share/doc/gconf/home.png share/doc/gconf/index.html share/doc/gconf/index.sgml @@ -61,6 +46,7 @@ share/locale/az/LC_MESSAGES/GConf2.mo share/locale/be/LC_MESSAGES/GConf2.mo share/locale/bg/LC_MESSAGES/GConf2.mo share/locale/bn/LC_MESSAGES/GConf2.mo +share/locale/bs/LC_MESSAGES/GConf2.mo share/locale/ca/LC_MESSAGES/GConf2.mo share/locale/cs/LC_MESSAGES/GConf2.mo share/locale/cy/LC_MESSAGES/GConf2.mo @@ -90,6 +76,8 @@ share/locale/mk/LC_MESSAGES/GConf2.mo share/locale/ml/LC_MESSAGES/GConf2.mo share/locale/mn/LC_MESSAGES/GConf2.mo share/locale/ms/LC_MESSAGES/GConf2.mo +share/locale/nb/LC_MESSAGES/GConf2.mo +share/locale/ne/LC_MESSAGES/GConf2.mo share/locale/nl/LC_MESSAGES/GConf2.mo share/locale/nn/LC_MESSAGES/GConf2.mo share/locale/no/LC_MESSAGES/GConf2.mo diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index e608355897ea..bbdac7cff117 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 2.8.3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.6 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,13 +26,17 @@ USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ USE_REINPLACE= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --disable-openssl \ +CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls \ --with-gtk=no CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +GCONF_SCHEMAS= desktop_default_applications.schemas \ + desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ + system_http_proxy.schemas system_smb.schemas + OPTIONS= KDE_MENUS "Integrated KDE menu picks" on .include <bsd.port.pre.mk> @@ -41,6 +44,8 @@ OPTIONS= KDE_MENUS "Integrated KDE menu picks" on .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_CDPARANOIA .undef WITHOUT_SAMBA +.undef WITHOUT_MDNS +WITH_MDNS= yes WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif @@ -60,6 +65,10 @@ WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif +.if exists(${LOCALBASE}/lib/libhowl.so) +WITH_MDNS= yes +.endif + .if defined(WITH_CDPARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia PLIST_SUB+= CDPARANOIA="" @@ -67,10 +76,14 @@ PLIST_SUB+= CDPARANOIA="" PLIST_SUB+= CDPARANOIA="@comment " .endif -.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM) +.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif +.if exists(${LOCALBASE}/lib/libkrb5.so) +LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal +.endif + .if defined(WITH_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" @@ -78,6 +91,10 @@ PLIST_SUB+= SAMBA="" PLIST_SUB+= SAMBA="@comment " .endif +.if defined(WITH_MDNS) +LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +.endif + post-patch: @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' @@ -86,7 +103,9 @@ post-patch: ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/libgnomevfs/xdgmime.c + ${WRKSRC}/libgnomevfs/xdgmime.c \ + ${WRKSRC}/libgnomevfs/eggdirfuncs.c \ + ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c .if !defined(WITHOUT_KDE_MENUS) @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index d88c0954602a..026296e07214 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.6.2.tar.bz2) = 61bf3e145652089c63edd423ecbc9eba -SIZE (gnome2/gnome-vfs-2.6.2.tar.bz2) = 1372181 +MD5 (gnome2/gnome-vfs-2.8.3.tar.bz2) = 5484694e7250c80a231cfc525d924cc3 +SIZE (gnome2/gnome-vfs-2.8.3.tar.bz2) = 1907154 diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index f7ec12a89ea7..caf6411ffeaa 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Thu Aug 12 19:59:11 2004 -+++ configure Thu Aug 12 19:59:11 2004 -@@ -22922,6 +22922,8 @@ +--- configure.orig Tue Jun 1 03:53:13 2004 ++++ configure Tue Jun 1 03:53:13 2004 +@@ -22815,6 +22815,8 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9,7 +9,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23004,6 +23006,7 @@ +@@ -22897,6 +22899,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17,7 +17,7 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -23011,6 +23014,7 @@ +@@ -22904,6 +22907,7 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -25,7 +25,7 @@ have_ngettext=yes else echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -26981,8 +26985,8 @@ +@@ -26876,8 +26880,8 @@ done fi @@ -36,7 +36,7 @@ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -27001,11 +27005,11 @@ +@@ -26896,11 +26900,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -50,7 +50,7 @@ ; return 0; } -@@ -28136,7 +28140,7 @@ +@@ -28031,7 +28035,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -59,7 +59,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29765,6 +29769,9 @@ +@@ -29660,6 +29664,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -69,7 +69,7 @@ #include <sys/statfs.h> #include <sys/fstyp.h> _ACEOF -@@ -29805,6 +29812,9 @@ +@@ -29700,6 +29707,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -79,7 +79,7 @@ #include <sys/statfs.h> #include <sys/vmount.h> _ACEOF -@@ -31432,6 +31442,7 @@ +@@ -31338,6 +31348,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac index 5a687e11a977..9362cac1715f 100644 --- a/devel/gnome-vfs/files/patch-ac +++ b/devel/gnome-vfs/files/patch-ac @@ -1,16 +1,7 @@ ---- modules/Makefile.in.orig Thu Aug 26 20:51:38 2004 -+++ modules/Makefile.in Thu Aug 26 21:00:56 2004 -@@ -195,7 +195,7 @@ - am__quote = @am__quote@ - install_sh = @install_sh@ - NULL = --SUBDIRS = extfs vfolder -+SUBDIRS = vfolder - - INCLUDES = \ - -I$(top_srcdir) \ -@@ -240,13 +240,12 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la +--- modules/Makefile.in.orig Tue May 6 15:39:48 2003 ++++ modules/Makefile.in Tue May 6 15:41:28 2003 +@@ -210,7 +210,7 @@ + @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = -module_flags = -export_dynamic -avoid-version -module -no-undefined @@ -18,22 +9,3 @@ modulesdir = $(libdir)/gnome-vfs-2.0/modules modules_LTLIBRARIES = \ - $(CDDA_LTLIBS) \ - libcomputer.la \ -- libextfs.la \ - libfile.la \ - libnetwork.la \ - libnntp.la \ -@@ -292,12 +291,6 @@ - libcomputer_la_SOURCES = computer-method.c - libcomputer_la_LDFLAGS = $(module_flags) - libcomputer_la_LIBADD = $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la -- -- --### `extfs' method --libextfs_la_SOURCES = extfs-method.c --libextfs_la_LDFLAGS = $(module_flags) --libextfs_la_LIBADD = $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la - - - ### `file' method diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in index c75f0d973243..4acd9a1bc552 100644 --- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in +++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in @@ -1,12 +1,13 @@ $FreeBSD$ ---- gnome-vfs-2.0.pc.in 2002/02/16 13:07:24 1.1 -+++ gnome-vfs-2.0.pc.in 2002/02/16 13:07:38 +--- gnome-vfs-2.0.pc.in.orig Thu Oct 28 13:25:35 2004 ++++ gnome-vfs-2.0.pc.in Thu Oct 28 13:25:51 2004 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system libraries Version: @VERSION@ - Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include + diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c new file mode 100644 index 000000000000..82e0e5f61891 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c @@ -0,0 +1,11 @@ +--- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004 ++++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004 +@@ -106,7 +106,7 @@ + data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); + + if (!data_dirs || !data_dirs[0]) +- data_dirs = "/usr/local/share/:/usr/share/"; ++ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; + + data_dir_vector = g_strsplit (data_dirs, ":", 0); + diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c new file mode 100644 index 000000000000..a61e83417651 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c @@ -0,0 +1,11 @@ +--- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004 ++++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004 +@@ -149,7 +149,7 @@ + + xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); + if (!xdg_data_dirs) { +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + } + + split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c new file mode 100644 index 000000000000..c58be91fa94b --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c @@ -0,0 +1,13 @@ +--- libgnomevfs/gnome-vfs-resolve.c.orig Sat Jul 31 17:52:23 2004 ++++ libgnomevfs/gnome-vfs-resolve.c Sat Jul 31 17:52:45 2004 +@@ -171,8 +171,10 @@ + switch (error) { + + case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; ++#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA) + case EAI_ADDRFAMILY: + case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; ++#endif + case EAI_SYSTEM: return gnome_vfs_result_from_errno (); + case EAI_FAIL: + case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER; diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c index 7028e5a91b8e..5d37cc768ddb 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c @@ -1,35 +1,10 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Feb 16 06:13:27 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Sat Apr 17 00:45:01 2004 -@@ -141,9 +141,9 @@ - FD_ZERO(&read_fds); - FD_SET(pipes[0], &read_fds); - -- /* Wait max half a second */ -- tv.tv_sec = 0; -- tv.tv_usec = 500; -+ /* Wait max one second */ -+ tv.tv_sec = 1; -+ tv.tv_usec = 0; - - res = select(pipes[0] + 1, - &read_fds, NULL, NULL, &tv); -@@ -428,7 +428,7 @@ - mount_entry->mount_path = g_strdup (mntent[i].f_mntonname); - mount_entry->device_path = g_strdup (mntent[i].f_mntfromname); - mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename); -- if (mntent[i].f_flags == MNT_RDONLY) { -+ if (mntent[i].f_flags & MNT_RDONLY) { - mount_entry->is_read_only = TRUE; - } - -@@ -857,8 +857,9 @@ - - #ifdef HAVE_SYS_SYSCTL_H - if (usermnt != 0) { -+ uid_t uid = getuid (); - if (stat (fstab->fs_file, &sb) == 0) { -- if (sb.st_uid != 0) { -+ if (uid == 0 || sb.st_uid == uid) { - mount_entry->is_user_mountable = TRUE; - } - } +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004 ++++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004 +@@ -43,6 +43,7 @@ + #include <errno.h> + #include <string.h> + #include <signal.h> ++#include <poll.h> + #include <libgnomevfs/gnome-vfs.h> + + #include "gnome-vfs-unix-mounts.h" diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c index a168c6acdac8..9788a89f060e 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,25 +1,6 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Fri Apr 16 06:43:05 2004 -+++ libgnomevfs/gnome-vfs-utils.c Mon Apr 19 15:41:47 2004 -@@ -797,7 +797,9 @@ - - #if HAVE_STATVFS - statfs_result = statvfs (unescaped_path, &statfs_buffer); -+#define statfs_bsize f_frsize - #else -+#define statfs_bsize f_bsize - #if STATFS_ARGS == 2 - statfs_result = statfs (unescaped_path, &statfs_buffer); - #elif STATFS_ARGS == 4 -@@ -838,7 +840,7 @@ - } - #endif - -- block_size = statfs_buffer.f_bsize; -+ block_size = statfs_buffer.statfs_bsize; - free_blocks = statfs_buffer.f_bavail; - - *size = block_size * free_blocks; -@@ -866,7 +868,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004 ++++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004 +@@ -871,7 +871,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c index 0c6c3d28ad0a..472a4b5f6c19 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c @@ -1,11 +1,11 @@ ---- libgnomevfs/xdgmime.c.orig Wed Jun 23 20:15:25 2004 -+++ libgnomevfs/xdgmime.c Wed Jun 23 20:15:41 2004 -@@ -97,7 +97,7 @@ +--- libgnomevfs/xdgmime.c.orig Thu Jul 22 11:20:13 2004 ++++ libgnomevfs/xdgmime.c Thu Jul 22 11:20:52 2004 +@@ -189,7 +189,7 @@ - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - ptr = xdg_data_dirs; + ptr = xdg_data_dirs; diff --git a/devel/gnome-vfs/files/patch-modules_default-modules.conf b/devel/gnome-vfs/files/patch-modules_default-modules.conf deleted file mode 100644 index 0efb87aa888c..000000000000 --- a/devel/gnome-vfs/files/patch-modules_default-modules.conf +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/default-modules.conf.orig Thu Aug 26 21:01:12 2004 -+++ modules/default-modules.conf Thu Aug 26 21:01:22 2004 -@@ -38,9 +38,6 @@ - - ssh: ssh - --# The various access methods implemented by the extfs system. --a ar arj cpio deb hp48 lha mailfs patchfs rar rpm rpms trpm zip zoo: extfs -- - # vfolder desktop method - applications: vfolder-desktop - applications-all-users: vfolder-desktop diff --git a/devel/gnome-vfs/files/patch-modules_extfs-method.c b/devel/gnome-vfs/files/patch-modules_extfs-method.c deleted file mode 100644 index 129e9c4e131e..000000000000 --- a/devel/gnome-vfs/files/patch-modules_extfs-method.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/extfs-method.c.orig Thu Aug 12 20:04:05 2004 -+++ modules/extfs-method.c Thu Aug 12 20:06:20 2004 -@@ -61,7 +61,7 @@ - - - static ssize_t --getdelim (char **lineptr, size_t n, int terminator, FILE *stream) -+getdelim (char **lineptr, size_t *n, int terminator, FILE *stream) - { - char *line, *p; - size_t size, copy; diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 3f5cc01a3a79..7bec57259d84 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -3,21 +3,11 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_default_applications.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_default_applications.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_default_applications.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_url_handlers.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_url_handlers.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_url_handlers.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/system_http_proxy.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/system_http_proxy.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_http_proxy.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/system_smb.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/system_smb.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_smb.schemas > /dev/null || /usr/bin/true +bin/gnomevfs-rm %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf +etc/gnome-vfs-2.0/modules/ssl-modules.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info etc/gnome-vfs-2.0/vfolders/network.vfolder-info @@ -26,11 +16,13 @@ etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info include/gnome-vfs-2.0/include/gnome-vfs-file-size.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h @@ -40,11 +32,13 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h @@ -71,6 +65,7 @@ lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so lib/gnome-vfs-2.0/modules/libcomputer.so +lib/gnome-vfs-2.0/modules/libdns-sd.so lib/gnome-vfs-2.0/modules/libfile.so lib/gnome-vfs-2.0/modules/libftp.so lib/gnome-vfs-2.0/modules/libgzip.so @@ -79,7 +74,6 @@ lib/gnome-vfs-2.0/modules/libnetwork.so lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so -lib/gnome-vfs-2.0/modules/libssh.so lib/gnome-vfs-2.0/modules/libtar.so lib/gnome-vfs-2.0/modules/libvfolder-desktop.so lib/gnome-vfs-2.0/modules/libvfs-pipe.so @@ -87,12 +81,71 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.600 +lib/libgnomevfs-2.so.800 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc libexec/gnome-vfs-daemon +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/home.png +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/left.png +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/networking.html +share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/style.css +share/doc/gnome-vfs-2.0/up.png +share/doc/gnome-vfs-2.0/volumes.html @exec mkdir -p %D/share/gnome/vfolders %%KDEMENUS%%share/gnome/vfolders/KDE.directory share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo @@ -138,6 +191,7 @@ share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo @@ -165,6 +219,7 @@ share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/gnome/vfolders +@dirrm share/doc/gnome-vfs-2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile index 4e141049c3b7..6d1c8352901e 100644 --- a/devel/gnome2-hacker-tools/Makefile +++ b/devel/gnome2-hacker-tools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-hacker-tools -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 CATEGORIES= devel gnome MASTER_SITES= # empty DISTFILES= # empty @@ -22,18 +22,12 @@ RUN_DEPENDS= mlv:${PORTSDIR}/editors/mlview \ gob2:${PORTSDIR}/devel/gob2 \ conglomerate:${PORTSDIR}/editors/conglomerate \ meld:${PORTSDIR}/textproc/meld \ - gtranslator:${PORTSDIR}/devel/gtranslator -# not yet buildable under GNOME 2.5 -# regexxer:${PORTSDIR}/devel/regexxer - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -RUN_DEPENDS+= anjuta:${PORTSDIR}/devel/anjuta -.endif + gtranslator:${PORTSDIR}/devel/gtranslator \ + regexxer:${PORTSDIR}/devel/regexxer \ + anjuta:${PORTSDIR}/devel/anjuta NO_BUILD= yes do-install: # empty -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index e608355897ea..bbdac7cff117 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 2.8.3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.6 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,13 +26,17 @@ USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ USE_REINPLACE= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --disable-openssl \ +CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls \ --with-gtk=no CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +GCONF_SCHEMAS= desktop_default_applications.schemas \ + desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ + system_http_proxy.schemas system_smb.schemas + OPTIONS= KDE_MENUS "Integrated KDE menu picks" on .include <bsd.port.pre.mk> @@ -41,6 +44,8 @@ OPTIONS= KDE_MENUS "Integrated KDE menu picks" on .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_CDPARANOIA .undef WITHOUT_SAMBA +.undef WITHOUT_MDNS +WITH_MDNS= yes WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif @@ -60,6 +65,10 @@ WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif +.if exists(${LOCALBASE}/lib/libhowl.so) +WITH_MDNS= yes +.endif + .if defined(WITH_CDPARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia PLIST_SUB+= CDPARANOIA="" @@ -67,10 +76,14 @@ PLIST_SUB+= CDPARANOIA="" PLIST_SUB+= CDPARANOIA="@comment " .endif -.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM) +.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif +.if exists(${LOCALBASE}/lib/libkrb5.so) +LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal +.endif + .if defined(WITH_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" @@ -78,6 +91,10 @@ PLIST_SUB+= SAMBA="" PLIST_SUB+= SAMBA="@comment " .endif +.if defined(WITH_MDNS) +LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +.endif + post-patch: @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' @@ -86,7 +103,9 @@ post-patch: ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/libgnomevfs/xdgmime.c + ${WRKSRC}/libgnomevfs/xdgmime.c \ + ${WRKSRC}/libgnomevfs/eggdirfuncs.c \ + ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c .if !defined(WITHOUT_KDE_MENUS) @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index d88c0954602a..026296e07214 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.6.2.tar.bz2) = 61bf3e145652089c63edd423ecbc9eba -SIZE (gnome2/gnome-vfs-2.6.2.tar.bz2) = 1372181 +MD5 (gnome2/gnome-vfs-2.8.3.tar.bz2) = 5484694e7250c80a231cfc525d924cc3 +SIZE (gnome2/gnome-vfs-2.8.3.tar.bz2) = 1907154 diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa index f7ec12a89ea7..caf6411ffeaa 100644 --- a/devel/gnomevfs2/files/patch-aa +++ b/devel/gnomevfs2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Thu Aug 12 19:59:11 2004 -+++ configure Thu Aug 12 19:59:11 2004 -@@ -22922,6 +22922,8 @@ +--- configure.orig Tue Jun 1 03:53:13 2004 ++++ configure Tue Jun 1 03:53:13 2004 +@@ -22815,6 +22815,8 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9,7 +9,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23004,6 +23006,7 @@ +@@ -22897,6 +22899,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17,7 +17,7 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -23011,6 +23014,7 @@ +@@ -22904,6 +22907,7 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -25,7 +25,7 @@ have_ngettext=yes else echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -26981,8 +26985,8 @@ +@@ -26876,8 +26880,8 @@ done fi @@ -36,7 +36,7 @@ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -27001,11 +27005,11 @@ +@@ -26896,11 +26900,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -50,7 +50,7 @@ ; return 0; } -@@ -28136,7 +28140,7 @@ +@@ -28031,7 +28035,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -59,7 +59,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29765,6 +29769,9 @@ +@@ -29660,6 +29664,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -69,7 +69,7 @@ #include <sys/statfs.h> #include <sys/fstyp.h> _ACEOF -@@ -29805,6 +29812,9 @@ +@@ -29700,6 +29707,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -79,7 +79,7 @@ #include <sys/statfs.h> #include <sys/vmount.h> _ACEOF -@@ -31432,6 +31442,7 @@ +@@ -31338,6 +31348,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac index 5a687e11a977..9362cac1715f 100644 --- a/devel/gnomevfs2/files/patch-ac +++ b/devel/gnomevfs2/files/patch-ac @@ -1,16 +1,7 @@ ---- modules/Makefile.in.orig Thu Aug 26 20:51:38 2004 -+++ modules/Makefile.in Thu Aug 26 21:00:56 2004 -@@ -195,7 +195,7 @@ - am__quote = @am__quote@ - install_sh = @install_sh@ - NULL = --SUBDIRS = extfs vfolder -+SUBDIRS = vfolder - - INCLUDES = \ - -I$(top_srcdir) \ -@@ -240,13 +240,12 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la +--- modules/Makefile.in.orig Tue May 6 15:39:48 2003 ++++ modules/Makefile.in Tue May 6 15:41:28 2003 +@@ -210,7 +210,7 @@ + @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = -module_flags = -export_dynamic -avoid-version -module -no-undefined @@ -18,22 +9,3 @@ modulesdir = $(libdir)/gnome-vfs-2.0/modules modules_LTLIBRARIES = \ - $(CDDA_LTLIBS) \ - libcomputer.la \ -- libextfs.la \ - libfile.la \ - libnetwork.la \ - libnntp.la \ -@@ -292,12 +291,6 @@ - libcomputer_la_SOURCES = computer-method.c - libcomputer_la_LDFLAGS = $(module_flags) - libcomputer_la_LIBADD = $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la -- -- --### `extfs' method --libextfs_la_SOURCES = extfs-method.c --libextfs_la_LDFLAGS = $(module_flags) --libextfs_la_LIBADD = $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la - - - ### `file' method diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in index c75f0d973243..4acd9a1bc552 100644 --- a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in +++ b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in @@ -1,12 +1,13 @@ $FreeBSD$ ---- gnome-vfs-2.0.pc.in 2002/02/16 13:07:24 1.1 -+++ gnome-vfs-2.0.pc.in 2002/02/16 13:07:38 +--- gnome-vfs-2.0.pc.in.orig Thu Oct 28 13:25:35 2004 ++++ gnome-vfs-2.0.pc.in Thu Oct 28 13:25:51 2004 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system libraries Version: @VERSION@ - Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include + diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c new file mode 100644 index 000000000000..82e0e5f61891 --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c @@ -0,0 +1,11 @@ +--- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004 ++++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004 +@@ -106,7 +106,7 @@ + data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); + + if (!data_dirs || !data_dirs[0]) +- data_dirs = "/usr/local/share/:/usr/share/"; ++ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; + + data_dir_vector = g_strsplit (data_dirs, ":", 0); + diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c new file mode 100644 index 000000000000..a61e83417651 --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c @@ -0,0 +1,11 @@ +--- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004 ++++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004 +@@ -149,7 +149,7 @@ + + xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); + if (!xdg_data_dirs) { +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + } + + split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c new file mode 100644 index 000000000000..c58be91fa94b --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c @@ -0,0 +1,13 @@ +--- libgnomevfs/gnome-vfs-resolve.c.orig Sat Jul 31 17:52:23 2004 ++++ libgnomevfs/gnome-vfs-resolve.c Sat Jul 31 17:52:45 2004 +@@ -171,8 +171,10 @@ + switch (error) { + + case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; ++#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA) + case EAI_ADDRFAMILY: + case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; ++#endif + case EAI_SYSTEM: return gnome_vfs_result_from_errno (); + case EAI_FAIL: + case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER; diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c index 7028e5a91b8e..5d37cc768ddb 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c @@ -1,35 +1,10 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Feb 16 06:13:27 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Sat Apr 17 00:45:01 2004 -@@ -141,9 +141,9 @@ - FD_ZERO(&read_fds); - FD_SET(pipes[0], &read_fds); - -- /* Wait max half a second */ -- tv.tv_sec = 0; -- tv.tv_usec = 500; -+ /* Wait max one second */ -+ tv.tv_sec = 1; -+ tv.tv_usec = 0; - - res = select(pipes[0] + 1, - &read_fds, NULL, NULL, &tv); -@@ -428,7 +428,7 @@ - mount_entry->mount_path = g_strdup (mntent[i].f_mntonname); - mount_entry->device_path = g_strdup (mntent[i].f_mntfromname); - mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename); -- if (mntent[i].f_flags == MNT_RDONLY) { -+ if (mntent[i].f_flags & MNT_RDONLY) { - mount_entry->is_read_only = TRUE; - } - -@@ -857,8 +857,9 @@ - - #ifdef HAVE_SYS_SYSCTL_H - if (usermnt != 0) { -+ uid_t uid = getuid (); - if (stat (fstab->fs_file, &sb) == 0) { -- if (sb.st_uid != 0) { -+ if (uid == 0 || sb.st_uid == uid) { - mount_entry->is_user_mountable = TRUE; - } - } +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004 ++++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004 +@@ -43,6 +43,7 @@ + #include <errno.h> + #include <string.h> + #include <signal.h> ++#include <poll.h> + #include <libgnomevfs/gnome-vfs.h> + + #include "gnome-vfs-unix-mounts.h" diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c index a168c6acdac8..9788a89f060e 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,25 +1,6 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Fri Apr 16 06:43:05 2004 -+++ libgnomevfs/gnome-vfs-utils.c Mon Apr 19 15:41:47 2004 -@@ -797,7 +797,9 @@ - - #if HAVE_STATVFS - statfs_result = statvfs (unescaped_path, &statfs_buffer); -+#define statfs_bsize f_frsize - #else -+#define statfs_bsize f_bsize - #if STATFS_ARGS == 2 - statfs_result = statfs (unescaped_path, &statfs_buffer); - #elif STATFS_ARGS == 4 -@@ -838,7 +840,7 @@ - } - #endif - -- block_size = statfs_buffer.f_bsize; -+ block_size = statfs_buffer.statfs_bsize; - free_blocks = statfs_buffer.f_bavail; - - *size = block_size * free_blocks; -@@ -866,7 +868,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004 ++++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004 +@@ -871,7 +871,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c index 0c6c3d28ad0a..472a4b5f6c19 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c @@ -1,11 +1,11 @@ ---- libgnomevfs/xdgmime.c.orig Wed Jun 23 20:15:25 2004 -+++ libgnomevfs/xdgmime.c Wed Jun 23 20:15:41 2004 -@@ -97,7 +97,7 @@ +--- libgnomevfs/xdgmime.c.orig Thu Jul 22 11:20:13 2004 ++++ libgnomevfs/xdgmime.c Thu Jul 22 11:20:52 2004 +@@ -189,7 +189,7 @@ - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - ptr = xdg_data_dirs; + ptr = xdg_data_dirs; diff --git a/devel/gnomevfs2/files/patch-modules_default-modules.conf b/devel/gnomevfs2/files/patch-modules_default-modules.conf deleted file mode 100644 index 0efb87aa888c..000000000000 --- a/devel/gnomevfs2/files/patch-modules_default-modules.conf +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/default-modules.conf.orig Thu Aug 26 21:01:12 2004 -+++ modules/default-modules.conf Thu Aug 26 21:01:22 2004 -@@ -38,9 +38,6 @@ - - ssh: ssh - --# The various access methods implemented by the extfs system. --a ar arj cpio deb hp48 lha mailfs patchfs rar rpm rpms trpm zip zoo: extfs -- - # vfolder desktop method - applications: vfolder-desktop - applications-all-users: vfolder-desktop diff --git a/devel/gnomevfs2/files/patch-modules_extfs-method.c b/devel/gnomevfs2/files/patch-modules_extfs-method.c deleted file mode 100644 index 129e9c4e131e..000000000000 --- a/devel/gnomevfs2/files/patch-modules_extfs-method.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/extfs-method.c.orig Thu Aug 12 20:04:05 2004 -+++ modules/extfs-method.c Thu Aug 12 20:06:20 2004 -@@ -61,7 +61,7 @@ - - - static ssize_t --getdelim (char **lineptr, size_t n, int terminator, FILE *stream) -+getdelim (char **lineptr, size_t *n, int terminator, FILE *stream) - { - char *line, *p; - size_t size, copy; diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 3f5cc01a3a79..7bec57259d84 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -3,21 +3,11 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_default_applications.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_default_applications.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_default_applications.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_url_handlers.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_url_handlers.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_url_handlers.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/system_http_proxy.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/system_http_proxy.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_http_proxy.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/system_smb.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/system_smb.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_smb.schemas > /dev/null || /usr/bin/true +bin/gnomevfs-rm %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf +etc/gnome-vfs-2.0/modules/ssl-modules.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info etc/gnome-vfs-2.0/vfolders/network.vfolder-info @@ -26,11 +16,13 @@ etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info include/gnome-vfs-2.0/include/gnome-vfs-file-size.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h @@ -40,11 +32,13 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h @@ -71,6 +65,7 @@ lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so lib/gnome-vfs-2.0/modules/libcomputer.so +lib/gnome-vfs-2.0/modules/libdns-sd.so lib/gnome-vfs-2.0/modules/libfile.so lib/gnome-vfs-2.0/modules/libftp.so lib/gnome-vfs-2.0/modules/libgzip.so @@ -79,7 +74,6 @@ lib/gnome-vfs-2.0/modules/libnetwork.so lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so -lib/gnome-vfs-2.0/modules/libssh.so lib/gnome-vfs-2.0/modules/libtar.so lib/gnome-vfs-2.0/modules/libvfolder-desktop.so lib/gnome-vfs-2.0/modules/libvfs-pipe.so @@ -87,12 +81,71 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.600 +lib/libgnomevfs-2.so.800 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc libexec/gnome-vfs-daemon +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/home.png +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/left.png +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/networking.html +share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/style.css +share/doc/gnome-vfs-2.0/up.png +share/doc/gnome-vfs-2.0/volumes.html @exec mkdir -p %D/share/gnome/vfolders %%KDEMENUS%%share/gnome/vfolders/KDE.directory share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo @@ -138,6 +191,7 @@ share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo @@ -165,6 +219,7 @@ share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/gnome/vfolders +@dirrm share/doc/gnome-vfs-2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 1b12fc015d5a..5d83c592f8e3 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -6,10 +6,11 @@ # PORTNAME= libbonobo -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,7 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_PERL5= yes USE_GNOME= gnomehack intlhack libxml2 orbit2 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 6157d89bd62e..d84072b69b8b 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libbonobo-2.6.2.tar.bz2) = d99ababb4569c66c3002cba97b076c31 -SIZE (gnome2/libbonobo-2.6.2.tar.bz2) = 1055680 +MD5 (gnome2/libbonobo-2.8.0.tar.bz2) = e3358680e50e69779535d126b1c56ee7 +SIZE (gnome2/libbonobo-2.8.0.tar.bz2) = 1460478 diff --git a/devel/libbonobo/files/patch-ltmain.sh b/devel/libbonobo/files/patch-ltmain.sh deleted file mode 100644 index 2719aeb6ca5a..000000000000 --- a/devel/libbonobo/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Thu Jun 5 08:09:04 2003 -+++ ltmain.sh Sat Jun 14 01:36:34 2003 -@@ -1280,7 +1280,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1290,8 +1290,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3000,6 +3008,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5428,10 +5439,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index d3888990a606..a3d113f0d6fc 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -88,12 +88,102 @@ share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl +share/doc/bonobo-activation/api-reference.html +share/doc/bonobo-activation/architecture.html +share/doc/bonobo-activation/async-activation.html +share/doc/bonobo-activation/attribute-tag.html +share/doc/bonobo-activation/bonobo-activation-Debugging.html +share/doc/bonobo-activation/bonobo-activation-Initialization.html +share/doc/bonobo-activation/bonobo-activation-Query-and-Activation.html +share/doc/bonobo-activation/bonobo-activation-Registration.html +share/doc/bonobo-activation/bonobo-activation-Utilities.html +share/doc/bonobo-activation/bonobo-activation.devhelp +share/doc/bonobo-activation/bonobo-activation.png +share/doc/bonobo-activation/checklist.html +share/doc/bonobo-activation/configuring.html +share/doc/bonobo-activation/home.png +share/doc/bonobo-activation/index.html +share/doc/bonobo-activation/index.sgml +share/doc/bonobo-activation/left.png +share/doc/bonobo-activation/lgpl.html +share/doc/bonobo-activation/migrating.html +share/doc/bonobo-activation/query-langage.html +share/doc/bonobo-activation/query-syntax.html +share/doc/bonobo-activation/right.png +share/doc/bonobo-activation/server-arch.html +share/doc/bonobo-activation/server-xml-reference.html +share/doc/bonobo-activation/style.css +share/doc/bonobo-activation/terms.html +share/doc/bonobo-activation/tutorial.html +share/doc/bonobo-activation/up.png +share/doc/libbonobo/debugging.html +share/doc/libbonobo/factories.html +share/doc/libbonobo/general.html +share/doc/libbonobo/home.png +share/doc/libbonobo/index.html +share/doc/libbonobo/index.sgml +share/doc/libbonobo/left.png +share/doc/libbonobo/libbonobo-bonobo-app-client.html +share/doc/libbonobo/libbonobo-bonobo-application.html +share/doc/libbonobo/libbonobo-bonobo-arg.html +share/doc/libbonobo/libbonobo-bonobo-config-database.html +share/doc/libbonobo/libbonobo-bonobo-context.html +share/doc/libbonobo/libbonobo-bonobo-event-source.html +share/doc/libbonobo/libbonobo-bonobo-exception.html +share/doc/libbonobo/libbonobo-bonobo-generic-factory.html +share/doc/libbonobo/libbonobo-bonobo-i18n.html +share/doc/libbonobo/libbonobo-bonobo-item-container.html +share/doc/libbonobo/libbonobo-bonobo-item-handler.html +share/doc/libbonobo/libbonobo-bonobo-listener.html +share/doc/libbonobo/libbonobo-bonobo-main.html +share/doc/libbonobo/libbonobo-bonobo-moniker-context.html +share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html +share/doc/libbonobo/libbonobo-bonobo-moniker-simple.html +share/doc/libbonobo/libbonobo-bonobo-moniker-util.html +share/doc/libbonobo/libbonobo-bonobo-moniker.html +share/doc/libbonobo/libbonobo-bonobo-object.html +share/doc/libbonobo/libbonobo-bonobo-persist-client.html +share/doc/libbonobo/libbonobo-bonobo-persist-file.html +share/doc/libbonobo/libbonobo-bonobo-persist-stream.html +share/doc/libbonobo/libbonobo-bonobo-persist.html +share/doc/libbonobo/libbonobo-bonobo-property-bag-client.html +share/doc/libbonobo/libbonobo-bonobo-property-bag.html +share/doc/libbonobo/libbonobo-bonobo-running-context.html +share/doc/libbonobo/libbonobo-bonobo-shlib-factory.html +share/doc/libbonobo/libbonobo-bonobo-shutdown.html +share/doc/libbonobo/libbonobo-bonobo-storage-memory.html +share/doc/libbonobo/libbonobo-bonobo-storage.html +share/doc/libbonobo/libbonobo-bonobo-stream-client.html +share/doc/libbonobo/libbonobo-bonobo-stream-memory.html +share/doc/libbonobo/libbonobo-bonobo-types.html +share/doc/libbonobo/libbonobo-faq.html +share/doc/libbonobo/libbonobo.devhelp +share/doc/libbonobo/misc.html +share/doc/libbonobo/monikers-overview.html +share/doc/libbonobo/monikers.html +share/doc/libbonobo/persist-file.png +share/doc/libbonobo/persist-storage.png +share/doc/libbonobo/persist-stream.png +share/doc/libbonobo/persist.html +share/doc/libbonobo/persist.png +share/doc/libbonobo/properties.html +share/doc/libbonobo/property-bags.html +share/doc/libbonobo/refcounting.html +share/doc/libbonobo/right.png +share/doc/libbonobo/running-context.png +share/doc/libbonobo/storage.png +share/doc/libbonobo/stream.png +share/doc/libbonobo/streams.html +share/doc/libbonobo/style.css +share/doc/libbonobo/unknown.png +share/doc/libbonobo/up.png share/locale/am/LC_MESSAGES/libbonobo-2.0.mo share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo share/locale/az/LC_MESSAGES/libbonobo-2.0.mo share/locale/be/LC_MESSAGES/libbonobo-2.0.mo share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo share/locale/bn/LC_MESSAGES/libbonobo-2.0.mo +share/locale/bs/LC_MESSAGES/libbonobo-2.0.mo share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo share/locale/cy/LC_MESSAGES/libbonobo-2.0.mo @@ -127,6 +217,8 @@ share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo share/locale/mn/LC_MESSAGES/libbonobo-2.0.mo share/locale/ms/LC_MESSAGES/libbonobo-2.0.mo +share/locale/nb/LC_MESSAGES/libbonobo-2.0.mo +share/locale/ne/LC_MESSAGES/libbonobo-2.0.mo share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo share/locale/no/LC_MESSAGES/libbonobo-2.0.mo diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 53854f7d9a69..4a3196dd9851 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= libgtop2 -PORTVERSION= 2.6.0 +PORTVERSION= 2.8.1 PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 DISTNAME= libgtop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,7 +26,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack glib20 USE_REINPLACE= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo index 5f14e960bd87..50d3ac436835 100644 --- a/devel/libgtop2/distinfo +++ b/devel/libgtop2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgtop-2.6.0.tar.bz2) = 5d0ec207842b54d2f2d04c99af7c98b9 -SIZE (gnome2/libgtop-2.6.0.tar.bz2) = 946822 +MD5 (gnome2/libgtop-2.8.1.tar.bz2) = 5d191cbf2b5b2a84dfee1972c99b1a78 +SIZE (gnome2/libgtop-2.8.1.tar.bz2) = 1046174 diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah index e270a82213e8..3728441bebb7 100644 --- a/devel/libgtop2/files/patch-ah +++ b/devel/libgtop2/files/patch-ah @@ -1,5 +1,5 @@ ---- sysdeps/freebsd/procmap.c.orig Wed Mar 10 06:18:59 2004 -+++ sysdeps/freebsd/procmap.c Thu Oct 28 21:08:55 2004 +--- sysdeps/freebsd/procmap.c.orig Fri Sep 24 18:49:06 2004 ++++ sysdeps/freebsd/procmap.c Thu Oct 28 15:42:58 2004 @@ -47,7 +47,13 @@ #endif #endif @@ -35,7 +35,7 @@ /* Now we get the memory maps. */ -@@ -280,13 +288,9 @@ +@@ -278,13 +286,9 @@ &inode, sizeof (inode)) != sizeof (inode)) glibtop_error_io_r (server, "kvm_read (inode)"); diff --git a/devel/libgtop2/files/patch-lib::command.c b/devel/libgtop2/files/patch-lib::command.c deleted file mode 100644 index 4bb3aefb1b9a..000000000000 --- a/devel/libgtop2/files/patch-lib::command.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/command.c.orig Tue Sep 9 09:47:58 2003 -+++ lib/command.c Tue Sep 9 08:14:33 2003 -@@ -38,6 +38,7 @@ - glibtop_init_r (&server, 0, 0); - - memset (&cmnd, 0, sizeof (glibtop_command)); -+ memset (&response, 0, sizeof (glibtop_response)); - - cmnd.command = command; - diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c index 38583f8766a9..53d091a32b04 100644 --- a/devel/libgtop2/files/patch-lib::read.c +++ b/devel/libgtop2/files/patch-lib::read.c @@ -1,14 +1,14 @@ ---- lib/read.c.orig Mon Oct 20 11:19:41 2003 -+++ lib/read.c Fri Nov 14 14:37:00 2003 +--- lib/read.c.orig Fri Jun 18 04:03:55 2004 ++++ lib/read.c Sat Aug 7 16:05:41 2004 @@ -22,6 +22,7 @@ */ #include <config.h> +#include <errno.h> #include <glibtop/read.h> - #include <libgnome/gnome-i18n.h> + #include "libgtop-i18n.h" -@@ -68,12 +69,16 @@ +@@ -56,14 +57,18 @@ fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size); #endif @@ -16,13 +16,15 @@ if (server->socket) { do_read (server->socket, buf, size); } else { - ret = read (server->input [0], buf, size); +- if(read (server->input [0], buf, size) < 0) ++ if(read (server->input [0], buf, size) < 0) { ++ if (errno == EINTR) ++ goto retry; + glibtop_error_io_r ( + server, + ngettext ("read %d byte", + "read %d bytes", size), + size); ++ } } - -- if (ret < 0) -+ if (ret < 0) { -+ if (errno == EINTR) -+ goto retry; - glibtop_error_io_r (server, _("read %d bytes"), size); -+ } } diff --git a/devel/libgtop2/files/patch-ltmain.sh b/devel/libgtop2/files/patch-ltmain.sh deleted file mode 100644 index 54bbcbc5777e..000000000000 --- a/devel/libgtop2/files/patch-ltmain.sh +++ /dev/null @@ -1,42 +0,0 @@ ---- ltmain.sh.orig Sun Aug 24 18:53:15 2003 -+++ ltmain.sh Sun Aug 24 18:57:42 2003 -@@ -1060,8 +1060,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_command="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2444,6 +2452,9 @@ - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4210,10 +4221,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c index e61274b13864..0713da61925e 100644 --- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c +++ b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c @@ -1,5 +1,5 @@ ---- sysdeps/freebsd/procmem.c.orig Wed Mar 10 21:23:52 2004 -+++ sysdeps/freebsd/procmem.c Thu Mar 11 15:46:05 2004 +--- sysdeps/freebsd/procmem.c.orig Mon Jul 19 02:07:03 2004 ++++ sysdeps/freebsd/procmem.c Tue Jul 20 22:03:29 2004 @@ -125,7 +125,7 @@ #else struct vm_object object; @@ -17,14 +17,14 @@ - (unsigned long) pinfo [0].PROC_VMSPACE, - (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) { - glibtop_warn_io_r (server, "kvm_read (plimit)"); -+ if (getrlimit (RLIMIT_RSS, &rlimit) < 0) { -+ glibtop_warn_io_r (server, "getrlimit"); ++ if (getrlimit (RLIMIT_RSS, &rlimit) < 0) { ++ glibtop_warn_io_r (server, "getrlimit"); return; } -- buf->rss_rlim = (guint64) +- buf->rss_rlim = (guint64) - (plimit.pl_rlimit [RLIMIT_RSS].rlim_cur); + buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur); - + vms = &pinfo [0].kp_eproc.e_vm; diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c new file mode 100644 index 000000000000..de564dcfd5f6 --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c @@ -0,0 +1,14 @@ +--- sysdeps/common/fsusage.c.orig Sun Oct 17 00:51:26 2004 ++++ sysdeps/common/fsusage.c Sun Oct 17 00:52:07 2004 +@@ -253,8 +253,9 @@ + if (statvfs (path, &fsd) < 0) + return; + +-#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) +- /* Solaris but not SunOS */ ++#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \ ++ || defined(__FreeBSD__) ++ /* Solaris but not SunOS and FreeBSD */ + buf->block_size = fsd.f_frsize; + #else + /* else, including Linux */ diff --git a/devel/libgtop2/files/patch-sysdeps_common_mountlist.c b/devel/libgtop2/files/patch-sysdeps_common_mountlist.c deleted file mode 100644 index 62269380b46b..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_common_mountlist.c +++ /dev/null @@ -1,20 +0,0 @@ ---- sysdeps/common/mountlist.c.orig Mon Dec 1 13:59:28 2003 -+++ sysdeps/common/mountlist.c Mon Dec 1 16:13:15 2003 -@@ -127,7 +127,7 @@ - } - #endif /* MOUNTED_GETMNTENT1. */ - --#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) -+#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) && !defined(__FreeBSD__) - static char * - fstype_to_string (t) - short t; -@@ -345,7 +345,7 @@ - me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry)); - me->me_devname = g_strdup (fsp->f_mntfromname); - me->me_mountdir = g_strdup (fsp->f_mntonname); --#if defined(__NetBSD__) || defined(__OpenBSD__) -+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) - me->me_type = g_strdup (fsp->f_fstypename); - #else - me->me_type = g_strdup (fstype_to_string (fsp->f_type)); diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c b/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c deleted file mode 100644 index 7dbba8c37ab1..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c +++ /dev/null @@ -1,13 +0,0 @@ ---- sysdeps/freebsd/uptime.c.orig Thu Mar 11 15:59:16 2004 -+++ sysdeps/freebsd/uptime.c Thu Mar 11 15:59:38 2004 -@@ -68,9 +68,8 @@ - buf->flags = _glibtop_sysdeps_uptime; - } - #else -- buf->flags = _glibtop_sysdeps_uptime; -- - glibtop_cpu cpu; -+ buf->flags = _glibtop_sysdeps_uptime; - - glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0); - diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist index 4c48f567fd7e..cc1d2ecda163 100644 --- a/devel/libgtop2/pkg-plist +++ b/devel/libgtop2/pkg-plist @@ -53,6 +53,7 @@ share/locale/az/LC_MESSAGES/libgtop-2.0.mo share/locale/be/LC_MESSAGES/libgtop-2.0.mo share/locale/bg/LC_MESSAGES/libgtop-2.0.mo share/locale/bn/LC_MESSAGES/libgtop-2.0.mo +share/locale/bs/LC_MESSAGES/libgtop-2.0.mo share/locale/ca/LC_MESSAGES/libgtop-2.0.mo share/locale/cs/LC_MESSAGES/libgtop-2.0.mo share/locale/cy/LC_MESSAGES/libgtop-2.0.mo @@ -63,11 +64,13 @@ share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo share/locale/es/LC_MESSAGES/libgtop-2.0.mo share/locale/et/LC_MESSAGES/libgtop-2.0.mo +share/locale/eu/LC_MESSAGES/libgtop-2.0.mo share/locale/fa/LC_MESSAGES/libgtop-2.0.mo share/locale/fi/LC_MESSAGES/libgtop-2.0.mo share/locale/fr/LC_MESSAGES/libgtop-2.0.mo share/locale/ga/LC_MESSAGES/libgtop-2.0.mo share/locale/gl/LC_MESSAGES/libgtop-2.0.mo +share/locale/gu/LC_MESSAGES/libgtop-2.0.mo share/locale/he/LC_MESSAGES/libgtop-2.0.mo share/locale/hi/LC_MESSAGES/libgtop-2.0.mo share/locale/hr/LC_MESSAGES/libgtop-2.0.mo @@ -78,13 +81,16 @@ share/locale/ja/LC_MESSAGES/libgtop-2.0.mo share/locale/ko/LC_MESSAGES/libgtop-2.0.mo share/locale/lt/LC_MESSAGES/libgtop-2.0.mo share/locale/lv/LC_MESSAGES/libgtop-2.0.mo +share/locale/mi/LC_MESSAGES/libgtop-2.0.mo share/locale/mk/LC_MESSAGES/libgtop-2.0.mo share/locale/ml/LC_MESSAGES/libgtop-2.0.mo share/locale/mn/LC_MESSAGES/libgtop-2.0.mo share/locale/ms/LC_MESSAGES/libgtop-2.0.mo +share/locale/nb/LC_MESSAGES/libgtop-2.0.mo share/locale/nl/LC_MESSAGES/libgtop-2.0.mo share/locale/nn/LC_MESSAGES/libgtop-2.0.mo share/locale/no/LC_MESSAGES/libgtop-2.0.mo +share/locale/or/LC_MESSAGES/libgtop-2.0.mo share/locale/pa/LC_MESSAGES/libgtop-2.0.mo share/locale/pl/LC_MESSAGES/libgtop-2.0.mo share/locale/pt/LC_MESSAGES/libgtop-2.0.mo diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index bd7a1bacb36d..c4709713daad 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libsoup -PORTVERSION= 1.99.28 -PORTREVISION= 1 +PORTVERSION= 2.2.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.99 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,14 +18,27 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_GNOME= gnomehack lthack glib20 +USE_GNOME= gnomehack glib20 libxml2 INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER= 13 -USE_OPENSSL= yes +USE_LIBTOOL_VER=15 +USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --with-gnutls-includes=${FALSE} \ - --with-gnutls-libs=${FALSE} + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib +PLIST_SUB= VERSION="2.2" + +.if !defined(WITHOUT_SSL) +LIB_DEPENDS+= gnutls.12:${PORTSDIR}/security/gnutls +.else +CONFIGURE_ARGS+=--disable-ssl +.endif + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "libsoup has the following configurable option(s):" + @${ECHO_MSG} " WITHOUT_SSL Disable GnuTLS SSL support" + @${ECHO_MSG} "" + .include <bsd.port.mk> diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index 87c1098922f8..902a0436e7cf 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libsoup-1.99.28.tar.bz2) = c33f1cb5697ef9b9ad6cd8482c4c2abb -SIZE (gnome2/libsoup-1.99.28.tar.bz2) = 233412 +MD5 (gnome2/libsoup-2.2.1.tar.bz2) = 8132b0bce469affed688c4863702aa41 +SIZE (gnome2/libsoup-2.2.1.tar.bz2) = 403907 diff --git a/devel/libsoup/files/patch-configure b/devel/libsoup/files/patch-configure deleted file mode 100644 index 85f964458b26..000000000000 --- a/devel/libsoup/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Tue Apr 6 17:08:05 2004 -+++ configure Tue Apr 6 17:10:47 2004 -@@ -9520,7 +9521,7 @@ - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $gnutls_inc_prefix" - --for ac_header in gnutls/gnutls.h -+for ac_header in gnutls/xxxgnutls.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/devel/libsoup/pkg-descr b/devel/libsoup/pkg-descr index 423bf5cfc4f6..1ec2bfea440f 100644 --- a/devel/libsoup/pkg-descr +++ b/devel/libsoup/pkg-descr @@ -1,17 +1,16 @@ Soup is a SOAP (Simple Object Access Protocol) implementation in C. -It provides an queued asynchronous callback-based mechanism for sending and -servicing SOAP requests, and a WSDL (Web Service Definition Language) to C -compiler which generates client stubs and server skeletons for easily calling -and implementing SOAP methods. - -It uses the GLib main loop and is designed to work well with GTK applications. +It provides a queued asynchronous callback-based mechanism for sending and +servicing SOAP requests, and a WSDL (Web Service Definition Language) for C +compilers which generates client stubs and server skeletons for easily +calling and implementing SOAP methods. It uses GLib and is designed to work +well with GTK applications. Features: * Completely Asynchronous * Connection cache * HTTP chunked transfer and persistent connections - * authenticated HTTP, SOCKS4, and SOCKS5 proxy support + * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support * SSL Support using OpenSSL * Apache module server support * Client digest authentication diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 1ef3a47265a0..debbbf1a8694 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -1,20 +1,60 @@ -include/soup-2.0/libsoup/soup-address.h -include/soup-2.0/libsoup/soup-context.h -include/soup-2.0/libsoup/soup-error.h -include/soup-2.0/libsoup/soup-headers.h -include/soup-2.0/libsoup/soup-message.h -include/soup-2.0/libsoup/soup-method.h -include/soup-2.0/libsoup/soup-misc.h -include/soup-2.0/libsoup/soup-ntlm.h -include/soup-2.0/libsoup/soup-server-auth.h -include/soup-2.0/libsoup/soup-server.h -include/soup-2.0/libsoup/soup-socket.h -include/soup-2.0/libsoup/soup-uri.h -include/soup-2.0/libsoup/soup.h -lib/libsoup-2.0.a -lib/libsoup-2.0.so -lib/libsoup-2.0.so.0 -libdata/pkgconfig/soup-2.0.pc -libexec/libsoup-ssl-proxy -@dirrm include/soup-2.0/libsoup -@dirrm include/soup-2.0 +include/libsoup-%%VERSION%%/libsoup/soup-address.h +include/libsoup-%%VERSION%%/libsoup/soup-connection.h +include/libsoup-%%VERSION%%/libsoup/soup-headers.h +include/libsoup-%%VERSION%%/libsoup/soup-message-filter.h +include/libsoup-%%VERSION%%/libsoup/soup-message-queue.h +include/libsoup-%%VERSION%%/libsoup/soup-message.h +include/libsoup-%%VERSION%%/libsoup/soup-method.h +include/libsoup-%%VERSION%%/libsoup/soup-misc.h +include/libsoup-%%VERSION%%/libsoup/soup-server-auth.h +include/libsoup-%%VERSION%%/libsoup/soup-server-message.h +include/libsoup-%%VERSION%%/libsoup/soup-server.h +include/libsoup-%%VERSION%%/libsoup/soup-session-async.h +include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h +include/libsoup-%%VERSION%%/libsoup/soup-session.h +include/libsoup-%%VERSION%%/libsoup/soup-soap-message.h +include/libsoup-%%VERSION%%/libsoup/soup-soap-response.h +include/libsoup-%%VERSION%%/libsoup/soup-socket.h +include/libsoup-%%VERSION%%/libsoup/soup-status.h +include/libsoup-%%VERSION%%/libsoup/soup-types.h +include/libsoup-%%VERSION%%/libsoup/soup-uri.h +include/libsoup-%%VERSION%%/libsoup/soup.h +lib/libsoup-%%VERSION%%.a +lib/libsoup-%%VERSION%%.so +lib/libsoup-%%VERSION%%.so.7 +libdata/pkgconfig/libsoup-%%VERSION%%.pc +%%DOCSDIR%%/SoupAuth.html +%%DOCSDIR%%/SoupAuthBasic.html +%%DOCSDIR%%/SoupAuthDigest.html +%%DOCSDIR%%/SoupConnection.html +%%DOCSDIR%%/SoupConnectionNTLM.html +%%DOCSDIR%%/SoupMessage.html +%%DOCSDIR%%/SoupSoapMessage.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libsoup-SoupAddress.html +%%DOCSDIR%%/libsoup-SoupServer.html +%%DOCSDIR%%/libsoup-SoupServerMessage.html +%%DOCSDIR%%/libsoup-SoupSession.html +%%DOCSDIR%%/libsoup-SoupSocket.html +%%DOCSDIR%%/libsoup-soup-dns.html +%%DOCSDIR%%/libsoup-soup-headers.html +%%DOCSDIR%%/libsoup-soup-md5-utils.html +%%DOCSDIR%%/libsoup-soup-message-private.html +%%DOCSDIR%%/libsoup-soup-message-queue.html +%%DOCSDIR%%/libsoup-soup-method.html +%%DOCSDIR%%/libsoup-soup-misc.html +%%DOCSDIR%%/libsoup-soup-server-auth.html +%%DOCSDIR%%/libsoup-soup-ssl.html +%%DOCSDIR%%/libsoup-soup-status.html +%%DOCSDIR%%/libsoup-soup-uri.html +%%DOCSDIR%%/libsoup.devhelp +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png +@dirrm %%DOCSDIR%% +@dirrm include/libsoup-%%VERSION%%/libsoup +@dirrm include/libsoup-%%VERSION%% diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile index bd7a1bacb36d..c4709713daad 100644 --- a/devel/libsoup22/Makefile +++ b/devel/libsoup22/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libsoup -PORTVERSION= 1.99.28 -PORTREVISION= 1 +PORTVERSION= 2.2.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.99 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,14 +18,27 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_GNOME= gnomehack lthack glib20 +USE_GNOME= gnomehack glib20 libxml2 INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER= 13 -USE_OPENSSL= yes +USE_LIBTOOL_VER=15 +USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --with-gnutls-includes=${FALSE} \ - --with-gnutls-libs=${FALSE} + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib +PLIST_SUB= VERSION="2.2" + +.if !defined(WITHOUT_SSL) +LIB_DEPENDS+= gnutls.12:${PORTSDIR}/security/gnutls +.else +CONFIGURE_ARGS+=--disable-ssl +.endif + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "libsoup has the following configurable option(s):" + @${ECHO_MSG} " WITHOUT_SSL Disable GnuTLS SSL support" + @${ECHO_MSG} "" + .include <bsd.port.mk> diff --git a/devel/libsoup22/distinfo b/devel/libsoup22/distinfo index 87c1098922f8..902a0436e7cf 100644 --- a/devel/libsoup22/distinfo +++ b/devel/libsoup22/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libsoup-1.99.28.tar.bz2) = c33f1cb5697ef9b9ad6cd8482c4c2abb -SIZE (gnome2/libsoup-1.99.28.tar.bz2) = 233412 +MD5 (gnome2/libsoup-2.2.1.tar.bz2) = 8132b0bce469affed688c4863702aa41 +SIZE (gnome2/libsoup-2.2.1.tar.bz2) = 403907 diff --git a/devel/libsoup22/files/patch-configure b/devel/libsoup22/files/patch-configure deleted file mode 100644 index 85f964458b26..000000000000 --- a/devel/libsoup22/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Tue Apr 6 17:08:05 2004 -+++ configure Tue Apr 6 17:10:47 2004 -@@ -9520,7 +9521,7 @@ - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $gnutls_inc_prefix" - --for ac_header in gnutls/gnutls.h -+for ac_header in gnutls/xxxgnutls.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/devel/libsoup22/pkg-descr b/devel/libsoup22/pkg-descr index 423bf5cfc4f6..1ec2bfea440f 100644 --- a/devel/libsoup22/pkg-descr +++ b/devel/libsoup22/pkg-descr @@ -1,17 +1,16 @@ Soup is a SOAP (Simple Object Access Protocol) implementation in C. -It provides an queued asynchronous callback-based mechanism for sending and -servicing SOAP requests, and a WSDL (Web Service Definition Language) to C -compiler which generates client stubs and server skeletons for easily calling -and implementing SOAP methods. - -It uses the GLib main loop and is designed to work well with GTK applications. +It provides a queued asynchronous callback-based mechanism for sending and +servicing SOAP requests, and a WSDL (Web Service Definition Language) for C +compilers which generates client stubs and server skeletons for easily +calling and implementing SOAP methods. It uses GLib and is designed to work +well with GTK applications. Features: * Completely Asynchronous * Connection cache * HTTP chunked transfer and persistent connections - * authenticated HTTP, SOCKS4, and SOCKS5 proxy support + * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support * SSL Support using OpenSSL * Apache module server support * Client digest authentication diff --git a/devel/libsoup22/pkg-plist b/devel/libsoup22/pkg-plist index 1ef3a47265a0..debbbf1a8694 100644 --- a/devel/libsoup22/pkg-plist +++ b/devel/libsoup22/pkg-plist @@ -1,20 +1,60 @@ -include/soup-2.0/libsoup/soup-address.h -include/soup-2.0/libsoup/soup-context.h -include/soup-2.0/libsoup/soup-error.h -include/soup-2.0/libsoup/soup-headers.h -include/soup-2.0/libsoup/soup-message.h -include/soup-2.0/libsoup/soup-method.h -include/soup-2.0/libsoup/soup-misc.h -include/soup-2.0/libsoup/soup-ntlm.h -include/soup-2.0/libsoup/soup-server-auth.h -include/soup-2.0/libsoup/soup-server.h -include/soup-2.0/libsoup/soup-socket.h -include/soup-2.0/libsoup/soup-uri.h -include/soup-2.0/libsoup/soup.h -lib/libsoup-2.0.a -lib/libsoup-2.0.so -lib/libsoup-2.0.so.0 -libdata/pkgconfig/soup-2.0.pc -libexec/libsoup-ssl-proxy -@dirrm include/soup-2.0/libsoup -@dirrm include/soup-2.0 +include/libsoup-%%VERSION%%/libsoup/soup-address.h +include/libsoup-%%VERSION%%/libsoup/soup-connection.h +include/libsoup-%%VERSION%%/libsoup/soup-headers.h +include/libsoup-%%VERSION%%/libsoup/soup-message-filter.h +include/libsoup-%%VERSION%%/libsoup/soup-message-queue.h +include/libsoup-%%VERSION%%/libsoup/soup-message.h +include/libsoup-%%VERSION%%/libsoup/soup-method.h +include/libsoup-%%VERSION%%/libsoup/soup-misc.h +include/libsoup-%%VERSION%%/libsoup/soup-server-auth.h +include/libsoup-%%VERSION%%/libsoup/soup-server-message.h +include/libsoup-%%VERSION%%/libsoup/soup-server.h +include/libsoup-%%VERSION%%/libsoup/soup-session-async.h +include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h +include/libsoup-%%VERSION%%/libsoup/soup-session.h +include/libsoup-%%VERSION%%/libsoup/soup-soap-message.h +include/libsoup-%%VERSION%%/libsoup/soup-soap-response.h +include/libsoup-%%VERSION%%/libsoup/soup-socket.h +include/libsoup-%%VERSION%%/libsoup/soup-status.h +include/libsoup-%%VERSION%%/libsoup/soup-types.h +include/libsoup-%%VERSION%%/libsoup/soup-uri.h +include/libsoup-%%VERSION%%/libsoup/soup.h +lib/libsoup-%%VERSION%%.a +lib/libsoup-%%VERSION%%.so +lib/libsoup-%%VERSION%%.so.7 +libdata/pkgconfig/libsoup-%%VERSION%%.pc +%%DOCSDIR%%/SoupAuth.html +%%DOCSDIR%%/SoupAuthBasic.html +%%DOCSDIR%%/SoupAuthDigest.html +%%DOCSDIR%%/SoupConnection.html +%%DOCSDIR%%/SoupConnectionNTLM.html +%%DOCSDIR%%/SoupMessage.html +%%DOCSDIR%%/SoupSoapMessage.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libsoup-SoupAddress.html +%%DOCSDIR%%/libsoup-SoupServer.html +%%DOCSDIR%%/libsoup-SoupServerMessage.html +%%DOCSDIR%%/libsoup-SoupSession.html +%%DOCSDIR%%/libsoup-SoupSocket.html +%%DOCSDIR%%/libsoup-soup-dns.html +%%DOCSDIR%%/libsoup-soup-headers.html +%%DOCSDIR%%/libsoup-soup-md5-utils.html +%%DOCSDIR%%/libsoup-soup-message-private.html +%%DOCSDIR%%/libsoup-soup-message-queue.html +%%DOCSDIR%%/libsoup-soup-method.html +%%DOCSDIR%%/libsoup-soup-misc.html +%%DOCSDIR%%/libsoup-soup-server-auth.html +%%DOCSDIR%%/libsoup-soup-ssl.html +%%DOCSDIR%%/libsoup-soup-status.html +%%DOCSDIR%%/libsoup-soup-uri.html +%%DOCSDIR%%/libsoup.devhelp +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png +@dirrm %%DOCSDIR%% +@dirrm include/libsoup-%%VERSION%%/libsoup +@dirrm include/libsoup-%%VERSION%% diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile index f452eeceab5f..8d9b9b136b20 100644 --- a/editors/gedit2/Makefile +++ b/editors/gedit2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gedit2 -PORTVERSION= 2.6.2 -PORTREVISION= 2 +PORTVERSION= 2.8.1 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 DISTNAME= gedit-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,13 +22,15 @@ USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 -USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier \ - libgnomeprintui libgnomeui eel2 gtksourceview +USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix gnomehack intlhack gnomehier \ + libgnomeprintui libgnomeui eel2 gtksourceview desktopfileutils CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="2.6" +PLIST_SUB= VERSION="2.8" \ + POVERSION="2.6" MAN1= gedit.1 +GCONF_SCHEMAS= gedit.schemas .include <bsd.port.mk> diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo index 95c1d00d87b1..a609c0bcd54b 100644 --- a/editors/gedit2/distinfo +++ b/editors/gedit2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gedit-2.6.2.tar.bz2) = a4773bd9884371041cf6236f0fe1505f -SIZE (gnome2/gedit-2.6.2.tar.bz2) = 2370962 +MD5 (gnome2/gedit-2.8.1.tar.bz2) = 89052aec40b7447eb11d73134d71e812 +SIZE (gnome2/gedit-2.8.1.tar.bz2) = 2520837 diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist index 0ec5bc0a3db5..4d33342cb12e 100644 --- a/editors/gedit2/pkg-plist +++ b/editors/gedit2/pkg-plist @@ -1,8 +1,5 @@ bin/gedit bin/gnome-text-editor -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gedit.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gedit.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gedit.schemas > /dev/null || /usr/bin/true include/gedit-%%VERSION%%/gedit/bonobo-mdi-child.h include/gedit-%%VERSION%%/gedit/bonobo-mdi.h include/gedit-%%VERSION%%/gedit/gedit-convert.h @@ -30,8 +27,10 @@ include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-bonobo.h include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-gtk.h include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view.h lib/bonobo/libgedit-control.so +lib/gedit-2/plugins/changecase.gedit-plugin lib/gedit-2/plugins/docinfo.gedit-plugin lib/gedit-2/plugins/indent.gedit-plugin +lib/gedit-2/plugins/libchangecase.so lib/gedit-2/plugins/libdocinfo.so lib/gedit-2/plugins/libindent.so lib/gedit-2/plugins/libsample.so @@ -50,6 +49,7 @@ libdata/bonobo/servers/GNOME_Gedit.server libdata/pkgconfig/gedit-%%VERSION%%.pc share/gnome/application-registry/gedit.applications share/gnome/applications/gedit.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/gedit-2/glade/docinfo.glade2 share/gnome/gedit-2/glade/gedit-encodings-dialog.glade2 share/gnome/gedit-2/glade/gedit-preferences.glade2 @@ -85,6 +85,10 @@ share/gnome/help/gedit/es/figures/gedit_recent_files_menu_icon.png share/gnome/help/gedit/es/figures/gedit_window.png share/gnome/help/gedit/es/gedit.xml share/gnome/help/gedit/es/legal.xml +share/gnome/help/gedit/eu/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/eu/figures/gedit_window.png +share/gnome/help/gedit/eu/gedit.xml +share/gnome/help/gedit/eu/legal.xml share/gnome/help/gedit/fr/figures/gedit_recent_files_menu_icon.png share/gnome/help/gedit/fr/figures/gedit_window.png share/gnome/help/gedit/fr/gedit.xml @@ -128,6 +132,8 @@ share/gnome/omf/gedit/gedit-de.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-es.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gedit/gedit-eu.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-eu.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-fr.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gedit/gedit-it.omf @@ -149,73 +155,76 @@ share/gnome/omf/gedit/gedit-zh_TW.omf share/gnome/pixmaps/gedit-icon.png share/gnome/pixmaps/gedit-logo.png share/gnome/pixmaps/gedit-plugin-manager.png -share/locale/af/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/am/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ar/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/az/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/be/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/bg/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/bn/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ca/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/cs/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/cy/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/da/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/de/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/el/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/en_CA/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/en_GB/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/es/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/et/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/eu/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/fa/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/fi/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/fr/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ga/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/gl/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/gu/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/he/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/hi/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/hr/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/hu/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/id/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/is/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/it/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ja/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/kn/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ko/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/lt/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/lv/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/mi/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/mk/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ml/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/mn/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/mr/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ms/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ne/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/nl/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/nn/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/no/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/pa/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/pl/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/pt/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/pt_BR/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ro/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ru/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/sk/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/sl/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/sq/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/sr/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/sv/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/ta/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/th/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/tk/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/tr/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/uk/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/vi/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/wa/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/zh_CN/LC_MESSAGES/gedit-%%VERSION%%.mo -share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo +share/locale/af/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/am/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ar/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/az/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/be/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/bg/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/bn/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/bs/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ca/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/cs/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/cy/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/da/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/de/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/el/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/en_CA/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/en_GB/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/es/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/et/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/eu/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/fa/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/fi/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/fr/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ga/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/gl/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/gu/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/he/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/hi/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/hr/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/hu/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/id/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/is/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/it/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ja/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/kn/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ko/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/lt/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/lv/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/mi/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/mk/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ml/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/mn/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/mr/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ms/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/nb/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ne/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/nl/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/nn/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/no/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/or/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/pa/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/pl/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/pt/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ro/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ru/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/sk/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/sl/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/sq/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/sr/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/sv/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/ta/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/th/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/tk/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/tr/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/uk/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/vi/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/wa/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/gedit-%%POVERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/gedit-%%POVERSION%%.mo @dirrm share/gnome/omf/gedit @dirrm share/gnome/help/gedit/zh_TW/figures @dirrm share/gnome/help/gedit/zh_TW @@ -235,6 +244,8 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo @dirrm share/gnome/help/gedit/it @dirrm share/gnome/help/gedit/fr/figures @dirrm share/gnome/help/gedit/fr +@dirrm share/gnome/help/gedit/eu/figures +@dirrm share/gnome/help/gedit/eu @dirrm share/gnome/help/gedit/es/figures @dirrm share/gnome/help/gedit/es @dirrm share/gnome/help/gedit/de/figures @@ -254,6 +265,7 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-eu.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true @@ -263,3 +275,4 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/editors/gnome2-office/Makefile b/editors/gnome2-office/Makefile index ba618e7a31cd..f4199e67aeb6 100644 --- a/editors/gnome2-office/Makefile +++ b/editors/gnome2-office/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-office -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 CATEGORIES= editors gnome MASTER_SITES= # empty DISTFILES= # empty @@ -19,8 +19,7 @@ RUN_DEPENDS= gnumeric:${PORTSDIR}/math/gnumeric2 \ planner:${PORTSDIR}/deskutils/planner \ dia:${PORTSDIR}/graphics/dia \ glabels:${PORTSDIR}/deskutils/glabels \ - evolution:${PORTSDIR}/mail/evolution \ - AbiWord-2.0:${PORTSDIR}/editors/AbiWord2 \ + AbiWord-2.2:${PORTSDIR}/editors/AbiWord2 \ mergeant:${PORTSDIR}/databases/mergeant NO_BUILD= yes diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile new file mode 100644 index 000000000000..cfc08d4f3f99 --- /dev/null +++ b/games/gnome-games-extra-data/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: gnomegames2-extra-data +# Date created: 16 August 2004 +# Whom: Adam Weinberger <adamw@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= gnomegames2-extra-data +PORTVERSION= 2.8.0 +CATEGORIES= games gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.8 +DISTNAME= gnome-games-extra-data-${PORTVERSION} +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Themes and artwork for the gnomegames2 package + +RUN_DEPENDS= ${X11BASE}/bin/sol:${PORTSDIR}/games/gnomegames2 + +USE_BZIP2= yes +USE_GMAKE= yes +USE_X_PREFIX= yes +GNU_CONFIGURE= yes +USE_GNOME= gnomehack gnomeprefix +CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo new file mode 100644 index 000000000000..8327f7a2740c --- /dev/null +++ b/games/gnome-games-extra-data/distinfo @@ -0,0 +1,2 @@ +MD5 (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 6a3252a66e3c3ac09e2f951ee2d726b2 +SIZE (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 3582341 diff --git a/games/gnome-games-extra-data/pkg-descr b/games/gnome-games-extra-data/pkg-descr new file mode 100644 index 000000000000..992c00ea920e --- /dev/null +++ b/games/gnome-games-extra-data/pkg-descr @@ -0,0 +1,3 @@ +This package contains extra data files for the gnome-games package. At +the moment this is almost entirely extra themes and artwork for the +games. diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist new file mode 100644 index 000000000000..cf3cdea0e8c1 --- /dev/null +++ b/games/gnome-games-extra-data/pkg-plist @@ -0,0 +1,30 @@ +share/gnome/pixmaps/glines/classic.png +share/gnome/pixmaps/glines/dots.png +share/gnome/pixmaps/glines/gumball.png +share/gnome/pixmaps/glines/pulse.png +share/gnome/pixmaps/gnobots2/cows.png +share/gnome/pixmaps/gnobots2/eggs.png +share/gnome/pixmaps/gnobots2/mice.png +share/gnome/pixmaps/gnobots2/windows.png +share/gnome/pixmaps/gnome-games-common/cards/bellot.svg +share/gnome/pixmaps/gnome-games-common/cards/dondorf.svg +share/gnome/pixmaps/gnometris/5blocks-tig.png +share/gnome/pixmaps/gnometris/5blocks-tim.png +share/gnome/pixmaps/gnometris/5blocks.png +share/gnome/pixmaps/gnometris/7blocks.png +share/gnome/pixmaps/gnometris/7stones-gn.png +share/gnome/pixmaps/gnometris/7stones2-gn.png +share/gnome/pixmaps/iagno/blend.png +share/gnome/pixmaps/iagno/flipblend.png +share/gnome/pixmaps/iagno/metal.png +share/gnome/pixmaps/iagno/metal2.png +share/gnome/pixmaps/iagno/shrink.png +share/gnome/pixmaps/iagno/sunmoon.png +share/gnome/pixmaps/mahjongg/default.png +share/gnome/pixmaps/mahjongg/default2.png +share/gnome/pixmaps/mahjongg/maya.png +share/gnome/pixmaps/mahjongg/seta.png +share/gnome/pixmaps/same-gnome/blink-sync.png +share/gnome/pixmaps/same-gnome/glass.png +share/gnome/pixmaps/same-gnome/marbles.png +share/gnome/pixmaps/same-gnome/rotate.png diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 78ed7dc5f2cf..b17fa1d94f68 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.6.2 -PORTREVISION= 2 +PORTVERSION= 2.8.1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.6 +MASTER_SITE_SUBDIR= sources/gnome-games/2.8 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,13 +22,18 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui \ - librsvg2 -USE_INC_LIBTOOL_VER=13 -INSTALLS_SHLIB= yes +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeui \ + librsvg2 desktopfileutils +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas gataxx.schemas \ + glines.schemas gnect.schemas gnibbles.schemas gnobots2.schemas \ + gnome-stones.schemas gnometris.schemas gnomine.schemas \ + gnotravex.schemas gtali.schemas iagno.schemas mahjongg.schemas \ + same-gnome.schemas + CONFLICTS= sol-1.0.* post-patch: diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index daee81986fc9..fb6cc99cba4e 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-2.6.2.tar.bz2) = 3b43e035912ec7e941568b571f1237ae -SIZE (gnome2/gnome-games-2.6.2.tar.bz2) = 8269706 +MD5 (gnome2/gnome-games-2.8.1.tar.bz2) = d3c675e29c835cfa765fbd6ae4a289cc +SIZE (gnome2/gnome-games-2.8.1.tar.bz2) = 5926555 diff --git a/games/gnome-games/files/patch-ac b/games/gnome-games/files/patch-ac deleted file mode 100644 index 2605cefdfe3f..000000000000 --- a/games/gnome-games/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- gdk-card-image/Makefile.in.orig Wed Dec 10 11:44:58 2003 -+++ gdk-card-image/Makefile.in Wed Dec 10 11:45:48 2003 -@@ -243,7 +243,7 @@ - libgdkcardimage_la_SOURCES = gdk-card-image.c card-style-file.c - libgdkcardimageincludedir = $(includedir)/gdkcardimage - libgdkcardimageinclude_HEADERS = gdk-card-image.h card-style-file.h --libgdkcardimage_la_LDFLAGS = -version-info 0:0:0 -+libgdkcardimage_la_LDFLAGS = -version-info 1:0:0 - libgdkcardimage_la_LIBADD = $(GNOME_GAMES_LIBS) @UCB_LDFLAGS@ - subdir = gdk-card-image - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/games/gnome-games/files/patch-aisleriot::sol.c b/games/gnome-games/files/patch-aisleriot::sol.c deleted file mode 100644 index 7a281c20a24e..000000000000 --- a/games/gnome-games/files/patch-aisleriot::sol.c +++ /dev/null @@ -1,37 +0,0 @@ ---- aisleriot/sol.c.orig Wed Oct 1 20:19:36 2003 -+++ aisleriot/sol.c Tue Nov 25 16:30:44 2003 -@@ -83,6 +83,15 @@ - #define DEFAULT_VARIATION "klondike.scm" - #define GNOME_SESSION_BUG - -+gchar* game_file_to_variation (const gchar* file) -+{ -+ char* p, *buf = g_path_get_basename(file); -+ -+ if ((p = strrchr (buf, '.'))) *p = '\0'; -+ -+ return buf; -+} -+ - gchar* game_file_to_name (const gchar* file) - { - char* p, *buf = g_path_get_basename(file); -@@ -545,14 +554,14 @@ - n_games = 0; - - for (i = 0; i < n_games; i++) { -- gchar *game_name = game_file_to_name (game_dents[i]->d_name); -- if (!strcasecmp (variation, game_name)) { -+ gchar *game_variation = game_file_to_variation (game_dents[i]->d_name); -+ if (!strcasecmp (variation, game_variation)) { - dont_save = TRUE; - start_game = g_strdup ((gchar*) game_dents[i]->d_name); -- g_free (game_name); -+ g_free (game_variation); - break; - } -- g_free (game_name); -+ g_free (game_variation); - } - - gh_enter(argc, argv, main_prog); diff --git a/games/gnome-games/files/patch-blackjack_src_player.cpp b/games/gnome-games/files/patch-blackjack_src_player.cpp new file mode 100644 index 000000000000..0a2d1ac3b8b0 --- /dev/null +++ b/games/gnome-games/files/patch-blackjack_src_player.cpp @@ -0,0 +1,75 @@ +--- blackjack/src/player.cpp.orig Tue Jul 6 12:56:50 2004 ++++ blackjack/src/player.cpp Tue Jul 6 12:59:29 2004 +@@ -262,8 +262,8 @@ + // Player can always stand. + + bestValue = value = getValueStand (*lplayer, upCard); +- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", +- _("Stand"), value * 100); ++ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", ++ _("Stand"), (long double)(value * 100)); + bestOption = KEY_S; + bestOptionNumber = num_options; + +@@ -271,8 +271,8 @@ + if (bj_hand_can_be_hit ()) { + value = getValueHit (*lplayer, upCard); + +- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", +- _("Hit"), value * 100); ++ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", ++ _("Hit"), (long double)(value * 100)); + if (value > bestValue) { + bestValue = value; + bestOption = KEY_H; +@@ -282,8 +282,8 @@ + // Check if player can double down. + if (bj_hand_can_be_doubled ()) { + value = getValueDoubleDown (*lplayer, upCard); +- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", +- _("Double"), value * 100); ++ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", ++ _("Double"), (long double)(value * 100)); + if (value > bestValue) { + bestValue = value; + bestOption = KEY_D; +@@ -296,8 +296,8 @@ + + if (bj_hand_can_be_split ()) { + value = getValueSplit(lplayer->cards[0].value (), upCard); +- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", +- _("Split"), value * 100); ++ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", ++ _("Split"), (long double)(value * 100)); + if (value > bestValue) { + bestValue = value; + bestOption = KEY_P; +@@ -308,8 +308,8 @@ + // Check if player can surrender. + if (bj_hand_can_be_surrendered ()) { + value = -0.5; +- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", +- _("Surrender"), value * 100); ++ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", ++ _("Surrender"), (long double)(value * 100)); + if (value > bestValue) { + bestValue = value; + bestOption = KEY_R; +@@ -439,12 +439,12 @@ + reset (); + + mark_list[0] = g_strdup_printf ("<b>%s</b>\n", _("Dealer hand probabilities")); +- mark_list[1] = g_strdup_printf (" %s %5.2lf%%\n", _("Bust"), +- getProbabilityBust (lupCard) * 100.0 / notBlackjack); ++ mark_list[1] = g_strdup_printf (" %s %5.2Lf%%\n", _("Bust"), ++ (long double)(getProbabilityBust (lupCard) * 100.0 / notBlackjack)); + for (int count = 17; count <= 21; count++) { +- mark_list[count-15] = g_strdup_printf (" %2d %5.2lf%%\n", count, +- getProbabilityCount (count, lupCard) +- * 100.0 / notBlackjack); ++ mark_list[count-15] = g_strdup_printf (" %2d %5.2Lf%%\n", count, ++ (long double)(getProbabilityCount (count, lupCard) ++ * 100.0 / notBlackjack)); + } + + markup = g_strconcat ("<span size=\"small\" font_family=\"monospace\" foreground=\"#eaeac1\">", diff --git a/games/gnome-games/files/patch-gataxx_gtkgridboard.c b/games/gnome-games/files/patch-gataxx_gtkgridboard.c new file mode 100644 index 000000000000..9ceabef83f4f --- /dev/null +++ b/games/gnome-games/files/patch-gataxx_gtkgridboard.c @@ -0,0 +1,21 @@ +--- gataxx/gtkgridboard.c.orig Thu May 20 17:17:56 2004 ++++ gataxx/gtkgridboard.c Thu May 20 17:18:13 2004 +@@ -140,6 +140,7 @@ + static gint gtk_gridboard_button_press(GtkWidget *widget, GdkEventButton *event) + { + GtkGridBoard * gridboard; ++ int x, y; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (GTK_IS_GRIDBOARD(widget), FALSE); +@@ -147,8 +148,8 @@ + + gridboard=GTK_GRIDBOARD(widget); + +- int x=event->x/gridboard->tilewidth; +- int y=event->y/gridboard->tileheight; ++ x=event->x/gridboard->tilewidth; ++ y=event->y/gridboard->tileheight; + g_signal_emit (G_OBJECT(widget), + gridboard_signals[BOXCLICKED], 0, x, y); + return TRUE; diff --git a/games/gnome-games/files/patch-iagno_othello.c b/games/gnome-games/files/patch-iagno_othello.c new file mode 100644 index 000000000000..4b87018a5f18 --- /dev/null +++ b/games/gnome-games/files/patch-iagno_othello.c @@ -0,0 +1,38 @@ +--- iagno/othello.c.orig Thu May 20 17:20:21 2004 ++++ iagno/othello.c Thu May 20 17:21:11 2004 +@@ -544,7 +544,7 @@ + memcpy (tboard, board, sizeof (gint8) * 8 * 8); + move_board(tboard, i, j, me, 0); + +- // assume that opponent takes best move ++ /* assume that opponent takes best move */ + tmp_move = find_best_move(tboard, not_me, ply_depth-1, + -pass_thresh, -use_thresh, 0, 0); + +@@ -559,7 +559,7 @@ + } + } + +- // check if we have to pass ++ /* check if we have to pass */ + if (best_x == 8 && best_y == 8) { + tmp_move = find_best_move(board, not_me, ply_depth-1, + -pass_thresh, -use_thresh, 0, 0); +@@ -802,14 +802,14 @@ + found_free = TRUE; + } + +- // check if a player is dead ++ /* check if a player is dead */ + if (!found_me && found_not_me) + return (-10000); + else if (found_me && !found_not_me) + return (10000); + +- // if the game is finished, return the actual score rather than +- // a huristic ++ /* if the game is finished, return the actual score rather than ++ * a huristic */ + if (!found_free) + return (actual_score); + diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install index 38f82a6246e5..da897732169d 100644 --- a/games/gnome-games/pkg-install +++ b/games/gnome-games/pkg-install @@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in POST-INSTALL) mkdir -p ${PKG_PREFIX}/share/gnome/games - SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores same-gnome.scores" + SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores" for i in ${SCORES}; do if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then touch -f ${PKG_PREFIX}/share/gnome/games/${i} diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index d8d26bbe1ffd..e2a994af5003 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -14,63 +14,12 @@ bin/iagno bin/mahjongg bin/same-gnome bin/sol -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/aisleriot.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/aisleriot.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/aisleriot.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/blackjack.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/blackjack.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/blackjack.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gataxx.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gataxx.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gataxx.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/glines.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/glines.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/glines.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnect.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnect.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnect.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnibbles.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnibbles.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnibbles.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnobots2.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnobots2.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnobots2.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-stones.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-stones.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-stones.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnometris.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnometris.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnometris.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomine.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnomine.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomine.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnotravex.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnotravex.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnotravex.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtali.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gtali.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtali.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/iagno.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/iagno.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/iagno.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mahjongg.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/mahjongg.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mahjongg.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/same-gnome.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/same-gnome.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/same-gnome.schemas > /dev/null || /usr/bin/true -etc/sound/events/gataxx.soundlist etc/sound/events/gnect.soundlist etc/sound/events/gnibbles.soundlist etc/sound/events/gnobots2.soundlist etc/sound/events/iagno.soundlist -include/gdkcardimage/card-style-file.h -include/gdkcardimage/gdk-card-image.h lib/gnome-stones/objects/libgnome-stones.so lib/gnome-stones/objects/libgnomekoban.so -lib/libgdkcardimage.a -lib/libgdkcardimage.so -lib/libgdkcardimage.so.1 share/gnome/applications/blackjack.desktop share/gnome/applications/freecell.desktop share/gnome/applications/gataxx.desktop @@ -88,6 +37,7 @@ share/gnome/applications/iagno.desktop share/gnome/applications/mahjongg.desktop share/gnome/applications/same-gnome.desktop share/gnome/applications/sol.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/blackjack/Ameristar.rules share/gnome/blackjack/Atlantic_City.rules share/gnome/blackjack/Vegas_Downtown.rules @@ -156,6 +106,7 @@ share/gnome/blackjack/Vegas_Strip.rules @unexec [ -s %D/share/gnome/games/mahjongg.easy.scores ] || rm -f %D/share/gnome/games/mahjongg.easy.scores @unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores @unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores +@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores @unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores share/gnome/gnect/white_ob.cn4 share/gnome/gnibbles/level001.gnl @@ -254,6 +205,8 @@ share/gnome/help/aisleriot/C/scuffle.xml share/gnome/help/aisleriot/C/seahaven.xml share/gnome/help/aisleriot/C/sir_tommy.xml share/gnome/help/aisleriot/C/spider.xml +share/gnome/help/aisleriot/C/spider_one_suit.xml +share/gnome/help/aisleriot/C/spider_two_suit.xml share/gnome/help/aisleriot/C/spiderette.xml share/gnome/help/aisleriot/C/straight_up.xml share/gnome/help/aisleriot/C/streets_and_alleys.xml @@ -289,7 +242,6 @@ share/gnome/help/gnect/C/figures/tileset.png share/gnome/help/gnect/C/gnect.xml share/gnome/help/gnect/C/legal.xml share/gnome/help/gnibbles/C/figures/game.png -share/gnome/help/gnibbles/C/figures/graphics.png share/gnome/help/gnibbles/C/figures/intro.png share/gnome/help/gnibbles/C/figures/playing.png share/gnome/help/gnibbles/C/figures/worm_op.png @@ -404,53 +356,16 @@ share/gnome/omf/gnome-games/same-gnome-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/blackjack/baize.png share/gnome/pixmaps/blackjack/blackjack-splash.png -share/gnome/pixmaps/blackjack/chip-1.png -share/gnome/pixmaps/blackjack/chip-100.png -share/gnome/pixmaps/blackjack/chip-25.png -share/gnome/pixmaps/blackjack/chip-5.png -share/gnome/pixmaps/cards/backs/antique-red.png -share/gnome/pixmaps/cards/backs/beige.png -share/gnome/pixmaps/cards/backs/dondorf-flower.png -share/gnome/pixmaps/cards/backs/face.png -share/gnome/pixmaps/cards/backs/grey.png -share/gnome/pixmaps/cards/backs/rods.png -share/gnome/pixmaps/cards/backs/tux.png +share/gnome/pixmaps/blackjack/chip-1.svg +share/gnome/pixmaps/blackjack/chip-100.svg +share/gnome/pixmaps/blackjack/chip-25.svg +share/gnome/pixmaps/blackjack/chip-5.svg share/gnome/pixmaps/cards/baize.png -share/gnome/pixmaps/cards/card-styles.xml -share/gnome/pixmaps/cards/honors/bonded.png -share/gnome/pixmaps/cards/honors/dondorf.png -share/gnome/pixmaps/cards/honors/xpat.png -share/gnome/pixmaps/cards/jokers/gnome.png -share/gnome/pixmaps/cards/ranks/bold-09x14.png -share/gnome/pixmaps/cards/ranks/fine-07x12.png -share/gnome/pixmaps/cards/slots/hand.png -share/gnome/pixmaps/cards/slots/plain.png -share/gnome/pixmaps/cards/slots/white-outline.png -share/gnome/pixmaps/cards/suits_large/knuth-09x10.png -share/gnome/pixmaps/cards/suits_large/knuth-15x19.png -share/gnome/pixmaps/cards/suits_large/knuth-18x21.png -share/gnome/pixmaps/cards/suits_large/knuth-21x25.png -share/gnome/pixmaps/cards/suits_large/xpat-11x11.png -share/gnome/pixmaps/cards/suits_large/xpat-15x15.png -share/gnome/pixmaps/cards/suits_large/xpat-21x21.png -share/gnome/pixmaps/cards/suits_large/xpat-41x41.png -share/gnome/pixmaps/cards/suits_medium/knuth-09x10.png -share/gnome/pixmaps/cards/suits_medium/knuth-15x19.png -share/gnome/pixmaps/cards/suits_medium/knuth-18x21.png -share/gnome/pixmaps/cards/suits_medium/knuth-21x25.png -share/gnome/pixmaps/cards/suits_medium/xpat-11x11.png -share/gnome/pixmaps/cards/suits_medium/xpat-15x15.png -share/gnome/pixmaps/cards/suits_medium/xpat-21x21.png -share/gnome/pixmaps/cards/suits_small/knuth-09x10.png -share/gnome/pixmaps/cards/suits_small/xpat-11x11.png -share/gnome/pixmaps/cards/suits_small/xpat-15x15.png +share/gnome/pixmaps/cards/slot.png +share/gnome/pixmaps/cards/slots/white-outline.svg share/gnome/pixmaps/gataxx.png share/gnome/pixmaps/glines.png share/gnome/pixmaps/glines/balls.svg -share/gnome/pixmaps/glines/classic.png -share/gnome/pixmaps/glines/dots.png -share/gnome/pixmaps/glines/gumball.png -share/gnome/pixmaps/glines/pulse.png share/gnome/pixmaps/glines/shapes.svg share/gnome/pixmaps/gnect-icon.png share/gnome/pixmaps/gnect/bg_grotty.jpg @@ -461,26 +376,46 @@ share/gnome/pixmaps/gnect/tileset_50x50_classic.png share/gnome/pixmaps/gnect/tileset_50x50_glassy.png share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.png share/gnome/pixmaps/gnect/tileset_50x50_square.png +share/gnome/pixmaps/gnibbles/blank.svg +share/gnome/pixmaps/gnibbles/bonus1.svg +share/gnome/pixmaps/gnibbles/bonus2.svg +share/gnome/pixmaps/gnibbles/bonus3.svg +share/gnome/pixmaps/gnibbles/bonus4.svg +share/gnome/pixmaps/gnibbles/bonus5.svg +share/gnome/pixmaps/gnibbles/diamond.svg share/gnome/pixmaps/gnibbles/gnibbles-logo.png share/gnome/pixmaps/gnibbles/gnibbles.png +share/gnome/pixmaps/gnibbles/life.svg +share/gnome/pixmaps/gnibbles/questionmark.svg +share/gnome/pixmaps/gnibbles/snake-blue.svg +share/gnome/pixmaps/gnibbles/snake-cyan.svg +share/gnome/pixmaps/gnibbles/snake-green.svg +share/gnome/pixmaps/gnibbles/snake-grey.svg +share/gnome/pixmaps/gnibbles/snake-magenta.svg +share/gnome/pixmaps/gnibbles/snake-red.svg +share/gnome/pixmaps/gnibbles/snake-yellow.svg +share/gnome/pixmaps/gnibbles/wall-corner-bottom-left.svg +share/gnome/pixmaps/gnibbles/wall-corner-bottom-right.svg +share/gnome/pixmaps/gnibbles/wall-corner-top-left.svg +share/gnome/pixmaps/gnibbles/wall-corner-top-right.svg +share/gnome/pixmaps/gnibbles/wall-cross.svg +share/gnome/pixmaps/gnibbles/wall-empty.svg +share/gnome/pixmaps/gnibbles/wall-straight-side.svg +share/gnome/pixmaps/gnibbles/wall-straight-up.svg +share/gnome/pixmaps/gnibbles/wall-tee-down.svg +share/gnome/pixmaps/gnibbles/wall-tee-left.svg +share/gnome/pixmaps/gnibbles/wall-tee-right.svg +share/gnome/pixmaps/gnibbles/wall-tee-up.svg share/gnome/pixmaps/gnobots2/aieee.png -share/gnome/pixmaps/gnobots2/cows.png -share/gnome/pixmaps/gnobots2/eggs.png share/gnome/pixmaps/gnobots2/gnomes.png -share/gnome/pixmaps/gnobots2/mice.png share/gnome/pixmaps/gnobots2/robots.png share/gnome/pixmaps/gnobots2/splat.png -share/gnome/pixmaps/gnobots2/windows.png share/gnome/pixmaps/gnobots2/yahoo.png +share/gnome/pixmaps/gnome-games-common/cards/bonded.png +share/gnome/pixmaps/gnome-games-common/cards/paris.svg share/gnome/pixmaps/gnome-aisleriot.png share/gnome/pixmaps/gnome-blackjack.png share/gnome/pixmaps/gnome-cardgame.png -share/gnome/pixmaps/gnome-die1.png -share/gnome/pixmaps/gnome-die2.png -share/gnome/pixmaps/gnome-die3.png -share/gnome/pixmaps/gnome-die4.png -share/gnome/pixmaps/gnome-die5.png -share/gnome/pixmaps/gnome-die6.png share/gnome/pixmaps/gnome-gnobots2.png share/gnome/pixmaps/gnome-gnomine.png share/gnome/pixmaps/gnome-gnotravex.png @@ -508,58 +443,34 @@ share/gnome/pixmaps/gnome-stones/frame.png share/gnome/pixmaps/gnome-stones/gnome.png share/gnome/pixmaps/gnome-stones/title-tile.png share/gnome/pixmaps/gnome-stones/wall.png -share/gnome/pixmaps/gnometris/5blocks-tig.png -share/gnome/pixmaps/gnometris/5blocks-tim.png -share/gnome/pixmaps/gnometris/5blocks.png share/gnome/pixmaps/gnometris/7blocks-gw.png share/gnome/pixmaps/gnometris/7blocks-tig.png -share/gnome/pixmaps/gnometris/7blocks.png -share/gnome/pixmaps/gnometris/7stones-gn.png -share/gnome/pixmaps/gnometris/7stones2-gn.png -share/gnome/pixmaps/gnometris/bg/dog-bg.jpg -share/gnome/pixmaps/gnometris/bg/fishy-bg.jpg -share/gnome/pixmaps/gnometris/bg/geschier-bg.jpg -share/gnome/pixmaps/gnometris/bg/gitter-bg.jpg -share/gnome/pixmaps/gnometris/bg/gnome2-foot.png -share/gnome/pixmaps/gnometris/bg/gnometris-bg.jpg -share/gnome/pixmaps/gnometris/bg/greyprint-bg.jpg -share/gnome/pixmaps/gnometris/bg/leaves-bg.jpg -share/gnome/pixmaps/gnometris/bg/rhinoceros-bg.jpg -share/gnome/pixmaps/gnometris/bg/scrcow-bg.jpg -share/gnome/pixmaps/gnometris/bg/sweet-bg.jpg -share/gnome/pixmaps/gnometris/bg/trees-bg.jpg -share/gnome/pixmaps/gnometris/bg/vortex-bg.jpg -share/gnome/pixmaps/gnometris/bg/watery-bg.jpg -share/gnome/pixmaps/gnometris/bg/weirdo-bg.jpg -share/gnome/pixmaps/gnomine/face-cool.xpm -share/gnome/pixmaps/gnomine/face-sad.xpm -share/gnome/pixmaps/gnomine/face-smile.xpm -share/gnome/pixmaps/gnomine/face-win.xpm -share/gnome/pixmaps/gnomine/face-worried.xpm +share/gnome/pixmaps/gnomine/face-cool.png +share/gnome/pixmaps/gnomine/face-sad.png +share/gnome/pixmaps/gnomine/face-smile.png +share/gnome/pixmaps/gnomine/face-win.png +share/gnome/pixmaps/gnomine/face-worried.png share/gnome/pixmaps/gnomine/flag-question.svg share/gnome/pixmaps/gnomine/flag.svg share/gnome/pixmaps/gnomine/mine.svg share/gnome/pixmaps/gnotski-icon.png share/gnome/pixmaps/gnotski.png +share/gnome/pixmaps/gtali/gnome-dice-1.svg +share/gnome/pixmaps/gtali/gnome-dice-2.svg +share/gnome/pixmaps/gtali/gnome-dice-3.svg +share/gnome/pixmaps/gtali/gnome-dice-4.svg +share/gnome/pixmaps/gtali/gnome-dice-5.svg +share/gnome/pixmaps/gtali/gnome-dice-6.svg +share/gnome/pixmaps/gtali/gnome-dice-none.svg share/gnome/pixmaps/iagno.png -share/gnome/pixmaps/iagno/blend.png share/gnome/pixmaps/iagno/classic.png -share/gnome/pixmaps/iagno/flipblend.png -share/gnome/pixmaps/iagno/metal.png -share/gnome/pixmaps/iagno/metal2.png -share/gnome/pixmaps/iagno/shrink.png -share/gnome/pixmaps/iagno/sunmoon.png share/gnome/pixmaps/iagno/woodtrim.png -share/gnome/pixmaps/mahjongg/default.png -share/gnome/pixmaps/mahjongg/maya.png share/gnome/pixmaps/mahjongg/postmodern.svg share/gnome/pixmaps/mahjongg/smooth.png -share/gnome/pixmaps/same-gnome/blink-sync.png -share/gnome/pixmaps/same-gnome/glass.png -share/gnome/pixmaps/same-gnome/marbles.png +share/gnome/pixmaps/rteleport.png share/gnome/pixmaps/same-gnome/planets.png -share/gnome/pixmaps/same-gnome/rotate.png share/gnome/pixmaps/same-gnome/stones.png +share/gnome/pixmaps/teleport.png share/gnome/sol-games/agnes.scm share/gnome/sol-games/auld_lang_syne.scm share/gnome/sol-games/bakers_dozen.scm @@ -615,6 +526,8 @@ share/gnome/sol-games/seahaven.scm share/gnome/sol-games/sir_tommy.scm share/gnome/sol-games/sol.scm share/gnome/sol-games/spider.scm +share/gnome/sol-games/spider_one_suit.scm +share/gnome/sol-games/spider_two_suit.scm share/gnome/sol-games/spiderette.scm share/gnome/sol-games/straight_up.scm share/gnome/sol-games/streets_and_alleys.scm @@ -631,8 +544,6 @@ share/gnome/sol-games/will_o_the_wisp.scm share/gnome/sol-games/yield.scm share/gnome/sol-games/yukon.scm share/gnome/sol-games/zebra.scm -share/gnome/sounds/gataxx/flip-piece.wav -share/gnome/sounds/gataxx/gameover.wav share/gnome/sounds/gnibbles/appear.wav share/gnome/sounds/gnibbles/bonus.wav share/gnome/sounds/gnibbles/crash.wav @@ -648,13 +559,14 @@ share/gnome/sounds/gnobots2/splat.wav share/gnome/sounds/gnobots2/teleport.wav share/gnome/sounds/gnobots2/victory.wav share/gnome/sounds/gnobots2/yahoo.wav -share/gnome/sounds/gnome-stones/born.wav -share/gnome/sounds/gnome-stones/boulder.wav -share/gnome/sounds/gnome-stones/dig.wav -share/gnome/sounds/gnome-stones/door_open.wav -share/gnome/sounds/gnome-stones/explosion.wav -share/gnome/sounds/gnome-stones/get_diamond.wav -share/gnome/sounds/gnome-stones/title.wav +share/gnome/sounds/gnometris/gameover.wav +share/gnome/sounds/gnometris/gnometris.wav +share/gnome/sounds/gnometris/land.wav +share/gnome/sounds/gnometris/lines1.wav +share/gnome/sounds/gnometris/lines2.wav +share/gnome/sounds/gnometris/lines3.wav +share/gnome/sounds/gnometris/slide.wav +share/gnome/sounds/gnometris/turn.wav share/gnome/sounds/iagno/flip-piece.wav share/gnome/sounds/iagno/gameover.wav share/locale/am/LC_MESSAGES/gnome-games.mo @@ -685,6 +597,7 @@ share/locale/hi/LC_MESSAGES/gnome-games.mo share/locale/hr/LC_MESSAGES/gnome-games.mo share/locale/hu/LC_MESSAGES/gnome-games.mo share/locale/id/LC_MESSAGES/gnome-games.mo +share/locale/is/LC_MESSAGES/gnome-games.mo share/locale/it/LC_MESSAGES/gnome-games.mo share/locale/ja/LC_MESSAGES/gnome-games.mo share/locale/ko/LC_MESSAGES/gnome-games.mo @@ -694,6 +607,7 @@ share/locale/mk/LC_MESSAGES/gnome-games.mo share/locale/ml/LC_MESSAGES/gnome-games.mo share/locale/mn/LC_MESSAGES/gnome-games.mo share/locale/ms/LC_MESSAGES/gnome-games.mo +share/locale/nb/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo share/locale/nn/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo @@ -709,6 +623,7 @@ share/locale/sq/LC_MESSAGES/gnome-games.mo share/locale/sr/LC_MESSAGES/gnome-games.mo share/locale/sr@Latn/LC_MESSAGES/gnome-games.mo share/locale/sv/LC_MESSAGES/gnome-games.mo +share/locale/ta/LC_MESSAGES/gnome-games.mo share/locale/tr/LC_MESSAGES/gnome-games.mo share/locale/uk/LC_MESSAGES/gnome-games.mo share/locale/vi/LC_MESSAGES/gnome-games.mo @@ -716,31 +631,25 @@ share/locale/wa/LC_MESSAGES/gnome-games.mo share/locale/zh_CN/LC_MESSAGES/gnome-games.mo share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/sounds/iagno -@dirrm share/gnome/sounds/gnome-stones +@dirrm share/gnome/sounds/gnometris @dirrm share/gnome/sounds/gnobots2 @dirrm share/gnome/sounds/gnibbles -@dirrm share/gnome/sounds/gataxx @dirrm share/gnome/sol-games/glade @dirrm share/gnome/sol-games @dirrm share/gnome/pixmaps/same-gnome @dirrm share/gnome/pixmaps/mahjongg @dirrm share/gnome/pixmaps/iagno +@dirrm share/gnome/pixmaps/gtali @dirrm share/gnome/pixmaps/gnomine -@dirrm share/gnome/pixmaps/gnometris/bg @dirrm share/gnome/pixmaps/gnometris @dirrm share/gnome/pixmaps/gnome-stones +@dirrm share/gnome/pixmaps/gnome-games-common/cards +@dirrm share/gnome/pixmaps/gnome-games-common @dirrm share/gnome/pixmaps/gnobots2 @dirrm share/gnome/pixmaps/gnibbles @dirrm share/gnome/pixmaps/gnect @dirrm share/gnome/pixmaps/glines -@dirrm share/gnome/pixmaps/cards/suits_small -@dirrm share/gnome/pixmaps/cards/suits_medium -@dirrm share/gnome/pixmaps/cards/suits_large @dirrm share/gnome/pixmaps/cards/slots -@dirrm share/gnome/pixmaps/cards/ranks -@dirrm share/gnome/pixmaps/cards/jokers -@dirrm share/gnome/pixmaps/cards/honors -@dirrm share/gnome/pixmaps/cards/backs @dirrm share/gnome/pixmaps/cards @dirrm share/gnome/pixmaps/blackjack @dirrm share/gnome/omf/gnome-games @@ -822,3 +731,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/games/gnomegames2-extra-data/Makefile b/games/gnomegames2-extra-data/Makefile new file mode 100644 index 000000000000..cfc08d4f3f99 --- /dev/null +++ b/games/gnomegames2-extra-data/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: gnomegames2-extra-data +# Date created: 16 August 2004 +# Whom: Adam Weinberger <adamw@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= gnomegames2-extra-data +PORTVERSION= 2.8.0 +CATEGORIES= games gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.8 +DISTNAME= gnome-games-extra-data-${PORTVERSION} +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Themes and artwork for the gnomegames2 package + +RUN_DEPENDS= ${X11BASE}/bin/sol:${PORTSDIR}/games/gnomegames2 + +USE_BZIP2= yes +USE_GMAKE= yes +USE_X_PREFIX= yes +GNU_CONFIGURE= yes +USE_GNOME= gnomehack gnomeprefix +CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/games/gnomegames2-extra-data/distinfo b/games/gnomegames2-extra-data/distinfo new file mode 100644 index 000000000000..8327f7a2740c --- /dev/null +++ b/games/gnomegames2-extra-data/distinfo @@ -0,0 +1,2 @@ +MD5 (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 6a3252a66e3c3ac09e2f951ee2d726b2 +SIZE (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 3582341 diff --git a/games/gnomegames2-extra-data/pkg-descr b/games/gnomegames2-extra-data/pkg-descr new file mode 100644 index 000000000000..992c00ea920e --- /dev/null +++ b/games/gnomegames2-extra-data/pkg-descr @@ -0,0 +1,3 @@ +This package contains extra data files for the gnome-games package. At +the moment this is almost entirely extra themes and artwork for the +games. diff --git a/games/gnomegames2-extra-data/pkg-plist b/games/gnomegames2-extra-data/pkg-plist new file mode 100644 index 000000000000..cf3cdea0e8c1 --- /dev/null +++ b/games/gnomegames2-extra-data/pkg-plist @@ -0,0 +1,30 @@ +share/gnome/pixmaps/glines/classic.png +share/gnome/pixmaps/glines/dots.png +share/gnome/pixmaps/glines/gumball.png +share/gnome/pixmaps/glines/pulse.png +share/gnome/pixmaps/gnobots2/cows.png +share/gnome/pixmaps/gnobots2/eggs.png +share/gnome/pixmaps/gnobots2/mice.png +share/gnome/pixmaps/gnobots2/windows.png +share/gnome/pixmaps/gnome-games-common/cards/bellot.svg +share/gnome/pixmaps/gnome-games-common/cards/dondorf.svg +share/gnome/pixmaps/gnometris/5blocks-tig.png +share/gnome/pixmaps/gnometris/5blocks-tim.png +share/gnome/pixmaps/gnometris/5blocks.png +share/gnome/pixmaps/gnometris/7blocks.png +share/gnome/pixmaps/gnometris/7stones-gn.png +share/gnome/pixmaps/gnometris/7stones2-gn.png +share/gnome/pixmaps/iagno/blend.png +share/gnome/pixmaps/iagno/flipblend.png +share/gnome/pixmaps/iagno/metal.png +share/gnome/pixmaps/iagno/metal2.png +share/gnome/pixmaps/iagno/shrink.png +share/gnome/pixmaps/iagno/sunmoon.png +share/gnome/pixmaps/mahjongg/default.png +share/gnome/pixmaps/mahjongg/default2.png +share/gnome/pixmaps/mahjongg/maya.png +share/gnome/pixmaps/mahjongg/seta.png +share/gnome/pixmaps/same-gnome/blink-sync.png +share/gnome/pixmaps/same-gnome/glass.png +share/gnome/pixmaps/same-gnome/marbles.png +share/gnome/pixmaps/same-gnome/rotate.png diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index 78ed7dc5f2cf..b17fa1d94f68 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.6.2 -PORTREVISION= 2 +PORTVERSION= 2.8.1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.6 +MASTER_SITE_SUBDIR= sources/gnome-games/2.8 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,13 +22,18 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui \ - librsvg2 -USE_INC_LIBTOOL_VER=13 -INSTALLS_SHLIB= yes +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeui \ + librsvg2 desktopfileutils +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas gataxx.schemas \ + glines.schemas gnect.schemas gnibbles.schemas gnobots2.schemas \ + gnome-stones.schemas gnometris.schemas gnomine.schemas \ + gnotravex.schemas gtali.schemas iagno.schemas mahjongg.schemas \ + same-gnome.schemas + CONFLICTS= sol-1.0.* post-patch: diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo index daee81986fc9..fb6cc99cba4e 100644 --- a/games/gnomegames2/distinfo +++ b/games/gnomegames2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-2.6.2.tar.bz2) = 3b43e035912ec7e941568b571f1237ae -SIZE (gnome2/gnome-games-2.6.2.tar.bz2) = 8269706 +MD5 (gnome2/gnome-games-2.8.1.tar.bz2) = d3c675e29c835cfa765fbd6ae4a289cc +SIZE (gnome2/gnome-games-2.8.1.tar.bz2) = 5926555 diff --git a/games/gnomegames2/files/patch-ac b/games/gnomegames2/files/patch-ac deleted file mode 100644 index 2605cefdfe3f..000000000000 --- a/games/gnomegames2/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- gdk-card-image/Makefile.in.orig Wed Dec 10 11:44:58 2003 -+++ gdk-card-image/Makefile.in Wed Dec 10 11:45:48 2003 -@@ -243,7 +243,7 @@ - libgdkcardimage_la_SOURCES = gdk-card-image.c card-style-file.c - libgdkcardimageincludedir = $(includedir)/gdkcardimage - libgdkcardimageinclude_HEADERS = gdk-card-image.h card-style-file.h --libgdkcardimage_la_LDFLAGS = -version-info 0:0:0 -+libgdkcardimage_la_LDFLAGS = -version-info 1:0:0 - libgdkcardimage_la_LIBADD = $(GNOME_GAMES_LIBS) @UCB_LDFLAGS@ - subdir = gdk-card-image - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/games/gnomegames2/files/patch-aisleriot::sol.c b/games/gnomegames2/files/patch-aisleriot::sol.c deleted file mode 100644 index 7a281c20a24e..000000000000 --- a/games/gnomegames2/files/patch-aisleriot::sol.c +++ /dev/null @@ -1,37 +0,0 @@ ---- aisleriot/sol.c.orig Wed Oct 1 20:19:36 2003 -+++ aisleriot/sol.c Tue Nov 25 16:30:44 2003 -@@ -83,6 +83,15 @@ - #define DEFAULT_VARIATION "klondike.scm" - #define GNOME_SESSION_BUG - -+gchar* game_file_to_variation (const gchar* file) -+{ -+ char* p, *buf = g_path_get_basename(file); -+ -+ if ((p = strrchr (buf, '.'))) *p = '\0'; -+ -+ return buf; -+} -+ - gchar* game_file_to_name (const gchar* file) - { - char* p, *buf = g_path_get_basename(file); -@@ -545,14 +554,14 @@ - n_games = 0; - - for (i = 0; i < n_games; i++) { -- gchar *game_name = game_file_to_name (game_dents[i]->d_name); -- if (!strcasecmp (variation, game_name)) { -+ gchar *game_variation = game_file_to_variation (game_dents[i]->d_name); -+ if (!strcasecmp (variation, game_variation)) { - dont_save = TRUE; - start_game = g_strdup ((gchar*) game_dents[i]->d_name); -- g_free (game_name); -+ g_free (game_variation); - break; - } -- g_free (game_name); -+ g_free (game_variation); - } - - gh_enter(argc, argv, main_prog); diff --git a/games/gnomegames2/files/patch-blackjack_src_player.cpp b/games/gnomegames2/files/patch-blackjack_src_player.cpp new file mode 100644 index 000000000000..0a2d1ac3b8b0 --- /dev/null +++ b/games/gnomegames2/files/patch-blackjack_src_player.cpp @@ -0,0 +1,75 @@ +--- blackjack/src/player.cpp.orig Tue Jul 6 12:56:50 2004 ++++ blackjack/src/player.cpp Tue Jul 6 12:59:29 2004 +@@ -262,8 +262,8 @@ + // Player can always stand. + + bestValue = value = getValueStand (*lplayer, upCard); +- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", +- _("Stand"), value * 100); ++ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", ++ _("Stand"), (long double)(value * 100)); + bestOption = KEY_S; + bestOptionNumber = num_options; + +@@ -271,8 +271,8 @@ + if (bj_hand_can_be_hit ()) { + value = getValueHit (*lplayer, upCard); + +- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", +- _("Hit"), value * 100); ++ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", ++ _("Hit"), (long double)(value * 100)); + if (value > bestValue) { + bestValue = value; + bestOption = KEY_H; +@@ -282,8 +282,8 @@ + // Check if player can double down. + if (bj_hand_can_be_doubled ()) { + value = getValueDoubleDown (*lplayer, upCard); +- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", +- _("Double"), value * 100); ++ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", ++ _("Double"), (long double)(value * 100)); + if (value > bestValue) { + bestValue = value; + bestOption = KEY_D; +@@ -296,8 +296,8 @@ + + if (bj_hand_can_be_split ()) { + value = getValueSplit(lplayer->cards[0].value (), upCard); +- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", +- _("Split"), value * 100); ++ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", ++ _("Split"), (long double)(value * 100)); + if (value > bestValue) { + bestValue = value; + bestOption = KEY_P; +@@ -308,8 +308,8 @@ + // Check if player can surrender. + if (bj_hand_can_be_surrendered ()) { + value = -0.5; +- mark_list[num_options++] = g_strdup_printf (" %s %8.2lf%%\n", +- _("Surrender"), value * 100); ++ mark_list[num_options++] = g_strdup_printf (" %s %8.2Lf%%\n", ++ _("Surrender"), (long double)(value * 100)); + if (value > bestValue) { + bestValue = value; + bestOption = KEY_R; +@@ -439,12 +439,12 @@ + reset (); + + mark_list[0] = g_strdup_printf ("<b>%s</b>\n", _("Dealer hand probabilities")); +- mark_list[1] = g_strdup_printf (" %s %5.2lf%%\n", _("Bust"), +- getProbabilityBust (lupCard) * 100.0 / notBlackjack); ++ mark_list[1] = g_strdup_printf (" %s %5.2Lf%%\n", _("Bust"), ++ (long double)(getProbabilityBust (lupCard) * 100.0 / notBlackjack)); + for (int count = 17; count <= 21; count++) { +- mark_list[count-15] = g_strdup_printf (" %2d %5.2lf%%\n", count, +- getProbabilityCount (count, lupCard) +- * 100.0 / notBlackjack); ++ mark_list[count-15] = g_strdup_printf (" %2d %5.2Lf%%\n", count, ++ (long double)(getProbabilityCount (count, lupCard) ++ * 100.0 / notBlackjack)); + } + + markup = g_strconcat ("<span size=\"small\" font_family=\"monospace\" foreground=\"#eaeac1\">", diff --git a/games/gnomegames2/files/patch-gataxx_gtkgridboard.c b/games/gnomegames2/files/patch-gataxx_gtkgridboard.c new file mode 100644 index 000000000000..9ceabef83f4f --- /dev/null +++ b/games/gnomegames2/files/patch-gataxx_gtkgridboard.c @@ -0,0 +1,21 @@ +--- gataxx/gtkgridboard.c.orig Thu May 20 17:17:56 2004 ++++ gataxx/gtkgridboard.c Thu May 20 17:18:13 2004 +@@ -140,6 +140,7 @@ + static gint gtk_gridboard_button_press(GtkWidget *widget, GdkEventButton *event) + { + GtkGridBoard * gridboard; ++ int x, y; + + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (GTK_IS_GRIDBOARD(widget), FALSE); +@@ -147,8 +148,8 @@ + + gridboard=GTK_GRIDBOARD(widget); + +- int x=event->x/gridboard->tilewidth; +- int y=event->y/gridboard->tileheight; ++ x=event->x/gridboard->tilewidth; ++ y=event->y/gridboard->tileheight; + g_signal_emit (G_OBJECT(widget), + gridboard_signals[BOXCLICKED], 0, x, y); + return TRUE; diff --git a/games/gnomegames2/files/patch-iagno_othello.c b/games/gnomegames2/files/patch-iagno_othello.c new file mode 100644 index 000000000000..4b87018a5f18 --- /dev/null +++ b/games/gnomegames2/files/patch-iagno_othello.c @@ -0,0 +1,38 @@ +--- iagno/othello.c.orig Thu May 20 17:20:21 2004 ++++ iagno/othello.c Thu May 20 17:21:11 2004 +@@ -544,7 +544,7 @@ + memcpy (tboard, board, sizeof (gint8) * 8 * 8); + move_board(tboard, i, j, me, 0); + +- // assume that opponent takes best move ++ /* assume that opponent takes best move */ + tmp_move = find_best_move(tboard, not_me, ply_depth-1, + -pass_thresh, -use_thresh, 0, 0); + +@@ -559,7 +559,7 @@ + } + } + +- // check if we have to pass ++ /* check if we have to pass */ + if (best_x == 8 && best_y == 8) { + tmp_move = find_best_move(board, not_me, ply_depth-1, + -pass_thresh, -use_thresh, 0, 0); +@@ -802,14 +802,14 @@ + found_free = TRUE; + } + +- // check if a player is dead ++ /* check if a player is dead */ + if (!found_me && found_not_me) + return (-10000); + else if (found_me && !found_not_me) + return (10000); + +- // if the game is finished, return the actual score rather than +- // a huristic ++ /* if the game is finished, return the actual score rather than ++ * a huristic */ + if (!found_free) + return (actual_score); + diff --git a/games/gnomegames2/pkg-install b/games/gnomegames2/pkg-install index 38f82a6246e5..da897732169d 100644 --- a/games/gnomegames2/pkg-install +++ b/games/gnomegames2/pkg-install @@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in POST-INSTALL) mkdir -p ${PKG_PREFIX}/share/gnome/games - SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores same-gnome.scores" + SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores" for i in ${SCORES}; do if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then touch -f ${PKG_PREFIX}/share/gnome/games/${i} diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index d8d26bbe1ffd..e2a994af5003 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -14,63 +14,12 @@ bin/iagno bin/mahjongg bin/same-gnome bin/sol -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/aisleriot.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/aisleriot.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/aisleriot.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/blackjack.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/blackjack.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/blackjack.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gataxx.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gataxx.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gataxx.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/glines.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/glines.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/glines.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnect.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnect.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnect.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnibbles.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnibbles.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnibbles.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnobots2.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnobots2.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnobots2.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-stones.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-stones.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-stones.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnometris.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnometris.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnometris.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomine.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnomine.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomine.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnotravex.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnotravex.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnotravex.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtali.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gtali.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtali.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/iagno.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/iagno.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/iagno.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mahjongg.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/mahjongg.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mahjongg.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/same-gnome.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/same-gnome.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/same-gnome.schemas > /dev/null || /usr/bin/true -etc/sound/events/gataxx.soundlist etc/sound/events/gnect.soundlist etc/sound/events/gnibbles.soundlist etc/sound/events/gnobots2.soundlist etc/sound/events/iagno.soundlist -include/gdkcardimage/card-style-file.h -include/gdkcardimage/gdk-card-image.h lib/gnome-stones/objects/libgnome-stones.so lib/gnome-stones/objects/libgnomekoban.so -lib/libgdkcardimage.a -lib/libgdkcardimage.so -lib/libgdkcardimage.so.1 share/gnome/applications/blackjack.desktop share/gnome/applications/freecell.desktop share/gnome/applications/gataxx.desktop @@ -88,6 +37,7 @@ share/gnome/applications/iagno.desktop share/gnome/applications/mahjongg.desktop share/gnome/applications/same-gnome.desktop share/gnome/applications/sol.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/blackjack/Ameristar.rules share/gnome/blackjack/Atlantic_City.rules share/gnome/blackjack/Vegas_Downtown.rules @@ -156,6 +106,7 @@ share/gnome/blackjack/Vegas_Strip.rules @unexec [ -s %D/share/gnome/games/mahjongg.easy.scores ] || rm -f %D/share/gnome/games/mahjongg.easy.scores @unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores @unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores +@unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores @unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores share/gnome/gnect/white_ob.cn4 share/gnome/gnibbles/level001.gnl @@ -254,6 +205,8 @@ share/gnome/help/aisleriot/C/scuffle.xml share/gnome/help/aisleriot/C/seahaven.xml share/gnome/help/aisleriot/C/sir_tommy.xml share/gnome/help/aisleriot/C/spider.xml +share/gnome/help/aisleriot/C/spider_one_suit.xml +share/gnome/help/aisleriot/C/spider_two_suit.xml share/gnome/help/aisleriot/C/spiderette.xml share/gnome/help/aisleriot/C/straight_up.xml share/gnome/help/aisleriot/C/streets_and_alleys.xml @@ -289,7 +242,6 @@ share/gnome/help/gnect/C/figures/tileset.png share/gnome/help/gnect/C/gnect.xml share/gnome/help/gnect/C/legal.xml share/gnome/help/gnibbles/C/figures/game.png -share/gnome/help/gnibbles/C/figures/graphics.png share/gnome/help/gnibbles/C/figures/intro.png share/gnome/help/gnibbles/C/figures/playing.png share/gnome/help/gnibbles/C/figures/worm_op.png @@ -404,53 +356,16 @@ share/gnome/omf/gnome-games/same-gnome-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/blackjack/baize.png share/gnome/pixmaps/blackjack/blackjack-splash.png -share/gnome/pixmaps/blackjack/chip-1.png -share/gnome/pixmaps/blackjack/chip-100.png -share/gnome/pixmaps/blackjack/chip-25.png -share/gnome/pixmaps/blackjack/chip-5.png -share/gnome/pixmaps/cards/backs/antique-red.png -share/gnome/pixmaps/cards/backs/beige.png -share/gnome/pixmaps/cards/backs/dondorf-flower.png -share/gnome/pixmaps/cards/backs/face.png -share/gnome/pixmaps/cards/backs/grey.png -share/gnome/pixmaps/cards/backs/rods.png -share/gnome/pixmaps/cards/backs/tux.png +share/gnome/pixmaps/blackjack/chip-1.svg +share/gnome/pixmaps/blackjack/chip-100.svg +share/gnome/pixmaps/blackjack/chip-25.svg +share/gnome/pixmaps/blackjack/chip-5.svg share/gnome/pixmaps/cards/baize.png -share/gnome/pixmaps/cards/card-styles.xml -share/gnome/pixmaps/cards/honors/bonded.png -share/gnome/pixmaps/cards/honors/dondorf.png -share/gnome/pixmaps/cards/honors/xpat.png -share/gnome/pixmaps/cards/jokers/gnome.png -share/gnome/pixmaps/cards/ranks/bold-09x14.png -share/gnome/pixmaps/cards/ranks/fine-07x12.png -share/gnome/pixmaps/cards/slots/hand.png -share/gnome/pixmaps/cards/slots/plain.png -share/gnome/pixmaps/cards/slots/white-outline.png -share/gnome/pixmaps/cards/suits_large/knuth-09x10.png -share/gnome/pixmaps/cards/suits_large/knuth-15x19.png -share/gnome/pixmaps/cards/suits_large/knuth-18x21.png -share/gnome/pixmaps/cards/suits_large/knuth-21x25.png -share/gnome/pixmaps/cards/suits_large/xpat-11x11.png -share/gnome/pixmaps/cards/suits_large/xpat-15x15.png -share/gnome/pixmaps/cards/suits_large/xpat-21x21.png -share/gnome/pixmaps/cards/suits_large/xpat-41x41.png -share/gnome/pixmaps/cards/suits_medium/knuth-09x10.png -share/gnome/pixmaps/cards/suits_medium/knuth-15x19.png -share/gnome/pixmaps/cards/suits_medium/knuth-18x21.png -share/gnome/pixmaps/cards/suits_medium/knuth-21x25.png -share/gnome/pixmaps/cards/suits_medium/xpat-11x11.png -share/gnome/pixmaps/cards/suits_medium/xpat-15x15.png -share/gnome/pixmaps/cards/suits_medium/xpat-21x21.png -share/gnome/pixmaps/cards/suits_small/knuth-09x10.png -share/gnome/pixmaps/cards/suits_small/xpat-11x11.png -share/gnome/pixmaps/cards/suits_small/xpat-15x15.png +share/gnome/pixmaps/cards/slot.png +share/gnome/pixmaps/cards/slots/white-outline.svg share/gnome/pixmaps/gataxx.png share/gnome/pixmaps/glines.png share/gnome/pixmaps/glines/balls.svg -share/gnome/pixmaps/glines/classic.png -share/gnome/pixmaps/glines/dots.png -share/gnome/pixmaps/glines/gumball.png -share/gnome/pixmaps/glines/pulse.png share/gnome/pixmaps/glines/shapes.svg share/gnome/pixmaps/gnect-icon.png share/gnome/pixmaps/gnect/bg_grotty.jpg @@ -461,26 +376,46 @@ share/gnome/pixmaps/gnect/tileset_50x50_classic.png share/gnome/pixmaps/gnect/tileset_50x50_glassy.png share/gnome/pixmaps/gnect/tileset_50x50_hcontrast.png share/gnome/pixmaps/gnect/tileset_50x50_square.png +share/gnome/pixmaps/gnibbles/blank.svg +share/gnome/pixmaps/gnibbles/bonus1.svg +share/gnome/pixmaps/gnibbles/bonus2.svg +share/gnome/pixmaps/gnibbles/bonus3.svg +share/gnome/pixmaps/gnibbles/bonus4.svg +share/gnome/pixmaps/gnibbles/bonus5.svg +share/gnome/pixmaps/gnibbles/diamond.svg share/gnome/pixmaps/gnibbles/gnibbles-logo.png share/gnome/pixmaps/gnibbles/gnibbles.png +share/gnome/pixmaps/gnibbles/life.svg +share/gnome/pixmaps/gnibbles/questionmark.svg +share/gnome/pixmaps/gnibbles/snake-blue.svg +share/gnome/pixmaps/gnibbles/snake-cyan.svg +share/gnome/pixmaps/gnibbles/snake-green.svg +share/gnome/pixmaps/gnibbles/snake-grey.svg +share/gnome/pixmaps/gnibbles/snake-magenta.svg +share/gnome/pixmaps/gnibbles/snake-red.svg +share/gnome/pixmaps/gnibbles/snake-yellow.svg +share/gnome/pixmaps/gnibbles/wall-corner-bottom-left.svg +share/gnome/pixmaps/gnibbles/wall-corner-bottom-right.svg +share/gnome/pixmaps/gnibbles/wall-corner-top-left.svg +share/gnome/pixmaps/gnibbles/wall-corner-top-right.svg +share/gnome/pixmaps/gnibbles/wall-cross.svg +share/gnome/pixmaps/gnibbles/wall-empty.svg +share/gnome/pixmaps/gnibbles/wall-straight-side.svg +share/gnome/pixmaps/gnibbles/wall-straight-up.svg +share/gnome/pixmaps/gnibbles/wall-tee-down.svg +share/gnome/pixmaps/gnibbles/wall-tee-left.svg +share/gnome/pixmaps/gnibbles/wall-tee-right.svg +share/gnome/pixmaps/gnibbles/wall-tee-up.svg share/gnome/pixmaps/gnobots2/aieee.png -share/gnome/pixmaps/gnobots2/cows.png -share/gnome/pixmaps/gnobots2/eggs.png share/gnome/pixmaps/gnobots2/gnomes.png -share/gnome/pixmaps/gnobots2/mice.png share/gnome/pixmaps/gnobots2/robots.png share/gnome/pixmaps/gnobots2/splat.png -share/gnome/pixmaps/gnobots2/windows.png share/gnome/pixmaps/gnobots2/yahoo.png +share/gnome/pixmaps/gnome-games-common/cards/bonded.png +share/gnome/pixmaps/gnome-games-common/cards/paris.svg share/gnome/pixmaps/gnome-aisleriot.png share/gnome/pixmaps/gnome-blackjack.png share/gnome/pixmaps/gnome-cardgame.png -share/gnome/pixmaps/gnome-die1.png -share/gnome/pixmaps/gnome-die2.png -share/gnome/pixmaps/gnome-die3.png -share/gnome/pixmaps/gnome-die4.png -share/gnome/pixmaps/gnome-die5.png -share/gnome/pixmaps/gnome-die6.png share/gnome/pixmaps/gnome-gnobots2.png share/gnome/pixmaps/gnome-gnomine.png share/gnome/pixmaps/gnome-gnotravex.png @@ -508,58 +443,34 @@ share/gnome/pixmaps/gnome-stones/frame.png share/gnome/pixmaps/gnome-stones/gnome.png share/gnome/pixmaps/gnome-stones/title-tile.png share/gnome/pixmaps/gnome-stones/wall.png -share/gnome/pixmaps/gnometris/5blocks-tig.png -share/gnome/pixmaps/gnometris/5blocks-tim.png -share/gnome/pixmaps/gnometris/5blocks.png share/gnome/pixmaps/gnometris/7blocks-gw.png share/gnome/pixmaps/gnometris/7blocks-tig.png -share/gnome/pixmaps/gnometris/7blocks.png -share/gnome/pixmaps/gnometris/7stones-gn.png -share/gnome/pixmaps/gnometris/7stones2-gn.png -share/gnome/pixmaps/gnometris/bg/dog-bg.jpg -share/gnome/pixmaps/gnometris/bg/fishy-bg.jpg -share/gnome/pixmaps/gnometris/bg/geschier-bg.jpg -share/gnome/pixmaps/gnometris/bg/gitter-bg.jpg -share/gnome/pixmaps/gnometris/bg/gnome2-foot.png -share/gnome/pixmaps/gnometris/bg/gnometris-bg.jpg -share/gnome/pixmaps/gnometris/bg/greyprint-bg.jpg -share/gnome/pixmaps/gnometris/bg/leaves-bg.jpg -share/gnome/pixmaps/gnometris/bg/rhinoceros-bg.jpg -share/gnome/pixmaps/gnometris/bg/scrcow-bg.jpg -share/gnome/pixmaps/gnometris/bg/sweet-bg.jpg -share/gnome/pixmaps/gnometris/bg/trees-bg.jpg -share/gnome/pixmaps/gnometris/bg/vortex-bg.jpg -share/gnome/pixmaps/gnometris/bg/watery-bg.jpg -share/gnome/pixmaps/gnometris/bg/weirdo-bg.jpg -share/gnome/pixmaps/gnomine/face-cool.xpm -share/gnome/pixmaps/gnomine/face-sad.xpm -share/gnome/pixmaps/gnomine/face-smile.xpm -share/gnome/pixmaps/gnomine/face-win.xpm -share/gnome/pixmaps/gnomine/face-worried.xpm +share/gnome/pixmaps/gnomine/face-cool.png +share/gnome/pixmaps/gnomine/face-sad.png +share/gnome/pixmaps/gnomine/face-smile.png +share/gnome/pixmaps/gnomine/face-win.png +share/gnome/pixmaps/gnomine/face-worried.png share/gnome/pixmaps/gnomine/flag-question.svg share/gnome/pixmaps/gnomine/flag.svg share/gnome/pixmaps/gnomine/mine.svg share/gnome/pixmaps/gnotski-icon.png share/gnome/pixmaps/gnotski.png +share/gnome/pixmaps/gtali/gnome-dice-1.svg +share/gnome/pixmaps/gtali/gnome-dice-2.svg +share/gnome/pixmaps/gtali/gnome-dice-3.svg +share/gnome/pixmaps/gtali/gnome-dice-4.svg +share/gnome/pixmaps/gtali/gnome-dice-5.svg +share/gnome/pixmaps/gtali/gnome-dice-6.svg +share/gnome/pixmaps/gtali/gnome-dice-none.svg share/gnome/pixmaps/iagno.png -share/gnome/pixmaps/iagno/blend.png share/gnome/pixmaps/iagno/classic.png -share/gnome/pixmaps/iagno/flipblend.png -share/gnome/pixmaps/iagno/metal.png -share/gnome/pixmaps/iagno/metal2.png -share/gnome/pixmaps/iagno/shrink.png -share/gnome/pixmaps/iagno/sunmoon.png share/gnome/pixmaps/iagno/woodtrim.png -share/gnome/pixmaps/mahjongg/default.png -share/gnome/pixmaps/mahjongg/maya.png share/gnome/pixmaps/mahjongg/postmodern.svg share/gnome/pixmaps/mahjongg/smooth.png -share/gnome/pixmaps/same-gnome/blink-sync.png -share/gnome/pixmaps/same-gnome/glass.png -share/gnome/pixmaps/same-gnome/marbles.png +share/gnome/pixmaps/rteleport.png share/gnome/pixmaps/same-gnome/planets.png -share/gnome/pixmaps/same-gnome/rotate.png share/gnome/pixmaps/same-gnome/stones.png +share/gnome/pixmaps/teleport.png share/gnome/sol-games/agnes.scm share/gnome/sol-games/auld_lang_syne.scm share/gnome/sol-games/bakers_dozen.scm @@ -615,6 +526,8 @@ share/gnome/sol-games/seahaven.scm share/gnome/sol-games/sir_tommy.scm share/gnome/sol-games/sol.scm share/gnome/sol-games/spider.scm +share/gnome/sol-games/spider_one_suit.scm +share/gnome/sol-games/spider_two_suit.scm share/gnome/sol-games/spiderette.scm share/gnome/sol-games/straight_up.scm share/gnome/sol-games/streets_and_alleys.scm @@ -631,8 +544,6 @@ share/gnome/sol-games/will_o_the_wisp.scm share/gnome/sol-games/yield.scm share/gnome/sol-games/yukon.scm share/gnome/sol-games/zebra.scm -share/gnome/sounds/gataxx/flip-piece.wav -share/gnome/sounds/gataxx/gameover.wav share/gnome/sounds/gnibbles/appear.wav share/gnome/sounds/gnibbles/bonus.wav share/gnome/sounds/gnibbles/crash.wav @@ -648,13 +559,14 @@ share/gnome/sounds/gnobots2/splat.wav share/gnome/sounds/gnobots2/teleport.wav share/gnome/sounds/gnobots2/victory.wav share/gnome/sounds/gnobots2/yahoo.wav -share/gnome/sounds/gnome-stones/born.wav -share/gnome/sounds/gnome-stones/boulder.wav -share/gnome/sounds/gnome-stones/dig.wav -share/gnome/sounds/gnome-stones/door_open.wav -share/gnome/sounds/gnome-stones/explosion.wav -share/gnome/sounds/gnome-stones/get_diamond.wav -share/gnome/sounds/gnome-stones/title.wav +share/gnome/sounds/gnometris/gameover.wav +share/gnome/sounds/gnometris/gnometris.wav +share/gnome/sounds/gnometris/land.wav +share/gnome/sounds/gnometris/lines1.wav +share/gnome/sounds/gnometris/lines2.wav +share/gnome/sounds/gnometris/lines3.wav +share/gnome/sounds/gnometris/slide.wav +share/gnome/sounds/gnometris/turn.wav share/gnome/sounds/iagno/flip-piece.wav share/gnome/sounds/iagno/gameover.wav share/locale/am/LC_MESSAGES/gnome-games.mo @@ -685,6 +597,7 @@ share/locale/hi/LC_MESSAGES/gnome-games.mo share/locale/hr/LC_MESSAGES/gnome-games.mo share/locale/hu/LC_MESSAGES/gnome-games.mo share/locale/id/LC_MESSAGES/gnome-games.mo +share/locale/is/LC_MESSAGES/gnome-games.mo share/locale/it/LC_MESSAGES/gnome-games.mo share/locale/ja/LC_MESSAGES/gnome-games.mo share/locale/ko/LC_MESSAGES/gnome-games.mo @@ -694,6 +607,7 @@ share/locale/mk/LC_MESSAGES/gnome-games.mo share/locale/ml/LC_MESSAGES/gnome-games.mo share/locale/mn/LC_MESSAGES/gnome-games.mo share/locale/ms/LC_MESSAGES/gnome-games.mo +share/locale/nb/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo share/locale/nn/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo @@ -709,6 +623,7 @@ share/locale/sq/LC_MESSAGES/gnome-games.mo share/locale/sr/LC_MESSAGES/gnome-games.mo share/locale/sr@Latn/LC_MESSAGES/gnome-games.mo share/locale/sv/LC_MESSAGES/gnome-games.mo +share/locale/ta/LC_MESSAGES/gnome-games.mo share/locale/tr/LC_MESSAGES/gnome-games.mo share/locale/uk/LC_MESSAGES/gnome-games.mo share/locale/vi/LC_MESSAGES/gnome-games.mo @@ -716,31 +631,25 @@ share/locale/wa/LC_MESSAGES/gnome-games.mo share/locale/zh_CN/LC_MESSAGES/gnome-games.mo share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/sounds/iagno -@dirrm share/gnome/sounds/gnome-stones +@dirrm share/gnome/sounds/gnometris @dirrm share/gnome/sounds/gnobots2 @dirrm share/gnome/sounds/gnibbles -@dirrm share/gnome/sounds/gataxx @dirrm share/gnome/sol-games/glade @dirrm share/gnome/sol-games @dirrm share/gnome/pixmaps/same-gnome @dirrm share/gnome/pixmaps/mahjongg @dirrm share/gnome/pixmaps/iagno +@dirrm share/gnome/pixmaps/gtali @dirrm share/gnome/pixmaps/gnomine -@dirrm share/gnome/pixmaps/gnometris/bg @dirrm share/gnome/pixmaps/gnometris @dirrm share/gnome/pixmaps/gnome-stones +@dirrm share/gnome/pixmaps/gnome-games-common/cards +@dirrm share/gnome/pixmaps/gnome-games-common @dirrm share/gnome/pixmaps/gnobots2 @dirrm share/gnome/pixmaps/gnibbles @dirrm share/gnome/pixmaps/gnect @dirrm share/gnome/pixmaps/glines -@dirrm share/gnome/pixmaps/cards/suits_small -@dirrm share/gnome/pixmaps/cards/suits_medium -@dirrm share/gnome/pixmaps/cards/suits_large @dirrm share/gnome/pixmaps/cards/slots -@dirrm share/gnome/pixmaps/cards/ranks -@dirrm share/gnome/pixmaps/cards/jokers -@dirrm share/gnome/pixmaps/cards/honors -@dirrm share/gnome/pixmaps/cards/backs @dirrm share/gnome/pixmaps/cards @dirrm share/gnome/pixmaps/blackjack @dirrm share/gnome/omf/gnome-games @@ -822,3 +731,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index 66f1946d6383..31c161e719a7 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= eog2 -PORTVERSION= 2.6.1 -PORTREVISION= 4 +PORTVERSION= 2.8.1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 DISTNAME= eog-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,16 +20,21 @@ USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack gnomehier intlhack eel2 libgnomeprintui \ - librsvg2 + librsvg2 desktopfileutils USE_X_PREFIX= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +GCONF_SCHEMAS= eog.schemas + .include <bsd.port.pre.mk> .if defined(WITH_EXIF) || exists(${LOCALBASE}/lib/libexif.so.10) LIB_DEPENDS+= exif.10:${PORTSDIR}/graphics/libexif .endif +post-install: + @-update-desktop-database > /dev/null + .include <bsd.port.post.mk> diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo index 6e4800d6ec58..df37f92b6890 100644 --- a/graphics/eog2/distinfo +++ b/graphics/eog2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eog-2.6.1.tar.bz2) = a7207082b9034e9e24ec7adde744c3a9 -SIZE (gnome2/eog-2.6.1.tar.bz2) = 863021 +MD5 (gnome2/eog-2.8.1.tar.bz2) = 2bad4006f3ccf15b0153d7b9facbc961 +SIZE (gnome2/eog-2.8.1.tar.bz2) = 834279 diff --git a/graphics/eog2/files/patch-libeog_eog-info-view.c b/graphics/eog2/files/patch-libeog_eog-info-view.c deleted file mode 100644 index a9050fa7cccc..000000000000 --- a/graphics/eog2/files/patch-libeog_eog-info-view.c +++ /dev/null @@ -1,24 +0,0 @@ ---- libeog/eog-info-view.c.orig Wed Oct 13 16:42:12 2004 -+++ libeog/eog-info-view.c Wed Oct 13 16:43:41 2004 -@@ -246,6 +246,7 @@ - EogInfoView *view; - EogInfoViewPrivate *priv; - char *path; -+ char entryval[4096]; - - view = EOG_INFO_VIEW (data); - priv = view->priv; -@@ -255,11 +256,11 @@ - path = g_hash_table_lookup (priv->id_path_hash, GINT_TO_POINTER (entry->tag)); - - if (path != NULL) { -- set_row_data (store, path, exif_tag_get_name (entry->tag), exif_entry_get_value (entry)); -+ set_row_data (store, path, exif_tag_get_name (entry->tag), exif_entry_get_value (entry, entryval, sizeof(entryval))); - } - else { - path = set_row_data (store, NULL, -- exif_tag_get_name (entry->tag), exif_entry_get_value (entry)); -+ exif_tag_get_name (entry->tag), exif_entry_get_value (entry, entryval, sizeof(entryval))); - - g_hash_table_insert (priv->id_path_hash, - GINT_TO_POINTER (entry->tag), diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist index 0791bc90ec98..8965a0bbc56f 100644 --- a/graphics/eog2/pkg-plist +++ b/graphics/eog2/pkg-plist @@ -1,19 +1,10 @@ bin/eog -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/eog.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/eog.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/eog.schemas > /dev/null || /usr/bin/true -libdata/bonobo/servers/GNOME_EOG.server -libdata/bonobo/servers/GNOME_EOG_Collection.server -libexec/eog-collection-view -libexec/eog-image-viewer share/gnome/applications/eog.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/eog/glade/eog.glade -share/gnome/eog/gpi-dialog.glade -share/gnome/gnome-2.0/ui/eog-collection-view-ui.xml -share/gnome/gnome-2.0/ui/eog-image-view-ctrl-ui.xml -share/gnome/gnome-2.0/ui/eog-image-view-ui.xml -share/gnome/gnome-2.0/ui/eog-shell-ui.xml +share/gnome/gnome-2.0/ui/eog-gtk-ui.xml share/gnome/help/eog/C/eog.xml +share/gnome/help/eog/C/figures/eog_save_as_window.png share/gnome/help/eog/C/figures/eog_start_window.png share/gnome/help/eog/C/legal.xml share/gnome/help/eog/de/eog.xml @@ -46,7 +37,6 @@ share/gnome/help/eog/zh_CN/legal.xml share/gnome/help/eog/zh_TW/eog.xml share/gnome/help/eog/zh_TW/figures/eog_start_window.png share/gnome/help/eog/zh_TW/legal.xml -share/gnome/idl/Eog.idl share/gnome/omf/eog/eog-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/eog/eog-de.omf @@ -74,6 +64,8 @@ share/gnome/pixmaps/eog/loading.png share/gnome/pixmaps/eog/orient-horizontal.png share/gnome/pixmaps/eog/orient-vertical.png share/gnome/pixmaps/eog/right-down.png +share/gnome/pixmaps/eog/stock-flip-horizontal-16.png +share/gnome/pixmaps/eog/stock-flip-vertical-16.png share/gnome/pixmaps/eog/stock-rotate-90-16.png share/gnome/pixmaps/eog/stock-rotate-270-16.png share/gnome/pixmaps/eog/stock-rotate-180-16.png @@ -85,6 +77,7 @@ share/locale/az/LC_MESSAGES/eog.mo share/locale/be/LC_MESSAGES/eog.mo share/locale/bg/LC_MESSAGES/eog.mo share/locale/bn/LC_MESSAGES/eog.mo +share/locale/bs/LC_MESSAGES/eog.mo share/locale/ca/LC_MESSAGES/eog.mo share/locale/cs/LC_MESSAGES/eog.mo share/locale/cy/LC_MESSAGES/eog.mo @@ -118,9 +111,12 @@ share/locale/mk/LC_MESSAGES/eog.mo share/locale/ml/LC_MESSAGES/eog.mo share/locale/mn/LC_MESSAGES/eog.mo share/locale/ms/LC_MESSAGES/eog.mo +share/locale/nb/LC_MESSAGES/eog.mo +share/locale/ne/LC_MESSAGES/eog.mo share/locale/nl/LC_MESSAGES/eog.mo share/locale/nn/LC_MESSAGES/eog.mo share/locale/no/LC_MESSAGES/eog.mo +share/locale/or/LC_MESSAGES/eog.mo share/locale/pa/LC_MESSAGES/eog.mo share/locale/pl/LC_MESSAGES/eog.mo share/locale/pt/LC_MESSAGES/eog.mo @@ -135,13 +131,13 @@ share/locale/sr@Latn/LC_MESSAGES/eog.mo share/locale/sv/LC_MESSAGES/eog.mo share/locale/ta/LC_MESSAGES/eog.mo share/locale/th/LC_MESSAGES/eog.mo +share/locale/tk/LC_MESSAGES/eog.mo share/locale/tr/LC_MESSAGES/eog.mo share/locale/uk/LC_MESSAGES/eog.mo share/locale/vi/LC_MESSAGES/eog.mo share/locale/wa/LC_MESSAGES/eog.mo share/locale/zh_CN/LC_MESSAGES/eog.mo share/locale/zh_TW/LC_MESSAGES/eog.mo -@dirrm share/gnome/pixmaps/eog @dirrm share/gnome/omf/eog @dirrm share/gnome/help/eog/zh_TW/figures @dirrm share/gnome/help/eog/zh_TW @@ -165,7 +161,6 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo @dirrm share/gnome/help/eog/de @dirrm share/gnome/help/eog/C/figures @dirrm share/gnome/help/eog/C -@dirrm share/gnome/help/eog @dirrm share/gnome/eog/glade @dirrm share/gnome/eog @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true @@ -179,3 +174,4 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile index 4246d90cccc6..20ff136fd0fc 100644 --- a/graphics/gpdf/Makefile +++ b/graphics/gpdf/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gpdf -PORTVERSION= 0.132 +PORTVERSION= 2.8.0 CATEGORIES= graphics print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -17,10 +17,13 @@ COMMENT= GNOME version of xpdf USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack lthack libgnomeui libgnomeprintui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui \ + desktopfileutils USE_X_PREFIX= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= gpdf.schemas + .include <bsd.port.mk> diff --git a/graphics/gpdf/distinfo b/graphics/gpdf/distinfo index 59ae6780cd8e..c6dbba7b0342 100644 --- a/graphics/gpdf/distinfo +++ b/graphics/gpdf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gpdf-0.132.tar.bz2) = 1b8ba3384210b89a3628281e6aa5edaa -SIZE (gnome2/gpdf-0.132.tar.bz2) = 1109005 +MD5 (gnome2/gpdf-2.8.0.tar.bz2) = a1c054d5de1d5ef361006975c57b45f5 +SIZE (gnome2/gpdf-2.8.0.tar.bz2) = 1046763 diff --git a/graphics/gpdf/pkg-plist b/graphics/gpdf/pkg-plist index 082964bf611a..fd5b70418812 100644 --- a/graphics/gpdf/pkg-plist +++ b/graphics/gpdf/pkg-plist @@ -1,11 +1,9 @@ bin/gpdf -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gpdf.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gpdf.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gpdf.schemas > /dev/null || /usr/bin/true libdata/bonobo/servers/GNOME_PDF.server libexec/gnome-pdf-viewer share/gnome/application-registry/gpdf.applications share/gnome/applications/gpdf.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/gnome-2.0/ui/gpdf-control-ui.xml share/gnome/gnome-2.0/ui/gpdf-window-ui.xml share/gnome/gpdf/glade/gpdf-print-progress-dialog.glade @@ -40,6 +38,7 @@ share/locale/ar/LC_MESSAGES/gpdf.mo share/locale/az/LC_MESSAGES/gpdf.mo share/locale/be/LC_MESSAGES/gpdf.mo share/locale/bn/LC_MESSAGES/gpdf.mo +share/locale/bs/LC_MESSAGES/gpdf.mo share/locale/ca/LC_MESSAGES/gpdf.mo share/locale/cs/LC_MESSAGES/gpdf.mo share/locale/cy/LC_MESSAGES/gpdf.mo @@ -73,9 +72,11 @@ share/locale/mk/LC_MESSAGES/gpdf.mo share/locale/ml/LC_MESSAGES/gpdf.mo share/locale/mn/LC_MESSAGES/gpdf.mo share/locale/ms/LC_MESSAGES/gpdf.mo +share/locale/nb/LC_MESSAGES/gpdf.mo share/locale/nl/LC_MESSAGES/gpdf.mo share/locale/nn/LC_MESSAGES/gpdf.mo share/locale/no/LC_MESSAGES/gpdf.mo +share/locale/or/LC_MESSAGES/gpdf.mo share/locale/pa/LC_MESSAGES/gpdf.mo share/locale/pl/LC_MESSAGES/gpdf.mo share/locale/pt/LC_MESSAGES/gpdf.mo @@ -110,3 +111,4 @@ share/locale/zh_TW/LC_MESSAGES/gpdf.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-es.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 4e0554d7481d..a7c0c549d1e2 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomecanvas -PORTVERSION= 2.6.1.1 +PORTVERSION= 2.8.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,8 +19,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 -USE_GNOME= gnomehack lthack libglade2 libartlgpl2 +USE_LIBTOOL_VER=15 +USE_GNOME= gnomehack libglade2 libartlgpl2 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index ff508aec7c0c..ddc4ebce2feb 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomecanvas-2.6.1.1.tar.bz2) = 040257b0231fd5fc507f731d73d9738b -SIZE (gnome2/libgnomecanvas-2.6.1.1.tar.bz2) = 520488 +MD5 (gnome2/libgnomecanvas-2.8.0.tar.bz2) = 2bf10396a92777e7b64b6052a8a232f1 +SIZE (gnome2/libgnomecanvas-2.8.0.tar.bz2) = 578849 diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist index be326c42d585..642eafb250db 100644 --- a/graphics/libgnomecanvas/pkg-plist +++ b/graphics/libgnomecanvas/pkg-plist @@ -15,14 +15,42 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h lib/libglade/2.0/libcanvas.so lib/libgnomecanvas-2.a lib/libgnomecanvas-2.so -lib/libgnomecanvas-2.so.600 +lib/libgnomecanvas-2.so.800 libdata/pkgconfig/libgnomecanvas-2.0.pc +share/doc/libgnomecanvas/GnomeCanvas.html +share/doc/libgnomecanvas/GnomeCanvasBpath.html +share/doc/libgnomecanvas/GnomeCanvasClipgroup.html +share/doc/libgnomecanvas/GnomeCanvasEllipse.html +share/doc/libgnomecanvas/GnomeCanvasGroup.html +share/doc/libgnomecanvas/GnomeCanvasItem.html +share/doc/libgnomecanvas/GnomeCanvasLine.html +share/doc/libgnomecanvas/GnomeCanvasPixbuf.html +share/doc/libgnomecanvas/GnomeCanvasPolygon.html +share/doc/libgnomecanvas/GnomeCanvasRE.html +share/doc/libgnomecanvas/GnomeCanvasRect.html +share/doc/libgnomecanvas/GnomeCanvasRichText.html +share/doc/libgnomecanvas/GnomeCanvasShape.html +share/doc/libgnomecanvas/GnomeCanvasText.html +share/doc/libgnomecanvas/GnomeCanvasWidget.html +share/doc/libgnomecanvas/ch01.html +share/doc/libgnomecanvas/ch02.html +share/doc/libgnomecanvas/home.png +share/doc/libgnomecanvas/index.html +share/doc/libgnomecanvas/index.sgml +share/doc/libgnomecanvas/left.png +share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html +share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html +share/doc/libgnomecanvas/libgnomecanvas.devhelp +share/doc/libgnomecanvas/right.png +share/doc/libgnomecanvas/style.css +share/doc/libgnomecanvas/up.png share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/bg/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/bn/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/bs/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ca/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/cs/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/cy/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -57,6 +85,7 @@ share/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ml/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/mn/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ms/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/nb/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ne/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 78d92c7d1607..1d534fa7dbc0 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= librsvg2 -PORTVERSION= 2.6.5 -PORTREVISION= 1 +PORTVERSION= 2.8.1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 DISTNAME= librsvg-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,23 +19,84 @@ COMMENT= Library for parsing and rendering SVG vector-graphic files BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ popt.0:${PORTSDIR}/devel/popt \ - croco.3:${PORTSDIR}/textproc/libcroco -RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2 + croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco +RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/${GTK_VERSION}/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2 USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 -USE_GNOME= gnomehack lthack gtk20 libartlgpl2 libxml2 libgsf +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes +USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gnomevfs2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-svgz \ --disable-gtk-doc \ --without-gimp \ + --enable-gnome-vfs \ --with-croco -PLIST_SUB= GTK_VERSION="2.4.0" + +CROCO_VERSION= 0.6 +GTK_VERSION= 2.4.0 + +PLIST_SUB= GTK_VERSION=${GTK_VERSION} MAN1= rsvg.1 -.include <bsd.port.mk> +OPTIONS= MOZILLA_PLUGIN "Enable the RSVG browser plug-in" no + +.include <bsd.port.pre.mk> + +.if defined(WITH_MOZILLA_PLUGIN) +.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" +BUILD_DEPENDS+= ${X11BASE}/lib/firefox/lib/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox +RUN_DEPENDS+= ${X11BASE}/lib/firefox/lib/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox +.else +BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} +RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} +.endif + +HEADERS_SUFX= + +.if !defined(WITH_MOZILLA) +HEADERS_SUFX= +.else +.if ${WITH_MOZILLA}=="mozilla" +HEADERS_SUFX= +.else +.if ${WITH_MOZILLA}=="mozilla-devel" +HEADERS_SUFX= -devel +.else +.if ${WITH_MOZILLA}=="firefox" +CONFIGURE_ENV+= PKG_CONFIG_PATH=${X11BASE}/lib/firefox/lib/pkgconfig +.endif +.endif +.endif +.endif +PLIST_SUB+= PLUGIN="" +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in +PLIST_SUB+= PLUGIN="@comment " +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ + ${WRKSRC}/librsvg-2.0.pc.in +.if defined(WITH_MOZILLA_PLUGIN) +.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" + @${REINPLACE_CMD} -e 's|mozilla-|firefox-|g' ${WRKSRC}/configure +.else + @${REINPLACE_CMD} -e 's|mozilla-plugin|mozilla-plugin${HEADERS_SUFX}|g' \ + ${WRKSRC}/configure +.endif +.endif + +.if defined(WITH_MOZILLA_PLUGIN) +post-install: + ${MKDIR} ${PREFIX}/lib/browser_plugins + ${INSTALL_PROGRAM} ${WRKSRC}/moz-plugin/.libs/libmozsvgdec.so \ + ${PREFIX}/lib/browser_plugins +.endif + +.include <bsd.port.post.mk> diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 7e8e9281e375..567866d8a371 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/librsvg-2.6.5.tar.bz2) = 2d1d16f9493c80ce8214e585727334ae -SIZE (gnome2/librsvg-2.6.5.tar.bz2) = 294229 +MD5 (gnome2/librsvg-2.8.1.tar.bz2) = 01c14f6adcf3a71be2b808879e1223a0 +SIZE (gnome2/librsvg-2.8.1.tar.bz2) = 361446 diff --git a/graphics/librsvg2/files/extra-patch-Makefile.in b/graphics/librsvg2/files/extra-patch-Makefile.in new file mode 100644 index 000000000000..27c8fcd2988f --- /dev/null +++ b/graphics/librsvg2/files/extra-patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Fri Sep 3 00:54:51 2004 ++++ Makefile.in Fri Sep 3 00:55:00 2004 +@@ -307,7 +307,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data ++SUBDIRS = . gtk-engine gdk-pixbuf-loader doc data + @HAVE_GTK_FALSE@target_rsvg_view = + @HAVE_GTK_TRUE@target_rsvg_view = rsvg-view + man_MANS = rsvg.1 diff --git a/graphics/librsvg2/files/patch-configure b/graphics/librsvg2/files/patch-configure index 087685258357..38c33bc6c06a 100644 --- a/graphics/librsvg2/files/patch-configure +++ b/graphics/librsvg2/files/patch-configure @@ -1,10 +1,11 @@ ---- configure.orig Sat May 1 14:14:13 2004 -+++ configure Sat May 1 14:14:20 2004 -@@ -157,6 +157,7 @@ +--- configure.orig Wed Jun 9 01:30:07 2004 ++++ configure Wed Jun 9 01:30:24 2004 +@@ -22052,7 +22052,7 @@ + if test "x$with_html_dir" = "x" ; then + HTML_DIR='${datadir}/doc/librsvg/html' + else +- HTML_DIR=$with_html_dir ++ HTML_DIR=${with_html_dir}/librsvg/html + fi - -+unset tagnames - tagnames=${tagnames+${tagnames},}CXX - - tagnames=${tagnames+${tagnames},}F77 diff --git a/graphics/librsvg2/files/patch-librsvg-2.0.pc.in b/graphics/librsvg2/files/patch-librsvg-2.0.pc.in new file mode 100644 index 000000000000..8210a432bc0d --- /dev/null +++ b/graphics/librsvg2/files/patch-librsvg-2.0.pc.in @@ -0,0 +1,9 @@ +--- librsvg-2.0.pc.in.orig Fri Jun 4 20:23:35 2004 ++++ librsvg-2.0.pc.in Wed Jun 9 01:58:50 2004 +@@ -7,5 +7,5 @@ + Description: library that renders svg files + Version: @VERSION@ + Requires: glib-2.0 gdk-pixbuf-2.0 +-Libs: -L${libdir} -lrsvg-2 ++Libs: -L${libdir} -lrsvg-2 %%PTHREAD_LIBS%% + Cflags: -I${includedir}/librsvg-2 diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in new file mode 100644 index 000000000000..1f570b2472c2 --- /dev/null +++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in @@ -0,0 +1,27 @@ +--- moz-plugin/Makefile.in.orig Fri Sep 3 01:07:24 2004 ++++ moz-plugin/Makefile.in Fri Sep 3 01:08:00 2004 +@@ -282,15 +282,15 @@ + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) +- @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)" +- @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ +- if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ +- else :; fi; \ +- done ++# @$(NORMAL_INSTALL) ++# test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)" ++# @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ ++# if test -f $$p; then \ ++# f="`echo $$p | sed -e 's|^.*/||'`"; \ ++# echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ ++# $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++# else :; fi; \ ++# done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) diff --git a/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c b/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c new file mode 100644 index 000000000000..f75959a2a4ef --- /dev/null +++ b/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c @@ -0,0 +1,15 @@ +--- moz-plugin/moz-plugin.c.orig Fri Sep 3 00:48:45 2004 ++++ moz-plugin/moz-plugin.c Fri Sep 3 00:49:35 2004 +@@ -26,9 +26,12 @@ + #include <config.h> + + #include <stdio.h> ++#ifdef HAVE_STDINT_H + #include <stdint.h> ++#endif + #include <unistd.h> + #include <sys/wait.h> ++#include <signal.h> + + #include <X11/Xlib.h> + #include <X11/Intrinsic.h> diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index a950255e54d5..ef193121ef5f 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -1,30 +1,35 @@ bin/rsvg +bin/rsvg-view include/librsvg-2/librsvg/librsvg-features.h include/librsvg-2/librsvg/rsvg-gz.h include/librsvg-2/librsvg/rsvg.h +%%PLUGIN%%lib/browser_plugins/libmozsvgdec.so lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so lib/librsvg-2.a lib/librsvg-2.so -lib/librsvg-2.so.8 +lib/librsvg-2.so.10 libdata/pkgconfig/librsvg-2.0.pc share/doc/librsvg/html/home.png -share/doc/librsvg/html/i1073.html share/doc/librsvg/html/index.html share/doc/librsvg/html/index.sgml +share/doc/librsvg/html/ix01.html share/doc/librsvg/html/left.png -share/doc/librsvg/html/r22.html -share/doc/librsvg/html/r436.html -share/doc/librsvg/html/r473.html share/doc/librsvg/html/right.png -share/doc/librsvg/html/rsvg-convenience-functions.html -share/doc/librsvg/html/rsvg-core-api.html -share/doc/librsvg/html/rsvg-creating-a-svgz-reader.html +share/doc/librsvg/html/rn01.html +share/doc/librsvg/html/rn02.html +share/doc/librsvg/html/rn03.html +share/doc/librsvg/html/rsvg-Convenience-Functions.html +share/doc/librsvg/html/rsvg-Core-API.html +share/doc/librsvg/html/rsvg-Creating-a-SVGZ-reader.html +share/doc/librsvg/html/rsvg.devhelp share/doc/librsvg/html/rsvg.html share/doc/librsvg/html/up.png +share/gnome/pixmaps/svg-viewer.svg @dirrm share/doc/librsvg/html @dirrm share/doc/librsvg @dirrm include/librsvg-2/librsvg @dirrm include/librsvg-2 @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true @unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true +%%PLUGIN%%@unexec rmdir %D/lib/browser_plugins 2>/dev/null || /usr/bin/true diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index 1756b804bc9d..5ab39285bf6c 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ximian -PORTVERSION= 1.4.7.1 -PORTREVISION= 1 +PORTVERSION= 2.0.2 CATEGORIES= mail gnome -MASTER_SITES= http://ftp.ximian.com/pub/source/evolution/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/2.0 PKGNAMESUFFIX= -connector DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} @@ -19,18 +19,36 @@ COMMENT= Evolution plugin to connect to Microsoft Exchange servers BUILD_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution RUN_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution +USE_BZIP2= yes USE_X_PREFIX= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_GMAKE= yes -WANT_OPENLDAP_VER= 21 -WANT_OPENLDAP_SASL= yes +USE_OPENLDAP= yes USE_GNOME= gnomeprefix intlhack gnomehack gnometarget CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -rpath ${X11BASE}/lib/evolution/${EVO_VERSION}" CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ --with-static-ldap=no -EVO_VERSION= 1.4 -PLIST_SUB= VERSION="1.4" EVO_VERSION=${EVO_VERSION} +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} +EVO_VERSION= 2.0 +PLIST_SUB= VERSION="2.0" EVO_VERSION=${EVO_VERSION} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 && defined(MAKE_KERBEROS5) && \ + exists(/usr/lib/libkrb5.so) && !defined(PACKAGE_BUILDING) +CONFIGURE_ARGS+= --with-krb5=/usr +.elif ( ${OSVERSION} < 500000 && !defined(MAKE_KERBEROS5) ) || \ + defined(PACKAGE_BUILDING) +LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal +CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} +.elif ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ + exists(/usr/lib/libkrb5.so) +CONFIGURE_ARGS+= --with-krb5=/usr +.else +LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal +CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} +.endif + +.include <bsd.port.post.mk> diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo index ff3a864f146c..ecaf521ee176 100644 --- a/mail/evolution-exchange/distinfo +++ b/mail/evolution-exchange/distinfo @@ -1,2 +1,2 @@ -MD5 (ximian-connector-1.4.7.1.tar.gz) = fad20b3b50161a99f1e36b704590e600 -SIZE (ximian-connector-1.4.7.1.tar.gz) = 898976 +MD5 (ximian-connector-2.0.2.tar.bz2) = 706f53c9c26321c938248264a4456c30 +SIZE (ximian-connector-2.0.2.tar.bz2) = 1185897 diff --git a/mail/evolution-exchange/files/patch-configure b/mail/evolution-exchange/files/patch-configure index b2b64b88e985..43668716a0d1 100644 --- a/mail/evolution-exchange/files/patch-configure +++ b/mail/evolution-exchange/files/patch-configure @@ -1,11 +1,22 @@ ---- configure.orig Tue Jun 1 20:52:34 2004 -+++ configure Tue Jun 1 20:52:55 2004 -@@ -22992,7 +22992,7 @@ - - case $with_static_ldap in - no|"") -- if test -f $with_openldap/lib/libldap.la; then -+ if test -f $with_openldap/lib/libldap.so; then - with_static_ldap=no +--- configure.orig Fri Aug 20 15:26:49 2004 ++++ configure Fri Aug 20 15:27:21 2004 +@@ -23754,8 +23754,8 @@ + # libldap might depend on OpenSSL... We need to pull + # in the dependency libs explicitly here since we're + # not using libtool for the configure test. +- if test -f $with_openldap/lib/libldap.la; then +- LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS" ++ if test -f $with_openldap/lib/libldap.so; then ++ LDAP_LIBS="`. $with_openldap/lib/libldap.so; echo $dependency_libs` $LDAP_LIBS" + fi else - with_static_ldap=yes + LDAP_LIBS="-llber $LDAP_LIBS" +@@ -24006,7 +24006,7 @@ + + + mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" +-heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" ++heimlibs="-lkrb5 -lcrypt -lcrypto -lasn1 -lcom_err -lroken -lgssapi" + echo "$as_me:$LINENO: checking for Kerberos 5" >&5 + echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 + if test "${ac_cv_lib_kerberos5+set}" = set; then diff --git a/mail/evolution-exchange/files/patch-lib::e2k-autoconfig.c b/mail/evolution-exchange/files/patch-lib::e2k-autoconfig.c index d5806c41d0c5..7576f7123449 100644 --- a/mail/evolution-exchange/files/patch-lib::e2k-autoconfig.c +++ b/mail/evolution-exchange/files/patch-lib::e2k-autoconfig.c @@ -1,13 +1,13 @@ ---- lib/e2k-autoconfig.c.orig Tue May 11 11:09:03 2004 -+++ lib/e2k-autoconfig.c Tue Jun 1 20:47:50 2004 -@@ -25,6 +25,10 @@ +--- lib/e2k-autoconfig.c.orig Tue May 11 11:15:58 2004 ++++ lib/e2k-autoconfig.c Thu Jun 17 14:02:58 2004 +@@ -31,6 +31,10 @@ + #include <sys/stat.h> + #include <unistd.h> - #include <stdlib.h> - #include <string.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> - #include <resolv.h> + #include <netinet/in.h> #include <arpa/nameser.h> - + #include <resolv.h> diff --git a/mail/evolution-exchange/files/patch-ltmain.sh b/mail/evolution-exchange/files/patch-ltmain.sh deleted file mode 100644 index 263a5ce21d00..000000000000 --- a/mail/evolution-exchange/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Mon Apr 5 19:24:18 2004 -+++ ltmain.sh Tue Jun 1 20:45:09 2004 -@@ -1346,7 +1346,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1361,8 +1361,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3056,6 +3064,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5528,10 +5539,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/mail/evolution-exchange/files/patch-po::Makefile.in.in b/mail/evolution-exchange/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..042bef6eb7fc --- /dev/null +++ b/mail/evolution-exchange/files/patch-po::Makefile.in.in @@ -0,0 +1,11 @@ +--- po/Makefile.in.in.orig Sun Jul 25 18:30:57 2004 ++++ po/Makefile.in.in Sun Jul 25 18:31:20 2004 +@@ -32,6 +32,8 @@ + gnulocaledir = $(datadir)/locale + gettextsrcdir = $(datadir)/glib-2.0/gettext/po + subdir = po ++mkdir_p = @mkdir_p@ ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist index 2041a036ef58..70ec761c760a 100644 --- a/mail/evolution-exchange/pkg-plist +++ b/mail/evolution-exchange/pkg-plist @@ -1,21 +1,93 @@ -bin/ximian-connector-setup -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_exchange.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_evolution_exchange.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_exchange.schemas > /dev/null || /usr/bin/true +bin/ximian-connector-setup-%%VERSION%% lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.so lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.urls -libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage.server +libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage -share/gnome/evolution/%%EVO_VERSION%%/images/connector.png -share/gnome/evolution/%%EVO_VERSION%%/images/exchange-delegates-48.png -share/gnome/evolution/%%EVO_VERSION%%/images/exchange-oof-48.png +%%DOCSDIR%%/E2kContext.html +%%DOCSDIR%%/E2kGlobalCatalog.html +%%DOCSDIR%%/E2kSecurityDescriptor.html +%%DOCSDIR%%/E2kSid.html +%%DOCSDIR%%/E2kUserDialog.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png +%%DOCSDIR%%/ximian-connector-e2k-action.html +%%DOCSDIR%%/ximian-connector-e2k-autoconfig.html +%%DOCSDIR%%/ximian-connector-e2k-encoding-utils.html +%%DOCSDIR%%/ximian-connector-e2k-freebusy.html +%%DOCSDIR%%/ximian-connector-e2k-http-utils.html +%%DOCSDIR%%/ximian-connector-e2k-properties.html +%%DOCSDIR%%/ximian-connector-e2k-restriction.html +%%DOCSDIR%%/ximian-connector-e2k-result.html +%%DOCSDIR%%/ximian-connector-e2k-rule-xml.html +%%DOCSDIR%%/ximian-connector-e2k-rule.html +%%DOCSDIR%%/ximian-connector-e2k-uri.html +%%DOCSDIR%%/ximian-connector-e2k-utils.html +%%DOCSDIR%%/ximian-connector-e2k-xml-utils.html +%%DOCSDIR%%/ximian-connector-test-utils.html +%%DOCSDIR%%/ximian-connector-xntlm-des.html +%%DOCSDIR%%/ximian-connector-xntlm-md4.html +%%DOCSDIR%%/ximian-connector-xntlm.html +%%DOCSDIR%%/ximian-connector.devhelp +share/gnome/ximian-connector/%%VERSION%%/etspec/e-storage-set-view.etspec +share/gnome/ximian-connector/%%VERSION%%/glade/e-folder-creation-dialog.glade +share/gnome/ximian-connector/%%VERSION%%/glade/e-foreign-folder-dialog.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-autoconfig-wizard.glade +share/gnome/ximian-connector/%%VERSION%%/glade/exchange-change-password.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-delegates.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-oof.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-permissions-dialog.glade +share/gnome/ximian-connector/%%VERSION%%/images/connector-mini.png share/gnome/ximian-connector/%%VERSION%%/images/connector.png +share/gnome/ximian-connector/%%VERSION%%/images/exchange-delegates-48.png +share/gnome/ximian-connector/%%VERSION%%/images/exchange-oof-48.png +share/gnome/ximian-connector/%%VERSION%%/ui/ximian-connector.xml +share/locale/ar/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/cy/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/de/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/gu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/nn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/no/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/ta/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +@dirrm share/gnome/ximian-connector/%%VERSION%%/ui @dirrm share/gnome/ximian-connector/%%VERSION%%/images @dirrm share/gnome/ximian-connector/%%VERSION%%/glade +@dirrm share/gnome/ximian-connector/%%VERSION%%/etspec @dirrm share/gnome/ximian-connector/%%VERSION%% @dirrm share/gnome/ximian-connector +@dirrm %%DOCSDIR%% diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 5a9b6eb2548f..3d2021bcd510 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -6,45 +6,49 @@ # PORTNAME= evolution -PORTVERSION= 1.4.6 -PORTREVISION= 1 +PORTVERSION= 2.0.2 CATEGORIES= mail gnome -MASTER_SITES= ${MASTER_SITE_GNOME} \ - http://people.FreeBSD.org/~sobomax/:local -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 \ - sobomax/:local -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ - db-3.1.17${EXTRACT_SUFX}:local +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An integrated mail, calendar and address book distributed suite +LIB_DEPENDS= nss3.1:${PORTSDIR}/security/nss RUN_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnometarget gtkhtml3 +USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gal2 \ + gtkhtml3 desktopfileutils USE_REINPLACE= yes -USE_OPENSSL= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-db3-libs=${DB3_WRKSRC} \ - --with-db3-includes=${DB3_WRKSRC} \ - --enable-nss=no \ - --enable-openssl=yes \ +USE_LIBTOOL_VER=15 +CONFIGURE_ARGS= --enable-nss=yes \ + --with-nss-includes=${LOCALBASE}/include/nss/nss \ + --with-nss-libs=${LOCALBASE}/lib \ + --with-nspr-includes=${LOCALBASE}/include/nspr \ + --with-nspr-libs=${LOCALBASE}/lib \ + --enable-openssl=no \ + --with-sub-version=" FreeBSD GNOME Team Port" \ --with-krb5=/usr -CONFIGURE_ENV= CPPFLAGS="-I${DB3_WRKSRC} -I${LOCALBASE}/include" \ - LIBS="${PTHREAD_LIBS}" -LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" -EVO_VERSION= 1.4 -PLIST_SUB= VERSION=${EVO_VERSION} -PKGINSTALL= ${WRKDIR}/pkg-install +GCONF_SCHEMAS= apps_evolution_addressbook-${EVO_VERSION}.schemas \ + apps_evolution_calendar-${EVO_VERSION}.schemas \ + apps_evolution_shell-${EVO_VERSION}.schemas \ + evolution-mail-${EVO_VERSION}.schemas + +EVO_VERSION= 2.0 +PLIST_SUB= VERSION=${EVO_VERSION} \ + PORTVERSION=2.0 OPTIONS= PILOT "Enable Palm Pilot sync support" off \ - LDAP "Enable LDAP support" on + LDAP "Enable LDAP support" on \ + SPAMASSASSIN "Enable SpamAssassin spam filtering" off .include <bsd.port.pre.mk> @@ -64,42 +68,13 @@ CONFIGURE_ARGS+=--with-openldap=${LOCALBASE} CONFIGURE_ARGS+=--with-openldap=no .endif -.if ${ARCH} == "amd64" -CONFIGURE_ARGS+=--with-pic +.if defined(WITH_SPAMASSASSIN) +RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin .endif -post-patch: - @${FIND} ${WRKSRC} -type f -name "*.[ch]" | ${XARGS} ${GREP} -l '<db.h>' | \ - ${XARGS} ${REINPLACE_CMD} -e 's|<db.h>|<db3/db.h>|g' - @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" ${DB3_WRKSRC}/${DB3_CONFIGURE_SCRIPT} - -# DB3 stuff. Ugly, I know, but that's life. -DB3_WRKSRC= ${WRKDIR}/db-3.1.17/build_unix -DB3_CONFIGURE_SCRIPT= ../dist/configure -DB3_CONFIGURE_ARGS= --enable-compat185 \ - --enable-dump185 --enable-cxx \ - --enable-static \ - --disable-dynamic \ - --prefix=${PREFIX} \ - --includedir=${PREFIX}/include/db3 \ - --target=${ARCH}-unknown-freebsd${OSREL} - -pre-configure: - @(cd ${DB3_WRKSRC} && \ - ${SETENV} CC="${CC}" CXX="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - ${DB3_CONFIGURE_ENV} ./${DB3_CONFIGURE_SCRIPT} ${DB3_CONFIGURE_ARGS}) - @(cd ${DB3_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) - @${RM} -f ${DB3_WRKSRC}/db3 - @${LN} -s . ${DB3_WRKSRC}/db3 -# End of the DB3 stuff - post-install: - @${FIND} ${PREFIX}/share/gnome/evolution/${EVO_VERSION}/default_user \ - -type f | ${XARGS} ${CHMOD} u+w + @${CHMOD} u+w ${PREFIX}/share/gnome/evolution/${EVO_VERSION}/default/C/mail/local/Inbox + @${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \ + ${PREFIX}/bin/evolution .include <bsd.port.post.mk> diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index 946bec833f3a..09c720548438 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,4 +1,2 @@ -MD5 (gnome2/evolution-1.4.6.tar.bz2) = 4138610c027177e6ffe92bdd565128a6 -SIZE (gnome2/evolution-1.4.6.tar.bz2) = 13927597 -MD5 (gnome2/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d -SIZE (gnome2/db-3.1.17.tar.bz2) = 1481866 +MD5 (gnome2/evolution-2.0.2.tar.bz2) = d3f12240ebb05dc6c984af68b5fe1955 +SIZE (gnome2/evolution-2.0.2.tar.bz2) = 15400311 diff --git a/mail/evolution/files/patch-..::db-3.1.17::dist::Makefile.in b/mail/evolution/files/patch-..::db-3.1.17::dist::Makefile.in deleted file mode 100644 index 8609f029b432..000000000000 --- a/mail/evolution/files/patch-..::db-3.1.17::dist::Makefile.in +++ /dev/null @@ -1,44 +0,0 @@ - -$FreeBSD$ - ---- ../db-3.1.17/dist/Makefile.in.orig Tue Jul 18 18:37:57 2000 -+++ ../db-3.1.17/dist/Makefile.in Fri Dec 14 16:49:51 2001 -@@ -34,11 +34,11 @@ - libdb= libdb.a - - libso_base= libdb --libso_linkname= $(libso_base)-$(SOVERSION).la --libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@ --libso_target= $(libso_base)-$(SOVERSION).la -+libso_linkname= $(libso_base)$(SOMAJOR).la -+libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@ -+libso_target= $(libso_base)$(SOMAJOR).la - libso_default= $(libso_base).@SOSUFFIX@ --libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@ -+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1 - - ################################################## - # C++ -@@ -49,10 +49,10 @@ - ################################################## - libcxx= libdb_cxx.a - libxso_base= libdb_cxx --libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@ --libxso_target= $(libxso_base)-$(SOVERSION).la -+libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@ -+libxso_target= $(libxso_base)$(SOMAJOR).la - libxso_default= $(libxso_base).@SOSUFFIX@ --libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@ -+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1 - - ################################################## - # JAVA -@@ -112,7 +112,7 @@ - bindir= @bindir@ - includedir=@includedir@ - libdir= @libdir@ --docdir= $(prefix)/docs -+docdir= $(prefix)/share/doc/db3 - - dmode= 755 - emode= 555 diff --git a/mail/evolution/files/patch-..::db-3.1.17::dist::ltmain.sh b/mail/evolution/files/patch-..::db-3.1.17::dist::ltmain.sh deleted file mode 100644 index 902d705c895b..000000000000 --- a/mail/evolution/files/patch-..::db-3.1.17::dist::ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ../db-3.1.17/dist/ltmain.sh.orig Sun Jul 30 20:45:53 2000 -+++ ../db-3.1.17/dist/ltmain.sh Fri Dec 14 19:32:11 2001 -@@ -2694,6 +2694,9 @@ - # Absolute path. - rpath="$rpath$dir:" - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" -@@ -3356,10 +3359,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa index 8bd2ee6f707c..eadafd8477d1 100644 --- a/mail/evolution/files/patch-aa +++ b/mail/evolution/files/patch-aa @@ -1,36 +1,14 @@ ---- configure.orig Fri Mar 12 02:06:47 2004 -+++ configure Fri Mar 12 02:28:50 2004 -@@ -10407,6 +10407,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/types.h> - #include <sys/socket.h> - socklen_t x; - -@@ -11519,7 +11520,7 @@ - CPPFLAGS="$DB3_CFLAGS $CPPFLAGS" - - --for ac_header in db.h db3/db.h -+for ac_header in db3/db.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then -@@ -11712,9 +11713,9 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: Found db.h is not version $evolution_db_version" >&5 --echo "$as_me: error: Found db.h is not version $evolution_db_version" >&2;} -- { (exit 1); exit 1; }; } -+#{ { echo "$as_me:$LINENO: error: Found db.h is not version $evolution_db_version" >&5 -+#echo "$as_me: error: Found db.h is not version $evolution_db_version" >&2;} -+# { (exit 1); exit 1; }; } - fi - rm -f conftest.$ac_objext conftest.$ac_ext - -@@ -13075,7 +13076,7 @@ +--- configure.orig Wed Sep 29 14:06:43 2004 ++++ configure Wed Sep 29 14:24:28 2004 +@@ -24206,6 +24206,7 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <netdb.h> ++ #include <stdio.h> + + + int +@@ -25772,7 +25773,7 @@ LDFLAGS_save="$LDFLAGS" mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" @@ -39,7 +17,7 @@ echo "$as_me:$LINENO: checking for Kerberos 5" >&5 echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 if test "${ac_cv_lib_kerberos5+set}" = set; then -@@ -13860,10 +13861,10 @@ +@@ -26928,10 +26929,10 @@ Example: --with-nspr-libs=/usr/lib" >&2;} { (exit 1); exit 1; }; } else @@ -52,7 +30,7 @@ fi echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5 -@@ -17387,7 +17388,7 @@ +@@ -30807,7 +30808,7 @@ idldir="$datadir/idl/evolution-$BASE_VERSION" diff --git a/mail/evolution/files/patch-addressbook_conduit_address-conduit.c b/mail/evolution/files/patch-addressbook_conduit_address-conduit.c deleted file mode 100644 index 7ace497e3a7c..000000000000 --- a/mail/evolution/files/patch-addressbook_conduit_address-conduit.c +++ /dev/null @@ -1,34 +0,0 @@ ---- addressbook/conduit/address-conduit.c.orig Tue Aug 26 19:45:53 2003 -+++ addressbook/conduit/address-conduit.c Fri Aug 6 12:19:52 2004 -@@ -610,6 +610,7 @@ - case E_CARD_SIMPLE_FIELD_EMAIL_2: - return E_CARD_SIMPLE_FIELD_EMAIL_3; - default: -+ break; - } - - return E_CARD_SIMPLE_FIELD_LAST; -@@ -625,6 +626,7 @@ - case E_CARD_SIMPLE_FIELD_PHONE_HOME: - return E_CARD_SIMPLE_FIELD_PHONE_HOME_2; - default: -+ break; - } - - return E_CARD_SIMPLE_FIELD_LAST; -@@ -640,6 +642,7 @@ - case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS: - return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2; - default: -+ break; - } - - return E_CARD_SIMPLE_FIELD_LAST; -@@ -657,6 +660,7 @@ - case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX: - return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX; - default: -+ break; - } - - return E_CARD_SIMPLE_FIELD_LAST; diff --git a/mail/evolution/files/patch-calendar_cal-client_cal-client.h b/mail/evolution/files/patch-calendar_cal-client_cal-client.h deleted file mode 100644 index 6ac301776c00..000000000000 --- a/mail/evolution/files/patch-calendar_cal-client_cal-client.h +++ /dev/null @@ -1,11 +0,0 @@ ---- calendar/cal-client/cal-client.h.orig Mon Aug 2 12:55:04 2004 -+++ calendar/cal-client/cal-client.h Mon Aug 2 12:57:11 2004 -@@ -213,7 +213,7 @@ - CalClientResult cal_client_remove_object (CalClient *client, const char *uid); - CalClientResult cal_client_remove_object_with_mod (CalClient *client, const char *uid, CalObjModType mod); - --CalClientSendResult cal_client_send_object (CalClient *client, icalcomponent *icalcomp, -+CalClientResult cal_client_send_object (CalClient *client, icalcomponent *icalcomp, - icalcomponent **new_icalcomp, GList **users, - char error_msg[256]); - diff --git a/mail/evolution/files/patch-calendar_gui_e-day-view.c b/mail/evolution/files/patch-calendar_gui_e-day-view.c deleted file mode 100644 index a3cff05c7893..000000000000 --- a/mail/evolution/files/patch-calendar_gui_e-day-view.c +++ /dev/null @@ -1,20 +0,0 @@ ---- calendar/gui/e-day-view.c.orig Mon Aug 2 13:04:10 2004 -+++ calendar/gui/e-day-view.c Mon Aug 2 13:04:59 2004 -@@ -3235,7 +3235,7 @@ - case GDK_SCROLL_DOWN: - e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE); - return TRUE; -- default: -+ default:; - } - - return FALSE; -@@ -3255,7 +3255,7 @@ - case GDK_SCROLL_DOWN: - e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE); - return TRUE; -- default: -+ default:; - } - - return FALSE; diff --git a/mail/evolution/files/patch-camel_Makefile.in b/mail/evolution/files/patch-camel_Makefile.in new file mode 100644 index 000000000000..a4250e85cbb3 --- /dev/null +++ b/mail/evolution/files/patch-camel_Makefile.in @@ -0,0 +1,11 @@ +--- camel/Makefile.in.orig Tue Dec 30 00:44:37 2003 ++++ camel/Makefile.in Tue Dec 30 00:44:45 2003 +@@ -221,7 +221,7 @@ + soundsdir = @soundsdir@ + viewsdir = @viewsdir@ + +-SUBDIRS = . providers tests ++SUBDIRS = . providers + + libcamelincludedir = $(privincludedir)/camel + diff --git a/mail/evolution/files/patch-camel_camel-mime-utils.c b/mail/evolution/files/patch-camel_camel-mime-utils.c new file mode 100644 index 000000000000..33111196a800 --- /dev/null +++ b/mail/evolution/files/patch-camel_camel-mime-utils.c @@ -0,0 +1,11 @@ +--- camel/camel-mime-utils.c.orig Fri May 3 15:47:41 2002 ++++ camel/camel-mime-utils.c Sun May 5 18:09:24 2002 +@@ -3388,6 +3388,8 @@ + } + d(printf("named offset = %d\n", offset)); + } ++ ++ tm.tm_isdst = -1; + + t = mktime(&tm); + #if defined(HAVE_TIMEZONE) diff --git a/mail/evolution/files/patch-e-util_e-component-listener.c b/mail/evolution/files/patch-e-util_e-component-listener.c deleted file mode 100644 index b8609f21896d..000000000000 --- a/mail/evolution/files/patch-e-util_e-component-listener.c +++ /dev/null @@ -1,11 +0,0 @@ ---- e-util/e-component-listener.c.orig Mon Aug 2 11:57:30 2004 -+++ e-util/e-component-listener.c Mon Aug 2 11:58:50 2004 -@@ -52,7 +52,7 @@ - cl->priv->component = CORBA_OBJECT_NIL; - g_object_unref (cl); - break; -- default : -+ default :; - } - } - } diff --git a/mail/evolution/files/patch-e-util_e-host-utils.c b/mail/evolution/files/patch-e-util_e-host-utils.c new file mode 100644 index 000000000000..3d92fc70fca2 --- /dev/null +++ b/mail/evolution/files/patch-e-util_e-host-utils.c @@ -0,0 +1,24 @@ +--- e-util/e-host-utils.c.orig Tue Apr 13 15:19:43 2004 ++++ e-util/e-host-utils.c Sun Oct 3 01:17:57 2004 +@@ -136,12 +136,21 @@ + case EAI_SERVICE: + return NO_DATA; + break; ++#ifdef EAI_ADDRFAMILY + case EAI_ADDRFAMILY: + return NO_ADDRESS; + break; ++#endif ++#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME + case EAI_NODATA: + return NO_DATA; + break; ++#endif ++#ifdef EAI_NOFAMILY ++ case EAI_NOFAMILY: ++ return NO_ADDRESS; ++ break; ++#endif + case EAI_MEMORY: + return ENOMEM; + break; diff --git a/mail/evolution/files/patch-e-util_e-msgport.c b/mail/evolution/files/patch-e-util_e-msgport.c new file mode 100644 index 000000000000..85bd48595b3d --- /dev/null +++ b/mail/evolution/files/patch-e-util_e-msgport.c @@ -0,0 +1,47 @@ +--- e-util/e-msgport.c.orig Wed Jan 14 00:04:04 2004 ++++ e-util/e-msgport.c Sun Sep 19 14:01:25 2004 +@@ -921,9 +921,13 @@ + void e_thread_put(EThread *e, EMsg *msg) + { + pthread_t id; ++ pthread_attr_t attr; + EMsg *dmsg = NULL; + + pthread_mutex_lock(&e->mutex); ++ pthread_attr_init(&attr); ++ /* Give us a 1 MB thread stack size. */ ++ pthread_attr_setstacksize(&attr, 0x100000); + + /* the caller forgot to tell us what to do, well, we can't do anything can we */ + if (e->received == NULL) { +@@ -962,13 +966,14 @@ + e_msgport_put(e->server_port, msg); + if (e->waiting == 0 + && g_list_length(e->id_list) < e->queue_limit +- && pthread_create(&id, NULL, thread_dispatch, e) == 0) { ++ && pthread_create(&id, &attr, thread_dispatch, e) == 0) { + struct _thread_info *info = g_malloc0(sizeof(*info)); + t(printf("created NEW thread %ld\n", id)); + info->id = id; + info->busy = TRUE; + e->id_list = g_list_append(e->id_list, info); + } ++ pthread_attr_destroy(&attr); + pthread_mutex_unlock(&e->mutex); + return; + } +@@ -977,12 +982,13 @@ + if (e->id == E_THREAD_NONE) { + int err; + +- if ((err = pthread_create(&e->id, NULL, thread_dispatch, e)) != 0) { ++ if ((err = pthread_create(&e->id, &attr, thread_dispatch, e)) != 0) { + g_warning("Could not create dispatcher thread, message queued?: %s", strerror(err)); + e->id = E_THREAD_NONE; + } + } + ++ pthread_attr_destroy(&attr); + pthread_mutex_unlock(&e->mutex); + + if (dmsg) { diff --git a/mail/evolution/files/patch-libical_src_libical_icaltime.c b/mail/evolution/files/patch-libical_src_libical_icaltime.c deleted file mode 100644 index 6f24e0f4cbf4..000000000000 --- a/mail/evolution/files/patch-libical_src_libical_icaltime.c +++ /dev/null @@ -1,106 +0,0 @@ ---- libical/src/libical/icaltime.c.orig Tue Aug 26 20:25:02 2003 -+++ libical/src/libical/icaltime.c Tue Aug 26 20:29:05 2003 -@@ -46,6 +46,76 @@ - - #include "icaltimezone.h" - -+static time_t make_time(struct tm *tm, int tzm) -+{ -+ time_t tim; -+ -+ static int days[] = { -1, 30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364 }; -+ -+ /* check that year specification within range */ -+ -+ if (tm->tm_year < 70 || tm->tm_year > 138) -+ return((time_t) -1); -+ -+ /* check that month specification within range */ -+ -+ if (tm->tm_mon < 0 || tm->tm_mon > 11) -+ return((time_t) -1); -+ -+ /* check for upper bound of Jan 17, 2038 (to avoid possibility of -+ 32-bit arithmetic overflow) */ -+ -+ if (tm->tm_year == 138) { -+ if (tm->tm_mon > 0) -+ return((time_t) -1); -+ else if (tm->tm_mday > 17) -+ return((time_t) -1); -+ } -+ -+ /* -+ * calculate elapsed days since start of the epoch (midnight Jan -+ * 1st, 1970 UTC) 17 = number of leap years between 1900 and 1970 -+ * (number of leap days to subtract) -+ */ -+ -+ tim = (tm->tm_year - 70) * 365 + ((tm->tm_year - 1) / 4) - 17; -+ -+ /* add number of days elapsed in the current year */ -+ -+ tim += days[tm->tm_mon]; -+ -+ /* check and adjust for leap years (the leap year check only valid -+ during the 32-bit era */ -+ -+ if ((tm->tm_year & 3) == 0 && tm->tm_mon > 1) -+ tim += 1; -+ -+ /* elapsed days to current date */ -+ -+ tim += tm->tm_mday; -+ -+ -+ /* calculate elapsed hours since start of the epoch */ -+ -+ tim = tim * 24 + tm->tm_hour; -+ -+ /* calculate elapsed minutes since start of the epoch */ -+ -+ tim = tim * 60 + tm->tm_min; -+ -+ /* adjust per time zone specification */ -+ -+ tim -= tzm; -+ -+ /* calculate elapsed seconds since start of the epoch */ -+ -+ tim = tim * 60 + tm->tm_sec; -+ -+ /* return number of seconds since start of the epoch */ -+ -+ return(tim); -+} -+ - - struct icaltimetype - icaltime_from_timet(time_t tm, int is_date) -@@ -221,13 +291,7 @@ - stm.tm_year = tt.year-1900; - stm.tm_isdst = -1; - -- if(tt.is_utc == 1 || tt.is_date == 1){ -- char *old_tz = set_tz("UTC"); -- t = mktime(&stm); -- unset_tz(old_tz); -- } else { -- t = mktime(&stm); -- } -+ t = make_time(&stm, 0); - - return t; - -@@ -269,10 +333,7 @@ - stm.tm_year = tt.year-1900; - stm.tm_isdst = -1; - -- /* Set TZ to UTC and use mktime to convert to a time_t. */ -- old_tz = set_tz ("UTC"); -- t = mktime (&stm); -- unset_tz (old_tz); -+ t = make_time(&stm, 0); - - return t; - } diff --git a/mail/evolution/files/patch-ltmain.sh b/mail/evolution/files/patch-ltmain.sh deleted file mode 100644 index bb660972a6d1..000000000000 --- a/mail/evolution/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Thu May 22 16:42:22 2003 -+++ ltmain.sh Tue May 27 12:12:52 2003 -@@ -1072,7 +1072,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1082,8 +1082,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2498,6 +2506,9 @@ - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4325,10 +4336,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h new file mode 100644 index 000000000000..b3e7b9ffbe25 --- /dev/null +++ b/mail/evolution/files/patch-mail_em-utils.h @@ -0,0 +1,10 @@ +--- mail/em-utils.h.orig Tue Aug 3 16:59:46 2004 ++++ mail/em-utils.h Tue Aug 3 17:00:04 2004 +@@ -23,6 +23,7 @@ + #ifndef __EM_UTILS_H__ + #define __EM_UTILS_H__ + ++#include <sys/types.h> + #include <glib.h> + + #ifdef __cplusplus diff --git a/mail/evolution/files/patch-mail_message-browser.c b/mail/evolution/files/patch-mail_message-browser.c deleted file mode 100644 index 56558473bcd9..000000000000 --- a/mail/evolution/files/patch-mail_message-browser.c +++ /dev/null @@ -1,11 +0,0 @@ ---- mail/message-browser.c.orig Mon Aug 2 13:11:44 2004 -+++ mail/message-browser.c Mon Aug 2 13:11:51 2004 -@@ -344,7 +344,7 @@ - case GDK_Escape: - message_browser_close (NULL, mb, NULL); - return TRUE; -- default: -+ default:; - } - - return FALSE; diff --git a/mail/evolution/files/patch-my-evolution::e-summary-preferences.c b/mail/evolution/files/patch-my-evolution::e-summary-preferences.c deleted file mode 100644 index e7f22e6e7845..000000000000 --- a/mail/evolution/files/patch-my-evolution::e-summary-preferences.c +++ /dev/null @@ -1,14 +0,0 @@ ---- my-evolution/e-summary-preferences.c.orig Thu Oct 24 18:14:17 2002 -+++ my-evolution/e-summary-preferences.c Sun Nov 24 01:23:59 2002 -@@ -581,8 +581,11 @@ - {"http://barrapunto.com/gnome.rdf", "Barrapunto GNOME", FALSE,}, - {"http://www.bsdtoday.com/backend/bt.rdf", "BSD Today", FALSE}, - {"http://beyond2000.com/b2k.rdf", "Beyond 2000", FALSE}, -+ {"http://daily.daemonnews.org/ddn.rdf.php3", "Daily Daemon News", FALSE}, - {"http://www.dictionary.com/wordoftheday/wotd.rss", N_("Dictionary.com Word of the Day"), FALSE}, - {"http://www.dvdreview.com/rss/newschannel.rss", "DVD Review", FALSE}, -+ {"http://www.freebsd.org/gnome/news.rdf", "FreeBSD GNOME Project News", FALSE}, -+ {"http://www.freebsd.org/news/news.rdf", "FreeBSD Newsflash", FALSE}, - {"http://freshmeat.net/backend/fm.rdf", "Freshmeat", FALSE}, - {"http://www.gnomedesktop.org/backend.php", "Footnotes - GNOME News", FALSE}, - {"http://headlines.internet.com/internetnews/prod-news/news.rss", "Internet.com", FALSE}, diff --git a/mail/evolution/files/patch-tools_Makefile.in b/mail/evolution/files/patch-tools_Makefile.in deleted file mode 100644 index 36504035faed..000000000000 --- a/mail/evolution/files/patch-tools_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/Makefile.in.orig Fri Mar 12 02:59:53 2004 -+++ tools/Makefile.in Fri Mar 12 03:00:37 2004 -@@ -267,7 +267,8 @@ - - - killev_LDADD = \ -- $(top_builddir)/e-util/libeutil.la -+ $(top_builddir)/e-util/libeutil.la \ -+ $(E_UTIL_LIBS) - - - CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES) diff --git a/mail/evolution/pkg-descr b/mail/evolution/pkg-descr index 5e9708594d54..47965256d100 100644 --- a/mail/evolution/pkg-descr +++ b/mail/evolution/pkg-descr @@ -1,11 +1,9 @@ Ximian Evolution[tm] is the premier personal and workgroup information -management solution for UNIX. The software seamlessly integrates email, -calendaring, meeting scheduling, contact management and online task lists in -one powerful, fast, and easy to use application. Ximian Evolution also -delivers a comprehensive set of features that help you keep your work -organized and your projects on track. Automatic email indexing keeps your -information at your fingertips. The unique Ximian vFolders[tm] are virtual -folders you use to create and save powerful contextual views of your email -messages. +management solution for UNIX. Evolution seamlessly integrates email, +calendaring, meeting scheduling, contact management and online task lists +in one powerful, fast, and easy to use application. It also delivers a +comprehensive set of features that help keep work organized and projects +on track. The unique Ximian vFolders[tm] are virtual folders used to +create and save powerful contextual views of email messages. WWW: http://www.ximian.com/products/ximian_evolution/ diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index e1b995077643..8e8ddd96d02d 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -1,30 +1,5 @@ bin/evolution bin/evolution-%%VERSION%% -bin/evolution-addressbook-export -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_evolution_addressbook.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_evolution_calendar.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_shell.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_evolution_shell.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_shell.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_summary.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_evolution_summary.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_summary.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/evolution-mail.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/evolution-mail.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/evolution-mail.schemas > /dev/null || /usr/bin/true -include/evolution-%%VERSION%%/cal-client/cal-client-multi.h -include/evolution-%%VERSION%%/cal-client/cal-client-types.h -include/evolution-%%VERSION%%/cal-client/cal-client.h -include/evolution-%%VERSION%%/cal-client/cal-query.h -include/evolution-%%VERSION%%/cal-client/evolution-calendar.h -include/evolution-%%VERSION%%/cal-util/cal-component.h -include/evolution-%%VERSION%%/cal-util/cal-recur.h -include/evolution-%%VERSION%%/cal-util/cal-util.h -include/evolution-%%VERSION%%/cal-util/timeutil.h include/evolution-%%VERSION%%/camel/broken-date-parser.h include/evolution-%%VERSION%%/camel/camel-address.h include/evolution-%%VERSION%%/camel/camel-arg.h @@ -32,9 +7,9 @@ include/evolution-%%VERSION%%/camel/camel-block-file.h include/evolution-%%VERSION%%/camel/camel-certdb.h include/evolution-%%VERSION%%/camel/camel-charset-map.h include/evolution-%%VERSION%%/camel/camel-cipher-context.h -include/evolution-%%VERSION%%/camel/camel-cms-context.h include/evolution-%%VERSION%%/camel/camel-data-cache.h include/evolution-%%VERSION%%/camel/camel-data-wrapper.h +include/evolution-%%VERSION%%/camel/camel-debug.h include/evolution-%%VERSION%%/camel/camel-digest-folder.h include/evolution-%%VERSION%%/camel/camel-digest-store.h include/evolution-%%VERSION%%/camel/camel-digest-summary.h @@ -65,7 +40,7 @@ include/evolution-%%VERSION%%/camel/camel-imap-utils.h include/evolution-%%VERSION%%/camel/camel-imap-wrapper.h include/evolution-%%VERSION%%/camel/camel-index.h include/evolution-%%VERSION%%/camel/camel-internet-address.h -include/evolution-%%VERSION%%/camel/camel-io.h +include/evolution-%%VERSION%%/camel/camel-junk-plugin.h include/evolution-%%VERSION%%/camel/camel-local-folder.h include/evolution-%%VERSION%%/camel/camel-local-store.h include/evolution-%%VERSION%%/camel/camel-local-summary.h @@ -88,11 +63,14 @@ include/evolution-%%VERSION%%/camel/camel-mime-filter-charset.h include/evolution-%%VERSION%%/camel/camel-mime-filter-crlf.h include/evolution-%%VERSION%%/camel/camel-mime-filter-enriched.h include/evolution-%%VERSION%%/camel/camel-mime-filter-from.h +include/evolution-%%VERSION%%/camel/camel-mime-filter-gzip.h include/evolution-%%VERSION%%/camel/camel-mime-filter-html.h include/evolution-%%VERSION%%/camel/camel-mime-filter-index.h include/evolution-%%VERSION%%/camel/camel-mime-filter-linewrap.h include/evolution-%%VERSION%%/camel/camel-mime-filter-save.h include/evolution-%%VERSION%%/camel/camel-mime-filter-tohtml.h +include/evolution-%%VERSION%%/camel/camel-mime-filter-windows.h +include/evolution-%%VERSION%%/camel/camel-mime-filter-yenc.h include/evolution-%%VERSION%%/camel/camel-mime-filter.h include/evolution-%%VERSION%%/camel/camel-mime-message.h include/evolution-%%VERSION%%/camel/camel-mime-parser.h @@ -103,10 +81,15 @@ include/evolution-%%VERSION%%/camel/camel-movemail.h include/evolution-%%VERSION%%/camel/camel-multipart-encrypted.h include/evolution-%%VERSION%%/camel/camel-multipart-signed.h include/evolution-%%VERSION%%/camel/camel-multipart.h +include/evolution-%%VERSION%%/camel/camel-nntp-folder.h +include/evolution-%%VERSION%%/camel/camel-nntp-resp-codes.h +include/evolution-%%VERSION%%/camel/camel-nntp-store-summary.h +include/evolution-%%VERSION%%/camel/camel-nntp-store.h +include/evolution-%%VERSION%%/camel/camel-nntp-stream.h +include/evolution-%%VERSION%%/camel/camel-nntp-summary.h include/evolution-%%VERSION%%/camel/camel-object.h include/evolution-%%VERSION%%/camel/camel-operation.h include/evolution-%%VERSION%%/camel/camel-partition-table.h -include/evolution-%%VERSION%%/camel/camel-pgp-mime.h include/evolution-%%VERSION%%/camel/camel-pop3-engine.h include/evolution-%%VERSION%%/camel/camel-pop3-folder.h include/evolution-%%VERSION%%/camel/camel-pop3-store.h @@ -128,7 +111,6 @@ include/evolution-%%VERSION%%/camel/camel-sendmail-transport.h include/evolution-%%VERSION%%/camel/camel-service.h include/evolution-%%VERSION%%/camel/camel-session.h include/evolution-%%VERSION%%/camel/camel-smime-context.h -include/evolution-%%VERSION%%/camel/camel-smime-utils.h include/evolution-%%VERSION%%/camel/camel-smtp-transport.h include/evolution-%%VERSION%%/camel/camel-spool-folder.h include/evolution-%%VERSION%%/camel/camel-spool-store.h @@ -140,7 +122,9 @@ include/evolution-%%VERSION%%/camel/camel-stream-filter.h include/evolution-%%VERSION%%/camel/camel-stream-fs.h include/evolution-%%VERSION%%/camel/camel-stream-mem.h include/evolution-%%VERSION%%/camel/camel-stream-null.h +include/evolution-%%VERSION%%/camel/camel-stream-process.h include/evolution-%%VERSION%%/camel/camel-stream.h +include/evolution-%%VERSION%%/camel/camel-string-utils.h include/evolution-%%VERSION%%/camel/camel-tcp-stream-raw.h include/evolution-%%VERSION%%/camel/camel-tcp-stream-ssl.h include/evolution-%%VERSION%%/camel/camel-tcp-stream.h @@ -155,14 +139,11 @@ include/evolution-%%VERSION%%/camel/camel-vee-folder.h include/evolution-%%VERSION%%/camel/camel-vee-store.h include/evolution-%%VERSION%%/camel/camel-vtrash-folder.h include/evolution-%%VERSION%%/camel/camel.h -include/evolution-%%VERSION%%/camel/string-utils.h include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h -include/evolution-%%VERSION%%/e-conduit/e-pilot-settings.h include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h -include/evolution-%%VERSION%%/e-db3util/e-db3-utils.h -include/evolution-%%VERSION%%/e-db3util/e-dbhash.h include/evolution-%%VERSION%%/e-util/e-account-list.h include/evolution-%%VERSION%%/e-util/e-account.h +include/evolution-%%VERSION%%/e-util/e-bconf-map.h include/evolution-%%VERSION%%/e-util/e-categories-config.h include/evolution-%%VERSION%%/e-util/e-categories-master-list-wombat.h include/evolution-%%VERSION%%/e-util/e-component-listener.h @@ -170,107 +151,77 @@ include/evolution-%%VERSION%%/e-util/e-config-listener.h include/evolution-%%VERSION%%/e-util/e-corba-utils.h include/evolution-%%VERSION%%/e-util/e-dialog-utils.h include/evolution-%%VERSION%%/e-util/e-dialog-widgets.h +include/evolution-%%VERSION%%/e-util/e-folder-map.h +include/evolution-%%VERSION%%/e-util/e-fsutils.h include/evolution-%%VERSION%%/e-util/e-gtk-utils.h include/evolution-%%VERSION%%/e-util/e-gui-utils.h include/evolution-%%VERSION%%/e-util/e-host-utils.h include/evolution-%%VERSION%%/e-util/e-html-utils.h +include/evolution-%%VERSION%%/e-util/e-icon-factory.h include/evolution-%%VERSION%%/e-util/e-iterator.h -include/evolution-%%VERSION%%/e-util/e-lang-utils.h include/evolution-%%VERSION%%/e-util/e-list-iterator.h include/evolution-%%VERSION%%/e-util/e-list.h include/evolution-%%VERSION%%/e-util/e-memory.h -include/evolution-%%VERSION%%/e-util/e-meta.h include/evolution-%%VERSION%%/e-util/e-mktemp.h include/evolution-%%VERSION%%/e-util/e-msgport.h include/evolution-%%VERSION%%/e-util/e-passwords.h include/evolution-%%VERSION%%/e-util/e-path.h -include/evolution-%%VERSION%%/e-util/e-proxy.h include/evolution-%%VERSION%%/e-util/e-request.h include/evolution-%%VERSION%%/e-util/e-sexp.h +include/evolution-%%VERSION%%/e-util/e-signature-list.h +include/evolution-%%VERSION%%/e-util/e-signature.h include/evolution-%%VERSION%%/e-util/e-time-utils.h include/evolution-%%VERSION%%/e-util/e-trie.h +include/evolution-%%VERSION%%/e-util/e-uid.h include/evolution-%%VERSION%%/e-util/e-url.h -include/evolution-%%VERSION%%/e-util/e-xml-hash-utils.h include/evolution-%%VERSION%%/e-util/md5-utils.h -include/evolution-%%VERSION%%/ebook/addressbook.h -include/evolution-%%VERSION%%/ebook/e-book-listener.h -include/evolution-%%VERSION%%/ebook/e-book-types.h -include/evolution-%%VERSION%%/ebook/e-book-util.h -include/evolution-%%VERSION%%/ebook/e-book-view-listener.h -include/evolution-%%VERSION%%/ebook/e-book-view.h -include/evolution-%%VERSION%%/ebook/e-book.h -include/evolution-%%VERSION%%/ebook/e-card-compare.h -include/evolution-%%VERSION%%/ebook/e-card-cursor.h -include/evolution-%%VERSION%%/ebook/e-card-simple.h -include/evolution-%%VERSION%%/ebook/e-card-types.h -include/evolution-%%VERSION%%/ebook/e-card.h -include/evolution-%%VERSION%%/ebook/e-destination.h -include/evolution-%%VERSION%%/ename/e-address-western.h -include/evolution-%%VERSION%%/ename/e-name-western-tables.h -include/evolution-%%VERSION%%/ename/e-name-western.h -include/evolution-%%VERSION%%/ical.h include/evolution-%%VERSION%%/importer/GNOME_Evolution_Importer.h include/evolution-%%VERSION%%/importer/evolution-importer-client.h include/evolution-%%VERSION%%/importer/evolution-importer-listener.h include/evolution-%%VERSION%%/importer/evolution-importer.h include/evolution-%%VERSION%%/importer/evolution-intelligent-importer.h -include/evolution-%%VERSION%%/pas/addressbook.h -include/evolution-%%VERSION%%/pas/pas-backend-card-sexp.h -include/evolution-%%VERSION%%/pas/pas-backend-summary.h -include/evolution-%%VERSION%%/pas/pas-backend.h -include/evolution-%%VERSION%%/pas/pas-book-factory.h -include/evolution-%%VERSION%%/pas/pas-book-view.h -include/evolution-%%VERSION%%/pas/pas-book.h -include/evolution-%%VERSION%%/pas/pas-card-cursor.h -include/evolution-%%VERSION%%/pcs/cal-backend-util.h -include/evolution-%%VERSION%%/pcs/cal-backend.h -include/evolution-%%VERSION%%/pcs/cal-common.h -include/evolution-%%VERSION%%/pcs/cal-factory.h -include/evolution-%%VERSION%%/pcs/cal.h -include/evolution-%%VERSION%%/pcs/evolution-calendar.h -include/evolution-%%VERSION%%/pcs/job.h -include/evolution-%%VERSION%%/pcs/query-backend.h -include/evolution-%%VERSION%%/pcs/query.h include/evolution-%%VERSION%%/shell/Evolution.h -include/evolution-%%VERSION%%/shell/e-folder-list.h -include/evolution-%%VERSION%%/shell/e-folder-tree.h -include/evolution-%%VERSION%%/shell/e-folder.h include/evolution-%%VERSION%%/shell/e-shell-corba-icon-utils.h -include/evolution-%%VERSION%%/shell/evolution-activity-client.h +include/evolution-%%VERSION%%/shell/e-shell-utils.h +include/evolution-%%VERSION%%/shell/e-user-creatable-items-handler.h include/evolution-%%VERSION%%/shell/evolution-config-control.h -include/evolution-%%VERSION%%/shell/evolution-folder-selector-button.h -include/evolution-%%VERSION%%/shell/evolution-session.h -include/evolution-%%VERSION%%/shell/evolution-shell-client.h -include/evolution-%%VERSION%%/shell/evolution-shell-component-client.h -include/evolution-%%VERSION%%/shell/evolution-shell-component-dnd.h include/evolution-%%VERSION%%/shell/evolution-shell-component-utils.h -include/evolution-%%VERSION%%/shell/evolution-shell-component.h -include/evolution-%%VERSION%%/shell/evolution-shell-view.h -include/evolution-%%VERSION%%/shell/evolution-storage-listener.h -include/evolution-%%VERSION%%/shell/evolution-storage-set-view-listener.h -include/evolution-%%VERSION%%/shell/evolution-storage.h include/evolution-%%VERSION%%/shell/evolution-wizard.h +include/evolution-%%VERSION%%/widgets/e-activity-handler.h include/evolution-%%VERSION%%/widgets/e-calendar-item.h include/evolution-%%VERSION%%/widgets/e-calendar.h include/evolution-%%VERSION%%/widgets/e-cell-date-edit.h include/evolution-%%VERSION%%/widgets/e-cell-percent.h +include/evolution-%%VERSION%%/widgets/e-cell-renderer-combo.h include/evolution-%%VERSION%%/widgets/e-charset-picker.h include/evolution-%%VERSION%%/widgets/e-clipped-label.h include/evolution-%%VERSION%%/widgets/e-combo-button.h +include/evolution-%%VERSION%%/widgets/e-combo-cell-editable.h include/evolution-%%VERSION%%/widgets/e-config-page.h include/evolution-%%VERSION%%/widgets/e-dateedit.h include/evolution-%%VERSION%%/widgets/e-dropdown-button.h +include/evolution-%%VERSION%%/widgets/e-error.h +include/evolution-%%VERSION%%/widgets/e-expander.h +include/evolution-%%VERSION%%/widgets/e-image-chooser.h +include/evolution-%%VERSION%%/widgets/e-info-label.h include/evolution-%%VERSION%%/widgets/e-map.h -include/evolution-%%VERSION%%/widgets/e-messagebox.h include/evolution-%%VERSION%%/widgets/e-multi-config-dialog.h +%%PILOT:%%include/evolution-%%VERSION%%/widgets/e-pilot-settings.h include/evolution-%%VERSION%%/widgets/e-search-bar.h +include/evolution-%%VERSION%%/widgets/e-source-option-menu.h +include/evolution-%%VERSION%%/widgets/e-source-selector.h +include/evolution-%%VERSION%%/widgets/e-task-bar.h +include/evolution-%%VERSION%%/widgets/e-task-widget.h include/evolution-%%VERSION%%/widgets/e-title-bar.h include/evolution-%%VERSION%%/widgets/e-url-entry.h -include/evolution-%%VERSION%%/wombat/wombat-client.h +lib/evolution/%%VERSION%%/camel-providers/libcamelgroupwise.so +lib/evolution/%%VERSION%%/camel-providers/libcamelgroupwise.urls lib/evolution/%%VERSION%%/camel-providers/libcamelimap.so lib/evolution/%%VERSION%%/camel-providers/libcamelimap.urls lib/evolution/%%VERSION%%/camel-providers/libcamellocal.so lib/evolution/%%VERSION%%/camel-providers/libcamellocal.urls +lib/evolution/%%VERSION%%/camel-providers/libcamelnntp.so +lib/evolution/%%VERSION%%/camel-providers/libcamelnntp.urls lib/evolution/%%VERSION%%/camel-providers/libcamelpop3.so lib/evolution/%%VERSION%%/camel-providers/libcamelpop3.urls lib/evolution/%%VERSION%%/camel-providers/libcamelsendmail.so @@ -279,394 +230,134 @@ lib/evolution/%%VERSION%%/camel-providers/libcamelsmtp.so lib/evolution/%%VERSION%%/camel-providers/libcamelsmtp.urls lib/evolution/%%VERSION%%/components/libevolution-addressbook.so lib/evolution/%%VERSION%%/components/libevolution-calendar.so -lib/evolution/%%VERSION%%/components/libevolution-executive-summary.so lib/evolution/%%VERSION%%/components/libevolution-mail.so +%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so +%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so +%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.so +lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-ldif-importer.so +lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-vcard-importer.so lib/evolution/%%VERSION%%/evolution-calendar-importers/libevolution-calendar-importers.so -lib/evolution/%%VERSION%%/evolution-mail-importers/libevolution-elm-importer.so -lib/evolution/%%VERSION%%/evolution-mail-importers/libevolution-netscape-importer.so -lib/evolution/%%VERSION%%/evolution-mail-importers/libevolution-pine-importer.so -lib/evolution/%%VERSION%%/evolution-mail-importers/libmbox.so -lib/evolution/%%VERSION%%/evolution-mail-importers/liboutlook.so -lib/evolution/%%VERSION%%/libcal-client.a -lib/evolution/%%VERSION%%/libcal-client.so -lib/evolution/%%VERSION%%/libcal-client.so.0 -lib/evolution/%%VERSION%%/libcal-util-static.a -lib/evolution/%%VERSION%%/libcal-util.a -lib/evolution/%%VERSION%%/libcal-util.so -lib/evolution/%%VERSION%%/libcal-util.so.0 lib/evolution/%%VERSION%%/libcamel.a lib/evolution/%%VERSION%%/libcamel.so lib/evolution/%%VERSION%%/libcamel.so.0 -lib/evolution/%%VERSION%%/libebook-static.a -lib/evolution/%%VERSION%%/libebook.a -lib/evolution/%%VERSION%%/libebook.so -lib/evolution/%%VERSION%%/libebook.so.0 lib/evolution/%%VERSION%%/libeconduit.a lib/evolution/%%VERSION%%/libeconduit.so lib/evolution/%%VERSION%%/libeconduit.so.0 -lib/evolution/%%VERSION%%/libedb3util.a -lib/evolution/%%VERSION%%/libedb3util.so -lib/evolution/%%VERSION%%/libedb3util.so.0 lib/evolution/%%VERSION%%/libemiscwidgets.a lib/evolution/%%VERSION%%/libemiscwidgets.so lib/evolution/%%VERSION%%/libemiscwidgets.so.0 -lib/evolution/%%VERSION%%/libename.a -lib/evolution/%%VERSION%%/libename.so -lib/evolution/%%VERSION%%/libename.so.0 +lib/evolution/%%VERSION%%/libeselectnames.a +lib/evolution/%%VERSION%%/libeselectnames.so +lib/evolution/%%VERSION%%/libeselectnames.so.0 lib/evolution/%%VERSION%%/libeshell.a lib/evolution/%%VERSION%%/libeshell.so lib/evolution/%%VERSION%%/libeshell.so.0 -lib/evolution/%%VERSION%%/libetimezonedialog.a -lib/evolution/%%VERSION%%/libetimezonedialog.so -lib/evolution/%%VERSION%%/libetimezonedialog.so.0 lib/evolution/%%VERSION%%/libeutil.a lib/evolution/%%VERSION%%/libeutil.so lib/evolution/%%VERSION%%/libeutil.so.0 +lib/evolution/%%VERSION%%/libevolution-a11y.a +lib/evolution/%%VERSION%%/libevolution-a11y.so +lib/evolution/%%VERSION%%/libevolution-a11y.so.0 +lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.a +lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so +lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so.0 +lib/evolution/%%VERSION%%/libevolution-calendar-a11y.a +lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so +lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so.0 lib/evolution/%%VERSION%%/libevolution-importer.a lib/evolution/%%VERSION%%/libevolution-importer.so lib/evolution/%%VERSION%%/libevolution-importer.so.0 -lib/evolution/%%VERSION%%/libical-evolution.a -lib/evolution/%%VERSION%%/libical-evolution.so -lib/evolution/%%VERSION%%/libical-evolution.so.0 -lib/evolution/%%VERSION%%/libicalvcal-evolution.a -lib/evolution/%%VERSION%%/libicalvcal-evolution.so -lib/evolution/%%VERSION%%/libicalvcal-evolution.so.0 -lib/evolution/%%VERSION%%/libmenus.a -lib/evolution/%%VERSION%%/libmenus.so -lib/evolution/%%VERSION%%/libmenus.so.0 -lib/evolution/%%VERSION%%/libpas.a -lib/evolution/%%VERSION%%/libpcs.a -lib/evolution/%%VERSION%%/libversit.a -lib/evolution/%%VERSION%%/libversit.so -lib/evolution/%%VERSION%%/libversit.so.0 -lib/evolution/%%VERSION%%/libwombat.a -lib/evolution/%%VERSION%%/libwombat.so -lib/evolution/%%VERSION%%/libwombat.so.0 -%%PILOT:%%lib/gnome-pilot/conduits/libeaddress_conduit.so -%%PILOT:%%lib/gnome-pilot/conduits/libecalendar_conduit.so -%%PILOT:%%lib/gnome-pilot/conduits/libetodo_conduit.so -libdata/bonobo/servers/GNOME_Evolution_Addressbook.server -libdata/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer.server -libdata/bonobo/servers/GNOME_Evolution_Addressbook_SelectNames.server -libdata/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer.server -libdata/bonobo/servers/GNOME_Evolution_Calendar.server -libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server -libdata/bonobo/servers/GNOME_Evolution_Calendar_Importer.server -libdata/bonobo/servers/GNOME_Evolution_Mail.server -libdata/bonobo/servers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server -libdata/bonobo/servers/GNOME_Evolution_Mail_Mbox_Importer.server -libdata/bonobo/servers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server -libdata/bonobo/servers/GNOME_Evolution_Mail_Outlook_Importer.server -libdata/bonobo/servers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server -libdata/bonobo/servers/GNOME_Evolution_Shell.server -libdata/bonobo/servers/GNOME_Evolution_Summary.server -libdata/bonobo/servers/GNOME_Evolution_Wombat.server -libdata/pkgconfig/camel.pc -libdata/pkgconfig/evolution-addressbook.pc -libdata/pkgconfig/evolution-calendar.pc -libdata/pkgconfig/evolution-shell.pc +lib/evolution/%%VERSION%%/libevolution-mail-importers.a +lib/evolution/%%VERSION%%/libevolution-mail-importers.so +lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0 +lib/evolution/%%VERSION%%/libevolution-widgets-a11y.a +lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so +lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0 +libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server +libdata/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_%%VERSION%%.server +libdata/bonobo/servers/GNOME_Evolution_Addressbook_SelectNames_%%VERSION%%.server +libdata/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_%%VERSION%%.server +libdata/bonobo/servers/GNOME_Evolution_Calendar_%%VERSION%%.server +libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%%VERSION%%.server +libdata/bonobo/servers/GNOME_Evolution_Calendar_Importer_%%VERSION%%.server +libdata/bonobo/servers/GNOME_Evolution_Mail_%%VERSION%%.server +libdata/bonobo/servers/GNOME_Evolution_Mail_Importers_%%VERSION%%.server +libdata/bonobo/servers/GNOME_Evolution_Shell_%%VERSION%%.server +libdata/pkgconfig/camel-%%VERSION%%.pc +libdata/pkgconfig/evolution-shell-%%VERSION%%.pc libexec/evolution/%%VERSION%%/camel/camel-index-control libexec/evolution/%%VERSION%%/camel/camel-lock-helper libexec/evolution/%%VERSION%%/csv2vcard libexec/evolution/%%VERSION%%/evolution-addressbook-clean -libexec/evolution/%%VERSION%%/evolution-addressbook-import +libexec/evolution/%%VERSION%%/evolution-addressbook-export libexec/evolution/%%VERSION%%/evolution-alarm-notify -libexec/evolution/%%VERSION%%/evolution-ldif-importer -libexec/evolution/%%VERSION%%/evolution-vcard-importer -libexec/evolution/%%VERSION%%/evolution-wombat libexec/evolution/%%VERSION%%/killev -libexec/evolution/%%VERSION%%/load-gnomecard-addressbook -libexec/evolution/%%VERSION%%/load-pine-addressbook -share/gnome/applications/evolution.desktop -share/gnome/evolution/%%VERSION%%/Locations +share/gnome/applications/evolution-%%VERSION%%.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/evolution/%%VERSION%%/addresstypes.xml -share/gnome/evolution/%%VERSION%%/default_user/addressbook-sources.xml -share/gnome/evolution/%%VERSION%%/default_user/local/Calendar/calendar.ics -share/gnome/evolution/%%VERSION%%/default_user/local/Calendar/folder-metadata.xml -share/gnome/evolution/%%VERSION%%/default_user/local/Contacts/create-initial -share/gnome/evolution/%%VERSION%%/default_user/local/Contacts/folder-metadata.xml -share/gnome/evolution/%%VERSION%%/default_user/local/Drafts/folder-metadata.xml -share/gnome/evolution/%%VERSION%%/default_user/local/Drafts/mbox -share/gnome/evolution/%%VERSION%%/default_user/local/Inbox/folder-metadata.xml -share/gnome/evolution/%%VERSION%%/default_user/local/Inbox/mbox -share/gnome/evolution/%%VERSION%%/default_user/local/Outbox/folder-metadata.xml -share/gnome/evolution/%%VERSION%%/default_user/local/Outbox/mbox -share/gnome/evolution/%%VERSION%%/default_user/local/Sent/folder-metadata.xml -share/gnome/evolution/%%VERSION%%/default_user/local/Sent/mbox -share/gnome/evolution/%%VERSION%%/default_user/local/Tasks/folder-metadata.xml -share/gnome/evolution/%%VERSION%%/default_user/local/Tasks/tasks.ics -share/gnome/evolution/%%VERSION%%/default_user/local/Trash/folder-metadata.xml -share/gnome/evolution/%%VERSION%%/default_user/searches.xml -share/gnome/evolution/%%VERSION%%/default_user/vfolders.xml +share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox share/gnome/evolution/%%VERSION%%/ecps/medbook.ecps share/gnome/evolution/%%VERSION%%/ecps/phonelist.ecps share/gnome/evolution/%%VERSION%%/ecps/smallbook.ecps +share/gnome/evolution/%%VERSION%%/errors/addressbook-errors.xml +share/gnome/evolution/%%VERSION%%/errors/calendar-errors.xml +share/gnome/evolution/%%VERSION%%/errors/e-system-errors.xml +share/gnome/evolution/%%VERSION%%/errors/filter-errors.xml +share/gnome/evolution/%%VERSION%%/errors/mail-composer-errors.xml +share/gnome/evolution/%%VERSION%%/errors/mail-errors.xml +share/gnome/evolution/%%VERSION%%/errors/shell-errors.xml share/gnome/evolution/%%VERSION%%/etspec/e-addressbook-view.etspec +share/gnome/evolution/%%VERSION%%/etspec/e-cal-list-view.etspec share/gnome/evolution/%%VERSION%%/etspec/e-calendar-table.etspec share/gnome/evolution/%%VERSION%%/etspec/e-contact-list-editor.etspec share/gnome/evolution/%%VERSION%%/etspec/e-meeting-time-sel.etspec -share/gnome/evolution/%%VERSION%%/etspec/e-select-names.etspec share/gnome/evolution/%%VERSION%%/etspec/e-select-names-section.etspec -share/gnome/evolution/%%VERSION%%/etspec/e-storage-set-view.etspec -share/gnome/evolution/%%VERSION%%/etspec/mail-accounts.etspec -share/gnome/evolution/%%VERSION%%/etspec/meeting-page.etspec +share/gnome/evolution/%%VERSION%%/etspec/e-select-names.etspec share/gnome/evolution/%%VERSION%%/etspec/message-list.etspec -share/gnome/evolution/%%VERSION%%/etspec/subscribe-dialog.etspec -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/share/gnome/evolution/%%VERSION%%/evolutionperson.schema > /dev/null || /usr/bin/true -share/gnome/evolution/%%VERSION%%/evolutionperson.schema -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/share/gnome/evolution/%%VERSION%%/evolutionperson.schema > /dev/null || /usr/bin/true share/gnome/evolution/%%VERSION%%/filtertypes.xml +share/gnome/evolution/%%VERSION%%/glade/alarm-dialog.glade +share/gnome/evolution/%%VERSION%%/glade/alarm-list-dialog.glade share/gnome/evolution/%%VERSION%%/glade/alarm-notify.glade -share/gnome/evolution/%%VERSION%%/glade/alarm-options.glade -share/gnome/evolution/%%VERSION%%/glade/alarm-page.glade share/gnome/evolution/%%VERSION%%/glade/cal-prefs-dialog.glade +share/gnome/evolution/%%VERSION%%/glade/calendar-setup.glade share/gnome/evolution/%%VERSION%%/glade/contact-editor.glade share/gnome/evolution/%%VERSION%%/glade/contact-list-editor.glade share/gnome/evolution/%%VERSION%%/glade/e-active-connection-dialog.glade -share/gnome/evolution/%%VERSION%%/glade/e-card-duplicate-detected.glade -share/gnome/evolution/%%VERSION%%/glade/e-card-merging-book-commit-duplicate-detected.glade share/gnome/evolution/%%VERSION%%/glade/e-contact-print.glade share/gnome/evolution/%%VERSION%%/glade/e-delegate-dialog.glade -share/gnome/evolution/%%VERSION%%/glade/e-folder-list.glade share/gnome/evolution/%%VERSION%%/glade/e-itip-control.glade share/gnome/evolution/%%VERSION%%/glade/e-msg-composer-attachment.glade -share/gnome/evolution/%%VERSION%%/glade/e-shell-config-default-folders.glade -share/gnome/evolution/%%VERSION%%/glade/e-shell-folder-creation-dialog.glade -share/gnome/evolution/%%VERSION%%/glade/e-shell-shared-folder-picker-dialog.glade share/gnome/evolution/%%VERSION%%/glade/e-timezone-dialog.glade +share/gnome/evolution/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade +share/gnome/evolution/%%VERSION%%/glade/eab-contact-duplicate-detected.glade share/gnome/evolution/%%VERSION%%/glade/event-page.glade share/gnome/evolution/%%VERSION%%/glade/evolution-startup-wizard.glade -share/gnome/evolution/%%VERSION%%/glade/evolution.png share/gnome/evolution/%%VERSION%%/glade/filter.glade -share/gnome/evolution/%%VERSION%%/glade/flag-for-followup-48.png share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade share/gnome/evolution/%%VERSION%%/glade/fullname.glade share/gnome/evolution/%%VERSION%%/glade/goto-dialog.glade +share/gnome/evolution/%%VERSION%%/glade/im.glade share/gnome/evolution/%%VERSION%%/glade/import.glade -share/gnome/evolution/%%VERSION%%/glade/import.png share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade -share/gnome/evolution/%%VERSION%%/glade/local-config.glade -share/gnome/evolution/%%VERSION%%/glade/mail-config-druid-account-name.png -share/gnome/evolution/%%VERSION%%/glade/mail-config-druid-identity.png -share/gnome/evolution/%%VERSION%%/glade/mail-config-druid-receive.png -share/gnome/evolution/%%VERSION%%/glade/mail-config-druid-send.png -share/gnome/evolution/%%VERSION%%/glade/mail-config-druid.png share/gnome/evolution/%%VERSION%%/glade/mail-config.glade +share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade -share/gnome/evolution/%%VERSION%%/glade/message-tags.glade -share/gnome/evolution/%%VERSION%%/glade/my-evolution.glade share/gnome/evolution/%%VERSION%%/glade/recurrence-page.glade share/gnome/evolution/%%VERSION%%/glade/schedule-page.glade share/gnome/evolution/%%VERSION%%/glade/select-names.glade -share/gnome/evolution/%%VERSION%%/glade/subscribe-dialog.glade +share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade share/gnome/evolution/%%VERSION%%/glade/task-page.glade -share/gnome/evolution/%%VERSION%%/glade/thankyou.png -share/gnome/evolution/%%VERSION%%/glade/timezone-48.png -share/gnome/evolution/%%VERSION%%/images/16_copy.png -share/gnome/evolution/%%VERSION%%/images/16_customize.png -share/gnome/evolution/%%VERSION%%/images/16_cut.png -share/gnome/evolution/%%VERSION%%/images/16_paste.png +share/gnome/evolution/%%VERSION%%/glade/url-editor-dialog.glade +share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf share/gnome/evolution/%%VERSION%%/images/about-box.png -share/gnome/evolution/%%VERSION%%/images/alarm.png -share/gnome/evolution/%%VERSION%%/images/all_contacts.xpm -share/gnome/evolution/%%VERSION%%/images/apply-filters-16.xpm share/gnome/evolution/%%VERSION%%/images/bcg.png -share/gnome/evolution/%%VERSION%%/images/briefcase.png -share/gnome/evolution/%%VERSION%%/images/butterfly.png -share/gnome/evolution/%%VERSION%%/images/buttons/add-attachment.png -share/gnome/evolution/%%VERSION%%/images/buttons/add-service.png -share/gnome/evolution/%%VERSION%%/images/buttons/arrow-left-24.png -share/gnome/evolution/%%VERSION%%/images/buttons/arrow-right-24.png -share/gnome/evolution/%%VERSION%%/images/buttons/compose-message.png -share/gnome/evolution/%%VERSION%%/images/buttons/copy-message.png -share/gnome/evolution/%%VERSION%%/images/buttons/copy.png -share/gnome/evolution/%%VERSION%%/images/buttons/cut.png -share/gnome/evolution/%%VERSION%%/images/buttons/dayview.xpm -share/gnome/evolution/%%VERSION%%/images/buttons/delete-message.png -share/gnome/evolution/%%VERSION%%/images/buttons/fetch-mail.png -share/gnome/evolution/%%VERSION%%/images/buttons/forward.png -share/gnome/evolution/%%VERSION%%/images/buttons/goto-24.png -share/gnome/evolution/%%VERSION%%/images/buttons/monthview.xpm -share/gnome/evolution/%%VERSION%%/images/buttons/move-message.png -share/gnome/evolution/%%VERSION%%/images/buttons/new_appointment.png -share/gnome/evolution/%%VERSION%%/images/buttons/new_task.png -share/gnome/evolution/%%VERSION%%/images/buttons/next-message.png -share/gnome/evolution/%%VERSION%%/images/buttons/paste.png -share/gnome/evolution/%%VERSION%%/images/buttons/previous-message.png -share/gnome/evolution/%%VERSION%%/images/buttons/print-preview-24.png -share/gnome/evolution/%%VERSION%%/images/buttons/print.png -share/gnome/evolution/%%VERSION%%/images/buttons/receive-24.png -share/gnome/evolution/%%VERSION%%/images/buttons/reply-to-all.png -share/gnome/evolution/%%VERSION%%/images/buttons/reply.png -share/gnome/evolution/%%VERSION%%/images/buttons/save-24.png -share/gnome/evolution/%%VERSION%%/images/buttons/send-24-receive.png -share/gnome/evolution/%%VERSION%%/images/buttons/send-24.png -share/gnome/evolution/%%VERSION%%/images/buttons/weekview.xpm -share/gnome/evolution/%%VERSION%%/images/buttons/workweekview.xpm -share/gnome/evolution/%%VERSION%%/images/buttons/yearview.xpm -share/gnome/evolution/%%VERSION%%/images/calendar-and-tasks-settings.png -share/gnome/evolution/%%VERSION%%/images/cellphone.png -share/gnome/evolution/%%VERSION%%/images/compose-message.png -share/gnome/evolution/%%VERSION%%/images/composer-settings.png -share/gnome/evolution/%%VERSION%%/images/conduits/evo-16-address-conduit.png -share/gnome/evolution/%%VERSION%%/images/conduits/evo-16-calendar-conduit.png -share/gnome/evolution/%%VERSION%%/images/conduits/evo-16-todo-conduit.png -share/gnome/evolution/%%VERSION%%/images/conduits/evo-48-address-conduit.png -share/gnome/evolution/%%VERSION%%/images/conduits/evo-48-calendar-conduit.png -share/gnome/evolution/%%VERSION%%/images/conduits/evo-48-todo-conduit.png -share/gnome/evolution/%%VERSION%%/images/configure_16_addressbook.xpm -share/gnome/evolution/%%VERSION%%/images/configure_16_calendar.xpm -share/gnome/evolution/%%VERSION%%/images/configure_16_folder.xpm -share/gnome/evolution/%%VERSION%%/images/configure_16_mail.xpm -share/gnome/evolution/%%VERSION%%/images/connect_to_url-16.xpm -share/gnome/evolution/%%VERSION%%/images/contact-is-a-list.png -share/gnome/evolution/%%VERSION%%/images/contact-list-16.png -share/gnome/evolution/%%VERSION%%/images/copy_16_message.xpm -share/gnome/evolution/%%VERSION%%/images/edit.xpm -share/gnome/evolution/%%VERSION%%/images/empty.gif -share/gnome/evolution/%%VERSION%%/images/encrypt.xpm -share/gnome/evolution/%%VERSION%%/images/envelope.png -share/gnome/evolution/%%VERSION%%/images/es-appointments.png -share/gnome/evolution/%%VERSION%%/images/es-weather.png -share/gnome/evolution/%%VERSION%%/images/evolution-calendar-mini.png -share/gnome/evolution/%%VERSION%%/images/evolution-calendar.png share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.png -share/gnome/evolution/%%VERSION%%/images/evolution-contacts-plain.png -share/gnome/evolution/%%VERSION%%/images/evolution-contacts.png -share/gnome/evolution/%%VERSION%%/images/evolution-inbox-mini.png -share/gnome/evolution/%%VERSION%%/images/evolution-inbox.png -share/gnome/evolution/%%VERSION%%/images/evolution-notes-mini.png -share/gnome/evolution/%%VERSION%%/images/evolution-notes.png -share/gnome/evolution/%%VERSION%%/images/evolution-tasks-mini.png -share/gnome/evolution/%%VERSION%%/images/evolution-tasks.png -share/gnome/evolution/%%VERSION%%/images/evolution-today-mini.png -share/gnome/evolution/%%VERSION%%/images/evolution-today.png -share/gnome/evolution/%%VERSION%%/images/evolution-trash-mini.png -share/gnome/evolution/%%VERSION%%/images/evolution-trash.png -share/gnome/evolution/%%VERSION%%/images/executive-summary-bg.png -share/gnome/evolution/%%VERSION%%/images/executive-summary-curve.png -share/gnome/evolution/%%VERSION%%/images/faq-16.png -share/gnome/evolution/%%VERSION%%/images/fetch-mail.png -share/gnome/evolution/%%VERSION%%/images/find_contact.xpm -share/gnome/evolution/%%VERSION%%/images/find_message.xpm -share/gnome/evolution/%%VERSION%%/images/flag-for-followup-16.png -share/gnome/evolution/%%VERSION%%/images/folder-copy-16.png -share/gnome/evolution/%%VERSION%%/images/folder-mini.png -share/gnome/evolution/%%VERSION%%/images/folder-move-16.png -share/gnome/evolution/%%VERSION%%/images/folder-settings.png -share/gnome/evolution/%%VERSION%%/images/folder.png -share/gnome/evolution/%%VERSION%%/images/folder.xpm -share/gnome/evolution/%%VERSION%%/images/font.png -share/gnome/evolution/%%VERSION%%/images/forward.xpm -share/gnome/evolution/%%VERSION%%/images/globe.png -share/gnome/evolution/%%VERSION%%/images/goto-16.png -share/gnome/evolution/%%VERSION%%/images/hide_deleted_messages.xpm -share/gnome/evolution/%%VERSION%%/images/hide_read_messages.xpm -share/gnome/evolution/%%VERSION%%/images/hide_selected_messages.xpm -share/gnome/evolution/%%VERSION%%/images/house.png -share/gnome/evolution/%%VERSION%%/images/ico-calendar.png -share/gnome/evolution/%%VERSION%%/images/ico-mail.png -share/gnome/evolution/%%VERSION%%/images/ico-rdf.png -share/gnome/evolution/%%VERSION%%/images/ico-weather.png -share/gnome/evolution/%%VERSION%%/images/import.png -share/gnome/evolution/%%VERSION%%/images/import.xpm -share/gnome/evolution/%%VERSION%%/images/inbox-mini.png -share/gnome/evolution/%%VERSION%%/images/inbox.png -share/gnome/evolution/%%VERSION%%/images/info-bulb.png -share/gnome/evolution/%%VERSION%%/images/ldap-mini.png -share/gnome/evolution/%%VERSION%%/images/ldap-settings.png -share/gnome/evolution/%%VERSION%%/images/ldap.png -share/gnome/evolution/%%VERSION%%/images/mail-accounts-settings.png -share/gnome/evolution/%%VERSION%%/images/mail-config-druid-account-name.png -share/gnome/evolution/%%VERSION%%/images/mail-config-druid-identity.png -share/gnome/evolution/%%VERSION%%/images/mail-config-druid-receive.png -share/gnome/evolution/%%VERSION%%/images/mail-config-druid-send.png -share/gnome/evolution/%%VERSION%%/images/mail-config-druid.png -share/gnome/evolution/%%VERSION%%/images/mail-new.xpm -share/gnome/evolution/%%VERSION%%/images/mail-read.xpm -share/gnome/evolution/%%VERSION%%/images/mail.png -share/gnome/evolution/%%VERSION%%/images/malehead.png -share/gnome/evolution/%%VERSION%%/images/mark-as-important-16.png -share/gnome/evolution/%%VERSION%%/images/meeting-request-16.png -share/gnome/evolution/%%VERSION%%/images/meeting-request.png share/gnome/evolution/%%VERSION%%/images/monkey-16.png -share/gnome/evolution/%%VERSION%%/images/move_message.xpm -share/gnome/evolution/%%VERSION%%/images/myevo-appointments.png -share/gnome/evolution/%%VERSION%%/images/myevo-mail-summary.png -share/gnome/evolution/%%VERSION%%/images/myevo-post-it.png -share/gnome/evolution/%%VERSION%%/images/myweather-clouds.png -share/gnome/evolution/%%VERSION%%/images/myweather-fog.png -share/gnome/evolution/%%VERSION%%/images/myweather-rain.png -share/gnome/evolution/%%VERSION%%/images/myweather-snow.png -share/gnome/evolution/%%VERSION%%/images/myweather-storm.png -share/gnome/evolution/%%VERSION%%/images/myweather-sun.png -share/gnome/evolution/%%VERSION%%/images/myweather-suncloud.png -share/gnome/evolution/%%VERSION%%/images/new-message.xpm -share/gnome/evolution/%%VERSION%%/images/new_all_day_event.png -share/gnome/evolution/%%VERSION%%/images/new_appointment.xpm -share/gnome/evolution/%%VERSION%%/images/new_contact.xpm -share/gnome/evolution/%%VERSION%%/images/new_task-16.png share/gnome/evolution/%%VERSION%%/images/offline.png share/gnome/evolution/%%VERSION%%/images/online.png -share/gnome/evolution/%%VERSION%%/images/open-in-new-window-16.png -share/gnome/evolution/%%VERSION%%/images/outbox-mini.png -share/gnome/evolution/%%VERSION%%/images/outbox.png -share/gnome/evolution/%%VERSION%%/images/pattern.png -share/gnome/evolution/%%VERSION%%/images/pgp-signature-bad.png -share/gnome/evolution/%%VERSION%%/images/pgp-signature-nokey.png -share/gnome/evolution/%%VERSION%%/images/pgp-signature-ok.png -share/gnome/evolution/%%VERSION%%/images/post-message-16.png -share/gnome/evolution/%%VERSION%%/images/post-reply-24.png -share/gnome/evolution/%%VERSION%%/images/print-preview.xpm -share/gnome/evolution/%%VERSION%%/images/print.xpm -share/gnome/evolution/%%VERSION%%/images/priority-high.xpm -share/gnome/evolution/%%VERSION%%/images/public-folder-mini.png -share/gnome/evolution/%%VERSION%%/images/public-folder.png -share/gnome/evolution/%%VERSION%%/images/rdf.png -share/gnome/evolution/%%VERSION%%/images/reply.xpm -share/gnome/evolution/%%VERSION%%/images/reply_to_all.xpm -share/gnome/evolution/%%VERSION%%/images/save-16.png -share/gnome/evolution/%%VERSION%%/images/save-as-16.png -share/gnome/evolution/%%VERSION%%/images/save.xpm -share/gnome/evolution/%%VERSION%%/images/schedule-meeting-16.xpm -share/gnome/evolution/%%VERSION%%/images/schedule-meeting-24.png -share/gnome/evolution/%%VERSION%%/images/search-16.png -share/gnome/evolution/%%VERSION%%/images/search-and-replace-16.png -share/gnome/evolution/%%VERSION%%/images/send-16.png -share/gnome/evolution/%%VERSION%%/images/send-later-16.png -share/gnome/evolution/%%VERSION%%/images/send-receive.xpm -share/gnome/evolution/%%VERSION%%/images/service-close.png -share/gnome/evolution/%%VERSION%%/images/service-configure.png -share/gnome/evolution/%%VERSION%%/images/service-down-disabled.png -share/gnome/evolution/%%VERSION%%/images/service-down.png -share/gnome/evolution/%%VERSION%%/images/service-left-disabled.png -share/gnome/evolution/%%VERSION%%/images/service-left.png -share/gnome/evolution/%%VERSION%%/images/service-right-disabled.png -share/gnome/evolution/%%VERSION%%/images/service-right.png -share/gnome/evolution/%%VERSION%%/images/service-up-disabled.png -share/gnome/evolution/%%VERSION%%/images/service-up.png -share/gnome/evolution/%%VERSION%%/images/settings-16.png -share/gnome/evolution/%%VERSION%%/images/settings.png -share/gnome/evolution/%%VERSION%%/images/show_all_messages.xpm -share/gnome/evolution/%%VERSION%%/images/splash.png -share/gnome/evolution/%%VERSION%%/images/stock-edit-16.png -share/gnome/evolution/%%VERSION%%/images/stock-edit-24.png -share/gnome/evolution/%%VERSION%%/images/summary-settings.png -share/gnome/evolution/%%VERSION%%/images/summary_preferences-16.png -share/gnome/evolution/%%VERSION%%/images/talking-heads.png -share/gnome/evolution/%%VERSION%%/images/task.png -share/gnome/evolution/%%VERSION%%/images/task.xpm -share/gnome/evolution/%%VERSION%%/images/thankyou.png -share/gnome/evolution/%%VERSION%%/images/timezone-16.xpm -share/gnome/evolution/%%VERSION%%/images/timezone-48.png -share/gnome/evolution/%%VERSION%%/images/undelete_message-16.png -share/gnome/evolution/%%VERSION%%/images/wax-seal-broken.png -share/gnome/evolution/%%VERSION%%/images/wax-seal.png -share/gnome/evolution/%%VERSION%%/images/work_offline.xpm -share/gnome/evolution/%%VERSION%%/images/work_online-16.png -share/gnome/evolution/%%VERSION%%/images/working-16.png share/gnome/evolution/%%VERSION%%/images/world_map-960.png +share/gnome/evolution/%%VERSION%%/searchtypes.xml share/gnome/evolution/%%VERSION%%/ui/evolution-addressbook.xml share/gnome/evolution/%%VERSION%%/ui/evolution-calendar.xml share/gnome/evolution/%%VERSION%%/ui/evolution-comp-editor.xml @@ -685,12 +376,12 @@ share/gnome/evolution/%%VERSION%%/ui/evolution-subscribe.xml share/gnome/evolution/%%VERSION%%/ui/evolution-task-editor.xml share/gnome/evolution/%%VERSION%%/ui/evolution-tasks.xml share/gnome/evolution/%%VERSION%%/ui/evolution.xml -share/gnome/evolution/%%VERSION%%/ui/my-evolution.xml share/gnome/evolution/%%VERSION%%/vfoldertypes.xml share/gnome/evolution/%%VERSION%%/views/addressbook/Address_Cards.galview share/gnome/evolution/%%VERSION%%/views/addressbook/By_Company.galview share/gnome/evolution/%%VERSION%%/views/addressbook/Phone_List.galview share/gnome/evolution/%%VERSION%%/views/addressbook/galview.xml +share/gnome/evolution/%%VERSION%%/views/calendar/List_View.galview share/gnome/evolution/%%VERSION%%/views/calendar/galview.xml share/gnome/evolution/%%VERSION%%/views/mail/As_Sent_Folder.galview share/gnome/evolution/%%VERSION%%/views/mail/By_Follow_Up_Flag.galview @@ -700,471 +391,75 @@ share/gnome/evolution/%%VERSION%%/views/mail/By_Subject.galview share/gnome/evolution/%%VERSION%%/views/mail/Messages.galview share/gnome/evolution/%%VERSION%%/views/mail/galview.xml share/gnome/evolution/%%VERSION%%/views/tasks/Tasks.galview -share/gnome/evolution/%%VERSION%%/views/tasks/With_Category.galview +share/gnome/evolution/%%VERSION%%/views/tasks/With_DueDate.galview +share/gnome/evolution/%%VERSION%%/views/tasks/With_Status.galview share/gnome/evolution/%%VERSION%%/views/tasks/galview.xml -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Abidjan.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Accra.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Addis_Ababa.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Algiers.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Asmera.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Bamako.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Bangui.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Banjul.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Bissau.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Blantyre.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Brazzaville.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Bujumbura.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Cairo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Casablanca.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Ceuta.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Conakry.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Dakar.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Dar_es_Salaam.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Djibouti.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Douala.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/El_Aaiun.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Freetown.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Gaborone.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Harare.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Johannesburg.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Kampala.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Khartoum.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Kigali.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Kinshasa.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Lagos.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Libreville.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Lome.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Luanda.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Lubumbashi.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Lusaka.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Malabo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Maputo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Maseru.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Mbabane.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Mogadishu.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Monrovia.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Nairobi.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Ndjamena.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Niamey.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Nouakchott.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Ouagadougou.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Porto-Novo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Sao_Tome.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Timbuktu.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Tripoli.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Tunis.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Africa/Windhoek.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Adak.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Anchorage.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Anguilla.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Antigua.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Araguaina.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Aruba.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Asuncion.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Barbados.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Belem.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Belize.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Boa_Vista.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Bogota.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Boise.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Buenos_Aires.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Cambridge_Bay.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Cancun.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Caracas.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Catamarca.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Cayenne.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Cayman.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Chicago.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Chihuahua.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Cordoba.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Costa_Rica.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Cuiaba.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Curacao.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Danmarkshavn.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Dawson.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Dawson_Creek.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Denver.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Detroit.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Dominica.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Edmonton.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Eirunepe.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/El_Salvador.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Fortaleza.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Glace_Bay.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Godthab.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Goose_Bay.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Grand_Turk.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Grenada.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Guadeloupe.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Guatemala.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Guayaquil.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Guyana.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Halifax.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Havana.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Hermosillo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Indiana/Indianapolis.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Indiana/Knox.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Indiana/Marengo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Indiana/Vevay.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Indianapolis.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Inuvik.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Iqaluit.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Jamaica.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Jujuy.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Juneau.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Kentucky/Louisville.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Kentucky/Monticello.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/La_Paz.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Lima.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Los_Angeles.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Louisville.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Maceio.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Managua.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Manaus.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Martinique.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Mazatlan.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Mendoza.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Menominee.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Merida.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Mexico_City.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Miquelon.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Monterrey.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Montevideo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Montreal.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Montserrat.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Nassau.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/New_York.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Nipigon.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Nome.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Noronha.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/North_Dakota/Center.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Panama.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Pangnirtung.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Paramaribo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Phoenix.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Port-au-Prince.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Port_of_Spain.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Porto_Velho.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Puerto_Rico.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Rainy_River.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Rankin_Inlet.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Recife.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Regina.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Rio_Branco.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Rosario.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Santiago.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Santo_Domingo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Sao_Paulo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Scoresbysund.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Shiprock.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/St_Johns.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/St_Kitts.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/St_Lucia.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/St_Thomas.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/St_Vincent.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Swift_Current.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Tegucigalpa.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Thule.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Thunder_Bay.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Tijuana.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Tortola.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Vancouver.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Whitehorse.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Winnipeg.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Yakutat.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/America/Yellowknife.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Antarctica/Casey.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Antarctica/Davis.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Antarctica/DumontDUrville.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Antarctica/Mawson.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Antarctica/McMurdo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Antarctica/Palmer.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Antarctica/South_Pole.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Antarctica/Syowa.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Antarctica/Vostok.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Arctic/Longyearbyen.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Aden.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Almaty.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Amman.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Anadyr.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Aqtau.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Aqtobe.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Ashgabat.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Baghdad.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Bahrain.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Baku.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Bangkok.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Beirut.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Bishkek.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Brunei.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Calcutta.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Choibalsan.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Chongqing.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Chungking.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Colombo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Damascus.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Dhaka.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Dili.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Dubai.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Dushanbe.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Gaza.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Harbin.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Hong_Kong.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Hovd.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Irkutsk.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Istanbul.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Jakarta.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Jayapura.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Jerusalem.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Kabul.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Kamchatka.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Karachi.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Kashgar.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Katmandu.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Krasnoyarsk.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Kuala_Lumpur.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Kuching.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Kuwait.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Macao.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Magadan.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Manila.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Muscat.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Nicosia.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Novosibirsk.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Omsk.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Phnom_Penh.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Pontianak.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Pyongyang.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Qatar.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Rangoon.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Riyadh.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Saigon.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Sakhalin.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Samarkand.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Seoul.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Shanghai.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Singapore.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Taipei.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Tashkent.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Tbilisi.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Tehran.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Thimphu.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Tokyo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Ujung_Pandang.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Ulaanbaatar.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Urumqi.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Vientiane.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Vladivostok.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Yakutsk.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Yekaterinburg.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Asia/Yerevan.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/Azores.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/Bermuda.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/Canary.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/Cape_Verde.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/Faeroe.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/Jan_Mayen.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/Madeira.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/Reykjavik.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/South_Georgia.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/St_Helena.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic/Stanley.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Australia/Adelaide.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Australia/Brisbane.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Australia/Broken_Hill.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Australia/Darwin.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Australia/Hobart.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Australia/Lindeman.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Australia/Lord_Howe.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Australia/Melbourne.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Australia/Perth.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Australia/Sydney.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Amsterdam.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Andorra.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Athens.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Belfast.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Belgrade.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Berlin.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Bratislava.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Brussels.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Bucharest.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Budapest.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Chisinau.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Copenhagen.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Dublin.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Gibraltar.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Helsinki.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Istanbul.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Kaliningrad.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Kiev.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Lisbon.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Ljubljana.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/London.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Luxembourg.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Madrid.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Malta.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Minsk.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Monaco.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Moscow.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Nicosia.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Oslo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Paris.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Prague.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Riga.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Rome.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Samara.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/San_Marino.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Sarajevo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Simferopol.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Skopje.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Sofia.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Stockholm.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Tallinn.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Tirane.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Uzhgorod.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Vaduz.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Vatican.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Vienna.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Vilnius.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Warsaw.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Zagreb.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Zaporozhye.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Europe/Zurich.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Antananarivo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Chagos.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Christmas.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Cocos.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Comoro.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Kerguelen.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Mahe.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Maldives.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Mauritius.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Mayotte.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Indian/Reunion.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Apia.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Auckland.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Chatham.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Easter.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Efate.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Enderbury.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Fakaofo.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Fiji.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Funafuti.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Galapagos.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Gambier.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Guadalcanal.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Guam.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Honolulu.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Johnston.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Kiritimati.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Kosrae.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Kwajalein.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Majuro.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Marquesas.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Midway.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Nauru.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Niue.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Norfolk.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Noumea.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Pago_Pago.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Palau.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Pitcairn.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Ponape.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Port_Moresby.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Rarotonga.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Saipan.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Tahiti.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Tarawa.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Tongatapu.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Truk.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Wake.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Wallis.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific/Yap.ics -share/gnome/evolution/%%VERSION%%/zoneinfo/zones.tab -%%PILOT:%%share/gnome/gnome-pilot/conduits/e-address.conduit -%%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar.conduit -%%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo.conduit -share/gnome/help/evolution-%%VERSION%%/C/apx-authors.xml -share/gnome/help/evolution-%%VERSION%%/C/apx-bugs.xml -share/gnome/help/evolution-%%VERSION%%/C/apx-fdl.xml -share/gnome/help/evolution-%%VERSION%%/C/apx-gloss.xml -share/gnome/help/evolution-%%VERSION%%/C/apx-gpl.xml -share/gnome/help/evolution-%%VERSION%%/C/config-prefs.xml -share/gnome/help/evolution-%%VERSION%%/C/config-sync.xml -share/gnome/help/evolution-%%VERSION%%/C/evolution-%%VERSION%%.xml -share/gnome/help/evolution-%%VERSION%%/C/figures/calendar.png -share/gnome/help/evolution-%%VERSION%%/C/figures/config-cal.png -share/gnome/help/evolution-%%VERSION%%/C/figures/config-mail.png -share/gnome/help/evolution-%%VERSION%%/C/figures/contact-editor.png -share/gnome/help/evolution-%%VERSION%%/C/figures/contact.png -share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-delegation.png -share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-identity.png -share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive-options.png -share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive.png -share/gnome/help/evolution-%%VERSION%%/C/figures/filter-new-fig.png -share/gnome/help/evolution-%%VERSION%%/C/figures/folder-bar.png -share/gnome/help/evolution-%%VERSION%%/C/figures/full-1.png -share/gnome/help/evolution-%%VERSION%%/C/figures/full-2.png -share/gnome/help/evolution-%%VERSION%%/C/figures/full-3.png -share/gnome/help/evolution-%%VERSION%%/C/figures/full-4.png -share/gnome/help/evolution-%%VERSION%%/C/figures/full-5.png -share/gnome/help/evolution-%%VERSION%%/C/figures/full-6.png -share/gnome/help/evolution-%%VERSION%%/C/figures/full-7.png -share/gnome/help/evolution-%%VERSION%%/C/figures/mail-druid-pic.png -share/gnome/help/evolution-%%VERSION%%/C/figures/mail-inbox.png -share/gnome/help/evolution-%%VERSION%%/C/figures/mail-threaded.png -share/gnome/help/evolution-%%VERSION%%/C/figures/mainwindow-pic.png -share/gnome/help/evolution-%%VERSION%%/C/figures/newmsg.png -share/gnome/help/evolution-%%VERSION%%/C/figures/print-dest.png -share/gnome/help/evolution-%%VERSION%%/C/figures/print-preview.png -share/gnome/help/evolution-%%VERSION%%/C/figures/replymsg.png -share/gnome/help/evolution-%%VERSION%%/C/figures/schedule.png -share/gnome/help/evolution-%%VERSION%%/C/figures/summary.png -share/gnome/help/evolution-%%VERSION%%/C/figures/vfolder-createrule-fig.png -share/gnome/help/evolution-%%VERSION%%/C/legal.xml -share/gnome/help/evolution-%%VERSION%%/C/menuref.xml -share/gnome/help/evolution-%%VERSION%%/C/preface.xml -share/gnome/help/evolution-%%VERSION%%/C/usage-calendar.xml -share/gnome/help/evolution-%%VERSION%%/C/usage-contact.xml -share/gnome/help/evolution-%%VERSION%%/C/usage-exchange.xml -share/gnome/help/evolution-%%VERSION%%/C/usage-exec-summary.xml -share/gnome/help/evolution-%%VERSION%%/C/usage-mail-org.xml -share/gnome/help/evolution-%%VERSION%%/C/usage-mail.xml -share/gnome/help/evolution-%%VERSION%%/C/usage-mainwindow.xml -share/gnome/help/evolution-%%VERSION%%/C/usage-print.xml -share/gnome/help/evolution-%%VERSION%%/C/usage-sync.xml +%%PILOT:%%share/gnome/gnome-pilot/conduits/e-address-%%VERSION%%.conduit +%%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit +%%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit +share/gnome/help/evolution-%%PORTVERSION%%/C/evolution-%%PORTVERSION%%.xml +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/calendar.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/config-cal.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/config-mail.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contact-editor.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contact.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contacts_mainwindow_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_account_info_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_contacteditor_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_email_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_identity_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mail_callout_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_newmess_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_receive_setup2_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_receive_setup_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_rule_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_send_setup_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_timezone_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-delegation.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-identity.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-receive-options.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-receive.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/filter-new-fig.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-1.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-2.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-3.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-4.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-5.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-6.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-7.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-druid-pic.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-inbox.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-threaded.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mainwindow-pic.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail_mainwindow_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/newmsg.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/replymsg.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/schedule.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/vfolder-createrule-fig.png share/gnome/idl/evolution-%%VERSION%%/Composer.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-Activity.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-Addressbook-SelectNames.idl +share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-Composer.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-Offline.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-Session.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-ShellComponent.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-ShellComponentDnd.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-ShellView.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-Shortcuts.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-Storage.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-StorageSetView.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-Wizard.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-Wombat.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-common.idl share/gnome/idl/evolution-%%VERSION%%/Evolution.idl share/gnome/idl/evolution-%%VERSION%%/GNOME_Evolution_Importer.idl -share/gnome/idl/evolution-%%VERSION%%/Mailer.idl -share/gnome/idl/evolution-%%VERSION%%/addressbook.idl share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl share/gnome/mime-info/evolution-%%VERSION%%.keys share/gnome/mime-info/evolution-%%VERSION%%.mime -share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/evolution/evolution-%%PORTVERSION%%-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/evolution/evolution-%%PORTVERSION%%-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/evolution-%%VERSION%%.png -share/gnome/pixmaps/evolution.png share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/cy/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -1172,24 +467,37 @@ share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/de/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/el/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/en_AU/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/es/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/et/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/eu/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/fa/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/fi/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ga/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/gu/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/he/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/hi/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/id/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/is/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/mk/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/ml/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/no/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/pl/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/pt/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/pt_BR/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -1201,81 +509,54 @@ share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sr@Latn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/ta/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/tr/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/wa/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm share/gnome/omf/evolution @dirrm share/gnome/idl/evolution-%%VERSION%% -@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures -@dirrm share/gnome/help/evolution-%%VERSION%%/C -@dirrm share/gnome/help/evolution-%%VERSION%% -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/Pacific -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/Indian -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/Europe -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/Australia -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/Atlantic -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/Asia -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/Arctic -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/Antarctica -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/America/North_Dakota -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/America/Kentucky -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/America/Indiana -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/America -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo/Africa -@dirrm share/gnome/evolution/%%VERSION%%/zoneinfo +@dirrm share/gnome/help/evolution-%%PORTVERSION%%/C/figures +@dirrm share/gnome/help/evolution-%%PORTVERSION%%/C +@dirrm share/gnome/help/evolution-%%PORTVERSION%% @dirrm share/gnome/evolution/%%VERSION%%/views/tasks @dirrm share/gnome/evolution/%%VERSION%%/views/mail @dirrm share/gnome/evolution/%%VERSION%%/views/calendar @dirrm share/gnome/evolution/%%VERSION%%/views/addressbook @dirrm share/gnome/evolution/%%VERSION%%/views @dirrm share/gnome/evolution/%%VERSION%%/ui -@dirrm share/gnome/evolution/%%VERSION%%/images/conduits -@dirrm share/gnome/evolution/%%VERSION%%/images/buttons @dirrm share/gnome/evolution/%%VERSION%%/images +@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/C +@dirrm share/gnome/evolution/%%VERSION%%/help/quickref +@dirrm share/gnome/evolution/%%VERSION%%/help @dirrm share/gnome/evolution/%%VERSION%%/glade @dirrm share/gnome/evolution/%%VERSION%%/etspec +@dirrm share/gnome/evolution/%%VERSION%%/errors @dirrm share/gnome/evolution/%%VERSION%%/ecps -@dirrm share/gnome/evolution/%%VERSION%%/default_user/views/tasks -@dirrm share/gnome/evolution/%%VERSION%%/default_user/views/mail -@dirrm share/gnome/evolution/%%VERSION%%/default_user/views/calendar -@dirrm share/gnome/evolution/%%VERSION%%/default_user/views/addressbook -@dirrm share/gnome/evolution/%%VERSION%%/default_user/views -@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Trash -@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Tasks -@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Sent -@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Outbox -@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Inbox -@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Drafts -@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Contacts -@dirrm share/gnome/evolution/%%VERSION%%/default_user/local/Calendar -@dirrm share/gnome/evolution/%%VERSION%%/default_user/local -@dirrm share/gnome/evolution/%%VERSION%%/default_user +@dirrm share/gnome/evolution/%%VERSION%%/default/C/mail/local +@dirrm share/gnome/evolution/%%VERSION%%/default/C/mail +@dirrm share/gnome/evolution/%%VERSION%%/default/C +@dirrm share/gnome/evolution/%%VERSION%%/default @dirrm share/gnome/evolution/%%VERSION%% @dirrm share/gnome/evolution @dirrm libexec/evolution/%%VERSION%%/camel @dirrm libexec/evolution/%%VERSION%% @dirrm libexec/evolution -@dirrm lib/evolution/%%VERSION%%/evolution-mail-importers @dirrm lib/evolution/%%VERSION%%/evolution-calendar-importers +@dirrm lib/evolution/%%VERSION%%/evolution-addressbook-importers +%%PILOT:%%@dirrm lib/evolution/%%VERSION%%/conduits @dirrm lib/evolution/%%VERSION%%/components @dirrm lib/evolution/%%VERSION%%/camel-providers @dirrm lib/evolution/%%VERSION%% @dirrm lib/evolution -@dirrm include/evolution-%%VERSION%%/wombat @dirrm include/evolution-%%VERSION%%/widgets @dirrm include/evolution-%%VERSION%%/shell -@dirrm include/evolution-%%VERSION%%/pcs -@dirrm include/evolution-%%VERSION%%/pas @dirrm include/evolution-%%VERSION%%/importer -@dirrm include/evolution-%%VERSION%%/ename -@dirrm include/evolution-%%VERSION%%/ebook @dirrm include/evolution-%%VERSION%%/e-util -@dirrm include/evolution-%%VERSION%%/e-db3util @dirrm include/evolution-%%VERSION%%/e-conduit @dirrm include/evolution-%%VERSION%%/camel -@dirrm include/evolution-%%VERSION%%/cal-util -@dirrm include/evolution-%%VERSION%%/cal-client @dirrm include/evolution-%%VERSION%% -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/evolution/evolution-%%PORTVERSION%%-C.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/mail/ximian-connector/Makefile b/mail/ximian-connector/Makefile index 1756b804bc9d..5ab39285bf6c 100644 --- a/mail/ximian-connector/Makefile +++ b/mail/ximian-connector/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ximian -PORTVERSION= 1.4.7.1 -PORTREVISION= 1 +PORTVERSION= 2.0.2 CATEGORIES= mail gnome -MASTER_SITES= http://ftp.ximian.com/pub/source/evolution/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/2.0 PKGNAMESUFFIX= -connector DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} @@ -19,18 +19,36 @@ COMMENT= Evolution plugin to connect to Microsoft Exchange servers BUILD_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution RUN_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution +USE_BZIP2= yes USE_X_PREFIX= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_GMAKE= yes -WANT_OPENLDAP_VER= 21 -WANT_OPENLDAP_SASL= yes +USE_OPENLDAP= yes USE_GNOME= gnomeprefix intlhack gnomehack gnometarget CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -rpath ${X11BASE}/lib/evolution/${EVO_VERSION}" CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ --with-static-ldap=no -EVO_VERSION= 1.4 -PLIST_SUB= VERSION="1.4" EVO_VERSION=${EVO_VERSION} +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} +EVO_VERSION= 2.0 +PLIST_SUB= VERSION="2.0" EVO_VERSION=${EVO_VERSION} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 && defined(MAKE_KERBEROS5) && \ + exists(/usr/lib/libkrb5.so) && !defined(PACKAGE_BUILDING) +CONFIGURE_ARGS+= --with-krb5=/usr +.elif ( ${OSVERSION} < 500000 && !defined(MAKE_KERBEROS5) ) || \ + defined(PACKAGE_BUILDING) +LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal +CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} +.elif ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ + exists(/usr/lib/libkrb5.so) +CONFIGURE_ARGS+= --with-krb5=/usr +.else +LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal +CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} +.endif + +.include <bsd.port.post.mk> diff --git a/mail/ximian-connector/distinfo b/mail/ximian-connector/distinfo index ff3a864f146c..ecaf521ee176 100644 --- a/mail/ximian-connector/distinfo +++ b/mail/ximian-connector/distinfo @@ -1,2 +1,2 @@ -MD5 (ximian-connector-1.4.7.1.tar.gz) = fad20b3b50161a99f1e36b704590e600 -SIZE (ximian-connector-1.4.7.1.tar.gz) = 898976 +MD5 (ximian-connector-2.0.2.tar.bz2) = 706f53c9c26321c938248264a4456c30 +SIZE (ximian-connector-2.0.2.tar.bz2) = 1185897 diff --git a/mail/ximian-connector/files/patch-configure b/mail/ximian-connector/files/patch-configure index b2b64b88e985..43668716a0d1 100644 --- a/mail/ximian-connector/files/patch-configure +++ b/mail/ximian-connector/files/patch-configure @@ -1,11 +1,22 @@ ---- configure.orig Tue Jun 1 20:52:34 2004 -+++ configure Tue Jun 1 20:52:55 2004 -@@ -22992,7 +22992,7 @@ - - case $with_static_ldap in - no|"") -- if test -f $with_openldap/lib/libldap.la; then -+ if test -f $with_openldap/lib/libldap.so; then - with_static_ldap=no +--- configure.orig Fri Aug 20 15:26:49 2004 ++++ configure Fri Aug 20 15:27:21 2004 +@@ -23754,8 +23754,8 @@ + # libldap might depend on OpenSSL... We need to pull + # in the dependency libs explicitly here since we're + # not using libtool for the configure test. +- if test -f $with_openldap/lib/libldap.la; then +- LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS" ++ if test -f $with_openldap/lib/libldap.so; then ++ LDAP_LIBS="`. $with_openldap/lib/libldap.so; echo $dependency_libs` $LDAP_LIBS" + fi else - with_static_ldap=yes + LDAP_LIBS="-llber $LDAP_LIBS" +@@ -24006,7 +24006,7 @@ + + + mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" +-heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" ++heimlibs="-lkrb5 -lcrypt -lcrypto -lasn1 -lcom_err -lroken -lgssapi" + echo "$as_me:$LINENO: checking for Kerberos 5" >&5 + echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 + if test "${ac_cv_lib_kerberos5+set}" = set; then diff --git a/mail/ximian-connector/files/patch-lib::e2k-autoconfig.c b/mail/ximian-connector/files/patch-lib::e2k-autoconfig.c index d5806c41d0c5..7576f7123449 100644 --- a/mail/ximian-connector/files/patch-lib::e2k-autoconfig.c +++ b/mail/ximian-connector/files/patch-lib::e2k-autoconfig.c @@ -1,13 +1,13 @@ ---- lib/e2k-autoconfig.c.orig Tue May 11 11:09:03 2004 -+++ lib/e2k-autoconfig.c Tue Jun 1 20:47:50 2004 -@@ -25,6 +25,10 @@ +--- lib/e2k-autoconfig.c.orig Tue May 11 11:15:58 2004 ++++ lib/e2k-autoconfig.c Thu Jun 17 14:02:58 2004 +@@ -31,6 +31,10 @@ + #include <sys/stat.h> + #include <unistd.h> - #include <stdlib.h> - #include <string.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> - #include <resolv.h> + #include <netinet/in.h> #include <arpa/nameser.h> - + #include <resolv.h> diff --git a/mail/ximian-connector/files/patch-ltmain.sh b/mail/ximian-connector/files/patch-ltmain.sh deleted file mode 100644 index 263a5ce21d00..000000000000 --- a/mail/ximian-connector/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Mon Apr 5 19:24:18 2004 -+++ ltmain.sh Tue Jun 1 20:45:09 2004 -@@ -1346,7 +1346,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1361,8 +1361,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3056,6 +3064,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5528,10 +5539,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/mail/ximian-connector/files/patch-po::Makefile.in.in b/mail/ximian-connector/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..042bef6eb7fc --- /dev/null +++ b/mail/ximian-connector/files/patch-po::Makefile.in.in @@ -0,0 +1,11 @@ +--- po/Makefile.in.in.orig Sun Jul 25 18:30:57 2004 ++++ po/Makefile.in.in Sun Jul 25 18:31:20 2004 +@@ -32,6 +32,8 @@ + gnulocaledir = $(datadir)/locale + gettextsrcdir = $(datadir)/glib-2.0/gettext/po + subdir = po ++mkdir_p = @mkdir_p@ ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ diff --git a/mail/ximian-connector/pkg-plist b/mail/ximian-connector/pkg-plist index 2041a036ef58..70ec761c760a 100644 --- a/mail/ximian-connector/pkg-plist +++ b/mail/ximian-connector/pkg-plist @@ -1,21 +1,93 @@ -bin/ximian-connector-setup -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_exchange.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_evolution_exchange.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_exchange.schemas > /dev/null || /usr/bin/true +bin/ximian-connector-setup-%%VERSION%% lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.so lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.urls -libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage.server +libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage -share/gnome/evolution/%%EVO_VERSION%%/images/connector.png -share/gnome/evolution/%%EVO_VERSION%%/images/exchange-delegates-48.png -share/gnome/evolution/%%EVO_VERSION%%/images/exchange-oof-48.png +%%DOCSDIR%%/E2kContext.html +%%DOCSDIR%%/E2kGlobalCatalog.html +%%DOCSDIR%%/E2kSecurityDescriptor.html +%%DOCSDIR%%/E2kSid.html +%%DOCSDIR%%/E2kUserDialog.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png +%%DOCSDIR%%/ximian-connector-e2k-action.html +%%DOCSDIR%%/ximian-connector-e2k-autoconfig.html +%%DOCSDIR%%/ximian-connector-e2k-encoding-utils.html +%%DOCSDIR%%/ximian-connector-e2k-freebusy.html +%%DOCSDIR%%/ximian-connector-e2k-http-utils.html +%%DOCSDIR%%/ximian-connector-e2k-properties.html +%%DOCSDIR%%/ximian-connector-e2k-restriction.html +%%DOCSDIR%%/ximian-connector-e2k-result.html +%%DOCSDIR%%/ximian-connector-e2k-rule-xml.html +%%DOCSDIR%%/ximian-connector-e2k-rule.html +%%DOCSDIR%%/ximian-connector-e2k-uri.html +%%DOCSDIR%%/ximian-connector-e2k-utils.html +%%DOCSDIR%%/ximian-connector-e2k-xml-utils.html +%%DOCSDIR%%/ximian-connector-test-utils.html +%%DOCSDIR%%/ximian-connector-xntlm-des.html +%%DOCSDIR%%/ximian-connector-xntlm-md4.html +%%DOCSDIR%%/ximian-connector-xntlm.html +%%DOCSDIR%%/ximian-connector.devhelp +share/gnome/ximian-connector/%%VERSION%%/etspec/e-storage-set-view.etspec +share/gnome/ximian-connector/%%VERSION%%/glade/e-folder-creation-dialog.glade +share/gnome/ximian-connector/%%VERSION%%/glade/e-foreign-folder-dialog.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-autoconfig-wizard.glade +share/gnome/ximian-connector/%%VERSION%%/glade/exchange-change-password.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-delegates.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-oof.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-permissions-dialog.glade +share/gnome/ximian-connector/%%VERSION%%/images/connector-mini.png share/gnome/ximian-connector/%%VERSION%%/images/connector.png +share/gnome/ximian-connector/%%VERSION%%/images/exchange-delegates-48.png +share/gnome/ximian-connector/%%VERSION%%/images/exchange-oof-48.png +share/gnome/ximian-connector/%%VERSION%%/ui/ximian-connector.xml +share/locale/ar/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/cy/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/de/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/gu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/nn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/no/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/ta/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +@dirrm share/gnome/ximian-connector/%%VERSION%%/ui @dirrm share/gnome/ximian-connector/%%VERSION%%/images @dirrm share/gnome/ximian-connector/%%VERSION%%/glade +@dirrm share/gnome/ximian-connector/%%VERSION%%/etspec @dirrm share/gnome/ximian-connector/%%VERSION%% @dirrm share/gnome/ximian-connector +@dirrm %%DOCSDIR%% diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index 2b6fff775ba8..2c51b27f0835 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -6,8 +6,8 @@ # PORTNAME= gcalctool -PORTVERSION= 4.3.51 -PORTEPOCH= 1 +PORTVERSION= 4.4.20 +PORTEPOCH= 2 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -17,15 +17,17 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME 2 calculator tool based on the old calctool for OpenWindows USE_BZIP2= yes +USE_BISON= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack lthack intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gcalctool.1 +GCONF_SCHEMAS= gcalctool.schemas post-patch: @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo index 714274dfdf5a..cedcf1a094c6 100644 --- a/math/gcalctool/distinfo +++ b/math/gcalctool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gcalctool-4.3.51.tar.bz2) = 1b06749fafc19a195fa069501c2b23a5 -SIZE (gnome2/gcalctool-4.3.51.tar.bz2) = 842356 +MD5 (gnome2/gcalctool-4.4.20.tar.bz2) = 51de83d6d68d7cb65dced80b96acbaaa +SIZE (gnome2/gcalctool-4.4.20.tar.bz2) = 918938 diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist index b89aba434cab..0627d491fd8c 100644 --- a/math/gcalctool/pkg-plist +++ b/math/gcalctool/pkg-plist @@ -1,8 +1,5 @@ bin/gcalctool bin/gnome-calculator -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gcalctool.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gcalctool.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gcalctool.schemas > /dev/null || /usr/bin/true share/gnome/applications/gcalctool.desktop share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png @@ -92,12 +89,13 @@ share/gnome/omf/gcalctool/gcalctool-zh_HK.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gcalctool/gcalctool-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gcalctool/gcalctool-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/pixmaps/gcalctool.png share/locale/am/LC_MESSAGES/gcalctool.mo share/locale/ar/LC_MESSAGES/gcalctool.mo share/locale/az/LC_MESSAGES/gcalctool.mo share/locale/be/LC_MESSAGES/gcalctool.mo share/locale/bg/LC_MESSAGES/gcalctool.mo +share/locale/bn/LC_MESSAGES/gcalctool.mo +share/locale/bs/LC_MESSAGES/gcalctool.mo share/locale/ca/LC_MESSAGES/gcalctool.mo share/locale/cs/LC_MESSAGES/gcalctool.mo share/locale/cy/LC_MESSAGES/gcalctool.mo @@ -112,6 +110,7 @@ share/locale/fa/LC_MESSAGES/gcalctool.mo share/locale/fi/LC_MESSAGES/gcalctool.mo share/locale/fr/LC_MESSAGES/gcalctool.mo share/locale/ga/LC_MESSAGES/gcalctool.mo +share/locale/gu/LC_MESSAGES/gcalctool.mo share/locale/he/LC_MESSAGES/gcalctool.mo share/locale/hi/LC_MESSAGES/gcalctool.mo share/locale/hr/LC_MESSAGES/gcalctool.mo @@ -125,8 +124,10 @@ share/locale/mk/LC_MESSAGES/gcalctool.mo share/locale/ml/LC_MESSAGES/gcalctool.mo share/locale/mn/LC_MESSAGES/gcalctool.mo share/locale/ms/LC_MESSAGES/gcalctool.mo +share/locale/nb/LC_MESSAGES/gcalctool.mo share/locale/nl/LC_MESSAGES/gcalctool.mo share/locale/no/LC_MESSAGES/gcalctool.mo +share/locale/or/LC_MESSAGES/gcalctool.mo share/locale/pa/LC_MESSAGES/gcalctool.mo share/locale/pl/LC_MESSAGES/gcalctool.mo share/locale/pt/LC_MESSAGES/gcalctool.mo @@ -141,6 +142,7 @@ share/locale/sr@Latn/LC_MESSAGES/gcalctool.mo share/locale/sv/LC_MESSAGES/gcalctool.mo share/locale/ta/LC_MESSAGES/gcalctool.mo share/locale/th/LC_MESSAGES/gcalctool.mo +share/locale/tk/LC_MESSAGES/gcalctool.mo share/locale/uk/LC_MESSAGES/gcalctool.mo share/locale/vi/LC_MESSAGES/gcalctool.mo share/locale/zh_CN/LC_MESSAGES/gcalctool.mo diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile index 1dba5f4052e8..f4154454a901 100644 --- a/misc/gnome-icon-theme/Makefile +++ b/misc/gnome-icon-theme/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnome-icon-theme -PORTVERSION= 1.2.3 +PORTVERSION= 2.8.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo index bf79a2ae08bc..08f1ed1a395d 100644 --- a/misc/gnome-icon-theme/distinfo +++ b/misc/gnome-icon-theme/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-icon-theme-1.2.3.tar.bz2) = 95bafdf2dd4d9ef2b7dfc4e015ddafcb -SIZE (gnome2/gnome-icon-theme-1.2.3.tar.bz2) = 2760153 +MD5 (gnome2/gnome-icon-theme-2.8.0.tar.bz2) = 7be016337c44c024fb22f7b94b689d7b +SIZE (gnome2/gnome-icon-theme-2.8.0.tar.bz2) = 2867812 diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist index 020f6d915dc3..d7468bf0e42d 100644 --- a/misc/gnome-icon-theme/pkg-plist +++ b/misc/gnome-icon-theme/pkg-plist @@ -6,12 +6,17 @@ share/icons/gnome/12x12/filesystems/gnome-fs-directory.png share/icons/gnome/16x16/devices/gnome-dev-cdrom-audio.png share/icons/gnome/16x16/devices/gnome-dev-cdrom.png share/icons/gnome/16x16/devices/gnome-dev-dvd.png +share/icons/gnome/16x16/devices/gnome-dev-ethernet.png share/icons/gnome/16x16/devices/gnome-dev-floppy.png share/icons/gnome/16x16/devices/gnome-dev-harddisk.png +share/icons/gnome/16x16/devices/gnome-dev-ipod.png share/icons/gnome/16x16/devices/gnome-dev-memory.png share/icons/gnome/16x16/devices/gnome-dev-mouse-ball.png +share/icons/gnome/16x16/devices/gnome-dev-pci.png share/icons/gnome/16x16/devices/gnome-dev-printer.png share/icons/gnome/16x16/devices/gnome-dev-removable.png +share/icons/gnome/16x16/devices/gnome-dev-wavelan-encrypted.png +share/icons/gnome/16x16/devices/gnome-dev-wavelan.png share/icons/gnome/16x16/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/16x16/filesystems/gnome-fs-bookmark.png share/icons/gnome/16x16/filesystems/gnome-fs-client.png @@ -38,12 +43,25 @@ share/icons/gnome/24x24/devices/gnome-dev-battery.png share/icons/gnome/24x24/devices/gnome-dev-cdrom-audio.png share/icons/gnome/24x24/devices/gnome-dev-cdrom.png share/icons/gnome/24x24/devices/gnome-dev-dvd.png +share/icons/gnome/24x24/devices/gnome-dev-ethernet.png share/icons/gnome/24x24/devices/gnome-dev-floppy.png +share/icons/gnome/24x24/devices/gnome-dev-harddisk-1394.png +share/icons/gnome/24x24/devices/gnome-dev-harddisk-usb.png share/icons/gnome/24x24/devices/gnome-dev-harddisk.png +share/icons/gnome/24x24/devices/gnome-dev-ipod.png +share/icons/gnome/24x24/devices/gnome-dev-media-cf.png +share/icons/gnome/24x24/devices/gnome-dev-media-ms.png +share/icons/gnome/24x24/devices/gnome-dev-media-sdmmc.png +share/icons/gnome/24x24/devices/gnome-dev-media-sm.png share/icons/gnome/24x24/devices/gnome-dev-memory.png share/icons/gnome/24x24/devices/gnome-dev-mouse-ball.png +share/icons/gnome/24x24/devices/gnome-dev-pci.png share/icons/gnome/24x24/devices/gnome-dev-printer.png +share/icons/gnome/24x24/devices/gnome-dev-removable-1394.png +share/icons/gnome/24x24/devices/gnome-dev-removable-usb.png share/icons/gnome/24x24/devices/gnome-dev-removable.png +share/icons/gnome/24x24/devices/gnome-dev-wavelan-encrypted.png +share/icons/gnome/24x24/devices/gnome-dev-wavelan.png share/icons/gnome/24x24/emblems/emblem-symbolic-link.png share/icons/gnome/24x24/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/24x24/filesystems/gnome-fs-bookmark.png @@ -57,6 +75,7 @@ share/icons/gnome/24x24/filesystems/gnome-fs-directory.png share/icons/gnome/24x24/filesystems/gnome-fs-network.png share/icons/gnome/24x24/filesystems/gnome-fs-server.png share/icons/gnome/24x24/mimetypes/gnome-mime-x-directory-nfs-server.png +share/icons/gnome/32x32/devices/gnome-dev-ipod.png share/icons/gnome/32x32/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/32x32/filesystems/gnome-fs-bookmark.png share/icons/gnome/32x32/filesystems/gnome-fs-client.png @@ -84,14 +103,23 @@ share/icons/gnome/48x48/devices/gnome-dev-cdrom-audio.png share/icons/gnome/48x48/devices/gnome-dev-cdrom.png share/icons/gnome/48x48/devices/gnome-dev-dvd.png share/icons/gnome/48x48/devices/gnome-dev-floppy.png +share/icons/gnome/48x48/devices/gnome-dev-harddisk-1394.png +share/icons/gnome/48x48/devices/gnome-dev-harddisk-usb.png share/icons/gnome/48x48/devices/gnome-dev-harddisk.png +share/icons/gnome/48x48/devices/gnome-dev-ipod.png share/icons/gnome/48x48/devices/gnome-dev-jazdisk.png share/icons/gnome/48x48/devices/gnome-dev-keyboard.png +share/icons/gnome/48x48/devices/gnome-dev-media-cf.png +share/icons/gnome/48x48/devices/gnome-dev-media-ms.png +share/icons/gnome/48x48/devices/gnome-dev-media-sdmmc.png +share/icons/gnome/48x48/devices/gnome-dev-media-sm.png share/icons/gnome/48x48/devices/gnome-dev-memory.png share/icons/gnome/48x48/devices/gnome-dev-mouse-ball.png share/icons/gnome/48x48/devices/gnome-dev-mouse-optical.png share/icons/gnome/48x48/devices/gnome-dev-pcmcia.png share/icons/gnome/48x48/devices/gnome-dev-printer.png +share/icons/gnome/48x48/devices/gnome-dev-removable-1394.png +share/icons/gnome/48x48/devices/gnome-dev-removable-usb.png share/icons/gnome/48x48/devices/gnome-dev-removable.png share/icons/gnome/48x48/devices/gnome-dev-symlink.png share/icons/gnome/48x48/devices/gnome-dev-zipdisk.png @@ -107,15 +135,23 @@ share/icons/gnome/48x48/emblems/emblem-certified.icon share/icons/gnome/48x48/emblems/emblem-certified.png share/icons/gnome/48x48/emblems/emblem-cool.icon share/icons/gnome/48x48/emblems/emblem-cool.png +share/icons/gnome/48x48/emblems/emblem-cvs-added.icon share/icons/gnome/48x48/emblems/emblem-cvs-added.png +share/icons/gnome/48x48/emblems/emblem-cvs-conflict.icon share/icons/gnome/48x48/emblems/emblem-cvs-conflict.png +share/icons/gnome/48x48/emblems/emblem-cvs-controlled.icon share/icons/gnome/48x48/emblems/emblem-cvs-controlled.png +share/icons/gnome/48x48/emblems/emblem-cvs-modified.icon share/icons/gnome/48x48/emblems/emblem-cvs-modified.png +share/icons/gnome/48x48/emblems/emblem-cvs-new-file.icon share/icons/gnome/48x48/emblems/emblem-cvs-new-file.png +share/icons/gnome/48x48/emblems/emblem-cvs-removed.icon share/icons/gnome/48x48/emblems/emblem-cvs-removed.png +share/icons/gnome/48x48/emblems/emblem-cvs-sticky-tag.icon share/icons/gnome/48x48/emblems/emblem-cvs-sticky-tag.png share/icons/gnome/48x48/emblems/emblem-danger.icon share/icons/gnome/48x48/emblems/emblem-danger.png +share/icons/gnome/48x48/emblems/emblem-desktop.icon share/icons/gnome/48x48/emblems/emblem-desktop.png share/icons/gnome/48x48/emblems/emblem-documents.icon share/icons/gnome/48x48/emblems/emblem-documents.png @@ -139,8 +175,11 @@ share/icons/gnome/48x48/emblems/emblem-multimedia.icon share/icons/gnome/48x48/emblems/emblem-multimedia.png share/icons/gnome/48x48/emblems/emblem-new.icon share/icons/gnome/48x48/emblems/emblem-new.png +share/icons/gnome/48x48/emblems/emblem-noread.icon share/icons/gnome/48x48/emblems/emblem-noread.png +share/icons/gnome/48x48/emblems/emblem-note.icon share/icons/gnome/48x48/emblems/emblem-note.png +share/icons/gnome/48x48/emblems/emblem-nowrite.icon share/icons/gnome/48x48/emblems/emblem-nowrite.png share/icons/gnome/48x48/emblems/emblem-ohno.icon share/icons/gnome/48x48/emblems/emblem-ohno.png @@ -162,7 +201,9 @@ share/icons/gnome/48x48/emblems/emblem-sound.icon share/icons/gnome/48x48/emblems/emblem-sound.png share/icons/gnome/48x48/emblems/emblem-special.icon share/icons/gnome/48x48/emblems/emblem-special.png +share/icons/gnome/48x48/emblems/emblem-symbolic-link.icon share/icons/gnome/48x48/emblems/emblem-symbolic-link.png +share/icons/gnome/48x48/emblems/emblem-trash.icon share/icons/gnome/48x48/emblems/emblem-trash.png share/icons/gnome/48x48/emblems/emblem-urgent.icon share/icons/gnome/48x48/emblems/emblem-urgent.png @@ -221,12 +262,14 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-wordperfect.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-abiword.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-applix-spreadsheet.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-applix-word.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-archive.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-arj.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-backup.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bittorrent.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-blender.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip.png @@ -357,6 +400,7 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-java.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-literate-haskell.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-lyx.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-makefile.png +share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-objcsrc.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-patch.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-readme.png share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-scheme.png @@ -504,6 +548,7 @@ share/icons/hicolor/16x16/stock/data/stock_goal-seek.png share/icons/hicolor/16x16/stock/data/stock_insert-fields.png share/icons/hicolor/16x16/stock/data/stock_lock-broken.png share/icons/hicolor/16x16/stock/data/stock_lock-ok.png +share/icons/hicolor/16x16/stock/data/stock_lock-open.png share/icons/hicolor/16x16/stock/data/stock_lock.png share/icons/hicolor/16x16/stock/data/stock_record-number.png share/icons/hicolor/16x16/stock/data/stock_signature-bad.png @@ -541,6 +586,32 @@ share/icons/hicolor/16x16/stock/document/stock_task-recurring.png share/icons/hicolor/16x16/stock/document/stock_task.png share/icons/hicolor/16x16/stock/document/stock_todo.png share/icons/hicolor/16x16/stock/document/stock_view-html-source.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-1.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-10.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-11.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-12.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-13.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-14.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-15.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-16.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-17.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-18.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-19.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-2.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-20.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-21.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-22.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-23.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-24.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-25.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-26.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-3.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-4.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-5.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-6.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-7.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-8.png +share/icons/hicolor/16x16/stock/emoticons/stock_smiley-9.png share/icons/hicolor/16x16/stock/form/stock_form-activation-order.png share/icons/hicolor/16x16/stock/form/stock_form-add-field.png share/icons/hicolor/16x16/stock/form/stock_form-automatic-control-focus.png @@ -657,6 +728,7 @@ share/icons/hicolor/16x16/stock/generic/stock_score-low.png share/icons/hicolor/16x16/stock/generic/stock_score-lower.png share/icons/hicolor/16x16/stock/generic/stock_score-lowest.png share/icons/hicolor/16x16/stock/generic/stock_score-normal.png +share/icons/hicolor/16x16/stock/generic/stock_search-and-replace.png share/icons/hicolor/16x16/stock/generic/stock_search.png share/icons/hicolor/16x16/stock/generic/stock_send-fax.png share/icons/hicolor/16x16/stock/generic/stock_show-all.png @@ -847,12 +919,14 @@ share/icons/hicolor/16x16/stock/io/stock_print.png share/icons/hicolor/16x16/stock/io/stock_printers.png share/icons/hicolor/16x16/stock/io/stock_reload.png share/icons/hicolor/16x16/stock/io/stock_save-as.png -share/icons/hicolor/16x16/stock/io/stock_save_as.png share/icons/hicolor/16x16/stock/io/stock_save-pdf.png share/icons/hicolor/16x16/stock/io/stock_save-template.png share/icons/hicolor/16x16/stock/io/stock_save.png +share/icons/hicolor/16x16/stock/io/stock_save_as.png share/icons/hicolor/16x16/stock/io/stock_up-one-dir.png +share/icons/hicolor/16x16/stock/media/stock_3dsound.png share/icons/hicolor/16x16/stock/media/stock_effects-sound.png +share/icons/hicolor/16x16/stock/media/stock_headphones.png share/icons/hicolor/16x16/stock/media/stock_insert-video-plugin.png share/icons/hicolor/16x16/stock/media/stock_line_in.png share/icons/hicolor/16x16/stock/media/stock_media-fwd.png @@ -1045,6 +1119,7 @@ share/icons/hicolor/16x16/stock/object/stock_insert-math-object.png share/icons/hicolor/16x16/stock/object/stock_insert-note.png share/icons/hicolor/16x16/stock/object/stock_insert-ole-object.png share/icons/hicolor/16x16/stock/object/stock_insert-plugin.png +share/icons/hicolor/16x16/stock/object/stock_insert-rule.png share/icons/hicolor/16x16/stock/object/stock_insert-single-column-text-frame.png share/icons/hicolor/16x16/stock/object/stock_insert-slide.png share/icons/hicolor/16x16/stock/object/stock_insert-sound-plugin.png @@ -1102,6 +1177,7 @@ share/icons/hicolor/16x16/stock/table/stock_insert-cells.png share/icons/hicolor/16x16/stock/table/stock_insert-columns.png share/icons/hicolor/16x16/stock/table/stock_insert-names-define.png share/icons/hicolor/16x16/stock/table/stock_insert-rows.png +share/icons/hicolor/16x16/stock/table/stock_insert-table.png share/icons/hicolor/16x16/stock/table/stock_select-cell.png share/icons/hicolor/16x16/stock/table/stock_select-column.png share/icons/hicolor/16x16/stock/table/stock_select-row.png @@ -1207,6 +1283,7 @@ share/icons/hicolor/16x16/stock/text/stock_superscript.png share/icons/hicolor/16x16/stock/text/stock_text-direction-ltr.png share/icons/hicolor/16x16/stock/text/stock_text-direction-ttb.png share/icons/hicolor/16x16/stock/text/stock_text-double-click-to-edit.png +share/icons/hicolor/16x16/stock/text/stock_text-monospaced.png share/icons/hicolor/16x16/stock/text/stock_text-outline.png share/icons/hicolor/16x16/stock/text/stock_text-quickedit.png share/icons/hicolor/16x16/stock/text/stock_text-select-text-only.png @@ -1327,6 +1404,7 @@ share/icons/hicolor/24x24/stock/data/stock_goal-seek.png share/icons/hicolor/24x24/stock/data/stock_insert-fields.png share/icons/hicolor/24x24/stock/data/stock_lock-broken.png share/icons/hicolor/24x24/stock/data/stock_lock-ok.png +share/icons/hicolor/24x24/stock/data/stock_lock-open.png share/icons/hicolor/24x24/stock/data/stock_lock.png share/icons/hicolor/24x24/stock/data/stock_record-number.png share/icons/hicolor/24x24/stock/data/stock_signature-bad.png @@ -1467,6 +1545,7 @@ share/icons/hicolor/24x24/stock/generic/stock_properties.png share/icons/hicolor/24x24/stock/generic/stock_redo.png share/icons/hicolor/24x24/stock/generic/stock_refresh.png share/icons/hicolor/24x24/stock/generic/stock_scores.png +share/icons/hicolor/24x24/stock/generic/stock_search-and-replace.png share/icons/hicolor/24x24/stock/generic/stock_search.png share/icons/hicolor/24x24/stock/generic/stock_send-fax.png share/icons/hicolor/24x24/stock/generic/stock_show-all.png @@ -1635,11 +1714,13 @@ share/icons/hicolor/24x24/stock/io/stock_print.png share/icons/hicolor/24x24/stock/io/stock_printers.png share/icons/hicolor/24x24/stock/io/stock_reload.png share/icons/hicolor/24x24/stock/io/stock_save-as.png -share/icons/hicolor/24x24/stock/io/stock_save_as.png share/icons/hicolor/24x24/stock/io/stock_save-pdf.png share/icons/hicolor/24x24/stock/io/stock_save-template.png share/icons/hicolor/24x24/stock/io/stock_save.png +share/icons/hicolor/24x24/stock/io/stock_save_as.png +share/icons/hicolor/24x24/stock/media/stock_3dsound.png share/icons/hicolor/24x24/stock/media/stock_effects-sound.png +share/icons/hicolor/24x24/stock/media/stock_headphones.png share/icons/hicolor/24x24/stock/media/stock_insert-video-plugin.png share/icons/hicolor/24x24/stock/media/stock_line_in.png share/icons/hicolor/24x24/stock/media/stock_media-fwd.png @@ -1768,6 +1849,7 @@ share/icons/hicolor/24x24/stock/object/stock_insert-math-object.png share/icons/hicolor/24x24/stock/object/stock_insert-note.png share/icons/hicolor/24x24/stock/object/stock_insert-ole-object.png share/icons/hicolor/24x24/stock/object/stock_insert-plugin.png +share/icons/hicolor/24x24/stock/object/stock_insert-rule.png share/icons/hicolor/24x24/stock/object/stock_insert-single-column-text-frame.png share/icons/hicolor/24x24/stock/object/stock_insert-slide.png share/icons/hicolor/24x24/stock/object/stock_insert-sound-plugin.png @@ -1825,6 +1907,7 @@ share/icons/hicolor/24x24/stock/table/stock_insert-cells.png share/icons/hicolor/24x24/stock/table/stock_insert-columns.png share/icons/hicolor/24x24/stock/table/stock_insert-names-define.png share/icons/hicolor/24x24/stock/table/stock_insert-rows.png +share/icons/hicolor/24x24/stock/table/stock_insert-table.png share/icons/hicolor/24x24/stock/table/stock_select-cell.png share/icons/hicolor/24x24/stock/table/stock_select-column.png share/icons/hicolor/24x24/stock/table/stock_select-row.png @@ -1906,6 +1989,7 @@ share/icons/hicolor/24x24/stock/text/stock_superscript.png share/icons/hicolor/24x24/stock/text/stock_text-direction-ltr.png share/icons/hicolor/24x24/stock/text/stock_text-direction-ttb.png share/icons/hicolor/24x24/stock/text/stock_text-double-click-to-edit.png +share/icons/hicolor/24x24/stock/text/stock_text-monospaced.png share/icons/hicolor/24x24/stock/text/stock_text-outline.png share/icons/hicolor/24x24/stock/text/stock_text-quickedit.png share/icons/hicolor/24x24/stock/text/stock_text-select-text-only.png @@ -1994,6 +2078,7 @@ share/icons/hicolor/32x32/stock/data/stock_data-sources-hand.png share/icons/hicolor/32x32/stock/data/stock_data-sources.png share/icons/hicolor/32x32/stock/data/stock_lock-broken.png share/icons/hicolor/32x32/stock/data/stock_lock-ok.png +share/icons/hicolor/32x32/stock/data/stock_lock-open.png share/icons/hicolor/32x32/stock/data/stock_lock.png share/icons/hicolor/32x32/stock/data/stock_signature-bad.png share/icons/hicolor/32x32/stock/data/stock_signature-ok.png @@ -2057,6 +2142,7 @@ share/icons/hicolor/32x32/stock/net/stock_internet.png share/icons/hicolor/32x32/stock/net/stock_mail-import.png share/icons/hicolor/32x32/stock/net/stock_mail-open.png share/icons/hicolor/32x32/stock/net/stock_mail-receive.png +share/icons/hicolor/32x32/stock/net/stock_mail-send-receive.png share/icons/hicolor/32x32/stock/net/stock_mail-send.png share/icons/hicolor/32x32/stock/net/stock_mail.png share/icons/hicolor/32x32/stock/net/stock_not-spam.png @@ -2186,6 +2272,7 @@ share/icons/hicolor/48x48/apps/xsane.png share/icons/hicolor/48x48/stock/code/stock_script.png share/icons/hicolor/48x48/stock/data/stock_lock-broken.png share/icons/hicolor/48x48/stock/data/stock_lock-ok.png +share/icons/hicolor/48x48/stock/data/stock_lock-open.png share/icons/hicolor/48x48/stock/data/stock_lock.png share/icons/hicolor/48x48/stock/data/stock_signature-bad.png share/icons/hicolor/48x48/stock/data/stock_signature-ok.png @@ -2267,6 +2354,7 @@ share/icons/hicolor/48x48/stock/net/stock_mail-flag-for-followup.png share/icons/hicolor/48x48/stock/net/stock_mail-import.png share/icons/hicolor/48x48/stock/net/stock_mail-open.png share/icons/hicolor/48x48/stock/net/stock_mail-receive.png +share/icons/hicolor/48x48/stock/net/stock_mail-send-receive.png share/icons/hicolor/48x48/stock/net/stock_mail-send.png share/icons/hicolor/48x48/stock/net/stock_mail.png share/icons/hicolor/48x48/stock/net/stock_not-spam.png @@ -2302,6 +2390,7 @@ share/icons/hicolor/96x96/apps/gnome-starthere.png @unexec /bin/rmdir %D/share/icons/hicolor/24x24/apps 2> /dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/hicolor/24x24 2> /dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/generic 2> /dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/emoticons 2> /dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/document 2> /dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/scalable/mimetypes 2> /dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/scalable/filesystems 2> /dev/null || /usr/bin/true @@ -2331,6 +2420,7 @@ share/icons/hicolor/96x96/apps/gnome-starthere.png @unexec /bin/rmdir %D/share/icons/gnome/36x36 2> /dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/32x32/mimetypes 2> /dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/32x32/filesystems 2> /dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/32x32/devices 2> /dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/32x32 2> /dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/24x24/mimetypes 2> /dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/icons/gnome/24x24/filesystems 2> /dev/null || /usr/bin/true diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index f5d417a837c5..918376f9db1e 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomeuserdocs2 -PORTVERSION= 2.6.0.1 +PORTVERSION= 2.8.1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.6 +MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.8 DISTNAME= gnome2-user-docs-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo index 5f26a52d9d98..3b818acc6e8e 100644 --- a/misc/gnome-user-docs/distinfo +++ b/misc/gnome-user-docs/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome2-user-docs-2.6.0.1.tar.bz2) = 8125558f7f515b681fdeb853adf06ebb -SIZE (gnome2/gnome2-user-docs-2.6.0.1.tar.bz2) = 1018591 +MD5 (gnome2/gnome2-user-docs-2.8.1.tar.bz2) = 90bdd21ea3e3e794f641dd805216f275 +SIZE (gnome2/gnome2-user-docs-2.8.1.tar.bz2) = 1054681 diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist index aa6f26f30a0e..2786bf221d96 100644 --- a/misc/gnome-user-docs/pkg-plist +++ b/misc/gnome-user-docs/pkg-plist @@ -113,6 +113,7 @@ share/gnome/help/user-guide/C/figures/workspace_switcher_applet.png share/gnome/help/user-guide/C/glossary.xml share/gnome/help/user-guide/C/gosbasic.xml share/gnome/help/user-guide/C/goscustaccess.xml +share/gnome/help/user-guide/C/goscustdesk-remotedesktop.xml share/gnome/help/user-guide/C/goscustdesk.xml share/gnome/help/user-guide/C/goscustlookandfeel.xml share/gnome/help/user-guide/C/gosdeskback.xml diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile index f5d417a837c5..918376f9db1e 100644 --- a/misc/gnomeuserdocs2/Makefile +++ b/misc/gnomeuserdocs2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomeuserdocs2 -PORTVERSION= 2.6.0.1 +PORTVERSION= 2.8.1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.6 +MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.8 DISTNAME= gnome2-user-docs-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/misc/gnomeuserdocs2/distinfo b/misc/gnomeuserdocs2/distinfo index 5f26a52d9d98..3b818acc6e8e 100644 --- a/misc/gnomeuserdocs2/distinfo +++ b/misc/gnomeuserdocs2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome2-user-docs-2.6.0.1.tar.bz2) = 8125558f7f515b681fdeb853adf06ebb -SIZE (gnome2/gnome2-user-docs-2.6.0.1.tar.bz2) = 1018591 +MD5 (gnome2/gnome2-user-docs-2.8.1.tar.bz2) = 90bdd21ea3e3e794f641dd805216f275 +SIZE (gnome2/gnome2-user-docs-2.8.1.tar.bz2) = 1054681 diff --git a/misc/gnomeuserdocs2/pkg-plist b/misc/gnomeuserdocs2/pkg-plist index aa6f26f30a0e..2786bf221d96 100644 --- a/misc/gnomeuserdocs2/pkg-plist +++ b/misc/gnomeuserdocs2/pkg-plist @@ -113,6 +113,7 @@ share/gnome/help/user-guide/C/figures/workspace_switcher_applet.png share/gnome/help/user-guide/C/glossary.xml share/gnome/help/user-guide/C/gosbasic.xml share/gnome/help/user-guide/C/goscustaccess.xml +share/gnome/help/user-guide/C/goscustdesk-remotedesktop.xml share/gnome/help/user-guide/C/goscustdesk.xml share/gnome/help/user-guide/C/goscustlookandfeel.xml share/gnome/help/user-guide/C/gosdeskback.xml diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile index d8bf33ffbf85..3a09ab11c503 100644 --- a/multimedia/nautilus-media/Makefile +++ b/multimedia/nautilus-media/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nautilus-media -PORTVERSION= 0.8.0 -PORTREVISION= 4 +PORTVERSION= 0.8.1 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 diff --git a/multimedia/nautilus-media/distinfo b/multimedia/nautilus-media/distinfo index c22a3f7ba884..dc6fb6216567 100644 --- a/multimedia/nautilus-media/distinfo +++ b/multimedia/nautilus-media/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-media-0.8.0.tar.bz2) = 78b2cdc9146af482cac52a549440e1ca -SIZE (gnome2/nautilus-media-0.8.0.tar.bz2) = 411161 +MD5 (gnome2/nautilus-media-0.8.1.tar.bz2) = 4ad604430b213a899c1217f5f4633887 +SIZE (gnome2/nautilus-media-0.8.1.tar.bz2) = 418924 diff --git a/multimedia/nautilus-media/pkg-plist b/multimedia/nautilus-media/pkg-plist index bfd20679f3e4..b9fb4a8a167c 100644 --- a/multimedia/nautilus-media/pkg-plist +++ b/multimedia/nautilus-media/pkg-plist @@ -20,6 +20,7 @@ share/locale/az/LC_MESSAGES/nautilus-media.mo share/locale/be/LC_MESSAGES/nautilus-media.mo share/locale/bg/LC_MESSAGES/nautilus-media.mo share/locale/bn/LC_MESSAGES/nautilus-media.mo +share/locale/bs/LC_MESSAGES/nautilus-media.mo share/locale/ca/LC_MESSAGES/nautilus-media.mo share/locale/cs/LC_MESSAGES/nautilus-media.mo share/locale/cy/LC_MESSAGES/nautilus-media.mo @@ -27,6 +28,7 @@ share/locale/da/LC_MESSAGES/nautilus-media.mo share/locale/de/LC_MESSAGES/nautilus-media.mo share/locale/el/LC_MESSAGES/nautilus-media.mo share/locale/en_GB/LC_MESSAGES/nautilus-media.mo +share/locale/en_CA/LC_MESSAGES/nautilus-media.mo share/locale/es/LC_MESSAGES/nautilus-media.mo share/locale/et/LC_MESSAGES/nautilus-media.mo share/locale/eu/LC_MESSAGES/nautilus-media.mo @@ -34,6 +36,7 @@ share/locale/fa/LC_MESSAGES/nautilus-media.mo share/locale/fi/LC_MESSAGES/nautilus-media.mo share/locale/fr/LC_MESSAGES/nautilus-media.mo share/locale/ga/LC_MESSAGES/nautilus-media.mo +share/locale/gu/LC_MESSAGES/nautilus-media.mo share/locale/he/LC_MESSAGES/nautilus-media.mo share/locale/hi/LC_MESSAGES/nautilus-media.mo share/locale/hr/LC_MESSAGES/nautilus-media.mo @@ -46,13 +49,16 @@ share/locale/ko/LC_MESSAGES/nautilus-media.mo share/locale/li/LC_MESSAGES/nautilus-media.mo share/locale/lt/LC_MESSAGES/nautilus-media.mo share/locale/lv/LC_MESSAGES/nautilus-media.mo +share/locale/mi/LC_MESSAGES/nautilus-media.mo share/locale/mk/LC_MESSAGES/nautilus-media.mo share/locale/ml/LC_MESSAGES/nautilus-media.mo share/locale/mn/LC_MESSAGES/nautilus-media.mo share/locale/ms/LC_MESSAGES/nautilus-media.mo +share/locale/nb/LC_MESSAGES/nautilus-media.mo share/locale/nl/LC_MESSAGES/nautilus-media.mo share/locale/nn/LC_MESSAGES/nautilus-media.mo share/locale/no/LC_MESSAGES/nautilus-media.mo +share/locale/or/LC_MESSAGES/nautilus-media.mo share/locale/pa/LC_MESSAGES/nautilus-media.mo share/locale/pl/LC_MESSAGES/nautilus-media.mo share/locale/pt/LC_MESSAGES/nautilus-media.mo @@ -67,6 +73,7 @@ share/locale/sr@Latn/LC_MESSAGES/nautilus-media.mo share/locale/sv/LC_MESSAGES/nautilus-media.mo share/locale/ta/LC_MESSAGES/nautilus-media.mo share/locale/th/LC_MESSAGES/nautilus-media.mo +share/locale/tk/LC_MESSAGES/nautilus-media.mo share/locale/tr/LC_MESSAGES/nautilus-media.mo share/locale/uk/LC_MESSAGES/nautilus-media.mo share/locale/vi/LC_MESSAGES/nautilus-media.mo diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index 719af263702c..0827ba51d92c 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -6,10 +6,11 @@ # PORTNAME= gnomenetstatus -PORTVERSION= 2.6.2.1 +PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.6 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.8 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,10 +19,13 @@ COMMENT= A GNOME applet that shows network status USE_X_PREFIX= yes USE_BZIP2= yes +GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= netstatus.schemas + .include <bsd.port.mk> diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo index 80285c4d8eca..1ad8a9f94236 100644 --- a/net/gnome-netstatus/distinfo +++ b/net/gnome-netstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-2.6.2.1.tar.bz2) = 7f0584bcf3eea67282cd748b2edf4096 -SIZE (gnome2/gnome-netstatus-2.6.2.1.tar.bz2) = 434086 +MD5 (gnome2/gnome-netstatus-2.8.0.tar.bz2) = fadc8a26ff7142e1372740d2edc435b1 +SIZE (gnome2/gnome-netstatus-2.8.0.tar.bz2) = 492599 diff --git a/net/gnome-netstatus/files/patch-configure b/net/gnome-netstatus/files/patch-configure deleted file mode 100644 index f195f07b43c6..000000000000 --- a/net/gnome-netstatus/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Wed Dec 11 18:31:51 2002 -+++ configure Thu Dec 12 12:07:17 2002 -@@ -7414,6 +7414,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 --git a/net/gnome-netstatus/files/patch-icons_Makefile.in b/net/gnome-netstatus/files/patch-icons_Makefile.in index 33fd6338d46f..322be3dd67c5 100644 --- a/net/gnome-netstatus/files/patch-icons_Makefile.in +++ b/net/gnome-netstatus/files/patch-icons_Makefile.in @@ -1,11 +1,11 @@ ---- icons/Makefile.in.orig Tue Apr 20 01:06:15 2004 -+++ icons/Makefile.in Tue Apr 20 01:06:49 2004 +--- icons/Makefile.in.orig Wed Jun 9 14:26:05 2004 ++++ icons/Makefile.in Wed Jun 9 14:26:34 2004 @@ -137,7 +137,7 @@ iconsize = 48x48 category = apps -iconsdir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +iconsdir = $(prefix)/share/icons/hicolor/$(iconsize)/$(category) - icons_DATA = gnome-netstatus-disconn.png gnome-netstatus-idle.png gnome-netstatus-rx.png gnome-netstatus-tx.png gnome-netstatus-txrx.png gnome-netstatus-error.png + icons_DATA = gnome-netstatus-disconn.png gnome-netstatus-idle.png gnome-netstatus-rx.png gnome-netstatus-tx.png gnome-netstatus-txrx.png gnome-netstatus-error.png gnome-netstatus-0-24.png gnome-netstatus-25-49.png gnome-netstatus-50-74.png gnome-netstatus-75-100.png diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c new file mode 100644 index 000000000000..a13a23161769 --- /dev/null +++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c @@ -0,0 +1,207 @@ +--- src/netstatus-sysdeps.c.orig Fri Jul 30 04:19:31 2004 ++++ src/netstatus-sysdeps.c Tue Sep 21 00:27:19 2004 +@@ -35,6 +35,16 @@ + #include <glib.h> + #include <libgnome/gnome-i18n.h> + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <sys/ioctl.h> ++#include <net/if.h> ++#include <net/if_var.h> ++#include <dev/an/if_aironet_ieee.h> ++#include <dev/wi/if_wavelan_ieee.h> ++#endif ++ + static inline gboolean + parse_stats (char *buf, + int prx_idx, +@@ -384,6 +394,163 @@ + } + } + ++static inline gboolean ++wireless_getval (const char *iface, ++ gpointer req, ++ unsigned long req_type, ++ char **error) ++{ ++ struct ifreq ifr; ++ int s; ++ ++ memset (&ifr, 0, sizeof (ifr)); ++ ++ strlcpy (ifr.ifr_name, iface, sizeof (ifr.ifr_name)); ++ ifr.ifr_data = (caddr_t) req; ++ ++ s = socket (AF_INET, SOCK_DGRAM, 0); ++ ++ if (s == -1) { ++ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); ++ return FALSE; ++ } ++ ++ if (ioctl (s, req_type, &ifr) == -1) { ++ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); ++ close (s); ++ return FALSE; ++ } ++ ++ close (s); ++ return TRUE; ++} ++ ++static inline char* ++get_an_data (const char *iface, ++ int *signal_strength) ++{ ++ struct an_req areq; ++ struct an_ltv_status *sts; ++#ifdef AN_RID_RSSI_MAP ++ struct an_ltv_rssi_map an_rssimap; ++#endif ++ int level; ++ char *error = NULL; ++ gboolean rssimap_valid = FALSE; ++ ++#ifdef AN_RID_RSSI_MAP ++ an_rssimap.an_len = sizeof (an_rssimap); ++ an_rssimap.an_type = AN_RID_RSSI_MAP; ++ rssimap_valid = wireless_getval (iface, (gpointer) &an_rssimap, SIOCGAIRONET, &error); ++#endif ++ ++ areq.an_len = sizeof (areq); ++ areq.an_type = AN_RID_STATUS; ++ ++ if (!wireless_getval (iface, (gpointer) &areq, SIOCGAIRONET, &error)) ++ return error; ++ ++ sts = (struct an_ltv_status *)&areq; ++#ifdef AN_RID_RSSI_MAP ++ if (rssimap_valid) ++ level = (int) (an_rssimap.an_entries[sts->an_normalized_strength].an_rss_pct); ++ else ++ level = (int) (sts->an_normalized_strength); ++#else ++ level = (int) (sts->an_normalized_rssi); ++#endif ++ memcpy (signal_strength, &level, sizeof (signal_strength)); ++ ++ return error; ++} ++ ++static inline char* ++get_wi_data (const char *iface, ++ int *signal_strength) ++{ ++ struct wi_req wreq; ++ int level; ++ char *error = NULL; ++ ++ memset (&wreq, 0, sizeof (wreq)); ++ ++ wreq.wi_len = WI_MAX_DATALEN; ++ wreq.wi_type = WI_RID_COMMS_QUALITY; ++ ++ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) ++ return error; ++ ++ level = (int) (wreq.wi_val[1]); ++ ++#ifdef WI_RID_READ_APS ++ if (signal_strength <= 0) { ++ /* we fail to get signal strength by usual means, try another way */ ++ static time_t last_scan; ++ static long int cached; ++ time_t now = time (NULL); ++ ++ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ ++ if (now > last_scan + 5) { ++ struct wi_apinfo *w; ++ int nstations; ++ ++ bzero ((char *)&wreq, sizeof(wreq)); ++ wreq.wi_len = WI_MAX_DATALEN; ++ wreq.wi_type = WI_RID_READ_APS; ++ ++ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) ++ return error; ++ nstations = *(int *)wreq.wi_val; ++ if (nstations > 0) { ++ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); ++ signal_strength = (long int)w->signal; ++ } ++ ++ cached = signal_strength; ++ last_scan = now; ++ } else { ++ signal_strength = cached; ++ } ++ } ++#endif ++ ++ memcpy (signal_strength, &level, sizeof (signal_strength)); ++ ++ return error; ++} ++ ++char * ++netstatus_sysdeps_read_iface_wireless_details (const char *iface, ++ gboolean *is_wireless, ++ int *signal_strength) ++{ ++ char *error_message = NULL; ++ ++ g_return_val_if_fail (iface != NULL, NULL); ++ g_return_val_if_fail (is_wireless != NULL, NULL); ++ g_return_val_if_fail (signal_strength != NULL, NULL); ++ ++ if (is_wireless) ++ *is_wireless = FALSE; ++ if (signal_strength) ++ *signal_strength = 0; ++ ++ if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) && ++ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4)) ++ return error_message; ++ ++ if (g_strncasecmp (iface, "an", 2) == 0) { ++ error_message = get_an_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } ++ else { ++ error_message = get_wi_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } ++ ++ return error_message; ++} ++ + char * + netstatus_sysdeps_read_iface_statistics (const char *iface, + gulong *in_packets, +@@ -485,23 +652,6 @@ + g_strfreev (argv); + + return error_message; +-} +- +-char * +-netstatus_sysdeps_read_iface_wireless_details (const char *iface, +- gboolean *is_wireless, +- int *signal_strength) +-{ +- g_return_val_if_fail (iface != NULL, NULL); +- g_return_val_if_fail (is_wireless != NULL, NULL); +- g_return_val_if_fail (signal_strength_wireless != NULL, NULL); +- +- if (is_wireless) +- *is_wireless = FALSE; +- if (signal_strength) +- *signal_strength = 0; +- +- return NULL; + } + + #endif /* !defined(__FreeBSD__) */ diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist index d4ed9ddf3ed4..870993198a33 100644 --- a/net/gnome-netstatus/pkg-plist +++ b/net/gnome-netstatus/pkg-plist @@ -1,6 +1,3 @@ -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/netstatus.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/netstatus.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/netstatus.schemas > /dev/null || /usr/bin/true libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server libexec/gnome-netstatus-applet share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml @@ -116,6 +113,10 @@ share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-netstatus-tx.png +share/icons/hicolor/48x48/apps/gnome-netstatus-0-24.png +share/icons/hicolor/48x48/apps/gnome-netstatus-25-49.png +share/icons/hicolor/48x48/apps/gnome-netstatus-50-74.png +share/icons/hicolor/48x48/apps/gnome-netstatus-75-100.png share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png share/icons/hicolor/48x48/apps/gnome-netstatus-error.png share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png @@ -126,6 +127,7 @@ share/locale/ar/LC_MESSAGES/gnome-netstatus.mo share/locale/az/LC_MESSAGES/gnome-netstatus.mo share/locale/bg/LC_MESSAGES/gnome-netstatus.mo share/locale/bn/LC_MESSAGES/gnome-netstatus.mo +share/locale/bs/LC_MESSAGES/gnome-netstatus.mo share/locale/ca/LC_MESSAGES/gnome-netstatus.mo share/locale/cs/LC_MESSAGES/gnome-netstatus.mo share/locale/cy/LC_MESSAGES/gnome-netstatus.mo @@ -135,9 +137,11 @@ share/locale/el/LC_MESSAGES/gnome-netstatus.mo share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo share/locale/es/LC_MESSAGES/gnome-netstatus.mo +share/locale/eu/LC_MESSAGES/gnome-netstatus.mo share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo share/locale/ga/LC_MESSAGES/gnome-netstatus.mo +share/locale/gu/LC_MESSAGES/gnome-netstatus.mo share/locale/hi/LC_MESSAGES/gnome-netstatus.mo share/locale/hr/LC_MESSAGES/gnome-netstatus.mo share/locale/hu/LC_MESSAGES/gnome-netstatus.mo @@ -146,9 +150,9 @@ share/locale/it/LC_MESSAGES/gnome-netstatus.mo share/locale/ja/LC_MESSAGES/gnome-netstatus.mo share/locale/ko/LC_MESSAGES/gnome-netstatus.mo share/locale/lt/LC_MESSAGES/gnome-netstatus.mo -share/locale/mi/LC_MESSAGES/gnome-netstatus.mo share/locale/mn/LC_MESSAGES/gnome-netstatus.mo share/locale/ms/LC_MESSAGES/gnome-netstatus.mo +share/locale/nb/LC_MESSAGES/gnome-netstatus.mo share/locale/nl/LC_MESSAGES/gnome-netstatus.mo share/locale/nn/LC_MESSAGES/gnome-netstatus.mo share/locale/no/LC_MESSAGES/gnome-netstatus.mo @@ -163,12 +167,14 @@ share/locale/sq/LC_MESSAGES/gnome-netstatus.mo share/locale/sr/LC_MESSAGES/gnome-netstatus.mo share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo share/locale/sv/LC_MESSAGES/gnome-netstatus.mo +share/locale/ta/LC_MESSAGES/gnome-netstatus.mo share/locale/th/LC_MESSAGES/gnome-netstatus.mo share/locale/tr/LC_MESSAGES/gnome-netstatus.mo share/locale/uk/LC_MESSAGES/gnome-netstatus.mo share/locale/vi/LC_MESSAGES/gnome-netstatus.mo share/locale/wa/LC_MESSAGES/gnome-netstatus.mo share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo +share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/omf/gnome-netstatus @dirrm share/gnome/help/gnome-netstatus/zh_TW/figures @dirrm share/gnome/help/gnome-netstatus/zh_TW diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile index 719af263702c..0827ba51d92c 100644 --- a/net/gnomenetstatus/Makefile +++ b/net/gnomenetstatus/Makefile @@ -6,10 +6,11 @@ # PORTNAME= gnomenetstatus -PORTVERSION= 2.6.2.1 +PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.6 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.8 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,10 +19,13 @@ COMMENT= A GNOME applet that shows network status USE_X_PREFIX= yes USE_BZIP2= yes +GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= netstatus.schemas + .include <bsd.port.mk> diff --git a/net/gnomenetstatus/distinfo b/net/gnomenetstatus/distinfo index 80285c4d8eca..1ad8a9f94236 100644 --- a/net/gnomenetstatus/distinfo +++ b/net/gnomenetstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-2.6.2.1.tar.bz2) = 7f0584bcf3eea67282cd748b2edf4096 -SIZE (gnome2/gnome-netstatus-2.6.2.1.tar.bz2) = 434086 +MD5 (gnome2/gnome-netstatus-2.8.0.tar.bz2) = fadc8a26ff7142e1372740d2edc435b1 +SIZE (gnome2/gnome-netstatus-2.8.0.tar.bz2) = 492599 diff --git a/net/gnomenetstatus/files/patch-configure b/net/gnomenetstatus/files/patch-configure deleted file mode 100644 index f195f07b43c6..000000000000 --- a/net/gnomenetstatus/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Wed Dec 11 18:31:51 2002 -+++ configure Thu Dec 12 12:07:17 2002 -@@ -7414,6 +7414,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 --git a/net/gnomenetstatus/files/patch-icons_Makefile.in b/net/gnomenetstatus/files/patch-icons_Makefile.in index 33fd6338d46f..322be3dd67c5 100644 --- a/net/gnomenetstatus/files/patch-icons_Makefile.in +++ b/net/gnomenetstatus/files/patch-icons_Makefile.in @@ -1,11 +1,11 @@ ---- icons/Makefile.in.orig Tue Apr 20 01:06:15 2004 -+++ icons/Makefile.in Tue Apr 20 01:06:49 2004 +--- icons/Makefile.in.orig Wed Jun 9 14:26:05 2004 ++++ icons/Makefile.in Wed Jun 9 14:26:34 2004 @@ -137,7 +137,7 @@ iconsize = 48x48 category = apps -iconsdir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +iconsdir = $(prefix)/share/icons/hicolor/$(iconsize)/$(category) - icons_DATA = gnome-netstatus-disconn.png gnome-netstatus-idle.png gnome-netstatus-rx.png gnome-netstatus-tx.png gnome-netstatus-txrx.png gnome-netstatus-error.png + icons_DATA = gnome-netstatus-disconn.png gnome-netstatus-idle.png gnome-netstatus-rx.png gnome-netstatus-tx.png gnome-netstatus-txrx.png gnome-netstatus-error.png gnome-netstatus-0-24.png gnome-netstatus-25-49.png gnome-netstatus-50-74.png gnome-netstatus-75-100.png diff --git a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c new file mode 100644 index 000000000000..a13a23161769 --- /dev/null +++ b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c @@ -0,0 +1,207 @@ +--- src/netstatus-sysdeps.c.orig Fri Jul 30 04:19:31 2004 ++++ src/netstatus-sysdeps.c Tue Sep 21 00:27:19 2004 +@@ -35,6 +35,16 @@ + #include <glib.h> + #include <libgnome/gnome-i18n.h> + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <sys/ioctl.h> ++#include <net/if.h> ++#include <net/if_var.h> ++#include <dev/an/if_aironet_ieee.h> ++#include <dev/wi/if_wavelan_ieee.h> ++#endif ++ + static inline gboolean + parse_stats (char *buf, + int prx_idx, +@@ -384,6 +394,163 @@ + } + } + ++static inline gboolean ++wireless_getval (const char *iface, ++ gpointer req, ++ unsigned long req_type, ++ char **error) ++{ ++ struct ifreq ifr; ++ int s; ++ ++ memset (&ifr, 0, sizeof (ifr)); ++ ++ strlcpy (ifr.ifr_name, iface, sizeof (ifr.ifr_name)); ++ ifr.ifr_data = (caddr_t) req; ++ ++ s = socket (AF_INET, SOCK_DGRAM, 0); ++ ++ if (s == -1) { ++ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); ++ return FALSE; ++ } ++ ++ if (ioctl (s, req_type, &ifr) == -1) { ++ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); ++ close (s); ++ return FALSE; ++ } ++ ++ close (s); ++ return TRUE; ++} ++ ++static inline char* ++get_an_data (const char *iface, ++ int *signal_strength) ++{ ++ struct an_req areq; ++ struct an_ltv_status *sts; ++#ifdef AN_RID_RSSI_MAP ++ struct an_ltv_rssi_map an_rssimap; ++#endif ++ int level; ++ char *error = NULL; ++ gboolean rssimap_valid = FALSE; ++ ++#ifdef AN_RID_RSSI_MAP ++ an_rssimap.an_len = sizeof (an_rssimap); ++ an_rssimap.an_type = AN_RID_RSSI_MAP; ++ rssimap_valid = wireless_getval (iface, (gpointer) &an_rssimap, SIOCGAIRONET, &error); ++#endif ++ ++ areq.an_len = sizeof (areq); ++ areq.an_type = AN_RID_STATUS; ++ ++ if (!wireless_getval (iface, (gpointer) &areq, SIOCGAIRONET, &error)) ++ return error; ++ ++ sts = (struct an_ltv_status *)&areq; ++#ifdef AN_RID_RSSI_MAP ++ if (rssimap_valid) ++ level = (int) (an_rssimap.an_entries[sts->an_normalized_strength].an_rss_pct); ++ else ++ level = (int) (sts->an_normalized_strength); ++#else ++ level = (int) (sts->an_normalized_rssi); ++#endif ++ memcpy (signal_strength, &level, sizeof (signal_strength)); ++ ++ return error; ++} ++ ++static inline char* ++get_wi_data (const char *iface, ++ int *signal_strength) ++{ ++ struct wi_req wreq; ++ int level; ++ char *error = NULL; ++ ++ memset (&wreq, 0, sizeof (wreq)); ++ ++ wreq.wi_len = WI_MAX_DATALEN; ++ wreq.wi_type = WI_RID_COMMS_QUALITY; ++ ++ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) ++ return error; ++ ++ level = (int) (wreq.wi_val[1]); ++ ++#ifdef WI_RID_READ_APS ++ if (signal_strength <= 0) { ++ /* we fail to get signal strength by usual means, try another way */ ++ static time_t last_scan; ++ static long int cached; ++ time_t now = time (NULL); ++ ++ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ ++ if (now > last_scan + 5) { ++ struct wi_apinfo *w; ++ int nstations; ++ ++ bzero ((char *)&wreq, sizeof(wreq)); ++ wreq.wi_len = WI_MAX_DATALEN; ++ wreq.wi_type = WI_RID_READ_APS; ++ ++ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) ++ return error; ++ nstations = *(int *)wreq.wi_val; ++ if (nstations > 0) { ++ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); ++ signal_strength = (long int)w->signal; ++ } ++ ++ cached = signal_strength; ++ last_scan = now; ++ } else { ++ signal_strength = cached; ++ } ++ } ++#endif ++ ++ memcpy (signal_strength, &level, sizeof (signal_strength)); ++ ++ return error; ++} ++ ++char * ++netstatus_sysdeps_read_iface_wireless_details (const char *iface, ++ gboolean *is_wireless, ++ int *signal_strength) ++{ ++ char *error_message = NULL; ++ ++ g_return_val_if_fail (iface != NULL, NULL); ++ g_return_val_if_fail (is_wireless != NULL, NULL); ++ g_return_val_if_fail (signal_strength != NULL, NULL); ++ ++ if (is_wireless) ++ *is_wireless = FALSE; ++ if (signal_strength) ++ *signal_strength = 0; ++ ++ if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) && ++ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4)) ++ return error_message; ++ ++ if (g_strncasecmp (iface, "an", 2) == 0) { ++ error_message = get_an_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } ++ else { ++ error_message = get_wi_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } ++ ++ return error_message; ++} ++ + char * + netstatus_sysdeps_read_iface_statistics (const char *iface, + gulong *in_packets, +@@ -485,23 +652,6 @@ + g_strfreev (argv); + + return error_message; +-} +- +-char * +-netstatus_sysdeps_read_iface_wireless_details (const char *iface, +- gboolean *is_wireless, +- int *signal_strength) +-{ +- g_return_val_if_fail (iface != NULL, NULL); +- g_return_val_if_fail (is_wireless != NULL, NULL); +- g_return_val_if_fail (signal_strength_wireless != NULL, NULL); +- +- if (is_wireless) +- *is_wireless = FALSE; +- if (signal_strength) +- *signal_strength = 0; +- +- return NULL; + } + + #endif /* !defined(__FreeBSD__) */ diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist index d4ed9ddf3ed4..870993198a33 100644 --- a/net/gnomenetstatus/pkg-plist +++ b/net/gnomenetstatus/pkg-plist @@ -1,6 +1,3 @@ -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/netstatus.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/netstatus.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/netstatus.schemas > /dev/null || /usr/bin/true libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server libexec/gnome-netstatus-applet share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml @@ -116,6 +113,10 @@ share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-netstatus-tx.png +share/icons/hicolor/48x48/apps/gnome-netstatus-0-24.png +share/icons/hicolor/48x48/apps/gnome-netstatus-25-49.png +share/icons/hicolor/48x48/apps/gnome-netstatus-50-74.png +share/icons/hicolor/48x48/apps/gnome-netstatus-75-100.png share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png share/icons/hicolor/48x48/apps/gnome-netstatus-error.png share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png @@ -126,6 +127,7 @@ share/locale/ar/LC_MESSAGES/gnome-netstatus.mo share/locale/az/LC_MESSAGES/gnome-netstatus.mo share/locale/bg/LC_MESSAGES/gnome-netstatus.mo share/locale/bn/LC_MESSAGES/gnome-netstatus.mo +share/locale/bs/LC_MESSAGES/gnome-netstatus.mo share/locale/ca/LC_MESSAGES/gnome-netstatus.mo share/locale/cs/LC_MESSAGES/gnome-netstatus.mo share/locale/cy/LC_MESSAGES/gnome-netstatus.mo @@ -135,9 +137,11 @@ share/locale/el/LC_MESSAGES/gnome-netstatus.mo share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo share/locale/es/LC_MESSAGES/gnome-netstatus.mo +share/locale/eu/LC_MESSAGES/gnome-netstatus.mo share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo share/locale/ga/LC_MESSAGES/gnome-netstatus.mo +share/locale/gu/LC_MESSAGES/gnome-netstatus.mo share/locale/hi/LC_MESSAGES/gnome-netstatus.mo share/locale/hr/LC_MESSAGES/gnome-netstatus.mo share/locale/hu/LC_MESSAGES/gnome-netstatus.mo @@ -146,9 +150,9 @@ share/locale/it/LC_MESSAGES/gnome-netstatus.mo share/locale/ja/LC_MESSAGES/gnome-netstatus.mo share/locale/ko/LC_MESSAGES/gnome-netstatus.mo share/locale/lt/LC_MESSAGES/gnome-netstatus.mo -share/locale/mi/LC_MESSAGES/gnome-netstatus.mo share/locale/mn/LC_MESSAGES/gnome-netstatus.mo share/locale/ms/LC_MESSAGES/gnome-netstatus.mo +share/locale/nb/LC_MESSAGES/gnome-netstatus.mo share/locale/nl/LC_MESSAGES/gnome-netstatus.mo share/locale/nn/LC_MESSAGES/gnome-netstatus.mo share/locale/no/LC_MESSAGES/gnome-netstatus.mo @@ -163,12 +167,14 @@ share/locale/sq/LC_MESSAGES/gnome-netstatus.mo share/locale/sr/LC_MESSAGES/gnome-netstatus.mo share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo share/locale/sv/LC_MESSAGES/gnome-netstatus.mo +share/locale/ta/LC_MESSAGES/gnome-netstatus.mo share/locale/th/LC_MESSAGES/gnome-netstatus.mo share/locale/tr/LC_MESSAGES/gnome-netstatus.mo share/locale/uk/LC_MESSAGES/gnome-netstatus.mo share/locale/vi/LC_MESSAGES/gnome-netstatus.mo share/locale/wa/LC_MESSAGES/gnome-netstatus.mo share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo +share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/omf/gnome-netstatus @dirrm share/gnome/help/gnome-netstatus/zh_TW/figures @dirrm share/gnome/help/gnome-netstatus/zh_TW diff --git a/net/vino/Makefile b/net/vino/Makefile index 96d5aa5c41bc..e11dabda5745 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -6,13 +6,13 @@ # PORTNAME= vino -PORTVERSION= 2.7.92 +PORTVERSION= 2.8.1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.7 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNOME 2 frontend for vncviewer +COMMENT= VNC server that allows for remote access to your GNOME desktop LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls @@ -22,6 +22,7 @@ USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_LIBTOOL_VER=15 +CONFIGURE_ARGS= --enable-session-support CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/vino/distinfo b/net/vino/distinfo index 68d871f77547..6785d59f40ee 100644 --- a/net/vino/distinfo +++ b/net/vino/distinfo @@ -1,2 +1,2 @@ -MD5 (vino-2.7.92.tar.bz2) = f69d190c194441d6923a7dbc10dfd790 -SIZE (vino-2.7.92.tar.bz2) = 491334 +MD5 (vino-2.8.1.tar.bz2) = 2005c5df2481f6d4f16d37a750989199 +SIZE (vino-2.8.1.tar.bz2) = 542710 diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist index 90bf0d87baf3..ba8c4a06fed8 100644 --- a/net/vino/pkg-plist +++ b/net/vino/pkg-plist @@ -9,9 +9,12 @@ share/gnome/control-center-2.0/capplets/vino-preferences.desktop share/gnome/pixmaps/gnome-remote-desktop.png share/gnome/vino/vino-preferences.glade share/gnome/vino/vino-prompt.glade +share/locale/ar/LC_MESSAGES/vino.mo +share/locale/az/LC_MESSAGES/vino.mo share/locale/bg/LC_MESSAGES/vino.mo share/locale/bn/LC_MESSAGES/vino.mo share/locale/bs/LC_MESSAGES/vino.mo +share/locale/ca/LC_MESSAGES/vino.mo share/locale/cs/LC_MESSAGES/vino.mo share/locale/da/LC_MESSAGES/vino.mo share/locale/de/LC_MESSAGES/vino.mo @@ -24,19 +27,30 @@ share/locale/fi/LC_MESSAGES/vino.mo share/locale/fr/LC_MESSAGES/vino.mo share/locale/gu/LC_MESSAGES/vino.mo share/locale/hu/LC_MESSAGES/vino.mo +share/locale/id/LC_MESSAGES/vino.mo +share/locale/it/LC_MESSAGES/vino.mo share/locale/ja/LC_MESSAGES/vino.mo share/locale/ko/LC_MESSAGES/vino.mo +share/locale/mk/LC_MESSAGES/vino.mo share/locale/ms/LC_MESSAGES/vino.mo share/locale/nb/LC_MESSAGES/vino.mo share/locale/nl/LC_MESSAGES/vino.mo +share/locale/nn/LC_MESSAGES/vino.mo share/locale/no/LC_MESSAGES/vino.mo +share/locale/or/LC_MESSAGES/vino.mo share/locale/pa/LC_MESSAGES/vino.mo share/locale/pl/LC_MESSAGES/vino.mo share/locale/pt/LC_MESSAGES/vino.mo share/locale/pt_BR/LC_MESSAGES/vino.mo +share/locale/ro/LC_MESSAGES/vino.mo +share/locale/ru/LC_MESSAGES/vino.mo share/locale/sq/LC_MESSAGES/vino.mo share/locale/sr/LC_MESSAGES/vino.mo share/locale/sr@Latn/LC_MESSAGES/vino.mo share/locale/sv/LC_MESSAGES/vino.mo +share/locale/ta/LC_MESSAGES/vino.mo +share/locale/tr/LC_MESSAGES/vino.mo share/locale/uk/LC_MESSAGES/vino.mo +share/locale/zh_CN/LC_MESSAGES/vino.mo +share/locale/zh_TW/LC_MESSAGES/vino.mo @dirrm share/gnome/vino diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index 9ec46a216b47..de94498353f1 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ggv2 -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.0 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 DISTNAME= ggv-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,12 +19,14 @@ COMMENT= GNOME 2 ghostscript viewer USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui desktopfileutils USE_GHOSTSCRIPT=yes USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= ggv.schemas + pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes @${ECHO_MSG} "" diff --git a/print/ggv2/distinfo b/print/ggv2/distinfo index 5561d3d067a4..84cc3aba2a74 100644 --- a/print/ggv2/distinfo +++ b/print/ggv2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/ggv-2.6.2.tar.bz2) = c02779b6ac22331c60df568301ca48c5 -SIZE (gnome2/ggv-2.6.2.tar.bz2) = 1234678 +MD5 (gnome2/ggv-2.8.0.tar.bz2) = 1a8e9e43ef793ef3221c5afb15d14a81 +SIZE (gnome2/ggv-2.8.0.tar.bz2) = 1280464 diff --git a/print/ggv2/pkg-descr b/print/ggv2/pkg-descr index 7c8fde6e01a4..c59727e1facc 100644 --- a/print/ggv2/pkg-descr +++ b/print/ggv2/pkg-descr @@ -1 +1,4 @@ -GNOME 2 ghostscript viewer. +GGV, the Gnome GhostView, is a Gnome PostScript document previewer. +It can also preview PDFs, but as it is not a native PDF viewer, it +does not take advantage of all the features of the PDF format. +graphics/gpdf is a more capable PDF viewer. diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist index b8fadd8ad63e..0e2c4955abc6 100644 --- a/print/ggv2/pkg-plist +++ b/print/ggv2/pkg-plist @@ -1,10 +1,8 @@ bin/ggv -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/ggv.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/ggv.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/ggv.schemas > /dev/null || /usr/bin/true libdata/bonobo/servers/GNOME_GGV.server libexec/ggv-postscript-viewer share/gnome/applications/ggv.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/gnome-2.0/ui/ggv-control-ui.xml share/gnome/gnome-2.0/ui/ggv-postscript-view-ui.xml share/gnome/gnome-2.0/ui/ggv-ui.xml @@ -78,6 +76,7 @@ share/locale/az/LC_MESSAGES/ggv.mo share/locale/be/LC_MESSAGES/ggv.mo share/locale/bg/LC_MESSAGES/ggv.mo share/locale/bn/LC_MESSAGES/ggv.mo +share/locale/bs/LC_MESSAGES/ggv.mo share/locale/ca/LC_MESSAGES/ggv.mo share/locale/cs/LC_MESSAGES/ggv.mo share/locale/cy/LC_MESSAGES/ggv.mo @@ -107,11 +106,11 @@ share/locale/kn/LC_MESSAGES/ggv.mo share/locale/ko/LC_MESSAGES/ggv.mo share/locale/lt/LC_MESSAGES/ggv.mo share/locale/lv/LC_MESSAGES/ggv.mo -share/locale/mi/LC_MESSAGES/ggv.mo share/locale/mk/LC_MESSAGES/ggv.mo share/locale/ml/LC_MESSAGES/ggv.mo share/locale/mn/LC_MESSAGES/ggv.mo share/locale/ms/LC_MESSAGES/ggv.mo +share/locale/nb/LC_MESSAGES/ggv.mo share/locale/nl/LC_MESSAGES/ggv.mo share/locale/nn/LC_MESSAGES/ggv.mo share/locale/no/LC_MESSAGES/ggv.mo @@ -167,3 +166,4 @@ share/locale/zh_TW/LC_MESSAGES/ggv.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ggv/ggv-sv.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ggv/ggv-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ggv/ggv-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index c43318cc29f6..eed9204f9802 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomeprint -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.0.1 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,13 +20,14 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libbonobo libartlgpl2 \ - gtk20 lthack + gtk20 INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION=${PORTVERSION} +PLIST_SUB= VERSION=${PORTVERSION} \ + LIBVERSION=2.2 .include <bsd.port.pre.mk> @@ -36,7 +37,7 @@ WITH_CUPS= yes .if defined(WITH_CUPS) && !defined(WITHOUT_CUPS) CONFIGURE_ARGS+= --with-cups -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base +LIB_DEPENDS+= gnomecups-1.0:${PORTSDIR}/print/libgnomecups PLIST_SUB+= CUPS:="" .else CONFIGURE_ARGS+= --without-cups diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index 9ed244ed13f3..ec07a4247f69 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeprint-2.6.2.tar.bz2) = f742bb321fab833b67270f7b86af0fdb -SIZE (gnome2/libgnomeprint-2.6.2.tar.bz2) = 701216 +MD5 (gnome2/libgnomeprint-2.8.0.1.tar.bz2) = 0473bf1976c2d4ec5a52bb66cf6b8464 +SIZE (gnome2/libgnomeprint-2.8.0.1.tar.bz2) = 751808 diff --git a/print/libgnomeprint/files/patch-libgnomeprint_ttsubset_sft.h b/print/libgnomeprint/files/patch-libgnomeprint_ttsubset_sft.h new file mode 100644 index 000000000000..9a4a497820fa --- /dev/null +++ b/print/libgnomeprint/files/patch-libgnomeprint_ttsubset_sft.h @@ -0,0 +1,11 @@ +--- libgnomeprint/ttsubset/sft.h.orig Thu Jul 1 13:18:38 2004 ++++ libgnomeprint/ttsubset/sft.h Thu Jul 1 13:20:14 2004 +@@ -103,7 +103,7 @@ + #endif + #endif + +-#ifdef __i386 ++#if defined(__i386) || defined(__alpha__) + #ifndef G_LITTLE_ENDIAN + #define G_LITTLE_ENDIAN + #endif diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist index b3799487bdbf..3de3913d7fdd 100644 --- a/print/libgnomeprint/pkg-plist +++ b/print/libgnomeprint/pkg-plist @@ -1,65 +1,69 @@ etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap -include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h -include/libgnomeprint-2.2/libgnomeprint/gnome-font.h -include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h -include/libgnomeprint-2.2/libgnomeprint/gnome-pgl.h -include/libgnomeprint-2.2/libgnomeprint/gnome-print-config.h -include/libgnomeprint-2.2/libgnomeprint/gnome-print-job.h -include/libgnomeprint-2.2/libgnomeprint/gnome-print-paper.h -include/libgnomeprint-2.2/libgnomeprint/gnome-print-unit.h -include/libgnomeprint-2.2/libgnomeprint/gnome-print.h -include/libgnomeprint-2.2/libgnomeprint/gnome-rfont.h -include/libgnomeprint-2.2/libgnomeprint/gp-gc.h -include/libgnomeprint-2.2/libgnomeprint/libgnomeprint-enum-types.h -include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h -include/libgnomeprint-2.2/libgnomeprint/private/gnome-fontmap.h -include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h -include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-private.h -include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-pango.h -include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h -include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-config.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-key.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-list.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-model.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-node-private.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-node.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-option.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-printer.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-reference.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-root.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-settings.h -include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-font-face.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-font.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-glyphlist.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-pango.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-pgl.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-config.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-job.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-paper.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-unit.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-rfont.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gp-gc.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/libgnomeprint-enum-types.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-font-private.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-fontmap.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-glyphlist-private.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-print-config-private.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-print-private.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gp-gc-private.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-config.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-key.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-list.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-model.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-node-private.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-node.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-option.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-printer.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-reference.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-root.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-settings.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-state.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-utils.h lib/libgnomeprint-2-2.a lib/libgnomeprint-2-2.so lib/libgnomeprint-2-2.so.1 %%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so +lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintlpd.so lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-custom.so lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-file.so lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so -libdata/pkgconfig/libgnomeprint-2.2.pc -share/doc/libgnomeprint/home.png -share/doc/libgnomeprint/index.html -share/doc/libgnomeprint/index.sgml -share/doc/libgnomeprint/left.png -share/doc/libgnomeprint/libgnomeprint-building.html -share/doc/libgnomeprint/libgnomeprint-compiling.html -share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html -share/doc/libgnomeprint/libgnomeprint-gnome-font.html -share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html -share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html -share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html -share/doc/libgnomeprint/libgnomeprint-gnome-print-job.html -share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html -share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html -share/doc/libgnomeprint/libgnomeprint-gnome-print.html -share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html -share/doc/libgnomeprint/libgnomeprint-resources.html -share/doc/libgnomeprint/libgnomeprint.html -share/doc/libgnomeprint/libgnomeprintunsorted.html -share/doc/libgnomeprint/right.png -share/doc/libgnomeprint/style.css -share/doc/libgnomeprint/up.png +libdata/pkgconfig/libgnomeprint-%%LIBVERSION%%.pc +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgnomeprint-Pango-Integration.html +%%DOCSDIR%%/libgnomeprint-building.html +%%DOCSDIR%%/libgnomeprint-compiling.html +%%DOCSDIR%%/libgnomeprint-gnome-font-face.html +%%DOCSDIR%%/libgnomeprint-gnome-font.html +%%DOCSDIR%%/libgnomeprint-gnome-glyphlist.html +%%DOCSDIR%%/libgnomeprint-gnome-pgl.html +%%DOCSDIR%%/libgnomeprint-gnome-print-config.html +%%DOCSDIR%%/libgnomeprint-gnome-print-job.html +%%DOCSDIR%%/libgnomeprint-gnome-print-paper.html +%%DOCSDIR%%/libgnomeprint-gnome-print-unit.html +%%DOCSDIR%%/libgnomeprint-gnome-print.html +%%DOCSDIR%%/libgnomeprint-gnome-rfont.html +%%DOCSDIR%%/libgnomeprint-resources.html +%%DOCSDIR%%/libgnomeprint.devhelp +%%DOCSDIR%%/libgnomeprint.html +%%DOCSDIR%%/libgnomeprintunsorted.html +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/gnome/libgnomeprint/%%VERSION%%/globals.xml share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-GENERIC-PS.xml share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-PDF-WRITER.xml @@ -67,80 +71,82 @@ share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled/GNOME-META.xml share/gnome/libgnomeprint/%%VERSION%%/printers/GENERIC.xml share/gnome/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.xml share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled/META.xml -share/locale/am/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/ar/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/be/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/bn/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/cy/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/en_CA/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/en_GB/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/es/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/et/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/eu/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/fa/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/fi/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/ga/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/gu/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/he/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/hr/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/id/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/is/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/it/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/ja/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/ko/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/lt/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/lv/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/mk/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/ml/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/mn/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/mr/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/pa/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/pl/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/pt/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/ro/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/ru/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/sk/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/sl/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/sq/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/sr/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/sr@Latn/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/sv/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/ta/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/th/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/tr/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/uk/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo -share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/am/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ar/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/az/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/be/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/bg/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/bn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/bs/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ca/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/cs/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/cy/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/da/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/de/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/el/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/en_CA/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/en_GB/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/es/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/et/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/eu/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/fa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/fi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/fr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ga/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/gu/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/he/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/hi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/hr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/hu/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/id/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/is/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/it/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ja/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ko/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/lt/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/lv/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/mk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ml/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/mn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/mr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ms/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/nb/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/nl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/nn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/no/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/pa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/pl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/pt/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ro/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ru/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/sk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/sl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/sq/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/sr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/sv/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ta/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/th/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/tr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/uk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/vi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/wa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers @dirrm share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled @dirrm share/gnome/libgnomeprint/%%VERSION%%/models @dirrm share/gnome/libgnomeprint/%%VERSION%% @dirrm share/gnome/libgnomeprint -@dirrm share/doc/libgnomeprint +@dirrm %%DOCSDIR%% @dirrm lib/libgnomeprint/%%VERSION%%/modules/transports @dirrm lib/libgnomeprint/%%VERSION%%/modules @dirrm lib/libgnomeprint/%%VERSION%% @dirrm lib/libgnomeprint -@dirrm include/libgnomeprint-2.2/libgnomeprint/private -@dirrm include/libgnomeprint-2.2/libgnomeprint -@dirrm include/libgnomeprint-2.2 +@dirrm include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private +@dirrm include/libgnomeprint-%%LIBVERSION%%/libgnomeprint +@dirrm include/libgnomeprint-%%LIBVERSION%% @dirrm etc/gnome/libgnomeprint-2.0/fonts @dirrm etc/gnome/libgnomeprint-2.0 diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index b387e2e027ba..697617e18a58 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomekeyring -PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTVERSION= 0.4.0 CATEGORIES= security gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-keyring/0.2 +MASTER_SITE_SUBDIR= sources/gnome-keyring/0.4 DISTNAME= gnome-keyring-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,9 +18,9 @@ COMMENT= A program that keeps passwords and other secrets USE_X_PREFIX= yes USE_BZIP2= yes -USE_GNOME= gnomehack lthack gtk20 +USE_GNOME= gnomehack gtk20 USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index 281cbb938679..f3fb17b64553 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-keyring-0.2.1.tar.bz2) = 2fe5fb39cc18d1a6792fd3281223dfff -SIZE (gnome2/gnome-keyring-0.2.1.tar.bz2) = 324989 +MD5 (gnome2/gnome-keyring-0.4.0.tar.bz2) = 683b422b77c56c3a125e7aa5c886c47e +SIZE (gnome2/gnome-keyring-0.4.0.tar.bz2) = 344937 diff --git a/security/gnome-keyring/files/patch-gnome-keyring-daemon.c b/security/gnome-keyring/files/patch-gnome-keyring-daemon.c new file mode 100644 index 000000000000..293df59b976f --- /dev/null +++ b/security/gnome-keyring/files/patch-gnome-keyring-daemon.c @@ -0,0 +1,34 @@ +--- gnome-keyring-daemon.c.orig Tue Jul 20 22:41:27 2004 ++++ gnome-keyring-daemon.c Tue Jul 20 22:43:03 2004 +@@ -121,7 +121,7 @@ + int i; + + got_random = FALSE; +-#ifdef __linux__ ++#if defined(__linux__) || defined(__FreeBSD__) + { + int fd; + +@@ -352,6 +352,22 @@ + app_ref->pathname[len] = 0; + } + ++ } ++#elif defined(__FreeBSD__) ++ { ++ char buffer[1024]; ++ int len; ++ char *path; ++ ++ path = g_strdup_printf ("/proc/%d/file", pid); ++ len = readlink (path, buffer, sizeof (buffer)); ++ g_free (path); ++ ++ if (len > 0) { ++ app_ref->pathname = g_malloc (len + 1); ++ memcpy (app_ref->pathname, buffer, len); ++ app_ref->pathname[len] = 0; ++ } + } + #endif + diff --git a/security/gnome-keyring/files/patch-gnome-keyring-daemon.c.orig b/security/gnome-keyring/files/patch-gnome-keyring-daemon.c.orig new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/security/gnome-keyring/files/patch-gnome-keyring-daemon.c.orig diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist index e8992e17d0e1..f28f54a16ab0 100644 --- a/security/gnome-keyring/pkg-plist +++ b/security/gnome-keyring/pkg-plist @@ -7,6 +7,9 @@ libdata/pkgconfig/gnome-keyring-1.pc libexec/gnome-keyring-ask share/locale/ar/LC_MESSAGES/gnome-keyring.mo share/locale/az/LC_MESSAGES/gnome-keyring.mo +share/locale/bg/LC_MESSAGES/gnome-keyring.mo +share/locale/bn/LC_MESSAGES/gnome-keyring.mo +share/locale/bs/LC_MESSAGES/gnome-keyring.mo share/locale/ca/LC_MESSAGES/gnome-keyring.mo share/locale/cs/LC_MESSAGES/gnome-keyring.mo share/locale/cy/LC_MESSAGES/gnome-keyring.mo @@ -16,10 +19,12 @@ share/locale/el/LC_MESSAGES/gnome-keyring.mo share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo share/locale/es/LC_MESSAGES/gnome-keyring.mo +share/locale/eu/LC_MESSAGES/gnome-keyring.mo share/locale/fi/LC_MESSAGES/gnome-keyring.mo share/locale/fr/LC_MESSAGES/gnome-keyring.mo share/locale/hr/LC_MESSAGES/gnome-keyring.mo share/locale/hu/LC_MESSAGES/gnome-keyring.mo +share/locale/id/LC_MESSAGES/gnome-keyring.mo share/locale/is/LC_MESSAGES/gnome-keyring.mo share/locale/it/LC_MESSAGES/gnome-keyring.mo share/locale/ja/LC_MESSAGES/gnome-keyring.mo @@ -27,18 +32,21 @@ share/locale/ko/LC_MESSAGES/gnome-keyring.mo share/locale/lt/LC_MESSAGES/gnome-keyring.mo share/locale/mn/LC_MESSAGES/gnome-keyring.mo share/locale/ms/LC_MESSAGES/gnome-keyring.mo +share/locale/nb/LC_MESSAGES/gnome-keyring.mo share/locale/nl/LC_MESSAGES/gnome-keyring.mo share/locale/no/LC_MESSAGES/gnome-keyring.mo share/locale/pa/LC_MESSAGES/gnome-keyring.mo share/locale/pl/LC_MESSAGES/gnome-keyring.mo share/locale/pt/LC_MESSAGES/gnome-keyring.mo share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo +share/locale/ro/LC_MESSAGES/gnome-keyring.mo share/locale/ru/LC_MESSAGES/gnome-keyring.mo share/locale/sk/LC_MESSAGES/gnome-keyring.mo share/locale/sq/LC_MESSAGES/gnome-keyring.mo share/locale/sr/LC_MESSAGES/gnome-keyring.mo share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo share/locale/sv/LC_MESSAGES/gnome-keyring.mo +share/locale/ta/LC_MESSAGES/gnome-keyring.mo share/locale/th/LC_MESSAGES/gnome-keyring.mo share/locale/tr/LC_MESSAGES/gnome-keyring.mo share/locale/uk/LC_MESSAGES/gnome-keyring.mo diff --git a/security/gnomekeyring/Makefile b/security/gnomekeyring/Makefile index b387e2e027ba..697617e18a58 100644 --- a/security/gnomekeyring/Makefile +++ b/security/gnomekeyring/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomekeyring -PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTVERSION= 0.4.0 CATEGORIES= security gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-keyring/0.2 +MASTER_SITE_SUBDIR= sources/gnome-keyring/0.4 DISTNAME= gnome-keyring-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,9 +18,9 @@ COMMENT= A program that keeps passwords and other secrets USE_X_PREFIX= yes USE_BZIP2= yes -USE_GNOME= gnomehack lthack gtk20 +USE_GNOME= gnomehack gtk20 USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/security/gnomekeyring/distinfo b/security/gnomekeyring/distinfo index 281cbb938679..f3fb17b64553 100644 --- a/security/gnomekeyring/distinfo +++ b/security/gnomekeyring/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-keyring-0.2.1.tar.bz2) = 2fe5fb39cc18d1a6792fd3281223dfff -SIZE (gnome2/gnome-keyring-0.2.1.tar.bz2) = 324989 +MD5 (gnome2/gnome-keyring-0.4.0.tar.bz2) = 683b422b77c56c3a125e7aa5c886c47e +SIZE (gnome2/gnome-keyring-0.4.0.tar.bz2) = 344937 diff --git a/security/gnomekeyring/files/patch-gnome-keyring-daemon.c b/security/gnomekeyring/files/patch-gnome-keyring-daemon.c new file mode 100644 index 000000000000..293df59b976f --- /dev/null +++ b/security/gnomekeyring/files/patch-gnome-keyring-daemon.c @@ -0,0 +1,34 @@ +--- gnome-keyring-daemon.c.orig Tue Jul 20 22:41:27 2004 ++++ gnome-keyring-daemon.c Tue Jul 20 22:43:03 2004 +@@ -121,7 +121,7 @@ + int i; + + got_random = FALSE; +-#ifdef __linux__ ++#if defined(__linux__) || defined(__FreeBSD__) + { + int fd; + +@@ -352,6 +352,22 @@ + app_ref->pathname[len] = 0; + } + ++ } ++#elif defined(__FreeBSD__) ++ { ++ char buffer[1024]; ++ int len; ++ char *path; ++ ++ path = g_strdup_printf ("/proc/%d/file", pid); ++ len = readlink (path, buffer, sizeof (buffer)); ++ g_free (path); ++ ++ if (len > 0) { ++ app_ref->pathname = g_malloc (len + 1); ++ memcpy (app_ref->pathname, buffer, len); ++ app_ref->pathname[len] = 0; ++ } + } + #endif + diff --git a/security/gnomekeyring/files/patch-gnome-keyring-daemon.c.orig b/security/gnomekeyring/files/patch-gnome-keyring-daemon.c.orig new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/security/gnomekeyring/files/patch-gnome-keyring-daemon.c.orig diff --git a/security/gnomekeyring/pkg-plist b/security/gnomekeyring/pkg-plist index e8992e17d0e1..f28f54a16ab0 100644 --- a/security/gnomekeyring/pkg-plist +++ b/security/gnomekeyring/pkg-plist @@ -7,6 +7,9 @@ libdata/pkgconfig/gnome-keyring-1.pc libexec/gnome-keyring-ask share/locale/ar/LC_MESSAGES/gnome-keyring.mo share/locale/az/LC_MESSAGES/gnome-keyring.mo +share/locale/bg/LC_MESSAGES/gnome-keyring.mo +share/locale/bn/LC_MESSAGES/gnome-keyring.mo +share/locale/bs/LC_MESSAGES/gnome-keyring.mo share/locale/ca/LC_MESSAGES/gnome-keyring.mo share/locale/cs/LC_MESSAGES/gnome-keyring.mo share/locale/cy/LC_MESSAGES/gnome-keyring.mo @@ -16,10 +19,12 @@ share/locale/el/LC_MESSAGES/gnome-keyring.mo share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo share/locale/es/LC_MESSAGES/gnome-keyring.mo +share/locale/eu/LC_MESSAGES/gnome-keyring.mo share/locale/fi/LC_MESSAGES/gnome-keyring.mo share/locale/fr/LC_MESSAGES/gnome-keyring.mo share/locale/hr/LC_MESSAGES/gnome-keyring.mo share/locale/hu/LC_MESSAGES/gnome-keyring.mo +share/locale/id/LC_MESSAGES/gnome-keyring.mo share/locale/is/LC_MESSAGES/gnome-keyring.mo share/locale/it/LC_MESSAGES/gnome-keyring.mo share/locale/ja/LC_MESSAGES/gnome-keyring.mo @@ -27,18 +32,21 @@ share/locale/ko/LC_MESSAGES/gnome-keyring.mo share/locale/lt/LC_MESSAGES/gnome-keyring.mo share/locale/mn/LC_MESSAGES/gnome-keyring.mo share/locale/ms/LC_MESSAGES/gnome-keyring.mo +share/locale/nb/LC_MESSAGES/gnome-keyring.mo share/locale/nl/LC_MESSAGES/gnome-keyring.mo share/locale/no/LC_MESSAGES/gnome-keyring.mo share/locale/pa/LC_MESSAGES/gnome-keyring.mo share/locale/pl/LC_MESSAGES/gnome-keyring.mo share/locale/pt/LC_MESSAGES/gnome-keyring.mo share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo +share/locale/ro/LC_MESSAGES/gnome-keyring.mo share/locale/ru/LC_MESSAGES/gnome-keyring.mo share/locale/sk/LC_MESSAGES/gnome-keyring.mo share/locale/sq/LC_MESSAGES/gnome-keyring.mo share/locale/sr/LC_MESSAGES/gnome-keyring.mo share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo share/locale/sv/LC_MESSAGES/gnome-keyring.mo +share/locale/ta/LC_MESSAGES/gnome-keyring.mo share/locale/th/LC_MESSAGES/gnome-keyring.mo share/locale/tr/LC_MESSAGES/gnome-keyring.mo share/locale/uk/LC_MESSAGES/gnome-keyring.mo diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index 2cd9723bb74b..5eb6b77538c1 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gconf-editor -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.2 PORTEPOCH= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,12 +19,13 @@ COMMENT= A gconf database editor for the GNOME 2 environment USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gconf2 -USE_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui +USE_LIBTOOL_VER=15 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gconf-editor.1 +GCONF_SCHEMAS= gconf-editor.schemas .include <bsd.port.mk> diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index fd91b290e760..31bf7e95fecc 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gconf-editor-2.6.2.tar.bz2) = 4b739532de350969c71f96c3b97f1093 -SIZE (gnome2/gconf-editor-2.6.2.tar.bz2) = 387614 +MD5 (gnome2/gconf-editor-2.8.2.tar.bz2) = 193d5970b570366fd435b2b7ebdd8047 +SIZE (gnome2/gconf-editor-2.8.2.tar.bz2) = 510014 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 4b66bf1fa370..49065627221b 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -1,5 +1,16 @@ bin/gconf-editor share/gnome/applications/gconf-editor.desktop +share/gnome/help/gconf-editor/C/figures/entry-blank.png +share/gnome/help/gconf-editor/C/figures/entry-bool.png +share/gnome/help/gconf-editor/C/figures/entry-list.png +share/gnome/help/gconf-editor/C/figures/entry-number.png +share/gnome/help/gconf-editor/C/figures/entry-schema.png +share/gnome/help/gconf-editor/C/figures/entry-string.png +share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png +share/gnome/help/gconf-editor/C/gconf-editor.xml +share/gnome/help/gconf-editor/C/legal.xml +share/gnome/omf/gconf-editor/gconf-editor-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gconf-editor/gconf-editor-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gconf-editor.png share/gnome/pixmaps/gconf-editor/entry-blank.png share/gnome/pixmaps/gconf-editor/entry-bool.png @@ -9,19 +20,20 @@ share/gnome/pixmaps/gconf-editor/entry-schema.png share/gnome/pixmaps/gconf-editor/entry-string.png share/gnome/pixmaps/gconf-editor/folder-closed.png share/gnome/pixmaps/gconf-editor/folder-open.png -share/gnome/pixmaps/gconf-editor/stock-about-16.png share/locale/am/LC_MESSAGES/gconf-editor.mo share/locale/ar/LC_MESSAGES/gconf-editor.mo share/locale/az/LC_MESSAGES/gconf-editor.mo share/locale/be/LC_MESSAGES/gconf-editor.mo share/locale/bg/LC_MESSAGES/gconf-editor.mo share/locale/bn/LC_MESSAGES/gconf-editor.mo +share/locale/bs/LC_MESSAGES/gconf-editor.mo share/locale/ca/LC_MESSAGES/gconf-editor.mo share/locale/cs/LC_MESSAGES/gconf-editor.mo share/locale/cy/LC_MESSAGES/gconf-editor.mo share/locale/da/LC_MESSAGES/gconf-editor.mo share/locale/de/LC_MESSAGES/gconf-editor.mo share/locale/el/LC_MESSAGES/gconf-editor.mo +share/locale/en_CA/LC_MESSAGES/gconf-editor.mo share/locale/en_GB/LC_MESSAGES/gconf-editor.mo share/locale/es/LC_MESSAGES/gconf-editor.mo share/locale/et/LC_MESSAGES/gconf-editor.mo @@ -49,8 +61,11 @@ share/locale/ml/LC_MESSAGES/gconf-editor.mo share/locale/mn/LC_MESSAGES/gconf-editor.mo share/locale/mr/LC_MESSAGES/gconf-editor.mo share/locale/ms/LC_MESSAGES/gconf-editor.mo +share/locale/nb/LC_MESSAGES/gconf-editor.mo +share/locale/ne/LC_MESSAGES/gconf-editor.mo share/locale/nl/LC_MESSAGES/gconf-editor.mo share/locale/no/LC_MESSAGES/gconf-editor.mo +share/locale/or/LC_MESSAGES/gconf-editor.mo share/locale/pa/LC_MESSAGES/gconf-editor.mo share/locale/pl/LC_MESSAGES/gconf-editor.mo share/locale/pt/LC_MESSAGES/gconf-editor.mo @@ -71,3 +86,8 @@ share/locale/vi/LC_MESSAGES/gconf-editor.mo share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo @dirrm share/gnome/pixmaps/gconf-editor +@dirrm share/gnome/omf/gconf-editor +@dirrm share/gnome/help/gconf-editor/C/figures +@dirrm share/gnome/help/gconf-editor/C +@dirrm share/gnome/help/gconf-editor +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gconf-editor/gconf-editor-C.omf 2>/dev/null || /usr/bin/true diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 7030776e333b..79415cb3df72 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.6.1 -PORTREVISION= 3 +PORTVERSION= 2.8.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.6 +MASTER_SITE_SUBDIR= sources/control-center/2.8 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,11 +25,18 @@ USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \ gstreamerplugins -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ + apps_gnome_settings_daemon_keybindings.schemas \ + apps_gnome_settings_daemon_screensaver.schemas \ + desktop_gnome_font_rendering.schemas \ + desktop_gnome_peripherals_keyboard_xkb.schemas \ + fontilus.schemas themus.schemas + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g' diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index 32f5ad00952e..c420e2166db6 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.6.1.tar.bz2) = da02f983fbf2e94cd5f09fc8f9d1d143 -SIZE (gnome2/control-center-2.6.1.tar.bz2) = 2487807 +MD5 (gnome2/control-center-2.8.1.tar.bz2) = 7bd9c12b9abb05b6fcf7b4906b6918ea +SIZE (gnome2/control-center-2.8.1.tar.bz2) = 2547071 diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c new file mode 100644 index 000000000000..f66b82c9ffd1 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c @@ -0,0 +1,11 @@ +--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Thu Oct 14 15:44:21 2004 ++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Thu Oct 14 15:44:38 2004 +@@ -813,7 +813,7 @@ + do_mail_action (acme); + break; + case SLEEP_KEY: +- do_sleep_action ("apm", "xset dpms force off"); ++ do_sleep_action ("zzz", "xset dpms force off"); + break; + case SCREENSAVER_KEY: + execute ("xscreensaver-command -lock", FALSE); diff --git a/sysutils/gnome-control-center/files/patch-ltmain.sh b/sysutils/gnome-control-center/files/patch-ltmain.sh deleted file mode 100644 index 49efbb5decf5..000000000000 --- a/sysutils/gnome-control-center/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Thu May 1 11:30:14 2003 -+++ ltmain.sh Mon Aug 11 14:38:46 2003 -@@ -1280,7 +1280,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1290,8 +1290,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3000,6 +3008,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5428,10 +5439,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 6676dfd5a3fa..ddf5788902c0 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -4,7 +4,6 @@ bin/gnome-background-properties bin/gnome-control-center bin/gnome-default-applications-properties bin/gnome-display-properties -bin/gnome-file-types-properties bin/gnome-font-properties bin/gnome-font-viewer bin/gnome-keybinding-properties @@ -12,34 +11,13 @@ bin/gnome-keyboard-properties bin/gnome-mouse-properties bin/gnome-network-preferences bin/gnome-sound-properties -bin/themus-theme-applier bin/gnome-theme-manager bin/gnome-theme-thumbnailer bin/gnome-thumbnail-font bin/gnome-typing-monitor bin/gnome-ui-properties bin/gnome-window-properties -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_font_rendering.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/fontilus.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/themus.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true +bin/themus-theme-applier etc/gnome-vfs-2.0/modules/font-method.conf etc/gnome-vfs-2.0/modules/theme-method.conf include/gnome-window-settings-2.0/gnome-window-manager.h @@ -66,7 +44,6 @@ share/gnome/control-center-2.0/capplets/at-properties.desktop share/gnome/control-center-2.0/capplets/background.desktop share/gnome/control-center-2.0/capplets/default-applications.desktop share/gnome/control-center-2.0/capplets/display-properties.desktop -share/gnome/control-center-2.0/capplets/file-types.desktop share/gnome/control-center-2.0/capplets/font-properties.desktop share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop @@ -80,7 +57,6 @@ share/gnome/control-center-2.0/icons/display-capplet.png share/gnome/control-center-2.0/interfaces/acme.glade share/gnome/control-center-2.0/interfaces/apply-font.glade share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade -share/gnome/control-center-2.0/interfaces/file-types-properties.glade share/gnome/control-center-2.0/interfaces/font-properties.glade share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade @@ -163,6 +139,7 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo share/locale/be/LC_MESSAGES/control-center-2.0.mo share/locale/bg/LC_MESSAGES/control-center-2.0.mo share/locale/bn/LC_MESSAGES/control-center-2.0.mo +share/locale/bs/LC_MESSAGES/control-center-2.0.mo share/locale/ca/LC_MESSAGES/control-center-2.0.mo share/locale/cs/LC_MESSAGES/control-center-2.0.mo share/locale/cy/LC_MESSAGES/control-center-2.0.mo @@ -195,6 +172,7 @@ share/locale/mk/LC_MESSAGES/control-center-2.0.mo share/locale/ml/LC_MESSAGES/control-center-2.0.mo share/locale/mn/LC_MESSAGES/control-center-2.0.mo share/locale/ms/LC_MESSAGES/control-center-2.0.mo +share/locale/nb/LC_MESSAGES/control-center-2.0.mo share/locale/nl/LC_MESSAGES/control-center-2.0.mo share/locale/nn/LC_MESSAGES/control-center-2.0.mo share/locale/no/LC_MESSAGES/control-center-2.0.mo @@ -225,6 +203,5 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces @dirrm share/gnome/control-center-2.0/icons -@dirrm share/gnome/applications @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index ea752f096a58..37a7e1672735 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.6.0 -PORTREVISION= 2 +PORTVERSION= 2.8.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.6 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.8 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,9 +22,11 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix intlhack lthack gnomehack libgnomeui libwnck -USE_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" +GCONF_SCHEMAS= gnome-system-monitor.schemas + .include <bsd.port.mk> diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 75cc73e5deaa..9653e3817c5e 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 1bc8709baa43fdca7eee8cad1dc76b17 -SIZE (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 597694 +MD5 (gnome2/gnome-system-monitor-2.8.0.tar.bz2) = 9aec14e8c549b26b2d2cd0e997038d8f +SIZE (gnome2/gnome-system-monitor-2.8.0.tar.bz2) = 681242 diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c index fda683104a47..05f4c5384caf 100644 --- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c +++ b/sysutils/gnome-system-monitor/files/patch-src::proctable.c @@ -1,6 +1,6 @@ ---- src/proctable.c.orig Sun Feb 8 10:06:08 2004 -+++ src/proctable.c Tue Apr 13 01:01:51 2004 -@@ -547,6 +548,9 @@ +--- src/proctable.c.orig Mon Jul 19 10:02:09 2004 ++++ src/proctable.c Mon Jul 19 10:08:18 2004 +@@ -563,6 +563,9 @@ glibtop_get_proc_uid (&procuid, pid); glibtop_get_proc_time (&proctime, pid); newcputime = proctime.utime + proctime.stime; @@ -10,38 +10,40 @@ model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree)); wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), -@@ -651,6 +655,9 @@ +@@ -667,6 +670,10 @@ glibtop_get_proc_uid (&procuid, pid); glibtop_get_proc_time (&proctime, pid); newcputime = proctime.utime + proctime.stime; + if (proctime.frequency) { + newcputime /= (proctime.frequency/100); + } ++ wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), pid, -@@ -751,12 +758,20 @@ - return NULL; +@@ -761,6 +768,12 @@ + return FALSE; } +static int +pid_compare(const void* first, const void* second) +{ -+ return *(unsigned*)first - *(unsigned*)second; ++ return *(unsigned*)first - *(unsigned*)second; +} + static void refresh_list (ProcData *data, unsigned *pid_list, gint n) { - ProcData *procdata = data; - GList *list = procdata->info; +@@ -769,6 +782,8 @@ + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree)); gint i = 0; -+ -+ qsort(pid_list, n, sizeof (*pid_list), pid_compare); - while (i < n) - { -@@ -848,6 +863,9 @@ ++ qsort(pid_list, n, sizeof (*pid_list), pid_compare); ++ + /* Add or update processes */ + while (i < n) { + ProcInfo *info; +@@ -862,6 +877,9 @@ ** should probably have a total_time_last gint in the ProcInfo structure */ glibtop_get_cpu (&cpu); total_time = cpu.total - total_time_last; diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index 96505c1e463e..27dd1f9c7159 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -1,7 +1,4 @@ bin/gnome-system-monitor -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-system-monitor.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true share/gnome/applications/gnome-system-monitor.desktop share/gnome/help/gnome-system-monitor/C/figures/addColumn.png share/gnome/help/gnome-system-monitor/C/figures/changePriority.png @@ -27,6 +24,7 @@ share/locale/az/LC_MESSAGES/gnome-system-monitor.mo share/locale/be/LC_MESSAGES/gnome-system-monitor.mo share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo +share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo @@ -34,12 +32,15 @@ share/locale/da/LC_MESSAGES/gnome-system-monitor.mo share/locale/de/LC_MESSAGES/gnome-system-monitor.mo share/locale/el/LC_MESSAGES/gnome-system-monitor.mo share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo +share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo share/locale/es/LC_MESSAGES/gnome-system-monitor.mo +share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo +share/locale/gu/LC_MESSAGES/gnome-system-monitor.mo share/locale/he/LC_MESSAGES/gnome-system-monitor.mo share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo @@ -55,8 +56,10 @@ share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo +share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo share/locale/no/LC_MESSAGES/gnome-system-monitor.mo +share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo @@ -64,10 +67,10 @@ share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo +share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo -share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index 63af3b9274af..ea712a90ad50 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomesystemtools -PORTVERSION= 0.92.0 -PORTREVISION= 1 +PORTVERSION= 1.0.0 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-tools/0.92 +MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.0 DISTNAME= gnome-system-tools-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -35,4 +35,10 @@ PLIST_SUB+= SERVICES="" PLIST_SUB+= SERVICES="@comment " .endif +.if ${PERL_LEVEL} < 500600 +post-configure: + @${FIND} ${WRKSRC}/backends \( -name "*.pl" -or -name "*-conf" \) | \ + ${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g' +.endif + .include <bsd.port.post.mk> diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo index 3a6b3da6e230..9d0dc16e5062 100644 --- a/sysutils/gnome-system-tools/distinfo +++ b/sysutils/gnome-system-tools/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 1c2e3ae388e179b669ffa8d293bd17f1 -SIZE (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 2614845 +MD5 (gnome2/gnome-system-tools-1.0.0.tar.bz2) = 7f85cab03aeffdb9c57925fe2be0e001 +SIZE (gnome2/gnome-system-tools-1.0.0.tar.bz2) = 2719276 diff --git a/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in b/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in new file mode 100644 index 000000000000..7f7cce28ee37 --- /dev/null +++ b/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in @@ -0,0 +1,34 @@ +--- backends/replace.pl.in.orig Fri Oct 22 02:41:56 2004 ++++ backends/replace.pl.in Fri Oct 22 02:42:48 2004 +@@ -1113,19 +1113,19 @@ + + return -1 if (!&gst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface)); + +- delete $$buff[$line_no]; ++ splice @{$buff},$line_no,1; + $line_no ++; + + while (&gst_replace_interfaces_get_next_option ($buff, \$line_no) != -1) + { +- delete $$buff[$line_no]; ++ splice @{$buff},$line_no,1; + $line_no ++; + } + + $line_no = 0; + if (&gst_replace_interfaces_auto_stanza_locate ($buff, \$line_no, $iface)) + { +- delete $$buff[$line_no]; ++ splice @{$buff},$line_no,1; + } + + &gst_file_buffer_clean ($buff); +@@ -1663,7 +1663,7 @@ + } + else + { +- delete $$buff[$i]; ++ splice @{$buff},$i,1; + } + } + } diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index fabe1da2680f..1ccb07eb14e1 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -97,6 +97,8 @@ share/gnome/omf/gnome-system-tools/time-admin-C.omf share/gnome/omf/gnome-system-tools/users-admin-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/users-admin-C.omf 2>/dev/null || /usr/bin/true share/locale/am/LC_MESSAGES/gnome-system-tools.mo +share/locale/ar/LC_MESSAGES/gnome-system-tools.mo +share/locale/ar/LC_MESSAGES/setup-tools-backends.mo share/locale/az/LC_MESSAGES/gnome-system-tools.mo share/locale/az/LC_MESSAGES/setup-tools-backends.mo share/locale/bg/LC_MESSAGES/gnome-system-tools.mo @@ -104,6 +106,7 @@ share/locale/bn/LC_MESSAGES/setup-tools-backends.mo share/locale/bn/LC_MESSAGES/gnome-system-tools.mo share/locale/bs/LC_MESSAGES/setup-tools-backends.mo share/locale/ca/LC_MESSAGES/gnome-system-tools.mo +share/locale/ca/LC_MESSAGES/setup-tools-backends.mo share/locale/cs/LC_MESSAGES/gnome-system-tools.mo share/locale/cs/LC_MESSAGES/setup-tools-backends.mo share/locale/da/LC_MESSAGES/gnome-system-tools.mo @@ -122,6 +125,7 @@ share/locale/et/LC_MESSAGES/gnome-system-tools.mo share/locale/eu/LC_MESSAGES/gnome-system-tools.mo share/locale/eu/LC_MESSAGES/setup-tools-backends.mo share/locale/fi/LC_MESSAGES/gnome-system-tools.mo +share/locale/fi/LC_MESSAGES/setup-tools-backends.mo share/locale/fr/LC_MESSAGES/gnome-system-tools.mo share/locale/ga/LC_MESSAGES/gnome-system-tools.mo share/locale/gl/LC_MESSAGES/gnome-system-tools.mo @@ -157,6 +161,8 @@ share/locale/pt/LC_MESSAGES/gnome-system-tools.mo share/locale/pt/LC_MESSAGES/setup-tools-backends.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo +share/locale/ro/LC_MESSAGES/gnome-system-tools.mo +share/locale/ro/LC_MESSAGES/setup-tools-backends.mo share/locale/ru/LC_MESSAGES/gnome-system-tools.mo share/locale/sk/LC_MESSAGES/gnome-system-tools.mo share/locale/sq/LC_MESSAGES/gnome-system-tools.mo @@ -168,13 +174,16 @@ share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo share/locale/sv/LC_MESSAGES/gnome-system-tools.mo share/locale/sv/LC_MESSAGES/setup-tools-backends.mo share/locale/ta/LC_MESSAGES/gnome-system-tools.mo +share/locale/ta/LC_MESSAGES/setup-tools-backends.mo share/locale/tr/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/setup-tools-backends.mo share/locale/vi/LC_MESSAGES/gnome-system-tools.mo share/locale/wa/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo +share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo +share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo share/setup-tool-backends/files/debian_ipchains share/setup-tool-backends/scripts/boot-conf share/setup-tool-backends/scripts/boot-grub.pl diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 7030776e333b..79415cb3df72 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.6.1 -PORTREVISION= 3 +PORTVERSION= 2.8.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.6 +MASTER_SITE_SUBDIR= sources/control-center/2.8 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,11 +25,18 @@ USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \ gstreamerplugins -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ + apps_gnome_settings_daemon_keybindings.schemas \ + apps_gnome_settings_daemon_screensaver.schemas \ + desktop_gnome_font_rendering.schemas \ + desktop_gnome_peripherals_keyboard_xkb.schemas \ + fontilus.schemas themus.schemas + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g' diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index 32f5ad00952e..c420e2166db6 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.6.1.tar.bz2) = da02f983fbf2e94cd5f09fc8f9d1d143 -SIZE (gnome2/control-center-2.6.1.tar.bz2) = 2487807 +MD5 (gnome2/control-center-2.8.1.tar.bz2) = 7bd9c12b9abb05b6fcf7b4906b6918ea +SIZE (gnome2/control-center-2.8.1.tar.bz2) = 2547071 diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c new file mode 100644 index 000000000000..f66b82c9ffd1 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c @@ -0,0 +1,11 @@ +--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Thu Oct 14 15:44:21 2004 ++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Thu Oct 14 15:44:38 2004 +@@ -813,7 +813,7 @@ + do_mail_action (acme); + break; + case SLEEP_KEY: +- do_sleep_action ("apm", "xset dpms force off"); ++ do_sleep_action ("zzz", "xset dpms force off"); + break; + case SCREENSAVER_KEY: + execute ("xscreensaver-command -lock", FALSE); diff --git a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh deleted file mode 100644 index 49efbb5decf5..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Thu May 1 11:30:14 2003 -+++ ltmain.sh Mon Aug 11 14:38:46 2003 -@@ -1280,7 +1280,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1290,8 +1290,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3000,6 +3008,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5428,10 +5439,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index 6676dfd5a3fa..ddf5788902c0 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -4,7 +4,6 @@ bin/gnome-background-properties bin/gnome-control-center bin/gnome-default-applications-properties bin/gnome-display-properties -bin/gnome-file-types-properties bin/gnome-font-properties bin/gnome-font-viewer bin/gnome-keybinding-properties @@ -12,34 +11,13 @@ bin/gnome-keyboard-properties bin/gnome-mouse-properties bin/gnome-network-preferences bin/gnome-sound-properties -bin/themus-theme-applier bin/gnome-theme-manager bin/gnome-theme-thumbnailer bin/gnome-thumbnail-font bin/gnome-typing-monitor bin/gnome-ui-properties bin/gnome-window-properties -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_font_rendering.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/fontilus.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/themus.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true +bin/themus-theme-applier etc/gnome-vfs-2.0/modules/font-method.conf etc/gnome-vfs-2.0/modules/theme-method.conf include/gnome-window-settings-2.0/gnome-window-manager.h @@ -66,7 +44,6 @@ share/gnome/control-center-2.0/capplets/at-properties.desktop share/gnome/control-center-2.0/capplets/background.desktop share/gnome/control-center-2.0/capplets/default-applications.desktop share/gnome/control-center-2.0/capplets/display-properties.desktop -share/gnome/control-center-2.0/capplets/file-types.desktop share/gnome/control-center-2.0/capplets/font-properties.desktop share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop @@ -80,7 +57,6 @@ share/gnome/control-center-2.0/icons/display-capplet.png share/gnome/control-center-2.0/interfaces/acme.glade share/gnome/control-center-2.0/interfaces/apply-font.glade share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade -share/gnome/control-center-2.0/interfaces/file-types-properties.glade share/gnome/control-center-2.0/interfaces/font-properties.glade share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade @@ -163,6 +139,7 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo share/locale/be/LC_MESSAGES/control-center-2.0.mo share/locale/bg/LC_MESSAGES/control-center-2.0.mo share/locale/bn/LC_MESSAGES/control-center-2.0.mo +share/locale/bs/LC_MESSAGES/control-center-2.0.mo share/locale/ca/LC_MESSAGES/control-center-2.0.mo share/locale/cs/LC_MESSAGES/control-center-2.0.mo share/locale/cy/LC_MESSAGES/control-center-2.0.mo @@ -195,6 +172,7 @@ share/locale/mk/LC_MESSAGES/control-center-2.0.mo share/locale/ml/LC_MESSAGES/control-center-2.0.mo share/locale/mn/LC_MESSAGES/control-center-2.0.mo share/locale/ms/LC_MESSAGES/control-center-2.0.mo +share/locale/nb/LC_MESSAGES/control-center-2.0.mo share/locale/nl/LC_MESSAGES/control-center-2.0.mo share/locale/nn/LC_MESSAGES/control-center-2.0.mo share/locale/no/LC_MESSAGES/control-center-2.0.mo @@ -225,6 +203,5 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces @dirrm share/gnome/control-center-2.0/icons -@dirrm share/gnome/applications @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index ea752f096a58..37a7e1672735 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.6.0 -PORTREVISION= 2 +PORTVERSION= 2.8.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.6 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.8 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,9 +22,11 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix intlhack lthack gnomehack libgnomeui libwnck -USE_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" +GCONF_SCHEMAS= gnome-system-monitor.schemas + .include <bsd.port.mk> diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo index 75cc73e5deaa..9653e3817c5e 100644 --- a/sysutils/gnomesystemmonitor/distinfo +++ b/sysutils/gnomesystemmonitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 1bc8709baa43fdca7eee8cad1dc76b17 -SIZE (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 597694 +MD5 (gnome2/gnome-system-monitor-2.8.0.tar.bz2) = 9aec14e8c549b26b2d2cd0e997038d8f +SIZE (gnome2/gnome-system-monitor-2.8.0.tar.bz2) = 681242 diff --git a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c index fda683104a47..05f4c5384caf 100644 --- a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c +++ b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c @@ -1,6 +1,6 @@ ---- src/proctable.c.orig Sun Feb 8 10:06:08 2004 -+++ src/proctable.c Tue Apr 13 01:01:51 2004 -@@ -547,6 +548,9 @@ +--- src/proctable.c.orig Mon Jul 19 10:02:09 2004 ++++ src/proctable.c Mon Jul 19 10:08:18 2004 +@@ -563,6 +563,9 @@ glibtop_get_proc_uid (&procuid, pid); glibtop_get_proc_time (&proctime, pid); newcputime = proctime.utime + proctime.stime; @@ -10,38 +10,40 @@ model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree)); wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), -@@ -651,6 +655,9 @@ +@@ -667,6 +670,10 @@ glibtop_get_proc_uid (&procuid, pid); glibtop_get_proc_time (&proctime, pid); newcputime = proctime.utime + proctime.stime; + if (proctime.frequency) { + newcputime /= (proctime.frequency/100); + } ++ wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), pid, -@@ -751,12 +758,20 @@ - return NULL; +@@ -761,6 +768,12 @@ + return FALSE; } +static int +pid_compare(const void* first, const void* second) +{ -+ return *(unsigned*)first - *(unsigned*)second; ++ return *(unsigned*)first - *(unsigned*)second; +} + static void refresh_list (ProcData *data, unsigned *pid_list, gint n) { - ProcData *procdata = data; - GList *list = procdata->info; +@@ -769,6 +782,8 @@ + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree)); gint i = 0; -+ -+ qsort(pid_list, n, sizeof (*pid_list), pid_compare); - while (i < n) - { -@@ -848,6 +863,9 @@ ++ qsort(pid_list, n, sizeof (*pid_list), pid_compare); ++ + /* Add or update processes */ + while (i < n) { + ProcInfo *info; +@@ -862,6 +877,9 @@ ** should probably have a total_time_last gint in the ProcInfo structure */ glibtop_get_cpu (&cpu); total_time = cpu.total - total_time_last; diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist index 96505c1e463e..27dd1f9c7159 100644 --- a/sysutils/gnomesystemmonitor/pkg-plist +++ b/sysutils/gnomesystemmonitor/pkg-plist @@ -1,7 +1,4 @@ bin/gnome-system-monitor -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-system-monitor.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true share/gnome/applications/gnome-system-monitor.desktop share/gnome/help/gnome-system-monitor/C/figures/addColumn.png share/gnome/help/gnome-system-monitor/C/figures/changePriority.png @@ -27,6 +24,7 @@ share/locale/az/LC_MESSAGES/gnome-system-monitor.mo share/locale/be/LC_MESSAGES/gnome-system-monitor.mo share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo +share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo @@ -34,12 +32,15 @@ share/locale/da/LC_MESSAGES/gnome-system-monitor.mo share/locale/de/LC_MESSAGES/gnome-system-monitor.mo share/locale/el/LC_MESSAGES/gnome-system-monitor.mo share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo +share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo share/locale/es/LC_MESSAGES/gnome-system-monitor.mo +share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo +share/locale/gu/LC_MESSAGES/gnome-system-monitor.mo share/locale/he/LC_MESSAGES/gnome-system-monitor.mo share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo @@ -55,8 +56,10 @@ share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo +share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo share/locale/no/LC_MESSAGES/gnome-system-monitor.mo +share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo @@ -64,10 +67,10 @@ share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo +share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo -share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile index 63af3b9274af..ea712a90ad50 100644 --- a/sysutils/gnomesystemtools/Makefile +++ b/sysutils/gnomesystemtools/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomesystemtools -PORTVERSION= 0.92.0 -PORTREVISION= 1 +PORTVERSION= 1.0.0 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-tools/0.92 +MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.0 DISTNAME= gnome-system-tools-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -35,4 +35,10 @@ PLIST_SUB+= SERVICES="" PLIST_SUB+= SERVICES="@comment " .endif +.if ${PERL_LEVEL} < 500600 +post-configure: + @${FIND} ${WRKSRC}/backends \( -name "*.pl" -or -name "*-conf" \) | \ + ${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g' +.endif + .include <bsd.port.post.mk> diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo index 3a6b3da6e230..9d0dc16e5062 100644 --- a/sysutils/gnomesystemtools/distinfo +++ b/sysutils/gnomesystemtools/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 1c2e3ae388e179b669ffa8d293bd17f1 -SIZE (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 2614845 +MD5 (gnome2/gnome-system-tools-1.0.0.tar.bz2) = 7f85cab03aeffdb9c57925fe2be0e001 +SIZE (gnome2/gnome-system-tools-1.0.0.tar.bz2) = 2719276 diff --git a/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in b/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in new file mode 100644 index 000000000000..7f7cce28ee37 --- /dev/null +++ b/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in @@ -0,0 +1,34 @@ +--- backends/replace.pl.in.orig Fri Oct 22 02:41:56 2004 ++++ backends/replace.pl.in Fri Oct 22 02:42:48 2004 +@@ -1113,19 +1113,19 @@ + + return -1 if (!&gst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface)); + +- delete $$buff[$line_no]; ++ splice @{$buff},$line_no,1; + $line_no ++; + + while (&gst_replace_interfaces_get_next_option ($buff, \$line_no) != -1) + { +- delete $$buff[$line_no]; ++ splice @{$buff},$line_no,1; + $line_no ++; + } + + $line_no = 0; + if (&gst_replace_interfaces_auto_stanza_locate ($buff, \$line_no, $iface)) + { +- delete $$buff[$line_no]; ++ splice @{$buff},$line_no,1; + } + + &gst_file_buffer_clean ($buff); +@@ -1663,7 +1663,7 @@ + } + else + { +- delete $$buff[$i]; ++ splice @{$buff},$i,1; + } + } + } diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist index fabe1da2680f..1ccb07eb14e1 100644 --- a/sysutils/gnomesystemtools/pkg-plist +++ b/sysutils/gnomesystemtools/pkg-plist @@ -97,6 +97,8 @@ share/gnome/omf/gnome-system-tools/time-admin-C.omf share/gnome/omf/gnome-system-tools/users-admin-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/users-admin-C.omf 2>/dev/null || /usr/bin/true share/locale/am/LC_MESSAGES/gnome-system-tools.mo +share/locale/ar/LC_MESSAGES/gnome-system-tools.mo +share/locale/ar/LC_MESSAGES/setup-tools-backends.mo share/locale/az/LC_MESSAGES/gnome-system-tools.mo share/locale/az/LC_MESSAGES/setup-tools-backends.mo share/locale/bg/LC_MESSAGES/gnome-system-tools.mo @@ -104,6 +106,7 @@ share/locale/bn/LC_MESSAGES/setup-tools-backends.mo share/locale/bn/LC_MESSAGES/gnome-system-tools.mo share/locale/bs/LC_MESSAGES/setup-tools-backends.mo share/locale/ca/LC_MESSAGES/gnome-system-tools.mo +share/locale/ca/LC_MESSAGES/setup-tools-backends.mo share/locale/cs/LC_MESSAGES/gnome-system-tools.mo share/locale/cs/LC_MESSAGES/setup-tools-backends.mo share/locale/da/LC_MESSAGES/gnome-system-tools.mo @@ -122,6 +125,7 @@ share/locale/et/LC_MESSAGES/gnome-system-tools.mo share/locale/eu/LC_MESSAGES/gnome-system-tools.mo share/locale/eu/LC_MESSAGES/setup-tools-backends.mo share/locale/fi/LC_MESSAGES/gnome-system-tools.mo +share/locale/fi/LC_MESSAGES/setup-tools-backends.mo share/locale/fr/LC_MESSAGES/gnome-system-tools.mo share/locale/ga/LC_MESSAGES/gnome-system-tools.mo share/locale/gl/LC_MESSAGES/gnome-system-tools.mo @@ -157,6 +161,8 @@ share/locale/pt/LC_MESSAGES/gnome-system-tools.mo share/locale/pt/LC_MESSAGES/setup-tools-backends.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo +share/locale/ro/LC_MESSAGES/gnome-system-tools.mo +share/locale/ro/LC_MESSAGES/setup-tools-backends.mo share/locale/ru/LC_MESSAGES/gnome-system-tools.mo share/locale/sk/LC_MESSAGES/gnome-system-tools.mo share/locale/sq/LC_MESSAGES/gnome-system-tools.mo @@ -168,13 +174,16 @@ share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo share/locale/sv/LC_MESSAGES/gnome-system-tools.mo share/locale/sv/LC_MESSAGES/setup-tools-backends.mo share/locale/ta/LC_MESSAGES/gnome-system-tools.mo +share/locale/ta/LC_MESSAGES/setup-tools-backends.mo share/locale/tr/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/setup-tools-backends.mo share/locale/vi/LC_MESSAGES/gnome-system-tools.mo share/locale/wa/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo +share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo +share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo share/setup-tool-backends/files/debian_ipchains share/setup-tool-backends/scripts/boot-conf share/setup-tool-backends/scripts/boot-grub.pl diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index d797995a06d6..41f1a5d3afef 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -6,11 +6,10 @@ # PORTNAME= nautilus-cd-burner -PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTVERSION= 2.8.5 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,13 +22,21 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack lthack nautilus2 -USE_INC_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 +USE_LIBTOOL_VER=15 +INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= ncb.schemas + .include <bsd.port.pre.mk> +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_DVD +WITH_DVD= yes +.endif + .if exists(${LOCALBASE}/bin/growisofs) WITH_DVD= yes .endif diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 52439e08a10e..6b36ce4a810a 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-cd-burner-2.6.1.tar.bz2) = 7998cbe011e9e0a22d9362a2430d578b -SIZE (gnome2/nautilus-cd-burner-2.6.1.tar.bz2) = 455965 +MD5 (gnome2/nautilus-cd-burner-2.8.5.tar.bz2) = 970173a3f93270950ca9fd247bdf07a7 +SIZE (gnome2/nautilus-cd-burner-2.8.5.tar.bz2) = 529099 diff --git a/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c b/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c new file mode 100644 index 000000000000..a684ac82a0de --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c @@ -0,0 +1,15 @@ +--- bacon-cd-selection.c.orig Thu Nov 4 00:25:43 2004 ++++ bacon-cd-selection.c Thu Nov 4 00:25:57 2004 +@@ -177,10 +177,10 @@ + static void + bacon_cd_selection_init (BaconCdSelection *bcs) + { +- bcs->priv = g_new0 (BaconCdSelectionPrivate, 1); +- + GtkCellRenderer *cell; + GtkListStore *store; ++ bcs->priv = g_new0 (BaconCdSelectionPrivate, 1); ++ + + store = gtk_list_store_new (1, G_TYPE_STRING); + gtk_combo_box_set_model (GTK_COMBO_BOX (bcs), diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c new file mode 100644 index 000000000000..1bcf94f3e29b --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c @@ -0,0 +1,218 @@ +--- cd-drive.c.orig Wed Sep 22 09:20:04 2004 ++++ cd-drive.c Mon Oct 4 02:20:47 2004 +@@ -270,9 +270,21 @@ + { + int fd; + int mmc_profile; ++#ifdef __FreeBSD__ ++ struct cam_device *cam; ++#endif + + g_return_val_if_fail (device != NULL, CD_MEDIA_TYPE_ERROR); + ++#ifdef __FreeBSD__ ++ cam = cam_open_device (device, O_RDWR); ++ if (cam == NULL) { ++ return CD_MEDIA_TYPE_ERROR; ++ } ++ ++ fd = cam->fd; ++#else ++ + fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); + if (fd < 0) { + if (errno == EBUSY) { +@@ -280,6 +292,7 @@ + } + return CD_MEDIA_TYPE_ERROR; + } ++#endif + + mmc_profile = get_mmc_profile (fd); + +@@ -307,7 +320,11 @@ + } + } + ++#ifdef __FreeBSD__ ++ cam_close_device (cam); ++#else + close (fd); ++#endif + + switch (mmc_profile) { + case -1: +@@ -442,10 +459,21 @@ + int secs; + int mmc_profile; + gint64 size; ++#ifdef __FreeBSD__ ++ struct cam_device *cam; ++#endif + + g_return_val_if_fail (device != NULL, CD_MEDIA_SIZE_UNKNOWN); + + secs = 0; ++#ifdef __FreeBSD__ ++ cam = cam_open_device (device, O_RDWR); ++ if (cam == NULL) { ++ return CD_MEDIA_SIZE_UNKNOWN; ++ } ++ ++ fd = cam->fd; ++#else + + fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); + if (fd < 0) { +@@ -454,6 +482,7 @@ + } + return CD_MEDIA_SIZE_UNKNOWN; + } ++#endif + + mmc_profile = get_mmc_profile (fd); + +@@ -476,7 +505,11 @@ + size = CD_MEDIA_SIZE_NA; + } + ++#ifdef __FreeBSD__ ++ cam_close_device (cam); ++#else + close (fd); ++#endif + + return size; + } +@@ -595,9 +628,81 @@ + #endif /* USE_HAL */ + + #if defined(__linux__) || defined(__FreeBSD__) ++static int ++get_device_max_write_speed (char *device) ++{ ++ int fd; ++ int max_speed; ++ int read_speed, write_speed; ++#ifdef __FreeBSD__ ++ struct cam_device *cam; ++#endif ++ ++ max_speed = -1; ++#ifdef __FreeBSD__ ++ cam = cam_open_device (device, O_RDWR); ++ if (cam == NULL) { ++ return -1; ++ } ++ ++ fd = cam->fd; ++#else ++ ++ fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); ++ if (fd < 0) { ++ return -1; ++ } ++#endif + ++ get_read_write_speed (fd, &read_speed, &write_speed); ++#ifdef __FreeBSD__ ++ cam_close_device (cam); ++#else ++ close (fd); ++#endif ++ max_speed = (int)floor (write_speed) / CD_ROM_SPEED; + ++ return max_speed; ++} + ++#if !defined(__linux) ++static int ++get_device_max_read_speed (char *device) ++{ ++ int fd; ++ int max_speed; ++ int read_speed, write_speed; ++#ifdef __FreeBSD__ ++ struct cam_device *cam; ++#endif ++ ++ max_speed = -1; ++#ifdef __FreeBSD__ ++ cam = cam_open_device (device, O_RDWR); ++ if (cam == NULL) { ++ return -1; ++ } ++ ++ fd = cam->fd; ++#else ++ ++ fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); ++ if (fd < 0) { ++ return -1; ++ } ++#endif ++ ++ get_read_write_speed (fd, &read_speed, &write_speed); ++#ifdef __FreeBSD__ ++ cam_close_device (cam); ++#else ++ close (fd); ++#endif ++ max_speed = (int)floor (read_speed) / CD_ROM_SPEED; ++ ++ return max_speed; ++} ++#endif + #endif /* __linux__ || __FreeBSD__ */ + + #if defined (__linux__) +@@ -800,49 +905,7 @@ + return NULL; + } + +-#if !defined(__linux) +-static int +-get_device_max_read_speed (char *device) +-{ +- int fd; +- int max_speed; +- int read_speed, write_speed; + +- max_speed = -1; +- +- fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); +- if (fd < 0) { +- return -1; +- } +- +- get_read_write_speed (fd, &read_speed, &write_speed); +- close (fd); +- max_speed = (int)floor (read_speed) / CD_ROM_SPEED; +- +- return max_speed; +-} +-#endif +- +-static int +-get_device_max_write_speed (char *device) +-{ +- int fd; +- int max_speed; +- int read_speed, write_speed; +- +- max_speed = -1; +- +- fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); +- if (fd < 0) { +- return -1; +- } +- +- get_read_write_speed (fd, &read_speed, &write_speed); +- close (fd); +- max_speed = (int)floor (write_speed) / CD_ROM_SPEED; +- +- return max_speed; +-} + + static char * + get_scsi_cd_name (int bus, int id, int lun, const char *dev, diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure new file mode 100644 index 000000000000..e8dbb4a5b891 --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-configure @@ -0,0 +1,27 @@ +--- configure.orig Thu Jul 22 10:27:35 2004 ++++ configure Thu Jul 22 10:29:32 2004 +@@ -21015,6 +21015,8 @@ + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ ac_check_lib_save_LIBS=$LIBS ++ LIBS="-lintl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21097,6 +21099,7 @@ + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ++ LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -21104,6 +21107,7 @@ + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF ++LIBS="-lintl $LIBS" + + fi + done diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c new file mode 100644 index 000000000000..3b8b07293043 --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c @@ -0,0 +1,33 @@ +--- nautilus-cd-burner.c.orig Sun Sep 19 18:44:15 2004 ++++ nautilus-cd-burner.c Sun Oct 31 13:06:08 2004 +@@ -21,6 +21,8 @@ + + Authors: Alexander Larsson <alexl@redhat.com> + */ ++#include <sys/types.h> ++#include <sys/stat.h> + #include <gtk/gtk.h> + #include <gtk/gtkfilesel.h> + #include <gtk/gtkseparatormenuitem.h> +@@ -632,8 +634,19 @@ + } + + if (res == RESULT_RETRY) { +- g_free (filename); +- filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL); ++ gchar *path1; ++ ++ path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir()); ++ ++ if (!g_file_test (path1, G_FILE_TEST_EXISTS)) { ++ mkdir (path1, 0700); ++ } ++ ++ if (filename != NULL) { ++ g_free (filename); ++ } ++ filename = g_build_filename (path1, "image.iso.XXXXXX", NULL); ++ g_free (path1); + fd = g_mkstemp(filename); + close (fd); + diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index c568590ce43b..c73c94fd94d0 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -1,12 +1,14 @@ bin/nautilus-cd-burner -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/ncb.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/ncb.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/ncb.schemas > /dev/null || /usr/bin/true etc/gnome-vfs-2.0/modules/mapping-modules.conf +include/libnautilus-burn/bacon-cd-selection.h +include/libnautilus-burn/cd-drive.h +include/libnautilus-burn/cd-recorder.h lib/gnome-vfs-2.0/modules/libmapping.so -lib/nautilus/extensions-1.0/libnautilus-burn.a -lib/nautilus/extensions-1.0/libnautilus-burn.so -lib/nautilus/extensions-1.0/libnautilus-burn.so.0 +lib/libnautilus-burn.a +lib/libnautilus-burn.so +lib/libnautilus-burn.so.0 +lib/nautilus/extensions-1.0/libnautilus-burn-extension.so +libdata/pkgconfig/libnautilus-burn.pc libexec/mapping-daemon share/gnome/nautilus-cd-burner/cdburn.glade share/gnome/nautilus-cd-burner/cdspin1.png @@ -23,6 +25,7 @@ share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo share/locale/bg/LC_MESSAGES/nautilus-cd-burner.mo share/locale/bn/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/bs/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ca/LC_MESSAGES/nautilus-cd-burner.mo share/locale/cs/LC_MESSAGES/nautilus-cd-burner.mo share/locale/cy/LC_MESSAGES/nautilus-cd-burner.mo @@ -44,6 +47,7 @@ share/locale/hi/LC_MESSAGES/nautilus-cd-burner.mo share/locale/hr/LC_MESSAGES/nautilus-cd-burner.mo share/locale/hu/LC_MESSAGES/nautilus-cd-burner.mo share/locale/id/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/is/LC_MESSAGES/nautilus-cd-burner.mo share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo @@ -51,8 +55,10 @@ share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/or/LC_MESSAGES/nautilus-cd-burner.mo share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo share/locale/pt/LC_MESSAGES/nautilus-cd-burner.mo @@ -72,3 +78,4 @@ share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo @dirrm share/gnome/nautilus-cd-burner +@dirrm include/libnautilus-burn diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile index 6a2b27836bd1..3b6120f37e63 100644 --- a/textproc/libcroco/Makefile +++ b/textproc/libcroco/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libcroco -PORTVERSION= 0.5.1 +PORTVERSION= 0.6.0 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6 MAINTAINER= gnome@FreeBSD.org COMMENT= CSS2 parsing library @@ -18,8 +18,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 INSTALLS_SHLIB= yes -USE_GNOME= gnomehack gtk20 libxml2 +USE_GNOME= gnomehack lthack glib20 libxml2 -MAN1= croco-config.1 csslint.1 +PLIST_SUB= VERSION="0.6" .include <bsd.port.mk> diff --git a/textproc/libcroco/distinfo b/textproc/libcroco/distinfo index 31dfc6d49675..8d4b4edce1a1 100644 --- a/textproc/libcroco/distinfo +++ b/textproc/libcroco/distinfo @@ -1,2 +1,2 @@ -MD5 (libcroco-0.5.1.tar.bz2) = 19e016a5533449a769662a116df7237c -SIZE (libcroco-0.5.1.tar.bz2) = 286747 +MD5 (libcroco-0.6.0.tar.bz2) = 78fb2bf78d469df83b1fc94ce196c1c4 +SIZE (libcroco-0.6.0.tar.bz2) = 358346 diff --git a/textproc/libcroco/files/patch-configure b/textproc/libcroco/files/patch-configure deleted file mode 100644 index e60602668856..000000000000 --- a/textproc/libcroco/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Tue Jul 8 02:14:29 2003 -+++ configure Tue Jul 8 02:14:54 2003 -@@ -7672,6 +7672,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 --git a/textproc/libcroco/pkg-plist b/textproc/libcroco/pkg-plist index f72b6632c3f8..4b37f5f3eb42 100644 --- a/textproc/libcroco/pkg-plist +++ b/textproc/libcroco/pkg-plist @@ -1,34 +1,36 @@ -bin/croco-config -bin/csslint -include/libcroco/libcroco/cr-additional-sel.h -include/libcroco/libcroco/cr-attr-sel.h -include/libcroco/libcroco/cr-cascade.h -include/libcroco/libcroco/cr-declaration.h -include/libcroco/libcroco/cr-doc-handler.h -include/libcroco/libcroco/cr-enc-handler.h -include/libcroco/libcroco/cr-fonts.h -include/libcroco/libcroco/cr-input.h -include/libcroco/libcroco/cr-num.h -include/libcroco/libcroco/cr-om-parser.h -include/libcroco/libcroco/cr-parser.h -include/libcroco/libcroco/cr-prop-list.h -include/libcroco/libcroco/cr-pseudo.h -include/libcroco/libcroco/cr-rgb.h -include/libcroco/libcroco/cr-sel-eng.h -include/libcroco/libcroco/cr-selector.h -include/libcroco/libcroco/cr-simple-sel.h -include/libcroco/libcroco/cr-statement.h -include/libcroco/libcroco/cr-style.h -include/libcroco/libcroco/cr-stylesheet.h -include/libcroco/libcroco/cr-term.h -include/libcroco/libcroco/cr-tknzr.h -include/libcroco/libcroco/cr-token.h -include/libcroco/libcroco/cr-utils.h -include/libcroco/libcroco/libcroco-config.h -include/libcroco/libcroco/libcroco.h -lib/libcroco.a -lib/libcroco.so -lib/libcroco.so.3 -libdata/pkgconfig/libcroco.pc -@dirrm include/libcroco/libcroco -@dirrm include/libcroco +bin/croco-%%VERSION%%-config +bin/csslint-%%VERSION%% +include/libcroco-%%VERSION%%/libcroco/cr-additional-sel.h +include/libcroco-%%VERSION%%/libcroco/cr-attr-sel.h +include/libcroco-%%VERSION%%/libcroco/cr-cascade.h +include/libcroco-%%VERSION%%/libcroco/cr-declaration.h +include/libcroco-%%VERSION%%/libcroco/cr-doc-handler.h +include/libcroco-%%VERSION%%/libcroco/cr-enc-handler.h +include/libcroco-%%VERSION%%/libcroco/cr-fonts.h +include/libcroco-%%VERSION%%/libcroco/cr-input.h +include/libcroco-%%VERSION%%/libcroco/cr-num.h +include/libcroco-%%VERSION%%/libcroco/cr-om-parser.h +include/libcroco-%%VERSION%%/libcroco/cr-parser.h +include/libcroco-%%VERSION%%/libcroco/cr-parsing-location.h +include/libcroco-%%VERSION%%/libcroco/cr-prop-list.h +include/libcroco-%%VERSION%%/libcroco/cr-pseudo.h +include/libcroco-%%VERSION%%/libcroco/cr-rgb.h +include/libcroco-%%VERSION%%/libcroco/cr-sel-eng.h +include/libcroco-%%VERSION%%/libcroco/cr-selector.h +include/libcroco-%%VERSION%%/libcroco/cr-simple-sel.h +include/libcroco-%%VERSION%%/libcroco/cr-statement.h +include/libcroco-%%VERSION%%/libcroco/cr-string.h +include/libcroco-%%VERSION%%/libcroco/cr-style.h +include/libcroco-%%VERSION%%/libcroco/cr-stylesheet.h +include/libcroco-%%VERSION%%/libcroco/cr-term.h +include/libcroco-%%VERSION%%/libcroco/cr-tknzr.h +include/libcroco-%%VERSION%%/libcroco/cr-token.h +include/libcroco-%%VERSION%%/libcroco/cr-utils.h +include/libcroco-%%VERSION%%/libcroco/libcroco-config.h +include/libcroco-%%VERSION%%/libcroco/libcroco.h +lib/libcroco-%%VERSION%%.a +lib/libcroco-%%VERSION%%.so +lib/libcroco-%%VERSION%%.so.3 +libdata/pkgconfig/libcroco-%%VERSION%%.pc +@dirrm include/libcroco-%%VERSION%%/libcroco +@dirrm include/libcroco-%%VERSION%% diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index b7a10ade7905..815f6f168152 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -6,11 +6,10 @@ # PORTNAME= epiphany -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.4.2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/1.4 PKGNAMESUFFIX= -extensions DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,8 +25,6 @@ RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany \ MOZILLA= mozilla HEADERS_SUFX= -MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.7" - .if !defined(WITH_MOZILLA) MOZILLA= mozilla HEADERS_SUFX= @@ -35,7 +32,6 @@ HEADERS_SUFX= .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2" MOZILLA= mozilla-devel HEADERS_SUFX= -devel -MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.8a2" .else MOZILLA= mozilla HEADERS_SUFX= @@ -49,8 +45,9 @@ USE_LIBTOOL_VER=15 USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS= --with-extensions="all" \ - ${MOZ_CONFIGURE_ARGS} +CONFIGURE_ARGS= --with-extensions="all" + +PLIST_SUB= VERSION="1.4" .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_OPENSP @@ -66,7 +63,7 @@ WITH_OPENSP= yes .if defined(WITH_OPENSP) CONFIGURE_ARGS+= --enable-opensp=yes .else -CONFIGURE_ARGS+= --enable-opensp=no +CONFIGURE_ARGS+= --disable-opensp .endif pre-everything:: @@ -81,6 +78,11 @@ pre-everything:: @${ECHO_MSG} "" post-patch: - @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \ + s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g; \ + s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g; \ + s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \ + ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo index 914d6098ba1c..b1833f468326 100644 --- a/www/epiphany-extensions/distinfo +++ b/www/epiphany-extensions/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/epiphany-extensions-1.0.tar.bz2) = 8be057ef7a37b10bdd3a3cc1df818f3a -SIZE (gnome2/epiphany-extensions-1.0.tar.bz2) = 392615 +MD5 (gnome2/epiphany-extensions-1.4.2.tar.bz2) = da502f0f0ba3c572b2aa2108b38281af +SIZE (gnome2/epiphany-extensions-1.4.2.tar.bz2) = 457118 diff --git a/www/epiphany-extensions/files/patch-configure b/www/epiphany-extensions/files/patch-configure index 3d1a72f41af7..2611517cb8d4 100644 --- a/www/epiphany-extensions/files/patch-configure +++ b/www/epiphany-extensions/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Mon Feb 2 01:47:03 2004 -+++ configure Mon Feb 2 01:47:33 2004 +--- configure.orig Wed Jul 7 14:09:38 2004 ++++ configure Wed Jul 7 14:10:16 2004 @@ -22050,6 +22050,10 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10,4 +10,4 @@ + HAVE_OPENSP_FALSE= fi - + diff --git a/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp b/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp deleted file mode 100644 index ffc2b645db0f..000000000000 --- a/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp +++ /dev/null @@ -1,31 +0,0 @@ ---- extensions/popup-blocker/mozilla/mozilla-helpers.cpp.orig Mon Mar 15 17:07:05 2004 -+++ extensions/popup-blocker/mozilla/mozilla-helpers.cpp Mon Jul 19 20:33:33 2004 -@@ -65,12 +65,16 @@ - nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface (domWindow, &rv)); - NS_ENSURE_SUCCESS (rv, NULL); - -+#if MOZILLA_SNAPSHOT < 18 - nsCOMPtr<nsIChromeEventHandler> chromeHandler; - rv = piWin->GetChromeEventHandler (getter_AddRefs (chromeHandler)); - NS_ENSURE_SUCCESS (rv, NULL); -+#endif - - nsCOMPtr<nsIDOMEventReceiver> eventReceiver; -+#if MOZILLA_SNAPSHOT < 18 - eventReceiver = do_QueryInterface (chromeHandler, &rv); -+#endif - NS_ENSURE_SUCCESS (rv, NULL); - - nsCOMPtr<nsIDOMEventTarget> target; -@@ -181,7 +185,11 @@ - g_free (script); - - PRBool isUndefined; -+#if MOZILLA_SNAPSHOT < 18 - nsAutoString ret; -+#else -+ nsAString *ret; -+#endif - context->EvaluateString (aScript, nsnull, nsnull, nsnull, 0, - nsnull, ret, &isUndefined); - diff --git a/www/epiphany-extensions/files/patch-extensions_smart-bookmarks_mozilla_Makefile.in b/www/epiphany-extensions/files/patch-extensions_smart-bookmarks_mozilla_Makefile.in new file mode 100644 index 000000000000..f155cba320cb --- /dev/null +++ b/www/epiphany-extensions/files/patch-extensions_smart-bookmarks_mozilla_Makefile.in @@ -0,0 +1,10 @@ +--- extensions/smart-bookmarks/mozilla/Makefile.in.orig Mon Sep 13 18:11:00 2004 ++++ extensions/smart-bookmarks/mozilla/Makefile.in Mon Sep 13 18:12:30 2004 +@@ -218,6 +218,7 @@ + -I$(MOZILLA_INCLUDE_ROOT)/content \ + -I$(MOZILLA_INCLUDE_ROOT)/docshell \ + -I$(MOZILLA_INCLUDE_ROOT)/dom \ ++ -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \ + -I$(MOZILLA_INCLUDE_ROOT)/xpcom \ + -I$(MOZILLA_INCLUDE_ROOT) \ + $(EPIPHANY_DEPENDENCY_CFLAGS) \ diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist index 4416b5296e6b..694b55312ee1 100644 --- a/www/epiphany-extensions/pkg-plist +++ b/www/epiphany-extensions/pkg-plist @@ -1,55 +1,72 @@ -lib/epiphany/extensions/libcertificatesextension.a -lib/epiphany/extensions/libcertificatesextension.so -lib/epiphany/extensions/libcertificatesextension.so.0 -lib/epiphany/extensions/libdashboardextension.a -lib/epiphany/extensions/libdashboardextension.so -lib/epiphany/extensions/libdashboardextension.so.0 -lib/epiphany/extensions/liberrorviewerextension.a -lib/epiphany/extensions/liberrorviewerextension.so -lib/epiphany/extensions/liberrorviewerextension.so.0 -lib/epiphany/extensions/libgesturesextension.a -lib/epiphany/extensions/libgesturesextension.so -lib/epiphany/extensions/libgesturesextension.so.0 -lib/epiphany/extensions/libpopupblockerextension.a -lib/epiphany/extensions/libpopupblockerextension.so -lib/epiphany/extensions/libpopupblockerextension.so.0 -lib/epiphany/extensions/libtabsmenuextension.a -lib/epiphany/extensions/libtabsmenuextension.so -lib/epiphany/extensions/libtabsmenuextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.a +lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.so +lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libdashboardextension.a +lib/epiphany-%%VERSION%%/extensions/libdashboardextension.so +lib/epiphany-%%VERSION%%/extensions/libdashboardextension.so.0 +lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.a +lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.so +lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libgesturesextension.a +lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so +lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.a +lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.so +lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.a +lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.so +lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libsidebarextension.a +lib/epiphany-%%VERSION%%/extensions/libsidebarextension.so +lib/epiphany-%%VERSION%%/extensions/libsidebarextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.a +lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.so +lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.a +lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.so +lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.a +lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.so +lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.so.0 share/gnome/epiphany-extensions/ephy-gestures.xml share/gnome/epiphany-extensions/glade/error-viewer.glade -share/gnome/epiphany-extensions/icons/popup-blocker.svg -share/locale/bg/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/ca/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/cs/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/da/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/de/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/el/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/en_GB/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/es/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/fr/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/hr/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/hu/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/it/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/ja/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/lt/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/nl/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/no/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/pa/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/pl/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/pt/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/ru/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/sk/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/sq/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/sr/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/sv/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/uk/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/wa/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-1.0.mo -@dirrm share/gnome/epiphany-extensions/icons +share/gnome/epiphany-extensions/glade/page-info.glade +share/gnome/epiphany-extensions/glade/smart-bookmarks.glade +share/gnome/epiphany-extensions/xml/epiphany-sidebar-ui.xml +share/gnome/epiphany-extensions/xml/page-info-context-ui.xml +share/locale/bg/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/no/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/wa/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +@dirrm share/gnome/epiphany-extensions/xml @dirrm share/gnome/epiphany-extensions/glade @dirrm share/gnome/epiphany-extensions -@dirrm lib/epiphany/extensions -@dirrm lib/epiphany +@dirrm lib/epiphany-%%VERSION%%/extensions +@dirrm lib/epiphany-%%VERSION%% diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index cebc7e3d8fe4..76797e5c5255 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -6,10 +6,10 @@ # PORTNAME= epiphany -PORTVERSION= 1.2.8 +PORTVERSION= 1.4.4 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -36,8 +36,7 @@ HEADERS_SUFX= USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui -WANT_GNOME= yes +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui desktopfileutils USE_LIBTOOL_VER=15 USE_GMAKE= yes USE_REINPLACE= yes @@ -46,26 +45,13 @@ CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUF CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas + FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1 PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" -.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) -.undef WITHOUT_GNOME -.undef WITHOUT_ALL -WITH_GNOME= yes -.endif - .include <bsd.port.pre.mk> -.if ${HAVE_GNOME:Mnautilus2}!="" -USE_GNOME+= nautilus2 -CONFIGURE_ARGS+= --enable-nautilus-view -PLIST_SUB+= NAUTILUS="" -.else -CONFIGURE_ARGS+= --enable-nautilus-view=no -PLIST_SUB+= NAUTILUS="@comment " -.endif - .if ${OSVERSION} > 500000 # Galeon does not build correctly in -CURRENT if -Werror is passed # to the compiler. @@ -85,21 +71,29 @@ pre-everything:: @${ECHO_MSG} "" post-patch: - @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \ - s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g ; \ + s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g ; \ + s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g ; \ + s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \ + ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-lpthread|${PTHREAD_LIBS}|g' @${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' post-configure: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ + @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g ; \ s|%%MOZILLA%%|${MOZILLA}|g ; \ - s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' ${WRKSRC}/src/epiphany + s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' <${FILESDIR}/epiphany \ + > ${WRKDIR}/epiphany pre-install: @-${X11BASE}/bin/gconftool-2 --shutdown +post-install: + @${MV} -f ${PREFIX}/bin/epiphany ${PREFIX}/bin/epiphany-bin + ${INSTALL_SCRIPT} ${WRKDIR}/epiphany ${PREFIX}/bin + .include <bsd.port.post.mk> diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index 8224bfd17032..2006f639245d 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/epiphany-1.2.8.tar.bz2) = 19d80db940f722b890dd439038743f83 -SIZE (gnome2/epiphany-1.2.8.tar.bz2) = 2979211 +MD5 (gnome2/epiphany-1.4.4.tar.bz2) = 2d29074c577dd42706c923df21a9a5bf +SIZE (gnome2/epiphany-1.4.4.tar.bz2) = 3355896 diff --git a/www/epiphany/files/epiphany b/www/epiphany/files/epiphany new file mode 100644 index 000000000000..504fd02402ce --- /dev/null +++ b/www/epiphany/files/epiphany @@ -0,0 +1,27 @@ +#!/bin/sh + +dist_bin=`dirname $0` + +MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%% + +if [ -z "$MOZ_PLUGIN_PATH" ]; then + MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins + export MOZ_PLUGIN_PATH +fi + +if [ -n "$LD_LIBRARY_PATH" ]; then + LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH +else + LD_LIBRARY_PATH=$MOZILLA_HOME +fi +export LD_LIBRARY_PATH + +MOZILLA_FIVE_HOME=$MOZILLA_HOME +export MOZILLA_FIVE_HOME + +if [ -f %%LOCALBASE%%/lib/libflashplayer.so.1 ]; then + LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1 + export LD_PRELOAD +fi + +exec "%%PREFIX%%/bin/epiphany-bin" "$@" diff --git a/www/epiphany/files/patch-embed_mozilla_Makefile.in b/www/epiphany/files/patch-embed_mozilla_Makefile.in new file mode 100644 index 000000000000..d9be4935d30d --- /dev/null +++ b/www/epiphany/files/patch-embed_mozilla_Makefile.in @@ -0,0 +1,18 @@ +--- embed/mozilla/Makefile.in.orig Tue Jul 6 18:36:11 2004 ++++ embed/mozilla/Makefile.in Tue Jul 6 18:38:39 2004 +@@ -218,6 +218,7 @@ + -I$(MOZILLA_INCLUDE_ROOT)/docshell \ + -I$(MOZILLA_INCLUDE_ROOT)/dom \ + -I$(MOZILLA_INCLUDE_ROOT)/exthandler \ ++ -I$(MOZILLA_INCLUDE_ROOT)/find \ + -I$(MOZILLA_INCLUDE_ROOT)/gfx \ + -I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \ + -I$(MOZILLA_INCLUDE_ROOT)/history \ +@@ -228,6 +229,7 @@ + -I$(MOZILLA_INCLUDE_ROOT)/nkcache \ + -I$(MOZILLA_INCLUDE_ROOT)/pipboot \ + -I$(MOZILLA_INCLUDE_ROOT)/pipnss \ ++ -I$(MOZILLA_INCLUDE_ROOT)/pref \ + -I$(MOZILLA_INCLUDE_ROOT)/shistory \ + -I$(MOZILLA_INCLUDE_ROOT)/uriloader \ + -I$(MOZILLA_INCLUDE_ROOT)/uconv \ diff --git a/www/epiphany/files/patch-src_epiphany.in b/www/epiphany/files/patch-src_epiphany.in deleted file mode 100644 index 23583b77fe82..000000000000 --- a/www/epiphany/files/patch-src_epiphany.in +++ /dev/null @@ -1,22 +0,0 @@ ---- src/epiphany.in.orig Sat Dec 20 14:35:58 2003 -+++ src/epiphany.in Sun Dec 28 16:44:41 2003 -@@ -5,7 +5,7 @@ - MOZILLA_HOME=@MOZILLA_HOME@ - - if [ -z "$MOZ_PLUGIN_PATH" ]; then -- MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins:/usr/libexec/plugins/mozilla -+ MOZ_PLUGIN_PATH=%%X11BASE%%/lib/browser_plugins - export MOZ_PLUGIN_PATH - fi - -@@ -28,4 +28,9 @@ - MOZILLA_FIVE_HOME=$MOZILLA_HOME - export MOZILLA_FIVE_HOME - --exec "$dist_bin/epiphany-bin" "$@" -+if [ -f %%FLASHPLAYER%% ]; then -+ LD_PRELOAD=%%FLASHPLAYER%% -+ export LD_PRELOAD -+fi -+ -+exec "%%PREFIX%%/bin/epiphany-bin" "$@" diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index a33679b30382..62dc792f7ea7 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -1,16 +1,11 @@ bin/epiphany bin/epiphany-bin -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/epiphany-lockdown.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/epiphany-lockdown.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/epiphany-lockdown.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/epiphany.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/epiphany.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/epiphany.schemas > /dev/null || /usr/bin/true include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-command-manager.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-dialog.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-event.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-factory.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h @@ -30,14 +25,21 @@ include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-statusbar.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-tab.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-window.h libdata/bonobo/servers/GNOME_Epiphany_Automation.server -%%NAUTILUS%%libdata/bonobo/servers/GNOME_Epiphany_NautilusView.server -libdata/pkgconfig/epiphany-1.2.pc +libdata/pkgconfig/epiphany-1.4.pc +%%DOCSDIR%%/EphyCommandManager.html +%%DOCSDIR%%/EphyEmbed.html +%%DOCSDIR%%/EphyNodeDb.html +%%DOCSDIR%%/EphyTab.html +%%DOCSDIR%%/EphyWindow.html %%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html +%%DOCSDIR%%/epiphany-EphyEmbedFactory.html +%%DOCSDIR%%/epiphany-EphyEmbedPersist.html +%%DOCSDIR%%/epiphany-EphyEmbedSingle.html +%%DOCSDIR%%/epiphany-EphyGlade.html +%%DOCSDIR%%/epiphany-EphyPermissionManager.html %%DOCSDIR%%/epiphany-ephy-cookie-manager.html -%%DOCSDIR%%/epiphany-ephy-embed-factory.html -%%DOCSDIR%%/epiphany-ephy-embed-single.html %%DOCSDIR%%/epiphany-ephy-password-manager.html -%%DOCSDIR%%/epiphany-ephy-permission-manager.html %%DOCSDIR%%/epiphany-ephy-session.html %%DOCSDIR%%/epiphany-ephy-shell.html %%DOCSDIR%%/epiphany.devhelp @@ -46,21 +48,25 @@ libdata/pkgconfig/epiphany-1.2.pc %%DOCSDIR%%/index.sgml %%DOCSDIR%%/left.png %%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css %%DOCSDIR%%/up.png share/gnome/application-registry/epiphany.applications share/gnome/applications/bme.desktop share/gnome/applications/epiphany.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/epiphany/art/epiphany-bookmarks.png +share/gnome/epiphany/art/epiphany-close-tab.png share/gnome/epiphany/art/epiphany-download.png share/gnome/epiphany/art/epiphany-entry.png share/gnome/epiphany/art/epiphany-history.png +share/gnome/epiphany/art/epiphany-popup-hidden.png share/gnome/epiphany/art/epiphany-secure.png -share/gnome/epiphany/art/epiphany-tab-loading.gif share/gnome/epiphany/art/epiphany-unsecure.png share/gnome/epiphany/art/hand-open.png share/gnome/epiphany/conspiracy.xhtml share/gnome/epiphany/default-prefs.js share/gnome/epiphany/epiphany-bookmark-editor-ui.xml +share/gnome/epiphany/epiphany-bookmarksbar.xml share/gnome/epiphany/epiphany-fs-toolbar.xml share/gnome/epiphany/epiphany-history-window-ui.xml share/gnome/epiphany/epiphany-toolbar.xml @@ -71,7 +77,6 @@ share/gnome/epiphany/glade/epiphany.glade share/gnome/epiphany/glade/prefs-dialog.glade share/gnome/epiphany/glade/print.glade share/gnome/epiphany/mime-types-permissions.xml -share/gnome/epiphany/nautilus-epiphany-view.xml share/gnome/help/epiphany/C/epiphany.xml share/gnome/help/epiphany/C/figures/ephy-addressbar-smartbookmark-screenshot.png share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.png @@ -88,19 +93,28 @@ share/gnome/help/epiphany/eu/epiphany.xml share/gnome/help/epiphany/eu/figures/ephy-history-window-screenshot.png share/gnome/help/epiphany/eu/figures/ephy-screenshot.png share/gnome/help/epiphany/eu/legal.xml +share/gnome/help/epiphany/ja/epiphany.xml +share/gnome/help/epiphany/ja/figures/ephy-addressbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/ja/figures/ephy-history-window-screenshot.png +share/gnome/help/epiphany/ja/figures/ephy-screenshot.png +share/gnome/help/epiphany/ja/legal.xml share/gnome/omf/epiphany/epiphany-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/epiphany/epiphany-es.omf @exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-es.omf 2>/dev/null || /usr/bin/true share/gnome/omf/epiphany/epiphany-eu.omf @exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-eu.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/epiphany/epiphany-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-ja.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/epiphany-bookmarks.png share/locale/am/LC_MESSAGES/epiphany.mo -share/locale/az/LC_MESSAGES/epiphany.mo share/locale/ar/LC_MESSAGES/epiphany.mo +share/locale/az/LC_MESSAGES/epiphany.mo share/locale/be/LC_MESSAGES/epiphany.mo share/locale/bg/LC_MESSAGES/epiphany.mo share/locale/bn/LC_MESSAGES/epiphany.mo +share/locale/bs/LC_MESSAGES/epiphany.mo share/locale/ca/LC_MESSAGES/epiphany.mo share/locale/cs/LC_MESSAGES/epiphany.mo share/locale/cy/LC_MESSAGES/epiphany.mo @@ -130,11 +144,14 @@ share/locale/li/LC_MESSAGES/epiphany.mo share/locale/lt/LC_MESSAGES/epiphany.mo share/locale/mi/LC_MESSAGES/epiphany.mo share/locale/mk/LC_MESSAGES/epiphany.mo +share/locale/ml/LC_MESSAGES/epiphany.mo share/locale/mn/LC_MESSAGES/epiphany.mo share/locale/ms/LC_MESSAGES/epiphany.mo +share/locale/nb/LC_MESSAGES/epiphany.mo +share/locale/ne/LC_MESSAGES/epiphany.mo share/locale/nl/LC_MESSAGES/epiphany.mo -share/locale/no/LC_MESSAGES/epiphany.mo share/locale/nn/LC_MESSAGES/epiphany.mo +share/locale/no/LC_MESSAGES/epiphany.mo share/locale/pa/LC_MESSAGES/epiphany.mo share/locale/pl/LC_MESSAGES/epiphany.mo share/locale/pt/LC_MESSAGES/epiphany.mo @@ -157,6 +174,8 @@ share/locale/wa/LC_MESSAGES/epiphany.mo share/locale/zh_CN/LC_MESSAGES/epiphany.mo share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm share/gnome/omf/epiphany +@dirrm share/gnome/help/epiphany/ja/figures +@dirrm share/gnome/help/epiphany/ja @dirrm share/gnome/help/epiphany/eu/figures @dirrm share/gnome/help/epiphany/eu @dirrm share/gnome/help/epiphany/es/figures @@ -171,5 +190,7 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm include/epiphany-%%EPHY_VERSION%%/epiphany @dirrm include/epiphany-%%EPHY_VERSION%% @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-eu.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-eu.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-ja.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile new file mode 100644 index 000000000000..ea49c09561d4 --- /dev/null +++ b/www/evolution-webcal/Makefile @@ -0,0 +1,30 @@ +# New ports collection makefile for: evolution-webcal +# Date created: Mon Apr 26 18:08:00 CEST 2004 +# Whom: Koop Mast <kwm@rainbow-runner.nl> +# +# $FreeBSD$ +# + +PORTNAME= webcal +PORTVERSION= 2.0.1 +CATEGORIES= www gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/2.0 +PKGNAMEPREFIX= evolution- +DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} + +MAINTAINER= kwm@FreeBSD.org +COMMENT= Webcal(endar) handler for gnome + +USE_X_PREFIX= yes +USE_BZIP2= yes +USE_GMAKE= yes +USE_PERL= yes +USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +GCONF_SCHEMAS= evolution-webcal.schemas + +.include <bsd.port.mk> diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo new file mode 100644 index 000000000000..c9ed8d4cf804 --- /dev/null +++ b/www/evolution-webcal/distinfo @@ -0,0 +1,2 @@ +MD5 (evolution-webcal-2.0.1.tar.bz2) = a29be3b55e6def3b56ffa3c48b349b40 +SIZE (evolution-webcal-2.0.1.tar.bz2) = 144969 diff --git a/www/evolution-webcal/pkg-descr b/www/evolution-webcal/pkg-descr new file mode 100644 index 000000000000..ab2f04e9d662 --- /dev/null +++ b/www/evolution-webcal/pkg-descr @@ -0,0 +1,7 @@ +Evolution Webcal installs a GNOME URL Handler for "webcal:". +This will pop up a subscription dialog when you point your web browser at it. +The calendars will automaticaly appear in Evolution 1.5.x if it is running, +or will show up the next time you start Evolution. + +It also works for non-GNOME applications. These applications need to set +there URL handler to be "gnome-open". diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist new file mode 100644 index 000000000000..f841cb7faa8e --- /dev/null +++ b/www/evolution-webcal/pkg-plist @@ -0,0 +1,45 @@ +libexec/evolution-webcal +share/gnome/application-registry/evolution-webcal.applications +share/locale/ar/LC_MESSAGES/evolution-webcal.mo +share/locale/az/LC_MESSAGES/evolution-webcal.mo +share/locale/bg/LC_MESSAGES/evolution-webcal.mo +share/locale/bn/LC_MESSAGES/evolution-webcal.mo +share/locale/bs/LC_MESSAGES/evolution-webcal.mo +share/locale/ca/LC_MESSAGES/evolution-webcal.mo +share/locale/cs/LC_MESSAGES/evolution-webcal.mo +share/locale/cy/LC_MESSAGES/evolution-webcal.mo +share/locale/da/LC_MESSAGES/evolution-webcal.mo +share/locale/de/LC_MESSAGES/evolution-webcal.mo +share/locale/el/LC_MESSAGES/evolution-webcal.mo +share/locale/en_CA/LC_MESSAGES/evolution-webcal.mo +share/locale/en_GB/LC_MESSAGES/evolution-webcal.mo +share/locale/es/LC_MESSAGES/evolution-webcal.mo +share/locale/eu/LC_MESSAGES/evolution-webcal.mo +share/locale/fi/LC_MESSAGES/evolution-webcal.mo +share/locale/fr/LC_MESSAGES/evolution-webcal.mo +share/locale/gu/LC_MESSAGES/evolution-webcal.mo +share/locale/hi/LC_MESSAGES/evolution-webcal.mo +share/locale/hu/LC_MESSAGES/evolution-webcal.mo +share/locale/it/LC_MESSAGES/evolution-webcal.mo +share/locale/ja/LC_MESSAGES/evolution-webcal.mo +share/locale/ko/LC_MESSAGES/evolution-webcal.mo +share/locale/ms/LC_MESSAGES/evolution-webcal.mo +share/locale/nb/LC_MESSAGES/evolution-webcal.mo +share/locale/nl/LC_MESSAGES/evolution-webcal.mo +share/locale/no/LC_MESSAGES/evolution-webcal.mo +share/locale/or/LC_MESSAGES/evolution-webcal.mo +share/locale/pa/LC_MESSAGES/evolution-webcal.mo +share/locale/pl/LC_MESSAGES/evolution-webcal.mo +share/locale/pt/LC_MESSAGES/evolution-webcal.mo +share/locale/pt_BR/LC_MESSAGES/evolution-webcal.mo +share/locale/ru/LC_MESSAGES/evolution-webcal.mo +share/locale/sq/LC_MESSAGES/evolution-webcal.mo +share/locale/sr/LC_MESSAGES/evolution-webcal.mo +share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo +share/locale/sv/LC_MESSAGES/evolution-webcal.mo +share/locale/ta/LC_MESSAGES/evolution-webcal.mo +share/locale/tr/LC_MESSAGES/evolution-webcal.mo +share/locale/uk/LC_MESSAGES/evolution-webcal.mo +share/locale/vi/LC_MESSAGES/evolution-webcal.mo +share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo +share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 915051e023f3..b9afe8083bf4 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -6,26 +6,27 @@ # PORTNAME= gtkhtml3 -PORTVERSION= 3.0.10 -PORTREVISION= 1 +PORTVERSION= 3.2.3 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.2 DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.0.0:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gal2 gail +USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + LDFLAGS="-L${LOCALBASE}/lib" + +PLIST_SUB= VERSION="3.1" .include <bsd.port.mk> diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index 045fb89e752c..d9435284ee39 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtkhtml-3.0.10.tar.bz2) = b05b8551f7803f32ecfcf505a6310f3f -SIZE (gnome2/gtkhtml-3.0.10.tar.bz2) = 1074973 +MD5 (gnome2/gtkhtml-3.2.3.tar.bz2) = fe7aa0259a4cd7c99280c076711f8f80 +SIZE (gnome2/gtkhtml-3.2.3.tar.bz2) = 1304520 diff --git a/www/gtkhtml3/files/patch-ltmain.sh b/www/gtkhtml3/files/patch-ltmain.sh deleted file mode 100644 index 1c2fba5d533f..000000000000 --- a/www/gtkhtml3/files/patch-ltmain.sh +++ /dev/null @@ -1,42 +0,0 @@ ---- ltmain.sh.orig Fri Sep 13 15:38:11 2002 -+++ ltmain.sh Fri Oct 11 01:44:24 2002 -@@ -1073,8 +1073,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2502,6 +2510,9 @@ - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4286,10 +4297,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c index 1747affa3007..902c39e8ecb1 100644 --- a/www/gtkhtml3/files/patch-src_gtkhtml.c +++ b/www/gtkhtml3/files/patch-src_gtkhtml.c @@ -1,11 +1,11 @@ ---- src/gtkhtml.c.orig Wed Apr 16 01:52:24 2003 -+++ src/gtkhtml.c Wed Apr 16 01:52:35 2003 -@@ -2677,7 +2677,7 @@ +--- src/gtkhtml.c.orig Mon Aug 2 11:21:24 2004 ++++ src/gtkhtml.c Tue Aug 3 15:19:41 2004 +@@ -2955,7 +2955,7 @@ add_bindings (klass); gtk_html_accessibility_init (); -- gtk_rc_parse (PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs"); -+ gtk_rc_parse (PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs"); +- gtk_rc_parse (PREFIX "/share/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs"); ++ gtk_rc_parse (PREFIX "/share/gnome/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs"); html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs"); read_key_theme (html_class); gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme", diff --git a/www/gtkhtml3/pkg-descr b/www/gtkhtml3/pkg-descr index 618f9c253d3b..38451dc0178d 100644 --- a/www/gtkhtml3/pkg-descr +++ b/www/gtkhtml3/pkg-descr @@ -1,5 +1,3 @@ -This is GtkHTML, a lightweight HTML rendering/printing/editing engine. -It was originally based on KHTMLW, but is now being developed -independently. +GtkHTML is a lightweight HTML rendering, printing, and editing engine. WWW: http://www.ximian.com/ diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist index 573bde598d33..a6ecb1a29789 100644 --- a/www/gtkhtml3/pkg-plist +++ b/www/gtkhtml3/pkg-plist @@ -1,194 +1,213 @@ -include/libgtkhtml-3.0/gtkhtml/gtkhtml-compat.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-embedded.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-enums.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-keybinding.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-private.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-properties.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-search.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-stream.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-types.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml.h -include/libgtkhtml-3.0/gtkhtml/gtkhtmldebug.h -include/libgtkhtml-3.0/gtkhtml/gtkhtmlfontstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlanchor.h -include/libgtkhtml-3.0/gtkhtml/htmlbutton.h -include/libgtkhtml-3.0/gtkhtml/htmlcheckbox.h -include/libgtkhtml-3.0/gtkhtml/htmlclue.h -include/libgtkhtml-3.0/gtkhtml/htmlcluealigned.h -include/libgtkhtml-3.0/gtkhtml/htmlclueflow.h -include/libgtkhtml-3.0/gtkhtml/htmlclueh.h -include/libgtkhtml-3.0/gtkhtml/htmlcluev.h -include/libgtkhtml-3.0/gtkhtml/htmlcolor.h -include/libgtkhtml-3.0/gtkhtml/htmlcolorset.h -include/libgtkhtml-3.0/gtkhtml/htmlcursor.h -include/libgtkhtml-3.0/gtkhtml/htmldrawqueue.h -include/libgtkhtml-3.0/gtkhtml/htmlembedded.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-clueflowstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cursor.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cut-and-paste.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-fontstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-images.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-movement.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-rule.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-selection-updater.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-table.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-tablecell.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-text.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-print.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-save.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-search.h -include/libgtkhtml-3.0/gtkhtml/htmlengine.h -include/libgtkhtml-3.0/gtkhtml/htmlentity.h -include/libgtkhtml-3.0/gtkhtml/htmlenums.h -include/libgtkhtml-3.0/gtkhtml/htmlenumutils.h -include/libgtkhtml-3.0/gtkhtml/htmlfontmanager.h -include/libgtkhtml-3.0/gtkhtml/htmlform.h -include/libgtkhtml-3.0/gtkhtml/htmlframe.h -include/libgtkhtml-3.0/gtkhtml/htmlframeset.h -include/libgtkhtml-3.0/gtkhtml/htmlgdkpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlhidden.h -include/libgtkhtml-3.0/gtkhtml/htmliframe.h -include/libgtkhtml-3.0/gtkhtml/htmlimage.h -include/libgtkhtml-3.0/gtkhtml/htmlimageinput.h -include/libgtkhtml-3.0/gtkhtml/htmlinterval.h -include/libgtkhtml-3.0/gtkhtml/htmllinktext.h -include/libgtkhtml-3.0/gtkhtml/htmllist.h -include/libgtkhtml-3.0/gtkhtml/htmlmap.h -include/libgtkhtml-3.0/gtkhtml/htmlmarshal.h -include/libgtkhtml-3.0/gtkhtml/htmlobject.h -include/libgtkhtml-3.0/gtkhtml/htmlpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlplainpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlprinter.h -include/libgtkhtml-3.0/gtkhtml/htmlradio.h -include/libgtkhtml-3.0/gtkhtml/htmlreplace.h -include/libgtkhtml-3.0/gtkhtml/htmlrule.h -include/libgtkhtml-3.0/gtkhtml/htmlsearch.h -include/libgtkhtml-3.0/gtkhtml/htmlselect.h -include/libgtkhtml-3.0/gtkhtml/htmlselection.h -include/libgtkhtml-3.0/gtkhtml/htmlsettings.h -include/libgtkhtml-3.0/gtkhtml/htmlshape.h -include/libgtkhtml-3.0/gtkhtml/htmlstack.h -include/libgtkhtml-3.0/gtkhtml/htmlstringtokenizer.h -include/libgtkhtml-3.0/gtkhtml/htmlstyle.h -include/libgtkhtml-3.0/gtkhtml/htmltable.h -include/libgtkhtml-3.0/gtkhtml/htmltablecell.h -include/libgtkhtml-3.0/gtkhtml/htmltablepriv.h -include/libgtkhtml-3.0/gtkhtml/htmltext.h -include/libgtkhtml-3.0/gtkhtml/htmltextarea.h -include/libgtkhtml-3.0/gtkhtml/htmltextinput.h -include/libgtkhtml-3.0/gtkhtml/htmltextslave.h -include/libgtkhtml-3.0/gtkhtml/htmltokenizer.h -include/libgtkhtml-3.0/gtkhtml/htmltype.h -include/libgtkhtml-3.0/gtkhtml/htmltypes.h -include/libgtkhtml-3.0/gtkhtml/htmlundo-action.h -include/libgtkhtml-3.0/gtkhtml/htmlundo.h -lib/gtkhtml/libgnome-gtkhtml-editor-3.0.so -lib/libgtkhtml-3.0.a -lib/libgtkhtml-3.0.so -lib/libgtkhtml-3.0.so.4 -libdata/bonobo/servers/GNOME_GtkHTML_Editor.server -libdata/pkgconfig/libgtkhtml-3.0.pc -share/gnome/gtkhtml-3.0/Editor.idl -share/gnome/gtkhtml-3.0/GNOME_GtkHTML_Editor-emacs.xml -share/gnome/gtkhtml-3.0/GNOME_GtkHTML_Editor.xml -share/gnome/gtkhtml-3.0/gtkhtml-editor-properties.glade -share/gnome/gtkhtml-3.0/icons/16_copy.png -share/gnome/gtkhtml-3.0/icons/16_cut.png -share/gnome/gtkhtml-3.0/icons/16_paste.png -share/gnome/gtkhtml-3.0/icons/24_copy.png -share/gnome/gtkhtml-3.0/icons/24_cut.png -share/gnome/gtkhtml-3.0/icons/24_paste.png -share/gnome/gtkhtml-3.0/icons/bulb.png -share/gnome/gtkhtml-3.0/icons/empty_image.png -share/gnome/gtkhtml-3.0/icons/flowers.png -share/gnome/gtkhtml-3.0/icons/font-tt-16.png -share/gnome/gtkhtml-3.0/icons/font-tt-24.png -share/gnome/gtkhtml-3.0/icons/html-viewer.png -share/gnome/gtkhtml-3.0/icons/info_bulb.png -share/gnome/gtkhtml-3.0/icons/insert-image-16.png -share/gnome/gtkhtml-3.0/icons/insert-image-24.png -share/gnome/gtkhtml-3.0/icons/insert-link-16.png -share/gnome/gtkhtml-3.0/icons/insert-link-24.png -share/gnome/gtkhtml-3.0/icons/insert-object-16.png -share/gnome/gtkhtml-3.0/icons/insert-object-24.png -share/gnome/gtkhtml-3.0/icons/insert-rule-16.png -share/gnome/gtkhtml-3.0/icons/insert-rule-24.png -share/gnome/gtkhtml-3.0/icons/insert-table-16.png -share/gnome/gtkhtml-3.0/icons/insert-table-24.png -share/gnome/gtkhtml-3.0/icons/paper.png -share/gnome/gtkhtml-3.0/icons/properties-16.png -share/gnome/gtkhtml-3.0/icons/rect.png -share/gnome/gtkhtml-3.0/icons/redo-16.png -share/gnome/gtkhtml-3.0/icons/redo-24.png -share/gnome/gtkhtml-3.0/icons/rule-blue-center.png -share/gnome/gtkhtml-3.0/icons/rule-blue-left.png -share/gnome/gtkhtml-3.0/icons/rule-blue-right.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-center.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-left.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-right.png -share/gnome/gtkhtml-3.0/icons/search-16.png -share/gnome/gtkhtml-3.0/icons/search-24.png -share/gnome/gtkhtml-3.0/icons/search-and-replace-16.png -share/gnome/gtkhtml-3.0/icons/search-and-replace-24.png -share/gnome/gtkhtml-3.0/icons/smiley-1.png -share/gnome/gtkhtml-3.0/icons/smiley-10.png -share/gnome/gtkhtml-3.0/icons/smiley-11.png -share/gnome/gtkhtml-3.0/icons/smiley-2.png -share/gnome/gtkhtml-3.0/icons/smiley-3.png -share/gnome/gtkhtml-3.0/icons/smiley-4.png -share/gnome/gtkhtml-3.0/icons/smiley-5.png -share/gnome/gtkhtml-3.0/icons/smiley-6.png -share/gnome/gtkhtml-3.0/icons/smiley-8.png -share/gnome/gtkhtml-3.0/icons/smiley-9.png -share/gnome/gtkhtml-3.0/icons/texture.png -share/gnome/gtkhtml-3.0/icons/transparent.png -share/gnome/gtkhtml-3.0/icons/undo-16.png -share/gnome/gtkhtml-3.0/icons/undo-24.png -share/gnome/gtkhtml-3.0/keybindingsrc.emacs -share/locale/am/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ar/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/az/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/be/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ca/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/cs/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/da/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/de/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/el/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/es/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/et/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/eu/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/fi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/fr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/gl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/he/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/hi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/hu/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/it/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ja/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ko/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/lt/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/lv/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ms/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/nl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/nn/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/no/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pt/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pt_BR/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ru/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sk/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sr@Latn/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sv/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/tr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/uk/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/vi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/zh_CN/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/zh_TW/LC_MESSAGES/gtkhtml-3.0.mo -@dirrm share/gnome/gtkhtml-3.0/icons -@dirrm share/gnome/gtkhtml-3.0 +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-compat.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-keybinding.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-private.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmldebug.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmlfontstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlanchor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlbutton.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcheckbox.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclue.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluealigned.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueflow.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueh.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluev.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolorset.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcursor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmldrawqueue.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlembedded.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-clueflowstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cursor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cut-and-paste.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-fontstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-images.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-movement.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-rule.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-selection-updater.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-table.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-tablecell.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-text.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-print.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-save.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-search.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlentity.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenumutils.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlfontmanager.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlform.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframe.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframeset.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlgdkpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlhidden.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmliframe.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimage.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimageinput.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlinterval.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmllist.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmap.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmarshal.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlobject.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlplainpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlprinter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlradio.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlreplace.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlrule.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsearch.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselect.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselection.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsettings.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlshape.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstack.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstringtokenizer.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltable.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablecell.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablepriv.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltext.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextarea.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextinput.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextslave.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltype.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo-action.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h +lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so +lib/libgtkhtml-%%VERSION%%.a +lib/libgtkhtml-%%VERSION%%.so +lib/libgtkhtml-%%VERSION%%.so.11 +libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server +libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc +share/gnome/gtkhtml-%%VERSION%%/Editor.idl +share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml +share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml +share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade +share/gnome/gtkhtml-%%VERSION%%/icons/16_copy.png +share/gnome/gtkhtml-%%VERSION%%/icons/16_cut.png +share/gnome/gtkhtml-%%VERSION%%/icons/16_paste.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_copy.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_cut.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_paste.png +share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png +share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png +share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png +share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png +share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png +share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/paper.png +share/gnome/gtkhtml-%%VERSION%%/icons/properties-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/rect.png +share/gnome/gtkhtml-%%VERSION%%/icons/redo-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/redo-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-5.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-6.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-8.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-9.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-column-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-row-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-table-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/texture.png +share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png +share/gnome/gtkhtml-%%VERSION%%/icons/undo-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/undo-24.png +share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs +share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ga/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/gl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/gu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/no/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +@dirrm share/gnome/gtkhtml-%%VERSION%%/icons +@dirrm share/gnome/gtkhtml-%%VERSION%% @dirrm lib/gtkhtml -@dirrm include/libgtkhtml-3.0/gtkhtml -@dirrm include/libgtkhtml-3.0 +@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml +@dirrm include/libgtkhtml-%%VERSION%% diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 915051e023f3..b9afe8083bf4 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -6,26 +6,27 @@ # PORTNAME= gtkhtml3 -PORTVERSION= 3.0.10 -PORTREVISION= 1 +PORTVERSION= 3.2.3 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.2 DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.0.0:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gal2 gail +USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + LDFLAGS="-L${LOCALBASE}/lib" + +PLIST_SUB= VERSION="3.1" .include <bsd.port.mk> diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo index 045fb89e752c..d9435284ee39 100644 --- a/www/gtkhtml38/distinfo +++ b/www/gtkhtml38/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtkhtml-3.0.10.tar.bz2) = b05b8551f7803f32ecfcf505a6310f3f -SIZE (gnome2/gtkhtml-3.0.10.tar.bz2) = 1074973 +MD5 (gnome2/gtkhtml-3.2.3.tar.bz2) = fe7aa0259a4cd7c99280c076711f8f80 +SIZE (gnome2/gtkhtml-3.2.3.tar.bz2) = 1304520 diff --git a/www/gtkhtml38/files/patch-ltmain.sh b/www/gtkhtml38/files/patch-ltmain.sh deleted file mode 100644 index 1c2fba5d533f..000000000000 --- a/www/gtkhtml38/files/patch-ltmain.sh +++ /dev/null @@ -1,42 +0,0 @@ ---- ltmain.sh.orig Fri Sep 13 15:38:11 2002 -+++ ltmain.sh Fri Oct 11 01:44:24 2002 -@@ -1073,8 +1073,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2502,6 +2510,9 @@ - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4286,10 +4297,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c index 1747affa3007..902c39e8ecb1 100644 --- a/www/gtkhtml38/files/patch-src_gtkhtml.c +++ b/www/gtkhtml38/files/patch-src_gtkhtml.c @@ -1,11 +1,11 @@ ---- src/gtkhtml.c.orig Wed Apr 16 01:52:24 2003 -+++ src/gtkhtml.c Wed Apr 16 01:52:35 2003 -@@ -2677,7 +2677,7 @@ +--- src/gtkhtml.c.orig Mon Aug 2 11:21:24 2004 ++++ src/gtkhtml.c Tue Aug 3 15:19:41 2004 +@@ -2955,7 +2955,7 @@ add_bindings (klass); gtk_html_accessibility_init (); -- gtk_rc_parse (PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs"); -+ gtk_rc_parse (PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs"); +- gtk_rc_parse (PREFIX "/share/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs"); ++ gtk_rc_parse (PREFIX "/share/gnome/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs"); html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs"); read_key_theme (html_class); gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme", diff --git a/www/gtkhtml38/pkg-descr b/www/gtkhtml38/pkg-descr index 618f9c253d3b..38451dc0178d 100644 --- a/www/gtkhtml38/pkg-descr +++ b/www/gtkhtml38/pkg-descr @@ -1,5 +1,3 @@ -This is GtkHTML, a lightweight HTML rendering/printing/editing engine. -It was originally based on KHTMLW, but is now being developed -independently. +GtkHTML is a lightweight HTML rendering, printing, and editing engine. WWW: http://www.ximian.com/ diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist index 573bde598d33..a6ecb1a29789 100644 --- a/www/gtkhtml38/pkg-plist +++ b/www/gtkhtml38/pkg-plist @@ -1,194 +1,213 @@ -include/libgtkhtml-3.0/gtkhtml/gtkhtml-compat.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-embedded.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-enums.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-keybinding.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-private.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-properties.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-search.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-stream.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-types.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml.h -include/libgtkhtml-3.0/gtkhtml/gtkhtmldebug.h -include/libgtkhtml-3.0/gtkhtml/gtkhtmlfontstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlanchor.h -include/libgtkhtml-3.0/gtkhtml/htmlbutton.h -include/libgtkhtml-3.0/gtkhtml/htmlcheckbox.h -include/libgtkhtml-3.0/gtkhtml/htmlclue.h -include/libgtkhtml-3.0/gtkhtml/htmlcluealigned.h -include/libgtkhtml-3.0/gtkhtml/htmlclueflow.h -include/libgtkhtml-3.0/gtkhtml/htmlclueh.h -include/libgtkhtml-3.0/gtkhtml/htmlcluev.h -include/libgtkhtml-3.0/gtkhtml/htmlcolor.h -include/libgtkhtml-3.0/gtkhtml/htmlcolorset.h -include/libgtkhtml-3.0/gtkhtml/htmlcursor.h -include/libgtkhtml-3.0/gtkhtml/htmldrawqueue.h -include/libgtkhtml-3.0/gtkhtml/htmlembedded.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-clueflowstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cursor.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cut-and-paste.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-fontstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-images.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-movement.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-rule.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-selection-updater.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-table.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-tablecell.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-text.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-print.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-save.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-search.h -include/libgtkhtml-3.0/gtkhtml/htmlengine.h -include/libgtkhtml-3.0/gtkhtml/htmlentity.h -include/libgtkhtml-3.0/gtkhtml/htmlenums.h -include/libgtkhtml-3.0/gtkhtml/htmlenumutils.h -include/libgtkhtml-3.0/gtkhtml/htmlfontmanager.h -include/libgtkhtml-3.0/gtkhtml/htmlform.h -include/libgtkhtml-3.0/gtkhtml/htmlframe.h -include/libgtkhtml-3.0/gtkhtml/htmlframeset.h -include/libgtkhtml-3.0/gtkhtml/htmlgdkpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlhidden.h -include/libgtkhtml-3.0/gtkhtml/htmliframe.h -include/libgtkhtml-3.0/gtkhtml/htmlimage.h -include/libgtkhtml-3.0/gtkhtml/htmlimageinput.h -include/libgtkhtml-3.0/gtkhtml/htmlinterval.h -include/libgtkhtml-3.0/gtkhtml/htmllinktext.h -include/libgtkhtml-3.0/gtkhtml/htmllist.h -include/libgtkhtml-3.0/gtkhtml/htmlmap.h -include/libgtkhtml-3.0/gtkhtml/htmlmarshal.h -include/libgtkhtml-3.0/gtkhtml/htmlobject.h -include/libgtkhtml-3.0/gtkhtml/htmlpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlplainpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlprinter.h -include/libgtkhtml-3.0/gtkhtml/htmlradio.h -include/libgtkhtml-3.0/gtkhtml/htmlreplace.h -include/libgtkhtml-3.0/gtkhtml/htmlrule.h -include/libgtkhtml-3.0/gtkhtml/htmlsearch.h -include/libgtkhtml-3.0/gtkhtml/htmlselect.h -include/libgtkhtml-3.0/gtkhtml/htmlselection.h -include/libgtkhtml-3.0/gtkhtml/htmlsettings.h -include/libgtkhtml-3.0/gtkhtml/htmlshape.h -include/libgtkhtml-3.0/gtkhtml/htmlstack.h -include/libgtkhtml-3.0/gtkhtml/htmlstringtokenizer.h -include/libgtkhtml-3.0/gtkhtml/htmlstyle.h -include/libgtkhtml-3.0/gtkhtml/htmltable.h -include/libgtkhtml-3.0/gtkhtml/htmltablecell.h -include/libgtkhtml-3.0/gtkhtml/htmltablepriv.h -include/libgtkhtml-3.0/gtkhtml/htmltext.h -include/libgtkhtml-3.0/gtkhtml/htmltextarea.h -include/libgtkhtml-3.0/gtkhtml/htmltextinput.h -include/libgtkhtml-3.0/gtkhtml/htmltextslave.h -include/libgtkhtml-3.0/gtkhtml/htmltokenizer.h -include/libgtkhtml-3.0/gtkhtml/htmltype.h -include/libgtkhtml-3.0/gtkhtml/htmltypes.h -include/libgtkhtml-3.0/gtkhtml/htmlundo-action.h -include/libgtkhtml-3.0/gtkhtml/htmlundo.h -lib/gtkhtml/libgnome-gtkhtml-editor-3.0.so -lib/libgtkhtml-3.0.a -lib/libgtkhtml-3.0.so -lib/libgtkhtml-3.0.so.4 -libdata/bonobo/servers/GNOME_GtkHTML_Editor.server -libdata/pkgconfig/libgtkhtml-3.0.pc -share/gnome/gtkhtml-3.0/Editor.idl -share/gnome/gtkhtml-3.0/GNOME_GtkHTML_Editor-emacs.xml -share/gnome/gtkhtml-3.0/GNOME_GtkHTML_Editor.xml -share/gnome/gtkhtml-3.0/gtkhtml-editor-properties.glade -share/gnome/gtkhtml-3.0/icons/16_copy.png -share/gnome/gtkhtml-3.0/icons/16_cut.png -share/gnome/gtkhtml-3.0/icons/16_paste.png -share/gnome/gtkhtml-3.0/icons/24_copy.png -share/gnome/gtkhtml-3.0/icons/24_cut.png -share/gnome/gtkhtml-3.0/icons/24_paste.png -share/gnome/gtkhtml-3.0/icons/bulb.png -share/gnome/gtkhtml-3.0/icons/empty_image.png -share/gnome/gtkhtml-3.0/icons/flowers.png -share/gnome/gtkhtml-3.0/icons/font-tt-16.png -share/gnome/gtkhtml-3.0/icons/font-tt-24.png -share/gnome/gtkhtml-3.0/icons/html-viewer.png -share/gnome/gtkhtml-3.0/icons/info_bulb.png -share/gnome/gtkhtml-3.0/icons/insert-image-16.png -share/gnome/gtkhtml-3.0/icons/insert-image-24.png -share/gnome/gtkhtml-3.0/icons/insert-link-16.png -share/gnome/gtkhtml-3.0/icons/insert-link-24.png -share/gnome/gtkhtml-3.0/icons/insert-object-16.png -share/gnome/gtkhtml-3.0/icons/insert-object-24.png -share/gnome/gtkhtml-3.0/icons/insert-rule-16.png -share/gnome/gtkhtml-3.0/icons/insert-rule-24.png -share/gnome/gtkhtml-3.0/icons/insert-table-16.png -share/gnome/gtkhtml-3.0/icons/insert-table-24.png -share/gnome/gtkhtml-3.0/icons/paper.png -share/gnome/gtkhtml-3.0/icons/properties-16.png -share/gnome/gtkhtml-3.0/icons/rect.png -share/gnome/gtkhtml-3.0/icons/redo-16.png -share/gnome/gtkhtml-3.0/icons/redo-24.png -share/gnome/gtkhtml-3.0/icons/rule-blue-center.png -share/gnome/gtkhtml-3.0/icons/rule-blue-left.png -share/gnome/gtkhtml-3.0/icons/rule-blue-right.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-center.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-left.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-right.png -share/gnome/gtkhtml-3.0/icons/search-16.png -share/gnome/gtkhtml-3.0/icons/search-24.png -share/gnome/gtkhtml-3.0/icons/search-and-replace-16.png -share/gnome/gtkhtml-3.0/icons/search-and-replace-24.png -share/gnome/gtkhtml-3.0/icons/smiley-1.png -share/gnome/gtkhtml-3.0/icons/smiley-10.png -share/gnome/gtkhtml-3.0/icons/smiley-11.png -share/gnome/gtkhtml-3.0/icons/smiley-2.png -share/gnome/gtkhtml-3.0/icons/smiley-3.png -share/gnome/gtkhtml-3.0/icons/smiley-4.png -share/gnome/gtkhtml-3.0/icons/smiley-5.png -share/gnome/gtkhtml-3.0/icons/smiley-6.png -share/gnome/gtkhtml-3.0/icons/smiley-8.png -share/gnome/gtkhtml-3.0/icons/smiley-9.png -share/gnome/gtkhtml-3.0/icons/texture.png -share/gnome/gtkhtml-3.0/icons/transparent.png -share/gnome/gtkhtml-3.0/icons/undo-16.png -share/gnome/gtkhtml-3.0/icons/undo-24.png -share/gnome/gtkhtml-3.0/keybindingsrc.emacs -share/locale/am/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ar/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/az/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/be/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ca/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/cs/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/da/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/de/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/el/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/es/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/et/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/eu/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/fi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/fr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/gl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/he/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/hi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/hu/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/it/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ja/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ko/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/lt/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/lv/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ms/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/nl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/nn/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/no/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pt/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pt_BR/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ru/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sk/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sr@Latn/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sv/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/tr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/uk/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/vi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/zh_CN/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/zh_TW/LC_MESSAGES/gtkhtml-3.0.mo -@dirrm share/gnome/gtkhtml-3.0/icons -@dirrm share/gnome/gtkhtml-3.0 +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-compat.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-keybinding.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-private.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmldebug.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmlfontstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlanchor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlbutton.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcheckbox.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclue.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluealigned.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueflow.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueh.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluev.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolorset.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcursor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmldrawqueue.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlembedded.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-clueflowstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cursor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cut-and-paste.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-fontstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-images.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-movement.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-rule.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-selection-updater.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-table.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-tablecell.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-text.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-print.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-save.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-search.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlentity.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenumutils.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlfontmanager.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlform.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframe.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframeset.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlgdkpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlhidden.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmliframe.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimage.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimageinput.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlinterval.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmllist.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmap.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmarshal.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlobject.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlplainpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlprinter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlradio.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlreplace.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlrule.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsearch.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselect.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselection.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsettings.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlshape.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstack.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstringtokenizer.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltable.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablecell.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablepriv.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltext.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextarea.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextinput.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextslave.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltype.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo-action.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h +lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so +lib/libgtkhtml-%%VERSION%%.a +lib/libgtkhtml-%%VERSION%%.so +lib/libgtkhtml-%%VERSION%%.so.11 +libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server +libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc +share/gnome/gtkhtml-%%VERSION%%/Editor.idl +share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml +share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml +share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade +share/gnome/gtkhtml-%%VERSION%%/icons/16_copy.png +share/gnome/gtkhtml-%%VERSION%%/icons/16_cut.png +share/gnome/gtkhtml-%%VERSION%%/icons/16_paste.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_copy.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_cut.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_paste.png +share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png +share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png +share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png +share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png +share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png +share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/paper.png +share/gnome/gtkhtml-%%VERSION%%/icons/properties-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/rect.png +share/gnome/gtkhtml-%%VERSION%%/icons/redo-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/redo-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-5.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-6.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-8.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-9.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-column-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-row-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-table-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/texture.png +share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png +share/gnome/gtkhtml-%%VERSION%%/icons/undo-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/undo-24.png +share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs +share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ga/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/gl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/gu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/no/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +@dirrm share/gnome/gtkhtml-%%VERSION%%/icons +@dirrm share/gnome/gtkhtml-%%VERSION%% @dirrm lib/gtkhtml -@dirrm include/libgtkhtml-3.0/gtkhtml -@dirrm include/libgtkhtml-3.0 +@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml +@dirrm include/libgtkhtml-%%VERSION%% diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index b1cbccda3b57..1e9585a83744 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -6,15 +6,16 @@ # PORTNAME?= mozilla -PORTVERSION= 1.7.2 -PORTREVISION?= 5 +PORTVERSION= 1.7.3 +PORTREVISION?= 2 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION}/src \ - marcus/:local -DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} + adamw/:local +DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \ + libart_lgpl${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org COMMENT= The open source, standards compliant web browser @@ -250,8 +251,8 @@ post-patch: @${REINPLACE_CMD} -E -e 's|libfreetype\.so\.[0-9]+|${FREETYPE_LIB}|g' \ ${WRKSRC}/modules/libpref/src/init/all.js @for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}|g ; \ - s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}|g' \ + ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \ + s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \ ${WRKSRC}/build/unix/$${pcfile}.pc.in; \ done @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \ @@ -270,7 +271,7 @@ post-build: ${FILESDIR}/mozilla.sh >${WRKSRC}/${MOZILLA} pre-install: - ${RM} -rf ${PLIST} ${FAKEDIR} + ${RM} -rf ${FAKEDIR} ${PLIST} ${TOUCH} -f ${PLIST} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install @@ -300,9 +301,9 @@ pre-install: ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc >> ${PLIST} ; \ + ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ done - cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ + cd ${FAKEDIR}/include/mozilla && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} @@ -335,12 +336,12 @@ do-install: ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ ${WRKSRC}/build/unix/$${pcfile}.pc; \ ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc ; \ + ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ done -${RM} -fr ${PREFIX}/include/${MOZILLA} ${MKDIR} ${PREFIX}/include/${MOZILLA} ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} - cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} . | \ + cd ${FAKEDIR}/include/mozilla && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} post-install: diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index cb0a4d9cefdd..090bcb860698 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,2 +1,4 @@ -MD5 (mozilla-source-1.7.2.tar.bz2) = 262987cfcb793bab9fb1aebb21c527ce -SIZE (mozilla-source-1.7.2.tar.bz2) = 34438800 +MD5 (mozilla-source-1.7.3.tar.bz2) = 15cb68da1d58f055f871b77ff655df77 +SIZE (mozilla-source-1.7.3.tar.bz2) = 29716200 +MD5 (libart_lgpl.tar.bz2) = d681e7528aa30b6c615e571a54db2242 +SIZE (libart_lgpl.tar.bz2) = 103000 diff --git a/www/mozilla/files/patch-245066,226669 b/www/mozilla/files/patch-245066,226669 deleted file mode 100644 index 00254916f224..000000000000 --- a/www/mozilla/files/patch-245066,226669 +++ /dev/null @@ -1,228 +0,0 @@ -Index: mozilla/mailnews/local/src/nsPop3Protocol.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/local/src/nsPop3Protocol.cpp,v -retrieving revision 1.214.2.1 -retrieving revision 1.214.2.1.2.1 -diff -u -r1.214.2.1 -r1.214.2.1.2.1 ---- mailnews/local/src/nsPop3Protocol.cpp 27 May 2004 14:54:03 -0000 1.214.2.1 -+++ mailnews/local/src/nsPop3Protocol.cpp 27 Aug 2004 13:15:42 -0000 1.214.2.1.2.1 -@@ -61,7 +61,6 @@ - #include "nsISignatureVerifier.h" - - #define EXTRA_SAFETY_SPACE 3096 --#define kLargeNumberOfMessages 50000 - - static PRLogModuleInfo *POP3LOGMODULE = nsnull; - -@@ -1791,11 +1790,11 @@ - - - m_pop3ConData->msg_info = (Pop3MsgInfo *) -- PR_CALLOC(sizeof(Pop3MsgInfo) * -- (m_pop3ConData->number_of_messages < kLargeNumberOfMessages ? m_pop3ConData->number_of_messages : kLargeNumberOfMessages)); -+ PR_CALLOC(sizeof(Pop3MsgInfo) * m_pop3ConData->number_of_messages); - if (!m_pop3ConData->msg_info) - return(MK_OUT_OF_MEMORY); - m_pop3ConData->next_state_after_response = POP3_GET_LIST; -+ m_listpos = 0; - return SendData(m_url, "LIST"CRLF); - } - -@@ -1837,6 +1836,9 @@ - */ - if(!PL_strcmp(line, ".")) - { -+ // limit the list if fewer entries than given in STAT response -+ if(m_listpos < m_pop3ConData->number_of_messages) -+ m_pop3ConData->number_of_messages = m_listpos; - m_pop3ConData->next_state = POP3_SEND_UIDL_LIST; - m_pop3ConData->pause_for_read = PR_FALSE; - PR_Free(line); -@@ -1848,24 +1850,15 @@ - if (token) - { - msg_num = atol(token); -+ m_listpos++; - -- if(msg_num <= m_pop3ConData->number_of_messages && msg_num > 0) -+ if(m_listpos <= m_pop3ConData->number_of_messages && m_listpos > 0) - { - token = nsCRT::strtok(newStr, " ", &newStr); - if (token) -- m_pop3ConData->msg_info[msg_num-1].size = atol(token); -- -- if (msg_num >= kLargeNumberOfMessages && msg_num < m_pop3ConData->number_of_messages) - { -- m_pop3ConData->msg_info = (Pop3MsgInfo *) //allocate space for next entry -- PR_REALLOC(m_pop3ConData->msg_info, sizeof(Pop3MsgInfo) * (msg_num + 1)); -- if (!m_pop3ConData->msg_info) -- { -- m_pop3ConData->number_of_messages = msg_num; //so that we don't try to free not allocated entries! -- return(MK_OUT_OF_MEMORY); -- } -- m_pop3ConData->msg_info[msg_num].size = 0; //initialize -- m_pop3ConData->msg_info[msg_num].uidl = nsnull; -+ m_pop3ConData->msg_info[m_listpos-1].size = atol(token); -+ m_pop3ConData->msg_info[m_listpos-1].msgnum = msg_num; - } - } - } -@@ -2101,6 +2094,7 @@ - { - m_pop3ConData->next_state_after_response = POP3_GET_XTND_XLST_MSGID; - m_pop3ConData->pause_for_read = PR_TRUE; -+ m_listpos = 0; - return SendData(m_url, "XTND XLST Message-Id" CRLF); - } - else -@@ -2166,6 +2160,9 @@ - */ - if(!PL_strcmp(line, ".")) - { -+ // limit the list if fewer entries than given in STAT response -+ if(m_listpos < m_pop3ConData->number_of_messages) -+ m_pop3ConData->number_of_messages = m_listpos; - m_pop3ConData->next_state = POP3_GET_MSG; - m_pop3ConData->pause_for_read = PR_FALSE; - PR_Free(line); -@@ -2177,7 +2174,9 @@ - if (token) - { - msg_num = atol(token); -- if(msg_num <= m_pop3ConData->number_of_messages && msg_num > 0) -+ m_listpos++; -+ -+ if(m_listpos <= m_pop3ConData->number_of_messages && m_listpos > 0) - { - /* char *eatMessageIdToken = nsCRT::strtok(newStr, " ", &newStr); */ - char *uidl = nsCRT::strtok(newStr, " ", &newStr);/* not really a uidl but a unique token -km */ -@@ -2189,8 +2188,17 @@ - there, I have no idea; must be a server bug. Or something. */ - uidl = ""; - -- m_pop3ConData->msg_info[msg_num-1].uidl = PL_strdup(uidl); -- if (!m_pop3ConData->msg_info[msg_num-1].uidl) -+ // seeking right entry, but try the one that should it be first -+ PRInt32 i; -+ if(m_pop3ConData->msg_info[m_listpos - 1].msgnum == msg_num) -+ i = m_listpos - 1; -+ else -+ for(i = 0; m_pop3ConData->msg_info[i].msgnum != msg_num && -+ i <= m_pop3ConData->number_of_messages; i++) -+ ; -+ -+ m_pop3ConData->msg_info[i].uidl = PL_strdup(uidl); -+ if (!m_pop3ConData->msg_info[i].uidl) - { - PR_Free(line); - return MK_OUT_OF_MEMORY; -@@ -2209,6 +2217,7 @@ - { - m_pop3ConData->next_state_after_response = POP3_GET_UIDL_LIST; - m_pop3ConData->pause_for_read = PR_TRUE; -+ m_listpos = 0; - return SendData(m_url,"UIDL" CRLF); - } - else -@@ -2264,6 +2273,9 @@ - */ - if(!PL_strcmp(line, ".")) - { -+ // limit the list if fewer entries than given in STAT response -+ if(m_listpos < m_pop3ConData->number_of_messages) -+ m_pop3ConData->number_of_messages = m_listpos; - m_pop3ConData->next_state = POP3_GET_MSG; - m_pop3ConData->pause_for_read = PR_FALSE; - PR_Free(line); -@@ -2275,7 +2287,9 @@ - if (token) - { - msg_num = atol(token); -- if(msg_num <= m_pop3ConData->number_of_messages && msg_num > 0) -+ m_listpos++; -+ -+ if(m_listpos <= m_pop3ConData->number_of_messages && m_listpos > 0) - { - char *uidl = nsCRT::strtok(newStr, " ", &newStr); - -@@ -2286,8 +2300,17 @@ - there, I have no idea; must be a server bug. Or something. */ - uidl = ""; - -- m_pop3ConData->msg_info[msg_num-1].uidl = PL_strdup(uidl); -- if (!m_pop3ConData->msg_info[msg_num-1].uidl) -+ // seeking right entry, but try the one that should it be first -+ PRInt32 i; -+ if(m_pop3ConData->msg_info[m_listpos - 1].msgnum == msg_num) -+ i = m_listpos - 1; -+ else -+ for(i = 0; m_pop3ConData->msg_info[i].msgnum != msg_num && -+ i <= m_pop3ConData->number_of_messages; i++) -+ ; -+ -+ m_pop3ConData->msg_info[i].uidl = PL_strdup(uidl); -+ if (!m_pop3ConData->msg_info[i].uidl) - { - PR_Free(line); - return MK_OUT_OF_MEMORY; -@@ -2603,7 +2626,7 @@ - PRInt32 nsPop3Protocol::SendTop() - { - char * cmd = PR_smprintf( "TOP %ld 20" CRLF, -- m_pop3ConData->last_accessed_msg+1); -+ m_pop3ConData->msg_info[m_pop3ConData->last_accessed_msg].msgnum); - PRInt32 status = -1; - if (cmd) - { -@@ -2624,7 +2647,7 @@ - */ - PRInt32 nsPop3Protocol::SendXsender() - { -- char * cmd = PR_smprintf("XSENDER %ld" CRLF, m_pop3ConData->last_accessed_msg+1); -+ char * cmd = PR_smprintf("XSENDER %ld" CRLF, m_pop3ConData->msg_info[m_pop3ConData->last_accessed_msg].msgnum); - PRInt32 status = -1; - if (cmd) - { -@@ -2662,7 +2685,7 @@ - nsPop3Protocol::SendRetr() - { - -- char * cmd = PR_smprintf("RETR %ld" CRLF, m_pop3ConData->last_accessed_msg+1); -+ char * cmd = PR_smprintf("RETR %ld" CRLF, m_pop3ConData->msg_info[m_pop3ConData->last_accessed_msg].msgnum); - PRInt32 status = -1; - if (cmd) - { -@@ -3071,8 +3094,8 @@ - { - /* increment the last accessed message since we have now read it - */ -+ char * cmd = PR_smprintf("DELE %ld" CRLF, m_pop3ConData->msg_info[m_pop3ConData->last_accessed_msg].msgnum); - m_pop3ConData->last_accessed_msg++; -- char * cmd = PR_smprintf("DELE %ld" CRLF, m_pop3ConData->last_accessed_msg); - PRInt32 status = -1; - if (cmd) - { -Index: mozilla/mailnews/local/src/nsPop3Protocol.h -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/local/src/nsPop3Protocol.h,v -retrieving revision 1.63 -retrieving revision 1.63.10.1 -diff -u -r1.63 -r1.63.10.1 ---- mailnews/local/src/nsPop3Protocol.h 8 Mar 2004 19:50:30 -0000 1.63 -+++ mailnews/local/src/nsPop3Protocol.h 27 Aug 2004 13:15:42 -0000 1.63.10.1 -@@ -191,6 +191,7 @@ - } Pop3UidlHost; - - typedef struct Pop3MsgInfo { -+ PRInt32 msgnum; - PRInt32 size; - char* uidl; - } Pop3MsgInfo; -@@ -350,6 +351,7 @@ - void BackupAuthFlags(); - void RestoreAuthFlags(); - PRInt32 m_origAuthFlags; -+ PRInt32 m_listpos; - - ////////////////////////////////////////////////////////////////////////////////////////// - // Begin Pop3 protocol state handlers diff --git a/www/mozilla/files/patch-250862 b/www/mozilla/files/patch-250862 deleted file mode 100644 index 05423dc84195..000000000000 --- a/www/mozilla/files/patch-250862 +++ /dev/null @@ -1,22 +0,0 @@ -Index: mozilla/xpfe/communicator/resources/content/contentAreaDD.js -=================================================================== -RCS file: /cvsroot/mozilla/xpfe/communicator/resources/content/contentAreaDD.js,v -retrieving revision 1.32 -retrieving revision 1.32.88.1 -diff -u -r1.32 -r1.32.88.1 ---- xpfe/communicator/resources/content/contentAreaDD.js 10 Jul 2002 01:23:50 -0000 1.32 -+++ xpfe/communicator/resources/content/contentAreaDD.js 27 Aug 2004 01:13:39 -0000 1.32.88.1 -@@ -53,8 +53,11 @@ - { - var url = transferUtils.retrieveURLFromData(aXferData.data, aXferData.flavour.contentType); - -- // valid urls don't contain spaces ' '; if we have a space it isn't a valid url so bail out -- if (!url || !url.length || url.indexOf(" ", 0) != -1) -+ // valid urls don't contain spaces ' '; if we have a space it -+ // isn't a valid url, or if it's a javascript: or data: url, -+ // bail out -+ if (!url || !url.length || url.indexOf(" ", 0) != -1 || -+ /^\s*(javascript|data):/.test(url)) - return; - - switch (document.firstChild.getAttribute('windowtype')) { diff --git a/www/mozilla/files/patch-255067 b/www/mozilla/files/patch-255067 deleted file mode 100644 index cddf17ca8328..000000000000 --- a/www/mozilla/files/patch-255067 +++ /dev/null @@ -1,60 +0,0 @@ -Index: mozilla/gfx/src/shared/gfxImageFrame.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/shared/gfxImageFrame.cpp,v -retrieving revision 1.26 -retrieving revision 1.26.12.1 -diff -u -r1.26 -r1.26.12.1 ---- gfx/src/shared/gfxImageFrame.cpp 16 Jan 2004 23:28:48 -0000 1.26 -+++ gfx/src/shared/gfxImageFrame.cpp 27 Aug 2004 11:02:58 -0000 1.26.12.1 -@@ -72,6 +72,13 @@ - return NS_ERROR_FAILURE; - } - -+ /* reject over-wide or over-tall images */ -+ const PRInt32 k64KLimit = 0x0000FFFF; -+ if ( aWidth > k64KLimit || aHeight > k64KLimit ){ -+ NS_ERROR("image too big"); -+ return NS_ERROR_FAILURE; -+ } -+ - nsresult rv; - - mOffset.MoveTo(aX, aY); -Index: mozilla/gfx/src/windows/nsImageWin.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/windows/nsImageWin.cpp,v -retrieving revision 3.130.2.1 -retrieving revision 3.130.2.1.6.1 -diff -u -r3.130.2.1 -r3.130.2.1.6.1 ---- gfx/src/windows/nsImageWin.cpp 11 May 2004 21:53:49 -0000 3.130.2.1 -+++ gfx/src/windows/nsImageWin.cpp 27 Aug 2004 11:02:58 -0000 3.130.2.1.6.1 -@@ -131,6 +131,10 @@ - return NS_ERROR_UNEXPECTED; - } - -+ // limit images to 64k pixels on a side (~55 feet on a 100dpi monitor) -+ const PRInt32 k64KLimit = 0x0000FFFF; -+ if (aWidth > k64KLimit || aHeight > k64KLimit) -+ return NS_ERROR_FAILURE; - - if (mNumPaletteColors >= 0){ - // If we have a palette -Index: mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp,v -retrieving revision 1.24.2.1 -retrieving revision 1.24.2.1.6.1 -diff -u -r1.24.2.1 -r1.24.2.1.6.1 ---- modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp 13 May 2004 22:27:35 -0000 1.24.2.1 -+++ modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp 27 Aug 2004 11:02:58 -0000 1.24.2.1.6.1 -@@ -274,7 +274,9 @@ - CalcBitShift(); - } - // BMPs with negative width are invalid -- if (mBIH.width < 0) -+ // Reject extremely wide images to keep the math sane -+ const PRInt32 k64KWidth = 0x0000FFFF; -+ if (mBIH.width < 0 || mBIH.width > k64KWidth) - return NS_ERROR_FAILURE; - - PRUint32 real_height = (mBIH.height > 0) ? mBIH.height : -mBIH.height; diff --git a/www/mozilla/files/patch-256316 b/www/mozilla/files/patch-256316 deleted file mode 100644 index 147d15e5303d..000000000000 --- a/www/mozilla/files/patch-256316 +++ /dev/null @@ -1,18 +0,0 @@ -Index: mozilla/netwerk/dns/src/nsIDNService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/dns/src/nsIDNService.cpp,v -retrieving revision 1.18 -retrieving revision 1.18.10.1 -diff -u -r1.18 -r1.18.10.1 ---- netwerk/dns/src/nsIDNService.cpp 3 Apr 2004 07:32:18 -0000 1.18 -+++ netwerk/dns/src/nsIDNService.cpp 27 Aug 2004 11:23:21 -0000 1.18.10.1 -@@ -242,6 +242,9 @@ - - NS_IMETHODIMP nsIDNService::Normalize(const nsACString & input, nsACString & output) - { -+ // protect against bogus input -+ NS_ENSURE_TRUE(IsUTF8(input), NS_ERROR_UNEXPECTED); -+ - nsAutoString outUTF16; - nsresult rv = stringPrep(NS_ConvertUTF8toUTF16(input), outUTF16); - if (NS_SUCCEEDED(rv)) diff --git a/www/mozilla/files/patch-257314 b/www/mozilla/files/patch-257314 deleted file mode 100644 index 8bcc707b9dd9..000000000000 --- a/www/mozilla/files/patch-257314 +++ /dev/null @@ -1,31 +0,0 @@ -Index: nsVCardObj.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsVCardObj.cpp,v -retrieving revision 1.2 -retrieving revision 1.2.24.1 -diff -u -r1.2 -r1.2.24.1 ---- mailnews/addrbook/src/nsVCardObj.cpp 14 Sep 2003 21:45:58 -0000 1.2 -+++ mailnews/addrbook/src/nsVCardObj.cpp 31 Aug 2004 07:44:25 -0000 1.2.24.1 -@@ -1344,16 +1344,13 @@ - - static void writeGroup(OFile *fp, VObject *o) - { -- char buf1[256]; -- char buf2[256]; -- PL_strcpy(buf1,NAME_OF(o)); -- while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { -- PL_strcpy(buf2,STRINGZ_VALUE_OF(o)); -- PL_strcat(buf2,"."); -- PL_strcat(buf2,buf1); -- PL_strcpy(buf1,buf2); -+ nsCAutoString buf(NAME_OF(o)); -+ -+ while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { -+ buf.Insert(NS_LITERAL_CSTRING("."), 0); -+ buf.Insert(STRINGZ_VALUE_OF(o), 0); - } -- appendsOFile(fp,buf1); -+ appendsOFile(fp, buf.get()); - } - - static int inList(const char **list, const char *s) diff --git a/www/mozilla/files/patch-258005 b/www/mozilla/files/patch-258005 deleted file mode 100644 index fc20d4b596cf..000000000000 --- a/www/mozilla/files/patch-258005 +++ /dev/null @@ -1,278 +0,0 @@ -Index: nsMsgCompUtils.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp,v -retrieving revision 1.161 -retrieving revision 1.161.10.1 -diff -u -r1.161 -r1.161.10.1 ---- mailnews/compose/src/nsMsgCompUtils.cpp 12 Mar 2004 07:23:38 -0000 1.161 -+++ mailnews/compose/src/nsMsgCompUtils.cpp 8 Sep 2004 19:27:53 -0000 1.161.10.1 -@@ -821,16 +821,7 @@ - nsresult rv; - nsCOMPtr<nsIPref> prefs(do_GetService(kPrefCID, &rv)); - -- PRInt32 buffer_size = 2048 + (real_name ? 2*PL_strlen(real_name) : 0) + (base_url ? 2*PL_strlen(base_url) : 0) + -- (type_param ? PL_strlen(type_param) : 0) + (encoding ? PL_strlen(encoding) : 0) + -- (description ? PL_strlen(description) : 0) + (x_mac_type ? PL_strlen(x_mac_type) : 0) + -- (x_mac_creator ? PL_strlen(x_mac_creator) : 0) + (attachmentCharset ? PL_strlen(attachmentCharset) : 0) + -- (bodyCharset ? PL_strlen(bodyCharset) : 0) + (content_id ? PL_strlen(content_id) : 0); -- char *buffer = (char *) PR_Malloc (buffer_size); -- char *buffer_tail = buffer; -- -- if (! buffer) -- return 0; /* NS_ERROR_OUT_OF_MEMORY */ -+ nsCString buf(""); - - NS_ASSERTION (encoding, "null encoding"); - -@@ -874,14 +865,13 @@ - } - } - -- PUSH_STRING ("Content-Type: "); -- PUSH_STRING (type); -- -+ buf.Append("Content-Type: "); -+ buf.Append(type); - if (type_param && *type_param) - { - if (*type_param != ';') -- PUSH_STRING("; "); -- PUSH_STRING(type_param); -+ buf.Append("; "); -+ buf.Append(type_param); - } - - if (mime_type_needs_charset (type)) -@@ -918,8 +908,8 @@ - (PL_strcasecmp(encoding, ENCODING_BASE64) != 0)) && - (*charset_label)) - { -- PUSH_STRING ("; charset="); -- PUSH_STRING (charset_label); -+ buf.Append("; charset="); -+ buf.Append(charset_label); - } - } - -@@ -930,7 +920,7 @@ - if(type && !PL_strcasecmp(type, "text/plain")) - { - if(UseFormatFlowed(bodyCharset)) -- PUSH_STRING ("; format=flowed"); -+ buf.Append("; format=flowed"); - // else - // { - // Don't add a markup. Could use -@@ -942,59 +932,59 @@ - } - - if (x_mac_type && *x_mac_type) { -- PUSH_STRING ("; x-mac-type=\""); -- PUSH_STRING (x_mac_type); -- PUSH_STRING ("\""); -+ buf.Append("; x-mac-type=\""); -+ buf.Append(x_mac_type); -+ buf.Append("\""); - } - - if (x_mac_creator && *x_mac_creator) { -- PUSH_STRING ("; x-mac-creator=\""); -- PUSH_STRING (x_mac_creator); -- PUSH_STRING ("\""); -+ buf.Append("; x-mac-creator=\""); -+ buf.Append(x_mac_creator); -+ buf.Append("\""); - } - - #ifdef EMIT_NAME_IN_CONTENT_TYPE - if (encodedRealName && *encodedRealName) { - if (parmFolding == 0 || parmFolding == 1) { -- PUSH_STRING (";\r\n name=\""); -- PUSH_STRING (encodedRealName); -- PUSH_STRING ("\""); -+ buf.Append(";\r\n name=\""); -+ buf.Append(encodedRealName); -+ buf.Append("\""); - } - else // if (parmFolding == 2) - { - char *rfc2231Parm = RFC2231ParmFolding("name", charset.get(), - nsMsgI18NGetAcceptLanguage(), encodedRealName); - if (rfc2231Parm) { -- PUSH_STRING(";\r\n "); -- PUSH_STRING(rfc2231Parm); -+ buf.Append(";\r\n "); -+ buf.Append(rfc2231Parm); - PR_Free(rfc2231Parm); - } - } - } - #endif /* EMIT_NAME_IN_CONTENT_TYPE */ -+ buf.Append(CRLF); - -- PUSH_NEWLINE (); -+ buf.Append("Content-Transfer-Encoding: "); -+ buf.Append(encoding); - -- PUSH_STRING ("Content-Transfer-Encoding: "); -- PUSH_STRING (encoding); -- PUSH_NEWLINE (); -+ buf.Append(CRLF); - - if (description && *description) { - char *s = mime_fix_header (description); - if (s) { -- PUSH_STRING ("Content-Description: "); -- PUSH_STRING (s); -- PUSH_NEWLINE (); -+ buf.Append("Content-Description: "); -+ buf.Append(s); -+ buf.Append(CRLF); - PR_Free(s); - } - } - - if ( (content_id) && (*content_id) ) - { -- PUSH_STRING ("Content-ID: <"); -- PUSH_STRING (content_id); -- PUSH_STRING (">"); -- PUSH_NEWLINE (); -+ buf.Append("Content-ID: <"); -+ buf.Append(content_id); -+ buf.Append(">"); -+ buf.Append(CRLF); - } - - if (encodedRealName && *encodedRealName) { -@@ -1004,15 +994,15 @@ - rv = prefs->GetIntPref("mail.content_disposition_type", &pref_content_disposition); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get mail.content_disposition_type"); - -- PUSH_STRING ("Content-Disposition: "); -+ buf.Append("Content-Disposition: "); - - if (pref_content_disposition == 1) -- PUSH_STRING ("attachment"); -+ buf.Append("attachment"); - else - if (pref_content_disposition == 2 && - (!PL_strcasecmp(type, TEXT_PLAIN) || - (period && !PL_strcasecmp(period, ".txt")))) -- PUSH_STRING("attachment"); -+ buf.Append("attachment"); - - /* If this document is an anonymous binary file or a vcard, - then always show it as an attachment, never inline. */ -@@ -1020,23 +1010,23 @@ - if (!PL_strcasecmp(type, APPLICATION_OCTET_STREAM) || - !PL_strcasecmp(type, TEXT_VCARD) || - !PL_strcasecmp(type, APPLICATION_DIRECTORY)) /* text/x-vcard synonym */ -- PUSH_STRING ("attachment"); -+ buf.Append("attachment"); - else -- PUSH_STRING ("inline"); -+ buf.Append("inline"); - - if (parmFolding == 0 || parmFolding == 1) { -- PUSH_STRING (";\r\n filename=\""); -- PUSH_STRING (encodedRealName); -- PUSH_STRING ("\"" CRLF); -+ buf.Append(";\r\n filename=\""); -+ buf.Append(encodedRealName); -+ buf.Append("\"" CRLF); - } - else // if (parmFolding == 2) - { - char *rfc2231Parm = RFC2231ParmFolding("filename", charset.get(), - nsMsgI18NGetAcceptLanguage(), encodedRealName); - if (rfc2231Parm) { -- PUSH_STRING(";\r\n "); -- PUSH_STRING(rfc2231Parm); -- PUSH_NEWLINE (); -+ buf.Append(";\r\n "); -+ buf.Append(rfc2231Parm); -+ buf.Append(CRLF); - PR_Free(rfc2231Parm); - } - } -@@ -1045,7 +1035,7 @@ - if (type && - (!PL_strcasecmp (type, MESSAGE_RFC822) || - !PL_strcasecmp (type, MESSAGE_NEWS))) -- PUSH_STRING ("Content-Disposition: inline" CRLF); -+ buf.Append("Content-Disposition: inline" CRLF); - - #ifdef GENERATE_CONTENT_BASE - /* If this is an HTML document, and we know the URL it originally -@@ -1079,9 +1069,9 @@ - prefs->GetBoolPref("mail.use_content_location_on_send", &useContentLocation); - - if (useContentLocation) -- PUSH_STRING ("Content-Location: \""); -+ buf.Append("Content-Location: \""); - else -- PUSH_STRING ("Content-Base: \""); -+ buf.Append("Content-Base: \""); - /* rhp - Pref for Content-Location usage */ - - /* rhp: this is to work with the Content-Location stuff */ -@@ -1089,34 +1079,34 @@ - - while (*s != 0 && *s != '#') - { -- const char *ot = buffer_tail; -- -+ PRUint32 ot=buf.Length(); -+ char tmp[]="\x00\x00"; - /* URLs must be wrapped at 40 characters or less. */ - if (col >= 38) { -- PUSH_STRING(CRLF "\t"); -+ buf.Append(CRLF "\t"); - col = 0; - } - - if (*s == ' ') -- PUSH_STRING("%20"); -+ buf.Append("%20"); - else if (*s == '\t') -- PUSH_STRING("%09"); -+ buf.Append("%09"); - else if (*s == '\n') -- PUSH_STRING("%0A"); -+ buf.Append("%0A"); - else if (*s == '\r') -- PUSH_STRING("%0D"); -+ buf.Append("%0D"); - else { -- *buffer_tail++ = *s; -- *buffer_tail = '\0'; -+ tmp[0]=*s; -+ buf.Append(tmp); - } - s++; -- col += (buffer_tail - ot); -+ col += (buf.Length() - ot); - } -- PUSH_STRING ("\"" CRLF); -+ buf.Append("\"" CRLF); - - /* rhp: this is to try to get around this fun problem with Content-Location */ - if (!useContentLocation) { -- PUSH_STRING ("Content-Location: \""); -+ buf.Append("Content-Location: \""); - s = base_url; - col = 0; - useContentLocation = PR_TRUE; -@@ -1130,10 +1120,9 @@ - #endif /* GENERATE_CONTENT_BASE */ - - /* realloc it smaller... */ -- buffer = (char*) PR_REALLOC (buffer, buffer_tail - buffer + 1); - - PR_FREEIF(encodedRealName); -- return buffer; -+ return PL_strdup(buf.get()); - } - - static PRBool isValidHost( const char* host ) diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile index 6a2989c2e2ee..c6b03ef99d67 100644 --- a/www/screem-devel/Makefile +++ b/www/screem-devel/Makefile @@ -6,8 +6,8 @@ # PORTNAME= screem -PORTVERSION= 0.10.2 -CATEGORIES= www editors gnome +PORTVERSION= 0.12.0 +CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,18 +15,22 @@ MAINTAINER= coop9211@uidaho.edu COMMENT= Nice GNOME/GTK-based HTML editor LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \ - croco.3:${PORTSDIR}/textproc/libcroco + croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco \ + dbus-1.0:${PORTSDIR}/devel/dbus USE_GMAKE= yes USE_REINPLACE= yes USE_X_PREFIX= yes USE_XPM= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \ - gtksourceview lthack intlhack -USE_INC_LIBTOOL_VER=13 -INSTALLS_SHLIB= yes + gtksourceview intlhack +USE_LIBTOOL_VER=15 -.ifndef WITHOUT_OPENSSL +GCONF_SCHEMAS= screem.schemas + +CROCO_VERSION= 0.6 + +.if !defined(WITHOUT_OPENSSL) USE_OPENSSL= yes CONFIGURE_ARGS+= --with-ssl .endif @@ -39,8 +43,17 @@ CONFIGURE_ARGS+= --without-included-neon post-patch: @${REINPLACE_CMD} -e 's|\$${DATADIRNAME}/\$${PACKAGE}/pixmaps|\$${DATADIRNAME}/gnome/\$${PACKAGE}/pixmaps|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|$$(datadir)/mime/|${PREFIX}/share/mime/| ; \ + s|$$(datadir)/mime$$|${PREFIX}/share/mime|' \ + ${WRKSRC}/data/mime/Makefile.in \ + ${WRKSRC}/data/tagtrees/Makefile.in post-configure: @${REINPLACE_CMD} -e 's|\/\* #undef HAVE_LIMITS_H \*\/|#define HAVE_LIMITS_H 1|g' ${WRKSRC}/config.h +# HACK: This allows test builds into a temporary directory, but in the REAL world, +# gconf would have created this directory. +pre-install: + @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults + .include <bsd.port.mk> diff --git a/www/screem-devel/distinfo b/www/screem-devel/distinfo index 983b017c2c07..2cd82d29274c 100644 --- a/www/screem-devel/distinfo +++ b/www/screem-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (screem-0.10.2.tar.gz) = a58c72555a6cecf34c2e2f6d9fda0288 -SIZE (screem-0.10.2.tar.gz) = 2350572 +MD5 (screem-0.12.0.tar.gz) = 549077fca6a94e7a7051f33fc1d51e4a +SIZE (screem-0.12.0.tar.gz) = 4172719 diff --git a/www/screem-devel/files/patch-libegg::toolbar::eggtoolbar.c b/www/screem-devel/files/patch-libegg::toolbar::eggtoolbar.c deleted file mode 100644 index 84d7b815805b..000000000000 --- a/www/screem-devel/files/patch-libegg::toolbar::eggtoolbar.c +++ /dev/null @@ -1,20 +0,0 @@ ---- libegg/toolbar/eggtoolbar.c.orig Thu Aug 12 10:09:55 2004 -+++ libegg/toolbar/eggtoolbar.c Thu Aug 12 10:11:54 2004 -@@ -2534,7 +2534,7 @@ - - GtkWidget* - egg_toolbar_append_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, -@@ -2551,7 +2551,7 @@ - - GtkWidget * - egg_toolbar_prepend_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, diff --git a/www/screem-devel/files/patch-ltmain.sh b/www/screem-devel/files/patch-ltmain.sh deleted file mode 100644 index 3bd995ac82f9..000000000000 --- a/www/screem-devel/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Tue Mar 30 22:36:08 2004 -+++ ltmain.sh Tue Mar 30 22:39:04 2004 -@@ -1360,7 +1360,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1370,8 +1370,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3110,6 +3118,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5712,10 +5723,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in b/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in index 51b06f5f654b..5ce8e16b5326 100644 --- a/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in +++ b/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in @@ -1,22 +1,22 @@ ---- plugins/uploadWizard/Makefile.in.orig Tue Mar 30 22:42:31 2004 -+++ plugins/uploadWizard/Makefile.in Tue Mar 30 22:43:33 2004 -@@ -267,8 +267,8 @@ - localdriver.c +--- plugins/uploadWizard/Makefile.in.orig Wed Nov 3 03:18:43 2004 ++++ plugins/uploadWizard/Makefile.in Wed Nov 3 03:20:17 2004 +@@ -277,8 +277,8 @@ + vfsdriver.c -uploadWizard_la_LDFLAGS = -avoid-version -module $(NEON_CFLAGS) -uploadWizard_la_LIBADD = $(NEONOBJS) $(NEON_LIBS) +uploadWizard_la_LDFLAGS = -avoid-version -module -+uploadWizard_la_LIBADD = ++uploadWizard_la_LIBADD = config_h = $(top_builddir)/config.h obj_ext = o -@@ -279,7 +279,7 @@ +@@ -289,7 +289,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(plugins_exec_LTLIBRARIES) -uploadWizard_la_DEPENDENCIES = $(neon_dir)/*.lo -+uploadWizard_la_DEPENDENCIES = - am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h rpmatch.c \ - fnmatch.c fnmatch.h common.c common.h davdriver.c fileset.c \ - fileset.h frontend.h ftp.c ftp.h ftpdriver.c i18n.h protocol.h \ ++uploadWizard_la_DEPENDENCIES = + am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h fnmatch.c \ + fnmatch.h common.c common.h fileset.c fileset.h frontend.h \ + ftp.c ftp.h ftpdriver.c i18n.h protocol.h rcfile.c rcfile.h \ diff --git a/www/screem-devel/pkg-descr b/www/screem-devel/pkg-descr index b586f6d09b23..b601941fa4de 100644 --- a/www/screem-devel/pkg-descr +++ b/www/screem-devel/pkg-descr @@ -2,7 +2,7 @@ SCREEM (Site CReating and Editing EnvironMent) is a VERY nice GUI-based HTML editor, much like bluefish. It even imports bluefish functions from your bluefish installation! -SCREEM makes a rather ideal GUI HTML editor, especially for +SCREEM makes a rather ideal GUI HTML editor, especially for Unixheads who like using CVS to manage source trees, as SCREEM has functional CVS interaction. diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist index 3363683c65d9..ae424d011918 100644 --- a/www/screem-devel/pkg-plist +++ b/www/screem-devel/pkg-plist @@ -1,7 +1,4 @@ bin/screem -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/screem.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true lib/screem/plugins/colourWizard.so lib/screem/plugins/cssWizard.so lib/screem/plugins/css_wizard.so @@ -9,16 +6,73 @@ lib/screem/plugins/entityWizard.so lib/screem/plugins/formWizard.so lib/screem/plugins/imageWizard.so lib/screem/plugins/linkWizard.so +lib/screem/plugins/object_wizard.so lib/screem/plugins/ssiWizard.so lib/screem/plugins/tableWizard.so lib/screem/plugins/uploadWizard.so share/gnome/application-registry/screem.applications +share/gnome/applications/mimeinfo.cache share/gnome/applications/screem.desktop -share/gnome/help/screem/C/figures/dummy.png +share/gnome/help/screem/C/figures/color-wizard.png +share/gnome/help/screem/C/figures/css-wizard1.png +share/gnome/help/screem/C/figures/css-wizard2.png +share/gnome/help/screem/C/figures/editor-autocomplete1.png +share/gnome/help/screem/C/figures/editor-context-menu.png +share/gnome/help/screem/C/figures/editor-error.png +share/gnome/help/screem/C/figures/editor-inline-tagging.png +share/gnome/help/screem/C/figures/editor-pasting.png +share/gnome/help/screem/C/figures/editor-tooltips.png +share/gnome/help/screem/C/figures/editor.png +share/gnome/help/screem/C/figures/entity-wizard.png +share/gnome/help/screem/C/figures/form-wizard.png +share/gnome/help/screem/C/figures/image-wizard.png +share/gnome/help/screem/C/figures/link-wizard1.png +share/gnome/help/screem/C/figures/link-wizard2.png +share/gnome/help/screem/C/figures/newblankdoc.png +share/gnome/help/screem/C/figures/newdoc.png +share/gnome/help/screem/C/figures/newsite1.png +share/gnome/help/screem/C/figures/newsite2.png +share/gnome/help/screem/C/figures/object-wizard.png +share/gnome/help/screem/C/figures/opensite1.png +share/gnome/help/screem/C/figures/opensite2.png +share/gnome/help/screem/C/figures/opensitelocation.png +share/gnome/help/screem/C/figures/prefs-browsers.png +share/gnome/help/screem/C/figures/prefs-doctypes.png +share/gnome/help/screem/C/figures/prefs-editor.png +share/gnome/help/screem/C/figures/prefs-fonts-colors.png +share/gnome/help/screem/C/figures/prefs-misc.png +share/gnome/help/screem/C/figures/prefs-tag-trees.png +share/gnome/help/screem/C/figures/preview.png +share/gnome/help/screem/C/figures/sidebar-attributes1.png +share/gnome/help/screem/C/figures/sidebar-attributes2.png +share/gnome/help/screem/C/figures/sidebar-attributes3.png +share/gnome/help/screem/C/figures/sidebar-errors.png +share/gnome/help/screem/C/figures/sidebar-files1.png +share/gnome/help/screem/C/figures/sidebar-files2.png +share/gnome/help/screem/C/figures/sidebar-messages.png +share/gnome/help/screem/C/figures/sidebar-resources1.png +share/gnome/help/screem/C/figures/sidebar-resources2.png +share/gnome/help/screem/C/figures/sidebar-resources3.png +share/gnome/help/screem/C/figures/sidebar-symbols.png +share/gnome/help/screem/C/figures/sidebar-tree.png +share/gnome/help/screem/C/figures/ssi-wizard.png +share/gnome/help/screem/C/figures/table-wizard.png +share/gnome/help/screem/C/figures/tree.png share/gnome/help/screem/C/legal.xml share/gnome/help/screem/C/screem.xml share/gnome/mime-info/screem.keys -share/gnome/mime-info/screem.mime +share/mime/application/vnd.wap.wmlc.xml +share/mime/application/vnd.wap.wmlscriptc.xml +share/mime/application/x-screem-tag-tree.xml +share/mime/application/x-screem.xml +share/mime/application/xhtml+xml.xml +share/mime/image/vnd.wap.wbmp.xml +share/mime/packages/screem.xml +share/mime/text/html.xml +share/mime/text/vnd.wap.wml.xml +share/mime/text/vnd.wap.wmlscript.xml +share/mime/text/x-component.xml +share/mime/text/x-javascript.xml share/gnome/omf/screem/screem-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/screem.png @@ -40,10 +94,10 @@ share/gnome/screem/dtd/xhtml-special.ent share/gnome/screem/dtd/xhtml-symbol.ent share/gnome/screem/features.xml share/gnome/screem/glade/css-wizard.glade -share/gnome/screem/glade/css.glade share/gnome/screem/glade/entityWizard.glade share/gnome/screem/glade/imageWizard.glade share/gnome/screem/glade/linkwizard.glade +share/gnome/screem/glade/object-wizard.glade share/gnome/screem/glade/screem.glade share/gnome/screem/glade/ssiwizard.glade share/gnome/screem/glade/tablewizard.glade @@ -82,6 +136,7 @@ share/gnome/screem/pixmaps/entry.xpm share/gnome/screem/pixmaps/fixed.xpm share/gnome/screem/pixmaps/gallery.xpm share/gnome/screem/pixmaps/gnome-fileentry.xpm +share/gnome/screem/pixmaps/hand-open.png share/gnome/screem/pixmaps/insert-symbol-16.png share/gnome/screem/pixmaps/insert-symbol-24.png share/gnome/screem/pixmaps/optionmenu.xpm @@ -92,10 +147,15 @@ share/gnome/screem/pixmaps/resources.png share/gnome/screem/pixmaps/screem_site.png share/gnome/screem/pixmaps/site_preview.png share/gnome/screem/pixmaps/site_structure-48.png +share/gnome/screem/pixmaps/stock-close-12.png +share/gnome/screem/pixmaps/stock-menu-left-12.png +share/gnome/screem/pixmaps/stock-menu-right-12.png share/gnome/screem/pixmaps/stock_connect.png share/gnome/screem/pixmaps/stock_disconnect.png share/gnome/screem/pixmaps/stock_insert_image-16.png share/gnome/screem/pixmaps/stock_insert_image.png +share/gnome/screem/pixmaps/stock_insert_object-16.png +share/gnome/screem/pixmaps/stock_insert_object.png share/gnome/screem/pixmaps/stock_insert_table-16.png share/gnome/screem/pixmaps/sub.xpm share/gnome/screem/pixmaps/sup.xpm @@ -112,10 +172,12 @@ share/gnome/screem/resources/Templates/template.html share/gnome/screem/tagtrees/apache.tagtree share/gnome/screem/tagtrees/css.tagtree share/gnome/screem/tagtrees/funcref_php.tagtree +share/gnome/screem/tagtrees/funcref_python.tagtree share/gnome/screem/tagtrees/html.tagtree share/gnome/screem/tagtrees/javascript.tagtree +share/gnome/screem/tagtrees/teixlite.tagtree share/gnome/screem/ui/layout -share/gnome/screem/ui/screem-css-window-ui.xml +share/gnome/screem/ui/screem-editable-toolbars.xml share/gnome/screem/ui/screem-tag-tree-bar.xml share/gnome/screem/ui/screem-window-menu.xml share/gnome/screem/ui/screem-window-popups.xml @@ -141,26 +203,28 @@ share/locale/tr/LC_MESSAGES/screem.mo share/locale/uk/LC_MESSAGES/screem.mo share/locale/vi/LC_MESSAGES/screem.mo share/locale/zh_CN/LC_MESSAGES/screem.mo -@dirrm share/gnome/screem/ui -@dirrm share/gnome/screem/tagtrees -@dirrm share/gnome/screem/resources/Templates -@dirrm share/gnome/screem/resources/PHP3 -@dirrm share/gnome/screem/resources/Javascript -@dirrm share/gnome/screem/resources/Images -@dirrm share/gnome/screem/resources/HTML -@dirrm share/gnome/screem/resources/Applets -@dirrm share/gnome/screem/resources -@dirrm share/gnome/screem/pixmaps -@dirrm share/gnome/screem/hints -@dirrm share/gnome/screem/glade -@dirrm share/gnome/screem/dtd -@dirrm share/gnome/screem -@dirrm share/gnome/pixmaps/screem/splash -@dirrm share/gnome/pixmaps/screem -@dirrm share/gnome/omf/screem +@dirrm lib/screem/plugins +@dirrm lib/screem @dirrm share/gnome/help/screem/C/figures @dirrm share/gnome/help/screem/C @dirrm share/gnome/help/screem -@dirrm lib/screem/plugins -@dirrm lib/screem +@dirrm share/gnome/omf/screem +@dirrm share/gnome/pixmaps/screem/splash +@dirrm share/gnome/pixmaps/screem +@dirrm share/gnome/screem/dtd +@dirrm share/gnome/screem/glade +@dirrm share/gnome/screem/hints +@dirrm share/gnome/screem/pixmaps +@dirrm share/gnome/screem/resources/Applets +@dirrm share/gnome/screem/resources/HTML +@dirrm share/gnome/screem/resources/Images +@dirrm share/gnome/screem/resources/Javascript +@dirrm share/gnome/screem/resources/PHP3 +@dirrm share/gnome/screem/resources/Templates +@dirrm share/gnome/screem/resources +@dirrm share/gnome/screem/tagtrees +@dirrm share/gnome/screem/ui +@dirrm share/gnome/screem @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true +@exec update-mime-database %D/share/mime +@unexec update-mime-database %D/share/mime diff --git a/www/screem/Makefile b/www/screem/Makefile index 6a2989c2e2ee..c6b03ef99d67 100644 --- a/www/screem/Makefile +++ b/www/screem/Makefile @@ -6,8 +6,8 @@ # PORTNAME= screem -PORTVERSION= 0.10.2 -CATEGORIES= www editors gnome +PORTVERSION= 0.12.0 +CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,18 +15,22 @@ MAINTAINER= coop9211@uidaho.edu COMMENT= Nice GNOME/GTK-based HTML editor LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \ - croco.3:${PORTSDIR}/textproc/libcroco + croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco \ + dbus-1.0:${PORTSDIR}/devel/dbus USE_GMAKE= yes USE_REINPLACE= yes USE_X_PREFIX= yes USE_XPM= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \ - gtksourceview lthack intlhack -USE_INC_LIBTOOL_VER=13 -INSTALLS_SHLIB= yes + gtksourceview intlhack +USE_LIBTOOL_VER=15 -.ifndef WITHOUT_OPENSSL +GCONF_SCHEMAS= screem.schemas + +CROCO_VERSION= 0.6 + +.if !defined(WITHOUT_OPENSSL) USE_OPENSSL= yes CONFIGURE_ARGS+= --with-ssl .endif @@ -39,8 +43,17 @@ CONFIGURE_ARGS+= --without-included-neon post-patch: @${REINPLACE_CMD} -e 's|\$${DATADIRNAME}/\$${PACKAGE}/pixmaps|\$${DATADIRNAME}/gnome/\$${PACKAGE}/pixmaps|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|$$(datadir)/mime/|${PREFIX}/share/mime/| ; \ + s|$$(datadir)/mime$$|${PREFIX}/share/mime|' \ + ${WRKSRC}/data/mime/Makefile.in \ + ${WRKSRC}/data/tagtrees/Makefile.in post-configure: @${REINPLACE_CMD} -e 's|\/\* #undef HAVE_LIMITS_H \*\/|#define HAVE_LIMITS_H 1|g' ${WRKSRC}/config.h +# HACK: This allows test builds into a temporary directory, but in the REAL world, +# gconf would have created this directory. +pre-install: + @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults + .include <bsd.port.mk> diff --git a/www/screem/distinfo b/www/screem/distinfo index 983b017c2c07..2cd82d29274c 100644 --- a/www/screem/distinfo +++ b/www/screem/distinfo @@ -1,2 +1,2 @@ -MD5 (screem-0.10.2.tar.gz) = a58c72555a6cecf34c2e2f6d9fda0288 -SIZE (screem-0.10.2.tar.gz) = 2350572 +MD5 (screem-0.12.0.tar.gz) = 549077fca6a94e7a7051f33fc1d51e4a +SIZE (screem-0.12.0.tar.gz) = 4172719 diff --git a/www/screem/files/patch-libegg::toolbar::eggtoolbar.c b/www/screem/files/patch-libegg::toolbar::eggtoolbar.c deleted file mode 100644 index 84d7b815805b..000000000000 --- a/www/screem/files/patch-libegg::toolbar::eggtoolbar.c +++ /dev/null @@ -1,20 +0,0 @@ ---- libegg/toolbar/eggtoolbar.c.orig Thu Aug 12 10:09:55 2004 -+++ libegg/toolbar/eggtoolbar.c Thu Aug 12 10:11:54 2004 -@@ -2534,7 +2534,7 @@ - - GtkWidget* - egg_toolbar_append_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, -@@ -2551,7 +2551,7 @@ - - GtkWidget * - egg_toolbar_prepend_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, diff --git a/www/screem/files/patch-ltmain.sh b/www/screem/files/patch-ltmain.sh deleted file mode 100644 index 3bd995ac82f9..000000000000 --- a/www/screem/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Tue Mar 30 22:36:08 2004 -+++ ltmain.sh Tue Mar 30 22:39:04 2004 -@@ -1360,7 +1360,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1370,8 +1370,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3110,6 +3118,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5712,10 +5723,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/screem/files/patch-plugins::uploadWizard::Makefile.in b/www/screem/files/patch-plugins::uploadWizard::Makefile.in index 51b06f5f654b..5ce8e16b5326 100644 --- a/www/screem/files/patch-plugins::uploadWizard::Makefile.in +++ b/www/screem/files/patch-plugins::uploadWizard::Makefile.in @@ -1,22 +1,22 @@ ---- plugins/uploadWizard/Makefile.in.orig Tue Mar 30 22:42:31 2004 -+++ plugins/uploadWizard/Makefile.in Tue Mar 30 22:43:33 2004 -@@ -267,8 +267,8 @@ - localdriver.c +--- plugins/uploadWizard/Makefile.in.orig Wed Nov 3 03:18:43 2004 ++++ plugins/uploadWizard/Makefile.in Wed Nov 3 03:20:17 2004 +@@ -277,8 +277,8 @@ + vfsdriver.c -uploadWizard_la_LDFLAGS = -avoid-version -module $(NEON_CFLAGS) -uploadWizard_la_LIBADD = $(NEONOBJS) $(NEON_LIBS) +uploadWizard_la_LDFLAGS = -avoid-version -module -+uploadWizard_la_LIBADD = ++uploadWizard_la_LIBADD = config_h = $(top_builddir)/config.h obj_ext = o -@@ -279,7 +279,7 @@ +@@ -289,7 +289,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(plugins_exec_LTLIBRARIES) -uploadWizard_la_DEPENDENCIES = $(neon_dir)/*.lo -+uploadWizard_la_DEPENDENCIES = - am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h rpmatch.c \ - fnmatch.c fnmatch.h common.c common.h davdriver.c fileset.c \ - fileset.h frontend.h ftp.c ftp.h ftpdriver.c i18n.h protocol.h \ ++uploadWizard_la_DEPENDENCIES = + am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h fnmatch.c \ + fnmatch.h common.c common.h fileset.c fileset.h frontend.h \ + ftp.c ftp.h ftpdriver.c i18n.h protocol.h rcfile.c rcfile.h \ diff --git a/www/screem/pkg-descr b/www/screem/pkg-descr index b586f6d09b23..b601941fa4de 100644 --- a/www/screem/pkg-descr +++ b/www/screem/pkg-descr @@ -2,7 +2,7 @@ SCREEM (Site CReating and Editing EnvironMent) is a VERY nice GUI-based HTML editor, much like bluefish. It even imports bluefish functions from your bluefish installation! -SCREEM makes a rather ideal GUI HTML editor, especially for +SCREEM makes a rather ideal GUI HTML editor, especially for Unixheads who like using CVS to manage source trees, as SCREEM has functional CVS interaction. diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist index 3363683c65d9..ae424d011918 100644 --- a/www/screem/pkg-plist +++ b/www/screem/pkg-plist @@ -1,7 +1,4 @@ bin/screem -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/screem.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true lib/screem/plugins/colourWizard.so lib/screem/plugins/cssWizard.so lib/screem/plugins/css_wizard.so @@ -9,16 +6,73 @@ lib/screem/plugins/entityWizard.so lib/screem/plugins/formWizard.so lib/screem/plugins/imageWizard.so lib/screem/plugins/linkWizard.so +lib/screem/plugins/object_wizard.so lib/screem/plugins/ssiWizard.so lib/screem/plugins/tableWizard.so lib/screem/plugins/uploadWizard.so share/gnome/application-registry/screem.applications +share/gnome/applications/mimeinfo.cache share/gnome/applications/screem.desktop -share/gnome/help/screem/C/figures/dummy.png +share/gnome/help/screem/C/figures/color-wizard.png +share/gnome/help/screem/C/figures/css-wizard1.png +share/gnome/help/screem/C/figures/css-wizard2.png +share/gnome/help/screem/C/figures/editor-autocomplete1.png +share/gnome/help/screem/C/figures/editor-context-menu.png +share/gnome/help/screem/C/figures/editor-error.png +share/gnome/help/screem/C/figures/editor-inline-tagging.png +share/gnome/help/screem/C/figures/editor-pasting.png +share/gnome/help/screem/C/figures/editor-tooltips.png +share/gnome/help/screem/C/figures/editor.png +share/gnome/help/screem/C/figures/entity-wizard.png +share/gnome/help/screem/C/figures/form-wizard.png +share/gnome/help/screem/C/figures/image-wizard.png +share/gnome/help/screem/C/figures/link-wizard1.png +share/gnome/help/screem/C/figures/link-wizard2.png +share/gnome/help/screem/C/figures/newblankdoc.png +share/gnome/help/screem/C/figures/newdoc.png +share/gnome/help/screem/C/figures/newsite1.png +share/gnome/help/screem/C/figures/newsite2.png +share/gnome/help/screem/C/figures/object-wizard.png +share/gnome/help/screem/C/figures/opensite1.png +share/gnome/help/screem/C/figures/opensite2.png +share/gnome/help/screem/C/figures/opensitelocation.png +share/gnome/help/screem/C/figures/prefs-browsers.png +share/gnome/help/screem/C/figures/prefs-doctypes.png +share/gnome/help/screem/C/figures/prefs-editor.png +share/gnome/help/screem/C/figures/prefs-fonts-colors.png +share/gnome/help/screem/C/figures/prefs-misc.png +share/gnome/help/screem/C/figures/prefs-tag-trees.png +share/gnome/help/screem/C/figures/preview.png +share/gnome/help/screem/C/figures/sidebar-attributes1.png +share/gnome/help/screem/C/figures/sidebar-attributes2.png +share/gnome/help/screem/C/figures/sidebar-attributes3.png +share/gnome/help/screem/C/figures/sidebar-errors.png +share/gnome/help/screem/C/figures/sidebar-files1.png +share/gnome/help/screem/C/figures/sidebar-files2.png +share/gnome/help/screem/C/figures/sidebar-messages.png +share/gnome/help/screem/C/figures/sidebar-resources1.png +share/gnome/help/screem/C/figures/sidebar-resources2.png +share/gnome/help/screem/C/figures/sidebar-resources3.png +share/gnome/help/screem/C/figures/sidebar-symbols.png +share/gnome/help/screem/C/figures/sidebar-tree.png +share/gnome/help/screem/C/figures/ssi-wizard.png +share/gnome/help/screem/C/figures/table-wizard.png +share/gnome/help/screem/C/figures/tree.png share/gnome/help/screem/C/legal.xml share/gnome/help/screem/C/screem.xml share/gnome/mime-info/screem.keys -share/gnome/mime-info/screem.mime +share/mime/application/vnd.wap.wmlc.xml +share/mime/application/vnd.wap.wmlscriptc.xml +share/mime/application/x-screem-tag-tree.xml +share/mime/application/x-screem.xml +share/mime/application/xhtml+xml.xml +share/mime/image/vnd.wap.wbmp.xml +share/mime/packages/screem.xml +share/mime/text/html.xml +share/mime/text/vnd.wap.wml.xml +share/mime/text/vnd.wap.wmlscript.xml +share/mime/text/x-component.xml +share/mime/text/x-javascript.xml share/gnome/omf/screem/screem-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/screem.png @@ -40,10 +94,10 @@ share/gnome/screem/dtd/xhtml-special.ent share/gnome/screem/dtd/xhtml-symbol.ent share/gnome/screem/features.xml share/gnome/screem/glade/css-wizard.glade -share/gnome/screem/glade/css.glade share/gnome/screem/glade/entityWizard.glade share/gnome/screem/glade/imageWizard.glade share/gnome/screem/glade/linkwizard.glade +share/gnome/screem/glade/object-wizard.glade share/gnome/screem/glade/screem.glade share/gnome/screem/glade/ssiwizard.glade share/gnome/screem/glade/tablewizard.glade @@ -82,6 +136,7 @@ share/gnome/screem/pixmaps/entry.xpm share/gnome/screem/pixmaps/fixed.xpm share/gnome/screem/pixmaps/gallery.xpm share/gnome/screem/pixmaps/gnome-fileentry.xpm +share/gnome/screem/pixmaps/hand-open.png share/gnome/screem/pixmaps/insert-symbol-16.png share/gnome/screem/pixmaps/insert-symbol-24.png share/gnome/screem/pixmaps/optionmenu.xpm @@ -92,10 +147,15 @@ share/gnome/screem/pixmaps/resources.png share/gnome/screem/pixmaps/screem_site.png share/gnome/screem/pixmaps/site_preview.png share/gnome/screem/pixmaps/site_structure-48.png +share/gnome/screem/pixmaps/stock-close-12.png +share/gnome/screem/pixmaps/stock-menu-left-12.png +share/gnome/screem/pixmaps/stock-menu-right-12.png share/gnome/screem/pixmaps/stock_connect.png share/gnome/screem/pixmaps/stock_disconnect.png share/gnome/screem/pixmaps/stock_insert_image-16.png share/gnome/screem/pixmaps/stock_insert_image.png +share/gnome/screem/pixmaps/stock_insert_object-16.png +share/gnome/screem/pixmaps/stock_insert_object.png share/gnome/screem/pixmaps/stock_insert_table-16.png share/gnome/screem/pixmaps/sub.xpm share/gnome/screem/pixmaps/sup.xpm @@ -112,10 +172,12 @@ share/gnome/screem/resources/Templates/template.html share/gnome/screem/tagtrees/apache.tagtree share/gnome/screem/tagtrees/css.tagtree share/gnome/screem/tagtrees/funcref_php.tagtree +share/gnome/screem/tagtrees/funcref_python.tagtree share/gnome/screem/tagtrees/html.tagtree share/gnome/screem/tagtrees/javascript.tagtree +share/gnome/screem/tagtrees/teixlite.tagtree share/gnome/screem/ui/layout -share/gnome/screem/ui/screem-css-window-ui.xml +share/gnome/screem/ui/screem-editable-toolbars.xml share/gnome/screem/ui/screem-tag-tree-bar.xml share/gnome/screem/ui/screem-window-menu.xml share/gnome/screem/ui/screem-window-popups.xml @@ -141,26 +203,28 @@ share/locale/tr/LC_MESSAGES/screem.mo share/locale/uk/LC_MESSAGES/screem.mo share/locale/vi/LC_MESSAGES/screem.mo share/locale/zh_CN/LC_MESSAGES/screem.mo -@dirrm share/gnome/screem/ui -@dirrm share/gnome/screem/tagtrees -@dirrm share/gnome/screem/resources/Templates -@dirrm share/gnome/screem/resources/PHP3 -@dirrm share/gnome/screem/resources/Javascript -@dirrm share/gnome/screem/resources/Images -@dirrm share/gnome/screem/resources/HTML -@dirrm share/gnome/screem/resources/Applets -@dirrm share/gnome/screem/resources -@dirrm share/gnome/screem/pixmaps -@dirrm share/gnome/screem/hints -@dirrm share/gnome/screem/glade -@dirrm share/gnome/screem/dtd -@dirrm share/gnome/screem -@dirrm share/gnome/pixmaps/screem/splash -@dirrm share/gnome/pixmaps/screem -@dirrm share/gnome/omf/screem +@dirrm lib/screem/plugins +@dirrm lib/screem @dirrm share/gnome/help/screem/C/figures @dirrm share/gnome/help/screem/C @dirrm share/gnome/help/screem -@dirrm lib/screem/plugins -@dirrm lib/screem +@dirrm share/gnome/omf/screem +@dirrm share/gnome/pixmaps/screem/splash +@dirrm share/gnome/pixmaps/screem +@dirrm share/gnome/screem/dtd +@dirrm share/gnome/screem/glade +@dirrm share/gnome/screem/hints +@dirrm share/gnome/screem/pixmaps +@dirrm share/gnome/screem/resources/Applets +@dirrm share/gnome/screem/resources/HTML +@dirrm share/gnome/screem/resources/Images +@dirrm share/gnome/screem/resources/Javascript +@dirrm share/gnome/screem/resources/PHP3 +@dirrm share/gnome/screem/resources/Templates +@dirrm share/gnome/screem/resources +@dirrm share/gnome/screem/tagtrees +@dirrm share/gnome/screem/ui +@dirrm share/gnome/screem @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true +@exec update-mime-database %D/share/mime +@unexec update-mime-database %D/share/mime diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index 52436b7e3094..76d620b87df4 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.6.3 -PORTREVISION= 2 +PORTVERSION= 2.8.2 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 DISTNAME= nautilus-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,7 +23,7 @@ USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomedesktop eel2 \ librsvg2 GNOME_DESKTOP_VERSION=2 INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \ @@ -34,8 +33,10 @@ CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ --enable-static MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" +GCONF_SCHEMAS= apps_nautilus_preferences.schemas + post-install: ${MKDIR} ${PREFIX}/lib/nautilus/extensions-1.0 - @${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop +# @${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop .include <bsd.port.mk> diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo index 312e42d24084..1645076c4527 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-2.6.3.tar.bz2) = ef91c7eefd219800a3aab93e6510a5c9 -SIZE (gnome2/nautilus-2.6.3.tar.bz2) = 5665374 +MD5 (gnome2/nautilus-2.8.2.tar.bz2) = d5fdec9acc37181016e8424e96d663b8 +SIZE (gnome2/nautilus-2.8.2.tar.bz2) = 5808170 diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in index d1e95a23b85f..7cb9fd809448 100644 --- a/x11-fm/nautilus2/files/patch-Makefile.in +++ b/x11-fm/nautilus2/files/patch-Makefile.in @@ -1,10 +1,11 @@ ---- Makefile.in.orig Fri Jun 4 16:51:06 2004 -+++ Makefile.in Fri Jun 4 17:01:49 2004 -@@ -195,7 +195,6 @@ - libnautilus-private \ - libnautilus-adapter \ - src \ -- test \ - components \ - po \ - data \ +--- Makefile.in.orig Mon Aug 16 11:35:20 2004 ++++ Makefile.in Mon Aug 16 11:35:34 2004 +@@ -179,7 +179,7 @@ + DESKTOP_SETTINGS_FILES = nautilus-file-management-properties.desktop + + +-SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src test components po data icons docs $(NULL) ++SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src components po data icons docs $(NULL) + + + EXTRA_DIST = COPYING.LIB COPYING-DOCS HACKING MAINTAINERS nautilus.spec.in nautilus.desktop nautilus.desktop.in ChangeLog-20000414 ChangeLog-20000625 ChangeLog-20000831 ChangeLog-20001018 intltool-extract.in intltool-merge.in intltool-update.in Makefile.shared add-include-prefix $(DESKTOP_IN_FILES) $(DESKTOP_APPLICATIONS_FILES) $(DESKTOP_SETTINGS_FILES) $(NULL) diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in index d82ca373940e..411fe669370f 100644 --- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in +++ b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in @@ -1,11 +1,11 @@ ---- libbackground/Makefile.in.orig Fri Jun 4 17:02:10 2004 -+++ libbackground/Makefile.in Fri Jun 4 17:02:52 2004 -@@ -173,7 +173,7 @@ - - INCLUDES = \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ - -DG_LOG_DOMAIN=\"capplet-common\" \ - -I$(top_srcdir)/ \ - @CAPPLET_CFLAGS@ +--- libbackground/Makefile.in.orig Mon Aug 16 11:36:57 2004 ++++ libbackground/Makefile.in Mon Aug 16 11:37:35 2004 +@@ -171,7 +171,7 @@ + + EXTRA_DIST = ChangeLog + +-INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ + + + noinst_LTLIBRARIES = libbackground.la diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c deleted file mode 100644 index 62385a0ac826..000000000000 --- a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c +++ /dev/null @@ -1,13 +0,0 @@ ---- libnautilus-private/nautilus-desktop-icon-file.c.orig Fri Jan 30 16:49:53 2004 -+++ libnautilus-private/nautilus-desktop-icon-file.c Fri Jan 30 16:50:52 2004 -@@ -199,6 +199,10 @@ - file_info->flags = GNOME_VFS_FILE_FLAGS_NONE; - file_info->link_count = 1; - file_info->size = 0; -+ /* Set a bogus owner and group on these files to prevent nowrite -+ * emblems from showing up on the files. */ -+ file_info->uid = -993; -+ file_info->gid = -993; - file_info->permissions = - GNOME_VFS_PERM_OTHER_WRITE | - GNOME_VFS_PERM_USER_READ | diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh deleted file mode 100644 index 3232b8da9655..000000000000 --- a/x11-fm/nautilus2/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Sun Jan 11 17:28:53 2004 -+++ ltmain.sh Fri Jan 30 16:45:37 2004 -@@ -1280,7 +1280,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1290,8 +1290,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3000,6 +3008,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5428,10 +5439,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index bc919359aa2a..9e283f87c5bf 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -1,15 +1,5 @@ bin/nautilus bin/nautilus-file-management-properties -etc/X11/serverconfig/.directory -etc/X11/starthere/.directory -etc/X11/starthere/applications.desktop -etc/X11/starthere/preferences.desktop -etc/X11/starthere/serverconfig.desktop -etc/X11/starthere/sysconfig.desktop -etc/X11/sysconfig/.directory -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_nautilus_preferences.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/apps_nautilus_preferences.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_nautilus_preferences.schemas > /dev/null || /usr/bin/true include/libnautilus/libnautilus.h include/libnautilus/nautilus-bonobo-ui.h include/libnautilus/nautilus-clipboard.h @@ -54,14 +44,14 @@ libdata/bonobo/servers/Nautilus_View_image_properties.server libdata/bonobo/servers/Nautilus_View_notes.server libdata/bonobo/servers/Nautilus_View_text.server libdata/bonobo/servers/Nautilus_shell.server -libdata/pkgconfig/libnautilus.pc libdata/pkgconfig/libnautilus-extension.pc +libdata/pkgconfig/libnautilus.pc libexec/nautilus-adapter libexec/nautilus-text-view libexec/nautilus-throbber -share/gnome/applications/nautilus.desktop share/gnome/applications/nautilus-computer.desktop share/gnome/applications/nautilus-home.desktop +share/gnome/applications/nautilus.desktop share/gnome/applications/network-scheme.desktop share/gnome/control-center-2.0/capplets/nautilus-file-management-properties.desktop share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml @@ -113,8 +103,6 @@ share/gnome/nautilus/patterns/snow_ridge.png share/gnome/nautilus/patterns/stucco.jpg share/gnome/nautilus/patterns/terracotta.png share/gnome/nautilus/patterns/wavy_white.png -share/gnome/nautilus/starthere-link.desktop -share/gnome/nautilus/starthere.desktop share/gnome/nautilus/static_bookmarks.xml share/gnome/pixmaps/nautilus/Search.png share/gnome/pixmaps/nautilus/audio.png @@ -153,6 +141,7 @@ share/locale/az/LC_MESSAGES/nautilus.mo share/locale/be/LC_MESSAGES/nautilus.mo share/locale/bg/LC_MESSAGES/nautilus.mo share/locale/bn/LC_MESSAGES/nautilus.mo +share/locale/bs/LC_MESSAGES/nautilus.mo share/locale/ca/LC_MESSAGES/nautilus.mo share/locale/cs/LC_MESSAGES/nautilus.mo share/locale/cy/LC_MESSAGES/nautilus.mo @@ -187,6 +176,7 @@ share/locale/mk/LC_MESSAGES/nautilus.mo share/locale/ml/LC_MESSAGES/nautilus.mo share/locale/mn/LC_MESSAGES/nautilus.mo share/locale/ms/LC_MESSAGES/nautilus.mo +share/locale/nb/LC_MESSAGES/nautilus.mo share/locale/ne/LC_MESSAGES/nautilus.mo share/locale/nl/LC_MESSAGES/nautilus.mo share/locale/nn/LC_MESSAGES/nautilus.mo @@ -204,6 +194,7 @@ share/locale/sr/LC_MESSAGES/nautilus.mo share/locale/sr@Latn/LC_MESSAGES/nautilus.mo share/locale/sr@ije/LC_MESSAGES/nautilus.mo share/locale/sv/LC_MESSAGES/nautilus.mo +share/locale/ta/LC_MESSAGES/nautilus.mo share/locale/th/LC_MESSAGES/nautilus.mo share/locale/tk/LC_MESSAGES/nautilus.mo share/locale/tr/LC_MESSAGES/nautilus.mo diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index f4c2ce61f7a6..d2ee08dba430 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnome-themes -PORTVERSION= 2.6.3 +PORTVERSION= 2.8.1 CATEGORIES= x11-themes gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,8 +21,9 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-theme USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_INC_LIBTOOL_VER=13 -USE_GNOME= gnomehack lthack metacity libgnomeui +USE_LIBTOOL_VER=15 +USE_GMAKE= yes +USE_GNOME= gnomehack intlhack metacity libgnomeui CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 4ca1f8283981..db242aa71fa7 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-themes-2.6.3.tar.bz2) = dfaf15f973e7ed91459b8ad0ca368839 -SIZE (gnome2/gnome-themes-2.6.3.tar.bz2) = 2608334 +MD5 (gnome2/gnome-themes-2.8.1.tar.bz2) = 43042549347d67a844f986acd9e6bc3d +SIZE (gnome2/gnome-themes-2.8.1.tar.bz2) = 2718430 diff --git a/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in b/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in index 090c18883e26..7694d5d3a158 100644 --- a/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in +++ b/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in @@ -1,6 +1,6 @@ ---- metacity-themes/Makefile.in.orig Tue Dec 9 22:11:42 2003 -+++ metacity-themes/Makefile.in Tue Dec 9 22:12:00 2003 -@@ -122,7 +122,7 @@ +--- metacity-themes/Makefile.in.orig Mon May 31 20:29:45 2004 ++++ metacity-themes/Makefile.in Mon May 31 20:29:56 2004 +@@ -133,7 +133,7 @@ THEMES = Mist Sandwish Smokey diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index edf68156adfd..7c36575ba44a 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -2,6 +2,7 @@ lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so share/eazel-engine/arrow_down-spinner.png share/eazel-engine/arrow_down.png @@ -78,6 +79,7 @@ share/eazel-engine/tab_usel-bottom-left.png share/eazel-engine/tab_usel-bottom.png share/eazel-engine/tab_usel-left.png share/eazel-engine/tab_usel.png +share/gnome/themes/Glider/metacity-1/metacity-theme-1.xml share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml share/gnome/themes/Sandwish/metacity-1/active-border-top-left-border.png share/gnome/themes/Sandwish/metacity-1/active-border-top-right-border.png @@ -240,6 +242,7 @@ share/icons/Flat-Blue/scalable/emblems/emblem-special.svg share/icons/Flat-Blue/scalable/emblems/emblem-urgent.svg share/icons/HighContrast/index.theme share/icons/HighContrastInverse/index.theme +share/icons/HighContrastLargePrint/48x48/apps/JUSimageIcon.png share/icons/HighContrastLargePrint/48x48/apps/accessibility-directory.png share/icons/HighContrastLargePrint/48x48/apps/acme-48.png share/icons/HighContrastLargePrint/48x48/apps/administration.png @@ -255,6 +258,7 @@ share/icons/HighContrastLargePrint/48x48/apps/evolution-1.4.png share/icons/HighContrastLargePrint/48x48/apps/evolution.png share/icons/HighContrastLargePrint/48x48/apps/file-manager.png share/icons/HighContrastLargePrint/48x48/apps/file-roller.png +share/icons/HighContrastLargePrint/48x48/apps/fsexam-icon.png share/icons/HighContrastLargePrint/48x48/apps/gaim.png share/icons/HighContrastLargePrint/48x48/apps/gataxx.png share/icons/HighContrastLargePrint/48x48/apps/gcalctool.png @@ -282,6 +286,7 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-desktop-config.png share/icons/HighContrastLargePrint/48x48/apps/gnome-devel.png share/icons/HighContrastLargePrint/48x48/apps/gnome-eog.png share/icons/HighContrastLargePrint/48x48/apps/gnome-folder-generic.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-folder.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ftp.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ghex.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ghostview.png @@ -350,19 +355,23 @@ share/icons/HighContrastLargePrint/48x48/apps/jDictionary.png share/icons/HighContrastLargePrint/48x48/apps/jDiskReport.png share/icons/HighContrastLargePrint/48x48/apps/jEdit.png share/icons/HighContrastLargePrint/48x48/apps/jGraphPad.png +share/icons/HighContrastLargePrint/48x48/apps/jSpiderIcon.png share/icons/HighContrastLargePrint/48x48/apps/jmplay.48.png share/icons/HighContrastLargePrint/48x48/apps/keyboard.png share/icons/HighContrastLargePrint/48x48/apps/launcher-program.png share/icons/HighContrastLargePrint/48x48/apps/logviewer.png share/icons/HighContrastLargePrint/48x48/apps/media-player-48.png share/icons/HighContrastLargePrint/48x48/apps/mozilla-icon.png +share/icons/HighContrastLargePrint/48x48/apps/nb48x48.png share/icons/HighContrastLargePrint/48x48/apps/network-config.png share/icons/HighContrastLargePrint/48x48/apps/network.png share/icons/HighContrastLargePrint/48x48/apps/password.png share/icons/HighContrastLargePrint/48x48/apps/perfmeter.png share/icons/HighContrastLargePrint/48x48/apps/postscript-viewer.png share/icons/HighContrastLargePrint/48x48/apps/procman.png +share/icons/HighContrastLargePrint/48x48/apps/realplay.png share/icons/HighContrastLargePrint/48x48/apps/realplayer.xpm +share/icons/HighContrastLargePrint/48x48/apps/rp7.xpm share/icons/HighContrastLargePrint/48x48/apps/screensaver.png share/icons/HighContrastLargePrint/48x48/apps/serviceconf.png share/icons/HighContrastLargePrint/48x48/apps/sound-capplet.png @@ -597,10 +606,11 @@ share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-x-font.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-package.png share/icons/HighContrastLargePrint/index.theme +share/icons/HighContrastLargePrintInverse/48x48/apps/JUSimageIcon.png share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-directory.png share/icons/HighContrastLargePrintInverse/48x48/apps/acme-48.png -share/icons/HighContrastLargePrintInverse/48x48/apps/administration.png share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png +share/icons/HighContrastLargePrintInverse/48x48/apps/administration.png share/icons/HighContrastLargePrintInverse/48x48/apps/ax-applet.png share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png share/icons/HighContrastLargePrintInverse/48x48/apps/config-language.png @@ -612,6 +622,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/evolution-1.4.png share/icons/HighContrastLargePrintInverse/48x48/apps/evolution.png share/icons/HighContrastLargePrintInverse/48x48/apps/file-manager.png share/icons/HighContrastLargePrintInverse/48x48/apps/file-roller.png +share/icons/HighContrastLargePrintInverse/48x48/apps/fsexam-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gaim.png share/icons/HighContrastLargePrintInverse/48x48/apps/gataxx.png share/icons/HighContrastLargePrintInverse/48x48/apps/gcalctool.png @@ -624,8 +635,8 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/glade-2.png share/icons/HighContrastLargePrintInverse/48x48/apps/glines.png share/icons/HighContrastLargePrintInverse/48x48/apps/glow.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnect-icon.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-application-generic.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-application-generic.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-audio2.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-blackjack.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calc3.png @@ -639,6 +650,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-desktop-config.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-devel.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-eog.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-folder-generic.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-folder.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ftp.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ghex.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ghostview.png @@ -707,19 +719,23 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/jDictionary.png share/icons/HighContrastLargePrintInverse/48x48/apps/jDiskReport.png share/icons/HighContrastLargePrintInverse/48x48/apps/jEdit.png share/icons/HighContrastLargePrintInverse/48x48/apps/jGraphPad.png +share/icons/HighContrastLargePrintInverse/48x48/apps/jSpiderIcon.png share/icons/HighContrastLargePrintInverse/48x48/apps/jmplay.48.png share/icons/HighContrastLargePrintInverse/48x48/apps/keyboard.png share/icons/HighContrastLargePrintInverse/48x48/apps/launcher-program.png share/icons/HighContrastLargePrintInverse/48x48/apps/logviewer.png share/icons/HighContrastLargePrintInverse/48x48/apps/media-player-48.png share/icons/HighContrastLargePrintInverse/48x48/apps/mozilla-icon.png +share/icons/HighContrastLargePrintInverse/48x48/apps/nb48x48.png share/icons/HighContrastLargePrintInverse/48x48/apps/network-config.png share/icons/HighContrastLargePrintInverse/48x48/apps/network.png share/icons/HighContrastLargePrintInverse/48x48/apps/password.png share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png share/icons/HighContrastLargePrintInverse/48x48/apps/postscript-viewer.png share/icons/HighContrastLargePrintInverse/48x48/apps/procman.png +share/icons/HighContrastLargePrintInverse/48x48/apps/realplay.png share/icons/HighContrastLargePrintInverse/48x48/apps/realplayer.xpm +share/icons/HighContrastLargePrintInverse/48x48/apps/rp7.xpm share/icons/HighContrastLargePrintInverse/48x48/apps/screensaver.png share/icons/HighContrastLargePrintInverse/48x48/apps/serviceconf.png share/icons/HighContrastLargePrintInverse/48x48/apps/sound-capplet.png @@ -1242,6 +1258,7 @@ share/locale/az/LC_MESSAGES/gnome-themes.mo share/locale/be/LC_MESSAGES/gnome-themes.mo share/locale/bg/LC_MESSAGES/gnome-themes.mo share/locale/bn/LC_MESSAGES/gnome-themes.mo +share/locale/bs/LC_MESSAGES/gnome-themes.mo share/locale/ca/LC_MESSAGES/gnome-themes.mo share/locale/cs/LC_MESSAGES/gnome-themes.mo share/locale/cy/LC_MESSAGES/gnome-themes.mo @@ -1274,6 +1291,7 @@ share/locale/mk/LC_MESSAGES/gnome-themes.mo share/locale/ml/LC_MESSAGES/gnome-themes.mo share/locale/mn/LC_MESSAGES/gnome-themes.mo share/locale/ms/LC_MESSAGES/gnome-themes.mo +share/locale/nb/LC_MESSAGES/gnome-themes.mo share/locale/nl/LC_MESSAGES/gnome-themes.mo share/locale/nn/LC_MESSAGES/gnome-themes.mo share/locale/no/LC_MESSAGES/gnome-themes.mo @@ -1289,6 +1307,7 @@ share/locale/sq/LC_MESSAGES/gnome-themes.mo share/locale/sr/LC_MESSAGES/gnome-themes.mo share/locale/sr@Latn/LC_MESSAGES/gnome-themes.mo share/locale/sv/LC_MESSAGES/gnome-themes.mo +share/locale/ta/LC_MESSAGES/gnome-themes.mo share/locale/th/LC_MESSAGES/gnome-themes.mo share/locale/tr/LC_MESSAGES/gnome-themes.mo share/locale/uk/LC_MESSAGES/gnome-themes.mo @@ -1298,6 +1317,21 @@ share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo share/themes/Crux/gtk-2.0/gtkrc share/themes/Crux/index.theme +share/themes/Glider/gtk-2.0/gtkrc +share/themes/Glider/gtk-2.0/iconrc +share/themes/Glider/gtk-2.0/stock_apply.png +share/themes/Glider/gtk-2.0/stock_bottom.png +share/themes/Glider/gtk-2.0/stock_cancel.png +share/themes/Glider/gtk-2.0/stock_down.png +share/themes/Glider/gtk-2.0/stock_first.png +share/themes/Glider/gtk-2.0/stock_last.png +share/themes/Glider/gtk-2.0/stock_left.png +share/themes/Glider/gtk-2.0/stock_ok.png +share/themes/Glider/gtk-2.0/stock_refresh.png +share/themes/Glider/gtk-2.0/stock_right.png +share/themes/Glider/gtk-2.0/stock_top.png +share/themes/Glider/gtk-2.0/stock_up.png +share/themes/Glider/index.theme share/themes/Grand-Canyon/gtk-2.0/3d_all_flat.png share/themes/Grand-Canyon/gtk-2.0/3d_all_normal.png share/themes/Grand-Canyon/gtk-2.0/3d_all_prelight.png @@ -1952,6 +1986,8 @@ share/themes/Traditional/index.theme @dirrm share/themes/HighContrast @dirrm share/themes/Grand-Canyon/gtk-2.0 @dirrm share/themes/Grand-Canyon +@dirrm share/themes/Glider/gtk-2.0 +@dirrm share/themes/Glider @dirrm share/themes/Crux/gtk-2.0 @dirrm share/themes/Crux @dirrm share/icons/Smokey-Red/48x48/filesystems @@ -2051,5 +2087,7 @@ share/themes/Traditional/index.theme @dirrm share/gnome/themes/Sandwish @dirrm share/gnome/themes/Mist/metacity-1 @dirrm share/gnome/themes/Mist +@dirrm share/gnome/themes/Glider/metacity-1 +@dirrm share/gnome/themes/Glider @dirrm share/eazel-engine @unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile index a25f54ae4411..c7bf6b51cb1c 100644 --- a/x11-toolkits/eel2/Makefile +++ b/x11-toolkits/eel2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= eel2 -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.2 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 DISTNAME= eel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,11 +20,15 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gail libgnomeui -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +post-patch: + @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ + ${WRKSRC}/eel/eel-open-with-dialog.c + .include <bsd.port.mk> diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo index 7c46305705c9..43f56ccf9a21 100644 --- a/x11-toolkits/eel2/distinfo +++ b/x11-toolkits/eel2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eel-2.6.2.tar.bz2) = a0350d241c01afc184d0e24521e4e3f9 -SIZE (gnome2/eel-2.6.2.tar.bz2) = 556016 +MD5 (gnome2/eel-2.8.2.tar.bz2) = 4d0beb2f0ad4c304b49c06b08d0a03e5 +SIZE (gnome2/eel-2.8.2.tar.bz2) = 620939 diff --git a/x11-toolkits/eel2/files/patch-configure b/x11-toolkits/eel2/files/patch-configure deleted file mode 100644 index 445a53ad1899..000000000000 --- a/x11-toolkits/eel2/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure 2002/04/25 19:15:15 1.1 -+++ configure 2002/04/25 19:17:28 -@@ -5331,6 +5331,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 --git a/x11-toolkits/eel2/files/patch-eel_eel-open-with-dialog.c b/x11-toolkits/eel2/files/patch-eel_eel-open-with-dialog.c new file mode 100644 index 000000000000..9512a2703290 --- /dev/null +++ b/x11-toolkits/eel2/files/patch-eel_eel-open-with-dialog.c @@ -0,0 +1,11 @@ +--- eel/eel-open-with-dialog.c.orig Mon Oct 4 00:30:27 2004 ++++ eel/eel-open-with-dialog.c Mon Oct 4 00:30:40 2004 +@@ -380,7 +380,7 @@ + gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), + FALSE); + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), +- "/usr/bin"); ++ "%%X11BASE%%/bin"); + + gtk_widget_show (chooser); + } diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist index 5b3be8cfd34b..6af5ffaa2fa3 100644 --- a/x11-toolkits/eel2/pkg-plist +++ b/x11-toolkits/eel2/pkg-plist @@ -28,6 +28,9 @@ include/eel-2/eel/eel-i18n.h include/eel-2/eel/eel-image-table.h include/eel-2/eel/eel-labeled-image.h include/eel-2/eel/eel-marshal.h +include/eel-2/eel/eel-mime-application-chooser.h +include/eel-2/eel/eel-mime-extensions.h +include/eel-2/eel/eel-open-with-dialog.h include/eel-2/eel/eel-pango-extensions.h include/eel-2/eel/eel-preferences-glade.h include/eel-2/eel/eel-preferences.h @@ -43,9 +46,10 @@ include/eel-2/eel/eel-xml-extensions.h include/eel-2/eel/eel.h lib/libeel-2.a lib/libeel-2.so -lib/libeel-2.so.8 +lib/libeel-2.so.10 libdata/pkgconfig/eel-2.0.pc share/locale/am/LC_MESSAGES/eel-2.0.mo +share/locale/ang/LC_MESSAGES/eel-2.0.mo share/locale/ar/LC_MESSAGES/eel-2.0.mo share/locale/az/LC_MESSAGES/eel-2.0.mo share/locale/be/LC_MESSAGES/eel-2.0.mo @@ -78,8 +82,8 @@ share/locale/id/LC_MESSAGES/eel-2.0.mo share/locale/is/LC_MESSAGES/eel-2.0.mo share/locale/it/LC_MESSAGES/eel-2.0.mo share/locale/ja/LC_MESSAGES/eel-2.0.mo -share/locale/ko/LC_MESSAGES/eel-2.0.mo share/locale/kn/LC_MESSAGES/eel-2.0.mo +share/locale/ko/LC_MESSAGES/eel-2.0.mo share/locale/li/LC_MESSAGES/eel-2.0.mo share/locale/lt/LC_MESSAGES/eel-2.0.mo share/locale/lv/LC_MESSAGES/eel-2.0.mo @@ -88,10 +92,12 @@ share/locale/ml/LC_MESSAGES/eel-2.0.mo share/locale/mn/LC_MESSAGES/eel-2.0.mo share/locale/mr/LC_MESSAGES/eel-2.0.mo share/locale/ms/LC_MESSAGES/eel-2.0.mo +share/locale/nb/LC_MESSAGES/eel-2.0.mo share/locale/ne/LC_MESSAGES/eel-2.0.mo share/locale/nl/LC_MESSAGES/eel-2.0.mo share/locale/nn/LC_MESSAGES/eel-2.0.mo share/locale/no/LC_MESSAGES/eel-2.0.mo +share/locale/or/LC_MESSAGES/eel-2.0.mo share/locale/pa/LC_MESSAGES/eel-2.0.mo share/locale/pl/LC_MESSAGES/eel-2.0.mo share/locale/pt/LC_MESSAGES/eel-2.0.mo diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 4f9566ed128c..002555dc9cd4 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gal2 -PORTVERSION= 1.99.11 -PORTREVISION= 1 +PORTVERSION= 2.2.3 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.99 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,14 +20,14 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix gnomehier libgnomeui libgnomeprintui -GNOME_HTML_DIR= ${PREFIX}/share/doc/gal2 +USE_GNOME= gnomehack gnomeprefix gnomehier intlhack \ + libgnomeui libgnomeprintui INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --enable-static --with-libiconv CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION=${PORTVERSION} +PLIST_SUB= VERSION="2.2" PORTVERSION=${PORTVERSION} .include <bsd.port.mk> diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo index 1d9b453a115f..5730f3c4acc7 100644 --- a/x11-toolkits/gal2/distinfo +++ b/x11-toolkits/gal2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gal-1.99.11.tar.bz2) = 906c0640d3160a55aac98974aecfb316 -SIZE (gnome2/gal-1.99.11.tar.bz2) = 949395 +MD5 (gnome2/gal-2.2.3.tar.bz2) = a50985fd1b70dc05cfc921455c39e660 +SIZE (gnome2/gal-2.2.3.tar.bz2) = 1161166 diff --git a/x11-toolkits/gal2/files/patch-ab b/x11-toolkits/gal2/files/patch-ab index 1e3cce24db3c..53fe2cc71565 100644 --- a/x11-toolkits/gal2/files/patch-ab +++ b/x11-toolkits/gal2/files/patch-ab @@ -1,11 +1,11 @@ ---- Makefile.in.orig Fri Mar 12 01:22:39 2004 -+++ Makefile.in Fri Mar 12 01:22:55 2004 -@@ -129,7 +129,7 @@ - YACC = @YACC@ +--- Makefile.in.orig Fri Jun 4 17:24:13 2004 ++++ Makefile.in Fri Jun 4 17:25:02 2004 +@@ -145,7 +145,7 @@ + am__quote = @am__quote@ gnomelocaledir = @gnomelocaledir@ - + install_sh = @install_sh@ -SUBDIRS = po gal tests docs art +SUBDIRS = po gal docs art pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = gal-2.0.pc + pkgconfig_DATA = gal-2.2.pc diff --git a/x11-toolkits/gal2/files/patch-configure b/x11-toolkits/gal2/files/patch-configure deleted file mode 100644 index 97aea5b88117..000000000000 --- a/x11-toolkits/gal2/files/patch-configure +++ /dev/null @@ -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 --git a/x11-toolkits/gal2/files/patch-po_da.po b/x11-toolkits/gal2/files/patch-po_da.po index 0baf35467230..bcd97ad6fff8 100644 --- a/x11-toolkits/gal2/files/patch-po_da.po +++ b/x11-toolkits/gal2/files/patch-po_da.po @@ -1,5 +1,5 @@ ---- po/da.po.orig Sat Dec 27 20:57:22 2003 -+++ po/da.po Sat Dec 27 20:57:29 2003 +--- po/da.po.orig Sat Dec 27 21:03:49 2003 ++++ po/da.po Sat Dec 27 21:04:00 2003 @@ -46,11 +46,11 @@ #: gal/e-table/e-cell-date.c:96 diff --git a/x11-toolkits/gal2/files/patch-po_zh_CN.po b/x11-toolkits/gal2/files/patch-po_zh_CN.po index 7d52a30f8c8a..b3072e58b078 100644 --- a/x11-toolkits/gal2/files/patch-po_zh_CN.po +++ b/x11-toolkits/gal2/files/patch-po_zh_CN.po @@ -1,34 +1,10 @@ ---- po/zh_CN.po.orig Sat Dec 27 20:58:11 2003 -+++ po/zh_CN.po Sat Dec 27 20:58:38 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 Fri Mar 5 12:17:59 2004 ++++ po/zh_CN.po Sat Mar 6 03:08:34 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 --git a/x11-toolkits/gal2/pkg-descr b/x11-toolkits/gal2/pkg-descr index e2bbdf422ba7..edb487657c30 100644 --- a/x11-toolkits/gal2/pkg-descr +++ b/x11-toolkits/gal2/pkg-descr @@ -1,8 +1,4 @@ GAL is a collection of widgets and utility routines that were taken from Evolution and Gnumeric. -The API is not frozen and might change at any time. Larger class -renaming might happen at any point without notice. Use this library -at your own risk. - WWW: http://www.gnome.org/ diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist index b0d9373544eb..ff1d616bfb3c 100644 --- a/x11-toolkits/gal2/pkg-plist +++ b/x11-toolkits/gal2/pkg-plist @@ -1,208 +1,230 @@ -include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell-registry.h -include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell-text.h -include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell.h -include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table-factory.h -include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table-item.h -include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table.h -include/gal-2.0/gal/a11y/e-text/gal-a11y-e-text-factory.h -include/gal-2.0/gal/a11y/e-text/gal-a11y-e-text.h -include/gal-2.0/gal/a11y/gal-a11y-factory.h -include/gal-2.0/gal/a11y/gal-a11y-util.h -include/gal-2.0/gal/e-table/e-cell-checkbox.h -include/gal-2.0/gal/e-table/e-cell-combo.h -include/gal-2.0/gal/e-table/e-cell-date.h -include/gal-2.0/gal/e-table/e-cell-float.h -include/gal-2.0/gal/e-table/e-cell-number.h -include/gal-2.0/gal/e-table/e-cell-pixbuf.h -include/gal-2.0/gal/e-table/e-cell-popup.h -include/gal-2.0/gal/e-table/e-cell-progress.h -include/gal-2.0/gal/e-table/e-cell-size.h -include/gal-2.0/gal/e-table/e-cell-spin-button.h -include/gal-2.0/gal/e-table/e-cell-text.h -include/gal-2.0/gal/e-table/e-cell-toggle.h -include/gal-2.0/gal/e-table/e-cell-tree.h -include/gal-2.0/gal/e-table/e-cell-vbox.h -include/gal-2.0/gal/e-table/e-cell.h -include/gal-2.0/gal/e-table/e-table-click-to-add.h -include/gal-2.0/gal/e-table/e-table-col-dnd.h -include/gal-2.0/gal/e-table/e-table-col.h -include/gal-2.0/gal/e-table/e-table-column-specification.h -include/gal-2.0/gal/e-table/e-table-config.h -include/gal-2.0/gal/e-table/e-table-defines.h -include/gal-2.0/gal/e-table/e-table-extras.h -include/gal-2.0/gal/e-table/e-table-field-chooser-dialog.h -include/gal-2.0/gal/e-table/e-table-field-chooser-item.h -include/gal-2.0/gal/e-table/e-table-field-chooser.h -include/gal-2.0/gal/e-table/e-table-group-container.h -include/gal-2.0/gal/e-table/e-table-group-leaf.h -include/gal-2.0/gal/e-table/e-table-group.h -include/gal-2.0/gal/e-table/e-table-header-item.h -include/gal-2.0/gal/e-table/e-table-header-utils.h -include/gal-2.0/gal/e-table/e-table-header.h -include/gal-2.0/gal/e-table/e-table-item.h -include/gal-2.0/gal/e-table/e-table-memory-callbacks.h -include/gal-2.0/gal/e-table/e-table-memory-store.h -include/gal-2.0/gal/e-table/e-table-memory.h -include/gal-2.0/gal/e-table/e-table-model.h -include/gal-2.0/gal/e-table/e-table-one.h -include/gal-2.0/gal/e-table/e-table-scrolled.h -include/gal-2.0/gal/e-table/e-table-search.h -include/gal-2.0/gal/e-table/e-table-selection-model.h -include/gal-2.0/gal/e-table/e-table-simple.h -include/gal-2.0/gal/e-table/e-table-sort-info.h -include/gal-2.0/gal/e-table/e-table-sorted-variable.h -include/gal-2.0/gal/e-table/e-table-sorted.h -include/gal-2.0/gal/e-table/e-table-sorter.h -include/gal-2.0/gal/e-table/e-table-sorting-utils.h -include/gal-2.0/gal/e-table/e-table-specification.h -include/gal-2.0/gal/e-table/e-table-state.h -include/gal-2.0/gal/e-table/e-table-subset-variable.h -include/gal-2.0/gal/e-table/e-table-subset.h -include/gal-2.0/gal/e-table/e-table-tooltip.h -include/gal-2.0/gal/e-table/e-table-utils.h -include/gal-2.0/gal/e-table/e-table-without.h -include/gal-2.0/gal/e-table/e-table.h -include/gal-2.0/gal/e-table/e-tree-memory-callbacks.h -include/gal-2.0/gal/e-table/e-tree-memory.h -include/gal-2.0/gal/e-table/e-tree-model.h -include/gal-2.0/gal/e-table/e-tree-scrolled.h -include/gal-2.0/gal/e-table/e-tree-selection-model.h -include/gal-2.0/gal/e-table/e-tree-sorted.h -include/gal-2.0/gal/e-table/e-tree-table-adapter.h -include/gal-2.0/gal/e-table/e-tree.h -include/gal-2.0/gal/e-text/e-completion-callbacks.h -include/gal-2.0/gal/e-text/e-completion-match.h -include/gal-2.0/gal/e-text/e-completion-view.h -include/gal-2.0/gal/e-text/e-completion.h -include/gal-2.0/gal/e-text/e-entry.h -include/gal-2.0/gal/e-text/e-table-text-model.h -include/gal-2.0/gal/e-text/e-text-model-repos.h -include/gal-2.0/gal/e-text/e-text-model-uri.h -include/gal-2.0/gal/e-text/e-text-model.h -include/gal-2.0/gal/e-text/e-text.h -include/gal-2.0/gal/menus/gal-define-views-dialog.h -include/gal-2.0/gal/menus/gal-define-views-model.h -include/gal-2.0/gal/menus/gal-view-collection.h -include/gal-2.0/gal/menus/gal-view-etable.h -include/gal-2.0/gal/menus/gal-view-factory-etable.h -include/gal-2.0/gal/menus/gal-view-factory.h -include/gal-2.0/gal/menus/gal-view-instance-save-as-dialog.h -include/gal-2.0/gal/menus/gal-view-instance.h -include/gal-2.0/gal/menus/gal-view-new-dialog.h -include/gal-2.0/gal/menus/gal-view.h -include/gal-2.0/gal/shortcut-bar/e-group-bar.h -include/gal-2.0/gal/shortcut-bar/e-icon-bar-bg-item.h -include/gal-2.0/gal/shortcut-bar/e-icon-bar.h -include/gal-2.0/gal/shortcut-bar/e-shortcut-bar.h -include/gal-2.0/gal/shortcut-bar/e-shortcut-model.h -include/gal-2.0/gal/shortcut-bar/e-vscrolled-bar.h -include/gal-2.0/gal/util/e-bit-array.h -include/gal-2.0/gal/util/e-cache.h -include/gal-2.0/gal/util/e-iconv.h -include/gal-2.0/gal/util/e-marshal.h -include/gal-2.0/gal/util/e-sorter-array.h -include/gal-2.0/gal/util/e-sorter.h -include/gal-2.0/gal/util/e-text-event-processor-emacs-like.h -include/gal-2.0/gal/util/e-text-event-processor-types.h -include/gal-2.0/gal/util/e-text-event-processor.h -include/gal-2.0/gal/util/e-util.h -include/gal-2.0/gal/util/e-xml-utils.h -include/gal-2.0/gal/widgets/color-group.h -include/gal-2.0/gal/widgets/color-palette.h -include/gal-2.0/gal/widgets/e-canvas-background.h -include/gal-2.0/gal/widgets/e-canvas-utils.h -include/gal-2.0/gal/widgets/e-canvas-vbox.h -include/gal-2.0/gal/widgets/e-canvas.h -include/gal-2.0/gal/widgets/e-categories-master-list-array.h -include/gal-2.0/gal/widgets/e-categories-master-list-combo.h -include/gal-2.0/gal/widgets/e-categories-master-list-dialog-model.h -include/gal-2.0/gal/widgets/e-categories-master-list-dialog.h -include/gal-2.0/gal/widgets/e-categories-master-list-option-menu.h -include/gal-2.0/gal/widgets/e-categories-master-list.h -include/gal-2.0/gal/widgets/e-categories.h -include/gal-2.0/gal/widgets/e-colors.h -include/gal-2.0/gal/widgets/e-cursors.h -include/gal-2.0/gal/widgets/e-file-selection.h -include/gal-2.0/gal/widgets/e-gui-utils.h -include/gal-2.0/gal/widgets/e-hsv-utils.h -include/gal-2.0/gal/widgets/e-option-menu.h -include/gal-2.0/gal/widgets/e-popup-menu.h -include/gal-2.0/gal/widgets/e-printable.h -include/gal-2.0/gal/widgets/e-reflow-model.h -include/gal-2.0/gal/widgets/e-reflow.h -include/gal-2.0/gal/widgets/e-selection-model-array.h -include/gal-2.0/gal/widgets/e-selection-model-simple.h -include/gal-2.0/gal/widgets/e-selection-model.h -include/gal-2.0/gal/widgets/e-unicode.h -include/gal-2.0/gal/widgets/gal-combo-box.h -include/gal-2.0/gal/widgets/gal-combo-stack.h -include/gal-2.0/gal/widgets/gal-combo-text.h -include/gal-2.0/gal/widgets/widget-color-combo.h -include/gal-2.0/gal/widgets/widget-pixmap-combo.h -lib/libgal-2.0.a -lib/libgal-2.0.so -lib/libgal-2.0.so.6 -lib/libgal-a11y-2.0.a -lib/libgal-a11y-2.0.so -lib/libgal-a11y-2.0.so.6 -libdata/pkgconfig/gal-2.0.pc -share/doc/gal2/gal-api.html -share/doc/gal2/gal-api.sgml -share/doc/gal2/gal-decl.txt -share/doc/gal2/gal-sections.txt -share/doc/gal2/gal.hierarchy -share/doc/gal2/gal.signals -share/doc/gal2/gal.types -share/gnome/gal-2.0/%%VERSION%%/glade/e-categories-master-list-dialog.glade -share/gnome/gal-2.0/%%VERSION%%/glade/e-table-config-no-group.glade -share/gnome/gal-2.0/%%VERSION%%/glade/e-table-config.glade -share/gnome/gal-2.0/%%VERSION%%/glade/e-table-field-chooser.glade -share/gnome/gal-2.0/%%VERSION%%/glade/gal-categories.glade -share/gnome/gal-2.0/%%VERSION%%/glade/gal-define-views.glade -share/gnome/gal-2.0/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade -share/gnome/gal-2.0/%%VERSION%%/glade/gal-view-new-dialog.glade -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_birthday_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_business_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_favorites_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_gifts_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_goals_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_holiday_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_ideas_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_international_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_key-customer_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_personal_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_status_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_strategies_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_suppliers_16.png -share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-popup.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-registry.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-text.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-toggle.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-tree.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-factory.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-item-factory.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-item.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-tree-factory.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-tree.h +include/gal-%%VERSION%%/gal/a11y/e-text/gal-a11y-e-text-factory.h +include/gal-%%VERSION%%/gal/a11y/e-text/gal-a11y-e-text.h +include/gal-%%VERSION%%/gal/a11y/gal-a11y-factory.h +include/gal-%%VERSION%%/gal/a11y/gal-a11y-util.h +include/gal-%%VERSION%%/gal/e-table/e-cell-checkbox.h +include/gal-%%VERSION%%/gal/e-table/e-cell-combo.h +include/gal-%%VERSION%%/gal/e-table/e-cell-date.h +include/gal-%%VERSION%%/gal/e-table/e-cell-float.h +include/gal-%%VERSION%%/gal/e-table/e-cell-number.h +include/gal-%%VERSION%%/gal/e-table/e-cell-pixbuf.h +include/gal-%%VERSION%%/gal/e-table/e-cell-popup.h +include/gal-%%VERSION%%/gal/e-table/e-cell-progress.h +include/gal-%%VERSION%%/gal/e-table/e-cell-size.h +include/gal-%%VERSION%%/gal/e-table/e-cell-spin-button.h +include/gal-%%VERSION%%/gal/e-table/e-cell-text.h +include/gal-%%VERSION%%/gal/e-table/e-cell-toggle.h +include/gal-%%VERSION%%/gal/e-table/e-cell-tree.h +include/gal-%%VERSION%%/gal/e-table/e-cell-vbox.h +include/gal-%%VERSION%%/gal/e-table/e-cell.h +include/gal-%%VERSION%%/gal/e-table/e-table-click-to-add.h +include/gal-%%VERSION%%/gal/e-table/e-table-col-dnd.h +include/gal-%%VERSION%%/gal/e-table/e-table-col.h +include/gal-%%VERSION%%/gal/e-table/e-table-column-specification.h +include/gal-%%VERSION%%/gal/e-table/e-table-config.h +include/gal-%%VERSION%%/gal/e-table/e-table-defines.h +include/gal-%%VERSION%%/gal/e-table/e-table-extras.h +include/gal-%%VERSION%%/gal/e-table/e-table-field-chooser-dialog.h +include/gal-%%VERSION%%/gal/e-table/e-table-field-chooser-item.h +include/gal-%%VERSION%%/gal/e-table/e-table-field-chooser.h +include/gal-%%VERSION%%/gal/e-table/e-table-group-container.h +include/gal-%%VERSION%%/gal/e-table/e-table-group-leaf.h +include/gal-%%VERSION%%/gal/e-table/e-table-group.h +include/gal-%%VERSION%%/gal/e-table/e-table-header-item.h +include/gal-%%VERSION%%/gal/e-table/e-table-header-utils.h +include/gal-%%VERSION%%/gal/e-table/e-table-header.h +include/gal-%%VERSION%%/gal/e-table/e-table-item.h +include/gal-%%VERSION%%/gal/e-table/e-table-memory-callbacks.h +include/gal-%%VERSION%%/gal/e-table/e-table-memory-store.h +include/gal-%%VERSION%%/gal/e-table/e-table-memory.h +include/gal-%%VERSION%%/gal/e-table/e-table-model.h +include/gal-%%VERSION%%/gal/e-table/e-table-one.h +include/gal-%%VERSION%%/gal/e-table/e-table-scrolled.h +include/gal-%%VERSION%%/gal/e-table/e-table-search.h +include/gal-%%VERSION%%/gal/e-table/e-table-selection-model.h +include/gal-%%VERSION%%/gal/e-table/e-table-simple.h +include/gal-%%VERSION%%/gal/e-table/e-table-sort-info.h +include/gal-%%VERSION%%/gal/e-table/e-table-sorted-variable.h +include/gal-%%VERSION%%/gal/e-table/e-table-sorted.h +include/gal-%%VERSION%%/gal/e-table/e-table-sorter.h +include/gal-%%VERSION%%/gal/e-table/e-table-sorting-utils.h +include/gal-%%VERSION%%/gal/e-table/e-table-specification.h +include/gal-%%VERSION%%/gal/e-table/e-table-state.h +include/gal-%%VERSION%%/gal/e-table/e-table-subset-variable.h +include/gal-%%VERSION%%/gal/e-table/e-table-subset.h +include/gal-%%VERSION%%/gal/e-table/e-table-tooltip.h +include/gal-%%VERSION%%/gal/e-table/e-table-utils.h +include/gal-%%VERSION%%/gal/e-table/e-table-without.h +include/gal-%%VERSION%%/gal/e-table/e-table.h +include/gal-%%VERSION%%/gal/e-table/e-tree-memory-callbacks.h +include/gal-%%VERSION%%/gal/e-table/e-tree-memory.h +include/gal-%%VERSION%%/gal/e-table/e-tree-model.h +include/gal-%%VERSION%%/gal/e-table/e-tree-scrolled.h +include/gal-%%VERSION%%/gal/e-table/e-tree-selection-model.h +include/gal-%%VERSION%%/gal/e-table/e-tree-sorted.h +include/gal-%%VERSION%%/gal/e-table/e-tree-table-adapter.h +include/gal-%%VERSION%%/gal/e-table/e-tree.h +include/gal-%%VERSION%%/gal/e-text/e-completion-callbacks.h +include/gal-%%VERSION%%/gal/e-text/e-completion-match.h +include/gal-%%VERSION%%/gal/e-text/e-completion-view.h +include/gal-%%VERSION%%/gal/e-text/e-completion.h +include/gal-%%VERSION%%/gal/e-text/e-entry.h +include/gal-%%VERSION%%/gal/e-text/e-table-text-model.h +include/gal-%%VERSION%%/gal/e-text/e-text-model-repos.h +include/gal-%%VERSION%%/gal/e-text/e-text-model-uri.h +include/gal-%%VERSION%%/gal/e-text/e-text-model.h +include/gal-%%VERSION%%/gal/e-text/e-text.h +include/gal-%%VERSION%%/gal/menus/gal-define-views-dialog.h +include/gal-%%VERSION%%/gal/menus/gal-define-views-model.h +include/gal-%%VERSION%%/gal/menus/gal-view-collection.h +include/gal-%%VERSION%%/gal/menus/gal-view-etable.h +include/gal-%%VERSION%%/gal/menus/gal-view-factory-etable.h +include/gal-%%VERSION%%/gal/menus/gal-view-factory.h +include/gal-%%VERSION%%/gal/menus/gal-view-instance-save-as-dialog.h +include/gal-%%VERSION%%/gal/menus/gal-view-instance.h +include/gal-%%VERSION%%/gal/menus/gal-view-new-dialog.h +include/gal-%%VERSION%%/gal/menus/gal-view.h +include/gal-%%VERSION%%/gal/shortcut-bar/e-group-bar.h +include/gal-%%VERSION%%/gal/shortcut-bar/e-icon-bar-bg-item.h +include/gal-%%VERSION%%/gal/shortcut-bar/e-icon-bar.h +include/gal-%%VERSION%%/gal/shortcut-bar/e-shortcut-bar.h +include/gal-%%VERSION%%/gal/shortcut-bar/e-shortcut-model.h +include/gal-%%VERSION%%/gal/shortcut-bar/e-vscrolled-bar.h +include/gal-%%VERSION%%/gal/util/e-bit-array.h +include/gal-%%VERSION%%/gal/util/e-cache.h +include/gal-%%VERSION%%/gal/util/e-iconv.h +include/gal-%%VERSION%%/gal/util/e-marshal.h +include/gal-%%VERSION%%/gal/util/e-sorter-array.h +include/gal-%%VERSION%%/gal/util/e-sorter.h +include/gal-%%VERSION%%/gal/util/e-text-event-processor-emacs-like.h +include/gal-%%VERSION%%/gal/util/e-text-event-processor-types.h +include/gal-%%VERSION%%/gal/util/e-text-event-processor.h +include/gal-%%VERSION%%/gal/util/e-util.h +include/gal-%%VERSION%%/gal/util/e-xml-utils.h +include/gal-%%VERSION%%/gal/widgets/color-group.h +include/gal-%%VERSION%%/gal/widgets/color-palette.h +include/gal-%%VERSION%%/gal/widgets/e-canvas-background.h +include/gal-%%VERSION%%/gal/widgets/e-canvas-utils.h +include/gal-%%VERSION%%/gal/widgets/e-canvas-vbox.h +include/gal-%%VERSION%%/gal/widgets/e-canvas.h +include/gal-%%VERSION%%/gal/widgets/e-categories-master-list-array.h +include/gal-%%VERSION%%/gal/widgets/e-categories-master-list-combo.h +include/gal-%%VERSION%%/gal/widgets/e-categories-master-list-dialog-model.h +include/gal-%%VERSION%%/gal/widgets/e-categories-master-list-dialog.h +include/gal-%%VERSION%%/gal/widgets/e-categories-master-list-option-menu.h +include/gal-%%VERSION%%/gal/widgets/e-categories-master-list.h +include/gal-%%VERSION%%/gal/widgets/e-categories.h +include/gal-%%VERSION%%/gal/widgets/e-colors.h +include/gal-%%VERSION%%/gal/widgets/e-cursors.h +include/gal-%%VERSION%%/gal/widgets/e-file-selection.h +include/gal-%%VERSION%%/gal/widgets/e-gui-utils.h +include/gal-%%VERSION%%/gal/widgets/e-hsv-utils.h +include/gal-%%VERSION%%/gal/widgets/e-option-menu.h +include/gal-%%VERSION%%/gal/widgets/e-popup-menu.h +include/gal-%%VERSION%%/gal/widgets/e-printable.h +include/gal-%%VERSION%%/gal/widgets/e-reflow-model.h +include/gal-%%VERSION%%/gal/widgets/e-reflow.h +include/gal-%%VERSION%%/gal/widgets/e-selection-model-array.h +include/gal-%%VERSION%%/gal/widgets/e-selection-model-simple.h +include/gal-%%VERSION%%/gal/widgets/e-selection-model.h +include/gal-%%VERSION%%/gal/widgets/e-unicode.h +include/gal-%%VERSION%%/gal/widgets/gal-combo-box.h +include/gal-%%VERSION%%/gal/widgets/gal-combo-stack.h +include/gal-%%VERSION%%/gal/widgets/gal-combo-text.h +include/gal-%%VERSION%%/gal/widgets/widget-color-combo.h +include/gal-%%VERSION%%/gal/widgets/widget-pixmap-combo.h +lib/libgal-%%VERSION%%.a +lib/libgal-%%VERSION%%.so +lib/libgal-%%VERSION%%.so.1 +lib/libgal-a11y-%%VERSION%%.a +lib/libgal-a11y-%%VERSION%%.so +lib/libgal-a11y-%%VERSION%%.so.1 +libdata/pkgconfig/gal-%%VERSION%%.pc +share/doc/gal-%%VERSION%%/gal-api.html +share/doc/gal-%%VERSION%%/gal-api.sgml +share/doc/gal-%%VERSION%%/gal-decl.txt +share/doc/gal-%%VERSION%%/gal-sections.txt +share/doc/gal-%%VERSION%%/gal.hierarchy +share/doc/gal-%%VERSION%%/gal.signals +share/doc/gal-%%VERSION%%/gal.types +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-categories-master-list-dialog.glade +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config-no-group.glade +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config.glade +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-field-chooser.glade +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-categories.glade +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-define-views.glade +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-instance-save-as-dialog.glade +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-new-dialog.glade +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_birthday_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_business_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_favorites_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_gifts_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_goals_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday-cards_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_hot-contacts_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_ideas_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_international_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_key-customer_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_miscellaneous_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_personal_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_phonecalls_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_status_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_strategies_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_suppliers_16.png +share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_time-and-expenses_16.png share/locale/am/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/ar/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/be/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/bs/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gal-%%VERSION%%.mo 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/et/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/eu/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/fi/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/ga/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/gu/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/hi/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/id/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/lv/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/mn/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/nn/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/no/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/pl/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/pt/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/pt_BR/LC_MESSAGES/gal-%%VERSION%%.mo @@ -210,30 +232,31 @@ share/locale/ro/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ru/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/sk/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/sl/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/sr@Latn/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ta/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/th/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/tr/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo -@dirrm share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories -@dirrm share/gnome/gal-2.0/%%VERSION%%/pixmaps -@dirrm share/gnome/gal-2.0/%%VERSION%%/glade -@dirrm share/gnome/gal-2.0/%%VERSION%% -@dirrm share/gnome/gal-2.0 -@dirrm share/doc/gal2/gal -@dirrm share/doc/gal2 -@dirrm include/gal-2.0/gal/widgets -@dirrm include/gal-2.0/gal/util -@dirrm include/gal-2.0/gal/shortcut-bar -@dirrm include/gal-2.0/gal/menus -@dirrm include/gal-2.0/gal/e-text -@dirrm include/gal-2.0/gal/e-table -@dirrm include/gal-2.0/gal/a11y/e-text -@dirrm include/gal-2.0/gal/a11y/e-table -@dirrm include/gal-2.0/gal/a11y -@dirrm include/gal-2.0/gal -@dirrm include/gal-2.0 +@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories +@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps +@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade +@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%% +@dirrm share/gnome/gal-%%VERSION%% +@dirrm share/doc/gal-%%VERSION%% +@dirrm include/gal-%%VERSION%%/gal/widgets +@dirrm include/gal-%%VERSION%%/gal/util +@dirrm include/gal-%%VERSION%%/gal/shortcut-bar +@dirrm include/gal-%%VERSION%%/gal/menus +@dirrm include/gal-%%VERSION%%/gal/e-text +@dirrm include/gal-%%VERSION%%/gal/e-table +@dirrm include/gal-%%VERSION%%/gal/a11y/e-text +@dirrm include/gal-%%VERSION%%/gal/a11y/e-table +@dirrm include/gal-%%VERSION%%/gal/a11y +@dirrm include/gal-%%VERSION%%/gal +@dirrm include/gal-%%VERSION%% diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 4e3133d15106..465abff4b3d0 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 2.4.9 -PORTREVISION= 1 +PORTVERSION= 2.4.13 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ \ diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 9e2073ed587f..fa4e781ce780 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gtk+-2.4.9.tar.bz2) = bfe3b960d334e81d8f91c3509f70868d -SIZE (gnome2/gtk+-2.4.9.tar.bz2) = 9599004 +MD5 (gnome2/gtk+-2.4.13.tar.bz2) = 3a438e1010704b11acaf060c9ba0fd7b +SIZE (gnome2/gtk+-2.4.13.tar.bz2) = 9272024 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 diff --git a/x11-toolkits/gtk20/files/patch-pixbuf-security b/x11-toolkits/gtk20/files/patch-pixbuf-security deleted file mode 100644 index 6ad822a6b420..000000000000 --- a/x11-toolkits/gtk20/files/patch-pixbuf-security +++ /dev/null @@ -1,100 +0,0 @@ -=================================================================== -RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-ico.c,v -retrieving revision 1.34 -retrieving revision 1.34.2.1 -diff -u -r1.34 -r1.34.2.1 ---- gdk-pixbuf/io-ico.c 2004/01/07 00:26:58 1.34 -+++ gdk-pixbuf/io-ico.c 2004/09/15 14:32:13 1.34.2.1 -@@ -323,6 +323,14 @@ - - State->HeaderSize+=I; - -+ if (State->HeaderSize < 0) { -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -+ _("Invalid header in icon")); -+ return; -+ } -+ - if (State->HeaderSize>State->BytesInHeaderBuf) { - guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize); - if (!tmp) { -=================================================================== -RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-xpm.c,v -retrieving revision 1.42 -retrieving revision 1.42.2.1 -diff -u -r1.42 -r1.42.2.1 ---- gdk-pixbuf/io-xpm.c 2003/03/08 20:48:58 1.42 -+++ gdk-pixbuf/io-xpm.c 2004/09/15 14:32:13 1.42.2.1 -@@ -1079,7 +1079,7 @@ - gint key = 0; - gint current_key = 1; - gint space = 128; -- gchar word[128], color[128], current_color[128]; -+ gchar word[129], color[129], current_color[129]; - gchar *r; - - word[0] = '\0'; -@@ -1121,8 +1121,8 @@ - return NULL; - /* accumulate color name */ - if (color[0] != '\0') { -- strcat (color, " "); -- space--; -+ strncat (color, " ", space); -+ space -= MIN (space, 1); - } - strncat (color, word, space); - space -= MIN (space, strlen (word)); -@@ -1246,27 +1246,43 @@ - return NULL; - - } -- if (n_col <= 0) { -+ if (cpp <= 0 || cpp >= 32) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -- _("XPM file has invalid number of colors")); -+ _("XPM has invalid number of chars per pixel")); - return NULL; -- - } -- if (cpp <= 0 || cpp >= 32) { -+ if (n_col <= 0 || n_col >= G_MAXINT / (cpp + 1)) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -- _("XPM has invalid number of chars per pixel")); -+ _("XPM file has invalid number of colors")); - return NULL; - } - - /* The hash is used for fast lookups of color from chars */ - color_hash = g_hash_table_new (g_str_hash, g_str_equal); - -- name_buf = g_new (gchar, n_col * (cpp + 1)); -- colors = g_new (XPMColor, n_col); -+ name_buf = g_try_malloc (n_col * (cpp + 1)); -+ if (!name_buf) { -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, -+ _("Cannot allocate memory for loading XPM image")); -+ g_hash_table_destroy (color_hash); -+ return NULL; -+ } -+ colors = (XPMColor *) g_try_malloc (sizeof (XPMColor) * n_col); -+ if (!colors) { -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, -+ _("Cannot allocate memory for loading XPM image")); -+ g_hash_table_destroy (color_hash); -+ g_free (name_buf); -+ return NULL; -+ } - - for (cnt = 0; cnt < n_col; cnt++) { - gchar *color_name; diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 3e19bed3759b..6f5709dc0b39 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -293,10 +293,14 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo share/locale/af/LC_MESSAGES/gtk20.mo share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo +share/locale/ang/LC_MESSAGES/gtk20-properties.mo +share/locale/ang/LC_MESSAGES/gtk20.mo share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo share/locale/az/LC_MESSAGES/gtk20.mo +share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo +share/locale/az_IR/LC_MESSAGES/gtk20.mo share/locale/be/LC_MESSAGES/gtk20-properties.mo share/locale/be/LC_MESSAGES/gtk20.mo share/locale/bg/LC_MESSAGES/gtk20-properties.mo diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 4e3133d15106..465abff4b3d0 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 2.4.9 -PORTREVISION= 1 +PORTVERSION= 2.4.13 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ \ diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 9e2073ed587f..fa4e781ce780 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gtk+-2.4.9.tar.bz2) = bfe3b960d334e81d8f91c3509f70868d -SIZE (gnome2/gtk+-2.4.9.tar.bz2) = 9599004 +MD5 (gnome2/gtk+-2.4.13.tar.bz2) = 3a438e1010704b11acaf060c9ba0fd7b +SIZE (gnome2/gtk+-2.4.13.tar.bz2) = 9272024 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 diff --git a/x11-toolkits/gtk30/files/patch-pixbuf-security b/x11-toolkits/gtk30/files/patch-pixbuf-security deleted file mode 100644 index 6ad822a6b420..000000000000 --- a/x11-toolkits/gtk30/files/patch-pixbuf-security +++ /dev/null @@ -1,100 +0,0 @@ -=================================================================== -RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-ico.c,v -retrieving revision 1.34 -retrieving revision 1.34.2.1 -diff -u -r1.34 -r1.34.2.1 ---- gdk-pixbuf/io-ico.c 2004/01/07 00:26:58 1.34 -+++ gdk-pixbuf/io-ico.c 2004/09/15 14:32:13 1.34.2.1 -@@ -323,6 +323,14 @@ - - State->HeaderSize+=I; - -+ if (State->HeaderSize < 0) { -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -+ _("Invalid header in icon")); -+ return; -+ } -+ - if (State->HeaderSize>State->BytesInHeaderBuf) { - guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize); - if (!tmp) { -=================================================================== -RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-xpm.c,v -retrieving revision 1.42 -retrieving revision 1.42.2.1 -diff -u -r1.42 -r1.42.2.1 ---- gdk-pixbuf/io-xpm.c 2003/03/08 20:48:58 1.42 -+++ gdk-pixbuf/io-xpm.c 2004/09/15 14:32:13 1.42.2.1 -@@ -1079,7 +1079,7 @@ - gint key = 0; - gint current_key = 1; - gint space = 128; -- gchar word[128], color[128], current_color[128]; -+ gchar word[129], color[129], current_color[129]; - gchar *r; - - word[0] = '\0'; -@@ -1121,8 +1121,8 @@ - return NULL; - /* accumulate color name */ - if (color[0] != '\0') { -- strcat (color, " "); -- space--; -+ strncat (color, " ", space); -+ space -= MIN (space, 1); - } - strncat (color, word, space); - space -= MIN (space, strlen (word)); -@@ -1246,27 +1246,43 @@ - return NULL; - - } -- if (n_col <= 0) { -+ if (cpp <= 0 || cpp >= 32) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -- _("XPM file has invalid number of colors")); -+ _("XPM has invalid number of chars per pixel")); - return NULL; -- - } -- if (cpp <= 0 || cpp >= 32) { -+ if (n_col <= 0 || n_col >= G_MAXINT / (cpp + 1)) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -- _("XPM has invalid number of chars per pixel")); -+ _("XPM file has invalid number of colors")); - return NULL; - } - - /* The hash is used for fast lookups of color from chars */ - color_hash = g_hash_table_new (g_str_hash, g_str_equal); - -- name_buf = g_new (gchar, n_col * (cpp + 1)); -- colors = g_new (XPMColor, n_col); -+ name_buf = g_try_malloc (n_col * (cpp + 1)); -+ if (!name_buf) { -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, -+ _("Cannot allocate memory for loading XPM image")); -+ g_hash_table_destroy (color_hash); -+ return NULL; -+ } -+ colors = (XPMColor *) g_try_malloc (sizeof (XPMColor) * n_col); -+ if (!colors) { -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, -+ _("Cannot allocate memory for loading XPM image")); -+ g_hash_table_destroy (color_hash); -+ g_free (name_buf); -+ return NULL; -+ } - - for (cnt = 0; cnt < n_col; cnt++) { - gchar *color_name; diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 3e19bed3759b..6f5709dc0b39 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -293,10 +293,14 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo share/locale/af/LC_MESSAGES/gtk20.mo share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo +share/locale/ang/LC_MESSAGES/gtk20-properties.mo +share/locale/ang/LC_MESSAGES/gtk20.mo share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo share/locale/az/LC_MESSAGES/gtk20.mo +share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo +share/locale/az_IR/LC_MESSAGES/gtk20.mo share/locale/be/LC_MESSAGES/gtk20-properties.mo share/locale/be/LC_MESSAGES/gtk20.mo share/locale/bg/LC_MESSAGES/gtk20-properties.mo diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index b807956224ff..11ebc9c9b6b4 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gtksourceview -PORTVERSION= 1.0.1 +PORTVERSION= 1.1.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,9 +18,9 @@ COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes -USE_GNOME= gnomeprefix gnomehack lthack libgnome libgnomeprintui +USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui CONFIGURE_ARGS= --enable-compile-warnings=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lgnuregex" diff --git a/x11-toolkits/gtksourceview/distinfo b/x11-toolkits/gtksourceview/distinfo index ff924b19c028..12c695f548e7 100644 --- a/x11-toolkits/gtksourceview/distinfo +++ b/x11-toolkits/gtksourceview/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtksourceview-1.0.1.tar.bz2) = dccdc61d7626f2d222605f25fee41997 -SIZE (gnome2/gtksourceview-1.0.1.tar.bz2) = 656525 +MD5 (gnome2/gtksourceview-1.1.1.tar.bz2) = 2e59c8748594181d4bf452320c8c3b5c +SIZE (gnome2/gtksourceview-1.1.1.tar.bz2) = 834424 diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist index abf2149ed033..7f6594d799c3 100644 --- a/x11-toolkits/gtksourceview/pkg-plist +++ b/x11-toolkits/gtksourceview/pkg-plist @@ -32,30 +32,42 @@ libdata/pkgconfig/gtksourceview-1.0.pc %%DOCSDIR%%/left.png %%DOCSDIR%%/right.png %%DOCSDIR%%/rn01.html +%%DOCSDIR%%/style.css %%DOCSDIR%%/up.png share/gnome/gtksourceview-1.0/language-specs/ada.lang share/gnome/gtksourceview-1.0/language-specs/c.lang share/gnome/gtksourceview-1.0/language-specs/cpp.lang share/gnome/gtksourceview-1.0/language-specs/csharp.lang +share/gnome/gtksourceview-1.0/language-specs/css.lang share/gnome/gtksourceview-1.0/language-specs/desktop.lang share/gnome/gtksourceview-1.0/language-specs/diff.lang +share/gnome/gtksourceview-1.0/language-specs/fortran.lang +share/gnome/gtksourceview-1.0/language-specs/haskell.lang share/gnome/gtksourceview-1.0/language-specs/html.lang share/gnome/gtksourceview-1.0/language-specs/idl.lang share/gnome/gtksourceview-1.0/language-specs/java.lang +share/gnome/gtksourceview-1.0/language-specs/javascript.lang share/gnome/gtksourceview-1.0/language-specs/language.dtd share/gnome/gtksourceview-1.0/language-specs/latex.lang +share/gnome/gtksourceview-1.0/language-specs/lua.lang share/gnome/gtksourceview-1.0/language-specs/msil.lang +share/gnome/gtksourceview-1.0/language-specs/pascal.lang share/gnome/gtksourceview-1.0/language-specs/perl.lang share/gnome/gtksourceview-1.0/language-specs/php.lang share/gnome/gtksourceview-1.0/language-specs/po.lang share/gnome/gtksourceview-1.0/language-specs/python.lang +share/gnome/gtksourceview-1.0/language-specs/ruby.lang share/gnome/gtksourceview-1.0/language-specs/sql.lang +share/gnome/gtksourceview-1.0/language-specs/texinfo.lang +share/gnome/gtksourceview-1.0/language-specs/vbnet.lang share/gnome/gtksourceview-1.0/language-specs/verilog.lang share/gnome/gtksourceview-1.0/language-specs/xml.lang share/locale/ar/LC_MESSAGES/gtksourceview-1.0.mo share/locale/az/LC_MESSAGES/gtksourceview-1.0.mo share/locale/be/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/bg/LC_MESSAGES/gtksourceview-1.0.mo share/locale/bn/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/bs/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ca/LC_MESSAGES/gtksourceview-1.0.mo share/locale/cs/LC_MESSAGES/gtksourceview-1.0.mo share/locale/cy/LC_MESSAGES/gtksourceview-1.0.mo @@ -85,6 +97,7 @@ share/locale/mk/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ml/LC_MESSAGES/gtksourceview-1.0.mo share/locale/mn/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ms/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/nb/LC_MESSAGES/gtksourceview-1.0.mo share/locale/nl/LC_MESSAGES/gtksourceview-1.0.mo share/locale/no/LC_MESSAGES/gtksourceview-1.0.mo share/locale/pa/LC_MESSAGES/gtksourceview-1.0.mo @@ -98,6 +111,7 @@ share/locale/sr/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sr@Latn/LC_MESSAGES/gtksourceview-1.0.mo share/locale/sv/LC_MESSAGES/gtksourceview-1.0.mo share/locale/ta/LC_MESSAGES/gtksourceview-1.0.mo +share/locale/th/LC_MESSAGES/gtksourceview-1.0.mo share/locale/tr/LC_MESSAGES/gtksourceview-1.0.mo share/locale/uk/LC_MESSAGES/gtksourceview-1.0.mo share/locale/vi/LC_MESSAGES/gtksourceview-1.0.mo diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 7e7f0dff66ac..a581ff4d5b11 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libbonoboui -PORTVERSION= 2.6.1 +PORTVERSION= 2.8.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo index 75f610ee8f44..b59d866f2845 100644 --- a/x11-toolkits/libbonoboui/distinfo +++ b/x11-toolkits/libbonoboui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libbonoboui-2.6.1.tar.bz2) = ee26630368b541dc101a65e46e67f5c4 -SIZE (gnome2/libbonoboui-2.6.1.tar.bz2) = 879500 +MD5 (gnome2/libbonoboui-2.8.0.tar.bz2) = 73e0b8883d8bea6b3bbd297dbbcb1f36 +SIZE (gnome2/libbonoboui-2.8.0.tar.bz2) = 970664 diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index c7b91b19c8a2..5cc25c76e1dc 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -72,6 +72,7 @@ libdata/pkgconfig/libbonoboui-2.0.pc %%DOCSDIR%%/libbonoboui-faq.html %%DOCSDIR%%/libbonoboui.devhelp %%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css %%DOCSDIR%%/up.png share/gnome/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml @@ -82,6 +83,7 @@ share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo share/locale/bn/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/bs/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo share/locale/cy/LC_MESSAGES/libbonoboui-2.0.mo @@ -115,10 +117,12 @@ share/locale/ml/LC_MESSAGES/libbonoboui-2.0.mo share/locale/mn/LC_MESSAGES/libbonoboui-2.0.mo share/locale/mr/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ms/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/nb/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ne/LC_MESSAGES/libbonoboui-2.0.mo share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo share/locale/no/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/or/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pt/LC_MESSAGES/libbonoboui-2.0.mo diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile index 025149fa59db..6a57a905462c 100644 --- a/x11-toolkits/libgail-gnome/Makefile +++ b/x11-toolkits/libgail-gnome/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgail-gnome -PORTVERSION= 1.0.6 +PORTVERSION= 1.1.0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libgail-gnome/distinfo b/x11-toolkits/libgail-gnome/distinfo index 19af44677049..503dd995bbbf 100644 --- a/x11-toolkits/libgail-gnome/distinfo +++ b/x11-toolkits/libgail-gnome/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgail-gnome-1.0.6.tar.bz2) = 7f608132150050f562d6eeadc456fdc2 -SIZE (gnome2/libgail-gnome-1.0.6.tar.bz2) = 141132 +MD5 (gnome2/libgail-gnome-1.1.0.tar.bz2) = 61541d3f04741b8a9f42f89776ea1fac +SIZE (gnome2/libgail-gnome-1.1.0.tar.bz2) = 141395 diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 2b966383db59..8e915538023e 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomeprintui -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,11 +22,11 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas lthack \ +USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \ intlhack USE_REINPLACE= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo index 29ed616e9e25..bca531884e28 100644 --- a/x11-toolkits/libgnomeprintui/distinfo +++ b/x11-toolkits/libgnomeprintui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeprintui-2.6.2.tar.bz2) = b26f7f70eb67fe29f20f6312d4f3085e -SIZE (gnome2/libgnomeprintui-2.6.2.tar.bz2) = 562712 +MD5 (gnome2/libgnomeprintui-2.8.0.tar.bz2) = 0854339b4c40f9526e7430d36f98a785 +SIZE (gnome2/libgnomeprintui-2.8.0.tar.bz2) = 580677 diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index 9feed9e6c4f8..546d1a8626e1 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -9,7 +9,7 @@ lib/libgnomeprintui-2-2.a lib/libgnomeprintui-2-2.so lib/libgnomeprintui-2-2.so.1 libdata/pkgconfig/libgnomeprintui-2.2.pc -%%DOCSDIR%%/c7.html +%%DOCSDIR%%/ch02.html %%DOCSDIR%%/home.png %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml @@ -21,6 +21,7 @@ libdata/pkgconfig/libgnomeprintui-2.2.pc %%DOCSDIR%%/libgnomeprintui-gnome-print-paper-selector.html %%DOCSDIR%%/libgnomeprintui-gnome-print-preview.html %%DOCSDIR%%/libgnomeprintui-gnome-printer-selector.html +%%DOCSDIR%%/libgnomeprintui.devhelp %%DOCSDIR%%/libgnomeprintui.html %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css @@ -32,6 +33,7 @@ share/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/be/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/bg/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/bn/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/bs/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ca/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/cy/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -65,6 +67,8 @@ share/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ml/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/nb/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ne/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/nl/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/nn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/no/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -83,6 +87,7 @@ share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/th/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index cecbd610282b..5761fff80844 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -6,10 +6,11 @@ # PORTNAME= libgnomeui -PORTVERSION= 2.6.1.1 +PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,9 +24,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack lthack gnomehier libbonoboui +USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index 47b24e35c1a8..7b6c6e3427a2 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeui-2.6.1.1.tar.bz2) = 16e6717b5d7da982db00fea6167188ef -SIZE (gnome2/libgnomeui-2.6.1.1.tar.bz2) = 1505062 +MD5 (gnome2/libgnomeui-2.8.0.tar.bz2) = ef0df128e3c0b2047ce440bbbe481390 +SIZE (gnome2/libgnomeui-2.8.0.tar.bz2) = 1623044 diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c new file mode 100644 index 000000000000..8c5bbd501398 --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c @@ -0,0 +1,20 @@ +--- libgnomeui/gnome-ice.c.orig Fri Oct 22 23:22:11 2004 ++++ libgnomeui/gnome-ice.c Fri Oct 22 23:22:38 2004 +@@ -54,6 +54,8 @@ + IceConn connection = (IceConn) data; + IceProcessMessagesStatus status; + ++ GDK_THREADS_ENTER(); ++ + status = IceProcessMessages (connection, NULL, NULL); + + if (status == IceProcessMessagesIOError) +@@ -73,6 +75,8 @@ + IceCloseConnection (connection); + } + } ++ ++ GDK_THREADS_LEAVE(); + + return TRUE; + } diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index 249cdf07e79a..ad14752b1e83 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -53,61 +53,97 @@ lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.so lib/libglade/2.0/libgnome.so lib/libgnomeui-2.a lib/libgnomeui-2.so -lib/libgnomeui-2.so.600 +lib/libgnomeui-2.so.800 libdata/pkgconfig/libgnomeui-2.0.pc libexec/gnome_segv2 -%%DOCSDIR%%/GnomeAbout.html -%%DOCSDIR%%/GnomeApp.html -%%DOCSDIR%%/GnomeAppBar.html -%%DOCSDIR%%/GnomeClient.html -%%DOCSDIR%%/GnomeColorPicker.html -%%DOCSDIR%%/GnomeDateEdit.html -%%DOCSDIR%%/GnomeDialog.html -%%DOCSDIR%%/GnomeDruid.html -%%DOCSDIR%%/GnomeDruidPage.html -%%DOCSDIR%%/GnomeDruidPageEdge.html -%%DOCSDIR%%/GnomeDruidPageStandard.html -%%DOCSDIR%%/GnomeEntry.html -%%DOCSDIR%%/GnomeFileEntry.html -%%DOCSDIR%%/GnomeFontPicker.html -%%DOCSDIR%%/GnomeHRef.html -%%DOCSDIR%%/GnomeIconEntry.html -%%DOCSDIR%%/GnomeIconList.html -%%DOCSDIR%%/GnomeIconSelection.html -%%DOCSDIR%%/GnomeMDI.html -%%DOCSDIR%%/GnomeMDIChild.html -%%DOCSDIR%%/GnomeMDIGenericChild.html -%%DOCSDIR%%/GnomeMessageBox.html -%%DOCSDIR%%/GnomePixmap.html -%%DOCSDIR%%/GnomePixmapEntry.html -%%DOCSDIR%%/GnomePropertyBox.html -%%DOCSDIR%%/GnomeScores.html -%%DOCSDIR%%/application-mgmt.html -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/deprecated.html -%%DOCSDIR%%/druids.html -%%DOCSDIR%%/fixme.html -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/libgnomeui-GnomeIconLookup.html -%%DOCSDIR%%/libgnomeui-GnomeIconTheme.html -%%DOCSDIR%%/libgnomeui-GnomeThemeFile.html -%%DOCSDIR%%/libgnomeui-GnomeThumbnail.html -%%DOCSDIR%%/libgnomeui-gnome-app-helper.html -%%DOCSDIR%%/libgnomeui-gnome-app-util.html -%%DOCSDIR%%/libgnomeui-gnome-dialog-util.html -%%DOCSDIR%%/libgnomeui-gnome-mdi-session.html -%%DOCSDIR%%/libgnomeui-gnome-popup-menu.html -%%DOCSDIR%%/libgnomeui-gnome-stock-icons.html -%%DOCSDIR%%/libgnomeui-gnome-types.html -%%DOCSDIR%%/libgnomeui-gnome-ui-init.html -%%DOCSDIR%%/libgnomeui-gnome-uidefs.html -%%DOCSDIR%%/libgnomeui-gnome-vfs-util.html -%%DOCSDIR%%/libgnomeui-gnome-window.html -%%DOCSDIR%%/libgnomeui-gnometypebuiltins.html -%%DOCSDIR%%/libgnomeui-objects.html -%%DOCSDIR%%/miscellaneous.html -%%DOCSDIR%%/style.css +share/doc/libgnomeui/GnomeAbout.html +share/doc/libgnomeui/GnomeApp.html +share/doc/libgnomeui/GnomeAppBar.html +share/doc/libgnomeui/GnomeClient.html +share/doc/libgnomeui/GnomeColorPicker.html +share/doc/libgnomeui/GnomeDateEdit.html +share/doc/libgnomeui/GnomeDialog.html +share/doc/libgnomeui/GnomeDruid.html +share/doc/libgnomeui/GnomeDruidPage.html +share/doc/libgnomeui/GnomeDruidPageEdge.html +share/doc/libgnomeui/GnomeDruidPageStandard.html +share/doc/libgnomeui/GnomeEntry.html +share/doc/libgnomeui/GnomeFileEntry.html +share/doc/libgnomeui/GnomeFontPicker.html +share/doc/libgnomeui/GnomeHRef.html +share/doc/libgnomeui/GnomeIconEntry.html +share/doc/libgnomeui/GnomeIconList.html +share/doc/libgnomeui/GnomeIconSelection.html +share/doc/libgnomeui/GnomeMDI.html +share/doc/libgnomeui/GnomeMDIChild.html +share/doc/libgnomeui/GnomeMDIGenericChild.html +share/doc/libgnomeui/GnomeMessageBox.html +share/doc/libgnomeui/GnomePixmap.html +share/doc/libgnomeui/GnomePixmapEntry.html +share/doc/libgnomeui/GnomePropertyBox.html +share/doc/libgnomeui/GnomeScores.html +share/doc/libgnomeui/application-mgmt.html +share/doc/libgnomeui/ch01.html +share/doc/libgnomeui/deprecated.html +share/doc/libgnomeui/druids.html +share/doc/libgnomeui/fixme.html +share/doc/libgnomeui/home.png +share/doc/libgnomeui/index.html +share/doc/libgnomeui/index.sgml +share/doc/libgnomeui/left.png +share/doc/libgnomeui/libgnomeui-GnomeIconLookup.html +share/doc/libgnomeui/libgnomeui-GnomeIconTheme.html +share/doc/libgnomeui/libgnomeui-GnomeThemeFile.html +share/doc/libgnomeui/libgnomeui-GnomeThumbnail.html +share/doc/libgnomeui/libgnomeui-gnome-app-helper.html +share/doc/libgnomeui/libgnomeui-gnome-app-util.html +share/doc/libgnomeui/libgnomeui-gnome-dialog-util.html +share/doc/libgnomeui/libgnomeui-gnome-mdi-session.html +share/doc/libgnomeui/libgnomeui-gnome-popup-menu.html +share/doc/libgnomeui/libgnomeui-gnome-stock-icons.html +share/doc/libgnomeui/libgnomeui-gnome-types.html +share/doc/libgnomeui/libgnomeui-gnome-ui-init.html +share/doc/libgnomeui/libgnomeui-gnome-uidefs.html +share/doc/libgnomeui/libgnomeui-gnome-vfs-util.html +share/doc/libgnomeui/libgnomeui-gnome-window.html +share/doc/libgnomeui/libgnomeui-gnometypebuiltins.html +share/doc/libgnomeui/libgnomeui-objects.html +share/doc/libgnomeui/libgnomeui.devhelp +share/doc/libgnomeui/miscellaneous.html +share/doc/libgnomeui/right.png +share/doc/libgnomeui/stock_attach.png +share/doc/libgnomeui/stock_book_blue.png +share/doc/libgnomeui/stock_book_green.png +share/doc/libgnomeui/stock_book_open.png +share/doc/libgnomeui/stock_book_red.png +share/doc/libgnomeui/stock_book_yellow.png +share/doc/libgnomeui/stock_line_in.png +share/doc/libgnomeui/stock_mail.png +share/doc/libgnomeui/stock_mail_compose.png +share/doc/libgnomeui/stock_mail_forward.png +share/doc/libgnomeui/stock_mail_receive.png +share/doc/libgnomeui/stock_mail_reply.png +share/doc/libgnomeui/stock_mail_send.png +share/doc/libgnomeui/stock_menu_about.png +share/doc/libgnomeui/stock_menu_blank.png +share/doc/libgnomeui/stock_mic.png +share/doc/libgnomeui/stock_midi.png +share/doc/libgnomeui/stock_multiple_file.png +share/doc/libgnomeui/stock_not.png +share/doc/libgnomeui/stock_scores.png +share/doc/libgnomeui/stock_table_borders.png +share/doc/libgnomeui/stock_table_fill.png +share/doc/libgnomeui/stock_text_bulleted_list.png +share/doc/libgnomeui/stock_text_indent.png +share/doc/libgnomeui/stock_text_numbered_list.png +share/doc/libgnomeui/stock_text_unindent.png +share/doc/libgnomeui/stock_timer.png +share/doc/libgnomeui/stock_timer_stopped.png +share/doc/libgnomeui/stock_trash.png +share/doc/libgnomeui/stock_trash_full.png +share/doc/libgnomeui/stock_volume.png +share/doc/libgnomeui/style.css +share/doc/libgnomeui/up.png share/gnome/pixmaps/gnome-about-logo.png share/gnome/pixmaps/gnome-default-dlg.png share/gnome/pixmaps/gnome-error.png @@ -121,6 +157,8 @@ share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo share/locale/be/LC_MESSAGES/libgnomeui-2.0.mo share/locale/bg/LC_MESSAGES/libgnomeui-2.0.mo share/locale/bn/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/br/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/bs/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo @@ -137,6 +175,7 @@ share/locale/fa/LC_MESSAGES/libgnomeui-2.0.mo share/locale/fi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/fr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ga/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/gl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/gu/LC_MESSAGES/libgnomeui-2.0.mo share/locale/he/LC_MESSAGES/libgnomeui-2.0.mo share/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo @@ -157,6 +196,8 @@ share/locale/ml/LC_MESSAGES/libgnomeui-2.0.mo share/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo share/locale/mr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ms/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/nb/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/ne/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo share/locale/no/LC_MESSAGES/libgnomeui-2.0.mo @@ -175,6 +216,7 @@ share/locale/sr@ije/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ta/LC_MESSAGES/libgnomeui-2.0.mo share/locale/th/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/tk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo @@ -182,7 +224,7 @@ share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo -@dirrm %%DOCSDIR%% +@dirrm share/doc/libgnomeui @dirrm include/libgnomeui-2.0/libgnomeui @dirrm include/libgnomeui-2.0 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 15a1ef5a06b2..649d9d566583 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libwnck -PORTVERSION= 2.6.2.1 -PORTREVISION= 1 +PORTVERSION= 2.8.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,10 +20,11 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomehack lthack gtk20 +USE_GNOME= gnomehack gtk20 USE_BISON= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index fcdc1afa2dd0..c9c164c626a5 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libwnck-2.6.2.1.tar.bz2) = 79feeef845f34768ac4dfdec4b927cde -SIZE (gnome2/libwnck-2.6.2.1.tar.bz2) = 346751 +MD5 (gnome2/libwnck-2.8.1.tar.bz2) = c0a5a8478064287e167c15e3ec0e82a1 +SIZE (gnome2/libwnck-2.8.1.tar.bz2) = 396274 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index b69752930bb3..831b51933c3d 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -14,12 +14,40 @@ lib/libwnck-1.a lib/libwnck-1.so lib/libwnck-1.so.13 libdata/pkgconfig/libwnck-1.0.pc +share/doc/libwnck/ch01.html +share/doc/libwnck/home.png +share/doc/libwnck/index.html +share/doc/libwnck/index.sgml +share/doc/libwnck/intro.html +share/doc/libwnck/left.png +share/doc/libwnck/libwnck-WnckApplication.html +share/doc/libwnck/libwnck-WnckClassGroup.html +share/doc/libwnck/libwnck-WnckPager.html +share/doc/libwnck/libwnck-WnckPagerAccessible.html +share/doc/libwnck/libwnck-WnckPagerAccessibleFactory.html +share/doc/libwnck/libwnck-WnckScreen.html +share/doc/libwnck/libwnck-WnckTasklist.html +share/doc/libwnck/libwnck-WnckWindow.html +share/doc/libwnck/libwnck-WnckWorkspace.html +share/doc/libwnck/libwnck-WnckWorkspaceAccessible.html +share/doc/libwnck/libwnck-WnckWorkspaceAccessibleFactory.html +share/doc/libwnck/libwnck-private.html +share/doc/libwnck/libwnck-util.html +share/doc/libwnck/libwnck-window-action-menu.html +share/doc/libwnck/libwnck-window-menu.html +share/doc/libwnck/libwnck-wnck-enum-types.html +share/doc/libwnck/libwnck-xutils.html +share/doc/libwnck/libwnck.devhelp +share/doc/libwnck/right.png +share/doc/libwnck/style.css +share/doc/libwnck/up.png share/locale/am/LC_MESSAGES/libwnck.mo share/locale/ar/LC_MESSAGES/libwnck.mo share/locale/az/LC_MESSAGES/libwnck.mo share/locale/be/LC_MESSAGES/libwnck.mo share/locale/bg/LC_MESSAGES/libwnck.mo share/locale/bn/LC_MESSAGES/libwnck.mo +share/locale/bs/LC_MESSAGES/libwnck.mo share/locale/ca/LC_MESSAGES/libwnck.mo share/locale/cs/LC_MESSAGES/libwnck.mo share/locale/cy/LC_MESSAGES/libwnck.mo @@ -46,6 +74,7 @@ share/locale/id/LC_MESSAGES/libwnck.mo share/locale/is/LC_MESSAGES/libwnck.mo share/locale/it/LC_MESSAGES/libwnck.mo share/locale/ja/LC_MESSAGES/libwnck.mo +share/locale/ka/LC_MESSAGES/libwnck.mo share/locale/kn/LC_MESSAGES/libwnck.mo share/locale/ko/LC_MESSAGES/libwnck.mo share/locale/li/LC_MESSAGES/libwnck.mo @@ -57,6 +86,7 @@ share/locale/ml/LC_MESSAGES/libwnck.mo share/locale/mn/LC_MESSAGES/libwnck.mo share/locale/mr/LC_MESSAGES/libwnck.mo share/locale/ms/LC_MESSAGES/libwnck.mo +share/locale/nb/LC_MESSAGES/libwnck.mo share/locale/nl/LC_MESSAGES/libwnck.mo share/locale/nn/LC_MESSAGES/libwnck.mo share/locale/no/LC_MESSAGES/libwnck.mo diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 063c58f48073..0e6f18b3d510 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -6,9 +6,9 @@ # PORTNAME= pango -PORTVERSION= 1.4.1 +PORTVERSION= 1.6.0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.4,} \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.6,} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ DIST_SUBDIR= gnome2 @@ -60,4 +60,3 @@ post-install: .endif .include <bsd.port.mk> - diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 0088581f7c15..f588247d893d 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/pango-1.4.1.tar.bz2) = 39868e0da250fd4c00b2970e4eb84389 -SIZE (gnome2/pango-1.4.1.tar.bz2) = 914710 +MD5 (gnome2/pango-1.6.0.tar.bz2) = 6c732bbc5fba5a0f1f8086e8aa4f490d +SIZE (gnome2/pango-1.6.0.tar.bz2) = 951911 diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac index 58f739a1e675..362dcd3f45d5 100644 --- a/x11-toolkits/pango/files/patch-ac +++ b/x11-toolkits/pango/files/patch-ac @@ -1,14 +1,15 @@ $FreeBSD$ ---- Makefile.in.orig Mon Mar 11 12:16:33 2002 -+++ Makefile.in Mon Mar 11 12:24:58 2002 -@@ -116,7 +116,7 @@ - YACC = @YACC@ - ms_librarian = @ms_librarian@ +--- Makefile.in.orig Mon Aug 2 19:12:56 2004 ++++ Makefile.in Mon Aug 2 19:13:11 2004 +@@ -234,7 +234,7 @@ + + AUTOMAKE_OPTIONS = 1.7 -SUBDIRS = pango modules examples docs tools tests +SUBDIRS = pango modules examples docs tools EXTRA_DIST = \ - pango.spec.in \ + pango.pc.in \ + diff --git a/x11-toolkits/pango/files/patch-configure b/x11-toolkits/pango/files/patch-configure index 071893b4cbda..76a6d1eefa0a 100644 --- a/x11-toolkits/pango/files/patch-configure +++ b/x11-toolkits/pango/files/patch-configure @@ -1,15 +1,6 @@ ---- configure.orig Mon Aug 2 20:29:37 2004 -+++ configure Mon Aug 2 20:32:46 2004 -@@ -1958,7 +1958,7 @@ - - - --LT_VERSION_INFO="400:1:400" -+LT_VERSION_INFO="399:1:399" - LT_CURRENT_MINUS_AGE=0 - - -@@ -23945,10 +23945,10 @@ +--- configure.orig Mon Aug 2 19:13:53 2004 ++++ configure Mon Aug 2 19:14:46 2004 +@@ -23948,10 +23948,10 @@ s,@CYGPATH_W@,$CYGPATH_W,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index cbb44b3091ae..5ce33aa86604 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -21,6 +21,7 @@ include/pango-1.0/pango/pango-tabs.h include/pango-1.0/pango/pango-types.h include/pango-1.0/pango/pango-utils.h include/pango-1.0/pango/pango.h +include/pango-1.0/pango/pangofc-decoder.h include/pango-1.0/pango/pangofc-font.h include/pango-1.0/pango/pangofc-fontmap.h include/pango-1.0/pango/pangoft2.h @@ -28,16 +29,16 @@ include/pango-1.0/pango/pangox.h include/pango-1.0/pango/pangoxft.h lib/libpango-1.0.a lib/libpango-1.0.so -lib/libpango-1.0.so.399 +lib/libpango-1.0.so.600 lib/libpangoft2-1.0.a lib/libpangoft2-1.0.so -lib/libpangoft2-1.0.so.399 +lib/libpangoft2-1.0.so.600 lib/libpangox-1.0.a lib/libpangox-1.0.so -lib/libpangox-1.0.so.399 +lib/libpangox-1.0.so.600 lib/libpangoxft-1.0.a lib/libpangoxft-1.0.so -lib/libpangoxft-1.0.so.399 +lib/libpangoxft-1.0.so.600 lib/pango/%%VERSION%%/modules/pango-arabic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-x.so @@ -49,41 +50,42 @@ libdata/pkgconfig/pango.pc libdata/pkgconfig/pangoft2.pc libdata/pkgconfig/pangox.pc libdata/pkgconfig/pangoxft.pc -share/doc/pango/PangoEngineLang.html -share/doc/pango/PangoEngineShape.html -share/doc/pango/PangoFcFont.html -share/doc/pango/PangoFcFontMap.html -share/doc/pango/home.png -share/doc/pango/index.html -share/doc/pango/index.sgml -share/doc/pango/ix01.html -share/doc/pango/layout.gif -share/doc/pango/left.png -share/doc/pango/lowlevel.html -share/doc/pango/PangoMarkupFormat.html -share/doc/pango/pango-Coverage-Maps.html -share/doc/pango/pango-Engines.html -share/doc/pango/pango-Fonts.html -share/doc/pango/pango-FreeType-Fonts-and-Rendering.html -share/doc/pango/pango-Glyph-Storage.html -share/doc/pango/pango-Layout-Objects.html -share/doc/pango/pango-Modules.html -share/doc/pango/pango-OpenType-Font-Handling.html -share/doc/pango/pango-Scripts.html -share/doc/pango/pango-Tab-Stops.html -share/doc/pango/pango-Text-Attributes.html -share/doc/pango/pango-Text-Processing.html -share/doc/pango/pango-Win32-Fonts-and-Rendering.html -share/doc/pango/pango-X-Fonts-and-Rendering.html -share/doc/pango/pango-Xft-Fonts-and-Rendering.html -share/doc/pango/pango-querymodules.html -share/doc/pango/pango.devhelp -share/doc/pango/pango.html -share/doc/pango/rendering.html -share/doc/pango/right.png -share/doc/pango/tools.html -share/doc/pango/up.png -@dirrm share/doc/pango +%%DOCSDIR%%/PangoEngineLang.html +%%DOCSDIR%%/PangoEngineShape.html +%%DOCSDIR%%/PangoFcDecoder.html +%%DOCSDIR%%/PangoFcFont.html +%%DOCSDIR%%/PangoFcFontMap.html +%%DOCSDIR%%/PangoMarkupFormat.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/ix01.html +%%DOCSDIR%%/layout.gif +%%DOCSDIR%%/left.png +%%DOCSDIR%%/lowlevel.html +%%DOCSDIR%%/pango-Coverage-Maps.html +%%DOCSDIR%%/pango-Engines.html +%%DOCSDIR%%/pango-Fonts.html +%%DOCSDIR%%/pango-FreeType-Fonts-and-Rendering.html +%%DOCSDIR%%/pango-Glyph-Storage.html +%%DOCSDIR%%/pango-Layout-Objects.html +%%DOCSDIR%%/pango-Modules.html +%%DOCSDIR%%/pango-OpenType-Font-Handling.html +%%DOCSDIR%%/pango-Scripts.html +%%DOCSDIR%%/pango-Tab-Stops.html +%%DOCSDIR%%/pango-Text-Attributes.html +%%DOCSDIR%%/pango-Text-Processing.html +%%DOCSDIR%%/pango-Win32-Fonts-and-Rendering.html +%%DOCSDIR%%/pango-X-Fonts-and-Rendering.html +%%DOCSDIR%%/pango-Xft-Fonts-and-Rendering.html +%%DOCSDIR%%/pango-querymodules.html +%%DOCSDIR%%/pango.devhelp +%%DOCSDIR%%/pango.html +%%DOCSDIR%%/rendering.html +%%DOCSDIR%%/right.png +%%DOCSDIR%%/tools.html +%%DOCSDIR%%/up.png +@dirrm %%DOCSDIR%% @dirrm lib/pango/%%VERSION%%/modules @dirrm lib/pango/%%VERSION%% @dirrm lib/pango diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index ed90fb93a774..20ed2c7d39cd 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -7,6 +7,7 @@ PORTNAME= vte PORTVERSION= 0.11.11 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/x11-toolkits/vte/files/patch-src_dumpkeys.c b/x11-toolkits/vte/files/patch-src_dumpkeys.c index 4b77086de2e0..b80fde6bbdf8 100644 --- a/x11-toolkits/vte/files/patch-src_dumpkeys.c +++ b/x11-toolkits/vte/files/patch-src_dumpkeys.c @@ -2,7 +2,7 @@ +++ src/dumpkeys.c Thu May 6 10:46:19 2004 @@ -18,6 +18,7 @@ - #ident "$Id: dumpkeys.c,v 1.7 2004/04/30 01:16:53 nalin Exp $" + #ident "$Id: patch-src_dumpkeys.c,v 1.5 2004/11/01 04:45:09 marcus Exp $" #include "../config.h" +#include <sys/types.h> #ifdef HAVE_SYS_SELECT_H diff --git a/x11-toolkits/vte/files/patch-src_keymap.c b/x11-toolkits/vte/files/patch-src_keymap.c index db657443b846..d903dbbee059 100644 --- a/x11-toolkits/vte/files/patch-src_keymap.c +++ b/x11-toolkits/vte/files/patch-src_keymap.c @@ -2,7 +2,7 @@ +++ src/keymap.c Tue Oct 22 17:42:33 2002 @@ -18,6 +18,7 @@ - #ident "$Id: patch-src_keymap.c,v 1.3 2003/04/12 04:52:53 marcus Exp $" + #ident "$Id: patch-src_keymap.c,v 1.5 2004/11/01 04:45:09 marcus Exp $" #include "../config.h" +#include <sys/types.h> #include <stdlib.h> diff --git a/x11-toolkits/vte/files/patch-src_vte.c b/x11-toolkits/vte/files/patch-src_vte.c index 11c0ef61c54c..728569d78a84 100644 --- a/x11-toolkits/vte/files/patch-src_vte.c +++ b/x11-toolkits/vte/files/patch-src_vte.c @@ -1,6 +1,6 @@ ---- src/vte.c.orig Mon Jun 16 17:15:09 2003 -+++ src/vte.c Thu Apr 8 14:24:13 2004 -@@ -101,7 +101,7 @@ +--- src/vte.c.orig Sun May 2 02:43:01 2004 ++++ src/vte.c Sun Oct 31 20:23:36 2004 +@@ -105,14 +105,14 @@ #define VTE_ADJUSTMENT_PRIORITY G_PRIORITY_DEFAULT_IDLE #define VTE_INPUT_RETRY_PRIORITY G_PRIORITY_HIGH #define VTE_INPUT_PRIORITY G_PRIORITY_DEFAULT_IDLE @@ -9,12 +9,26 @@ #define VTE_CHILD_OUTPUT_PRIORITY G_PRIORITY_HIGH #define VTE_FX_PRIORITY G_PRIORITY_DEFAULT_IDLE #define VTE_REGCOMP_FLAGS REG_EXTENDED -@@ -109,7 +109,7 @@ + #define VTE_REGEXEC_FLAGS 0 #define VTE_INPUT_CHUNK_SIZE 0x1000 - #define VTE_INVALID_SOURCE -1 #define VTE_INVALID_BYTE '?' -#define VTE_COALESCE_TIMEOUT 2 -+#define VTE_COALESCE_TIMEOUT 15 ++#define VTE_COALESCE_TIMEOUT 15 /* The structure we use to hold characters we're supposed to display -- this * includes any supported visible attributes. */ +@@ -10534,9 +10534,13 @@ + static gint + vte_terminal_visibility_notify(GtkWidget *widget, GdkEventVisibility *event) + { ++ VteTerminal *terminal; + g_return_val_if_fail(GTK_WIDGET(widget), FALSE); + g_return_val_if_fail(VTE_IS_TERMINAL(widget), FALSE); +- (VTE_TERMINAL(widget))->pvt->visibility_state = event->state; ++ terminal = VTE_TERMINAL(widget); ++ terminal->pvt->visibility_state = event->state; ++ if (terminal->pvt->visibility_state == GDK_VISIBILITY_UNOBSCURED) ++ vte_invalidate_all(terminal); + return FALSE; + } + diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 0acb85b419d4..9d2fccbde6f8 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -6,8 +6,7 @@ # PORTNAME= metacity -PORTVERSION= 2.8.2 -PORTREVISION= 1 +PORTVERSION= 2.8.6 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index e76e2925b31a..22c33c782de3 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/metacity-2.8.2.tar.bz2) = 4e37347f772f726e87d325f219da0ce8 -SIZE (gnome2/metacity-2.8.2.tar.bz2) = 2015438 +MD5 (gnome2/metacity-2.8.6.tar.bz2) = c49e4b5575503975516159780855e317 +SIZE (gnome2/metacity-2.8.6.tar.bz2) = 2174175 diff --git a/x11-wm/metacity/files/patch-src_window.c b/x11-wm/metacity/files/patch-src_window.c deleted file mode 100644 index 5e4ef9d96845..000000000000 --- a/x11-wm/metacity/files/patch-src_window.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/window.c 31 Jul 2004 21:26:05 -0000 1.333 -+++ src/window.c 4 Aug 2004 15:55:42 -0000 -@@ -1619,6 +1619,11 @@ window_takes_focus_on_map (MetaWindow *w - case META_WINDOW_NORMAL: - case META_WINDOW_DIALOG: - case META_WINDOW_MODAL_DIALOG: -+ /* Don't do focus stealing stuff; lame cop-out while we work on -+ * fixing http://bugzilla.gnome.org/show_bug.cgi?id=149028 -+ */ -+ return TRUE; -+ - if (window->focus_despite_user_time) - return TRUE; diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index 059778ca2e3d..ae4a274f4b43 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -114,6 +114,7 @@ share/locale/az/LC_MESSAGES/metacity.mo share/locale/be/LC_MESSAGES/metacity.mo share/locale/bg/LC_MESSAGES/metacity.mo share/locale/bn/LC_MESSAGES/metacity.mo +share/locale/bs/LC_MESSAGES/metacity.mo share/locale/ca/LC_MESSAGES/metacity.mo share/locale/cs/LC_MESSAGES/metacity.mo share/locale/cy/LC_MESSAGES/metacity.mo @@ -146,9 +147,11 @@ share/locale/mk/LC_MESSAGES/metacity.mo share/locale/ml/LC_MESSAGES/metacity.mo share/locale/mn/LC_MESSAGES/metacity.mo share/locale/ms/LC_MESSAGES/metacity.mo +share/locale/nb/LC_MESSAGES/metacity.mo share/locale/nl/LC_MESSAGES/metacity.mo share/locale/nn/LC_MESSAGES/metacity.mo share/locale/no/LC_MESSAGES/metacity.mo +share/locale/or/LC_MESSAGES/metacity.mo share/locale/pa/LC_MESSAGES/metacity.mo share/locale/pl/LC_MESSAGES/metacity.mo share/locale/pt/LC_MESSAGES/metacity.mo @@ -163,6 +166,7 @@ share/locale/sr@Latn/LC_MESSAGES/metacity.mo share/locale/sv/LC_MESSAGES/metacity.mo share/locale/ta/LC_MESSAGES/metacity.mo share/locale/th/LC_MESSAGES/metacity.mo +share/locale/tk/LC_MESSAGES/metacity.mo share/locale/tr/LC_MESSAGES/metacity.mo share/locale/uk/LC_MESSAGES/metacity.mo share/locale/vi/LC_MESSAGES/metacity.mo diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index a65c580ce39a..4a501d414cb6 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gdm2 -PORTVERSION= 2.6.0.4 +PORTVERSION= 2.6.0.6 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 @@ -54,6 +54,11 @@ post-extract: post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g' +.if ${OSVERSION} < 600006 +.for po in zh_CN.po + @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} +.endfor +.endif post-install: .if !defined(PACKAGE_BUILDING) diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo index 7c7e375a193c..ff06b0d61aef 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gdm-2.6.0.4.tar.bz2) = 3a6986217d4db2afd24fcdbf3b9af722 -SIZE (gnome2/gdm-2.6.0.4.tar.bz2) = 3217512 +MD5 (gnome2/gdm-2.6.0.6.tar.bz2) = 8dca7cb1f28d81f60f6e07b3c24288c5 +SIZE (gnome2/gdm-2.6.0.6.tar.bz2) = 3216098 diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab index 0bc57e468b33..35cd08f89e14 100644 --- a/x11/gdm2/files/patch-ab +++ b/x11/gdm2/files/patch-ab @@ -1,6 +1,6 @@ ---- config/gdm.conf.in.orig Mon Aug 2 18:20:59 2004 -+++ config/gdm.conf.in Thu Aug 19 12:54:26 2004 -@@ -77,7 +77,7 @@ +--- config/gdm.conf.in.orig Tue Oct 26 23:18:21 2004 ++++ config/gdm.conf.in Tue Oct 26 23:20:49 2004 +@@ -76,7 +76,7 @@ # To try to kill all clients started at greeter time or in the Init script. # doesn't always work, only if those clients have a window of their own #KillInitClients=true @@ -9,7 +9,7 @@ # You should probably never change this value unless you have a weird setup PidFile=/var/run/gdm.pid # Note that a post login script is run before a PreSession script. -@@ -97,7 +97,7 @@ +@@ -96,7 +96,7 @@ # Reboot, Halt and suspend commands, you can add different commands # separated by a semicolon and gdm will use the first one it can find #RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now @@ -18,23 +18,22 @@ #SuspendCommand= # Probably should not touch the below this is the standard setup ServAuthDir=@EXPANDED_AUTHDIR@ -@@ -132,11 +132,10 @@ +@@ -131,11 +131,11 @@ #FlexiReapDelayMinutes=5 # the X nest command - Xnest=@X_SERVER_PATH@/Xnest -audit 0 -name Xnest + Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@ -# Automatic VT allocation. Right now only works on Linux. This way --# we force X to use specific vts. turn VTAllocation to false if this --# is causing problems. ++# Automatic VT allocation. This way + # we force X to use specific vts. turn VTAllocation to false if this + # is causing problems. -#FirstVT=7 -#VTAllocation=true -+# Automatic VT allocation. This way we force X to use specific vts. -+# Turn VTAllocation to false if this is causing problems. +#FirstVT=9 +VTAllocation=false # Should double login be treated with a warning (and possibility to change - # vts on linux systems for console logins) + # vts on linux and freebsd systems for console logins) #DoubleLoginWarning=true -@@ -241,7 +240,7 @@ +@@ -240,7 +240,7 @@ # The specific gtkrc file we use. It should be the full path to the gtkrc # that we need. Unless you need a specific gtkrc that doesn't correspond to # a specific theme, then just use the GtkTheme key diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias index de8e5ea8d080..27ffdec94143 100644 --- a/x11/gdm2/files/patch-config_locale.alias +++ b/x11/gdm2/files/patch-config_locale.alias @@ -57,7 +57,7 @@ -Malay ms_MY.UTF-8,ms_MY -Marathi mr_IN.UTF-8,mr_IN -Mongolian mn_MN.UTF-8,mn_MN --Norwegian(bokmal) no_NO.UTF-8,no_NO +-Norwegian(bokmal) nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO -Norwegian(nynorsk) nn_NO.UTF-8,nn_NO -Oriya or_IN.UTF-8,or_IN -Panjabi pa_IN.UTF-8,pa_IN @@ -120,7 +120,7 @@ +Japanese ja_JP.UTF-8,ja_JP.EUC,ja_JP.eucJP +Korean ko_KR.UTF-8,ko_KR.EUC,ko_KR.eucKR +Lithuanian lt_LT.UTF-8,lt_LT.ISO8859-4,lt_LT.ISO8859-13 -+Norwegian(bokmal) no_NO.UTF-8,no_NO.ISO8859-1,no_NO.ISO8859-15 ++Norwegian(bokmal) nb_NO.UTF-8,nb_NO.ISO8859-1,nb_NO.ISO8859-15,no_NO.UTF-8,no_NO.ISO8859-1,no_NO.ISO8859-15 +Polish pl_PL.UTF-8,pl_PL.ISO8859-2 +Portuguese pt_PT.UTF-8,pt_PT.ISO8859-15,pt_PT.ISO8859-1 +Portuguese(Brazilian) pt_PT.UTF-8,pt_BR.ISO8859-1 diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist index 317dabf10ec2..0e69f9f5c7d9 100644 --- a/x11/gdm2/pkg-plist +++ b/x11/gdm2/pkg-plist @@ -138,6 +138,7 @@ share/locale/az/LC_MESSAGES/gdm.mo share/locale/be/LC_MESSAGES/gdm.mo share/locale/bg/LC_MESSAGES/gdm.mo share/locale/bn/LC_MESSAGES/gdm.mo +share/locale/bs/LC_MESSAGES/gdm.mo share/locale/ca/LC_MESSAGES/gdm.mo share/locale/cs/LC_MESSAGES/gdm.mo share/locale/cy/LC_MESSAGES/gdm.mo diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 28b69fcfec0c..4d86584d6f0b 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.6.2.1 -PORTREVISION= 4 +PORTVERSION= 2.8.1.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.6 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.8 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -29,7 +28,15 @@ USE_GNOME= gnomehier gnomeprefix gnomehack intlhack gnomepanel \ gstreamerplugins gail USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + FREEBSD_SYS=${FREEBSD_SYS} + +GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas gkb.schemas \ + gswitchit.schemas gtik.schemas gweather.schemas \ + mailcheck.schemas mini-commander.schemas mixer.schemas \ + modemlights.schemas multiload.schemas stickynotes.schemas + +FREEBSD_SYS?= /usr/src/sys .include <bsd.port.pre.mk> @@ -37,7 +44,20 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" PLIST_SUB= BATTERY="@comment " .else +GCONF_SCHEMAS+= battstat.schemas PLIST_SUB= BATTERY="" + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} " W A R N I N G" + @${ECHO_MSG} "*****************************************************" + @${ECHO_MSG} "* gnomeapplets2 requires that you have your kernel *" + @${ECHO_MSG} "* sources installed. If your kernel sources *" + @${ECHO_MSG} "* are somewhere other than /usr/src/sys, you *" + @${ECHO_MSG} "* may set the FREEBSD_SYS variable to the *" + @${ECHO_MSG} "* correct path. *" + @${ECHO_MSG} "*****************************************************" + @${ECHO_MSG} "" .endif .include <bsd.port.post.mk> diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index fa0dd052696d..2f9ff553586d 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-applets-2.6.2.1.tar.bz2) = d29dc21035db8b93671058d7f1ac4aaa -SIZE (gnome2/gnome-applets-2.6.2.1.tar.bz2) = 5478737 +MD5 (gnome2/gnome-applets-2.8.1.1.tar.bz2) = 897d6f7aed1717c5be9d5707c0407604 +SIZE (gnome2/gnome-applets-2.8.1.1.tar.bz2) = 6405066 diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index 73b0823ce82e..0186faf0ee14 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,6 +1,15 @@ ---- configure.orig Sun Feb 22 19:22:49 2004 -+++ configure Sun Feb 22 19:24:33 2004 -@@ -22912,6 +22912,7 @@ +--- configure.orig Sat Oct 16 15:45:26 2004 ++++ configure Sat Oct 16 15:47:04 2004 +@@ -463,7 +463,7 @@ + # include <unistd.h> + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE ACPIINC BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -24323,6 +24323,7 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";; @@ -8,16 +17,29 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -23034,7 +23035,7 @@ - - ;; - # list of supported OS cores that do not use libapm -- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) -+ i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) - ;; - *) - echo "warning: ${host} is not supported by battstat_applet, not building" >&2 -@@ -24905,14 +24906,14 @@ +@@ -24384,6 +24385,7 @@ + + HAVE_LIBAPM=no + NEED_LIBAPM=no ++ACPIINC= + build_battstat_applet=no + + if test x$disable_battstat = xno; then +@@ -24535,7 +24537,12 @@ + + ;; + # list of supported OS cores that do not use libapm +- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) ++ i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) ++ if [ -n "${FREEBSD_SYS}" ]; then ++ ACPIINC="-I${FREEBSD_SYS}" ++ else ++ ACPIINC="-I/usr/src/sys" ++ fi + ;; + *) + echo "warning: ${host} is not supported by battstat_applet, not building" >&2 +@@ -26615,14 +26622,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" cat >>confdefs.h <<_ACEOF @@ -34,3 +56,11 @@ _ACEOF cat >>confdefs.h <<_ACEOF +@@ -27773,6 +27780,7 @@ + s,@APPLET_CDPLAYER_FALSE@,$APPLET_CDPLAYER_FALSE,;t t + s,@CDROM_HOST@,$CDROM_HOST,;t t + s,@CDROM_LIBS@,$CDROM_LIBS,;t t ++s,@ACPIINC@,$ACPIINC,;t t + s,@HAVE_LIBAPM@,$HAVE_LIBAPM,;t t + s,@NEED_LIBAPM@,$NEED_LIBAPM,;t t + s,@HAVE_LIBAPM_TRUE@,$HAVE_LIBAPM_TRUE,;t t diff --git a/x11/gnome-applets/files/patch-battstat-acpi b/x11/gnome-applets/files/patch-battstat-acpi new file mode 100644 index 000000000000..4025a9a360f1 --- /dev/null +++ b/x11/gnome-applets/files/patch-battstat-acpi @@ -0,0 +1,459 @@ +--- battstat/Makefile.in.orig Mon Sep 27 18:39:44 2004 ++++ battstat/Makefile.in Mon Sep 27 18:40:56 2004 +@@ -173,6 +173,8 @@ + pixmapsdir = $(datadir)/pixmaps + pixmaps_DATA = battstat.png + ++ACPIINC = @ACPIINC@ ++ + @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@APMLIB = apmlib/libapm.a + @HAVE_LIBAPM_TRUE@@NEED_LIBAPM_TRUE@APMLIB = -lapm + @NEED_LIBAPM_FALSE@APMLIB = +@@ -191,6 +193,7 @@ + $(GNOME_APPLETS_CFLAGS) \ + $(LIBGLADE_CFLAGS) \ + $(APMINC) \ ++ $(ACPIINC) \ + -DDATA_DIR=\"$(datadir)\" \ + -DGLADE_DIR=\"$(gladedir)\" \ + -DG_LOG_DOMAIN=\"battstat_applet\" \ +@@ -205,7 +208,9 @@ + properties.c \ + battstat_applet.c \ + acpi-linux.c \ +- acpi-linux.h ++ acpi-linux.h \ ++ acpi-freebsd.c \ ++ acpi-freebsd.h + + + battstat_applet_2_LDADD = \ +@@ -242,7 +247,7 @@ + PROGRAMS = $(libexec_PROGRAMS) + + am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ +- battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT) ++ battstat_applet.$(OBJEXT) acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT) + battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS) + @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \ + @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a +@@ -259,6 +264,7 @@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/acpi-freebsd.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/battstat_applet.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/properties.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -330,6 +336,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@ + +--- battstat/acpi-freebsd.h.orig Mon Sep 27 18:39:30 2004 ++++ battstat/acpi-freebsd.h Mon Sep 27 18:39:30 2004 +@@ -0,0 +1,45 @@ ++/* ++ * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. ++ */ ++ ++#ifndef __ACPI_FREEBSD_H__ ++#define __ACPI_FREEBSD_H__ ++ ++#define ACPIDEV "/dev/acpi" ++ ++#define BATT_MIN 0 ++#define BATT_MAX 64 ++ ++#define ACPI_ACLINE "hw.acpi.acline" ++#define ACPI_TIME "hw.acpi.battery.time" ++#define ACPI_LIFE "hw.acpi.battery.life" ++#define ACPI_STATE "hw.acpi.battery.state" ++ ++struct acpi_info { ++ gboolean ac_online; ++ int acpifd; ++ int max_capacity; ++ int low_capacity; ++ int critical_capacity; ++}; ++ ++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); ++gboolean acpi_process_event(struct acpi_info * acpiinfo); ++gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); ++void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); ++ ++#endif /* __ACPI_FREEBSD_H__ */ +--- battstat/acpi-freebsd.c.orig Tue Sep 28 16:55:52 2004 ++++ battstat/acpi-freebsd.c Tue Sep 28 17:00:32 2004 +@@ -0,0 +1,213 @@ ++/* battstat A GNOME battery meter for laptops. ++ * Copyright (C) 2000 by Jörgen Pehrson <jp@spektr.eu.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. ++ * ++ $Id: patch-battstat-acpi,v 1.3 2004/10/01 20:45:45 marcus Exp $ ++ */ ++ ++/* ++ * ACPI battery functions for FreeBSD >= 5.2. ++ * September 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ ++#ifdef __FreeBSD__ ++ ++#include <stdio.h> ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#include <sys/ioctl.h> ++#include <machine/apm_bios.h> ++#include <stdlib.h> ++#include <errno.h> ++#include <unistd.h> ++#include <fcntl.h> ++#include <glib.h> ++ ++#include <dev/acpica/acpiio.h> ++#include <contrib/dev/acpica/acpi.h> ++ ++#include "acpi-freebsd.h" ++ ++static gboolean ++update_ac_info(struct acpi_info * acpiinfo) ++{ ++ int acline; ++ size_t len = sizeof(acline); ++ ++ acpiinfo->ac_online = FALSE; ++ ++ if (sysctlbyname(ACPI_ACLINE, &acline, &len, NULL, 0) == -1) { ++ return FALSE; ++ } ++ ++ acpiinfo->ac_online = acline ? TRUE : FALSE; ++ ++ return TRUE; ++} ++ ++static gboolean ++update_battery_info(struct acpi_info * acpiinfo) ++{ ++ union acpi_battery_ioctl_arg battio; ++ int i; ++ ++ /* We really don't have to do this here. All of the relevant battery ++ * info can be obtained through sysctl. However, one day, the rate ++ * may be useful to get time left to full charge. ++ */ ++ ++ for(i = BATT_MIN; i < BATT_MAX; i++) { ++ battio.unit = i; ++ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BIF, &battio) == -1) { ++ continue; ++ } ++ ++ acpiinfo->max_capacity += battio.bif.lfcap; ++ acpiinfo->low_capacity += battio.bif.wcap; ++ acpiinfo->critical_capacity += battio.bif.lcap; ++ } ++ ++ return TRUE; ++} ++ ++gboolean ++acpi_freebsd_init(struct acpi_info * acpiinfo) ++{ ++ int acpi_fd; ++ ++ g_assert(acpiinfo); ++ ++ acpi_fd = open(ACPIDEV, O_RDONLY); ++ if (acpi_fd >= 0) { ++ acpiinfo->acpifd = acpi_fd; ++ } ++ else { ++ acpiinfo->acpifd = -1; ++ return FALSE; ++ } ++ ++ update_battery_info(acpiinfo); ++ update_ac_info(acpiinfo); ++ ++ return TRUE; ++} ++ ++void ++acpi_freebsd_cleanup(struct acpi_info * acpiinfo) ++{ ++ g_assert(acpiinfo); ++ ++ if (acpiinfo->acpifd >= 0) { ++ close(acpiinfo->acpifd); ++ acpiinfo->acpifd = -1; ++ } ++} ++ ++/* XXX This is a hack since user-land applications can't get ACPI events yet. ++ * Devd provides this (or supposedly provides this), but you need to be ++ * root to access devd. ++ */ ++gboolean ++acpi_process_event(struct acpi_info * acpiinfo) ++{ ++ g_assert(acpiinfo); ++ ++ update_ac_info(acpiinfo); ++ update_battery_info(acpiinfo); ++ ++ return TRUE; ++} ++ ++gboolean ++acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo) ++{ ++ int time; ++ int life; ++ int acline; ++ int state; ++ size_t len; ++ int rate; ++ int remain; ++ union acpi_battery_ioctl_arg battio; ++ gboolean charging; ++ int i; ++ ++ g_assert(acpiinfo); ++ ++ charging = FALSE; ++ ++ for(i = BATT_MIN; i < BATT_MAX; i++) { ++ battio.unit = i; ++ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BST, &battio) == -1) { ++ continue; ++ } ++ ++ remain += battio.bst.cap; ++ rate += battio.bst.rate; ++ } ++ ++ len = sizeof(time); ++ if (sysctlbyname(ACPI_TIME, &time, &len, NULL, 0) == -1) { ++ return FALSE; ++ } ++ ++ len = sizeof(life); ++ if (sysctlbyname(ACPI_LIFE, &life, &len, NULL, 0) == -1) { ++ return FALSE; ++ } ++ ++ len = sizeof(state); ++ if (sysctlbyname(ACPI_STATE, &state, &len, NULL, 0) == -1) { ++ return FALSE; ++ } ++ ++ apminfo->ai_acline = acpiinfo->ac_online ? 1 : 0; ++ if (state & ACPI_BATT_STAT_CHARGING) { ++ apminfo->ai_batt_stat = 3; ++ charging = TRUE; ++ } ++ else if (state & ACPI_BATT_STAT_CRITICAL) { ++ /* Add a special check here since FreeBSD's ACPI interface will tell us ++ * when the battery is critical. ++ */ ++ apminfo->ai_batt_stat = 2; ++ } ++ else { ++ apminfo->ai_batt_stat = remain < acpiinfo->low_capacity ? 1 : remain < acpiinfo->critical_capacity ? 2 : 0; ++ } ++ apminfo->ai_batt_life = life; ++ if (!charging) { ++ apminfo->ai_batt_time = time * 60; ++ } ++ else if (charging && rate > 0) { ++ apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate * 60); ++ } ++ else ++ /* This multiplication is a hack to make sure the -1 survives so the applet ++ * can process it. Battstat wants the remaining time in minutes, but ++ * ai_batt_time is in seconds. In order to make both ACPI and APM work ++ * with the fewest amount of hacks, we will just assume everything is ++ * in seconds. ++ */ ++ apminfo->ai_batt_time = -1 * 60; ++ ++ return TRUE; ++} ++#endif +--- battstat/battstat_applet.c.orig Mon Sep 13 04:33:31 2004 ++++ battstat/battstat_applet.c Fri Oct 1 16:46:01 2004 +@@ -62,6 +62,9 @@ + #ifdef __linux__ + #include "acpi-linux.h" + #endif ++#ifdef __FreeBSD__ ++#include "acpi-freebsd.h" ++#endif + + #ifndef gettext_noop + #define gettext_noop(String) (String) +@@ -237,6 +240,24 @@ + #endif + + #ifdef __FreeBSD__ ++struct acpi_info acpiinfo; ++gboolean using_acpi; ++int acpi_count; ++ ++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); ++ ++gboolean acpi_callback (gpointer data) ++{ ++ ProgressData * battstat = (ProgressData *) data; ++ ++ if (acpi_process_event(&acpiinfo)) { ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ pixmap_timeout(data); ++ } ++ ++ return TRUE; ++} ++ + void + apm_readinfo (PanelApplet *applet, ProgressData * battstat) + { +@@ -247,13 +268,22 @@ + int fd; + if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); + +- fd = open(APMDEVICE, O_RDONLY); +- if (fd == -1) cleanup (applet, 1); ++ if (using_acpi) { ++ if (acpi_count <= 0) { ++ acpi_count = 30; ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ acpi_count--; ++ } ++ else { ++ fd = open(APMDEVICE, O_RDONLY); ++ if (fd == -1) cleanup (applet, 1); + +- if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) +- err(1, "ioctl(APMIO_GETINFO)"); ++ if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) ++ err(1, "ioctl(APMIO_GETINFO)"); + +- close(fd); ++ close(fd); ++ } + } + #elif defined(__NetBSD__) || defined(__OpenBSD__) + void +@@ -361,7 +391,7 @@ + + #ifdef __FreeBSD__ + acline_status = apminfo.ai_acline ? 1 : 0; +- time = apminfo.ai_batt_time; ++ time = (int) (apminfo.ai_batt_time / 60); + batt_life = apminfo.ai_batt_life; + #elif defined (__NetBSD__) || defined(__OpenBSD__) + acline_status = apminfo.ac_state ? 1 : 0; +@@ -375,8 +405,10 @@ + + if (batt_life > 100) batt_life = 100; + +- hours = time / 60; +- mins = time % 60; ++ if (time >= 0) { ++ hours = time / 60; ++ mins = time % 60; ++ } + + if (acline_status && batt_life == 100) + return g_strdup_printf (_("Battery charged (%d%%)"), batt_life); +@@ -912,6 +944,13 @@ + pdata->acpiwatch = 0; + acpi_linux_cleanup(&acpiinfo); + } ++#elif defined(__FreeBSD__) ++ if (using_acpi) { ++ if (pdata->acpiwatch != 0) ++ g_source_remove(pdata->acpiwatch); ++ pdata->acpiwatch = 0; ++ acpi_freebsd_cleanup(&acpiinfo); ++ } + #endif + + if (pdata->suspend_cmd) +@@ -1052,6 +1091,7 @@ + "Lennart Poettering <lennart@poettering.de> (Linux ACPI support)", + "Seth Nickell <snickell@stanford.edu> (GNOME2 port)", + "Davyd Madeley <davyd@ucc.asn.au>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)", + NULL + }; + +@@ -1760,11 +1800,18 @@ + using_acpi = TRUE; + acpi_count = 0; + } ++#elif defined(__FreeBSD__) ++ if (acpi_freebsd_init(&acpiinfo)) { ++ using_acpi = TRUE; ++ acpi_count = 0; ++ } ++ else ++ using_acpi = FALSE; + #endif + apm_readinfo (applet, NULL); + + #ifdef __FreeBSD__ +- if(apminfo.ai_status == 0) cleanup (applet, 2); ++ if(!using_acpi && apminfo.ai_status == 0) cleanup (applet, 2); + #endif + + battstat = g_new0 (ProgressData, 1); +@@ -1803,6 +1850,10 @@ + battstat->acpiwatch = g_io_add_watch (acpiinfo.channel, + G_IO_IN | G_IO_ERR | G_IO_HUP, + acpi_callback, battstat); ++ } ++#elif defined(__FreeBSD__) ++ if (using_acpi) { ++ battstat->acpiwatch = g_timeout_add (2000, acpi_callback, battstat); + } + #endif + diff --git a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in new file mode 100644 index 000000000000..ecaea9dab09e --- /dev/null +++ b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in @@ -0,0 +1,11 @@ +--- battstat/battstat.schemas.in.orig Fri Oct 1 16:22:39 2004 ++++ battstat/battstat.schemas.in Fri Oct 1 16:22:46 2004 +@@ -115,7 +115,7 @@ + <key>/schemas/apps/battstat-applet/prefs/suspend_command</key> + <owner>battstat-applet</owner> + <type>string</type> +- <default>/usr/bin/apm -s</default> ++ <default>/usr/sbin/apm -s</default> + <locale name="C"> + <short>Suspend Command</short> + <long>Command to send to suspend the computer</long> diff --git a/x11/gnome-applets/files/patch-wireless_wireless-applet.c b/x11/gnome-applets/files/patch-wireless_wireless-applet.c index b7ca26a8262a..f66bc56578d7 100644 --- a/x11/gnome-applets/files/patch-wireless_wireless-applet.c +++ b/x11/gnome-applets/files/patch-wireless_wireless-applet.c @@ -1,6 +1,6 @@ ---- wireless/wireless-applet.c.orig Tue Apr 13 06:39:46 2004 -+++ wireless/wireless-applet.c Tue Jun 15 01:22:59 2004 -@@ -30,6 +30,15 @@ +--- wireless/wireless-applet.c.orig Mon Aug 16 04:45:55 2004 ++++ wireless/wireless-applet.c Mon Sep 20 17:17:27 2004 +@@ -30,12 +30,25 @@ #include <math.h> #include <dirent.h> @@ -16,9 +16,7 @@ #include <gnome.h> #include <panel-applet.h> #include <panel-applet-gconf.h> -@@ -37,7 +46,11 @@ - - #include <egg-screen-help.h> + #include <glade/glade.h> +#ifdef __FreeBSD__ +#define CFG_DEVICE "an0" @@ -28,7 +26,7 @@ #define CFG_UPDATE_INTERVAL 2 typedef enum { -@@ -94,6 +107,12 @@ +@@ -92,6 +105,12 @@ WirelessApplet *applet); static void wireless_applet_about_cb (BonoboUIComponent *uic, WirelessApplet *applet); @@ -41,8 +39,8 @@ static void prefs_response_cb (GtkDialog *dialog, gint response, gpointer data); static const BonoboUIVerb wireless_menu_verbs [] = { -@@ -157,9 +176,11 @@ - g_free (tmp); +@@ -159,9 +178,11 @@ + g_free (tltp); /* Update the image */ +#ifndef __FreeBSD__ @@ -54,7 +52,7 @@ state = PIX_BROKEN; else if (percent == 0) state = PIX_NO_LINK; -@@ -190,6 +211,7 @@ +@@ -192,6 +213,7 @@ int percent; /* Calculate the percentage based on the link quality */ @@ -62,7 +60,7 @@ if (level < 0) { percent = -1; } else { -@@ -200,6 +222,9 @@ +@@ -202,6 +224,9 @@ percent = CLAMP (percent, 0, 100); } } @@ -72,7 +70,7 @@ wireless_applet_draw (applet, percent); } -@@ -242,14 +267,147 @@ +@@ -244,14 +269,179 @@ } } @@ -129,7 +127,39 @@ + + signal_strength = (long int) (wreq.wi_val[1]); + -+ memcpy(level, &signal_strength, sizeof(level)); ++#ifdef WI_RID_READ_APS ++ if (signal_strength <= 0) { ++ /* we fail to get signal strength by usual means, try another way */ ++ static time_t last_scan; ++ static long int cached; ++ time_t now = time(NULL); ++ ++ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ ++ if (now > last_scan + 5) { ++ struct wi_apinfo *w; ++ int nstations; ++ ++ bzero((char *)&wreq, sizeof(wreq)); ++ wreq.wi_len = WI_MAX_DATALEN; ++ wreq.wi_type = WI_RID_READ_APS; ++ ++ (void)wi_getval(applet, device, &wreq); ++ ++ nstations = *(int *)wreq.wi_val; ++ if (nstations > 0) { ++ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); ++ signal_strength = (long int)w->signal; ++ } ++ ++ cached = signal_strength; ++ last_scan = now; ++ } else { ++ signal_strength = cached; ++ } ++ } ++#endif ++ ++ memcpy(level, &signal_strength, sizeof( *level )); + + return; +} @@ -222,7 +252,7 @@ gboolean found = FALSE; /* resest list of available wireless devices */ -@@ -257,8 +415,35 @@ +@@ -259,8 +449,37 @@ g_list_free (applet->devices); applet->devices = NULL; @@ -245,7 +275,9 @@ + found = TRUE; + } + } -+ else if (g_strncasecmp (device, "wi", 2)==0 || g_strncasecmp (device, "ath", 3)==0) { ++ else if (g_strncasecmp (device, "wi", 2)==0 || ++ g_strncasecmp (device, "ath", 3)==0 || ++ g_strncasecmp (device, "ndis", 4)==0) { + applet->devices = g_list_prepend (applet->devices, g_strdup (device)); + if (g_strcasecmp (applet->device, device)==0) { + get_wi_data (applet, device, &level); @@ -258,7 +290,7 @@ char *ptr; fgets (line, 256, applet->file); -@@ -292,6 +477,7 @@ +@@ -294,6 +513,7 @@ found = TRUE; } } @@ -266,7 +298,7 @@ } while (1); if (g_list_length (applet->devices)==1) { -@@ -303,17 +489,23 @@ +@@ -305,17 +525,23 @@ } /* rewind the /proc/net/wireless file */ @@ -290,23 +322,20 @@ wireless_applet_read_device_state (applet); -@@ -360,6 +552,7 @@ +@@ -362,10 +588,12 @@ static void start_file_read (WirelessApplet *applet) { +#ifndef __FreeBSD__ applet->file = fopen ("/proc/net/wireless", "rt"); if (applet->file == NULL) { - gtk_tooltips_set_tip (applet->tips, -@@ -368,6 +561,7 @@ - NULL); show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect.")); } +#endif } static void -@@ -670,8 +864,10 @@ +@@ -668,8 +896,10 @@ applet->prefs = NULL; } diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 23785f86439c..e235aa2c792a 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -1,51 +1,6 @@ bin/gkb_xmmap bin/gnome-keyboard-layout bin/gswitchit-plugins-capplet -%%BATTERY%%@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/battstat.schemas > /dev/null || /usr/bin/true -%%BATTERY%%etc/gconf/schemas/battstat.schemas -%%BATTERY%%@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/battstat.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/cdplayer.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/cdplayer.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/cdplayer.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/charpick.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/charpick.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/charpick.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/drivemount.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/drivemount.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/drivemount.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/geyes.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/geyes.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/geyes.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gkb.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gkb.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gkb.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gswitchit.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gswitchit.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gswitchit.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtik.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gtik.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtik.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gweather.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gweather.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gweather.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mailcheck.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/mailcheck.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mailcheck.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mini-commander.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/mini-commander.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mini-commander.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mixer.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/mixer.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mixer.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/modemlights.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/modemlights.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/modemlights.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/multiload.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/multiload.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/multiload.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/stickynotes.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/stickynotes.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/stickynotes.schemas > /dev/null || /usr/bin/true %%BATTERY%%etc/sound/events/battstat_applet.soundlist etc/sound/events/mailcheck.soundlist include/libgswitchit/gswitchit_plugin.h @@ -194,6 +149,7 @@ share/gnome/gkb/SE_Swedish.keyprop share/gnome/gkb/SE_Swedish_x.keyprop share/gnome/gkb/SI_Slovenian.keyprop share/gnome/gkb/SI_Slovenian_x.keyprop +share/gnome/gkb/SK__x.keyprop share/gnome/gkb/SR_Dutch.keyprop share/gnome/gkb/Slovak.keyprop share/gnome/gkb/Slovene.keyprop @@ -252,7 +208,7 @@ share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml share/gnome/gswitchit/gswitchit-plugins.glade share/gnome/gswitchit/gswitchit-properties.glade -share/gnome/gweather/Locations +share/gnome/gweather/Locations.xml share/gnome/help/accessx-status/C/accessx-status.xml share/gnome/help/accessx-status/C/figures/accessx-status-applet.png share/gnome/help/accessx-status/C/legal.xml @@ -580,11 +536,6 @@ share/gnome/help/char-palette/it/figures/charpick_chargroup.png share/gnome/help/char-palette/it/legal.xml share/gnome/help/char-palette/ja/char-palette.xml share/gnome/help/char-palette/ja/figures/charpalette_applet.png -share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png -share/gnome/help/char-palette/ja/figures/charpick_applet.png -share/gnome/help/char-palette/ja/figures/charpick_characters.png -share/gnome/help/char-palette/ja/figures/charpick_chargroup.png -share/gnome/help/char-palette/ja/figures/mailcheck_applet.png share/gnome/help/char-palette/ja/legal.xml share/gnome/help/char-palette/ko/char-palette.xml share/gnome/help/char-palette/ko/figures/charpalette_applet.png @@ -818,6 +769,8 @@ share/gnome/help/gkb/zh_HK/legal.xml share/gnome/help/gkb/zh_TW/figures/gkb_applet.png share/gnome/help/gkb/zh_TW/gkb.xml share/gnome/help/gkb/zh_TW/legal.xml +share/gnome/help/gswitchit/C/gswitchit.xml +share/gnome/help/gswitchit/C/legal.xml share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml share/gnome/help/gtik2_applet2/C/legal.xml @@ -1349,6 +1302,8 @@ share/gnome/omf/gnome-applets/gkb-zh_HK.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gkb-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/gswitchit-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gswitchit-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-de.omf @@ -1641,6 +1596,7 @@ share/gnome/pixmaps/gkb/yu.png share/gnome/pixmaps/gnome-cpu.png share/gnome/pixmaps/gnome-eyes.png share/gnome/pixmaps/gnome-mini-commander.png +share/gnome/pixmaps/gnome-mixer-applet.png share/gnome/pixmaps/gswitchit-applet.png share/gnome/pixmaps/gswitchit-properties-capplet.png share/gnome/pixmaps/mailcheck/eclouds.png @@ -1651,7 +1607,6 @@ share/gnome/pixmaps/mailcheck/email.png share/gnome/pixmaps/mailcheck/tux-anim.png share/gnome/pixmaps/mini-commander/browser-mini.xpm share/gnome/pixmaps/mini-commander/history-mini.xpm -share/gnome/pixmaps/mixer/gnome-mixer-applet.png share/gnome/pixmaps/mixer/volume-max.png share/gnome/pixmaps/mixer/volume-medium.png share/gnome/pixmaps/mixer/volume-min.png @@ -1764,6 +1719,7 @@ share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo @@ -1785,17 +1741,18 @@ share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/mi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo @@ -2006,6 +1963,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gtik2_applet2/C/figures @dirrm share/gnome/help/gtik2_applet2/C @dirrm share/gnome/help/gtik2_applet2 +@dirrm share/gnome/help/gswitchit/C +@dirrm share/gnome/help/gswitchit @dirrm share/gnome/help/gkb/zh_TW/figures @dirrm share/gnome/help/gkb/zh_TW @dirrm share/gnome/help/gkb/zh_HK/figures @@ -2285,6 +2244,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gswitchit-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-es.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 7d0085385bd5..03fa441302e1 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.6 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.8 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,12 +20,12 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_BISON= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 157cde1df0e2..fd37f714c120 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.6.2.tar.bz2) = efe9949e7aed8ca143287ec551b6852a -SIZE (gnome2/gnome-desktop-2.6.2.tar.bz2) = 1131159 +MD5 (gnome2/gnome-desktop-2.8.1.tar.bz2) = 47f9b9508c4a0349d66fa1138b521794 +SIZE (gnome2/gnome-desktop-2.8.1.tar.bz2) = 1132666 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index f2699e459a3b..a4be6d322f61 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -183,6 +183,7 @@ share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo @@ -207,20 +208,21 @@ share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo @dirrm share/gnome/omf/gnome-desktop -@dirrm share/gnome/help/lgpl/C @dirrm share/gnome/help/lgpl/eu +@dirrm share/gnome/help/lgpl/C @dirrm share/gnome/help/lgpl -@dirrm share/gnome/help/gpl/C @dirrm share/gnome/help/gpl/eu +@dirrm share/gnome/help/gpl/C @dirrm share/gnome/help/gpl -@dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback/eu +@dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback -@dirrm share/gnome/help/fdl/C @dirrm share/gnome/help/fdl/eu +@dirrm share/gnome/help/fdl/C @dirrm share/gnome/help/fdl @dirrm share/gnome/gnome-about/headers @dirrm share/gnome/gnome-about diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 65f532081d2d..064ce43d2107 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.6 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.8 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,21 +21,43 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \ +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomedesktop \ libwnck +WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-kde-docdir=${LOCALBASE}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= gnome-panel.1 gnome-panel-preferences.1 +MAN1= gnome-panel.1 +GCONF_SCHEMAS= clock.schemas fish.schemas gnome-panel-screenshot.schemas \ + panel-compatibility.schemas panel-general.schemas \ + panel-global.schemas panel-object.schemas \ + panel-toplevel.schemas window-list.schemas \ + workspace-switcher.schemas +.include <bsd.port.pre.mk> + +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + +.if ${HAVE_GNOME:Mevolutiondataserver}!="" +USE_GNOME+= evolutiondataserver +CONFIGURE_ARGS+=--enable-eds +.else +CONFIGURE_ARGS+=--disable-eds +.endif + +.if ${OSVERSION} < 600006 post-patch: -.for po in da.po it.po zh_TW.po +.for po in da.po it.po zh_CN.po zh_TW.po @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} .endfor +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 0a30f300febf..454689617e2e 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-panel-2.6.2.tar.bz2) = 41318b24e18f497b4418c7d60aaf33f6 -SIZE (gnome2/gnome-panel-2.6.2.tar.bz2) = 3082567 +MD5 (gnome2/gnome-panel-2.8.1.tar.bz2) = 77aea214467da238170ed10dbc825799 +SIZE (gnome2/gnome-panel-2.8.1.tar.bz2) = 3210138 diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index a8e8e95e3e4b..9b385b60a358 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -1,43 +1,12 @@ bin/gnome-desktop-item-edit bin/gnome-panel -bin/gnome-panel-preferences bin/gnome-panel-screenshot bin/panel-test-applets -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/clock.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/clock.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/clock.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fish.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/fish.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fish.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-panel-screenshot.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-panel-screenshot.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-panel-screenshot.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-compatibility.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/panel-compatibility.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-compatibility.schemas > /dev/null || /usr/bin/true @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true etc/gconf/schemas/panel-default-setup.entries @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-general.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/panel-general.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-general.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-global.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/panel-global.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-global.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-object.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/panel-object.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-object.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-toplevel.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/panel-toplevel.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-toplevel.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/window-list.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/window-list.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/window-list.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/workspace-switcher.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/workspace-switcher.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/workspace-switcher.schemas > /dev/null || /usr/bin/true include/panel-2.0/GNOME_Panel.h include/panel-2.0/panel-applet-enums.h include/panel-2.0/panel-applet-gconf.h @@ -73,7 +42,6 @@ share/doc/panel-applet/server-files.html share/doc/panel-applet/session-saving.html share/doc/panel-applet/style.css share/doc/panel-applet/up.png -share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml @@ -322,7 +290,6 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/panel/gnome-panel-preferences.glade share/gnome/panel/gnome-panel-screenshot.glade share/gnome/panel/panel-properties-dialog.glade share/gnome/panel/panel-run-dialog.glade @@ -355,6 +322,7 @@ share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo @@ -390,6 +358,7 @@ share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index ab5ff700a301..094f576055b2 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -6,12 +6,12 @@ # PORTNAME= gnomesession -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://people.FreeBSD.org/~marcus/:local \ ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= sources/gnome-session/2.6 \ +MASTER_SITE_SUBDIR= sources/gnome-session/2.8 \ marcus/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -24,19 +24,20 @@ COMMENT= Session component for the GNOME 2 desktop USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeui USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-halt-command=/sbin/shutdown \ --with-reboot-command=/sbin/shutdown CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ - gnome-session-save.1 -MAN5= default.session.5 +MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 \ + session-properties.1 gnome-session-save.1 +MAN5= default.session.5 +GCONF_SCHEMAS= gnome-session.schemas -SPLASH_IMG= gnome-splash04-12.png +SPLASH_IMG= gnome-splash28.png post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR} diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 47fa01285ba3..8f05e97ece4c 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.6.2.tar.bz2) = 0c80fbb64123cef7f2d7a9b69b0b965e -SIZE (gnome2/gnome-session-2.6.2.tar.bz2) = 873420 -MD5 (gnome2/gnome-splash04-12.png) = a26cafb0ccffd5e173d7255e683faafd -SIZE (gnome2/gnome-splash04-12.png) = 75841 +MD5 (gnome2/gnome-session-2.8.1.tar.bz2) = 15402d84eef4cf159bb8de78f432bb98 +SIZE (gnome2/gnome-session-2.8.1.tar.bz2) = 883921 +MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55 +SIZE (gnome2/gnome-splash28.png) = 121715 diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in index 60c14531bce0..2b05e8c0027e 100644 --- a/x11/gnome-session/files/patch-gnome-session_Makefile.in +++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in @@ -1,11 +1,11 @@ ---- gnome-session/Makefile.in.orig Wed May 8 14:36:22 2002 -+++ gnome-session/Makefile.in Wed May 8 14:36:34 2002 -@@ -129,7 +129,7 @@ +--- gnome-session/Makefile.in.orig Mon May 31 14:34:48 2004 ++++ gnome-session/Makefile.in Mon May 31 14:34:57 2004 +@@ -153,7 +153,7 @@ NULL = -defaultdir = $(datadir)/gnome +defaultdir = $(datadir) - INCLUDES = $(GNOME_SESSION_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DDEFAULTDIR="\"$(defaultdir)\"" + INCLUDES = $(GNOME_SESSION_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\"" -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DRSH_COMMAND=\""$(RSH_COMMAND)\"" -DGCONFTOOL_CMD=\""$(GCONFTOOL)\"" -DDEFAULTDIR="\"$(defaultdir)\"" -DESD_SERVER="\"$(ESD_SERVER)\"" diff --git a/x11/gnome-session/files/patch-gnome-session_manager.c b/x11/gnome-session/files/patch-gnome-session_manager.c new file mode 100644 index 000000000000..7e56843ac733 --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_manager.c @@ -0,0 +1,14 @@ +--- gnome-session/manager.c.orig Tue Oct 12 14:04:26 2004 ++++ gnome-session/manager.c Tue Oct 12 14:05:51 2004 +@@ -1042,9 +1042,10 @@ + + if (interact_ping_replied) + { ++ IceConn ice_conn; + gsm_verbose ("have interact_list; sending ping with data to client %p\n", client); + print_client (client); +- IceConn ice_conn = SmsGetIceConnection (client->connection); ++ ice_conn = SmsGetIceConnection (client->connection); + interact_ping_replied = FALSE; + IcePing (ice_conn, interact_ping_reply, (IcePointer)client); + } diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index ae71556f4a43..6107618a5527 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -4,9 +4,6 @@ bin/gnome-session-remove bin/gnome-session-save bin/gnome-smproxy bin/gnome-wm -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-session.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true share/gnome/control-center-2.0/capplets/session-properties.desktop share/gnome/default.session share/gnome/default.wm @@ -16,9 +13,9 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/be/LC_MESSAGES/gnome-session-2.0.mo +share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo -share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo @@ -55,6 +52,8 @@ share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo share/locale/no/LC_MESSAGES/gnome-session-2.0.mo @@ -72,6 +71,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo share/locale/th/LC_MESSAGES/gnome-session-2.0.mo +share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index a6905e02a207..303ea7a5d354 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.6.1 -PORTREVISION= 2 +PORTVERSION= 2.8.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.6 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.8 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,9 +20,11 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui vte -USE_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui vte +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= gnome-terminal.schemas + .include <bsd.port.mk> diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index 53e2076ddaee..97c12e3c7f68 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.6.1.tar.bz2) = 43e04260410e66e767a4b247d0af8b46 -SIZE (gnome2/gnome-terminal-2.6.1.tar.bz2) = 1999378 +MD5 (gnome2/gnome-terminal-2.8.0.tar.bz2) = 93e59f24b35bd867653664565adb4672 +SIZE (gnome2/gnome-terminal-2.8.0.tar.bz2) = 2195403 diff --git a/x11/gnome-terminal/files/patch-src-eggcellrendererkeys.c b/x11/gnome-terminal/files/patch-src-eggcellrendererkeys.c deleted file mode 100644 index 57c197bee543..000000000000 --- a/x11/gnome-terminal/files/patch-src-eggcellrendererkeys.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/eggcellrendererkeys.c.orig Thu Jul 29 23:34:48 2004 -+++ src/eggcellrendererkeys.c Thu Jul 29 23:35:36 2004 -@@ -584,7 +584,7 @@ - void - egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, - guint keyval, -- GdkModifierType mask) -+ EggVirtualModifierType mask) - { - char *text; - gboolean changed; -@@ -626,7 +626,7 @@ - void - egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys, - guint *keyval, -- GdkModifierType *mask) -+ EggVirtualModifierType *mask) - { - g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); - diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 12dd4ed33afc..2ef85466b931 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -1,7 +1,4 @@ bin/gnome-terminal -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-terminal.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true libdata/bonobo/servers/gnome-terminal.server share/gnome/application-registry/gnome-terminal.applications share/gnome/applications/gnome-terminal.desktop @@ -90,6 +87,7 @@ share/locale/az/LC_MESSAGES/gnome-terminal.mo share/locale/be/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo share/locale/bn/LC_MESSAGES/gnome-terminal.mo +share/locale/bs/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo share/locale/cs/LC_MESSAGES/gnome-terminal.mo share/locale/cy/LC_MESSAGES/gnome-terminal.mo @@ -100,6 +98,7 @@ share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo share/locale/es/LC_MESSAGES/gnome-terminal.mo share/locale/et/LC_MESSAGES/gnome-terminal.mo +share/locale/eu/LC_MESSAGES/gnome-terminal.mo share/locale/fa/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo share/locale/fr/LC_MESSAGES/gnome-terminal.mo @@ -120,6 +119,7 @@ share/locale/mk/LC_MESSAGES/gnome-terminal.mo share/locale/ml/LC_MESSAGES/gnome-terminal.mo share/locale/mn/LC_MESSAGES/gnome-terminal.mo share/locale/ms/LC_MESSAGES/gnome-terminal.mo +share/locale/nb/LC_MESSAGES/gnome-terminal.mo share/locale/nl/LC_MESSAGES/gnome-terminal.mo share/locale/nn/LC_MESSAGES/gnome-terminal.mo share/locale/no/LC_MESSAGES/gnome-terminal.mo diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index e6a2a83ba130..160b270c9c7b 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-fifth-toe -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -28,14 +28,13 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras \ bluefish:${PORTSDIR}/www/bluefish-devel \ gossip:${PORTSDIR}/net/gossip \ - inkscape:${PORTSDIR}/graphics/inkscape \ straw:${PORTSDIR}/net/straw \ liferea:${PORTSDIR}/net/liferea \ gnotime:${PORTSDIR}/deskutils/gnotime \ sound-juicer:${PORTSDIR}/audio/sound-juicer \ rhythmbox:${PORTSDIR}/audio/rhythmbox \ - network-admin:${PORTSDIR}/sysutils/gnomesystemtools \ - jamboree:${PORTSDIR}/audio/jamboree + jamboree:${PORTSDIR}/audio/jamboree \ + ${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnomegames2-extra-data .if !defined(PACKAGE_BUILDING) && !defined(PARALLEL_PACKAGE_BUILD) RUN_DEPENDS+= totem:${PORTSDIR}/multimedia/totem @@ -43,6 +42,12 @@ RUN_DEPENDS+= totem:${PORTSDIR}/multimedia/totem NO_BUILD= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500000 +RUN_DEPENDS+= inkscape:${PORTSDIR}/graphics/inkscape +.endif + do-install: # empty -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index 6f21feaef3b2..d0a5cd8fc05c 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2 -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 CATEGORIES= x11 gnome MASTER_SITES= # empty PKGNAMESUFFIX= -lite diff --git a/x11/gnome2-lite/pkg-message b/x11/gnome2-lite/pkg-message index 1ef09fe3d3c0..0b0e5564e4be 100644 --- a/x11/gnome2-lite/pkg-message +++ b/x11/gnome2-lite/pkg-message @@ -2,7 +2,7 @@ The GNOME 2 desktop Lite edition has been successfully installed. -The Lite edition does not include all the components of the standard +The Lite edition does not include all the components of the standard GNOME 2 desktop as detailed at http://www.gnome.org. If you wish to install the full desktop, you can remove this port, and install the x11/gnome2 port or package. That can be best accomplished using @@ -12,7 +12,7 @@ the following commands: # cd /usr/ports/x11/gnome2 # make install clean -Alternatively, you can install additional GNOME components individually +Alternatively, you can install additional GNOME components individually using either their ports or packages. For more help on using GNOME on FreeBSD, please see the FreeBSD GNOME project diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index 369b4a0b4e8d..c37a59cd35ec 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnome2-power-tools -PORTVERSION= 2.6.2 -PORTREVISION= 2 +PORTVERSION= 2.8.1 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -22,11 +21,10 @@ RUN_DEPENDS= ${X11BASE}/lib/epiphany/extensions/libgesturesextension.so:${PORTSD ${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ ${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \ splashsetter:${PORTSDIR}/deskutils/splashsetter \ - gnome-nettool:${PORTSDIR}/net/gnomenettool \ gdesklets:${PORTSDIR}/deskutils/gdesklets \ - vino-session:${PORTSDIR}/net/vino \ cog:${PORTSDIR}/sysutils/cog \ gnome-blog-poster:${PORTSDIR}/deskutils/gnomeblog \ + gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \ gnomesu:${PORTSDIR}/sysutils/gnomesu NO_BUILD= yes diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 7b335621179a..df554fa020b8 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2 -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -47,7 +47,13 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ gnopernicus:${PORTSDIR}/accessibility/gnopernicus \ ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \ - dasher:${PORTSDIR}/accessibility/dasher + dasher:${PORTSDIR}/accessibility/dasher \ + evolution-2.0:${PORTSDIR}/mail/evolution \ + ${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ + network-admin:${PORTSDIR}/sysutils/gnomesystemtools \ + gnome-nettool:${PORTSDIR}/net/gnomenettool \ + vino-session:${PORTSDIR}/net/vino \ + ximian-connector-setup-2.0:${PORTSDIR}/mail/ximian-connector NO_BUILD= yes diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 28b69fcfec0c..4d86584d6f0b 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.6.2.1 -PORTREVISION= 4 +PORTVERSION= 2.8.1.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.6 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.8 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -29,7 +28,15 @@ USE_GNOME= gnomehier gnomeprefix gnomehack intlhack gnomepanel \ gstreamerplugins gail USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + FREEBSD_SYS=${FREEBSD_SYS} + +GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas gkb.schemas \ + gswitchit.schemas gtik.schemas gweather.schemas \ + mailcheck.schemas mini-commander.schemas mixer.schemas \ + modemlights.schemas multiload.schemas stickynotes.schemas + +FREEBSD_SYS?= /usr/src/sys .include <bsd.port.pre.mk> @@ -37,7 +44,20 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" PLIST_SUB= BATTERY="@comment " .else +GCONF_SCHEMAS+= battstat.schemas PLIST_SUB= BATTERY="" + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} " W A R N I N G" + @${ECHO_MSG} "*****************************************************" + @${ECHO_MSG} "* gnomeapplets2 requires that you have your kernel *" + @${ECHO_MSG} "* sources installed. If your kernel sources *" + @${ECHO_MSG} "* are somewhere other than /usr/src/sys, you *" + @${ECHO_MSG} "* may set the FREEBSD_SYS variable to the *" + @${ECHO_MSG} "* correct path. *" + @${ECHO_MSG} "*****************************************************" + @${ECHO_MSG} "" .endif .include <bsd.port.post.mk> diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo index fa0dd052696d..2f9ff553586d 100644 --- a/x11/gnomeapplets2/distinfo +++ b/x11/gnomeapplets2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-applets-2.6.2.1.tar.bz2) = d29dc21035db8b93671058d7f1ac4aaa -SIZE (gnome2/gnome-applets-2.6.2.1.tar.bz2) = 5478737 +MD5 (gnome2/gnome-applets-2.8.1.1.tar.bz2) = 897d6f7aed1717c5be9d5707c0407604 +SIZE (gnome2/gnome-applets-2.8.1.1.tar.bz2) = 6405066 diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index 73b0823ce82e..0186faf0ee14 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -1,6 +1,15 @@ ---- configure.orig Sun Feb 22 19:22:49 2004 -+++ configure Sun Feb 22 19:24:33 2004 -@@ -22912,6 +22912,7 @@ +--- configure.orig Sat Oct 16 15:45:26 2004 ++++ configure Sat Oct 16 15:47:04 2004 +@@ -463,7 +463,7 @@ + # include <unistd.h> + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE ACPIINC BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -24323,6 +24323,7 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";; @@ -8,16 +17,29 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -23034,7 +23035,7 @@ - - ;; - # list of supported OS cores that do not use libapm -- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) -+ i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) - ;; - *) - echo "warning: ${host} is not supported by battstat_applet, not building" >&2 -@@ -24905,14 +24906,14 @@ +@@ -24384,6 +24385,7 @@ + + HAVE_LIBAPM=no + NEED_LIBAPM=no ++ACPIINC= + build_battstat_applet=no + + if test x$disable_battstat = xno; then +@@ -24535,7 +24537,12 @@ + + ;; + # list of supported OS cores that do not use libapm +- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) ++ i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) ++ if [ -n "${FREEBSD_SYS}" ]; then ++ ACPIINC="-I${FREEBSD_SYS}" ++ else ++ ACPIINC="-I/usr/src/sys" ++ fi + ;; + *) + echo "warning: ${host} is not supported by battstat_applet, not building" >&2 +@@ -26615,14 +26622,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" cat >>confdefs.h <<_ACEOF @@ -34,3 +56,11 @@ _ACEOF cat >>confdefs.h <<_ACEOF +@@ -27773,6 +27780,7 @@ + s,@APPLET_CDPLAYER_FALSE@,$APPLET_CDPLAYER_FALSE,;t t + s,@CDROM_HOST@,$CDROM_HOST,;t t + s,@CDROM_LIBS@,$CDROM_LIBS,;t t ++s,@ACPIINC@,$ACPIINC,;t t + s,@HAVE_LIBAPM@,$HAVE_LIBAPM,;t t + s,@NEED_LIBAPM@,$NEED_LIBAPM,;t t + s,@HAVE_LIBAPM_TRUE@,$HAVE_LIBAPM_TRUE,;t t diff --git a/x11/gnomeapplets2/files/patch-battstat-acpi b/x11/gnomeapplets2/files/patch-battstat-acpi new file mode 100644 index 000000000000..4025a9a360f1 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-battstat-acpi @@ -0,0 +1,459 @@ +--- battstat/Makefile.in.orig Mon Sep 27 18:39:44 2004 ++++ battstat/Makefile.in Mon Sep 27 18:40:56 2004 +@@ -173,6 +173,8 @@ + pixmapsdir = $(datadir)/pixmaps + pixmaps_DATA = battstat.png + ++ACPIINC = @ACPIINC@ ++ + @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@APMLIB = apmlib/libapm.a + @HAVE_LIBAPM_TRUE@@NEED_LIBAPM_TRUE@APMLIB = -lapm + @NEED_LIBAPM_FALSE@APMLIB = +@@ -191,6 +193,7 @@ + $(GNOME_APPLETS_CFLAGS) \ + $(LIBGLADE_CFLAGS) \ + $(APMINC) \ ++ $(ACPIINC) \ + -DDATA_DIR=\"$(datadir)\" \ + -DGLADE_DIR=\"$(gladedir)\" \ + -DG_LOG_DOMAIN=\"battstat_applet\" \ +@@ -205,7 +208,9 @@ + properties.c \ + battstat_applet.c \ + acpi-linux.c \ +- acpi-linux.h ++ acpi-linux.h \ ++ acpi-freebsd.c \ ++ acpi-freebsd.h + + + battstat_applet_2_LDADD = \ +@@ -242,7 +247,7 @@ + PROGRAMS = $(libexec_PROGRAMS) + + am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ +- battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT) ++ battstat_applet.$(OBJEXT) acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT) + battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS) + @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \ + @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a +@@ -259,6 +264,7 @@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/acpi-freebsd.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/battstat_applet.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/properties.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -330,6 +336,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@ + +--- battstat/acpi-freebsd.h.orig Mon Sep 27 18:39:30 2004 ++++ battstat/acpi-freebsd.h Mon Sep 27 18:39:30 2004 +@@ -0,0 +1,45 @@ ++/* ++ * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. ++ */ ++ ++#ifndef __ACPI_FREEBSD_H__ ++#define __ACPI_FREEBSD_H__ ++ ++#define ACPIDEV "/dev/acpi" ++ ++#define BATT_MIN 0 ++#define BATT_MAX 64 ++ ++#define ACPI_ACLINE "hw.acpi.acline" ++#define ACPI_TIME "hw.acpi.battery.time" ++#define ACPI_LIFE "hw.acpi.battery.life" ++#define ACPI_STATE "hw.acpi.battery.state" ++ ++struct acpi_info { ++ gboolean ac_online; ++ int acpifd; ++ int max_capacity; ++ int low_capacity; ++ int critical_capacity; ++}; ++ ++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); ++gboolean acpi_process_event(struct acpi_info * acpiinfo); ++gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); ++void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); ++ ++#endif /* __ACPI_FREEBSD_H__ */ +--- battstat/acpi-freebsd.c.orig Tue Sep 28 16:55:52 2004 ++++ battstat/acpi-freebsd.c Tue Sep 28 17:00:32 2004 +@@ -0,0 +1,213 @@ ++/* battstat A GNOME battery meter for laptops. ++ * Copyright (C) 2000 by Jörgen Pehrson <jp@spektr.eu.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. ++ * ++ $Id: patch-battstat-acpi,v 1.3 2004/10/01 20:45:45 marcus Exp $ ++ */ ++ ++/* ++ * ACPI battery functions for FreeBSD >= 5.2. ++ * September 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ ++#ifdef __FreeBSD__ ++ ++#include <stdio.h> ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#include <sys/ioctl.h> ++#include <machine/apm_bios.h> ++#include <stdlib.h> ++#include <errno.h> ++#include <unistd.h> ++#include <fcntl.h> ++#include <glib.h> ++ ++#include <dev/acpica/acpiio.h> ++#include <contrib/dev/acpica/acpi.h> ++ ++#include "acpi-freebsd.h" ++ ++static gboolean ++update_ac_info(struct acpi_info * acpiinfo) ++{ ++ int acline; ++ size_t len = sizeof(acline); ++ ++ acpiinfo->ac_online = FALSE; ++ ++ if (sysctlbyname(ACPI_ACLINE, &acline, &len, NULL, 0) == -1) { ++ return FALSE; ++ } ++ ++ acpiinfo->ac_online = acline ? TRUE : FALSE; ++ ++ return TRUE; ++} ++ ++static gboolean ++update_battery_info(struct acpi_info * acpiinfo) ++{ ++ union acpi_battery_ioctl_arg battio; ++ int i; ++ ++ /* We really don't have to do this here. All of the relevant battery ++ * info can be obtained through sysctl. However, one day, the rate ++ * may be useful to get time left to full charge. ++ */ ++ ++ for(i = BATT_MIN; i < BATT_MAX; i++) { ++ battio.unit = i; ++ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BIF, &battio) == -1) { ++ continue; ++ } ++ ++ acpiinfo->max_capacity += battio.bif.lfcap; ++ acpiinfo->low_capacity += battio.bif.wcap; ++ acpiinfo->critical_capacity += battio.bif.lcap; ++ } ++ ++ return TRUE; ++} ++ ++gboolean ++acpi_freebsd_init(struct acpi_info * acpiinfo) ++{ ++ int acpi_fd; ++ ++ g_assert(acpiinfo); ++ ++ acpi_fd = open(ACPIDEV, O_RDONLY); ++ if (acpi_fd >= 0) { ++ acpiinfo->acpifd = acpi_fd; ++ } ++ else { ++ acpiinfo->acpifd = -1; ++ return FALSE; ++ } ++ ++ update_battery_info(acpiinfo); ++ update_ac_info(acpiinfo); ++ ++ return TRUE; ++} ++ ++void ++acpi_freebsd_cleanup(struct acpi_info * acpiinfo) ++{ ++ g_assert(acpiinfo); ++ ++ if (acpiinfo->acpifd >= 0) { ++ close(acpiinfo->acpifd); ++ acpiinfo->acpifd = -1; ++ } ++} ++ ++/* XXX This is a hack since user-land applications can't get ACPI events yet. ++ * Devd provides this (or supposedly provides this), but you need to be ++ * root to access devd. ++ */ ++gboolean ++acpi_process_event(struct acpi_info * acpiinfo) ++{ ++ g_assert(acpiinfo); ++ ++ update_ac_info(acpiinfo); ++ update_battery_info(acpiinfo); ++ ++ return TRUE; ++} ++ ++gboolean ++acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo) ++{ ++ int time; ++ int life; ++ int acline; ++ int state; ++ size_t len; ++ int rate; ++ int remain; ++ union acpi_battery_ioctl_arg battio; ++ gboolean charging; ++ int i; ++ ++ g_assert(acpiinfo); ++ ++ charging = FALSE; ++ ++ for(i = BATT_MIN; i < BATT_MAX; i++) { ++ battio.unit = i; ++ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BST, &battio) == -1) { ++ continue; ++ } ++ ++ remain += battio.bst.cap; ++ rate += battio.bst.rate; ++ } ++ ++ len = sizeof(time); ++ if (sysctlbyname(ACPI_TIME, &time, &len, NULL, 0) == -1) { ++ return FALSE; ++ } ++ ++ len = sizeof(life); ++ if (sysctlbyname(ACPI_LIFE, &life, &len, NULL, 0) == -1) { ++ return FALSE; ++ } ++ ++ len = sizeof(state); ++ if (sysctlbyname(ACPI_STATE, &state, &len, NULL, 0) == -1) { ++ return FALSE; ++ } ++ ++ apminfo->ai_acline = acpiinfo->ac_online ? 1 : 0; ++ if (state & ACPI_BATT_STAT_CHARGING) { ++ apminfo->ai_batt_stat = 3; ++ charging = TRUE; ++ } ++ else if (state & ACPI_BATT_STAT_CRITICAL) { ++ /* Add a special check here since FreeBSD's ACPI interface will tell us ++ * when the battery is critical. ++ */ ++ apminfo->ai_batt_stat = 2; ++ } ++ else { ++ apminfo->ai_batt_stat = remain < acpiinfo->low_capacity ? 1 : remain < acpiinfo->critical_capacity ? 2 : 0; ++ } ++ apminfo->ai_batt_life = life; ++ if (!charging) { ++ apminfo->ai_batt_time = time * 60; ++ } ++ else if (charging && rate > 0) { ++ apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate * 60); ++ } ++ else ++ /* This multiplication is a hack to make sure the -1 survives so the applet ++ * can process it. Battstat wants the remaining time in minutes, but ++ * ai_batt_time is in seconds. In order to make both ACPI and APM work ++ * with the fewest amount of hacks, we will just assume everything is ++ * in seconds. ++ */ ++ apminfo->ai_batt_time = -1 * 60; ++ ++ return TRUE; ++} ++#endif +--- battstat/battstat_applet.c.orig Mon Sep 13 04:33:31 2004 ++++ battstat/battstat_applet.c Fri Oct 1 16:46:01 2004 +@@ -62,6 +62,9 @@ + #ifdef __linux__ + #include "acpi-linux.h" + #endif ++#ifdef __FreeBSD__ ++#include "acpi-freebsd.h" ++#endif + + #ifndef gettext_noop + #define gettext_noop(String) (String) +@@ -237,6 +240,24 @@ + #endif + + #ifdef __FreeBSD__ ++struct acpi_info acpiinfo; ++gboolean using_acpi; ++int acpi_count; ++ ++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); ++ ++gboolean acpi_callback (gpointer data) ++{ ++ ProgressData * battstat = (ProgressData *) data; ++ ++ if (acpi_process_event(&acpiinfo)) { ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ pixmap_timeout(data); ++ } ++ ++ return TRUE; ++} ++ + void + apm_readinfo (PanelApplet *applet, ProgressData * battstat) + { +@@ -247,13 +268,22 @@ + int fd; + if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); + +- fd = open(APMDEVICE, O_RDONLY); +- if (fd == -1) cleanup (applet, 1); ++ if (using_acpi) { ++ if (acpi_count <= 0) { ++ acpi_count = 30; ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ acpi_count--; ++ } ++ else { ++ fd = open(APMDEVICE, O_RDONLY); ++ if (fd == -1) cleanup (applet, 1); + +- if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) +- err(1, "ioctl(APMIO_GETINFO)"); ++ if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) ++ err(1, "ioctl(APMIO_GETINFO)"); + +- close(fd); ++ close(fd); ++ } + } + #elif defined(__NetBSD__) || defined(__OpenBSD__) + void +@@ -361,7 +391,7 @@ + + #ifdef __FreeBSD__ + acline_status = apminfo.ai_acline ? 1 : 0; +- time = apminfo.ai_batt_time; ++ time = (int) (apminfo.ai_batt_time / 60); + batt_life = apminfo.ai_batt_life; + #elif defined (__NetBSD__) || defined(__OpenBSD__) + acline_status = apminfo.ac_state ? 1 : 0; +@@ -375,8 +405,10 @@ + + if (batt_life > 100) batt_life = 100; + +- hours = time / 60; +- mins = time % 60; ++ if (time >= 0) { ++ hours = time / 60; ++ mins = time % 60; ++ } + + if (acline_status && batt_life == 100) + return g_strdup_printf (_("Battery charged (%d%%)"), batt_life); +@@ -912,6 +944,13 @@ + pdata->acpiwatch = 0; + acpi_linux_cleanup(&acpiinfo); + } ++#elif defined(__FreeBSD__) ++ if (using_acpi) { ++ if (pdata->acpiwatch != 0) ++ g_source_remove(pdata->acpiwatch); ++ pdata->acpiwatch = 0; ++ acpi_freebsd_cleanup(&acpiinfo); ++ } + #endif + + if (pdata->suspend_cmd) +@@ -1052,6 +1091,7 @@ + "Lennart Poettering <lennart@poettering.de> (Linux ACPI support)", + "Seth Nickell <snickell@stanford.edu> (GNOME2 port)", + "Davyd Madeley <davyd@ucc.asn.au>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)", + NULL + }; + +@@ -1760,11 +1800,18 @@ + using_acpi = TRUE; + acpi_count = 0; + } ++#elif defined(__FreeBSD__) ++ if (acpi_freebsd_init(&acpiinfo)) { ++ using_acpi = TRUE; ++ acpi_count = 0; ++ } ++ else ++ using_acpi = FALSE; + #endif + apm_readinfo (applet, NULL); + + #ifdef __FreeBSD__ +- if(apminfo.ai_status == 0) cleanup (applet, 2); ++ if(!using_acpi && apminfo.ai_status == 0) cleanup (applet, 2); + #endif + + battstat = g_new0 (ProgressData, 1); +@@ -1803,6 +1850,10 @@ + battstat->acpiwatch = g_io_add_watch (acpiinfo.channel, + G_IO_IN | G_IO_ERR | G_IO_HUP, + acpi_callback, battstat); ++ } ++#elif defined(__FreeBSD__) ++ if (using_acpi) { ++ battstat->acpiwatch = g_timeout_add (2000, acpi_callback, battstat); + } + #endif + diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in b/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in new file mode 100644 index 000000000000..ecaea9dab09e --- /dev/null +++ b/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in @@ -0,0 +1,11 @@ +--- battstat/battstat.schemas.in.orig Fri Oct 1 16:22:39 2004 ++++ battstat/battstat.schemas.in Fri Oct 1 16:22:46 2004 +@@ -115,7 +115,7 @@ + <key>/schemas/apps/battstat-applet/prefs/suspend_command</key> + <owner>battstat-applet</owner> + <type>string</type> +- <default>/usr/bin/apm -s</default> ++ <default>/usr/sbin/apm -s</default> + <locale name="C"> + <short>Suspend Command</short> + <long>Command to send to suspend the computer</long> diff --git a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c index b7ca26a8262a..f66bc56578d7 100644 --- a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c +++ b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c @@ -1,6 +1,6 @@ ---- wireless/wireless-applet.c.orig Tue Apr 13 06:39:46 2004 -+++ wireless/wireless-applet.c Tue Jun 15 01:22:59 2004 -@@ -30,6 +30,15 @@ +--- wireless/wireless-applet.c.orig Mon Aug 16 04:45:55 2004 ++++ wireless/wireless-applet.c Mon Sep 20 17:17:27 2004 +@@ -30,12 +30,25 @@ #include <math.h> #include <dirent.h> @@ -16,9 +16,7 @@ #include <gnome.h> #include <panel-applet.h> #include <panel-applet-gconf.h> -@@ -37,7 +46,11 @@ - - #include <egg-screen-help.h> + #include <glade/glade.h> +#ifdef __FreeBSD__ +#define CFG_DEVICE "an0" @@ -28,7 +26,7 @@ #define CFG_UPDATE_INTERVAL 2 typedef enum { -@@ -94,6 +107,12 @@ +@@ -92,6 +105,12 @@ WirelessApplet *applet); static void wireless_applet_about_cb (BonoboUIComponent *uic, WirelessApplet *applet); @@ -41,8 +39,8 @@ static void prefs_response_cb (GtkDialog *dialog, gint response, gpointer data); static const BonoboUIVerb wireless_menu_verbs [] = { -@@ -157,9 +176,11 @@ - g_free (tmp); +@@ -159,9 +178,11 @@ + g_free (tltp); /* Update the image */ +#ifndef __FreeBSD__ @@ -54,7 +52,7 @@ state = PIX_BROKEN; else if (percent == 0) state = PIX_NO_LINK; -@@ -190,6 +211,7 @@ +@@ -192,6 +213,7 @@ int percent; /* Calculate the percentage based on the link quality */ @@ -62,7 +60,7 @@ if (level < 0) { percent = -1; } else { -@@ -200,6 +222,9 @@ +@@ -202,6 +224,9 @@ percent = CLAMP (percent, 0, 100); } } @@ -72,7 +70,7 @@ wireless_applet_draw (applet, percent); } -@@ -242,14 +267,147 @@ +@@ -244,14 +269,179 @@ } } @@ -129,7 +127,39 @@ + + signal_strength = (long int) (wreq.wi_val[1]); + -+ memcpy(level, &signal_strength, sizeof(level)); ++#ifdef WI_RID_READ_APS ++ if (signal_strength <= 0) { ++ /* we fail to get signal strength by usual means, try another way */ ++ static time_t last_scan; ++ static long int cached; ++ time_t now = time(NULL); ++ ++ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ ++ if (now > last_scan + 5) { ++ struct wi_apinfo *w; ++ int nstations; ++ ++ bzero((char *)&wreq, sizeof(wreq)); ++ wreq.wi_len = WI_MAX_DATALEN; ++ wreq.wi_type = WI_RID_READ_APS; ++ ++ (void)wi_getval(applet, device, &wreq); ++ ++ nstations = *(int *)wreq.wi_val; ++ if (nstations > 0) { ++ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); ++ signal_strength = (long int)w->signal; ++ } ++ ++ cached = signal_strength; ++ last_scan = now; ++ } else { ++ signal_strength = cached; ++ } ++ } ++#endif ++ ++ memcpy(level, &signal_strength, sizeof( *level )); + + return; +} @@ -222,7 +252,7 @@ gboolean found = FALSE; /* resest list of available wireless devices */ -@@ -257,8 +415,35 @@ +@@ -259,8 +449,37 @@ g_list_free (applet->devices); applet->devices = NULL; @@ -245,7 +275,9 @@ + found = TRUE; + } + } -+ else if (g_strncasecmp (device, "wi", 2)==0 || g_strncasecmp (device, "ath", 3)==0) { ++ else if (g_strncasecmp (device, "wi", 2)==0 || ++ g_strncasecmp (device, "ath", 3)==0 || ++ g_strncasecmp (device, "ndis", 4)==0) { + applet->devices = g_list_prepend (applet->devices, g_strdup (device)); + if (g_strcasecmp (applet->device, device)==0) { + get_wi_data (applet, device, &level); @@ -258,7 +290,7 @@ char *ptr; fgets (line, 256, applet->file); -@@ -292,6 +477,7 @@ +@@ -294,6 +513,7 @@ found = TRUE; } } @@ -266,7 +298,7 @@ } while (1); if (g_list_length (applet->devices)==1) { -@@ -303,17 +489,23 @@ +@@ -305,17 +525,23 @@ } /* rewind the /proc/net/wireless file */ @@ -290,23 +322,20 @@ wireless_applet_read_device_state (applet); -@@ -360,6 +552,7 @@ +@@ -362,10 +588,12 @@ static void start_file_read (WirelessApplet *applet) { +#ifndef __FreeBSD__ applet->file = fopen ("/proc/net/wireless", "rt"); if (applet->file == NULL) { - gtk_tooltips_set_tip (applet->tips, -@@ -368,6 +561,7 @@ - NULL); show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect.")); } +#endif } static void -@@ -670,8 +864,10 @@ +@@ -668,8 +896,10 @@ applet->prefs = NULL; } diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist index 23785f86439c..e235aa2c792a 100644 --- a/x11/gnomeapplets2/pkg-plist +++ b/x11/gnomeapplets2/pkg-plist @@ -1,51 +1,6 @@ bin/gkb_xmmap bin/gnome-keyboard-layout bin/gswitchit-plugins-capplet -%%BATTERY%%@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/battstat.schemas > /dev/null || /usr/bin/true -%%BATTERY%%etc/gconf/schemas/battstat.schemas -%%BATTERY%%@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/battstat.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/cdplayer.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/cdplayer.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/cdplayer.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/charpick.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/charpick.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/charpick.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/drivemount.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/drivemount.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/drivemount.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/geyes.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/geyes.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/geyes.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gkb.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gkb.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gkb.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gswitchit.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gswitchit.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gswitchit.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtik.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gtik.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtik.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gweather.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gweather.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gweather.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mailcheck.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/mailcheck.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mailcheck.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mini-commander.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/mini-commander.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mini-commander.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mixer.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/mixer.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mixer.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/modemlights.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/modemlights.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/modemlights.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/multiload.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/multiload.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/multiload.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/stickynotes.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/stickynotes.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/stickynotes.schemas > /dev/null || /usr/bin/true %%BATTERY%%etc/sound/events/battstat_applet.soundlist etc/sound/events/mailcheck.soundlist include/libgswitchit/gswitchit_plugin.h @@ -194,6 +149,7 @@ share/gnome/gkb/SE_Swedish.keyprop share/gnome/gkb/SE_Swedish_x.keyprop share/gnome/gkb/SI_Slovenian.keyprop share/gnome/gkb/SI_Slovenian_x.keyprop +share/gnome/gkb/SK__x.keyprop share/gnome/gkb/SR_Dutch.keyprop share/gnome/gkb/Slovak.keyprop share/gnome/gkb/Slovene.keyprop @@ -252,7 +208,7 @@ share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml share/gnome/gswitchit/gswitchit-plugins.glade share/gnome/gswitchit/gswitchit-properties.glade -share/gnome/gweather/Locations +share/gnome/gweather/Locations.xml share/gnome/help/accessx-status/C/accessx-status.xml share/gnome/help/accessx-status/C/figures/accessx-status-applet.png share/gnome/help/accessx-status/C/legal.xml @@ -580,11 +536,6 @@ share/gnome/help/char-palette/it/figures/charpick_chargroup.png share/gnome/help/char-palette/it/legal.xml share/gnome/help/char-palette/ja/char-palette.xml share/gnome/help/char-palette/ja/figures/charpalette_applet.png -share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png -share/gnome/help/char-palette/ja/figures/charpick_applet.png -share/gnome/help/char-palette/ja/figures/charpick_characters.png -share/gnome/help/char-palette/ja/figures/charpick_chargroup.png -share/gnome/help/char-palette/ja/figures/mailcheck_applet.png share/gnome/help/char-palette/ja/legal.xml share/gnome/help/char-palette/ko/char-palette.xml share/gnome/help/char-palette/ko/figures/charpalette_applet.png @@ -818,6 +769,8 @@ share/gnome/help/gkb/zh_HK/legal.xml share/gnome/help/gkb/zh_TW/figures/gkb_applet.png share/gnome/help/gkb/zh_TW/gkb.xml share/gnome/help/gkb/zh_TW/legal.xml +share/gnome/help/gswitchit/C/gswitchit.xml +share/gnome/help/gswitchit/C/legal.xml share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml share/gnome/help/gtik2_applet2/C/legal.xml @@ -1349,6 +1302,8 @@ share/gnome/omf/gnome-applets/gkb-zh_HK.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gkb-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/gswitchit-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gswitchit-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-de.omf @@ -1641,6 +1596,7 @@ share/gnome/pixmaps/gkb/yu.png share/gnome/pixmaps/gnome-cpu.png share/gnome/pixmaps/gnome-eyes.png share/gnome/pixmaps/gnome-mini-commander.png +share/gnome/pixmaps/gnome-mixer-applet.png share/gnome/pixmaps/gswitchit-applet.png share/gnome/pixmaps/gswitchit-properties-capplet.png share/gnome/pixmaps/mailcheck/eclouds.png @@ -1651,7 +1607,6 @@ share/gnome/pixmaps/mailcheck/email.png share/gnome/pixmaps/mailcheck/tux-anim.png share/gnome/pixmaps/mini-commander/browser-mini.xpm share/gnome/pixmaps/mini-commander/history-mini.xpm -share/gnome/pixmaps/mixer/gnome-mixer-applet.png share/gnome/pixmaps/mixer/volume-max.png share/gnome/pixmaps/mixer/volume-medium.png share/gnome/pixmaps/mixer/volume-min.png @@ -1764,6 +1719,7 @@ share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo @@ -1785,17 +1741,18 @@ share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/mi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo @@ -2006,6 +1963,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gtik2_applet2/C/figures @dirrm share/gnome/help/gtik2_applet2/C @dirrm share/gnome/help/gtik2_applet2 +@dirrm share/gnome/help/gswitchit/C +@dirrm share/gnome/help/gswitchit @dirrm share/gnome/help/gkb/zh_TW/figures @dirrm share/gnome/help/gkb/zh_TW @dirrm share/gnome/help/gkb/zh_HK/figures @@ -2285,6 +2244,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gswitchit-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-de.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-es.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index 7d0085385bd5..03fa441302e1 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.6 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.8 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,12 +20,12 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_BISON= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo index 157cde1df0e2..fd37f714c120 100644 --- a/x11/gnomedesktop/distinfo +++ b/x11/gnomedesktop/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.6.2.tar.bz2) = efe9949e7aed8ca143287ec551b6852a -SIZE (gnome2/gnome-desktop-2.6.2.tar.bz2) = 1131159 +MD5 (gnome2/gnome-desktop-2.8.1.tar.bz2) = 47f9b9508c4a0349d66fa1138b521794 +SIZE (gnome2/gnome-desktop-2.8.1.tar.bz2) = 1132666 diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist index f2699e459a3b..a4be6d322f61 100644 --- a/x11/gnomedesktop/pkg-plist +++ b/x11/gnomedesktop/pkg-plist @@ -183,6 +183,7 @@ share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo @@ -207,20 +208,21 @@ share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo @dirrm share/gnome/omf/gnome-desktop -@dirrm share/gnome/help/lgpl/C @dirrm share/gnome/help/lgpl/eu +@dirrm share/gnome/help/lgpl/C @dirrm share/gnome/help/lgpl -@dirrm share/gnome/help/gpl/C @dirrm share/gnome/help/gpl/eu +@dirrm share/gnome/help/gpl/C @dirrm share/gnome/help/gpl -@dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback/eu +@dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback -@dirrm share/gnome/help/fdl/C @dirrm share/gnome/help/fdl/eu +@dirrm share/gnome/help/fdl/C @dirrm share/gnome/help/fdl @dirrm share/gnome/gnome-about/headers @dirrm share/gnome/gnome-about diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile index 65f532081d2d..064ce43d2107 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.6 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.8 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,21 +21,43 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \ +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomedesktop \ libwnck +WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-kde-docdir=${LOCALBASE}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= gnome-panel.1 gnome-panel-preferences.1 +MAN1= gnome-panel.1 +GCONF_SCHEMAS= clock.schemas fish.schemas gnome-panel-screenshot.schemas \ + panel-compatibility.schemas panel-general.schemas \ + panel-global.schemas panel-object.schemas \ + panel-toplevel.schemas window-list.schemas \ + workspace-switcher.schemas +.include <bsd.port.pre.mk> + +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + +.if ${HAVE_GNOME:Mevolutiondataserver}!="" +USE_GNOME+= evolutiondataserver +CONFIGURE_ARGS+=--enable-eds +.else +CONFIGURE_ARGS+=--disable-eds +.endif + +.if ${OSVERSION} < 600006 post-patch: -.for po in da.po it.po zh_TW.po +.for po in da.po it.po zh_CN.po zh_TW.po @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} .endfor +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo index 0a30f300febf..454689617e2e 100644 --- a/x11/gnomepanel/distinfo +++ b/x11/gnomepanel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-panel-2.6.2.tar.bz2) = 41318b24e18f497b4418c7d60aaf33f6 -SIZE (gnome2/gnome-panel-2.6.2.tar.bz2) = 3082567 +MD5 (gnome2/gnome-panel-2.8.1.tar.bz2) = 77aea214467da238170ed10dbc825799 +SIZE (gnome2/gnome-panel-2.8.1.tar.bz2) = 3210138 diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index a8e8e95e3e4b..9b385b60a358 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -1,43 +1,12 @@ bin/gnome-desktop-item-edit bin/gnome-panel -bin/gnome-panel-preferences bin/gnome-panel-screenshot bin/panel-test-applets -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/clock.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/clock.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/clock.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fish.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/fish.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fish.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-panel-screenshot.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-panel-screenshot.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-panel-screenshot.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-compatibility.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/panel-compatibility.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-compatibility.schemas > /dev/null || /usr/bin/true @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true etc/gconf/schemas/panel-default-setup.entries @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-general.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/panel-general.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-general.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-global.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/panel-global.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-global.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-object.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/panel-object.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-object.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-toplevel.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/panel-toplevel.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-toplevel.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/window-list.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/window-list.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/window-list.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/workspace-switcher.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/workspace-switcher.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/workspace-switcher.schemas > /dev/null || /usr/bin/true include/panel-2.0/GNOME_Panel.h include/panel-2.0/panel-applet-enums.h include/panel-2.0/panel-applet-gconf.h @@ -73,7 +42,6 @@ share/doc/panel-applet/server-files.html share/doc/panel-applet/session-saving.html share/doc/panel-applet/style.css share/doc/panel-applet/up.png -share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml @@ -322,7 +290,6 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true -share/gnome/panel/gnome-panel-preferences.glade share/gnome/panel/gnome-panel-screenshot.glade share/gnome/panel/panel-properties-dialog.glade share/gnome/panel/panel-run-dialog.glade @@ -355,6 +322,7 @@ share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo @@ -390,6 +358,7 @@ share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index ab5ff700a301..094f576055b2 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -6,12 +6,12 @@ # PORTNAME= gnomesession -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://people.FreeBSD.org/~marcus/:local \ ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= sources/gnome-session/2.6 \ +MASTER_SITE_SUBDIR= sources/gnome-session/2.8 \ marcus/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -24,19 +24,20 @@ COMMENT= Session component for the GNOME 2 desktop USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui +USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeui USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-halt-command=/sbin/shutdown \ --with-reboot-command=/sbin/shutdown CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ - gnome-session-save.1 -MAN5= default.session.5 +MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 \ + session-properties.1 gnome-session-save.1 +MAN5= default.session.5 +GCONF_SCHEMAS= gnome-session.schemas -SPLASH_IMG= gnome-splash04-12.png +SPLASH_IMG= gnome-splash28.png post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR} diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index 47fa01285ba3..8f05e97ece4c 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.6.2.tar.bz2) = 0c80fbb64123cef7f2d7a9b69b0b965e -SIZE (gnome2/gnome-session-2.6.2.tar.bz2) = 873420 -MD5 (gnome2/gnome-splash04-12.png) = a26cafb0ccffd5e173d7255e683faafd -SIZE (gnome2/gnome-splash04-12.png) = 75841 +MD5 (gnome2/gnome-session-2.8.1.tar.bz2) = 15402d84eef4cf159bb8de78f432bb98 +SIZE (gnome2/gnome-session-2.8.1.tar.bz2) = 883921 +MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55 +SIZE (gnome2/gnome-splash28.png) = 121715 diff --git a/x11/gnomesession/files/patch-gnome-session_Makefile.in b/x11/gnomesession/files/patch-gnome-session_Makefile.in index 60c14531bce0..2b05e8c0027e 100644 --- a/x11/gnomesession/files/patch-gnome-session_Makefile.in +++ b/x11/gnomesession/files/patch-gnome-session_Makefile.in @@ -1,11 +1,11 @@ ---- gnome-session/Makefile.in.orig Wed May 8 14:36:22 2002 -+++ gnome-session/Makefile.in Wed May 8 14:36:34 2002 -@@ -129,7 +129,7 @@ +--- gnome-session/Makefile.in.orig Mon May 31 14:34:48 2004 ++++ gnome-session/Makefile.in Mon May 31 14:34:57 2004 +@@ -153,7 +153,7 @@ NULL = -defaultdir = $(datadir)/gnome +defaultdir = $(datadir) - INCLUDES = $(GNOME_SESSION_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DDEFAULTDIR="\"$(defaultdir)\"" + INCLUDES = $(GNOME_SESSION_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\"" -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DRSH_COMMAND=\""$(RSH_COMMAND)\"" -DGCONFTOOL_CMD=\""$(GCONFTOOL)\"" -DDEFAULTDIR="\"$(defaultdir)\"" -DESD_SERVER="\"$(ESD_SERVER)\"" diff --git a/x11/gnomesession/files/patch-gnome-session_manager.c b/x11/gnomesession/files/patch-gnome-session_manager.c new file mode 100644 index 000000000000..7e56843ac733 --- /dev/null +++ b/x11/gnomesession/files/patch-gnome-session_manager.c @@ -0,0 +1,14 @@ +--- gnome-session/manager.c.orig Tue Oct 12 14:04:26 2004 ++++ gnome-session/manager.c Tue Oct 12 14:05:51 2004 +@@ -1042,9 +1042,10 @@ + + if (interact_ping_replied) + { ++ IceConn ice_conn; + gsm_verbose ("have interact_list; sending ping with data to client %p\n", client); + print_client (client); +- IceConn ice_conn = SmsGetIceConnection (client->connection); ++ ice_conn = SmsGetIceConnection (client->connection); + interact_ping_replied = FALSE; + IcePing (ice_conn, interact_ping_reply, (IcePointer)client); + } diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index ae71556f4a43..6107618a5527 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -4,9 +4,6 @@ bin/gnome-session-remove bin/gnome-session-save bin/gnome-smproxy bin/gnome-wm -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-session.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true share/gnome/control-center-2.0/capplets/session-properties.desktop share/gnome/default.session share/gnome/default.wm @@ -16,9 +13,9 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/be/LC_MESSAGES/gnome-session-2.0.mo +share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo -share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo @@ -55,6 +52,8 @@ share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo share/locale/no/LC_MESSAGES/gnome-session-2.0.mo @@ -72,6 +71,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo share/locale/th/LC_MESSAGES/gnome-session-2.0.mo +share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index a6905e02a207..303ea7a5d354 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.6.1 -PORTREVISION= 2 +PORTVERSION= 2.8.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.6 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.8 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,9 +20,11 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui vte -USE_LIBTOOL_VER=13 +USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui vte +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= gnome-terminal.schemas + .include <bsd.port.mk> diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo index 53e2076ddaee..97c12e3c7f68 100644 --- a/x11/gnometerminal/distinfo +++ b/x11/gnometerminal/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.6.1.tar.bz2) = 43e04260410e66e767a4b247d0af8b46 -SIZE (gnome2/gnome-terminal-2.6.1.tar.bz2) = 1999378 +MD5 (gnome2/gnome-terminal-2.8.0.tar.bz2) = 93e59f24b35bd867653664565adb4672 +SIZE (gnome2/gnome-terminal-2.8.0.tar.bz2) = 2195403 diff --git a/x11/gnometerminal/files/patch-src-eggcellrendererkeys.c b/x11/gnometerminal/files/patch-src-eggcellrendererkeys.c deleted file mode 100644 index 57c197bee543..000000000000 --- a/x11/gnometerminal/files/patch-src-eggcellrendererkeys.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/eggcellrendererkeys.c.orig Thu Jul 29 23:34:48 2004 -+++ src/eggcellrendererkeys.c Thu Jul 29 23:35:36 2004 -@@ -584,7 +584,7 @@ - void - egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, - guint keyval, -- GdkModifierType mask) -+ EggVirtualModifierType mask) - { - char *text; - gboolean changed; -@@ -626,7 +626,7 @@ - void - egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys, - guint *keyval, -- GdkModifierType *mask) -+ EggVirtualModifierType *mask) - { - g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); - diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist index 12dd4ed33afc..2ef85466b931 100644 --- a/x11/gnometerminal/pkg-plist +++ b/x11/gnometerminal/pkg-plist @@ -1,7 +1,4 @@ bin/gnome-terminal -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnome-terminal.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true libdata/bonobo/servers/gnome-terminal.server share/gnome/application-registry/gnome-terminal.applications share/gnome/applications/gnome-terminal.desktop @@ -90,6 +87,7 @@ share/locale/az/LC_MESSAGES/gnome-terminal.mo share/locale/be/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo share/locale/bn/LC_MESSAGES/gnome-terminal.mo +share/locale/bs/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo share/locale/cs/LC_MESSAGES/gnome-terminal.mo share/locale/cy/LC_MESSAGES/gnome-terminal.mo @@ -100,6 +98,7 @@ share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo share/locale/es/LC_MESSAGES/gnome-terminal.mo share/locale/et/LC_MESSAGES/gnome-terminal.mo +share/locale/eu/LC_MESSAGES/gnome-terminal.mo share/locale/fa/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo share/locale/fr/LC_MESSAGES/gnome-terminal.mo @@ -120,6 +119,7 @@ share/locale/mk/LC_MESSAGES/gnome-terminal.mo share/locale/ml/LC_MESSAGES/gnome-terminal.mo share/locale/mn/LC_MESSAGES/gnome-terminal.mo share/locale/ms/LC_MESSAGES/gnome-terminal.mo +share/locale/nb/LC_MESSAGES/gnome-terminal.mo share/locale/nl/LC_MESSAGES/gnome-terminal.mo share/locale/nn/LC_MESSAGES/gnome-terminal.mo share/locale/no/LC_MESSAGES/gnome-terminal.mo diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index d752f7c6c44c..4bb69b27dbab 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -6,13 +6,13 @@ # PORTNAME= libgnome -PORTVERSION= 2.6.1.2 -CATEGORIES?= x11 gnome +PORTVERSION= 2.8.0 +CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 -MAINTAINER?= gnome@FreeBSD.org +MAINTAINER= gnome@FreeBSD.org COMMENT= Libraries for GNOME, a GNU desktop environment BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper @@ -20,6 +20,7 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_XPM= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomehier intlhack esound \ @@ -30,4 +31,24 @@ USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \ + desktop_gnome_accessibility_startup.schemas \ + desktop_gnome_applications_browser.schemas \ + desktop_gnome_applications_help_viewer.schemas \ + desktop_gnome_applications_terminal.schemas \ + desktop_gnome_applications_window_manager.schemas \ + desktop_gnome_background.schemas \ + desktop_gnome_file_views.schemas \ + desktop_gnome_interface.schemas desktop_gnome_lockdown.schemas \ + desktop_gnome_peripherals_keyboard.schemas \ + desktop_gnome_peripherals_mouse.schemas \ + desktop_gnome_sound.schemas desktop_gnome_thumbnailers.schemas \ + desktop_gnome_typing_break.schemas + +.if defined(NOPORTDOCS) +post-patch: + @${REINPLACE_CMD} -e 's|gnome-data po doc|gnome-data po|g' \ + ${WRKSRC}/Makefile.in +.endif + .include <bsd.port.mk> diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index eaf124ea95a5..0ce1fe747796 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnome-2.6.1.2.tar.bz2) = 5970203d9f6822652cc95bdd72082bfb -SIZE (gnome2/libgnome-2.6.1.2.tar.bz2) = 1050839 +MD5 (gnome2/libgnome-2.8.0.tar.bz2) = dab4ecbfa7ec1a2f22d2a48b6b83e937 +SIZE (gnome2/libgnome-2.8.0.tar.bz2) = 1164177 diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag index 131cf3baa5a4..157a59be15ac 100644 --- a/x11/libgnome/files/patch-ag +++ b/x11/libgnome/files/patch-ag @@ -11,7 +11,7 @@ $FreeBSD$ - "/bin/zsh", "/usr/bin/zsh", - "/bin/tcsh", "/usr/bin/tcsh", - "/bin/ksh", "/usr/bin/ksh", -- "/bin/csh", "/bin/sh", 0 +- "/bin/csh", "/bin/sh", NULL + "/bin/csh", "/bin/sh", + LOCALBASE "/bin/bash", + LOCALBASE "/bin/zsh", diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in index a3e14ed9e902..5a240a06a94c 100644 --- a/x11/libgnome/files/patch-libgnome::Makefile.in +++ b/x11/libgnome/files/patch-libgnome::Makefile.in @@ -1,6 +1,6 @@ ---- libgnome/Makefile.in.orig Wed Feb 25 01:17:58 2004 -+++ libgnome/Makefile.in Wed Feb 25 01:20:59 2004 -@@ -159,6 +159,9 @@ +--- libgnome/Makefile.in.orig Mon May 31 16:33:14 2004 ++++ libgnome/Makefile.in Mon May 31 16:33:45 2004 +@@ -211,6 +211,9 @@ libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome INCLUDES = \ diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c index 90fcdd22c777..9dd33f9c2838 100644 --- a/x11/libgnome/files/patch-libgnome_gnome-program.c +++ b/x11/libgnome/files/patch-libgnome_gnome-program.c @@ -1,6 +1,6 @@ ---- libgnome/gnome-program.c.orig Wed Jul 23 05:35:30 2003 -+++ libgnome/gnome-program.c Mon Dec 22 01:19:23 2003 -@@ -894,17 +894,17 @@ +--- libgnome/gnome-program.c.orig Mon May 31 16:37:02 2004 ++++ libgnome/gnome-program.c Mon May 31 16:37:05 2004 +@@ -895,17 +895,17 @@ attr_rel = ""; break; case GNOME_FILE_DOMAIN_DATADIR: @@ -21,7 +21,7 @@ attr_name = GNOME_PARAM_GNOME_DATADIR; attr_rel = "/pixmaps"; break; -@@ -916,7 +916,7 @@ +@@ -917,7 +917,7 @@ case GNOME_FILE_DOMAIN_HELP: prefix_rel = "/share/gnome/help"; attr_name = GNOME_PARAM_GNOME_DATADIR; @@ -30,7 +30,7 @@ break; case GNOME_FILE_DOMAIN_APP_LIBDIR: prefix_rel = "/lib"; -@@ -925,19 +925,19 @@ +@@ -926,19 +926,19 @@ search_path = FALSE; break; case GNOME_FILE_DOMAIN_APP_DATADIR: @@ -53,7 +53,7 @@ attr_name = GNOME_PARAM_APP_DATADIR; attr_rel = "/pixmaps"; search_path = FALSE; -@@ -958,12 +958,12 @@ +@@ -959,12 +959,12 @@ attr_name = GNOME_PARAM_APP_DATADIR; diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index d8fed71104d6..c4423ffe156f 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -1,49 +1,4 @@ bin/gnome-open -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_applications_browser.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_applications_browser.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_browser.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_applications_terminal.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_background.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_background.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_background.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_file_views.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_file_views.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_file_views.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_interface.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_interface.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_interface.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_lockdown.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_lockdown.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_lockdown.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_sound.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_sound.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_sound.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_thumbnailers.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_thumbnailers.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_thumbnailers.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_typing_break.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_typing_break.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_typing_break.schemas > /dev/null || /usr/bin/true etc/sound/events/gnome-2.soundlist etc/sound/events/gtk-events-2.soundlist include/libgnome-2.0/libgnome/gnome-config.h @@ -64,9 +19,35 @@ include/libgnome-2.0/libgnome/libgnometypebuiltins.h lib/bonobo/monikers/libmoniker_extra_2.so lib/libgnome-2.a lib/libgnome-2.so -lib/libgnome-2.so.600 +lib/libgnome-2.so.800 libdata/bonobo/servers/GNOME_Moniker_std.server libdata/pkgconfig/libgnome-2.0.pc +share/doc/libgnome/ch01s02.html +share/doc/libgnome/ch01s03.html +share/doc/libgnome/ch01s04.html +share/doc/libgnome/ch01s05.html +share/doc/libgnome/home.png +share/doc/libgnome/index.html +share/doc/libgnome/index.sgml +share/doc/libgnome/left.png +share/doc/libgnome/libgnome-gnome-config.html +share/doc/libgnome/libgnome-gnome-exec.html +share/doc/libgnome/libgnome-gnome-gconf.html +share/doc/libgnome/libgnome-gnome-help.html +share/doc/libgnome/libgnome-gnome-i18n.html +share/doc/libgnome/libgnome-gnome-init.html +share/doc/libgnome/libgnome-gnome-program.html +share/doc/libgnome/libgnome-gnome-score.html +share/doc/libgnome/libgnome-gnome-sound.html +share/doc/libgnome/libgnome-gnome-triggers.html +share/doc/libgnome/libgnome-gnome-url.html +share/doc/libgnome/libgnome-gnome-util.html +share/doc/libgnome/libgnome-libgnometypebuiltins.html +share/doc/libgnome/libgnome.devhelp +share/doc/libgnome/libgnome.html +share/doc/libgnome/right.png +share/doc/libgnome/style.css +share/doc/libgnome/up.png share/locale/am/LC_MESSAGES/libgnome-2.0.mo share/locale/ar/LC_MESSAGES/libgnome-2.0.mo share/locale/az/LC_MESSAGES/libgnome-2.0.mo @@ -106,6 +87,8 @@ share/locale/mk/LC_MESSAGES/libgnome-2.0.mo share/locale/ml/LC_MESSAGES/libgnome-2.0.mo share/locale/mn/LC_MESSAGES/libgnome-2.0.mo share/locale/ms/LC_MESSAGES/libgnome-2.0.mo +share/locale/nb/LC_MESSAGES/libgnome-2.0.mo +share/locale/ne/LC_MESSAGES/libgnome-2.0.mo share/locale/nl/LC_MESSAGES/libgnome-2.0.mo share/locale/nn/LC_MESSAGES/libgnome-2.0.mo share/locale/no/LC_MESSAGES/libgnome-2.0.mo @@ -119,8 +102,8 @@ share/locale/sk/LC_MESSAGES/libgnome-2.0.mo share/locale/sl/LC_MESSAGES/libgnome-2.0.mo share/locale/sq/LC_MESSAGES/libgnome-2.0.mo share/locale/sr/LC_MESSAGES/libgnome-2.0.mo -share/locale/sr@ije/LC_MESSAGES/libgnome-2.0.mo share/locale/sr@Latn/LC_MESSAGES/libgnome-2.0.mo +share/locale/sr@ije/LC_MESSAGES/libgnome-2.0.mo share/locale/sv/LC_MESSAGES/libgnome-2.0.mo share/locale/ta/LC_MESSAGES/libgnome-2.0.mo share/locale/th/LC_MESSAGES/libgnome-2.0.mo @@ -131,6 +114,6 @@ share/locale/wa/LC_MESSAGES/libgnome-2.0.mo share/locale/yi/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo -@dirrm %%DOCSDIR%% +@dirrm share/doc/libgnome @dirrm include/libgnome-2.0/libgnome @dirrm include/libgnome-2.0 diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 663ef1dea8d4..1955960680b4 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -6,7 +6,7 @@ # PORTNAME= yelp -PORTVERSION= 2.6.2 +PORTVERSION= 2.6.4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 1301aca675d8..2e5931ed00c5 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/yelp-2.6.2.tar.bz2) = d5530d4cb207bba0f019277cd8a4c0d8 -SIZE (gnome2/yelp-2.6.2.tar.bz2) = 632824 +MD5 (gnome2/yelp-2.6.4.tar.bz2) = 77d919335650ef0d114c951637669bda +SIZE (gnome2/yelp-2.6.4.tar.bz2) = 639056 diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 7af16743627f..b0f00dab87cd 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -6,10 +6,10 @@ # PORTNAME= zenity -PORTVERSION= 2.6.3 +PORTVERSION= 2.8.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= klammer@webonaut.com diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index fb3733900239..9066e03b2c2b 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/zenity-2.6.3.tar.bz2) = ce6678c406e9a834e4da04ca00338931 -SIZE (gnome2/zenity-2.6.3.tar.bz2) = 650351 +MD5 (gnome2/zenity-2.8.1.tar.bz2) = a566a88b88c8f530939e900539cb8d28 +SIZE (gnome2/zenity-2.8.1.tar.bz2) = 731091 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 1ecb7a4364e3..d1a62bf16c78 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -47,6 +47,7 @@ share/locale/az/LC_MESSAGES/zenity-0.1.mo share/locale/be/LC_MESSAGES/zenity-0.1.mo share/locale/bg/LC_MESSAGES/zenity-0.1.mo share/locale/bn/LC_MESSAGES/zenity-0.1.mo +share/locale/bs/LC_MESSAGES/zenity-0.1.mo share/locale/ca/LC_MESSAGES/zenity-0.1.mo share/locale/cs/LC_MESSAGES/zenity-0.1.mo share/locale/cy/LC_MESSAGES/zenity-0.1.mo @@ -71,12 +72,15 @@ share/locale/id/LC_MESSAGES/zenity-0.1.mo share/locale/is/LC_MESSAGES/zenity-0.1.mo share/locale/it/LC_MESSAGES/zenity-0.1.mo share/locale/ja/LC_MESSAGES/zenity-0.1.mo +share/locale/kn/LC_MESSAGES/zenity-0.1.mo share/locale/ko/LC_MESSAGES/zenity-0.1.mo share/locale/lt/LC_MESSAGES/zenity-0.1.mo share/locale/mi/LC_MESSAGES/zenity-0.1.mo +share/locale/mk/LC_MESSAGES/zenity-0.1.mo share/locale/ml/LC_MESSAGES/zenity-0.1.mo share/locale/mn/LC_MESSAGES/zenity-0.1.mo share/locale/ms/LC_MESSAGES/zenity-0.1.mo +share/locale/nb/LC_MESSAGES/zenity-0.1.mo share/locale/ne/LC_MESSAGES/zenity-0.1.mo share/locale/nl/LC_MESSAGES/zenity-0.1.mo share/locale/nn/LC_MESSAGES/zenity-0.1.mo @@ -95,6 +99,7 @@ share/locale/sr@Latn/LC_MESSAGES/zenity-0.1.mo share/locale/sv/LC_MESSAGES/zenity-0.1.mo share/locale/ta/LC_MESSAGES/zenity-0.1.mo share/locale/th/LC_MESSAGES/zenity-0.1.mo +share/locale/tr/LC_MESSAGES/zenity-0.1.mo share/locale/uk/LC_MESSAGES/zenity-0.1.mo share/locale/vi/LC_MESSAGES/zenity-0.1.mo share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo |