diff options
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xfce4-desktop/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/xfce4-desktop/distinfo | 6 | ||||
| -rw-r--r-- | x11-wm/xfce4-desktop/pkg-plist | 86 | ||||
| -rw-r--r-- | x11-wm/xfce4-panel/Makefile | 7 | ||||
| -rw-r--r-- | x11-wm/xfce4-panel/distinfo | 6 | ||||
| -rw-r--r-- | x11-wm/xfce4-panel/files/patch-plugins-launcher-launcher-exec.c | 13 | ||||
| -rw-r--r-- | x11-wm/xfce4-panel/pkg-plist | 30 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/Makefile | 7 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/distinfo | 6 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/pkg-plist | 45 | ||||
| -rw-r--r-- | x11-wm/xfce4-wm/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/xfce4-wm/distinfo | 6 | ||||
| -rw-r--r-- | x11-wm/xfce4-wm/pkg-plist | 285 | ||||
| -rw-r--r-- | x11-wm/xfce4/Makefile | 77 |
14 files changed, 314 insertions, 270 deletions
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index 6fad5c72a6cf..b0387f354ddf 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xfce4-desktop -PORTVERSION= 4.4.3 -PORTREVISION= 0 +PORTVERSION= 4.6.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} DISTNAME= xfdesktop-${PORTVERSION} @@ -25,7 +24,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= glib20 gnometarget gtk20 intltool intlhack pkgconfig USE_LDCONFIG= yes -USE_XFCE= configenv libgui libmcs libutil mcsmanager panel +USE_XFCE= configenv libgui libutil panel xfconf OPTIONS= FAM "Enable FAM support" on \ THUNAR "Enable thunar support" on diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo index 2592fb5f62b6..0d7d24e37ddc 100644 --- a/x11-wm/xfce4-desktop/distinfo +++ b/x11-wm/xfce4-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (xfce4/xfdesktop-4.4.3.tar.bz2) = 3c1ea8d2ccb3cfbbbbba834214ad5d2e -SHA256 (xfce4/xfdesktop-4.4.3.tar.bz2) = 2380f5347fcb2b53370f7bac46ce18267e54e7e4a0ddee3dfe6c16df7ab8e5f5 -SIZE (xfce4/xfdesktop-4.4.3.tar.bz2) = 3095897 +MD5 (xfce4/xfdesktop-4.6.0.tar.bz2) = 508b18f9d4ef27833517bba3bd6e2fbf +SHA256 (xfce4/xfdesktop-4.6.0.tar.bz2) = 1432fc32cd5ed2ed222c4f95e9eb229c09f7c7d063443be6f1322b01518f284f +SIZE (xfce4/xfdesktop-4.6.0.tar.bz2) = 3349853 diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist index ea4851675f43..b774941994cb 100644 --- a/x11-wm/xfce4-desktop/pkg-plist +++ b/x11-wm/xfce4-desktop/pkg-plist @@ -1,70 +1,6 @@ -bin/xfce4-menueditor -bin/xfce4-popup-menu bin/xfdesktop -etc/xdg/xfce4/desktop/xfce-registered-categories.xml -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ca -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.cs -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.eu -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fi -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.he -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.hu -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.it -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ja -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nb_NO -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nl -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pl -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ro -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ru -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.sk -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.sv -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.tr -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_CN -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW -etc/xdg/xfce4/desktop/menu.xml -etc/xdg/xfce4/desktop/menu.xml.be -etc/xdg/xfce4/desktop/menu.xml.ca -etc/xdg/xfce4/desktop/menu.xml.cs -etc/xdg/xfce4/desktop/menu.xml.da -etc/xdg/xfce4/desktop/menu.xml.de -etc/xdg/xfce4/desktop/menu.xml.el -etc/xdg/xfce4/desktop/menu.xml.es -etc/xdg/xfce4/desktop/menu.xml.et -etc/xdg/xfce4/desktop/menu.xml.eu -etc/xdg/xfce4/desktop/menu.xml.fi -etc/xdg/xfce4/desktop/menu.xml.fr -etc/xdg/xfce4/desktop/menu.xml.he -etc/xdg/xfce4/desktop/menu.xml.hu -etc/xdg/xfce4/desktop/menu.xml.it -etc/xdg/xfce4/desktop/menu.xml.ja -etc/xdg/xfce4/desktop/menu.xml.ko -etc/xdg/xfce4/desktop/menu.xml.nb_NO -etc/xdg/xfce4/desktop/menu.xml.nl -etc/xdg/xfce4/desktop/menu.xml.pa -etc/xdg/xfce4/desktop/menu.xml.pl -etc/xdg/xfce4/desktop/menu.xml.pt_BR -etc/xdg/xfce4/desktop/menu.xml.pt_PT -etc/xdg/xfce4/desktop/menu.xml.ro -etc/xdg/xfce4/desktop/menu.xml.ru -etc/xdg/xfce4/desktop/menu.xml.sk -etc/xdg/xfce4/desktop/menu.xml.sv -etc/xdg/xfce4/desktop/menu.xml.tr -etc/xdg/xfce4/desktop/menu.xml.uk -etc/xdg/xfce4/desktop/menu.xml.vi -etc/xdg/xfce4/desktop/menu.xml.zh_TW -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.de -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.el -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.es -etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fr -lib/xfce4/mcs-plugins/backdrop_settings.a -lib/xfce4/mcs-plugins/backdrop_settings.la -lib/xfce4/mcs-plugins/backdrop_settings.so -lib/xfce4/modules/xfce4_desktop_menu.a -lib/xfce4/modules/xfce4_desktop_menu.la -lib/xfce4/modules/xfce4_desktop_menu.so -libexec/xfce4/panel-plugins/xfce4-menu-plugin +bin/xfdesktop-settings share/applications/xfce-backdrop-settings.desktop -share/applications/xfce-menueditor.desktop share/icons/hicolor/32x32/apps/xfce4-backdrop.png share/icons/hicolor/32x32/apps/xfce4-menueditor.png share/icons/hicolor/48x48/apps/xfce4-backdrop.png @@ -117,6 +53,7 @@ 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 @@ -149,6 +86,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_menu2.png share/xfce4/doc/fr/images/root_menu.png share/xfce4/doc/fr/images/select_bg_color.png @@ -157,12 +95,14 @@ 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/panel-plugins/xfce4-menu.desktop -share/xfce4-menueditor/xfce4-menueditor.ui -@dirrm etc/xdg/xfce4/desktop +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 @dirrmtry share/applications -@dirrmtry etc/xdg/xfce4 -@dirrmtry etc/xdg @dirrmtry etc/xfce4 @dirrmtry lib/xfce4/mcs-plugins @dirrmtry lib/xfce4/modules @@ -176,16 +116,16 @@ share/xfce4-menueditor/xfce4-menueditor.ui @dirrm share/xfce4/backdrops @dirrmtry share/xfce4/doc/C/images @dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/da @dirrmtry share/xfce4/doc/fr/images @dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/ja/images +@dirrmtry share/xfce4/doc/ja @dirrmtry share/xfce4/doc @dirrmtry share/xfce4/panel-plugins @dirrmtry share/xfce4 -@dirrm share/xfce4-menueditor @dirrmtry share/locale/nb_NO/LC_MESSAGES @dirrmtry share/locale/nb_NO -@dirrmtry share/locale/ur/LC_MESSAGES -@dirrmtry share/locale/ur @dirrmtry share/pixmaps/xfdesktop @dirrmtry share/pixmaps/xfce4/xfdesktop @dirrmtry share/pixmaps/xfce4 diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index ef4bfeb4c8d9..6a23c615022e 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xfce4-panel -PORTVERSION= 4.4.3 -PORTREVISION= 0 +PORTVERSION= 4.6.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} DIST_SUBDIR= xfce4 @@ -15,6 +14,8 @@ DIST_SUBDIR= xfce4 MAINTAINER= oliver@FreeBSD.org COMMENT= XFce 4 panel module +LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck + CONFLICTS= xfce4-systray-* GNU_CONFIGURE= yes INSTALLS_ICONS= yes @@ -23,7 +24,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig USE_LDCONFIG= yes -USE_XFCE= configenv libgui libmcs libutil mcsmanager +USE_XFCE= configenv libexo libgui libutil OPTIONS= GTKDOC "install the library documentation" off \ STARTUP "Enable startup notification support" on diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo index d95638fdeb8a..7b092175fd25 100644 --- a/x11-wm/xfce4-panel/distinfo +++ b/x11-wm/xfce4-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (xfce4/xfce4-panel-4.4.3.tar.bz2) = 06ef9294062f9bdee4106772e62802f5 -SHA256 (xfce4/xfce4-panel-4.4.3.tar.bz2) = 07a1860f92aaf6b31bfb5e5255f2a09738d12204faa96eca8a2b12d45b8e1bb7 -SIZE (xfce4/xfce4-panel-4.4.3.tar.bz2) = 777979 +MD5 (xfce4/xfce4-panel-4.6.0.tar.bz2) = b4c7cce05cc858d11c9dcd4c2f8dbfdb +SHA256 (xfce4/xfce4-panel-4.6.0.tar.bz2) = 735e83a7754b04e3af8776f4f2dbcd07a784a6b891ccbe11989cb00589061393 +SIZE (xfce4/xfce4-panel-4.6.0.tar.bz2) = 866645 diff --git a/x11-wm/xfce4-panel/files/patch-plugins-launcher-launcher-exec.c b/x11-wm/xfce4-panel/files/patch-plugins-launcher-launcher-exec.c new file mode 100644 index 000000000000..011081a4e023 --- /dev/null +++ b/x11-wm/xfce4-panel/files/patch-plugins-launcher-launcher-exec.c @@ -0,0 +1,13 @@ +--- plugins/launcher/launcher-exec.c.orig 2009-01-15 13:10:55.000000000 +0100 ++++ plugins/launcher/launcher-exec.c 2009-01-15 13:11:12.000000000 +0100 +@@ -49,6 +49,10 @@ + #define WAIT_ANY (-1) + #endif + ++#ifndef environ ++extern char **environ; ++#endif ++ + #include "launcher.h" + #include "launcher-exec.h" + diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist index da1bf22ff144..d469ada19a9e 100644 --- a/x11-wm/xfce4-panel/pkg-plist +++ b/x11-wm/xfce4-panel/pkg-plist @@ -1,7 +1,5 @@ -bin/xfce4-iconbox bin/xfce4-panel bin/xfce4-popup-windowlist -bin/xftaskbar4 etc/xdg/xfce4/panel/clock-14.rc etc/xdg/xfce4/panel/launcher-10.rc etc/xdg/xfce4/panel/launcher-7.rc @@ -10,11 +8,12 @@ etc/xdg/xfce4/panel/launcher-9.rc etc/xdg/xfce4/panel/panels.xml etc/xdg/xfce4/panel/systray-4.rc etc/xdg/xfce4/panel/xfce4-menu-5.rc +include/xfce4/libxfce4panel/libxfce4panel.h +include/xfce4/libxfce4panel/libxfce4panel-enum-types.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 @@ -25,8 +24,6 @@ include/xfce4/libxfce4panel/xfce-panel-window.h lib/libxfce4panel.la lib/libxfce4panel.so lib/libxfce4panel.so.2 -lib/xfce4/mcs-plugins/libxfce4settings.la -lib/xfce4/mcs-plugins/libxfce4settings.so lib/xfce4/panel-plugins/libactions.la lib/xfce4/panel-plugins/libactions.so lib/xfce4/panel-plugins/libclock.la @@ -56,27 +53,36 @@ 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/ch01.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-Convenience-Functions.html +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-Writing-Plugins.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/xfce4-panel.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/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 @@ -110,6 +116,7 @@ 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 @@ -125,6 +132,7 @@ 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-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index 345f54861e58..cd4888b7121c 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xfce4-session -PORTVERSION= 4.4.3 -PORTREVISION= 0 +PORTVERSION= 4.6.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} DIST_SUBDIR= xfce4 @@ -17,6 +16,8 @@ COMMENT= Session manager for the Xfce 4 desktop environment BUILD_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth RUN_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth +LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib GNU_CONFIGURE= yes INSTALLS_ICONS= yes @@ -25,7 +26,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig USE_LDCONFIG= yes -USE_XFCE= configenv libgui libmcs libutil mcsmanager +USE_XFCE= configenv libgui libutil xfconf USE_XORG= x11 sm ice MAN1= xfce4-session.1 xfce4-session-logout.1 diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo index 03147af5700f..490973f3ed21 100644 --- a/x11-wm/xfce4-session/distinfo +++ b/x11-wm/xfce4-session/distinfo @@ -1,3 +1,3 @@ -MD5 (xfce4/xfce4-session-4.4.3.tar.bz2) = 5c522e0d28c952af413cf0c43257b907 -SHA256 (xfce4/xfce4-session-4.4.3.tar.bz2) = fa23d0e079ea3bf1b7f0e056adc6e28df04581632207face4f851269d92bffdd -SIZE (xfce4/xfce4-session-4.4.3.tar.bz2) = 1276089 +MD5 (xfce4/xfce4-session-4.6.0.tar.bz2) = 79a08c3696196ef31fc8185658316706 +SHA256 (xfce4/xfce4-session-4.6.0.tar.bz2) = 950ccf85c743f40b88d3431caa3279627153b04ce7b9bf5e4ddd1f9431de4517 +SIZE (xfce4/xfce4-session-4.6.0.tar.bz2) = 1362667 diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist index 01cd9f30eb0c..8009e1aa53e0 100644 --- a/x11-wm/xfce4-session/pkg-plist +++ b/x11-wm/xfce4-session/pkg-plist @@ -1,22 +1,15 @@ -bin/xfce4-autostart-editor bin/xfce4-session bin/xfce4-session-logout +bin/xfce4-session-settings bin/xfce4-tips etc/xdg/autostart/xfce4-tips-autostart.desktop -etc/xdg/xfce4-session/xfce4-session.rc -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.a -lib/libxfsm-4.2.la -lib/libxfsm-4.2.so -lib/libxfsm-4.2.so.0 -libdata/pkgconfig/xfce4-session-1.0.pc -lib/xfce4/mcs-plugins/session_settings.a -lib/xfce4/mcs-plugins/session_settings.la -lib/xfce4/mcs-plugins/session_settings.so -lib/xfce4/mcs-plugins/splash_settings.a -lib/xfce4/mcs-plugins/splash_settings.la -lib/xfce4/mcs-plugins/splash_settings.so +etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +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.a +lib/libxfsm-4.6.la +lib/libxfsm-4.6.so +lib/libxfsm-4.6.so.0 lib/xfce4/splash/engines/libbalou.a lib/xfce4/splash/engines/libbalou.la lib/xfce4/splash/engines/libbalou.so @@ -26,16 +19,18 @@ lib/xfce4/splash/engines/libmice.so lib/xfce4/splash/engines/libsimple.a lib/xfce4/splash/engines/libsimple.la lib/xfce4/splash/engines/libsimple.so +libdata/pkgconfig/xfce4-session-2.0.pc libexec/balou-export-theme libexec/balou-install-theme libexec/xfsm-shutdown-helper -share/applications/xfce4-autostart-editor.desktop share/applications/xfce-session-settings.desktop -share/applications/xfce-splash-settings.desktop 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-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 @@ -71,7 +66,6 @@ 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 @@ -87,11 +81,12 @@ 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 -share/locale/ur/LC_MESSAGES/xfce4-session.mo share/locale/uk/LC_MESSAGES/xfce4-session.mo +share/locale/ur/LC_MESSAGES/xfce4-session.mo share/locale/vi/LC_MESSAGES/xfce4-session.mo share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo @@ -107,14 +102,15 @@ share/xfce4/doc/fr/images/xfsm-splash.png share/xfce4/doc/fr/xfce4-session.html share/xfce4/tips/tips share/xfce4/tips/tips.dat -share/icons/hicolor/48x48/apps/xfce4-autostart-editor.png share/icons/hicolor/48x48/apps/xfsm-logout.png share/icons/hicolor/48x48/apps/xfsm-reboot.png @dirrm etc/xdg/autostart -@dirrm etc/xdg/xfce4-session +@dirrm etc/xdg/xfce4/xfconf/xfce-perchannel-xml +@dirrm etc/xdg/xfce4/xfconf +@dirrm etc/xdg/xfce4 @dirrmtry etc/xdg -@dirrm include/xfce4/xfce4-session-4.2/libxfsm -@dirrm include/xfce4/xfce4-session-4.2 +@dirrm include/xfce4/xfce4-session-4.6/libxfsm +@dirrm include/xfce4/xfce4-session-4.6 @dirrmtry include/xfce4 @dirrmtry share/applications @dirrmtry share/icons/hicolor/48x48/apps @@ -137,9 +133,7 @@ share/icons/hicolor/48x48/apps/xfsm-reboot.png @dirrmtry share/xfce4 @dirrmtry lib/xfce4/splash/engines @dirrmtry lib/xfce4/splash -@dirrmtry lib/xfce4/mcs-plugins @dirrmtry lib/xfce4 -@dirrmtry lib/pkgconfig @dirrmtry share/icons/hicolor/64x64/apps @dirrmtry share/icons/hicolor/64x64 @dirrmtry share/icons/hicolor/72x72/apps @@ -148,4 +142,3 @@ share/icons/hicolor/48x48/apps/xfsm-reboot.png @dirrmtry share/icons/hicolor/128x128 @dirrmtry share/icons/hicolor/scalable/apps @dirrmtry share/icons/hicolor/scalable - diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile index ed66c47dee1c..46e6123fae4a 100644 --- a/x11-wm/xfce4-wm/Makefile +++ b/x11-wm/xfce4-wm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xfce4-wm -PORTVERSION= 4.4.3 -PORTREVISION= 0 +PORTVERSION= 4.6.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} DISTNAME= xfwm4-${PORTVERSION} @@ -24,7 +23,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_LDCONFIG= yes -USE_XFCE= configenv libmcs libutil libgui mcsmanager panel +USE_XFCE= configenv libutil libgui panel xfconf OPTIONS= COMPOSITE "Support the experimental X11 Composite extension" on \ STARTUP "Enable startup notification support" on \ diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo index 49cce2f1e0cf..7a937b6b5599 100644 --- a/x11-wm/xfce4-wm/distinfo +++ b/x11-wm/xfce4-wm/distinfo @@ -1,3 +1,3 @@ -MD5 (xfce4/xfwm4-4.4.3.tar.bz2) = d15089f06187c029aee4cb87f75c302d -SHA256 (xfce4/xfwm4-4.4.3.tar.bz2) = 12ee2e6bea8896f418905d6b93ce4a585aa22990bae9c1f89ca3cd56c608be51 -SIZE (xfce4/xfwm4-4.4.3.tar.bz2) = 1590866 +MD5 (xfce4/xfwm4-4.6.0.tar.bz2) = 83cd2f82f2fabfe4ab28a9780fbf309e +SHA256 (xfce4/xfwm4-4.6.0.tar.bz2) = a82d4204639d63652bb306ccd70eb79b3c2ccf640cbd7ed6d032f7ee3dee9516 +SIZE (xfce4/xfwm4-4.6.0.tar.bz2) = 1792953 diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist index 1f64b6cc66df..87c14381042a 100644 --- a/x11-wm/xfce4-wm/pkg-plist +++ b/x11-wm/xfce4-wm/pkg-plist @@ -1,13 +1,8 @@ bin/xfwm4 -lib/xfce4/mcs-plugins/wmtweaks_plugin.a -lib/xfce4/mcs-plugins/wmtweaks_plugin.la -lib/xfce4/mcs-plugins/wmtweaks_plugin.so -lib/xfce4/mcs-plugins/workspaces_plugin.a -lib/xfce4/mcs-plugins/workspaces_plugin.la -lib/xfce4/mcs-plugins/workspaces_plugin.so -lib/xfce4/mcs-plugins/xfwm4_plugin.a -lib/xfce4/mcs-plugins/xfwm4_plugin.la -lib/xfce4/mcs-plugins/xfwm4_plugin.so +bin/xfwm4-settings +bin/xfwm4-tweaks-settings +bin/xfwm4-workspace-settings +libexec/xfce4/xfwm4/helper-dialog share/applications/xfce-wm-settings.desktop share/applications/xfce-wmtweaks-settings.desktop share/applications/xfce-workspaces-settings.desktop @@ -62,6 +57,7 @@ share/locale/pt_PT/LC_MESSAGES/xfwm4.mo share/locale/ro/LC_MESSAGES/xfwm4.mo share/locale/ru/LC_MESSAGES/xfwm4.mo share/locale/sk/LC_MESSAGES/xfwm4.mo +share/locale/sq/LC_MESSAGES/xfwm4.mo share/locale/sv/LC_MESSAGES/xfwm4.mo share/locale/ta/LC_MESSAGES/xfwm4.mo share/locale/tr/LC_MESSAGES/xfwm4.mo @@ -174,6 +170,24 @@ share/themes/Daloa/xfwm4/top-right-active.png share/themes/Daloa/xfwm4/top-right-active.xpm share/themes/Daloa/xfwm4/top-right-inactive.png share/themes/Daloa/xfwm4/top-right-inactive.xpm +share/themes/Daloa/xfwm4/close-prelight.xpm +share/themes/Daloa/xfwm4/hide-prelight.xpm +share/themes/Daloa/xfwm4/maximize-prelight.xpm +share/themes/Daloa/xfwm4/maximize-toggled-prelight.xpm +share/themes/Daloa/xfwm4/menu-prelight.xpm +share/themes/Daloa/xfwm4/shade-prelight.xpm +share/themes/Daloa/xfwm4/shade-toggled-prelight.xpm +share/themes/Daloa/xfwm4/stick-prelight.xpm +share/themes/Daloa/xfwm4/stick-toggled-prelight.xpm +share/themes/Daloa/xfwm4/close-prelight.png +share/themes/Daloa/xfwm4/hide-prelight.png +share/themes/Daloa/xfwm4/maximize-prelight.png +share/themes/Daloa/xfwm4/maximize-toggled-prelight.png +share/themes/Daloa/xfwm4/menu-prelight.png +share/themes/Daloa/xfwm4/shade-prelight.png +share/themes/Daloa/xfwm4/shade-toggled-prelight.png +share/themes/Daloa/xfwm4/stick-prelight.png +share/themes/Daloa/xfwm4/stick-toggled-prelight.png share/themes/Default-4.0/xfwm4/README share/themes/Default-4.0/xfwm4/bottom-active.xpm share/themes/Default-4.0/xfwm4/bottom-inactive.xpm @@ -313,6 +327,110 @@ share/themes/Default-4.2/xfwm4/top-right-active.png share/themes/Default-4.2/xfwm4/top-right-active.xpm share/themes/Default-4.2/xfwm4/top-right-inactive.png share/themes/Default-4.2/xfwm4/top-right-inactive.xpm +share/themes/Default-4.4/xfwm4/README +share/themes/Default-4.4/xfwm4/themerc +share/themes/Default-4.4/xfwm4/bottom-active.xpm +share/themes/Default-4.4/xfwm4/bottom-inactive.xpm +share/themes/Default-4.4/xfwm4/bottom-left-active.xpm +share/themes/Default-4.4/xfwm4/bottom-left-inactive.xpm +share/themes/Default-4.4/xfwm4/bottom-right-active.xpm +share/themes/Default-4.4/xfwm4/bottom-right-inactive.xpm +share/themes/Default-4.4/xfwm4/close-active.xpm +share/themes/Default-4.4/xfwm4/close-inactive.xpm +share/themes/Default-4.4/xfwm4/close-pressed.xpm +share/themes/Default-4.4/xfwm4/hide-active.xpm +share/themes/Default-4.4/xfwm4/hide-inactive.xpm +share/themes/Default-4.4/xfwm4/hide-pressed.xpm +share/themes/Default-4.4/xfwm4/left-active.xpm +share/themes/Default-4.4/xfwm4/left-inactive.xpm +share/themes/Default-4.4/xfwm4/maximize-active.xpm +share/themes/Default-4.4/xfwm4/maximize-inactive.xpm +share/themes/Default-4.4/xfwm4/maximize-pressed.xpm +share/themes/Default-4.4/xfwm4/maximize-toggled-active.xpm +share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.xpm +share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.xpm +share/themes/Default-4.4/xfwm4/menu-active.xpm +share/themes/Default-4.4/xfwm4/menu-inactive.xpm +share/themes/Default-4.4/xfwm4/menu-pressed.xpm +share/themes/Default-4.4/xfwm4/right-active.xpm +share/themes/Default-4.4/xfwm4/right-inactive.xpm +share/themes/Default-4.4/xfwm4/shade-active.xpm +share/themes/Default-4.4/xfwm4/shade-inactive.xpm +share/themes/Default-4.4/xfwm4/shade-pressed.xpm +share/themes/Default-4.4/xfwm4/shade-toggled-active.xpm +share/themes/Default-4.4/xfwm4/shade-toggled-inactive.xpm +share/themes/Default-4.4/xfwm4/shade-toggled-pressed.xpm +share/themes/Default-4.4/xfwm4/stick-active.xpm +share/themes/Default-4.4/xfwm4/stick-inactive.xpm +share/themes/Default-4.4/xfwm4/stick-pressed.xpm +share/themes/Default-4.4/xfwm4/stick-toggled-active.xpm +share/themes/Default-4.4/xfwm4/stick-toggled-inactive.xpm +share/themes/Default-4.4/xfwm4/stick-toggled-pressed.xpm +share/themes/Default-4.4/xfwm4/title-1-active.xpm +share/themes/Default-4.4/xfwm4/title-1-inactive.xpm +share/themes/Default-4.4/xfwm4/title-2-active.xpm +share/themes/Default-4.4/xfwm4/title-2-inactive.xpm +share/themes/Default-4.4/xfwm4/title-3-active.xpm +share/themes/Default-4.4/xfwm4/title-3-inactive.xpm +share/themes/Default-4.4/xfwm4/title-4-active.xpm +share/themes/Default-4.4/xfwm4/title-4-inactive.xpm +share/themes/Default-4.4/xfwm4/title-5-active.xpm +share/themes/Default-4.4/xfwm4/title-5-inactive.xpm +share/themes/Default-4.4/xfwm4/top-left-active.xpm +share/themes/Default-4.4/xfwm4/top-left-inactive.xpm +share/themes/Default-4.4/xfwm4/top-right-active.xpm +share/themes/Default-4.4/xfwm4/top-right-inactive.xpm +share/themes/Default-4.4/xfwm4/bottom-active.png +share/themes/Default-4.4/xfwm4/bottom-inactive.png +share/themes/Default-4.4/xfwm4/bottom-left-active.png +share/themes/Default-4.4/xfwm4/bottom-left-inactive.png +share/themes/Default-4.4/xfwm4/bottom-right-active.png +share/themes/Default-4.4/xfwm4/bottom-right-inactive.png +share/themes/Default-4.4/xfwm4/close-active.png +share/themes/Default-4.4/xfwm4/close-inactive.png +share/themes/Default-4.4/xfwm4/close-pressed.png +share/themes/Default-4.4/xfwm4/hide-active.png +share/themes/Default-4.4/xfwm4/hide-inactive.png +share/themes/Default-4.4/xfwm4/hide-pressed.png +share/themes/Default-4.4/xfwm4/left-active.png +share/themes/Default-4.4/xfwm4/left-inactive.png +share/themes/Default-4.4/xfwm4/maximize-active.png +share/themes/Default-4.4/xfwm4/maximize-inactive.png +share/themes/Default-4.4/xfwm4/maximize-pressed.png +share/themes/Default-4.4/xfwm4/maximize-toggled-active.png +share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.png +share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.png +share/themes/Default-4.4/xfwm4/menu-active.png +share/themes/Default-4.4/xfwm4/menu-inactive.png +share/themes/Default-4.4/xfwm4/menu-pressed.png +share/themes/Default-4.4/xfwm4/right-active.png +share/themes/Default-4.4/xfwm4/right-inactive.png +share/themes/Default-4.4/xfwm4/shade-active.png +share/themes/Default-4.4/xfwm4/shade-inactive.png +share/themes/Default-4.4/xfwm4/shade-pressed.png +share/themes/Default-4.4/xfwm4/shade-toggled-active.png +share/themes/Default-4.4/xfwm4/shade-toggled-inactive.png +share/themes/Default-4.4/xfwm4/shade-toggled-pressed.png +share/themes/Default-4.4/xfwm4/stick-active.png +share/themes/Default-4.4/xfwm4/stick-inactive.png +share/themes/Default-4.4/xfwm4/stick-pressed.png +share/themes/Default-4.4/xfwm4/stick-toggled-active.png +share/themes/Default-4.4/xfwm4/stick-toggled-inactive.png +share/themes/Default-4.4/xfwm4/stick-toggled-pressed.png +share/themes/Default-4.4/xfwm4/title-1-active.png +share/themes/Default-4.4/xfwm4/title-1-inactive.png +share/themes/Default-4.4/xfwm4/title-2-active.png +share/themes/Default-4.4/xfwm4/title-2-inactive.png +share/themes/Default-4.4/xfwm4/title-3-active.png +share/themes/Default-4.4/xfwm4/title-3-inactive.png +share/themes/Default-4.4/xfwm4/title-4-active.png +share/themes/Default-4.4/xfwm4/title-4-inactive.png +share/themes/Default-4.4/xfwm4/title-5-active.png +share/themes/Default-4.4/xfwm4/title-5-inactive.png +share/themes/Default-4.4/xfwm4/top-left-active.png +share/themes/Default-4.4/xfwm4/top-left-inactive.png +share/themes/Default-4.4/xfwm4/top-right-active.png +share/themes/Default-4.4/xfwm4/top-right-inactive.png share/themes/Default/xfwm4/README share/themes/Default/xfwm4/bottom-active.png share/themes/Default/xfwm4/bottom-active.xpm @@ -338,7 +456,6 @@ share/themes/Default/xfwm4/hide-inactive.png share/themes/Default/xfwm4/hide-inactive.xpm share/themes/Default/xfwm4/hide-pressed.png share/themes/Default/xfwm4/hide-pressed.xpm -share/themes/Default/xfwm4/keythemerc share/themes/Default/xfwm4/left-active.png share/themes/Default/xfwm4/left-active.xpm share/themes/Default/xfwm4/left-inactive.png @@ -418,110 +535,24 @@ share/themes/Default/xfwm4/top-right-active.png share/themes/Default/xfwm4/top-right-active.xpm share/themes/Default/xfwm4/top-right-inactive.png share/themes/Default/xfwm4/top-right-inactive.xpm -share/themes/Katiola/xfwm4/README -share/themes/Katiola/xfwm4/bottom-active.png -share/themes/Katiola/xfwm4/bottom-active.xpm -share/themes/Katiola/xfwm4/bottom-inactive.png -share/themes/Katiola/xfwm4/bottom-inactive.xpm -share/themes/Katiola/xfwm4/bottom-left-active.png -share/themes/Katiola/xfwm4/bottom-left-active.xpm -share/themes/Katiola/xfwm4/bottom-left-inactive.png -share/themes/Katiola/xfwm4/bottom-left-inactive.xpm -share/themes/Katiola/xfwm4/bottom-right-active.png -share/themes/Katiola/xfwm4/bottom-right-active.xpm -share/themes/Katiola/xfwm4/bottom-right-inactive.png -share/themes/Katiola/xfwm4/bottom-right-inactive.xpm -share/themes/Katiola/xfwm4/close-active.png -share/themes/Katiola/xfwm4/close-active.xpm -share/themes/Katiola/xfwm4/close-inactive.png -share/themes/Katiola/xfwm4/close-inactive.xpm -share/themes/Katiola/xfwm4/close-pressed.png -share/themes/Katiola/xfwm4/close-pressed.xpm -share/themes/Katiola/xfwm4/hide-active.png -share/themes/Katiola/xfwm4/hide-active.xpm -share/themes/Katiola/xfwm4/hide-inactive.png -share/themes/Katiola/xfwm4/hide-inactive.xpm -share/themes/Katiola/xfwm4/hide-pressed.png -share/themes/Katiola/xfwm4/hide-pressed.xpm -share/themes/Katiola/xfwm4/left-active.png -share/themes/Katiola/xfwm4/left-active.xpm -share/themes/Katiola/xfwm4/left-inactive.png -share/themes/Katiola/xfwm4/left-inactive.xpm -share/themes/Katiola/xfwm4/maximize-active.png -share/themes/Katiola/xfwm4/maximize-active.xpm -share/themes/Katiola/xfwm4/maximize-inactive.png -share/themes/Katiola/xfwm4/maximize-inactive.xpm -share/themes/Katiola/xfwm4/maximize-pressed.png -share/themes/Katiola/xfwm4/maximize-pressed.xpm -share/themes/Katiola/xfwm4/maximize-toggled-active.png -share/themes/Katiola/xfwm4/maximize-toggled-active.xpm -share/themes/Katiola/xfwm4/maximize-toggled-inactive.png -share/themes/Katiola/xfwm4/maximize-toggled-inactive.xpm -share/themes/Katiola/xfwm4/maximize-toggled-pressed.png -share/themes/Katiola/xfwm4/maximize-toggled-pressed.xpm -share/themes/Katiola/xfwm4/menu-active.png -share/themes/Katiola/xfwm4/menu-active.xpm -share/themes/Katiola/xfwm4/menu-inactive.png -share/themes/Katiola/xfwm4/menu-inactive.xpm -share/themes/Katiola/xfwm4/menu-pressed.png -share/themes/Katiola/xfwm4/menu-pressed.xpm -share/themes/Katiola/xfwm4/right-active.png -share/themes/Katiola/xfwm4/right-active.xpm -share/themes/Katiola/xfwm4/right-inactive.png -share/themes/Katiola/xfwm4/right-inactive.xpm -share/themes/Katiola/xfwm4/shade-active.png -share/themes/Katiola/xfwm4/shade-active.xpm -share/themes/Katiola/xfwm4/shade-inactive.png -share/themes/Katiola/xfwm4/shade-inactive.xpm -share/themes/Katiola/xfwm4/shade-pressed.png -share/themes/Katiola/xfwm4/shade-pressed.xpm -share/themes/Katiola/xfwm4/shade-toggled-active.png -share/themes/Katiola/xfwm4/shade-toggled-active.xpm -share/themes/Katiola/xfwm4/shade-toggled-inactive.png -share/themes/Katiola/xfwm4/shade-toggled-inactive.xpm -share/themes/Katiola/xfwm4/shade-toggled-pressed.png -share/themes/Katiola/xfwm4/shade-toggled-pressed.xpm -share/themes/Katiola/xfwm4/stick-active.png -share/themes/Katiola/xfwm4/stick-active.xpm -share/themes/Katiola/xfwm4/stick-inactive.png -share/themes/Katiola/xfwm4/stick-inactive.xpm -share/themes/Katiola/xfwm4/stick-pressed.png -share/themes/Katiola/xfwm4/stick-pressed.xpm -share/themes/Katiola/xfwm4/stick-toggled-active.png -share/themes/Katiola/xfwm4/stick-toggled-active.xpm -share/themes/Katiola/xfwm4/stick-toggled-inactive.png -share/themes/Katiola/xfwm4/stick-toggled-inactive.xpm -share/themes/Katiola/xfwm4/stick-toggled-pressed.png -share/themes/Katiola/xfwm4/stick-toggled-pressed.xpm -share/themes/Katiola/xfwm4/themerc -share/themes/Katiola/xfwm4/title-1-active.png -share/themes/Katiola/xfwm4/title-1-active.xpm -share/themes/Katiola/xfwm4/title-1-inactive.png -share/themes/Katiola/xfwm4/title-1-inactive.xpm -share/themes/Katiola/xfwm4/title-2-active.png -share/themes/Katiola/xfwm4/title-2-active.xpm -share/themes/Katiola/xfwm4/title-2-inactive.png -share/themes/Katiola/xfwm4/title-2-inactive.xpm -share/themes/Katiola/xfwm4/title-3-active.png -share/themes/Katiola/xfwm4/title-3-active.xpm -share/themes/Katiola/xfwm4/title-3-inactive.png -share/themes/Katiola/xfwm4/title-3-inactive.xpm -share/themes/Katiola/xfwm4/title-4-active.png -share/themes/Katiola/xfwm4/title-4-active.xpm -share/themes/Katiola/xfwm4/title-4-inactive.png -share/themes/Katiola/xfwm4/title-4-inactive.xpm -share/themes/Katiola/xfwm4/title-5-active.png -share/themes/Katiola/xfwm4/title-5-active.xpm -share/themes/Katiola/xfwm4/title-5-inactive.png -share/themes/Katiola/xfwm4/title-5-inactive.xpm -share/themes/Katiola/xfwm4/top-left-active.png -share/themes/Katiola/xfwm4/top-left-active.xpm -share/themes/Katiola/xfwm4/top-left-inactive.png -share/themes/Katiola/xfwm4/top-left-inactive.xpm -share/themes/Katiola/xfwm4/top-right-active.png -share/themes/Katiola/xfwm4/top-right-active.xpm -share/themes/Katiola/xfwm4/top-right-inactive.png -share/themes/Katiola/xfwm4/top-right-inactive.xpm +share/themes/Default/xfwm4/close-prelight.xpm +share/themes/Default/xfwm4/hide-prelight.xpm +share/themes/Default/xfwm4/maximize-prelight.xpm +share/themes/Default/xfwm4/maximize-toggled-prelight.xpm +share/themes/Default/xfwm4/menu-prelight.xpm +share/themes/Default/xfwm4/shade-prelight.xpm +share/themes/Default/xfwm4/shade-toggled-prelight.xpm +share/themes/Default/xfwm4/stick-prelight.xpm +share/themes/Default/xfwm4/stick-toggled-prelight.xpm +share/themes/Default/xfwm4/close-prelight.png +share/themes/Default/xfwm4/hide-prelight.png +share/themes/Default/xfwm4/maximize-prelight.png +share/themes/Default/xfwm4/maximize-toggled-prelight.png +share/themes/Default/xfwm4/menu-prelight.png +share/themes/Default/xfwm4/shade-prelight.png +share/themes/Default/xfwm4/shade-toggled-prelight.png +share/themes/Default/xfwm4/stick-prelight.png +share/themes/Default/xfwm4/stick-toggled-prelight.png share/themes/Kokodi/xfwm4/README share/themes/Kokodi/xfwm4/themerc share/themes/Kokodi/xfwm4/bottom-active.xpm @@ -626,6 +657,24 @@ share/themes/Kokodi/xfwm4/top-left-active.png share/themes/Kokodi/xfwm4/top-left-inactive.png share/themes/Kokodi/xfwm4/top-right-active.png share/themes/Kokodi/xfwm4/top-right-inactive.png +share/themes/Kokodi/xfwm4/close-prelight.xpm +share/themes/Kokodi/xfwm4/hide-prelight.xpm +share/themes/Kokodi/xfwm4/maximize-prelight.xpm +share/themes/Kokodi/xfwm4/maximize-toggled-prelight.xpm +share/themes/Kokodi/xfwm4/menu-prelight.xpm +share/themes/Kokodi/xfwm4/shade-prelight.xpm +share/themes/Kokodi/xfwm4/shade-toggled-prelight.xpm +share/themes/Kokodi/xfwm4/stick-prelight.xpm +share/themes/Kokodi/xfwm4/stick-toggled-prelight.xpm +share/themes/Kokodi/xfwm4/close-prelight.png +share/themes/Kokodi/xfwm4/hide-prelight.png +share/themes/Kokodi/xfwm4/maximize-prelight.png +share/themes/Kokodi/xfwm4/maximize-toggled-prelight.png +share/themes/Kokodi/xfwm4/menu-prelight.png +share/themes/Kokodi/xfwm4/shade-prelight.png +share/themes/Kokodi/xfwm4/shade-toggled-prelight.png +share/themes/Kokodi/xfwm4/stick-prelight.png +share/themes/Kokodi/xfwm4/stick-toggled-prelight.png share/themes/Moheli/xfwm4/README share/themes/Moheli/xfwm4/bottom-active.png share/themes/Moheli/xfwm4/bottom-active.xpm @@ -1282,14 +1331,14 @@ share/xfce4/doc/it/xfwm4.html share/xfwm4/defaults @dirrmtry lib/xfce4/mcs-plugins @dirrmtry lib/xfce4 +@dirrm libexec/xfce4/xfwm4 +@dirrm libexec/xfce4 @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/nb_NO/LC_MESSAGES @dirrmtry share/locale/nb_NO -@dirrmtry share/locale/ur/LC_MESSAGES -@dirrmtry share/locale/ur @dirrmtry share/xfce4/doc/C/images @dirrmtry share/xfce4/doc/C @dirrmtry share/xfce4/doc/fr/images @@ -1306,8 +1355,8 @@ share/xfwm4/defaults @dirrmtry share/themes/Default-4.0 @dirrm share/themes/Default-4.2/xfwm4 @dirrmtry share/themes/Default-4.2 -@dirrm share/themes/Katiola/xfwm4 -@dirrmtry share/themes/Katiola +@dirrm share/themes/Default-4.4/xfwm4 +@dirrmtry share/themes/Default-4.4 @dirrm share/themes/Kokodi/xfwm4 @dirrmtry share/themes/Kokodi @dirrm share/themes/Moheli/xfwm4 diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 540f2e8f4830..c1e90a233282 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xfce -PORTVERSION= 4.4.3 -PORTREVISION= 0 +PORTVERSION= 4.6.0 CATEGORIES= x11-wm xfce MASTER_SITES= # empty DISTFILES= # empty @@ -16,19 +15,22 @@ EXTRACT_ONLY= # empty MAINTAINER= oliver@FreeBSD.org COMMENT= The "meta-port" for the XFce 4 desktop environment -RUN_DEPENDS= ${LOCALBASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutils/xfce4-mcs-plugins \ - xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \ - xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder \ +OPTIONS= ICONS "Install a full icon theme" on \ + ORAGE "Install the Xfce calendar application" on \ + MOUSEPAD "Install the Xfce text editor" on \ + TERMINAL "Install the Xfce terminal application" on \ + APPFINDER "Install the Xfce application finder" on \ + MIXER "Install the Xfce mixer application" on \ + PRINT "Install the Xfce printing helper" on \ + GDM "Install the login manager gdm" off + +RUN_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \ xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \ xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \ xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop \ startxfce4:${PORTSDIR}/sysutils/xfce4-utils \ - xfprint4:${PORTSDIR}/print/xfce4-print \ ${LOCALBASE}/lib/gtk-2.0/2.10.0/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine \ - thunar:${PORTSDIR}/x11-fm/thunar \ - orage:${PORTSDIR}/deskutils/orage \ - mousepad:${PORTSDIR}/editors/mousepad \ - Terminal:${PORTSDIR}/x11/Terminal + xfsettingsd:${PORTSDIR}/sysutils/xfce4-settings NO_BUILD= yes LATEST_LINK= xfce4 @@ -39,22 +41,41 @@ LATEST_LINK= xfce4 WITH_GDM= yes .endif -.if defined(WITH_GDM) +.if !defined(WITH_GDM) +PLIST_SUB+= GDM="@comment " +.else RUN_DEPENDS+= ${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm PLIST_SUB+= GDM="" -.else -PLIST_SUB+= GDM="@comment " .endif -.if !defined(WITHOUT_EXTRAS) -.if !defined(WITHOUT_THEMES) +.if !defined(WITHOUT_ICONS) RUN_DEPENDS+= ${LOCALBASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme \ - ${LOCALBASE}/share/themes/Xfce/xfwm4/themerc:${PORTSDIR}/misc/xfce4-wm-themes + ${LOCALBASE}/share/themes/Xfce/xfwm4/themerc:${PORTSDIR}/misc/xfce4-wm-themes \ + icons-tango-extras>=0.1.0:${PORTSDIR}/x11-themes/icons-tango-extras +.endif + +.if !defined(WITHOUT_ORAGE) +RUN_DEPENDS+= orage:${PORTSDIR}/deskutils/orage .endif -.if !defined(WITHOUT_PLUGINS) -RUN_DEPENDS+= ${LOCALBASE}/lib/xfce4/modules/libxfce4mixer.so:${PORTSDIR}/audio/xfce4-mixer +.if !defined(WITHOUT_MOUSEPAD) +RUN_DEPENDS+= mousepad:${PORTSDIR}/editors/mousepad .endif + +.if !defined(WITHOUT_TERMINAL) +RUN_DEPENDS+= Terminal:${PORTSDIR}/x11/Terminal +.endif + +.if !defined(WITHOUT_APPFINDER) +RUN_DEPENDS+= xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder +.endif + +.if !defined(WITHOUT_MIXER) +RUN_DEPENDS+= ${LOCALBASE}/bin/xfce4-mixer:${PORTSDIR}/audio/xfce4-mixer +.endif + +.if !defined(WITHOUT_PRINT) +RUN_DEPENDS+= xfprint4:${PORTSDIR}/print/xfce4-print .endif do-install: # empty @@ -66,5 +87,25 @@ post-install: @${INSTALL_SCRIPT} ${FILESDIR}/XFce4 ${PREFIX}/etc/gdm/Sessions @${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${FILESDIR}/XFce4.desktop > ${PREFIX}/etc/dm/Sessions/XFce4.desktop .endif + @${ECHO} "================================================================" + @${ECHO} + @${ECHO} "If you want to allow users to restart or shutdown the system," + @${ECHO} "do not forget to add the following lines between the <config>" + @${ECHO} "tags in your PolicyKit.conf file." + @${ECHO} " ${PREFIX}/etc/PolicyKit/PolicyKit.conf + @${ECHO} "" + @${ECHO} "<match action=\"org.freedesktop.hal.power-management.shutdown\">" + @${ECHO} " <return result=\"yes\"/>" + @${ECHO} "</match>" + @${ECHO} "" + @${ECHO} "<match action=\"org.freedesktop.hal.power-management.reboot\">" + @${ECHO} " <return result=\"yes\"/>" + @${ECHO} "</match>" + @${ECHO} + @${ECHO} "Make also sure, hald_enable, dbus_enable and polkitd_enable" + @${ECHO} "is set to YES in your /etc/rc.conf" + @${ECHO} + @${ECHO} "================================================================" + .include <bsd.port.post.mk> |