diff options
author | martti <martti@pkgsrc.org> | 2007-04-12 09:55:08 +0000 |
---|---|---|
committer | martti <martti@pkgsrc.org> | 2007-04-12 09:55:08 +0000 |
commit | cc3a1b98dbb5f28f9899b166be27a16e4831791a (patch) | |
tree | df1647c213d3eed2c06db3ecc7e1e4a7031720db /x11/xfce4-desktop | |
parent | aaa04d9ac82bfe4f1c8570d3badea5fbf3fac8fb (diff) | |
download | pkgsrc-cc3a1b98dbb5f28f9899b166be27a16e4831791a.tar.gz |
Updated to Xfce 4.4.1
See http://www.xfce.org/documentation/changelogs/4.4.1 for details.
Diffstat (limited to 'x11/xfce4-desktop')
-rw-r--r-- | x11/xfce4-desktop/Makefile | 16 | ||||
-rw-r--r-- | x11/xfce4-desktop/PLIST | 49 | ||||
-rw-r--r-- | x11/xfce4-desktop/buildlink3.mk | 7 | ||||
-rw-r--r-- | x11/xfce4-desktop/distinfo | 12 | ||||
-rw-r--r-- | x11/xfce4-desktop/patches/patch-aa | 16 | ||||
-rw-r--r-- | x11/xfce4-desktop/patches/patch-ab | 14 |
6 files changed, 62 insertions, 52 deletions
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index a0b04587938..f54bfb3a324 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,25 +1,23 @@ -# $NetBSD: Makefile,v 1.25 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: Makefile,v 1.26 2007/04/12 09:55:21 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfdesktop-${XFCE4_VERSION} PKGNAME= xfce4-desktop-${XFCE4_VERSION} -#PKGREVISION= 1 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 fi fr he hu ja ko nl pl pt_BR ro ru sk sv \ +.for l in ca cs da de el es et eu fi fr he hu ja ko nl pl pt_BR 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 cs eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW +.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 @@ -27,13 +25,11 @@ CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml.${l:Q} \ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} REQD_DIRS+= ${XFCE4_EGBASE:Q} ${EGDIR:Q} - -BUILDLINK_DEPMETHOD.libXt?= build +BUILD_DEFS+= PKG_SYSCONFBASE .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/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/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 4bf5d4a99cc..99e3a83fa96 100644 --- a/x11/xfce4-desktop/PLIST +++ b/x11/xfce4-desktop/PLIST @@ -1,13 +1,15 @@ -@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:22 martti Exp $ bin/xfce4-menueditor +bin/xfce4-popup-menu bin/xfdesktop lib/xfce4/mcs-plugins/backdrop_settings.la lib/xfce4/modules/xfce4_desktop_menu.la -lib/xfce4/panel-plugins/libdesktopmenu.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 @@ -20,26 +22,33 @@ 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.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.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.nl share/examples/xfce4/desktop/xfce-registered-categories.xml.pl @@ -48,6 +57,7 @@ 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/icons/hicolor/32x32/apps/xfce4-backdrop.png @@ -56,7 +66,6 @@ share/icons/hicolor/48x48/apps/xfce4-backdrop.png share/icons/hicolor/48x48/apps/xfce4-menueditor.png share/icons/hicolor/scalable/apps/xfce4-backdrop.svg share/icons/hicolor/scalable/apps/xfce4-menueditor.svg -share/locale/af/LC_MESSAGES/xfdesktop.mo share/locale/ar/LC_MESSAGES/xfdesktop.mo share/locale/az/LC_MESSAGES/xfdesktop.mo share/locale/be/LC_MESSAGES/xfdesktop.mo @@ -64,8 +73,8 @@ share/locale/bg/LC_MESSAGES/xfdesktop.mo share/locale/bn_IN/LC_MESSAGES/xfdesktop.mo share/locale/ca/LC_MESSAGES/xfdesktop.mo share/locale/cs/LC_MESSAGES/xfdesktop.mo -share/locale/da/LC_MESSAGES/xfdesktop.mo share/locale/de/LC_MESSAGES/xfdesktop.mo +share/locale/dz/LC_MESSAGES/xfdesktop.mo share/locale/el/LC_MESSAGES/xfdesktop.mo share/locale/en_GB/LC_MESSAGES/xfdesktop.mo share/locale/eo/LC_MESSAGES/xfdesktop.mo @@ -76,6 +85,7 @@ share/locale/eu/LC_MESSAGES/xfdesktop.mo share/locale/fa/LC_MESSAGES/xfdesktop.mo share/locale/fi/LC_MESSAGES/xfdesktop.mo share/locale/fr/LC_MESSAGES/xfdesktop.mo +share/locale/gl/LC_MESSAGES/xfdesktop.mo share/locale/gu/LC_MESSAGES/xfdesktop.mo share/locale/he/LC_MESSAGES/xfdesktop.mo share/locale/hi/LC_MESSAGES/xfdesktop.mo @@ -83,9 +93,10 @@ share/locale/hu/LC_MESSAGES/xfdesktop.mo share/locale/hy/LC_MESSAGES/xfdesktop.mo share/locale/it/LC_MESSAGES/xfdesktop.mo share/locale/ja/LC_MESSAGES/xfdesktop.mo +share/locale/ka/LC_MESSAGES/xfdesktop.mo share/locale/ko/LC_MESSAGES/xfdesktop.mo -share/locale/ku/LC_MESSAGES/xfdesktop.mo share/locale/lt/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 @@ -97,8 +108,6 @@ 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/sl/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 @@ -106,11 +115,14 @@ share/locale/uk/LC_MESSAGES/xfdesktop.mo share/locale/vi/LC_MESSAGES/xfdesktop.mo share/locale/zh_CN/LC_MESSAGES/xfdesktop.mo share/locale/zh_TW/LC_MESSAGES/xfdesktop.mo +share/pixmaps/xfce4/xfdesktop/text-selection-frame.png share/pixmaps/xfce4_xicon.png share/pixmaps/xfce4_xicon1.png 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 @@ -123,26 +135,25 @@ share/xfce4/backdrops/xfce4logo.png share/xfce4/doc/C/images/root_menu.png share/xfce4/doc/C/images/root_menu2.png share/xfce4/doc/C/images/select_bg_color.png -share/xfce4/doc/C/images/xfdesktop-background.png +share/xfce4/doc/C/images/xfdesktop-appearance-tab.png +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/images/xfdesktop-menu-tab.png share/xfce4/doc/C/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 -share/xfce4/doc/fr/images/xfdesktop-background.png +share/xfce4/doc/fr/images/xfdesktop-appearance-tab.png +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/images/xfdesktop-menu-tab.png share/xfce4/doc/fr/xfdesktop.html -share/xfce4/doc/he/images/root_menu.png -share/xfce4/doc/he/images/root_menu2.png -share/xfce4/doc/he/images/select_bg_color.png -share/xfce4/doc/he/images/xfdesktop-background.png -share/xfce4/doc/he/images/xfdesktop-editor.png -share/xfce4/doc/he/images/xfdesktop-list.png -share/xfce4/doc/he/images/xfdesktop-menu-tab.png -share/xfce4/doc/he/xfdesktop.html +share/xfce4/panel-plugins/xfce4-menu.desktop +@dirrm share/xfce4-menueditor +@dirrm share/pixmaps/xfdesktop +@dirrm share/pixmaps/xfce4/xfdesktop @dirrm share/examples/xfce4/desktop @unexec ${RMDIR} %D/share/xfce4/backdrops 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/pixmaps/xfce4 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/lib/xfce4/modules 2>/dev/null || ${TRUE} diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk index 52299f31700..c8cbabd9d48 100644 --- a/x11/xfce4-desktop/buildlink3.mk +++ b/x11/xfce4-desktop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:22 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_DESKTOP_BUILDLINK3_MK:= ${XFCE4_DESKTOP_BUILDLINK3_MK}+ @@ -12,13 +12,16 @@ BUILDLINK_PACKAGES+= xfce4-desktop BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-desktop .if ${XFCE4_DESKTOP_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.2.4 +BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.4.1 BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop .endif # XFCE4_DESKTOP_BUILDLINK3_MK .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" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo index 27fa670cdcc..b9e7b462317 100644 --- a/x11/xfce4-desktop/distinfo +++ b/x11/xfce4-desktop/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.14 2007/01/23 11:53:47 martti Exp $ +$NetBSD: distinfo,v 1.15 2007/04/12 09:55:22 martti Exp $ -SHA1 (xfdesktop-4.2.4.tar.gz) = 9b19d900d325c5f2911de7e93f14b6be4ad07b59 -RMD160 (xfdesktop-4.2.4.tar.gz) = 99f98d9a5550ebee35bac5e3eb73d9817ae868d9 -Size (xfdesktop-4.2.4.tar.gz) = 3119654 bytes -SHA1 (patch-aa) = 074834de74292b1542f57a3b0b94ed9ff88f8bf8 -SHA1 (patch-ab) = 133532279efddccb723e735ccc630903fbace107 +SHA1 (xfdesktop-4.4.1.tar.bz2) = 46324ad37bb782ec7a5da11c619d9e76a0f54133 +RMD160 (xfdesktop-4.4.1.tar.bz2) = 10e182f2cebd309ed7e2b18d00331861e21f4528 +Size (xfdesktop-4.4.1.tar.bz2) = 3067577 bytes +SHA1 (patch-aa) = 22de9a53d0d87cfddecaf2374b0fce2beb50108c +SHA1 (patch-ab) = bc96e67a327eb9e2a3dfde21ee59ac4895a67531 diff --git a/x11/xfce4-desktop/patches/patch-aa b/x11/xfce4-desktop/patches/patch-aa index 1c06a4204df..22e1023ffe5 100644 --- a/x11/xfce4-desktop/patches/patch-aa +++ b/x11/xfce4-desktop/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.3 2007/01/23 11:53:47 martti Exp $ +$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:22 martti Exp $ ---- Makefile.in.orig 2007-01-14 21:07:41.000000000 +0000 -+++ Makefile.in 2007-01-23 12:59:39.000000000 +0000 -@@ -271,7 +271,7 @@ +--- Makefile.in.orig 2007-04-09 18:56:45.000000000 +0300 ++++ Makefile.in 2007-04-11 16:04:43.000000000 +0300 +@@ -327,7 +327,7 @@ + modules \ + pixmaps - SUBDIRS = backdrops common doc po settings src modules pixmaps \ - $(am__append_1) $(am__append_2) -confdir = $(sysconfdir)/xdg/xfce4/desktop +confdir = $(datadir)/examples/xfce4/desktop conf_DATA = \ - menu.xml \ - menu.xml.ca \ + menu.xml \ + menu.xml.be \ diff --git a/x11/xfce4-desktop/patches/patch-ab b/x11/xfce4-desktop/patches/patch-ab index e6ebefea58c..4947d60e128 100644 --- a/x11/xfce4-desktop/patches/patch-ab +++ b/x11/xfce4-desktop/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.3 2007/01/23 11:53:47 martti Exp $ +$NetBSD: patch-ab,v 1.4 2007/04/12 09:55:22 martti Exp $ ---- modules/menu/Makefile.in.orig 2007-01-14 21:07:40.000000000 +0000 -+++ modules/menu/Makefile.in 2007-01-23 13:00:00.000000000 +0000 -@@ -288,7 +288,7 @@ - @GMODULE_LIBS@ \ - @LIBXFCEGUI4_LIBS@ +--- modules/menu/Makefile.in.orig 2007-04-09 18:56:43.000000000 +0300 ++++ modules/menu/Makefile.in 2007-04-11 16:05:14.000000000 +0300 +@@ -348,7 +348,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.cs \ + xfce-registered-categories.xml.ca \ |