diff options
| author | reed <reed> | 2009-09-16 01:15:32 +0000 |
|---|---|---|
| committer | reed <reed> | 2009-09-16 01:15:32 +0000 |
| commit | 6a1ae5e3c60551eab5e38831e943bd5740d23cc1 (patch) | |
| tree | 0c5ff254424640857c1e834eb6a64837b8b09958 /x11 | |
| parent | 8406a9d0b61c5cb8f38f3b06e7972e715d366690 (diff) | |
| download | pkgsrc-6a1ae5e3c60551eab5e38831e943bd5740d23cc1.tar.gz | |
Upgrading Xfce to 4.6.1.
This is for PR #40984. This is based on work from
dieter roelants. Thank you Dieter.
Also I had done some work independently on this.
Hopefully, I am getting this all committed at one time.
The changelogs are at
http://www.xfce.org/documentation/changelogs/4.6.1
http://www.xfce.org/documentation/changelogs/4.6.0
Also don't need the xfce4-dev-tools for building. (It is only
needed when building from SVN source.)
Diffstat (limited to 'x11')
47 files changed, 503 insertions, 493 deletions
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile index 00786a1a09b..ab203188af0 100644 --- a/x11/libxfce4gui/Makefile +++ b/x11/libxfce4gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: Makefile,v 1.28 2009/09/16 01:15:34 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,18 +6,29 @@ PKG_DESTDIR_SUPPORT= user-destdir DISTNAME= libxfcegui4-${XFCE4_VERSION} PKGNAME= libxfce4gui-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= x11 COMMENT= Xfce widget library -USE_TOOLS+= msgfmt -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc +PKGCONFIG_OVERRIDE= libxfce4kbd-private/libxfce4kbd-private-1.0.pc.in +PKGCONFIG_OVERRIDE+= libxfcegui4/libxfcegui4-1.0.pc.in -PKGCONFIG_OVERRIDE= libxfcegui4/libxfcegui4-1.0.pc.in +CONFIGURE_ARGS+= --disable-gladeui +EGDIR= ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml +PKG_SYSCONFSUBDIR= xdg +CONF_FILES= ${EGDIR}/xfce4-keyboard-shortcuts.xml \ + ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml + +MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PREFIX}/include/xfce4 +MAKE_DIRS+= ${XFCE4_EGBASE} ${XFCE4_EGBASE:Q}/xfconf ${EGDIR} +OWN_DIRS+= ${PKG_SYSCONFDIR}/xfce4 ${PKG_SYSCONFDIR}/xfce4/xfconf +OWN_DIRS+= ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml + +.include "../../devel/libglade/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST index f37a6696625..9d404a343f2 100644 --- a/x11/libxfce4gui/PLIST +++ b/x11/libxfce4gui/PLIST @@ -1,4 +1,8 @@ -@comment $NetBSD: PLIST,v 1.20 2009/06/14 18:25:00 joerg Exp $ +@comment $NetBSD: PLIST,v 1.21 2009/09/16 01:15:34 reed Exp $ +include/xfce4/libxfce4kbd-private/xfce-shortcut-dialog.h +include/xfce4/libxfce4kbd-private/xfce-shortcuts-grabber.h +include/xfce4/libxfce4kbd-private/xfce-shortcuts-provider.h +include/xfce4/libxfce4kbd-private/xfce-shortcuts.h include/xfce4/libxfcegui4/dialogs.h include/xfce4/libxfcegui4/gtk_style.h include/xfce4/libxfcegui4/gtktoxevent.h @@ -10,7 +14,6 @@ include/xfce4/libxfcegui4/libxfcegui4.h include/xfce4/libxfcegui4/netk-application.h include/xfce4/libxfcegui4/netk-class-group.h include/xfce4/libxfcegui4/netk-enum-types.h -include/xfce4/libxfcegui4/netk-marshal.h include/xfce4/libxfcegui4/netk-pager.h include/xfce4/libxfcegui4/netk-screen.h include/xfce4/libxfcegui4/netk-tasklist.h @@ -39,40 +42,43 @@ include/xfce4/libxfcegui4/xfce_decorbutton.h include/xfce4/libxfcegui4/xfce_decortoggle.h include/xfce4/libxfcegui4/xfce_framebox.h include/xfce4/libxfcegui4/xfce_iconbutton.h -include/xfce4/libxfcegui4/xfce_marshal.h include/xfce4/libxfcegui4/xfce_menubutton.h include/xfce4/libxfcegui4/xfce_movehandler.h include/xfce4/libxfcegui4/xfce_scaled_image.h include/xfce4/libxfcegui4/xfce_systemtray.h include/xfce4/libxfcegui4/xfce_togglebutton.h include/xfce4/libxfcegui4/xinerama.h +lib/libglade/2.0/libxfce4.la +lib/libxfce4kbd-private.la lib/libxfcegui4.la +lib/pkgconfig/libxfce4kbd-private-1.0.pc lib/pkgconfig/libxfcegui4-1.0.pc -share/doc/libxfcegui4/XfceAboutDialog.html -share/doc/libxfcegui4/XfceAppMenuItem.html -share/doc/libxfcegui4/XfceFramebox.html -share/doc/libxfcegui4/XfceHeading.html -share/doc/libxfcegui4/XfceIconTheme.html -share/doc/libxfcegui4/XfceTitledDialog.html -share/doc/libxfcegui4/home.png -share/doc/libxfcegui4/index.html -share/doc/libxfcegui4/index.sgml -share/doc/libxfcegui4/left.png -share/doc/libxfcegui4/libxfcegui4-Standard-Macros.html -share/doc/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html -share/doc/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html -share/doc/libxfcegui4/libxfcegui4-XfceFileChooser.html -share/doc/libxfcegui4/libxfcegui4-core.html -share/doc/libxfcegui4/libxfcegui4-dialogs.html -share/doc/libxfcegui4/libxfcegui4-fundamentals.html -share/doc/libxfcegui4/libxfcegui4-netk.html -share/doc/libxfcegui4/libxfcegui4-xfce-exec.html -share/doc/libxfcegui4/libxfcegui4.devhelp -share/doc/libxfcegui4/libxfcegui4.devhelp2 -share/doc/libxfcegui4/reference.html -share/doc/libxfcegui4/right.png -share/doc/libxfcegui4/style.css -share/doc/libxfcegui4/up.png +share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html +share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html +share/gtk-doc/html/libxfcegui4/XfceFramebox.html +share/gtk-doc/html/libxfcegui4/XfceHeading.html +share/gtk-doc/html/libxfcegui4/XfceIconTheme.html +share/gtk-doc/html/libxfcegui4/XfceTitledDialog.html +share/gtk-doc/html/libxfcegui4/home.png +share/gtk-doc/html/libxfcegui4/index.html +share/gtk-doc/html/libxfcegui4/index.sgml +share/gtk-doc/html/libxfcegui4/left.png +share/gtk-doc/html/libxfcegui4/libxfcegui4-Standard-Macros.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-core.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html +share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp +share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp2 +share/gtk-doc/html/libxfcegui4/reference.html +share/gtk-doc/html/libxfcegui4/right.png +share/gtk-doc/html/libxfcegui4/style.css +share/gtk-doc/html/libxfcegui4/up.png share/icons/hicolor/48x48/apps/xfce-edit.png share/icons/hicolor/48x48/apps/xfce-filemanager.png share/icons/hicolor/48x48/apps/xfce-games.png @@ -121,12 +127,12 @@ share/locale/lt/LC_MESSAGES/libxfcegui4.mo share/locale/lv/LC_MESSAGES/libxfcegui4.mo share/locale/mk/LC_MESSAGES/libxfcegui4.mo share/locale/mr/LC_MESSAGES/libxfcegui4.mo -share/locale/nb_NO/LC_MESSAGES/libxfcegui4.mo +share/locale/nb/LC_MESSAGES/libxfcegui4.mo share/locale/nl/LC_MESSAGES/libxfcegui4.mo share/locale/pa/LC_MESSAGES/libxfcegui4.mo share/locale/pl/LC_MESSAGES/libxfcegui4.mo +share/locale/pt/LC_MESSAGES/libxfcegui4.mo share/locale/pt_BR/LC_MESSAGES/libxfcegui4.mo -share/locale/pt_PT/LC_MESSAGES/libxfcegui4.mo share/locale/ro/LC_MESSAGES/libxfcegui4.mo share/locale/ru/LC_MESSAGES/libxfcegui4.mo share/locale/si/LC_MESSAGES/libxfcegui4.mo @@ -134,7 +140,6 @@ share/locale/sk/LC_MESSAGES/libxfcegui4.mo share/locale/sq/LC_MESSAGES/libxfcegui4.mo share/locale/sv/LC_MESSAGES/libxfcegui4.mo share/locale/ta/LC_MESSAGES/libxfcegui4.mo -share/locale/th/LC_MESSAGES/libxfcegui4.mo share/locale/tr/LC_MESSAGES/libxfcegui4.mo share/locale/uk/LC_MESSAGES/libxfcegui4.mo share/locale/ur/LC_MESSAGES/libxfcegui4.mo diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk index 3d1c51d41c7..7f7d2b6c3c5 100644 --- a/x11/libxfce4gui/buildlink3.mk +++ b/x11/libxfce4gui/buildlink3.mk @@ -1,21 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.26 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2009/09/16 01:15:34 reed Exp $ BUILDLINK_TREE+= libxfce4gui .if !defined(LIBXFCE4GUI_BUILDLINK3_MK) LIBXFCE4GUI_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.libxfce4gui?= libxfce4gui>=4.4.3nb2 +BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.6.0 BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui -.include "../../textproc/libxml2/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # LIBXFCE4GUI_BUILDLINK3_MK BUILDLINK_TREE+= -libxfce4gui diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo index 19f208f0b71..fa98d38db15 100644 --- a/x11/libxfce4gui/distinfo +++ b/x11/libxfce4gui/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.17 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.18 2009/09/16 01:15:34 reed Exp $ -SHA1 (libxfcegui4-4.4.3.tar.bz2) = 4f1ab2fb035b0aaeb01cbef15d7378726037bcc9 -RMD160 (libxfcegui4-4.4.3.tar.bz2) = c0155a89e35d88d3c2e25fc2f38630309d50e916 -Size (libxfcegui4-4.4.3.tar.bz2) = 621245 bytes +SHA1 (libxfcegui4-4.6.1.tar.bz2) = 82bcfe74dd3b9188b9f41d8fa7dc4a8481461696 +RMD160 (libxfcegui4-4.6.1.tar.bz2) = 295263f3e8a6bbcea05ce5ae8ab0f3a9cf1e4568 +Size (libxfcegui4-4.6.1.tar.bz2) = 650666 bytes +SHA1 (patch-aa) = c054345fcb2aa5c516009d0740ac0abc3ba15706 diff --git a/x11/libxfce4gui/patches/patch-aa b/x11/libxfce4gui/patches/patch-aa new file mode 100644 index 00000000000..2531cce5a9e --- /dev/null +++ b/x11/libxfce4gui/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.3 2009/09/16 01:15:33 reed Exp $ + +--- libxfce4kbd-private/Makefile.in.orig 2009-03-08 20:41:51.000000000 +0000 ++++ libxfce4kbd-private/Makefile.in +@@ -360,7 +360,7 @@ top_srcdir = @top_srcdir@ + @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBXFCE4UTIL_LIBS) \ + @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(XFCONF_LIBS) + +-@ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml ++@ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml + @ENABLE_KEYBOARD_LIBRARY_TRUE@settings_DATA = xfce4-keyboard-shortcuts.xml + @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfigdir = $(libdir)/pkgconfig + @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfig_DATA = libxfce4kbd-private-1.0.pc diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index 60856aae585..0727cd919b1 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.16 2008/12/18 13:45:58 hira Exp $ +# $NetBSD: Makefile,v 1.17 2009/09/16 01:15:35 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= libxfce4util-${XFCE4_VERSION} -PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce basic library -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc - PKGCONFIG_OVERRIDE= libxfce4util/libxfce4util-1.0.pc.in +MAKE_DIRS+= ${PREFIX}/include/xfce4 + .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST index ce53d18b47f..7deda984b84 100644 --- a/x11/libxfce4util/PLIST +++ b/x11/libxfce4util/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:25:00 joerg Exp $ +@comment $NetBSD: PLIST,v 1.14 2009/09/16 01:15:35 reed Exp $ include/xfce4/libxfce4util/debug.h include/xfce4/libxfce4util/i18n.h include/xfce4/libxfce4util/libxfce4util-config.h @@ -13,45 +13,49 @@ include/xfce4/libxfce4util/xfce-i18n.h include/xfce4/libxfce4util/xfce-kiosk.h include/xfce4/libxfce4util/xfce-license.h include/xfce4/libxfce4util/xfce-miscutils.h +include/xfce4/libxfce4util/xfce-posix-signal-handler.h include/xfce4/libxfce4util/xfce-rc.h include/xfce4/libxfce4util/xfce-resource.h include/xfce4/libxfce4util/xfce-utf8.h lib/libxfce4util.la lib/pkgconfig/libxfce4util-1.0.pc sbin/xfce4-kiosk-query -share/doc/libxfce4util/home.png -share/doc/libxfce4util/index.html -share/doc/libxfce4util/index.sgml -share/doc/libxfce4util/left.png -share/doc/libxfce4util/libxfce4util-Desktop-entries.html -share/doc/libxfce4util/libxfce4util-File-Utilities.html -share/doc/libxfce4util/libxfce4util-Internationalisation.html -share/doc/libxfce4util/libxfce4util-Miscellaneous-Utilities.html -share/doc/libxfce4util/libxfce4util-Resource-Config-File-Support.html -share/doc/libxfce4util/libxfce4util-Resource-lookup-functions.html -share/doc/libxfce4util/libxfce4util-Software-Licenses.html -share/doc/libxfce4util/libxfce4util-Unicode-Support-Functions.html -share/doc/libxfce4util/libxfce4util-Version-Information.html -share/doc/libxfce4util/libxfce4util-Xfce-Generics.html -share/doc/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html -share/doc/libxfce4util/libxfce4util-core.html -share/doc/libxfce4util/libxfce4util-datatypes.html -share/doc/libxfce4util/libxfce4util-fundamentals.html -share/doc/libxfce4util/libxfce4util-utilities.html -share/doc/libxfce4util/libxfce4util.devhelp -share/doc/libxfce4util/libxfce4util.devhelp2 -share/doc/libxfce4util/reference.html -share/doc/libxfce4util/right.png -share/doc/libxfce4util/style.css -share/doc/libxfce4util/up.png +share/gtk-doc/html/libxfce4util/home.png +share/gtk-doc/html/libxfce4util/index.html +share/gtk-doc/html/libxfce4util/index.sgml +share/gtk-doc/html/libxfce4util/left.png +share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html +share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html +share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html +share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html +share/gtk-doc/html/libxfce4util/libxfce4util-POSIX-Signal-Handling.html +share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html +share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html +share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html +share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html +share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html +share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html +share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html +share/gtk-doc/html/libxfce4util/libxfce4util-core.html +share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html +share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html +share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html +share/gtk-doc/html/libxfce4util/libxfce4util.devhelp +share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2 +share/gtk-doc/html/libxfce4util/reference.html +share/gtk-doc/html/libxfce4util/right.png +share/gtk-doc/html/libxfce4util/style.css +share/gtk-doc/html/libxfce4util/up.png share/locale/am/LC_MESSAGES/libxfce4util.mo share/locale/ar/LC_MESSAGES/libxfce4util.mo share/locale/ca/LC_MESSAGES/libxfce4util.mo share/locale/cs/LC_MESSAGES/libxfce4util.mo share/locale/cy/LC_MESSAGES/libxfce4util.mo +share/locale/da/LC_MESSAGES/libxfce4util.mo share/locale/de/LC_MESSAGES/libxfce4util.mo share/locale/dz/LC_MESSAGES/libxfce4util.mo share/locale/en_GB/LC_MESSAGES/libxfce4util.mo +share/locale/es/LC_MESSAGES/libxfce4util.mo share/locale/et/LC_MESSAGES/libxfce4util.mo share/locale/eu/LC_MESSAGES/libxfce4util.mo share/locale/fi/LC_MESSAGES/libxfce4util.mo @@ -59,23 +63,23 @@ share/locale/fr/LC_MESSAGES/libxfce4util.mo share/locale/gl/LC_MESSAGES/libxfce4util.mo share/locale/he/LC_MESSAGES/libxfce4util.mo share/locale/id/LC_MESSAGES/libxfce4util.mo -share/locale/it/LC_MESSAGES/libxfce4util.mo share/locale/ja/LC_MESSAGES/libxfce4util.mo share/locale/ka/LC_MESSAGES/libxfce4util.mo share/locale/ko/LC_MESSAGES/libxfce4util.mo share/locale/lt/LC_MESSAGES/libxfce4util.mo share/locale/lv/LC_MESSAGES/libxfce4util.mo share/locale/mk/LC_MESSAGES/libxfce4util.mo -share/locale/nb_NO/LC_MESSAGES/libxfce4util.mo +share/locale/nb/LC_MESSAGES/libxfce4util.mo share/locale/nl/LC_MESSAGES/libxfce4util.mo share/locale/pl/LC_MESSAGES/libxfce4util.mo +share/locale/pt/LC_MESSAGES/libxfce4util.mo share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo -share/locale/pt_PT/LC_MESSAGES/libxfce4util.mo share/locale/ro/LC_MESSAGES/libxfce4util.mo share/locale/si/LC_MESSAGES/libxfce4util.mo -share/locale/sk/LC_MESSAGES/libxfce4util.mo +share/locale/sl/LC_MESSAGES/libxfce4util.mo share/locale/sq/LC_MESSAGES/libxfce4util.mo -share/locale/th/LC_MESSAGES/libxfce4util.mo +share/locale/sv/LC_MESSAGES/libxfce4util.mo share/locale/tr/LC_MESSAGES/libxfce4util.mo share/locale/uk/LC_MESSAGES/libxfce4util.mo share/locale/ur/LC_MESSAGES/libxfce4util.mo +share/locale/zh_CN/LC_MESSAGES/libxfce4util.mo diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk index e8ea79b240d..0cbd23a79fe 100644 --- a/x11/libxfce4util/buildlink3.mk +++ b/x11/libxfce4util/buildlink3.mk @@ -1,17 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.23 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/09/16 01:15:35 reed Exp $ BUILDLINK_TREE+= libxfce4util .if !defined(LIBXFCE4UTIL_BUILDLINK3_MK) LIBXFCE4UTIL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.libxfce4util?= libxfce4util>=4.4.3nb1 +BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.6.0 BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .endif # LIBXFCE4UTIL_BUILDLINK3_MK diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo index 5074289231c..b8fc9f050ef 100644 --- a/x11/libxfce4util/distinfo +++ b/x11/libxfce4util/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.19 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.20 2009/09/16 01:15:35 reed Exp $ -SHA1 (libxfce4util-4.4.3.tar.bz2) = 08e9d64e4c66ea2420a9a0ab678cf5a064585b37 -RMD160 (libxfce4util-4.4.3.tar.bz2) = 256f4e759562113be2dc82265752a218340deeda -Size (libxfce4util-4.4.3.tar.bz2) = 390566 bytes +SHA1 (libxfce4util-4.6.1.tar.bz2) = 6d14099aa095b2f5d9b6a4348968b741b9ad661d +RMD160 (libxfce4util-4.6.1.tar.bz2) = e54d6c7291bbd7e658bc612b52b1c8d02c47d5ae +Size (libxfce4util-4.6.1.tar.bz2) = 405327 bytes diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index a15028494ae..9e258078dcb 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: Makefile,v 1.34 2009/09/16 01:15:35 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,33 +6,39 @@ PKG_DESTDIR_SUPPORT= user-destdir DISTNAME= xfdesktop-${XFCE4_VERSION} PKGNAME= xfce4-desktop-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= x11 COMMENT= Xfce desktop background manager -PKG_SYSCONFSUBDIR= xdg/xfce4/desktop -EGDIR= ${XFCE4_EGBASE}/desktop -CONF_FILES= ${EGDIR:Q}/menu.xml ${PKG_SYSCONFDIR:Q}/menu.xml -.for l in ca cs da de el es et eu fi fr he hu ja ko nl pl pt_BR pt_PT ro ru sk \ - sv uk vi zh_TW -CONF_FILES+= ${EGDIR:Q}/menu.xml.${l:Q} \ - ${PKG_SYSCONFDIR:Q}/menu.xml.${l:Q} -.endfor -CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml \ - ${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml -.for l in ca cs de el es eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW -CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml.${l:Q} \ - ${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml.${l:Q} -.endfor - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} - -REQD_DIRS+= ${XFCE4_EGBASE:Q} ${EGDIR:Q} -BUILD_DEFS+= PKG_SYSCONFBASE +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +BUILD_DEFS+= PKG_SYSCONFBASE + +PKG_SYSCONFSUBDIR= xdg/menus + +OWN_DIRS+= ${PKG_SYSCONFDIR} +MAKE_DIRS+= ${PREFIX}/lib/xfce4 ${PREFIX}/libexec/xfce4 +MAKE_DIRS+= ${PREFIX}/libexec/panel-plugins ${XFCE4_EGBASE:Q} +MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/da +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/ja ${PREFIX}/share/xfce4/doc/ja/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/panel-plugins + +CONF_FILES= ${XFCE4_EGBASE:Q}/menus/xfce-applications.menu \ + ${PKG_SYSCONFDIR}/xfce-applications.menu + +.include "../../devel/libglade/buildlink3.mk" +.include "../../devel/libwnck/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/xfce4-thunar/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4menu/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/xfce4-exo/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST index b38df50f021..51ea08f43b5 100644 --- a/x11/xfce4-desktop/PLIST +++ b/x11/xfce4-desktop/PLIST @@ -1,68 +1,31 @@ -@comment $NetBSD: PLIST,v 1.21 2009/06/14 22:06:42 joerg Exp $ -bin/xfce4-menueditor +@comment $NetBSD: PLIST,v 1.22 2009/09/16 01:15:35 reed Exp $ bin/xfce4-popup-menu bin/xfdesktop -lib/xfce4/mcs-plugins/backdrop_settings.la +bin/xfdesktop-settings lib/xfce4/modules/xfce4_desktop_menu.la libexec/xfce4/panel-plugins/xfce4-menu-plugin man/man1/xfdesktop.1 share/applications/xfce-backdrop-settings.desktop -share/applications/xfce-menueditor.desktop -share/examples/xfce4/desktop/menu.xml -share/examples/xfce4/desktop/menu.xml.be -share/examples/xfce4/desktop/menu.xml.ca -share/examples/xfce4/desktop/menu.xml.cs -share/examples/xfce4/desktop/menu.xml.da -share/examples/xfce4/desktop/menu.xml.de -share/examples/xfce4/desktop/menu.xml.el -share/examples/xfce4/desktop/menu.xml.es -share/examples/xfce4/desktop/menu.xml.et -share/examples/xfce4/desktop/menu.xml.eu -share/examples/xfce4/desktop/menu.xml.fi -share/examples/xfce4/desktop/menu.xml.fr -share/examples/xfce4/desktop/menu.xml.he -share/examples/xfce4/desktop/menu.xml.hu -share/examples/xfce4/desktop/menu.xml.it -share/examples/xfce4/desktop/menu.xml.ja -share/examples/xfce4/desktop/menu.xml.ko -share/examples/xfce4/desktop/menu.xml.nb_NO -share/examples/xfce4/desktop/menu.xml.nl -share/examples/xfce4/desktop/menu.xml.pa -share/examples/xfce4/desktop/menu.xml.pl -share/examples/xfce4/desktop/menu.xml.pt_BR -share/examples/xfce4/desktop/menu.xml.pt_PT -share/examples/xfce4/desktop/menu.xml.ro -share/examples/xfce4/desktop/menu.xml.ru -share/examples/xfce4/desktop/menu.xml.sk -share/examples/xfce4/desktop/menu.xml.sv -share/examples/xfce4/desktop/menu.xml.tr -share/examples/xfce4/desktop/menu.xml.uk -share/examples/xfce4/desktop/menu.xml.vi -share/examples/xfce4/desktop/menu.xml.zh_TW -share/examples/xfce4/desktop/xfce-registered-categories.xml -share/examples/xfce4/desktop/xfce-registered-categories.xml.ca -share/examples/xfce4/desktop/xfce-registered-categories.xml.cs -share/examples/xfce4/desktop/xfce-registered-categories.xml.de -share/examples/xfce4/desktop/xfce-registered-categories.xml.el -share/examples/xfce4/desktop/xfce-registered-categories.xml.es -share/examples/xfce4/desktop/xfce-registered-categories.xml.eu -share/examples/xfce4/desktop/xfce-registered-categories.xml.fi -share/examples/xfce4/desktop/xfce-registered-categories.xml.fr -share/examples/xfce4/desktop/xfce-registered-categories.xml.he -share/examples/xfce4/desktop/xfce-registered-categories.xml.hu -share/examples/xfce4/desktop/xfce-registered-categories.xml.it -share/examples/xfce4/desktop/xfce-registered-categories.xml.ja -share/examples/xfce4/desktop/xfce-registered-categories.xml.nb_NO -share/examples/xfce4/desktop/xfce-registered-categories.xml.nl -share/examples/xfce4/desktop/xfce-registered-categories.xml.pl -share/examples/xfce4/desktop/xfce-registered-categories.xml.pt_BR -share/examples/xfce4/desktop/xfce-registered-categories.xml.ro -share/examples/xfce4/desktop/xfce-registered-categories.xml.ru -share/examples/xfce4/desktop/xfce-registered-categories.xml.sk -share/examples/xfce4/desktop/xfce-registered-categories.xml.sv -share/examples/xfce4/desktop/xfce-registered-categories.xml.tr -share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_CN -share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_TW +share/applications/xfce4-about-xfce.desktop +share/applications/xfce4-file-manager.desktop +share/applications/xfce4-help.desktop +share/applications/xfce4-logout.desktop +share/applications/xfce4-run-program.desktop +share/applications/xfce4-terminal.desktop +share/applications/xfce4-web-browser.desktop +share/desktop-directories/xfce-accessories.directory +share/desktop-directories/xfce-development.directory +share/desktop-directories/xfce-education.directory +share/desktop-directories/xfce-games.directory +share/desktop-directories/xfce-graphics.directory +share/desktop-directories/xfce-multimedia.directory +share/desktop-directories/xfce-network.directory +share/desktop-directories/xfce-office.directory +share/desktop-directories/xfce-other.directory +share/desktop-directories/xfce-screensavers.directory +share/desktop-directories/xfce-settings.directory +share/desktop-directories/xfce-system.directory +share/examples/xfce4/menus/xfce-applications.menu share/icons/hicolor/32x32/apps/xfce4-backdrop.png share/icons/hicolor/32x32/apps/xfce4-menueditor.png share/icons/hicolor/48x48/apps/xfce4-backdrop.png @@ -106,15 +69,16 @@ share/locale/lv/LC_MESSAGES/xfdesktop.mo share/locale/mk/LC_MESSAGES/xfdesktop.mo share/locale/mr/LC_MESSAGES/xfdesktop.mo share/locale/ms/LC_MESSAGES/xfdesktop.mo -share/locale/nb_NO/LC_MESSAGES/xfdesktop.mo +share/locale/nb/LC_MESSAGES/xfdesktop.mo share/locale/nl/LC_MESSAGES/xfdesktop.mo share/locale/pa/LC_MESSAGES/xfdesktop.mo share/locale/pl/LC_MESSAGES/xfdesktop.mo +share/locale/pt/LC_MESSAGES/xfdesktop.mo share/locale/pt_BR/LC_MESSAGES/xfdesktop.mo -share/locale/pt_PT/LC_MESSAGES/xfdesktop.mo share/locale/ro/LC_MESSAGES/xfdesktop.mo share/locale/ru/LC_MESSAGES/xfdesktop.mo share/locale/sk/LC_MESSAGES/xfdesktop.mo +share/locale/sq/LC_MESSAGES/xfdesktop.mo share/locale/sv/LC_MESSAGES/xfdesktop.mo share/locale/ta/LC_MESSAGES/xfdesktop.mo share/locale/tr/LC_MESSAGES/xfdesktop.mo @@ -130,7 +94,6 @@ share/pixmaps/xfce4_xicon2.png share/pixmaps/xfce4_xicon3.png share/pixmaps/xfce4_xicon4.png share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png -share/xfce4-menueditor/xfce4-menueditor.ui share/xfce4/backdrops/flower.png share/xfce4/backdrops/xfce-in-a-grid.png share/xfce4/backdrops/xfce-in-the-moon.png @@ -148,6 +111,7 @@ share/xfce4/doc/C/images/xfdesktop-behavior-tab.png share/xfce4/doc/C/images/xfdesktop-editor.png share/xfce4/doc/C/images/xfdesktop-list.png share/xfce4/doc/C/xfdesktop.html +share/xfce4/doc/da/xfdesktop.html share/xfce4/doc/fr/images/root_menu.png share/xfce4/doc/fr/images/root_menu2.png share/xfce4/doc/fr/images/select_bg_color.png @@ -156,4 +120,11 @@ share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png share/xfce4/doc/fr/images/xfdesktop-editor.png share/xfce4/doc/fr/images/xfdesktop-list.png share/xfce4/doc/fr/xfdesktop.html +share/xfce4/doc/ja/images/root_menu.png +share/xfce4/doc/ja/images/root_menu2.png +share/xfce4/doc/ja/images/select_bg_color.png +share/xfce4/doc/ja/images/xfdesktop-background-tab.png +share/xfce4/doc/ja/images/xfdesktop-icons-tab.png +share/xfce4/doc/ja/images/xfdesktop-menus-tab.png +share/xfce4/doc/ja/xfdesktop.html share/xfce4/panel-plugins/xfce4-menu.desktop diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk index 8d0dbf38e2e..13d3ac8824b 100644 --- a/x11/xfce4-desktop/buildlink3.mk +++ b/x11/xfce4-desktop/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.25 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2009/09/16 01:15:35 reed Exp $ BUILDLINK_TREE+= xfce4-desktop .if !defined(XFCE4_DESKTOP_BUILDLINK3_MK) XFCE4_DESKTOP_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-desktop?= xfce4-desktop>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/xfce4-thunar/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_DESKTOP_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-desktop diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo index b1b24d0f544..2a50f17c981 100644 --- a/x11/xfce4-desktop/distinfo +++ b/x11/xfce4-desktop/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.19 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.20 2009/09/16 01:15:35 reed Exp $ -SHA1 (xfdesktop-4.4.3.tar.bz2) = 6ba60fd7f8f57104195e3e17551315d0c3c2381e -RMD160 (xfdesktop-4.4.3.tar.bz2) = 490749cc579a30ea3689ab65c099d284ecffff56 -Size (xfdesktop-4.4.3.tar.bz2) = 3095897 bytes -SHA1 (patch-aa) = 72eb8d6810d0a680f49fa03f45a73fe4f124d02d -SHA1 (patch-ab) = 0816049644f48d4057b20d32f88629552216f5fc +SHA1 (xfdesktop-4.6.1.tar.bz2) = c2c1b54acaae924077caa3cdffe449e3bb34b2bd +RMD160 (xfdesktop-4.6.1.tar.bz2) = 86785f706a65e443c5521179b68309b9aca0cb32 +Size (xfdesktop-4.6.1.tar.bz2) = 3671378 bytes +SHA1 (patch-ac) = 1d63ec32443690ac989a88704079999894a67ad5 diff --git a/x11/xfce4-desktop/patches/patch-aa b/x11/xfce4-desktop/patches/patch-aa deleted file mode 100644 index 214c2bd2498..00000000000 --- a/x11/xfce4-desktop/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2007/12/07 19:43:27 martti Exp $ - ---- Makefile.in.orig 2007-11-17 19:52:57.000000000 +0000 -+++ Makefile.in 2007-12-04 13:28:52.000000000 +0000 -@@ -314,7 +314,7 @@ - modules \ - pixmaps - --confdir = $(sysconfdir)/xdg/xfce4/desktop -+confdir = $(datadir)/examples/xfce4/desktop - conf_DATA = \ - menu.xml \ - menu.xml.be \ diff --git a/x11/xfce4-desktop/patches/patch-ab b/x11/xfce4-desktop/patches/patch-ab deleted file mode 100644 index 9ef1c37f9b2..00000000000 --- a/x11/xfce4-desktop/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2007/12/07 19:43:27 martti Exp $ - ---- modules/menu/Makefile.in.orig 2007-11-17 19:52:57.000000000 +0000 -+++ modules/menu/Makefile.in 2007-12-04 13:29:15.000000000 +0000 -@@ -337,7 +337,7 @@ - $(LIBX11_LIBS) \ - $(LIBXFCEGUI4_LIBS) - --xfceconfdir = $(sysconfdir)/xdg/xfce4/desktop -+xfceconfdir = $(datadir)/examples/xfce4/desktop - xfceconf_DATA = \ - xfce-registered-categories.xml \ - xfce-registered-categories.xml.ca \ diff --git a/x11/xfce4-desktop/patches/patch-ac b/x11/xfce4-desktop/patches/patch-ac new file mode 100644 index 00000000000..637db20cc5e --- /dev/null +++ b/x11/xfce4-desktop/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.5 2009/09/16 01:15:33 reed Exp $ + +--- modules/menu/menu-data/Makefile.in.orig 2009-03-09 11:13:35.000000000 +0000 ++++ modules/menu/menu-data/Makefile.in +@@ -291,7 +291,7 @@ desktop_in_files = \ + xfce4-web-browser.desktop.in + + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +-menudir = $(sysconfdir)/xdg/menus ++menudir = $(datadir)/examples/xfce4/menus + menu_DATA = xfce-applications.menu + EXTRA_DIST = $(desktop_in_files) $(menu_DATA) + DISTCLEANFILES = $(desktop_DATA) diff --git a/x11/xfce4-exo/Makefile b/x11/xfce4-exo/Makefile index 576a42b2f93..face0e7026d 100644 --- a/x11/xfce4-exo/Makefile +++ b/x11/xfce4-exo/Makefile @@ -1,28 +1,45 @@ -# $NetBSD: Makefile,v 1.8 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: Makefile,v 1.9 2009/09/16 01:15:35 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.3.4 +XFCE4_VERSION= 0.3.101 DISTNAME= exo-${XFCE4_VERSION} PKGNAME= xfce4-exo-${XFCE4_VERSION} -PKGREVISION= 5 CATEGORIES= x11 COMMENT= Xfce extension library DEPENDS+= p5-URI>=0:../../www/p5-URI +PKGCONFIG_OVERRIDE+= exo/exo-0.3.pc.in exo-hal/exo-hal-0.3.pc.in + PKG_SYSCONFSUBDIR= xdg/xfce4 EGDIR= ${XFCE4_EGBASE} -CONF_FILES= ${EGDIR:Q}/helpers.rc ${PKG_SYSCONFDIR:Q}/helpers.rc + +MAKE_DIRS+= ${SYSCONFDIR} +MAKE_DIRS+= ${EGDIR} ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc +.for f in C es fr id ja pt_BR tr +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/${f} +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/${f}/images +.endfor + +CONF_FILES= ${EGDIR}/helpers.rc ${PKG_SYSCONFDIR}/helpers.rc OWN_DIRS+= ${EGDIR} +PY_PATCHPLIST= yes + .include "options.mk" +BUILDLINK_API_DEPENDS.libnotify+= libnotify>=0.4.0 + .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../lang/python/application.mk" +.include "../../lang/python/extension.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/libnotify/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/py-gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-exo/PLIST b/x11/xfce4-exo/PLIST index db4bc57019a..0adab725211 100644 --- a/x11/xfce4-exo/PLIST +++ b/x11/xfce4-exo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 22:06:43 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:35 reed Exp $ bin/exo-csource bin/exo-desktop-item-edit bin/exo-eject @@ -38,15 +38,22 @@ lib/libexo-0.3.la lib/libexo-hal-0.3.la lib/pkgconfig/exo-0.3.pc lib/pkgconfig/exo-hal-0.3.pc -lib/xfce4/mcs-plugins/exo-preferred-applications-settings.la +${PYSITELIB}/exo-0.3/_exo.la +${PYSITELIB}/exo-0.3/exo/__init__.py +${PYSITELIB}/exo-0.3/exo/__init__.pyc +${PYSITELIB}/exo-0.3/exo/__init__.pyo +${PYSITELIB}/pyexo.py +${PYSITELIB}/pyexo.pyc +${PYSITELIB}/pyexo.pyo libexec/exo-compose-mail-0.3 libexec/exo-helper-0.3 +libexec/exo-mount-notify-0.3 man/man1/exo-csource.1 man/man1/exo-open.1 share/applications/exo-preferred-applications.desktop share/examples/xfce4/helpers.rc -share/gtk-doc/html/exo/ExoCellRendererIcon.html share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html +share/gtk-doc/html/exo/ExoCellRendererIcon.html share/gtk-doc/html/exo/ExoEllipsizedLabel.html share/gtk-doc/html/exo/ExoIconBar.html share/gtk-doc/html/exo/ExoIconChooserDialog.html @@ -106,6 +113,7 @@ share/locale/be/LC_MESSAGES/libexo-0.3.mo share/locale/ca/LC_MESSAGES/libexo-0.3.mo share/locale/cs/LC_MESSAGES/libexo-0.3.mo share/locale/cy/LC_MESSAGES/libexo-0.3.mo +share/locale/da/LC_MESSAGES/libexo-0.3.mo share/locale/de/LC_MESSAGES/libexo-0.3.mo share/locale/dz/LC_MESSAGES/libexo-0.3.mo share/locale/el/LC_MESSAGES/libexo-0.3.mo @@ -118,40 +126,66 @@ share/locale/fr/LC_MESSAGES/libexo-0.3.mo share/locale/gl/LC_MESSAGES/libexo-0.3.mo share/locale/he/LC_MESSAGES/libexo-0.3.mo share/locale/hu/LC_MESSAGES/libexo-0.3.mo +share/locale/id/LC_MESSAGES/libexo-0.3.mo share/locale/it/LC_MESSAGES/libexo-0.3.mo share/locale/ja/LC_MESSAGES/libexo-0.3.mo share/locale/ka/LC_MESSAGES/libexo-0.3.mo +share/locale/ku/LC_MESSAGES/libexo-0.3.mo share/locale/lt/LC_MESSAGES/libexo-0.3.mo share/locale/lv/LC_MESSAGES/libexo-0.3.mo share/locale/mk/LC_MESSAGES/libexo-0.3.mo -share/locale/nb_NO/LC_MESSAGES/libexo-0.3.mo +share/locale/nb/LC_MESSAGES/libexo-0.3.mo share/locale/nl/LC_MESSAGES/libexo-0.3.mo share/locale/pa/LC_MESSAGES/libexo-0.3.mo share/locale/pl/LC_MESSAGES/libexo-0.3.mo +share/locale/pt/LC_MESSAGES/libexo-0.3.mo share/locale/pt_BR/LC_MESSAGES/libexo-0.3.mo -share/locale/pt_PT/LC_MESSAGES/libexo-0.3.mo share/locale/ro/LC_MESSAGES/libexo-0.3.mo share/locale/ru/LC_MESSAGES/libexo-0.3.mo share/locale/sq/LC_MESSAGES/libexo-0.3.mo share/locale/sv/LC_MESSAGES/libexo-0.3.mo +share/locale/tr/LC_MESSAGES/libexo-0.3.mo +share/locale/uk/LC_MESSAGES/libexo-0.3.mo share/locale/ur/LC_MESSAGES/libexo-0.3.mo +share/locale/zh_CN/LC_MESSAGES/libexo-0.3.mo share/locale/zh_TW/LC_MESSAGES/libexo-0.3.mo share/pixmaps/exo-0.3/exo-thumbnail-frame.png +share/pygtk/2.0/defs/exo-0.3/exo.defs share/xfce4/doc/C/exo-preferred-applications.html share/xfce4/doc/C/images/exo-preferred-applications-internet.png share/xfce4/doc/C/images/exo-preferred-applications-utilities.png share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-custom.png share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-menu.png +share/xfce4/doc/es/exo-preferred-applications.html +share/xfce4/doc/es/images/exo-preferred-applications-internet.png +share/xfce4/doc/es/images/exo-preferred-applications-utilities.png +share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-custom.png +share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-menu.png share/xfce4/doc/fr/exo-preferred-applications.html share/xfce4/doc/fr/images/exo-preferred-applications-internet.png share/xfce4/doc/fr/images/exo-preferred-applications-utilities.png share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-custom.png share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-menu.png +share/xfce4/doc/id/exo-preferred-applications.html +share/xfce4/doc/id/images/exo-preferred-applications-internet.png +share/xfce4/doc/id/images/exo-preferred-applications-utilities.png +share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-custom.png +share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-menu.png share/xfce4/doc/ja/exo-preferred-applications.html share/xfce4/doc/ja/images/exo-preferred-applications-internet.png share/xfce4/doc/ja/images/exo-preferred-applications-utilities.png share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-custom.png share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-menu.png +share/xfce4/doc/pt_BR/exo-preferred-applications.html +share/xfce4/doc/pt_BR/images/exo-preferred-applications-internet.png +share/xfce4/doc/pt_BR/images/exo-preferred-applications-utilities.png +share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-custom.png +share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-menu.png +share/xfce4/doc/tr/exo-preferred-applications.html +share/xfce4/doc/tr/images/exo-preferred-applications-internet.png +share/xfce4/doc/tr/images/exo-preferred-applications-utilities.png +share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-custom.png +share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-menu.png share/xfce4/helpers/Terminal.desktop share/xfce4/helpers/aterm.desktop share/xfce4/helpers/balsa.desktop @@ -168,6 +202,7 @@ share/xfce4/helpers/kmail.desktop share/xfce4/helpers/konqueror.desktop share/xfce4/helpers/links.desktop share/xfce4/helpers/lynx.desktop +share/xfce4/helpers/midori.desktop share/xfce4/helpers/mozilla-browser.desktop share/xfce4/helpers/mozilla-mailer.desktop share/xfce4/helpers/mutt.desktop diff --git a/x11/xfce4-exo/buildlink3.mk b/x11/xfce4-exo/buildlink3.mk index acc30e0e3fe..78327c2545d 100644 --- a/x11/xfce4-exo/buildlink3.mk +++ b/x11/xfce4-exo/buildlink3.mk @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.5 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:15:35 reed Exp $ BUILDLINK_TREE+= xfce4-exo .if !defined(XFCE4_EXO_BUILDLINK3_MK) XFCE4_EXO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-exo+= xfce4-exo>=0.3.4 -BUILDLINK_ABI_DEPENDS.xfce4-exo?= xfce4-exo>=0.3.4nb5 +BUILDLINK_API_DEPENDS.xfce4-exo+= xfce4-exo>=0.3.100 BUILDLINK_PKGSRCDIR.xfce4-exo?= ../../x11/xfce4-exo pkgbase := xfce4-exo @@ -16,10 +15,9 @@ pkgbase := xfce4-exo .include "../../sysutils/hal/buildlink3.mk" .endif -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .endif # XFCE4_EXO_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-exo diff --git a/x11/xfce4-exo/distinfo b/x11/xfce4-exo/distinfo index 0235dfe0b45..dc6bb8ab69f 100644 --- a/x11/xfce4-exo/distinfo +++ b/x11/xfce4-exo/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2008/12/18 16:38:08 hira Exp $ +$NetBSD: distinfo,v 1.7 2009/09/16 01:15:35 reed Exp $ -SHA1 (exo-0.3.4.tar.bz2) = 4f7a3f46592fd0311be1f011f17431f211cc1fcb -RMD160 (exo-0.3.4.tar.bz2) = e021f030a624c522c819ec0f3a8682a1007ae748 -Size (exo-0.3.4.tar.bz2) = 1300127 bytes +SHA1 (exo-0.3.101.tar.bz2) = 74194f58278a2b9d963264806f142e5d6d05336c +RMD160 (exo-0.3.101.tar.bz2) = 92dfc1e8f0bfa8ca74f151a2283f6988ce703649 +Size (exo-0.3.101.tar.bz2) = 1793815 bytes SHA1 (patch-ad) = af08127aad06a5e9d8e8055dff1f55982666d8d9 SHA1 (patch-ae) = 18a95737a6eaef8697224d4c099625c18be7ddfb -SHA1 (patch-af) = 3ee9049c676a03eadaaa92c69f5480e625a9cc9f +SHA1 (patch-af) = 86aee9fdf075c2de36deeebbb7594193e92cde95 diff --git a/x11/xfce4-exo/patches/patch-af b/x11/xfce4-exo/patches/patch-af index 232926af987..53eea103146 100644 --- a/x11/xfce4-exo/patches/patch-af +++ b/x11/xfce4-exo/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1 2008/12/18 16:38:08 hira Exp $ +$NetBSD: patch-af,v 1.2 2009/09/16 01:15:35 reed Exp $ ---- exo-helper/helpers/Makefile.in.orig 2008-11-29 17:14:28.000000000 +0900 -+++ exo-helper/helpers/Makefile.in 2008-11-29 17:15:31.000000000 +0900 -@@ -276,7 +276,7 @@ +--- exo-helper/helpers/Makefile.in.orig 2009-02-24 20:56:34.000000000 +0000 ++++ exo-helper/helpers/Makefile.in +@@ -273,7 +273,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile index a05ee824da5..627b1d3d758 100644 --- a/x11/xfce4-gtk2-engine/Makefile +++ b/x11/xfce4-gtk2-engine/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.12 2009/08/26 19:56:56 sno Exp $ +# $NetBSD: Makefile,v 1.13 2009/09/16 01:15:35 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 2.4.3 +XFCE4_VERSION= 2.6.0 DISTNAME= gtk-xfce-engine-${XFCE4_VERSION} PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION} -PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce GTK2 themes +MAKE_DIRS+= ${PREFIX}/share/themes/Xfce .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-gtk2-engine/PLIST b/x11/xfce4-gtk2-engine/PLIST index 00f419e3ee9..9b432672e9d 100644 --- a/x11/xfce4-gtk2-engine/PLIST +++ b/x11/xfce4-gtk2-engine/PLIST @@ -1,56 +1,21 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 22:06:43 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:35 reed Exp $ lib/gtk-2.0/2.10.0/engines/libxfce.la -share/themes/Xfce-4.0/ICON.png -share/themes/Xfce-4.0/README.html share/themes/Xfce-4.0/gtk-2.0/gtkrc -share/themes/Xfce-4.2/ICON.png -share/themes/Xfce-4.2/README.html share/themes/Xfce-4.2/gtk-2.0/gtkrc -share/themes/Xfce-b5/ICON.png -share/themes/Xfce-b5/README.html +share/themes/Xfce-4.4/gtk-2.0/gtkrc share/themes/Xfce-b5/gtk-2.0/gtkrc -share/themes/Xfce-basic/ICON.png -share/themes/Xfce-basic/README.html share/themes/Xfce-basic/gtk-2.0/gtkrc -share/themes/Xfce-cadmium/ICON.png -share/themes/Xfce-cadmium/README.html share/themes/Xfce-cadmium/gtk-2.0/gtkrc -share/themes/Xfce-curve/ICON.png -share/themes/Xfce-curve/README.html share/themes/Xfce-curve/gtk-2.0/gtkrc -share/themes/Xfce-dawn/ICON.png -share/themes/Xfce-dawn/README.html share/themes/Xfce-dawn/gtk-2.0/gtkrc -share/themes/Xfce-dusk/ICON.png -share/themes/Xfce-dusk/README.html share/themes/Xfce-dusk/gtk-2.0/gtkrc -share/themes/Xfce-kde2/ICON.png -share/themes/Xfce-kde2/README.html share/themes/Xfce-kde2/gtk-2.0/gtkrc -share/themes/Xfce-kolors/ICON.png -share/themes/Xfce-kolors/README.html share/themes/Xfce-kolors/gtk-2.0/gtkrc -share/themes/Xfce-light/ICON.png -share/themes/Xfce-light/README.html share/themes/Xfce-light/gtk-2.0/gtkrc -share/themes/Xfce-orange/ICON.png -share/themes/Xfce-orange/README.html share/themes/Xfce-orange/gtk-2.0/gtkrc -share/themes/Xfce-redmondxp/ICON.png -share/themes/Xfce-redmondxp/README.html share/themes/Xfce-redmondxp/gtk-2.0/gtkrc -share/themes/Xfce-saltlake/ICON.png -share/themes/Xfce-saltlake/README.html share/themes/Xfce-saltlake/gtk-2.0/gtkrc -share/themes/Xfce-smooth/ICON.png -share/themes/Xfce-smooth/README.html share/themes/Xfce-smooth/gtk-2.0/gtkrc -share/themes/Xfce-stellar/ICON.png -share/themes/Xfce-stellar/README.html share/themes/Xfce-stellar/gtk-2.0/gtkrc -share/themes/Xfce-winter/ICON.png -share/themes/Xfce-winter/README.html share/themes/Xfce-winter/gtk-2.0/gtkrc -share/themes/Xfce/ICON.png -share/themes/Xfce/README.html share/themes/Xfce/gtk-2.0/gtkrc diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk index dc3a32daba5..d2ede2bb486 100644 --- a/x11/xfce4-gtk2-engine/buildlink3.mk +++ b/x11/xfce4-gtk2-engine/buildlink3.mk @@ -1,17 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:56 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/09/16 01:15:35 reed Exp $ BUILDLINK_TREE+= xfce4-gtk2-engine .if !defined(XFCE4_GTK2_ENGINE_BUILDLINK3_MK) XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.4.3 -BUILDLINK_ABI_DEPENDS.xfce4-gtk2-engine?= xfce4-gtk2-engine>=2.4.3nb1 +BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.6.0 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engine -.include "../../x11/gtk2/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-gtk2-engine diff --git a/x11/xfce4-gtk2-engine/distinfo b/x11/xfce4-gtk2-engine/distinfo index 104d2578456..692d0c49ad9 100644 --- a/x11/xfce4-gtk2-engine/distinfo +++ b/x11/xfce4-gtk2-engine/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.6 2009/09/16 01:15:35 reed Exp $ -SHA1 (gtk-xfce-engine-2.4.3.tar.bz2) = 17794b7742691330f643ea207341dbd502b016f5 -RMD160 (gtk-xfce-engine-2.4.3.tar.bz2) = ef9960987e9356030efc6696725f504458b7f510 -Size (gtk-xfce-engine-2.4.3.tar.bz2) = 310286 bytes +SHA1 (gtk-xfce-engine-2.6.0.tar.bz2) = a7be2f330833d150c5fb37f68a4c2138348b5446 +RMD160 (gtk-xfce-engine-2.6.0.tar.bz2) = 07f4ff278056f7714e99da8420268dd950b15a91 +Size (gtk-xfce-engine-2.6.0.tar.bz2) = 280627 bytes diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index 28598309d72..e5a04ada149 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,45 +1,42 @@ -# $NetBSD: Makefile,v 1.34 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: Makefile,v 1.35 2009/09/16 01:15:35 reed Exp $ + +PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" -.include "../../mk/compiler.mk" DISTNAME= xfce4-panel-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= x11 COMMENT= Xfce panel -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc - -PKGCONFIG_OVERRIDE= panel/xfce4-panel-1.0.pc.in +PKGCONFIG_OVERRIDE= libxfce4panel/libxfce4panel-1.0.pc.in PTHREAD_AUTO_VARS= yes -OWN_DIRS+= xdg/xfce4 -OWN_DIRS+= xdg/xfce4/panel PKG_SYSCONFSUBDIR= xdg/xfce4/panel EGDIR= ${XFCE4_EGBASE}/panel + +MAKE_DIRS+= ${PREFIX}/include/xfce4 ${PREFIX}/lib/xfce4 +MAKE_DIRS+= ${XFCE4_EGBASE:Q} ${PREFIX}/share/xfce4 +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc ${PREFIX}/share/xfce4/doc/C +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C/images +OWN_DIRS+= ${PKG_SYSCONFDIR} +OWN_DIRS+= ${PREFIX}/libexec/xfce4/panel-plugins +# The following are not used in this pkg, but here is a good place to rmdir them +MAKE_DIRS+= ${PREFIX}/libexec/xfce4 +OWN_DIRS+= ${PREFIX}/share/xfce4/panel-plugins + .for f in clock-14.rc launcher-10.rc launcher-7.rc launcher-8.rc launcher-9.rc \ panels.xml systray-4.rc xfce4-menu-5.rc -CONF_FILES+= ${EGDIR:Q}/$f ${PKG_SYSCONFDIR:Q}/$f +CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -# If using gcc-4, compile the panel launcher without GCC optimization. See -# http://bugzilla.xfce.org/show_bug.cgi?id=2262 - -.if (!empty(CC_VERSION:Mgcc-4.*)) -SUBST_CLASSES+= launcher -SUBST_STAGE.launcher= post-configure -SUBST_FILES.launcher= plugins/launcher/Makefile -SUBST_SED.launcher= -e 's|-O |-O0 |g' -SUBST_SED.launcher+= -e 's|-O[123s] |-O0 |g' -.endif - -post-install: - @${ECHO} "Removing the dummy files" - rm -f ${PREFIX}/bin/xfce4-iconbox ${PREFIX}/bin/xftaskbar4 - +.include "../../devel/libwnck/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.include "../../x11/xfce4-exo/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST index 12b2483cf7c..48381de7592 100644 --- a/x11/xfce4-panel/PLIST +++ b/x11/xfce4-panel/PLIST @@ -1,11 +1,12 @@ -@comment $NetBSD: PLIST,v 1.21 2009/06/14 22:06:43 joerg Exp $ +@comment $NetBSD: PLIST,v 1.22 2009/09/16 01:15:35 reed Exp $ bin/xfce4-panel bin/xfce4-popup-windowlist +include/xfce4/libxfce4panel/libxfce4panel-enum-types.h +include/xfce4/libxfce4panel/libxfce4panel.h include/xfce4/libxfce4panel/xfce-arrow-button.h include/xfce4/libxfce4panel/xfce-hvbox.h include/xfce4/libxfce4panel/xfce-itembar.h include/xfce4/libxfce4panel/xfce-panel-convenience.h -include/xfce4/libxfce4panel/xfce-panel-enum-types.h include/xfce4/libxfce4panel/xfce-panel-enums.h include/xfce4/libxfce4panel/xfce-panel-external-plugin.h include/xfce4/libxfce4panel/xfce-panel-internal-plugin.h @@ -15,7 +16,6 @@ include/xfce4/libxfce4panel/xfce-panel-plugin.h include/xfce4/libxfce4panel/xfce-panel-window.h lib/libxfce4panel.la lib/pkgconfig/libxfce4panel-1.0.pc -lib/xfce4/mcs-plugins/libxfce4settings.la lib/xfce4/panel-plugins/libactions.la lib/xfce4/panel-plugins/libclock.la lib/xfce4/panel-plugins/libiconbox.la @@ -35,34 +35,43 @@ share/examples/xfce4/panel/launcher-9.rc share/examples/xfce4/panel/panels.xml share/examples/xfce4/panel/systray-4.rc share/examples/xfce4/panel/xfce4-menu-5.rc -share/doc/libxfce4panel/XfceArrowButton.html -share/doc/libxfce4panel/XfceExternalPanelPlugin.html -share/doc/libxfce4panel/XfceHVBox.html -share/doc/libxfce4panel/XfceInternalPanelPlugin.html -share/doc/libxfce4panel/XfceItembar.html -share/doc/libxfce4panel/XfcePanelPlugin.html -share/doc/libxfce4panel/XfcePanelWindow.html -share/doc/libxfce4panel/ch01.html -share/doc/libxfce4panel/home.png -share/doc/libxfce4panel/index.html -share/doc/libxfce4panel/index.sgml -share/doc/libxfce4panel/left.png -share/doc/libxfce4panel/libxfce4panel-Convenience-Functions.html -share/doc/libxfce4panel/libxfce4panel-Standard-Enumerations.html -share/doc/libxfce4panel/libxfce4panel-Writing-Plugins.html -share/doc/libxfce4panel/libxfce4panel.devhelp -share/doc/libxfce4panel/libxfce4panel.devhelp2 -share/doc/libxfce4panel/right.png -share/doc/libxfce4panel/style.css -share/doc/libxfce4panel/up.png +share/gtk-doc/html/libxfce4panel/XfceArrowButton.html +share/gtk-doc/html/libxfce4panel/XfceExternalPanelPlugin.html +share/gtk-doc/html/libxfce4panel/XfceHVBox.html +share/gtk-doc/html/libxfce4panel/XfceInternalPanelPlugin.html +share/gtk-doc/html/libxfce4panel/XfceItembar.html +share/gtk-doc/html/libxfce4panel/XfcePanelPlugin.html +share/gtk-doc/html/libxfce4panel/XfcePanelWindow.html +share/gtk-doc/html/libxfce4panel/home.png +share/gtk-doc/html/libxfce4panel/index.html +share/gtk-doc/html/libxfce4panel/index.sgml +share/gtk-doc/html/libxfce4panel/ix01.html +share/gtk-doc/html/libxfce4panel/ix02.html +share/gtk-doc/html/libxfce4panel/left.png +share/gtk-doc/html/libxfce4panel/libxfce4panel-Common-macros.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-Convenience-Widgets.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-Register-Plugins.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-Standard-Enumerations.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-fundamentals.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-panel.html +share/gtk-doc/html/libxfce4panel/libxfce4panel-widgets.html +share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp +share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp2 +share/gtk-doc/html/libxfce4panel/right.png +share/gtk-doc/html/libxfce4panel/style.css +share/gtk-doc/html/libxfce4panel/up.png share/icons/hicolor/16x16/apps/xfce-system-exit.png -share/icons/hicolor/16x16/apps/xfce-system-info.png share/icons/hicolor/16x16/apps/xfce-system-lock.png -share/icons/hicolor/16x16/apps/xfce-system-settings.png -share/icons/hicolor/48x48/apps/xfce-mail.png +share/icons/hicolor/16x16/apps/xfce4-panel.png +share/icons/hicolor/22x22/apps/xfce4-panel.png +share/icons/hicolor/24x24/apps/xfce4-panel.png +share/icons/hicolor/32x32/apps/xfce4-panel.png share/icons/hicolor/48x48/apps/xfce-mouse.png +share/icons/hicolor/48x48/apps/xfce4-clock.png share/icons/hicolor/48x48/apps/xfce4-iconbox.png share/icons/hicolor/48x48/apps/xfce4-panel.png +share/icons/hicolor/48x48/apps/xfce4-separator.png +share/icons/hicolor/48x48/apps/xfce4-systray.png share/icons/hicolor/48x48/apps/xfce4-taskbar.png share/locale/am/LC_MESSAGES/xfce4-panel.mo share/locale/ar/LC_MESSAGES/xfce4-panel.mo @@ -96,21 +105,23 @@ share/locale/it/LC_MESSAGES/xfce4-panel.mo share/locale/ja/LC_MESSAGES/xfce4-panel.mo share/locale/ka/LC_MESSAGES/xfce4-panel.mo share/locale/ko/LC_MESSAGES/xfce4-panel.mo +share/locale/ku/LC_MESSAGES/xfce4-panel.mo share/locale/lt/LC_MESSAGES/xfce4-panel.mo share/locale/lv/LC_MESSAGES/xfce4-panel.mo share/locale/mk/LC_MESSAGES/xfce4-panel.mo share/locale/mr/LC_MESSAGES/xfce4-panel.mo share/locale/ms/LC_MESSAGES/xfce4-panel.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo +share/locale/nb/LC_MESSAGES/xfce4-panel.mo share/locale/nl/LC_MESSAGES/xfce4-panel.mo share/locale/pa/LC_MESSAGES/xfce4-panel.mo share/locale/pl/LC_MESSAGES/xfce4-panel.mo +share/locale/pt/LC_MESSAGES/xfce4-panel.mo share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo share/locale/ro/LC_MESSAGES/xfce4-panel.mo share/locale/ru/LC_MESSAGES/xfce4-panel.mo share/locale/si/LC_MESSAGES/xfce4-panel.mo share/locale/sk/LC_MESSAGES/xfce4-panel.mo +share/locale/sq/LC_MESSAGES/xfce4-panel.mo share/locale/sv/LC_MESSAGES/xfce4-panel.mo share/locale/ta/LC_MESSAGES/xfce4-panel.mo share/locale/tr/LC_MESSAGES/xfce4-panel.mo diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk index d13d7c784a8..5d06fc723ef 100644 --- a/x11/xfce4-panel/buildlink3.mk +++ b/x11/xfce4-panel/buildlink3.mk @@ -1,20 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.24 2009/08/26 19:57:02 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2009/09/16 01:15:35 reed Exp $ BUILDLINK_TREE+= xfce4-panel .if !defined(XFCE4_PANEL_BUILDLINK3_MK) XFCE4_PANEL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-panel?= xfce4-panel>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .endif # XFCE4_PANEL_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-panel diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo index f2e0414337a..1b454ad660a 100644 --- a/x11/xfce4-panel/distinfo +++ b/x11/xfce4-panel/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.18 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.19 2009/09/16 01:15:35 reed Exp $ -SHA1 (xfce4-panel-4.4.3.tar.bz2) = 6af98ffef4906220c5ffdda17a77409adc7ed353 -RMD160 (xfce4-panel-4.4.3.tar.bz2) = 39c05602e82d3bdeaa152b3820e2f084df6c3759 -Size (xfce4-panel-4.4.3.tar.bz2) = 777979 bytes -SHA1 (patch-aa) = 0d44c64af2ab3cc5605dfb08baa75d78843af28f -SHA1 (patch-ab) = c5b1ccf61528bb11aebf63805586621dad4649d1 +SHA1 (xfce4-panel-4.6.1.tar.bz2) = 613c66f6402feba7983a7effb008f091182350d2 +RMD160 (xfce4-panel-4.6.1.tar.bz2) = 47ce1703306e7427d300bb3675e2e8dcd13c459e +Size (xfce4-panel-4.6.1.tar.bz2) = 868225 bytes +SHA1 (patch-ab) = 977b38f4e58620b96d28ef2b9992a03169eb7814 diff --git a/x11/xfce4-panel/patches/patch-aa b/x11/xfce4-panel/patches/patch-aa deleted file mode 100644 index 57cf0252154..00000000000 --- a/x11/xfce4-panel/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2008/03/25 16:13:52 macallan Exp $ - ---- panel/panel-properties.c.orig 2008-03-25 11:45:01.000000000 -0400 -+++ panel/panel-properties.c -@@ -623,7 +623,7 @@ _set_transparent (Panel *panel, - gboolean transparent) - { - PanelPrivate *priv; -- guint opacity; -+ gulong opacity; - - if (!GTK_WIDGET (panel)->window) - return; diff --git a/x11/xfce4-panel/patches/patch-ab b/x11/xfce4-panel/patches/patch-ab index ef586d510e5..1f810b9bd5a 100644 --- a/x11/xfce4-panel/patches/patch-ab +++ b/x11/xfce4-panel/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2008/12/17 12:50:03 hira Exp $ +$NetBSD: patch-ab,v 1.2 2009/09/16 01:15:32 reed Exp $ ---- config/Makefile.in.orig 2008-11-29 18:20:58.000000000 +0900 -+++ config/Makefile.in 2008-11-29 18:21:29.000000000 +0900 -@@ -254,7 +254,7 @@ - launcher-10.rc.in +--- config/Makefile.in.orig 2009-02-24 21:39:18.000000000 +0000 ++++ config/Makefile.in +@@ -263,7 +263,7 @@ target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + confdir = \ +- $(sysconfdir)/xdg/xfce4/panel ++ $(datadir)/examples/xfce4/panel - conf_files = $(conf_in_files:.rc.in=.rc) --confdir = $(sysconfdir)/xdg/xfce4/panel -+confdir = $(datadir)/examples/xfce4/panel - conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_files) - EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_in_files) - all: all-am + conf_in_files = \ + launcher-7.rc.in \ diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index b994d1786f9..cb3af8daa3a 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,32 +1,46 @@ -# $NetBSD: Makefile,v 1.25 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:35 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-session-${XFCE4_VERSION} -PKGREVISION= 3 CATEGORIES= x11 COMMENT= Xfce session manager -EGDIR= ${XFCE4_EGBASE}/session -CONF_FILES= ${EGDIR:Q}/xfce4-session.rc \ - ${PKG_SYSCONFDIR:Q}/xdg/xfce4-session/xfce4-session.rc -CONF_FILES+= ${PREFIX}/share/xdg/autostart/xfce4-tips-autostart.desktop \ - ${PKG_SYSCONFDIR:Q}/xdg/autostart/xfce4-tips-autostart.desktop +PKGCONFIG_OVERRIDE+= libxfsm/xfce4-session-2.0.pc.in -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= ICEAUTH=${TOOLS_PATH.iceauth:Q} - -REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} ${PREFIX}/share/xdg/autostart BUILD_DEFS+= PKG_SYSCONFBASE -OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg -OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/xfce4-session -OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= ICEAUTH=${TOOLS_PATH.iceauth} USE_TOOLS+= iceauth:run +EGDIR= ${XFCE4_EGBASE} +PKG_SYSCONFSUBDIR= xdg + +MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/autostart +MAKE_DIRS+= ${PREFIX}/include/xfce4 ${PREFIX}/lib/xfce4 +MAKE_DIRS+= ${EGDIR} ${EGDIR}/autostart ${EGDIR}/xfconf +MAKE_DIRS+= ${EGDIR}/xfconf/xfce-perchannel-xml +MAKE_DIRS+= ${EGDIR}/share/themes/Default +MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images + +CONF_FILES= ${EGDIR}/xfconf/xfce-perchannel-xml/xfce4-session.xml \ + ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +CONF_FILES+= ${EGDIR}/autostart/xfce4-tips-autostart.desktop \ + ${PKG_SYSCONFDIR}/autostart/xfce4-tips-autostart.desktop + +.include "../../devel/libglade/buildlink3.mk" +.include "../../devel/libwnck/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST index 3090da2ad99..4e087e769d8 100644 --- a/x11/xfce4-session/PLIST +++ b/x11/xfce4-session/PLIST @@ -1,14 +1,12 @@ -@comment $NetBSD: PLIST,v 1.14 2009/06/14 22:06:43 joerg Exp $ -bin/xfce4-autostart-editor +@comment $NetBSD: PLIST,v 1.15 2009/09/16 01:15:36 reed Exp $ bin/xfce4-session bin/xfce4-session-logout +bin/xfce4-session-settings bin/xfce4-tips -include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h -include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h -lib/libxfsm-4.2.la -lib/pkgconfig/xfce4-session-1.0.pc -lib/xfce4/mcs-plugins/session_settings.la -lib/xfce4/mcs-plugins/splash_settings.la +include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-engine.h +include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-rc.h +lib/libxfsm-4.6.la +lib/pkgconfig/xfce4-session-2.0.pc lib/xfce4/splash/engines/libbalou.la lib/xfce4/splash/engines/libmice.la lib/xfce4/splash/engines/libsimple.la @@ -18,16 +16,17 @@ libexec/xfsm-shutdown-helper man/man1/xfce4-session-logout.1 man/man1/xfce4-session.1 share/applications/xfce-session-settings.desktop -share/applications/xfce-splash-settings.desktop -share/applications/xfce4-autostart-editor.desktop -share/examples/xfce4/session/xfce4-session.rc +share/examples/xfce4/autostart/xfce4-tips-autostart.desktop +share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml share/icons/hicolor/128x128/apps/xfce4-session.png share/icons/hicolor/48x48/apps/xfce4-autostart-editor.png share/icons/hicolor/48x48/apps/xfce4-session.png share/icons/hicolor/48x48/apps/xfce4-splash.png +share/icons/hicolor/48x48/apps/xfsm-hibernate.png share/icons/hicolor/48x48/apps/xfsm-logout.png share/icons/hicolor/48x48/apps/xfsm-reboot.png share/icons/hicolor/48x48/apps/xfsm-shutdown.png +share/icons/hicolor/48x48/apps/xfsm-suspend.png share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png share/icons/hicolor/72x72/apps/xfsm-trash-normal.png @@ -63,22 +62,22 @@ share/locale/it/LC_MESSAGES/xfce4-session.mo share/locale/ja/LC_MESSAGES/xfce4-session.mo share/locale/ka/LC_MESSAGES/xfce4-session.mo share/locale/ko/LC_MESSAGES/xfce4-session.mo -share/locale/ku/LC_MESSAGES/xfce4-session.mo share/locale/lt/LC_MESSAGES/xfce4-session.mo share/locale/lv/LC_MESSAGES/xfce4-session.mo share/locale/mk/LC_MESSAGES/xfce4-session.mo share/locale/mr/LC_MESSAGES/xfce4-session.mo share/locale/ms/LC_MESSAGES/xfce4-session.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-session.mo +share/locale/nb/LC_MESSAGES/xfce4-session.mo share/locale/nl/LC_MESSAGES/xfce4-session.mo share/locale/pa/LC_MESSAGES/xfce4-session.mo share/locale/pl/LC_MESSAGES/xfce4-session.mo +share/locale/pt/LC_MESSAGES/xfce4-session.mo share/locale/pt_BR/LC_MESSAGES/xfce4-session.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-session.mo share/locale/ro/LC_MESSAGES/xfce4-session.mo share/locale/ru/LC_MESSAGES/xfce4-session.mo share/locale/si/LC_MESSAGES/xfce4-session.mo share/locale/sk/LC_MESSAGES/xfce4-session.mo +share/locale/sq/LC_MESSAGES/xfce4-session.mo share/locale/sv/LC_MESSAGES/xfce4-session.mo share/locale/ta/LC_MESSAGES/xfce4-session.mo share/locale/tr/LC_MESSAGES/xfce4-session.mo @@ -89,7 +88,6 @@ share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo share/themes/Default/balou/logo.png share/themes/Default/balou/themerc -share/xdg/autostart/xfce4-tips-autostart.desktop share/xfce4/doc/C/images/xfsm-advanced.png share/xfce4/doc/C/images/xfsm-general.png share/xfce4/doc/C/images/xfsm-splash.png diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk index 7e1cb8f8fe9..3ffbd0c7986 100644 --- a/x11/xfce4-session/buildlink3.mk +++ b/x11/xfce4-session/buildlink3.mk @@ -1,18 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.20 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/09/16 01:15:36 reed Exp $ BUILDLINK_TREE+= xfce4-session .if !defined(XFCE4_SESSION_BUILDLINK3_MK) XFCE4_SESSION_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.3nb2 -BUILDLINK_ABI_DEPENDS.xfce4-session?= xfce4-session>=4.4.3nb3 +BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" .endif # XFCE4_SESSION_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-session diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo index 2b50170454f..bf378ebe382 100644 --- a/x11/xfce4-session/distinfo +++ b/x11/xfce4-session/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.11 2008/12/19 23:58:18 hira Exp $ +$NetBSD: distinfo,v 1.12 2009/09/16 01:15:36 reed Exp $ -SHA1 (xfce4-session-4.4.3.tar.bz2) = 609cf888548e1dc7f2b2318698ab86ac73fb0f4d -RMD160 (xfce4-session-4.4.3.tar.bz2) = e0aa16b9089ae00a34f5e1df5b1b9af7a104f922 -Size (xfce4-session-4.4.3.tar.bz2) = 1276089 bytes -SHA1 (patch-aa) = 7fcb05e5884f979b015ac7e853df66ca79190195 -SHA1 (patch-ab) = d87076b003dd7e7ee74251199d4a1af0a5c5a355 +SHA1 (xfce4-session-4.6.1.tar.bz2) = 760e05bf73783521b3ce34e91aa187c74018ab8c +RMD160 (xfce4-session-4.6.1.tar.bz2) = 0cab4a0ca2b0d7718cde546d98bac1c87a7ba4f0 +Size (xfce4-session-4.6.1.tar.bz2) = 1365247 bytes +SHA1 (patch-ab) = f1c7a041a91f91a56ac7c8cf64e74a203be905f5 +SHA1 (patch-ac) = 549dccc70ae31f14291d3bf2c191ad8379139c63 diff --git a/x11/xfce4-session/patches/patch-aa b/x11/xfce4-session/patches/patch-aa deleted file mode 100644 index af69a182f1d..00000000000 --- a/x11/xfce4-session/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:24 martti Exp $ - ---- Makefile.in.orig 2006-07-10 12:12:02.000000000 +0000 -+++ Makefile.in 2006-07-14 09:28:20.000000000 +0000 -@@ -278,7 +278,7 @@ - xfce4-tips \ - xfsm-shutdown-helper - --configdir = $(sysconfdir)/xdg/xfce4-session -+configdir = $(datadir)/examples/xfce4/session - config_DATA = xfce4-session.rc - EXTRA_DIST = \ - BUGS \ diff --git a/x11/xfce4-session/patches/patch-ab b/x11/xfce4-session/patches/patch-ab index 0b11449f41d..59043a5e889 100644 --- a/x11/xfce4-session/patches/patch-ab +++ b/x11/xfce4-session/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2008/12/19 23:58:18 hira Exp $ +$NetBSD: patch-ab,v 1.2 2009/09/16 01:15:33 reed Exp $ ---- xfce4-tips/Makefile.in.orig 2008-12-20 08:38:59.000000000 +0900 -+++ xfce4-tips/Makefile.in 2008-12-20 08:39:31.000000000 +0900 -@@ -299,7 +299,7 @@ +--- xfce4-tips/Makefile.in.orig 2009-02-25 20:29:50.000000000 +0000 ++++ xfce4-tips/Makefile.in +@@ -309,7 +309,7 @@ xfce4_tips_CFLAGS = \ xfce4_tips_LDADD = \ @LIBXFCEGUI4_LIBS@ -desktopdir = $(sysconfdir)/xdg/autostart -+desktopdir = $(datadir)/xdg/autostart ++desktopdir = $(datadir)/examples/xfce4/autostart desktop_in_files = xfce4-tips-autostart.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ diff --git a/x11/xfce4-session/patches/patch-ac b/x11/xfce4-session/patches/patch-ac new file mode 100644 index 00000000000..019de5feb4d --- /dev/null +++ b/x11/xfce4-session/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2009/09/16 01:15:33 reed Exp $ + +--- settings/Makefile.in.orig 2009-02-25 20:29:49.000000000 +0000 ++++ settings/Makefile.in +@@ -334,7 +334,7 @@ xfce4_session_settings_LDADD = \ + xfce4_session_settings_DEPENDENCIES = \ + $(top_builddir)/libxfsm/libxfsm-4.6.la + +-settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml ++settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml + settings_DATA = xfce4-session.xml + desktopdir = $(datadir)/applications + desktop_in_files = xfce-session-settings.desktop.in diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile index 999a8c8c72f..986f76370df 100644 --- a/x11/xfce4-terminal/Makefile +++ b/x11/xfce4-terminal/Makefile @@ -1,19 +1,22 @@ -# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: Makefile,v 1.11 2009/09/16 01:15:36 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.2.8.3 +XFCE4_VERSION= 0.2.12 DISTNAME= Terminal-${XFCE4_VERSION} PKGNAME= xfce4-terminal-${XFCE4_VERSION} -PKGREVISION= 4 CATEGORIES= x11 COMMENT= Xfce terminal emulator .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-exo/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../x11/vte/buildlink3.mk" +.include "../../x11/xfce4-exo/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-terminal/PLIST b/x11/xfce4-terminal/PLIST index b4f9f4e7698..01ab162a34c 100644 --- a/x11/xfce4-terminal/PLIST +++ b/x11/xfce4-terminal/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:25:16 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/09/16 01:15:36 reed Exp $ bin/Terminal bin/terminal libexec/TerminalHelp @@ -121,12 +121,12 @@ share/locale/ko/LC_MESSAGES/Terminal.mo share/locale/ku/LC_MESSAGES/Terminal.mo share/locale/lt/LC_MESSAGES/Terminal.mo share/locale/lv/LC_MESSAGES/Terminal.mo -share/locale/nb_NO/LC_MESSAGES/Terminal.mo +share/locale/nb/LC_MESSAGES/Terminal.mo share/locale/nl/LC_MESSAGES/Terminal.mo share/locale/pa/LC_MESSAGES/Terminal.mo share/locale/pl/LC_MESSAGES/Terminal.mo +share/locale/pt/LC_MESSAGES/Terminal.mo share/locale/pt_BR/LC_MESSAGES/Terminal.mo -share/locale/pt_PT/LC_MESSAGES/Terminal.mo share/locale/ro/LC_MESSAGES/Terminal.mo share/locale/ru/LC_MESSAGES/Terminal.mo share/locale/sk/LC_MESSAGES/Terminal.mo diff --git a/x11/xfce4-terminal/buildlink3.mk b/x11/xfce4-terminal/buildlink3.mk index a68c915fc1c..6af90d16431 100644 --- a/x11/xfce4-terminal/buildlink3.mk +++ b/x11/xfce4-terminal/buildlink3.mk @@ -1,19 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/09/16 01:15:36 reed Exp $ BUILDLINK_TREE+= xfce4-terminal .if !defined(XFCE4_TERMINAL_BUILDLINK3_MK) XFCE4_TERMINAL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-terminal+= xfce4-terminal>=0.2.8.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-terminal?= xfce4-terminal>=0.2.8.3nb4 +BUILDLINK_API_DEPENDS.xfce4-terminal+= xfce4-terminal>=0.2.10 BUILDLINK_PKGSRCDIR.xfce4-terminal?= ../../x11/xfce4-terminal -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-exo/buildlink3.mk" -.include "../../x11/vte/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_TERMINAL_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-terminal diff --git a/x11/xfce4-terminal/distinfo b/x11/xfce4-terminal/distinfo index be776013f34..f76b2bfe59d 100644 --- a/x11/xfce4-terminal/distinfo +++ b/x11/xfce4-terminal/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2008/12/17 12:50:04 hira Exp $ +$NetBSD: distinfo,v 1.5 2009/09/16 01:15:36 reed Exp $ -SHA1 (Terminal-0.2.8.3.tar.bz2) = 69add6a7435855ab8bccb82774cacb6a148e7693 -RMD160 (Terminal-0.2.8.3.tar.bz2) = ccb5d5484b2164cac673cd5029d8bbc8793d19d4 -Size (Terminal-0.2.8.3.tar.bz2) = 1860706 bytes +SHA1 (Terminal-0.2.12.tar.bz2) = f6d0fc380fff6ac6fba7842fd4cfc46e2e5c6e40 +RMD160 (Terminal-0.2.12.tar.bz2) = 0879cfbb69d33d63a1a816cf5a67b1c836a5bb65 +Size (Terminal-0.2.12.tar.bz2) = 2005311 bytes diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile index 4da26520472..6aef2a64997 100644 --- a/x11/xfce4-utils/Makefile +++ b/x11/xfce4-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: Makefile,v 1.34 2009/09/16 01:15:36 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,23 +6,34 @@ PKG_DESTDIR_SUPPORT= user-destdir DISTNAME= xfce-utils-${XFCE4_VERSION} PKGNAME= xfce4-utils-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= x11 COMMENT= Xfce utilities -PKG_SYSCONFSUBDIR= xdg/xfce4 -EGDIR= ${XFCE4_EGBASE} -CONF_FILES= ${EGDIR:Q}/xinitrc ${PKG_SYSCONFDIR:Q}/xinitrc -USE_TOOLS+= xinit:run +DEPENDS+= p5-XML-Parser>=2.36:../../textproc/p5-XML-Parser -REQD_DIRS+= ${EGDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --with-xsession-prefix=${PREFIX} BUILD_DEFS+= PKG_SYSCONFBASE +USE_TOOLS+= xinit:run + +PKG_SYSCONFSUBDIR= xdg +EGDIR= ${XFCE4_EGBASE} + +MAKE_DIRS+= ${PREFIX}/libexec/xfce4 ${EGDIR} ${EGDIR}/autostart +MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images +MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/it +MAKE_DIRS+= ${PREFIX}/share/xsessions -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} +CONF_FILES= ${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xfce4/xinitrc +CONF_FILES+= ${EGDIR}/autostart/xfconf-migration-4.6.desktop \ + ${PKG_SYSCONFDIR}/autostart/xfconf-migration-4.6.desktop .include "options.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST index ddad204f40a..2563d39250a 100644 --- a/x11/xfce4-utils/PLIST +++ b/x11/xfce4-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2008/12/18 14:09:26 hira Exp $ +@comment $NetBSD: PLIST,v 1.19 2009/09/16 01:15:36 reed Exp $ bin/startxfce4 bin/xfbrowser4 bin/xfce4-about @@ -7,7 +7,10 @@ bin/xflock4 bin/xfmountdev4 bin/xfrun4 bin/xfterm4 +libexec/xfce4/xfconf-migration/xfconf-migration-4.6.pl +share/dbus-1/services/org.xfce.RunDialog.service share/examples/xfce4/Xft.xrdb +share/examples/xfce4/autostart/xfconf-migration-4.6.desktop share/examples/xfce4/xinitrc share/icons/hicolor/48x48/apps/xfce4-logo.png share/locale/af/LC_MESSAGES/xfce-utils.mo @@ -49,16 +52,17 @@ share/locale/lv/LC_MESSAGES/xfce-utils.mo share/locale/mk/LC_MESSAGES/xfce-utils.mo share/locale/mr/LC_MESSAGES/xfce-utils.mo share/locale/ms/LC_MESSAGES/xfce-utils.mo -share/locale/nb_NO/LC_MESSAGES/xfce-utils.mo +share/locale/nb/LC_MESSAGES/xfce-utils.mo share/locale/nl/LC_MESSAGES/xfce-utils.mo share/locale/pa/LC_MESSAGES/xfce-utils.mo share/locale/pl/LC_MESSAGES/xfce-utils.mo +share/locale/pt/LC_MESSAGES/xfce-utils.mo share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo -share/locale/pt_PT/LC_MESSAGES/xfce-utils.mo share/locale/ro/LC_MESSAGES/xfce-utils.mo share/locale/ru/LC_MESSAGES/xfce-utils.mo share/locale/si/LC_MESSAGES/xfce-utils.mo share/locale/sk/LC_MESSAGES/xfce-utils.mo +share/locale/sq/LC_MESSAGES/xfce-utils.mo share/locale/sv/LC_MESSAGES/xfce-utils.mo share/locale/ta/LC_MESSAGES/xfce-utils.mo share/locale/tr/LC_MESSAGES/xfce-utils.mo @@ -73,6 +77,7 @@ share/xfce4/COPYING share/xfce4/GPL share/xfce4/INFO share/xfce4/INFO.ca +share/xfce4/INFO.de share/xfce4/INFO.es share/xfce4/INFO.fi share/xfce4/INFO.fr @@ -103,3 +108,4 @@ share/xfce4/doc/it/index.html share/xfce4/doc/xfce-chunk.css share/xfce4/doc/xfce-mouse.png share/xfce4/doc/xfce.css +share/xsessions/xfce.desktop diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk index 4fe7ef7940e..52a0601f0c1 100644 --- a/x11/xfce4-utils/buildlink3.mk +++ b/x11/xfce4-utils/buildlink3.mk @@ -1,18 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.27 2009/08/26 19:57:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2009/09/16 01:15:36 reed Exp $ BUILDLINK_TREE+= xfce4-utils .if !defined(XFCE4_UTILS_BUILDLINK3_MK) XFCE4_UTILS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.xfce4-utils?= xfce4-utils>=4.4.3nb2 +BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.6.0 BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # XFCE4_UTILS_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-utils diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo index c977d2cce4c..dc319a11a57 100644 --- a/x11/xfce4-utils/distinfo +++ b/x11/xfce4-utils/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.19 2008/12/17 12:50:04 hira Exp $ +$NetBSD: distinfo,v 1.20 2009/09/16 01:15:36 reed Exp $ -SHA1 (xfce-utils-4.4.3.tar.bz2) = 71290af79f63bb2511d27b0313ec4cd7bc4a81b4 -RMD160 (xfce-utils-4.4.3.tar.bz2) = 62c337cdd40aebe58abca4689a444ab3b5b3e1e6 -Size (xfce-utils-4.4.3.tar.bz2) = 644408 bytes -SHA1 (patch-aa) = aff3c61c25944ae7e106cecc9e22a4f2f230741f +SHA1 (xfce-utils-4.6.1.tar.bz2) = 0bdb5b6e494f15372d8c0826ac93baca476c9f16 +RMD160 (xfce-utils-4.6.1.tar.bz2) = 4446c3882716e841c00e398df62b9d54046b9d26 +Size (xfce-utils-4.6.1.tar.bz2) = 614143 bytes +SHA1 (patch-aa) = 0bcfc2173ddb61d8ee04260fb99d57cd7f0704ba diff --git a/x11/xfce4-utils/patches/patch-aa b/x11/xfce4-utils/patches/patch-aa index a9a1a87e175..221c9fa330d 100644 --- a/x11/xfce4-utils/patches/patch-aa +++ b/x11/xfce4-utils/patches/patch-aa @@ -1,13 +1,22 @@ -$NetBSD: patch-aa,v 1.3 2007/12/07 19:43:32 martti Exp $ +$NetBSD: patch-aa,v 1.4 2009/09/16 01:15:36 reed Exp $ ---- scripts/Makefile.in.orig 2007-12-04 10:55:10.000000000 +0000 -+++ scripts/Makefile.in 2007-12-04 10:55:21.000000000 +0000 -@@ -240,7 +240,7 @@ - -e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g' \ - -e 's,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g' +--- scripts/Makefile.in.orig 2009-02-25 22:27:44.000000000 +0000 ++++ scripts/Makefile.in +@@ -268,7 +268,7 @@ edit = sed \ + -e "s,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g" \ + -e "s,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g" -conffilesdir = @sysconfdir@/xdg/xfce4 +conffilesdir = @datadir@/examples/xfce4 conffiles_DATA = \ xinitrc \ Xft.xrdb +@@ -276,7 +276,7 @@ conffiles_DATA = \ + @XFCONF_MIGRATION_TRUE@migrationscriptdir = $(libexecdir)/xfce4/xfconf-migration + @XFCONF_MIGRATION_TRUE@migrationscript_in_files = xfconf-migration-4.6.pl.in + @XFCONF_MIGRATION_TRUE@migrationscript_SCRIPTS = $(migrationscript_in_files:.pl.in=.pl) +-@XFCONF_MIGRATION_TRUE@autostartdir = $(sysconfdir)/xdg/autostart ++@XFCONF_MIGRATION_TRUE@autostartdir = $(datadir)/examples/xfce4/autostart + @XFCONF_MIGRATION_TRUE@autostart_in_files = xfconf-migration-4.6.desktop.in + @XFCONF_MIGRATION_TRUE@autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ |