diff --git a/x11/xfce4/xfdesktop/Makefile b/x11/xfce4/xfdesktop/Makefile index 34ad8a5909d..c4269ecc260 100644 --- a/x11/xfce4/xfdesktop/Makefile +++ b/x11/xfce4/xfdesktop/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.11 2006/12/16 12:22:37 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2007/05/08 16:10:48 steven Exp $ -COMMENT= "xfce4 desktop background manager" -V= 4.2.3 +COMMENT= "xfce4 desktop manager" + +V= 4.4.1 DISTNAME= xfdesktop-${V} -PKGNAME= ${DISTNAME}p4 -MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/ -HOMEPAGE= http://www.xfce.org/ +HOMEPAGE= http://www.xfce.org/projects/xfdesktop/ +MAINTAINER= Landry Breuil # GPL PERMIT_DISTFILES_CDROM= Yes @@ -14,18 +14,29 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes +MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/ +EXTRACT_SUFX= .tar.bz2 + +USE_GMAKE= Yes + MODULES= devel/gettext -BUILD_DEPENDS= :xfce-mcs-manager-*:x11/xfce4/xfce-mcs-manager \ - :xfce4-panel-*:x11/xfce4/xfce4-panel -LIB_DEPENDS= xfcegui4.>=3.3::x11/xfce4/libxfcegui4 \ - xfce4mcs-client.>=2.3::x11/xfce4/libxfce4mcs \ - xml2.>=9.0::textproc/libxml -RUN_DEPENDS= :xfce-mcs-manager-*:x11/xfce4/xfce-mcs-manager \ - :xfce4-panel-*:x11/xfce4/xfce4-panel -WANTLIB= ICE SM X11 Xext Xrender c fontconfig freetype m z \ + +CONFIGURE_ARGS= --enable-thunarx \ + --enable-exo + +LIB_DEPENDS= xfcegui4.>=4.0::x11/xfce4/libxfcegui4 \ + xfce4mcs-client.>=3.5::x11/xfce4/libxfce4mcs \ + thunar-vfs-1.>=4.2,thunarx-1.>=4.2::x11/xfce4/thunar \ + +RUN_DEPENDS= :xfce-mcs-manager->=4.4.1:x11/xfce4/xfce-mcs-manager + +WANTLIB= ICE SM X11 Xau Xdmcp Xrender c fontconfig \ + Xcursor Xext Xfixes Xi Xinerama Xrandr \ + gthread-2.0 freetype m z pthread jpeg expat \ atk-1.0 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \ gmodule-2.0 gobject-2.0 gtk-x11-2.0 pango-1.0 \ pangoft2-1.0 pangocairo-1.0 cairo glitz png \ - startup-notification-1 xfce4util.>=1 + startup-notification-1 xfce4util.>=1 \ + exo-0.3 xfce4panel dbus-1 dbus-glib-1 .include diff --git a/x11/xfce4/xfdesktop/distinfo b/x11/xfce4/xfdesktop/distinfo index 6a75fee263d..2bad35dabb7 100644 --- a/x11/xfce4/xfdesktop/distinfo +++ b/x11/xfce4/xfdesktop/distinfo @@ -1,5 +1,5 @@ -MD5 (xfce4/xfdesktop-4.2.3.tar.gz) = C+V6V0plRiXWEoFBH7a+VQ== -RMD160 (xfce4/xfdesktop-4.2.3.tar.gz) = 2grbY3UD+F04ZRlTVgkW68FBs+w= -SHA1 (xfce4/xfdesktop-4.2.3.tar.gz) = 1LEoWUfm9C5qoblannvtZFofWW0= -SHA256 (xfce4/xfdesktop-4.2.3.tar.gz) = Xg7eIubJRBujZCWAwXaJlQaejeFTYBO2X5OUsyFS0eY= -SIZE (xfce4/xfdesktop-4.2.3.tar.gz) = 3169283 +MD5 (xfce4/xfdesktop-4.4.1.tar.bz2) = fL68jolesZ7nNeUg6kjQOw== +RMD160 (xfce4/xfdesktop-4.4.1.tar.bz2) = EOGC8s69MJ7X4rGNADMYYeIfRSg= +SHA1 (xfce4/xfdesktop-4.4.1.tar.bz2) = RjJK03u3gux6XaEcYZ2edqD1QTM= +SHA256 (xfce4/xfdesktop-4.4.1.tar.bz2) = q/jJOvDfnW7HMJF+AsV3g1RsQLi+CRp0pRYLv1nuSoA= +SIZE (xfce4/xfdesktop-4.4.1.tar.bz2) = 3067577 diff --git a/x11/xfce4/xfdesktop/patches/patch-Makefile_in b/x11/xfce4/xfdesktop/patches/patch-Makefile_in index 6734a50c29d..89b8120ebdb 100644 --- a/x11/xfce4/xfdesktop/patches/patch-Makefile_in +++ b/x11/xfce4/xfdesktop/patches/patch-Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2005/11/10 22:57:41 jolan Exp $ ---- Makefile.in.orig Sun Nov 6 04:38:13 2005 -+++ Makefile.in Thu Nov 10 06:00:01 2005 -@@ -275,7 +275,7 @@ DIST_SUBDIRS = \ +$OpenBSD: patch-Makefile_in,v 1.3 2007/05/08 16:10:48 steven Exp $ +--- Makefile.in.orig Mon Apr 9 17:56:45 2007 ++++ Makefile.in Tue May 8 20:03:20 2007 +@@ -327,7 +327,7 @@ SUBDIRS = \ + modules \ + pixmaps - SUBDIRS = backdrops common doc po settings src modules pixmaps \ - $(am__append_1) $(am__append_2) -confdir = $(sysconfdir)/xdg/xfce4/desktop +confdir = $(prefix)/share/examples/xfdesktop conf_DATA = \ - menu.xml \ - menu.xml.ca \ + menu.xml \ + menu.xml.be \ diff --git a/x11/xfce4/xfdesktop/patches/patch-modules_menu_Makefile_in b/x11/xfce4/xfdesktop/patches/patch-modules_menu_Makefile_in index 3f39d664be3..c780f82a376 100644 --- a/x11/xfce4/xfdesktop/patches/patch-modules_menu_Makefile_in +++ b/x11/xfce4/xfdesktop/patches/patch-modules_menu_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-modules_menu_Makefile_in,v 1.1 2006/08/08 12:19:20 jasper Exp $ ---- modules/menu/Makefile.in.orig Sun Nov 6 11:38:12 2005 -+++ modules/menu/Makefile.in Mon Aug 7 21:18:07 2006 -@@ -290,7 +290,7 @@ xfce4_desktop_menu_la_LIBADD = \ - @GMODULE_LIBS@ \ - @LIBXFCEGUI4_LIBS@ +$OpenBSD: patch-modules_menu_Makefile_in,v 1.2 2007/05/08 16:10:48 steven Exp $ +--- modules/menu/Makefile.in.orig Mon Apr 9 17:56:43 2007 ++++ modules/menu/Makefile.in Tue May 8 20:03:20 2007 +@@ -348,7 +348,7 @@ xfce4_desktop_menu_la_LIBADD = \ + $(LIBX11_LIBS) \ + $(LIBXFCEGUI4_LIBS) -xfceconfdir = $(sysconfdir)/xdg/xfce4/desktop +xfceconfdir = $(prefix)/share/examples/xfdesktop xfceconf_DATA = \ xfce-registered-categories.xml \ - xfce-registered-categories.xml.cs \ + xfce-registered-categories.xml.ca \ diff --git a/x11/xfce4/xfdesktop/pkg/PFRAG.shared b/x11/xfce4/xfdesktop/pkg/PFRAG.shared index 3d48ab616ca..4566e742253 100644 --- a/x11/xfce4/xfdesktop/pkg/PFRAG.shared +++ b/x11/xfce4/xfdesktop/pkg/PFRAG.shared @@ -1,4 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2005/11/10 22:57:41 jolan Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.3 2007/05/08 16:10:48 steven Exp $ lib/xfce4/mcs-plugins/backdrop_settings.so lib/xfce4/modules/xfce4_desktop_menu.so -lib/xfce4/panel-plugins/libdesktopmenu.so diff --git a/x11/xfce4/xfdesktop/pkg/PLIST b/x11/xfce4/xfdesktop/pkg/PLIST index 3a992046750..267eca847d4 100644 --- a/x11/xfce4/xfdesktop/pkg/PLIST +++ b/x11/xfce4/xfdesktop/pkg/PLIST @@ -1,15 +1,16 @@ -@comment $OpenBSD: PLIST,v 1.5 2006/08/08 12:19:20 jasper Exp $ -@conflict xfce4-menueditor-* +@comment $OpenBSD: PLIST,v 1.6 2007/05/08 16:10:48 steven Exp $ %%SHARED%% bin/xfce4-menueditor +bin/xfce4-popup-menu bin/xfdesktop lib/xfce4/mcs-plugins/backdrop_settings.a lib/xfce4/mcs-plugins/backdrop_settings.la lib/xfce4/modules/ lib/xfce4/modules/xfce4_desktop_menu.a lib/xfce4/modules/xfce4_desktop_menu.la -lib/xfce4/panel-plugins/libdesktopmenu.a -lib/xfce4/panel-plugins/libdesktopmenu.la +libexec/xfce4/ +libexec/xfce4/panel-plugins/ +libexec/xfce4/panel-plugins/xfce4-menu-plugin @man man/man1/xfdesktop.1 share/applications/xfce-backdrop-settings.desktop share/applications/xfce-menueditor.desktop @@ -17,6 +18,7 @@ share/examples/xfdesktop/ @sample ${SYSCONFDIR}/xdg/xfce4/desktop/ share/examples/xfdesktop/menu.xml @sample ${SYSCONFDIR}/xdg/xfce4/desktop/menu.xml +share/examples/xfdesktop/menu.xml.be share/examples/xfdesktop/menu.xml.ca share/examples/xfdesktop/menu.xml.cs share/examples/xfdesktop/menu.xml.da @@ -24,29 +26,39 @@ share/examples/xfdesktop/menu.xml.de share/examples/xfdesktop/menu.xml.el share/examples/xfdesktop/menu.xml.es share/examples/xfdesktop/menu.xml.et +share/examples/xfdesktop/menu.xml.eu share/examples/xfdesktop/menu.xml.fi share/examples/xfdesktop/menu.xml.fr share/examples/xfdesktop/menu.xml.he share/examples/xfdesktop/menu.xml.hu +share/examples/xfdesktop/menu.xml.it share/examples/xfdesktop/menu.xml.ja share/examples/xfdesktop/menu.xml.ko share/examples/xfdesktop/menu.xml.nl +share/examples/xfdesktop/menu.xml.pa share/examples/xfdesktop/menu.xml.pl share/examples/xfdesktop/menu.xml.pt_BR share/examples/xfdesktop/menu.xml.ro share/examples/xfdesktop/menu.xml.ru share/examples/xfdesktop/menu.xml.sk share/examples/xfdesktop/menu.xml.sv +share/examples/xfdesktop/menu.xml.tr share/examples/xfdesktop/menu.xml.uk share/examples/xfdesktop/menu.xml.vi share/examples/xfdesktop/menu.xml.zh_TW share/examples/xfdesktop/xfce-registered-categories.xml @sample ${SYSCONFDIR}/xdg/xfce4/desktop/xfce-registered-categories.xml +share/examples/xfdesktop/xfce-registered-categories.xml.ca share/examples/xfdesktop/xfce-registered-categories.xml.cs +share/examples/xfdesktop/xfce-registered-categories.xml.de +share/examples/xfdesktop/xfce-registered-categories.xml.el +share/examples/xfdesktop/xfce-registered-categories.xml.es share/examples/xfdesktop/xfce-registered-categories.xml.eu share/examples/xfdesktop/xfce-registered-categories.xml.fi +share/examples/xfdesktop/xfce-registered-categories.xml.fr share/examples/xfdesktop/xfce-registered-categories.xml.he share/examples/xfdesktop/xfce-registered-categories.xml.hu +share/examples/xfdesktop/xfce-registered-categories.xml.it share/examples/xfdesktop/xfce-registered-categories.xml.ja share/examples/xfdesktop/xfce-registered-categories.xml.nl share/examples/xfdesktop/xfce-registered-categories.xml.pl @@ -55,6 +67,7 @@ share/examples/xfdesktop/xfce-registered-categories.xml.ro share/examples/xfdesktop/xfce-registered-categories.xml.ru share/examples/xfdesktop/xfce-registered-categories.xml.sk share/examples/xfdesktop/xfce-registered-categories.xml.sv +share/examples/xfdesktop/xfce-registered-categories.xml.tr share/examples/xfdesktop/xfce-registered-categories.xml.zh_CN share/examples/xfdesktop/xfce-registered-categories.xml.zh_TW share/icons/hicolor/32x32/ @@ -67,7 +80,6 @@ share/icons/hicolor/scalable/ share/icons/hicolor/scalable/apps/ 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 @@ -75,8 +87,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 @@ -87,6 +99,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 @@ -94,9 +107,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 @@ -108,7 +122,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/sv/LC_MESSAGES/xfdesktop.mo share/locale/ta/LC_MESSAGES/xfdesktop.mo share/locale/tr/LC_MESSAGES/xfdesktop.mo @@ -117,11 +130,18 @@ 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/ +share/pixmaps/xfce4/ +share/pixmaps/xfce4/xfdesktop/ +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/ +share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png +share/xfce4-menueditor/ +share/xfce4-menueditor/xfce4-menueditor.ui share/xfce4/backdrops/ share/xfce4/backdrops/flower.png share/xfce4/backdrops/xfce-in-a-grid.png @@ -135,24 +155,17 @@ 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