diff options
| author | jperkin <jperkin> | 2015-04-21 08:56:37 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-04-21 08:56:37 +0000 |
| commit | 69a9a7ef1bd8e3798cb4254b082188157b25c32c (patch) | |
| tree | ae790a249f25dd74c81f5e89461d2643574091dc /sysutils | |
| parent | c4075f0ca19efd108c2391a406cf7c6742e154f5 (diff) | |
| download | pkgsrc-69a9a7ef1bd8e3798cb4254b082188157b25c32c.tar.gz | |
Update Xfce to 4.12.0.
This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major
Xfce releases since 4.6.2, our previous pkgsrc release. For more information
about the thousands of changes in each major release since then, please see:
Xfce 4.12 announcement:
http://www.xfce.org/about/news
Xfce 4.12 tour:
http://www.xfce.org/about/tour
Xfce 4.10 announcement:
http://www.xfce.org/about/news/?post=1335571200
Xfce 4.10 tour:
http://www.xfce.org/about/tour410
Xfce 4.8 announcement:
http://www.xfce.org/about/news/?post=1295136000
Xfce 4.8 tour:
http://www.xfce.org/about/tour48
The pkgsrc changes since then are:
New packages:
archivers/xfce4-thunar-archive
graphics/elementary-xfce-icon-theme
mail/xfce4-mailwatch-plugin
misc/xfce4-time-out-plugin
multimedia/xfce4-thunar-media-tags
sysutils/xfce4-mount-plugin
sysutils/xfce4-taskmanager
sysutils/xfce4-thunar-vcs
sysutils/xfce4-verve-plugin
x11/xfce4-garcon
x11/xfce4-notifyd
x11/xfce4-tumbler
x11/xfce4-whiskermenu-plugin
Renamed packages:
devel/xfconf to devel/xfce4-conf
x11/libxfce4menu to x11/libxfce4ui
x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter
Updated packages:
audio/xfce4-mixer
audio/xfce4-xmms-plugin
devel/xfce4-dev-tools
editors/xfce4-mousepad
graphics/ristretto
meta-pkgs/xfce4-extras
meta-pkgs/xfce4
misc/xfce4-weather-plugin
multimedia/xfce4-mpc-plugin
net/xfce4-wavelan-plugin
sysutils/xfce4-appfinder
sysutils/xfce4-battery-plugin
sysutils/xfce4-cpugraph-plugin
sysutils/xfce4-diskperf-plugin
sysutils/xfce4-fsguard-plugin
sysutils/xfce4-genmon-plugin
sysutils/xfce4-netload-plugin
sysutils/xfce4-quicklauncher-plugin
sysutils/xfce4-systemload-plugin
sysutils/xfce4-thunar
sysutils/xfce4-xarchiver
sysutils/xfce4-xkb-plugin
textproc/xfce4-dict-plugin
time/xfce4-datetime-plugin
time/xfce4-orage
time/xfce4-timer-plugin
wm/xfce4-wm-themes
wm/xfce4-wm
x11/libxfce4gui
x11/libxfce4util
x11/xfce4-clipman-plugin
x11/xfce4-desktop
x11/xfce4-exo
x11/xfce4-eyes-plugin
x11/xfce4-gtk2-engine
x11/xfce4-notes-plugin
x11/xfce4-panel
x11/xfce4-places-plugin
x11/xfce4-session
x11/xfce4-settings
x11/xfce4-terminal
Removed packages:
sysutils/xfce4-volman
x11/xfce4-utils
This is based on a huge amount of work by the NetBSDfr team and Youri Mouton,
who takes over as MAINTAINER, and has been tested by Youri on a large number
of platforms prior to commit. A massive thanks to them. Any issues with the
import are mine alone as the committer-by-proxy.
Diffstat (limited to 'sysutils')
107 files changed, 2244 insertions, 1477 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index be115f16f5d..8888bd6158a 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.632 2015/04/14 11:28:38 fhajny Exp $ +# $NetBSD: Makefile,v 1.633 2015/04/21 08:56:39 jperkin Exp $ # COMMENT= System utilities @@ -603,11 +603,14 @@ SUBDIR+= xfce4-cpugraph-plugin SUBDIR+= xfce4-diskperf-plugin SUBDIR+= xfce4-fsguard-plugin SUBDIR+= xfce4-genmon-plugin +SUBDIR+= xfce4-mount-plugin SUBDIR+= xfce4-netload-plugin SUBDIR+= xfce4-quicklauncher-plugin SUBDIR+= xfce4-systemload-plugin +SUBDIR+= xfce4-taskmanager SUBDIR+= xfce4-thunar -SUBDIR+= xfce4-volman +SUBDIR+= xfce4-thunar-vcs +SUBDIR+= xfce4-verve-plugin SUBDIR+= xfce4-xarchiver SUBDIR+= xfce4-xkb-plugin SUBDIR+= xfe diff --git a/sysutils/xfce4-appfinder/Makefile b/sysutils/xfce4-appfinder/Makefile index edceb46c7c5..41b214283e7 100644 --- a/sysutils/xfce4-appfinder/Makefile +++ b/sysutils/xfce4-appfinder/Makefile @@ -1,17 +1,14 @@ -# $NetBSD: Makefile,v 1.36 2014/05/05 00:48:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.37 2015/04/21 08:56:39 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-appfinder-${XFCE4_VERSION} -PKGREVISION= 23 CATEGORIES= sysutils + +HOMEPAGE= http://docs.xfce.org/xfce/xfce4-appfinder/start COMMENT= Xfce application finder -.include "../../devel/xfconf/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/xfce4-thunar/buildlink3.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../x11/libxfce4menu/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/libxfce4ui/buildlink3.mk" +.include "../../x11/xfce4-garcon/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-appfinder/PLIST b/sysutils/xfce4-appfinder/PLIST index a0d90415d8f..d0070fd9e1b 100644 --- a/sysutils/xfce4-appfinder/PLIST +++ b/sysutils/xfce4-appfinder/PLIST @@ -1,43 +1,45 @@ -@comment $NetBSD: PLIST,v 1.11 2009/09/16 01:15:34 reed Exp $ +@comment $NetBSD: PLIST,v 1.12 2015/04/21 08:56:39 jperkin Exp $ bin/xfce4-appfinder +bin/xfrun4 +share/appdata/xfce4-appfinder.appdata.xml share/applications/xfce4-appfinder.desktop -share/icons/hicolor/48x48/apps/xfce4-appfinder.png +share/applications/xfce4-run.desktop share/locale/am/LC_MESSAGES/xfce4-appfinder.mo share/locale/ar/LC_MESSAGES/xfce4-appfinder.mo +share/locale/ast/LC_MESSAGES/xfce4-appfinder.mo share/locale/be/LC_MESSAGES/xfce4-appfinder.mo -share/locale/bn_IN/LC_MESSAGES/xfce4-appfinder.mo +share/locale/bg/LC_MESSAGES/xfce4-appfinder.mo +share/locale/bn/LC_MESSAGES/xfce4-appfinder.mo share/locale/ca/LC_MESSAGES/xfce4-appfinder.mo share/locale/cs/LC_MESSAGES/xfce4-appfinder.mo share/locale/da/LC_MESSAGES/xfce4-appfinder.mo share/locale/de/LC_MESSAGES/xfce4-appfinder.mo -share/locale/dz/LC_MESSAGES/xfce4-appfinder.mo share/locale/el/LC_MESSAGES/xfce4-appfinder.mo +share/locale/en_AU/LC_MESSAGES/xfce4-appfinder.mo share/locale/en_GB/LC_MESSAGES/xfce4-appfinder.mo share/locale/eo/LC_MESSAGES/xfce4-appfinder.mo share/locale/es/LC_MESSAGES/xfce4-appfinder.mo -share/locale/es_MX/LC_MESSAGES/xfce4-appfinder.mo share/locale/et/LC_MESSAGES/xfce4-appfinder.mo share/locale/eu/LC_MESSAGES/xfce4-appfinder.mo -share/locale/fa/LC_MESSAGES/xfce4-appfinder.mo share/locale/fi/LC_MESSAGES/xfce4-appfinder.mo share/locale/fr/LC_MESSAGES/xfce4-appfinder.mo share/locale/gl/LC_MESSAGES/xfce4-appfinder.mo -share/locale/gu/LC_MESSAGES/xfce4-appfinder.mo share/locale/he/LC_MESSAGES/xfce4-appfinder.mo +share/locale/hr/LC_MESSAGES/xfce4-appfinder.mo share/locale/hu/LC_MESSAGES/xfce4-appfinder.mo -share/locale/hy/LC_MESSAGES/xfce4-appfinder.mo share/locale/id/LC_MESSAGES/xfce4-appfinder.mo +share/locale/is/LC_MESSAGES/xfce4-appfinder.mo share/locale/it/LC_MESSAGES/xfce4-appfinder.mo share/locale/ja/LC_MESSAGES/xfce4-appfinder.mo -share/locale/ka/LC_MESSAGES/xfce4-appfinder.mo +share/locale/kk/LC_MESSAGES/xfce4-appfinder.mo share/locale/ko/LC_MESSAGES/xfce4-appfinder.mo -share/locale/ku/LC_MESSAGES/xfce4-appfinder.mo share/locale/lt/LC_MESSAGES/xfce4-appfinder.mo share/locale/lv/LC_MESSAGES/xfce4-appfinder.mo -share/locale/mk/LC_MESSAGES/xfce4-appfinder.mo -share/locale/mr/LC_MESSAGES/xfce4-appfinder.mo +share/locale/ms/LC_MESSAGES/xfce4-appfinder.mo share/locale/nb/LC_MESSAGES/xfce4-appfinder.mo share/locale/nl/LC_MESSAGES/xfce4-appfinder.mo +share/locale/nn/LC_MESSAGES/xfce4-appfinder.mo +share/locale/oc/LC_MESSAGES/xfce4-appfinder.mo share/locale/pa/LC_MESSAGES/xfce4-appfinder.mo share/locale/pl/LC_MESSAGES/xfce4-appfinder.mo share/locale/pt/LC_MESSAGES/xfce4-appfinder.mo @@ -46,10 +48,18 @@ share/locale/ro/LC_MESSAGES/xfce4-appfinder.mo share/locale/ru/LC_MESSAGES/xfce4-appfinder.mo share/locale/si/LC_MESSAGES/xfce4-appfinder.mo share/locale/sk/LC_MESSAGES/xfce4-appfinder.mo +share/locale/sl/LC_MESSAGES/xfce4-appfinder.mo share/locale/sq/LC_MESSAGES/xfce4-appfinder.mo +share/locale/sr/LC_MESSAGES/xfce4-appfinder.mo share/locale/sv/LC_MESSAGES/xfce4-appfinder.mo +share/locale/te/LC_MESSAGES/xfce4-appfinder.mo +share/locale/th/LC_MESSAGES/xfce4-appfinder.mo share/locale/tr/LC_MESSAGES/xfce4-appfinder.mo +share/locale/ug/LC_MESSAGES/xfce4-appfinder.mo share/locale/uk/LC_MESSAGES/xfce4-appfinder.mo share/locale/ur/LC_MESSAGES/xfce4-appfinder.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-appfinder.mo +share/locale/vi/LC_MESSAGES/xfce4-appfinder.mo share/locale/zh_CN/LC_MESSAGES/xfce4-appfinder.mo +share/locale/zh_HK/LC_MESSAGES/xfce4-appfinder.mo share/locale/zh_TW/LC_MESSAGES/xfce4-appfinder.mo diff --git a/sysutils/xfce4-appfinder/buildlink3.mk b/sysutils/xfce4-appfinder/buildlink3.mk deleted file mode 100644 index 5bfe9fd5633..00000000000 --- a/sysutils/xfce4-appfinder/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.20 2009/09/16 01:15:34 reed Exp $ - -BUILDLINK_TREE+= xfce4-appfinder - -.if !defined(XFCE4_APPFINDER_BUILDLINK3_MK) -XFCE4_APPFINDER_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-appfinder+= xfce4-appfinder>=4.6.0 -BUILDLINK_PKGSRCDIR.xfce4-appfinder?= ../../sysutils/xfce4-appfinder - -.endif # XFCE4_APPFINDER_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-appfinder diff --git a/sysutils/xfce4-appfinder/distinfo b/sysutils/xfce4-appfinder/distinfo index eca0fec481d..e0cfdb90975 100644 --- a/sysutils/xfce4-appfinder/distinfo +++ b/sysutils/xfce4-appfinder/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.11 2012/03/05 13:32:58 roy Exp $ +$NetBSD: distinfo,v 1.12 2015/04/21 08:56:39 jperkin Exp $ -SHA1 (xfce4-appfinder-4.6.1.tar.bz2) = ecc1f2c6afec8cfb79464a34d23f94c6ed7d017e -RMD160 (xfce4-appfinder-4.6.1.tar.bz2) = 00487ac1c963b0c7085d7725e05a0928412c8295 -Size (xfce4-appfinder-4.6.1.tar.bz2) = 314040 bytes -SHA1 (patch-src_xfce-appfinder-window.c) = 28d3f0d3e96d291248b1dcb475066e3a22ef60b9 +SHA1 (xfce4-appfinder-4.12.0.tar.bz2) = c6fe75b140e6c864654e9485e30a4718cdfd7321 +RMD160 (xfce4-appfinder-4.12.0.tar.bz2) = 09cdbc28598fb71cbb2f4b6e9b0de3c56eef8e36 +Size (xfce4-appfinder-4.12.0.tar.bz2) = 459338 bytes diff --git a/sysutils/xfce4-appfinder/patches/patch-src_xfce-appfinder-window.c b/sysutils/xfce4-appfinder/patches/patch-src_xfce-appfinder-window.c deleted file mode 100644 index 9164cb2c8f3..00000000000 --- a/sysutils/xfce4-appfinder/patches/patch-src_xfce-appfinder-window.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_xfce-appfinder-window.c,v 1.1 2012/03/05 13:32:58 roy Exp $ - -Should return NULL to silence errors. - ---- src/xfce-appfinder-window.c.orig 2012-03-05 13:18:51.000000000 +0000 -+++ src/xfce-appfinder-window.c -@@ -926,7 +926,7 @@ _xfce_appfinder_window_reload_menu (Xfce - gchar *filename = NULL; - gint counter = 0; - -- g_return_if_fail (XFCE_IS_APPFINDER_WINDOW (window)); -+ g_return_val_if_fail (XFCE_IS_APPFINDER_WINDOW (window), NULL); - - DBG ("window->menu_filename = %s", window->menu_filename); - diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile index 5af9c353146..342e0fed9cb 100644 --- a/sysutils/xfce4-battery-plugin/Makefile +++ b/sysutils/xfce4-battery-plugin/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.35 2015/01/04 09:35:23 dholland Exp $ +# $NetBSD: Makefile,v 1.36 2015/04/21 08:56:40 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.5.1 - -DISTNAME= xfce4-battery-plugin-${XFCE4_VERSION} -PKGREVISION= 25 +VERSION= 1.0.5 +DISTNAME= xfce4-battery-plugin-${VERSION} CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-battery-plugin/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.0/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin COMMENT= Xfce battery monitor plugin # On NetBSD/sparc64, apmvar.h is not exist in /usr/include/machine. @@ -19,8 +19,6 @@ COMMENT= Xfce battery monitor plugin PKG_FAIL_REASON+= "APM is not available on ${MACHINE_PLATFORM}." .endif -USE_TOOLS+= perl:run - .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-battery-plugin/PLIST b/sysutils/xfce4-battery-plugin/PLIST index 791ecbff42f..6ae6da48fc1 100644 --- a/sysutils/xfce4-battery-plugin/PLIST +++ b/sysutils/xfce4-battery-plugin/PLIST @@ -1,30 +1,87 @@ -@comment $NetBSD: PLIST,v 1.2 2008/12/20 09:26:51 hira Exp $ -libexec/xfce4/panel-plugins/xfce4-battery-plugin -share/icons/hicolor/16x16/devices/battery.png -share/icons/hicolor/22x22/devices/battery.png -share/icons/hicolor/24x24/devices/battery.png -share/icons/hicolor/32x32/devices/battery.png -share/icons/hicolor/scalable/devices/battery.svg +@comment $NetBSD: PLIST,v 1.3 2015/04/21 08:56:40 jperkin Exp $ +lib/xfce4/panel/plugins/libbattery.la +share/icons/hicolor/16x16/apps/xfce4-battery-critical-charging.png +share/icons/hicolor/16x16/apps/xfce4-battery-critical.png +share/icons/hicolor/16x16/apps/xfce4-battery-full-charging.png +share/icons/hicolor/16x16/apps/xfce4-battery-full.png +share/icons/hicolor/16x16/apps/xfce4-battery-low-charging.png +share/icons/hicolor/16x16/apps/xfce4-battery-low.png +share/icons/hicolor/16x16/apps/xfce4-battery-missing.png +share/icons/hicolor/16x16/apps/xfce4-battery-ok-charging.png +share/icons/hicolor/16x16/apps/xfce4-battery-ok.png +share/icons/hicolor/16x16/apps/xfce4-battery-plugin.png +share/icons/hicolor/22x22/apps/xfce4-battery-critical-charging.png +share/icons/hicolor/22x22/apps/xfce4-battery-critical.png +share/icons/hicolor/22x22/apps/xfce4-battery-full-charging.png +share/icons/hicolor/22x22/apps/xfce4-battery-full.png +share/icons/hicolor/22x22/apps/xfce4-battery-low-charging.png +share/icons/hicolor/22x22/apps/xfce4-battery-low.png +share/icons/hicolor/22x22/apps/xfce4-battery-missing.png +share/icons/hicolor/22x22/apps/xfce4-battery-ok-charging.png +share/icons/hicolor/22x22/apps/xfce4-battery-ok.png +share/icons/hicolor/22x22/apps/xfce4-battery-plugin.png +share/icons/hicolor/24x24/apps/xfce4-battery-critical-charging.png +share/icons/hicolor/24x24/apps/xfce4-battery-critical.png +share/icons/hicolor/24x24/apps/xfce4-battery-full-charging.png +share/icons/hicolor/24x24/apps/xfce4-battery-full.png +share/icons/hicolor/24x24/apps/xfce4-battery-low-charging.png +share/icons/hicolor/24x24/apps/xfce4-battery-low.png +share/icons/hicolor/24x24/apps/xfce4-battery-missing.png +share/icons/hicolor/24x24/apps/xfce4-battery-ok-charging.png +share/icons/hicolor/24x24/apps/xfce4-battery-ok.png +share/icons/hicolor/24x24/apps/xfce4-battery-plugin.png +share/icons/hicolor/32x32/apps/xfce4-battery-plugin.png +share/icons/hicolor/scalable/apps/xfce4-battery-critical-charging.svg +share/icons/hicolor/scalable/apps/xfce4-battery-critical.svg +share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg +share/icons/hicolor/scalable/apps/xfce4-battery-full.svg +share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg +share/icons/hicolor/scalable/apps/xfce4-battery-low.svg +share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg +share/icons/hicolor/scalable/apps/xfce4-battery-ok-charging.svg +share/icons/hicolor/scalable/apps/xfce4-battery-ok.svg +share/icons/hicolor/scalable/apps/xfce4-battery-plugin.svg share/locale/ar/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/bg/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/da/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/de/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/el/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/en_GB/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/fi/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/gl/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/id/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/is/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/it/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/ko/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/lt/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/lv/LC_MESSAGES/xfce4-battery-plugin.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/nn/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/pa/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-battery-plugin.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/sq/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/uk/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/ur/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/vi/LC_MESSAGES/xfce4-battery-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-battery-plugin.mo share/locale/zh_TW/LC_MESSAGES/xfce4-battery-plugin.mo -share/xfce4/panel-plugins/battmon.desktop +share/xfce4/panel/plugins/battery.desktop diff --git a/sysutils/xfce4-battery-plugin/buildlink3.mk b/sysutils/xfce4-battery-plugin/buildlink3.mk deleted file mode 100644 index e02c7ae181b..00000000000 --- a/sysutils/xfce4-battery-plugin/buildlink3.mk +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.27 2014/05/05 00:48:22 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-battery-plugin - -.if !defined(XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK) -XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-battery-plugin+= xfce4-battery-plugin>=0.5.0nb2 -BUILDLINK_ABI_DEPENDS.xfce4-battery-plugin+= xfce4-battery-plugin>=0.5.1nb24 -BUILDLINK_PKGSRCDIR.xfce4-battery-plugin?= ../../sysutils/xfce4-battery-plugin - -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-battery-plugin diff --git a/sysutils/xfce4-battery-plugin/distinfo b/sysutils/xfce4-battery-plugin/distinfo index 4a37431c51c..ea516e79eb7 100644 --- a/sysutils/xfce4-battery-plugin/distinfo +++ b/sysutils/xfce4-battery-plugin/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2010/03/22 15:46:02 joerg Exp $ +$NetBSD: distinfo,v 1.9 2015/04/21 08:56:40 jperkin Exp $ -SHA1 (xfce4-battery-plugin-0.5.1.tar.bz2) = f97c1b6445c8da07c17353ae385b5fadb2fd5f1a -RMD160 (xfce4-battery-plugin-0.5.1.tar.bz2) = ee770f06226cf8dfed95892c152ae3a2a446079a -Size (xfce4-battery-plugin-0.5.1.tar.bz2) = 227940 bytes -SHA1 (patch-aa) = 09679ad7084cd25f05d4026d22cf69f185aaf5a9 +SHA1 (xfce4-battery-plugin-1.0.5.tar.bz2) = f1748044874909e434b0d325068289d948f999d7 +RMD160 (xfce4-battery-plugin-1.0.5.tar.bz2) = 305b46ef187fa266851ebc5e3dcf7699fa0856fe +Size (xfce4-battery-plugin-1.0.5.tar.bz2) = 403505 bytes +SHA1 (patch-panel-plugin_battery.c) = 2aa4abb3b24bea30f266ee203271d27021110a4f diff --git a/sysutils/xfce4-battery-plugin/patches/patch-aa b/sysutils/xfce4-battery-plugin/patches/patch-aa deleted file mode 100644 index 53c3d342ca7..00000000000 --- a/sysutils/xfce4-battery-plugin/patches/patch-aa +++ /dev/null @@ -1,101 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2010/03/22 15:46:03 joerg Exp $ - ---- panel-plugin/battery.c.orig 2008-09-05 05:53:40.000000000 +0900 -+++ panel-plugin/battery.c 2008-11-27 22:16:05.000000000 +0900 -@@ -25,7 +25,7 @@ - #include <config.h> - #endif - --#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - #include <machine/apm_bios.h> - #elif __OpenBSD__ - #include <sys/param.h> -@@ -33,8 +33,18 @@ - #elif __NetBSD__ - #include <sys/param.h> - #include <sys/ioctl.h> -+#if defined(__sparc64__) -+/* On NetBSD/sparc64, apmvar.h is not exist in /usr/include/machine. */ -+/* Reported in PR port-sparc64/36735. */ -+#include <sparc/apmvar.h> -+#elif defined(__x86_64__) -+#include <dev/apm/apmbios.h> -+#include <dev/apm/apmio.h> -+#else - #include <machine/apmvar.h> -+#endif - #define APMDEVICE "/dev/apm" -+#define _ACPI_APM_BATT_UNKNOWN 0xffff /* from sys/dev/acpi/acpi_apm.c */ - #elif __linux__ - #include <libapm.h> - #endif -@@ -155,7 +165,7 @@ - gboolean - detect_battery_info(t_battmon *battmon) - { --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - /* This is how I read the information from the APM subsystem under - FreeBSD. Each time this functions is called (once every second) - the APM device is opened, read from and then closed. -@@ -209,7 +217,7 @@ - battmon->method = BM_BROKEN; - fd = open(APMDEVICE, O_RDONLY); - if (fd == -1) return FALSE; -- + if (ioctl(fd, APM_IOC_GETPOWER, &apm) == -1) { -+ if (ioctl(fd, APM_IOC_GETPOWER, &apm) == -1) { - close(fd); - return FALSE; - } -@@ -302,13 +312,16 @@ - battmon->method = BM_BROKEN; - fd = open(APMDEVICE, O_RDONLY); - if (fd == -1) return TRUE; -- if (ioctl(fd, APM_IOC_GETPOWER, &apminfo) == -1) -+ if (ioctl(fd, APM_IOC_GETPOWER, &apm) == -1) - return TRUE; - close(fd); - charge = apm.battery_life; - time_remaining = apm.minutes_left; - acline = apm.ac_state ? TRUE : FALSE; - -+ if(battmon->timeoutid != 0) g_source_remove(battmon->timeoutid); -+ battmon->timeoutid = g_timeout_add(2 * 1024, -+ (GSourceFunc) update_apm_status, battmon); - #else - struct apm_info apm; - DBG ("Updating battery status..."); -@@ -404,7 +417,7 @@ - acline = apm.ac_line_status ? TRUE : FALSE; - - } --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - else { - /* This is how I read the information from the APM subsystem under - FreeBSD. Each time this functions is called (once every second) -@@ -464,6 +475,11 @@ - - if(battmon->options.display_percentage && !(battmon->options.hide_when_full && acline && charge >= 99)){ - gtk_widget_show((GtkWidget *)battmon->charge); -+#if defined(__NetBSD__) || defined(__OpenBSD__) -+ if (apm.battery_state == APM_BATT_ABSENT) -+ g_snprintf(buffer, sizeof(buffer),"--%% "); -+ else -+#endif - g_snprintf(buffer, sizeof(buffer),"%d%% ", charge); - gtk_label_set_text(battmon->charge,buffer); - } else { -@@ -481,6 +501,11 @@ - } - - gtk_widget_show((GtkWidget *)active_label); -+#if defined(__NetBSD__) -+ if (acline || time_remaining == _ACPI_APM_BATT_UNKNOWN) -+ g_snprintf(buffer, sizeof(buffer), "--:--"); -+ else -+#endif - g_snprintf(buffer, sizeof(buffer),"%02d:%02d ",time_remaining/60,time_remaining%60); - gtk_label_set_text(active_label,buffer); - diff --git a/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c b/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c new file mode 100644 index 00000000000..cc130cadfba --- /dev/null +++ b/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c @@ -0,0 +1,63 @@ +$NetBSD: patch-panel-plugin_battery.c,v 1.1 2015/04/21 08:56:40 jperkin Exp $ + +Fix for NetBSD. +--- panel-plugin/battery.c.orig 2012-06-17 20:05:17.000000000 +0000 ++++ panel-plugin/battery.c +@@ -30,8 +30,16 @@ + #elif (defined(__OpenBSD__) || defined(__NetBSD__)) + #include <sys/param.h> + #include <sys/ioctl.h> ++#if defined(__sparc64__) ++#include <sparc/apmvar.h> ++#elif defined(__x86_64__) ++#include <dev/apm/apmbios.h> ++#include <dev/apm/apmio.h> ++#else + #include <machine/apmvar.h> ++#endif + #define APMDEVICE "/dev/apm" ++#define _ACPI_APM_BATT_UNKNOWN 0xffff /* from sys/dev/acpi/acpi_apm.c */ + #elif __linux__ + #include <libapm.h> + #endif +@@ -172,7 +180,7 @@ init_options(t_battmon_options *options) + gboolean + detect_battery_info(t_battmon *battmon) + { +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) + /* This is how I read the information from the APM subsystem under + FreeBSD. Each time this functions is called (once every second) + the APM device is opened, read from and then closed. +@@ -411,7 +419,7 @@ update_apm_status(t_battmon *battmon) + acline = apm.ac_line_status ? TRUE : FALSE; + + } +-#elif __FreeBSD__ ++#elif defined(__FreeBSD__) || defined(__DragonFly__) + else { + /* This is how I read the information from the APM subsystem under + FreeBSD. Each time this functions is called (once every second) +@@ -510,6 +518,11 @@ battmon.c:241: for each function it appe + if(battmon->options.display_percentage && charge > 0 && !(battmon->options.hide_when_full && acline && charge >= 99)){ + gtk_widget_show(GTK_WIDGET(battmon->charge)); + gtk_widget_show(GTK_WIDGET(battmon->timechargealignment)); ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (apm.battery_state == APM_BATT_ABSENT) ++ g_snprintf(buffer, sizeof(buffer), "--%%"); ++ else ++#endif + g_snprintf(buffer, sizeof(buffer),"%d%% ", charge); + gtk_label_set_text(battmon->charge,buffer); + } else { +@@ -519,6 +532,10 @@ battmon.c:241: for each function it appe + if (battmon->options.display_time && time_remaining > 0 && !(battmon->options.hide_when_full && acline && charge >= 99 )){ + gtk_widget_show(GTK_WIDGET(battmon->rtime)); + gtk_widget_show(GTK_WIDGET(battmon->timechargealignment)); ++#if defined(__NetBSD__) ++ if (acline || time_remaining == _ACPI_APM_BATT_UNKNOWN) ++ g_snprintf(buffer, sizeof(buffer), "--:--"); ++#endif + g_snprintf(buffer, sizeof(buffer),"%02d:%02d ",time_remaining/60,time_remaining%60); + gtk_label_set_text(battmon->rtime,buffer); + diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile index 8b421db740a..cb3367f3f0d 100644 --- a/sysutils/xfce4-cpugraph-plugin/Makefile +++ b/sysutils/xfce4-cpugraph-plugin/Makefile @@ -1,21 +1,14 @@ -# $NetBSD: Makefile,v 1.34 2014/05/05 00:48:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.35 2015/04/21 08:56:40 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.3.0 - -DISTNAME= xfce4-cpugraph-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-cpugraph-plugin-1.0.5 CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-cpugraph-plugin/ -COMMENT= Xfce CPU load plugin - -USE_TOOLS+= autoconf +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/ -.include "../../mk/bsd.prefs.mk" - -pre-configure: - cd ${WRKSRC} && autoconf +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin +COMMENT= Xfce CPU load plugin +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-cpugraph-plugin/PLIST b/sysutils/xfce4-cpugraph-plugin/PLIST index 50fd1123437..159cacc97d7 100644 --- a/sysutils/xfce4-cpugraph-plugin/PLIST +++ b/sysutils/xfce4-cpugraph-plugin/PLIST @@ -1,3 +1,48 @@ -@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:13 martti Exp $ -libexec/xfce4/panel-plugins/xfce4-cpugraph-plugin -share/xfce4/panel-plugins/cpugraph.desktop +@comment $NetBSD: PLIST,v 1.4 2015/04/21 08:56:40 jperkin Exp $ +lib/xfce4/panel/plugins/libcpugraph.la +share/icons/hicolor/16x16/apps/xfce4-cpugraph-plugin.png +share/icons/hicolor/22x22/apps/xfce4-cpugraph-plugin.png +share/icons/hicolor/48x48/apps/xfce4-cpugraph-plugin.png +share/locale/ar/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/be/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/ca/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/cs/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/de/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/eu/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/fr/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/gl/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/ko/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/ku/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/lt/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/pa/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/pl/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/ro/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/uk/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-cpugraph-plugin.mo +share/xfce4/panel/plugins/cpugraph.desktop diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk deleted file mode 100644 index 596f8e78cb2..00000000000 --- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.37 2014/05/05 00:48:22 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-cpugraph-plugin - -.if !defined(XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK) -XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+= xfce4-cpugraph-plugin>=0.3.0 -BUILDLINK_ABI_DEPENDS.xfce4-cpugraph-plugin+= xfce4-cpugraph-plugin>=0.3.0nb21 -BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?= ../../sysutils/xfce4-cpugraph-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-cpugraph-plugin diff --git a/sysutils/xfce4-cpugraph-plugin/distinfo b/sysutils/xfce4-cpugraph-plugin/distinfo index f97c49075cb..a523851f569 100644 --- a/sysutils/xfce4-cpugraph-plugin/distinfo +++ b/sysutils/xfce4-cpugraph-plugin/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.9 2007/04/17 13:05:08 joerg Exp $ +$NetBSD: distinfo,v 1.10 2015/04/21 08:56:40 jperkin Exp $ -SHA1 (xfce4-cpugraph-plugin-0.3.0.tar.bz2) = d869625350d6c0ae4bef3203f03bbc409773494f -RMD160 (xfce4-cpugraph-plugin-0.3.0.tar.bz2) = 99c309b3bf0ab622a9b95df9b568808a6c034055 -Size (xfce4-cpugraph-plugin-0.3.0.tar.bz2) = 102638 bytes -SHA1 (patch-aa) = fac9f1ac080540eb90291a73a718ea09040a7ff5 -SHA1 (patch-ab) = 0a566fd969a3359d709001728edcaa736f5d8776 -SHA1 (patch-ad) = a989f0ed1b91d2e1fbc61fa623b989d371be80e0 +SHA1 (xfce4-cpugraph-plugin-1.0.5.tar.bz2) = 6286bcb91eb88a77e7d8965e80c0999a03afc2ae +RMD160 (xfce4-cpugraph-plugin-1.0.5.tar.bz2) = 73494015fa2be1f6596dcafbd8c3fc2865196faa +Size (xfce4-cpugraph-plugin-1.0.5.tar.bz2) = 328972 bytes +SHA1 (patch-panel-plugin_os.c) = 53e9d414cf4be213ebb907672af0d5f6e977ee76 diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-aa b/sysutils/xfce4-cpugraph-plugin/patches/patch-aa deleted file mode 100644 index cc081662e28..00000000000 --- a/sysutils/xfce4-cpugraph-plugin/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2007/04/17 13:05:08 joerg Exp $ - ---- configure.ac.orig 2007-04-17 12:26:04.000000000 +0000 -+++ configure.ac -@@ -29,6 +29,9 @@ AC_PROG_INTLTOOL - dnl Check for standard header files - AC_HEADER_STDC - -+dnl *** Check for kinfo, needed for DragonFly *** -+AC_CHECK_LIB([kinfo], [kinfo_get_sched_cputime]) -+ - dnl configure the panel plugin - XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) - diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-ab b/sysutils/xfce4-cpugraph-plugin/patches/patch-ab deleted file mode 100644 index 75454ac035e..00000000000 --- a/sysutils/xfce4-cpugraph-plugin/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2007/04/17 13:05:08 joerg Exp $ - ---- panel-plugin/os.c.orig 2004-07-24 17:25:15.000000000 +0000 -+++ panel-plugin/os.c -@@ -67,6 +67,26 @@ long GetCPUUsage (int *oldusage, int *ol - - return usage; - } -+#elif defined(__DragonFly__) -+long GetCPUUsage (int *oldusage, int *oldtotal) -+{ -+ long used, total, usage; -+ struct kinfo_cputime cp_time; -+ -+ if (kinfo_get_sched_cputime(&cp_time) < 0) { -+ printf ("kinfo_get_sched_cputime failed"); -+ return -1; -+ } -+ used = cp_time.cp_user + cp_time.cp_nice + cp_time.cp_sys; -+ total = used + cp_time.cp_idle; -+ if (total != *oldtotal) -+ usage = 100 * (used - *oldusage + used / 2 - *oldusage / 2) / (total - *oldtotal); -+ else -+ usage = 0; -+ *oldusage = used; -+ *oldtotal = total; -+ return usage; -+} - #elif defined (__NetBSD__) - long GetCPUUsage (int *oldusage, int *oldtotal) - { diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-ad b/sysutils/xfce4-cpugraph-plugin/patches/patch-ad deleted file mode 100644 index 1a3977c2df2..00000000000 --- a/sysutils/xfce4-cpugraph-plugin/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2007/04/12 09:55:13 martti Exp $ - ---- panel-plugin/os.h.orig 2007-01-20 12:05:51.000000000 +0000 -+++ panel-plugin/os.h -@@ -17,6 +17,10 @@ - #include <nlist.h> - #endif - -+#if defined(__DragonFly__) -+#include <kinfo.h> -+#endif -+ - #if defined (__NetBSD__) - #include <sys/param.h> - #include <sys/sched.h> diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-panel-plugin_os.c b/sysutils/xfce4-cpugraph-plugin/patches/patch-panel-plugin_os.c new file mode 100644 index 00000000000..082ba2b2e81 --- /dev/null +++ b/sysutils/xfce4-cpugraph-plugin/patches/patch-panel-plugin_os.c @@ -0,0 +1,14 @@ +$NetBSD: patch-panel-plugin_os.c,v 1.1 2015/04/21 08:56:40 jperkin Exp $ + +Fix NetBSD support. +--- panel-plugin/os.c.orig 2012-04-18 21:27:33.000000000 +0000 ++++ panel-plugin/os.c +@@ -211,7 +211,7 @@ gboolean read_cpu_data( CpuData *data, g + data[0].load = 0; + for( i = 1 ; i <= nb_cpu ; i++ ) + { +- cp_time1 = cp_time + CPUSTATE * (i - 1); ++ cp_time1 = cp_time + CPUSTATES * (i - 1); + used = cp_time1[CP_USER] + cp_time1[CP_NICE] + cp_time1[CP_SYS] + cp_time1[CP_INTR]; + total = used + cp_time1[CP_IDLE]; + diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile index 353f9d74a60..2c73473f469 100644 --- a/sysutils/xfce4-diskperf-plugin/Makefile +++ b/sysutils/xfce4-diskperf-plugin/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.38 2014/05/05 00:48:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.39 2015/04/21 08:56:40 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 2.1.0 - -DISTNAME= xfce4-diskperf-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-diskperf-plugin-2.5.4 CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-diskperf-plugin/ -COMMENT= Xfce disk performance plugin +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.5/ -ONLY_FOR_PLATFORM+= NetBSD-*-* -ONLY_FOR_PLATFORM+= Linux-*-* +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin +COMMENT= Xfce disk performance plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-diskperf-plugin/PLIST b/sysutils/xfce4-diskperf-plugin/PLIST index 961ec8334d8..d5b5d99d5fa 100644 --- a/sysutils/xfce4-diskperf-plugin/PLIST +++ b/sysutils/xfce4-diskperf-plugin/PLIST @@ -1,8 +1,39 @@ -@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:13 martti Exp $ -libexec/xfce4/panel-plugins/xfce4-diskperf-plugin +@comment $NetBSD: PLIST,v 1.4 2015/04/21 08:56:40 jperkin Exp $ +lib/xfce4/panel/plugins/libdiskperf.la +share/locale/ar/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-diskperf-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-diskperf-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/de/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-diskperf-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-diskperf-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/gl/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/ko/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/lt/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/pa/LC_MESSAGES/xfce4-diskperf-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-diskperf-plugin.mo -share/xfce4/panel-plugins/diskperf.desktop +share/locale/pt/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/uk/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/xfce4/panel/plugins/diskperf.desktop diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk deleted file mode 100644 index 92d81441c3b..00000000000 --- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.38 2014/05/05 00:48:22 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-diskperf-plugin - -.if !defined(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK) -XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=2.1.0 -BUILDLINK_ABI_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=2.1.0nb21 -BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?= ../../sysutils/xfce4-diskperf-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-diskperf-plugin diff --git a/sysutils/xfce4-diskperf-plugin/distinfo b/sysutils/xfce4-diskperf-plugin/distinfo index 52329182cd2..5d3568975d0 100644 --- a/sysutils/xfce4-diskperf-plugin/distinfo +++ b/sysutils/xfce4-diskperf-plugin/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2007/04/12 09:55:13 martti Exp $ +$NetBSD: distinfo,v 1.7 2015/04/21 08:56:40 jperkin Exp $ -SHA1 (xfce4-diskperf-plugin-2.1.0.tar.bz2) = 66db93af32f4a3ca0ce931fed312b267a3a3dece -RMD160 (xfce4-diskperf-plugin-2.1.0.tar.bz2) = 7e66634d48499dc9be777580ac48e66c9e51039b -Size (xfce4-diskperf-plugin-2.1.0.tar.bz2) = 183492 bytes -SHA1 (patch-aa) = 86a3cabe41c9470716f82000e41e6d9b64f6d372 +SHA1 (xfce4-diskperf-plugin-2.5.4.tar.bz2) = fc74484b986eac9d98b050c5a98130e8a9671048 +RMD160 (xfce4-diskperf-plugin-2.5.4.tar.bz2) = 18d7be932d15bbec28810b822386df6a00285ae5 +Size (xfce4-diskperf-plugin-2.5.4.tar.bz2) = 321974 bytes +SHA1 (patch-panel-plugin_devperf.c) = 77c02a425cf525607bacb9b55d0238eb5b110067 diff --git a/sysutils/xfce4-diskperf-plugin/patches/patch-aa b/sysutils/xfce4-diskperf-plugin/patches/patch-aa deleted file mode 100644 index 9052518ce94..00000000000 --- a/sysutils/xfce4-diskperf-plugin/patches/patch-aa +++ /dev/null @@ -1,84 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:13 martti Exp $ - ---- panel-plugin/devperf.c.orig 2003-11-30 12:58:54.000000000 +0200 -+++ panel-plugin/devperf.c 2006-07-02 10:05:44.000000000 +0300 -@@ -264,21 +264,39 @@ - const char *device = (const char *) p_pvDevice; - struct timeval tv; - size_t size, i, ndrives; -+#ifdef HW_DISKSTATS - struct disk_sysctl *drives, drive; -+#else -+ struct io_sysctl *drives, drive; -+#endif - int mib[3]; - - mib[0] = CTL_HW; -+#ifdef HW_DISKSTATS - mib[1] = HW_DISKSTATS; - mib[2] = sizeof(struct disk_sysctl); -+#else -+ mib[1] = HW_IOSTATS; -+ mib[2] = sizeof(struct io_sysctl); -+#endif -+ - if (sysctl(mib, 3, NULL, &size, NULL, 0) == -1) - return(-1); -+#ifdef HW_DISKSTATS - ndrives = size / sizeof(struct disk_sysctl); -+#else -+ ndrives = size / sizeof(struct io_sysctl); -+#endif - drives = malloc(size); - if (sysctl(mib, 3, drives, &size, NULL, 0) == -1) - return(-1); - - for (i = 0; i < ndrives; i++) { -+#ifdef HW_DISKSTATS - if (strcmp(drives[i].dk_name, device) == 0) { -+#else -+ if (strcmp(drives[i].name, device) == 0) { -+#endif - drive = drives[i]; - break; - } -@@ -292,13 +310,18 @@ - gettimeofday (&tv, 0); - perf->timestamp_ns = (uint64_t)1000ull * 1000ull * 1000ull * - tv.tv_sec + 1000ull * tv.tv_usec; --#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000) -+#ifdef HW_DISKSTATS -+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000) - /* NetBSD < 1.6K does not have separate read/write statistics. */ - perf->rbytes = drive.dk_bytes; - perf->wbytes = drive.dk_bytes; --#else -+# else - perf->rbytes = drive.dk_rbytes; - perf->wbytes = drive.dk_wbytes; -+# endif -+#else -+ perf->rbytes = drive.rbytes; -+ perf->wbytes = drive.wbytes; - #endif - - /* -@@ -306,10 +329,18 @@ - * time separatly. - * -- Benedikt - */ -+#ifdef HW_DISKSTATS - perf->qlen = drive.dk_xfer; - perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.dk_time_sec - + 1000ull * drive.dk_time_usec) / 2ull; - perf->wbusy_ns = perf->rbusy_ns; -+#else -+ perf->qlen = drive.xfer; -+ perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.time_sec -+ + 1000ull * drive.time_usec) / 2ull; -+ perf->wbusy_ns = perf->rbusy_ns; -+ -+#endif - - return(0); - } diff --git a/sysutils/xfce4-diskperf-plugin/patches/patch-panel-plugin_devperf.c b/sysutils/xfce4-diskperf-plugin/patches/patch-panel-plugin_devperf.c new file mode 100644 index 00000000000..420757ed6e8 --- /dev/null +++ b/sysutils/xfce4-diskperf-plugin/patches/patch-panel-plugin_devperf.c @@ -0,0 +1,179 @@ +$NetBSD: patch-panel-plugin_devperf.c,v 1.1 2015/04/21 08:56:40 jperkin Exp $ + +Add FreeBSD support and fix NetBSD support. +--- panel-plugin/devperf.c.orig 2015-02-09 23:25:33.000000000 +0000 ++++ panel-plugin/devperf.c +@@ -225,6 +225,93 @@ int main () + + /************************** Linux End ***************/ + ++#elif defined(__FreeBSD__) ++ ++#include <sys/disk.h> ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#include <sys/types.h> ++#include <sys/errno.h> ++#include <sys/resource.h> ++#include <sys/time.h> ++#include <devstat.h> ++#include <fcntl.h> ++#include <limits.h> ++#include <string.h> ++#include <syslog.h> ++#include <stdarg.h> ++ ++#define MAXNAMELEN 256 ++ ++struct statinfo stats; ++struct devinfo dinfo; ++ ++int DevPerfInit () ++{ ++ stats.dinfo = &dinfo; ++ ++ return (0); ++} ++ ++int DevCheckStatAvailability(char const **strptr) ++{ ++ return (0); ++} ++ ++int DevGetPerfData (const void *p_pvDevice, struct devperf_t *perf) ++{ ++ struct timeval tv; ++ struct timespec ts; ++ struct devstat dev; ++ kvm_t *kd = NULL; ++ int i, found = 0; ++ char *check_dev = (char *) p_pvDevice; ++ ++ if(devstat_getdevs(kd, &stats) == -1) { ++ syslog(0, "DISKPERF: getdevs fail"); ++ } ++ ++ for(found = 0, i = 0; i < (stats.dinfo)->numdevs; i++) { ++ char dev_name[MAXNAMELEN]; ++ dev = (stats.dinfo)->devices[i]; ++ snprintf(dev_name, MAXNAMELEN-1, "%s%d", ++ dev.device_name, dev.unit_number); ++ if ((check_dev != NULL) && (strcmp(check_dev, dev_name) != 0)) ++ continue; ++ else { ++ found = 1; ++ break; ++ } ++ ++ } ++ ++ if(check_dev != NULL && found) { ++ perf->wbytes = dev.bytes[DEVSTAT_WRITE]; ++ perf->rbytes = dev.bytes[DEVSTAT_READ]; ++ gettimeofday (&tv, 0); ++ perf->timestamp_ns = (uint64_t)1000ull * 1000ull * 1000ull * ++ tv.tv_sec + 1000ull * tv.tv_usec; ++ perf->qlen = dev.start_count - dev.end_count; ++ // I'm not sure about rbusy and wbusy calculation ++ bintime2timespec(&dev.busy_time, &ts); ++ perf->rbusy_ns = (uint64_t) ts.tv_nsec; ++ perf->wbusy_ns = perf->rbusy_ns; ++ } ++ ++ return (0); ++} ++ ++#if 0 /* Standalone test purpose */ ++int main () ++{ ++ struct devperf_t oPerf; ++ DevGetPerfData ((void*)"ada0", &oPerf); ++ printf ("%lu\t%lu\n", oPerf.rbytes, oPerf.wbytes); ++ return (0); ++} ++#endif ++ ++ + + #elif defined(__NetBSD__) + /**************************************************************/ +@@ -251,21 +338,39 @@ int DevGetPerfData (const void *p_pvDevi + const char *device = (const char *) p_pvDevice; + struct timeval tv; + size_t size, i, ndrives; ++#ifdef HW_DISKSTATS + struct disk_sysctl *drives, drive; ++#else ++ struct io_sysctl *drives, drive; ++#endif + int mib[3]; + + mib[0] = CTL_HW; ++#ifdef HW_DISKSTATS + mib[1] = HW_DISKSTATS; + mib[2] = sizeof(struct disk_sysctl); ++#else ++ mib[1] = HW_IOSTATS; ++ mib[2] = sizeof(struct io_sysctl); ++#endif ++ + if (sysctl(mib, 3, NULL, &size, NULL, 0) == -1) + return(-1); ++#ifdef HW_DISKSTATS + ndrives = size / sizeof(struct disk_sysctl); ++#else ++ ndrives = size / sizeof(struct io_sysctl); ++#endif + drives = malloc(size); + if (sysctl(mib, 3, drives, &size, NULL, 0) == -1) + return(-1); + + for (i = 0; i < ndrives; i++) { ++#ifdef HW_DISKSTATS + if (strcmp(drives[i].dk_name, device) == 0) { ++#else ++ if (strcmp(drives[i].name, device) == 0) { ++#endif + drive = drives[i]; + break; + } +@@ -279,13 +384,18 @@ int DevGetPerfData (const void *p_pvDevi + gettimeofday (&tv, 0); + perf->timestamp_ns = (uint64_t)1000ull * 1000ull * 1000ull * + tv.tv_sec + 1000ull * tv.tv_usec; +-#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000) ++#ifdef HW_DISKSTATS ++# if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000) + /* NetBSD < 1.6K does not have separate read/write statistics. */ + perf->rbytes = drive.dk_bytes; + perf->wbytes = drive.dk_bytes; +-#else ++# else + perf->rbytes = drive.dk_rbytes; + perf->wbytes = drive.dk_wbytes; ++# endif ++#else ++ perf->rbytes = drive.rbytes; ++ perf->wbytes = drive.wbytes; + #endif + + /* +@@ -293,10 +403,18 @@ int DevGetPerfData (const void *p_pvDevi + * time separatly. + * -- Benedikt + */ ++#ifdef HW_DISKSTATS + perf->qlen = drive.dk_xfer; + perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.dk_time_sec + + 1000ull * drive.dk_time_usec) / 2ull; + perf->wbusy_ns = perf->rbusy_ns; ++#else ++ perf->qlen = drive.xfer; ++ perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.time_sec ++ + 1000ull * drive.time_usec) / 2ull; ++ perf->wbusy_ns = perf->rbusy_ns; ++ ++#endif + + return(0); + } diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile index e6e1fc39a05..87e830e312c 100644 --- a/sysutils/xfce4-fsguard-plugin/Makefile +++ b/sysutils/xfce4-fsguard-plugin/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.31 2014/05/05 00:48:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.32 2015/04/21 08:56:40 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.4.0 - -DISTNAME= xfce4-fsguard-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-fsguard-plugin-1.0.1 CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-fsguard-plugin/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.0/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin COMMENT= Xfce disk space plugin .include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-fsguard-plugin/PLIST b/sysutils/xfce4-fsguard-plugin/PLIST index c1bdcc4f766..241702d9f9a 100644 --- a/sysutils/xfce4-fsguard-plugin/PLIST +++ b/sysutils/xfce4-fsguard-plugin/PLIST @@ -1,29 +1,64 @@ -@comment $NetBSD: PLIST,v 1.4 2007/12/05 07:49:44 martti Exp $ -libexec/xfce4/panel-plugins/xfce4-fsguard-plugin +@comment $NetBSD: PLIST,v 1.5 2015/04/21 08:56:40 jperkin Exp $ +lib/xfce4/panel/plugins/libfsguard.la +share/icons/hicolor/16x16/apps/xfce4-fsguard-plugin-urgent.png +share/icons/hicolor/16x16/apps/xfce4-fsguard-plugin-warning.png +share/icons/hicolor/16x16/apps/xfce4-fsguard-plugin.png +share/icons/hicolor/22x22/apps/xfce4-fsguard-plugin-urgent.png +share/icons/hicolor/22x22/apps/xfce4-fsguard-plugin-warning.png +share/icons/hicolor/22x22/apps/xfce4-fsguard-plugin.png +share/icons/hicolor/24x24/apps/xfce4-fsguard-plugin-urgent.png +share/icons/hicolor/24x24/apps/xfce4-fsguard-plugin-warning.png +share/icons/hicolor/24x24/apps/xfce4-fsguard-plugin.png share/icons/hicolor/32x32/apps/xfce4-fsguard-plugin-urgent.png share/icons/hicolor/32x32/apps/xfce4-fsguard-plugin-warning.png share/icons/hicolor/32x32/apps/xfce4-fsguard-plugin.png +share/icons/hicolor/36x36/apps/xfce4-fsguard-plugin-urgent.png +share/icons/hicolor/36x36/apps/xfce4-fsguard-plugin-warning.png +share/icons/hicolor/36x36/apps/xfce4-fsguard-plugin.png +share/icons/hicolor/48x48/apps/xfce4-fsguard-plugin-urgent.png +share/icons/hicolor/48x48/apps/xfce4-fsguard-plugin-warning.png +share/icons/hicolor/48x48/apps/xfce4-fsguard-plugin.png share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin-urgent.svg share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin-warning.svg share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg +share/locale/ar/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/de/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/en_GB/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/gl/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/ja/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/ko/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/lt/LC_MESSAGES/xfce4-fsguard-plugin.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/pa/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-fsguard-plugin.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/sq/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/sv/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/uk/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/vi/LC_MESSAGES/xfce4-fsguard-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-fsguard-plugin.mo share/locale/zh_TW/LC_MESSAGES/xfce4-fsguard-plugin.mo -share/xfce4/panel-plugins/fsguard.desktop +share/xfce4/panel/plugins/fsguard.desktop diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk deleted file mode 100644 index 9107cf635f8..00000000000 --- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.35 2014/05/05 00:48:22 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-fsguard-plugin - -.if !defined(XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK) -XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+= xfce4-fsguard-plugin>=0.4.0 -BUILDLINK_ABI_DEPENDS.xfce4-fsguard-plugin+= xfce4-fsguard-plugin>=0.4.0nb21 -BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?= ../../sysutils/xfce4-fsguard-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-fsguard-plugin diff --git a/sysutils/xfce4-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo index 5f62928b853..d1e05d1cafc 100644 --- a/sysutils/xfce4-fsguard-plugin/distinfo +++ b/sysutils/xfce4-fsguard-plugin/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2007/12/05 07:49:44 martti Exp $ +$NetBSD: distinfo,v 1.7 2015/04/21 08:56:40 jperkin Exp $ -SHA1 (xfce4-fsguard-plugin-0.4.0.tar.bz2) = d00470b1d9e4ad1c529830b6c5fee3e422fb4677 -RMD160 (xfce4-fsguard-plugin-0.4.0.tar.bz2) = b25bf0f7487efd6aabbe697be7ba004bd7a8cf10 -Size (xfce4-fsguard-plugin-0.4.0.tar.bz2) = 169519 bytes -SHA1 (patch-aa) = 523b8632e5a84b2fd62980cba3f990be1cade007 +SHA1 (xfce4-fsguard-plugin-1.0.1.tar.bz2) = 42b7aecafd720bb1dcf37a5efd0deb3db528e3bc +RMD160 (xfce4-fsguard-plugin-1.0.1.tar.bz2) = d830ad9543138216f66be9721b217e1ccb61bda5 +Size (xfce4-fsguard-plugin-1.0.1.tar.bz2) = 356783 bytes +SHA1 (patch-panel-plugin_fsguard.c) = 9ecbaec359192a2b5ad36bfae6830f5ba2a513a3 diff --git a/sysutils/xfce4-fsguard-plugin/patches/patch-aa b/sysutils/xfce4-fsguard-plugin/patches/patch-aa deleted file mode 100644 index f0b1329d117..00000000000 --- a/sysutils/xfce4-fsguard-plugin/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2007/12/05 07:49:44 martti Exp $ - ---- panel-plugin/fsguard.c.orig 2007-10-20 20:49:18.000000000 +0000 -+++ panel-plugin/fsguard.c 2007-12-05 06:41:00.000000000 +0000 -@@ -40,10 +40,13 @@ - #include <sys/stat.h> - #if defined(__linux__) - #include <sys/vfs.h> --#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - #include <sys/param.h> - #include <sys/mount.h> - #endif -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900) /* NetBSD 2.99.9 */ -+#define statfs statvfs -+#endif - - #include <gtk/gtk.h> - #include <libxfce4util/libxfce4util.h> diff --git a/sysutils/xfce4-fsguard-plugin/patches/patch-panel-plugin_fsguard.c b/sysutils/xfce4-fsguard-plugin/patches/patch-panel-plugin_fsguard.c new file mode 100644 index 00000000000..9f41a1c793e --- /dev/null +++ b/sysutils/xfce4-fsguard-plugin/patches/patch-panel-plugin_fsguard.c @@ -0,0 +1,26 @@ +$NetBSD: patch-panel-plugin_fsguard.c,v 1.1 2015/04/21 08:56:40 jperkin Exp $ + +Fix NetBSD support. +Add SunOS, OS X and DragonFlyBSD support. +--- panel-plugin/fsguard.c.orig 2012-06-30 09:07:55.000000000 +0000 ++++ panel-plugin/fsguard.c +@@ -38,13 +38,18 @@ + #include <string.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <sys/statvfs.h> + #if defined(__linux__) || defined(__GNU__) + #include <sys/vfs.h> +-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) ++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__DragonFly__) + #include <sys/param.h> + #include <sys/mount.h> + #endif + ++#if defined(__NetBSD__) || defined(__sun) ++#define statfs statvfs ++#endif ++ + #include <gtk/gtk.h> + #include <libxfce4util/libxfce4util.h> + #include <libxfce4ui/libxfce4ui.h> diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile index 0456b5bb8e2..3939a84b906 100644 --- a/sysutils/xfce4-genmon-plugin/Makefile +++ b/sysutils/xfce4-genmon-plugin/Makefile @@ -1,14 +1,17 @@ -# $NetBSD: Makefile,v 1.24 2014/05/05 00:48:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.25 2015/04/21 08:56:40 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 3.1 - -DISTNAME= xfce4-genmon-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +VERSION= 3.4 +DISTNAME= xfce4-genmon-plugin-${VERSION}.0 +PKGNAME= xfce4-genmon-plugin-${VERSION} CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-genmon-plugin/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-genmon-plugin/3.4/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin COMMENT= Xfce general purpose monitor plugin +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} + .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-genmon-plugin/PLIST b/sysutils/xfce4-genmon-plugin/PLIST index 666a6a314e7..4c7ae5128e6 100644 --- a/sysutils/xfce4-genmon-plugin/PLIST +++ b/sysutils/xfce4-genmon-plugin/PLIST @@ -1,6 +1,38 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ -libexec/xfce4/panel-plugins/xfce4-genmon-plugin +@comment $NetBSD: PLIST,v 1.2 2015/04/21 08:56:40 jperkin Exp $ +lib/xfce4/panel/plugins/libgenmon.la +share/locale/ar/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ca/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/de/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/eu/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/gl/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ko/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-genmon-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-genmon-plugin.mo -share/xfce4/panel-plugins/genmon.desktop +share/locale/pt/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/uk/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-genmon-plugin.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-genmon-plugin.mo +share/xfce4/panel/plugins/genmon.desktop diff --git a/sysutils/xfce4-genmon-plugin/buildlink3.mk b/sysutils/xfce4-genmon-plugin/buildlink3.mk deleted file mode 100644 index c1e9a5a0721..00000000000 --- a/sysutils/xfce4-genmon-plugin/buildlink3.mk +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.25 2014/05/05 00:48:22 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-genmon-plugin - -.if !defined(XFCE4_GENMON_PLUGIN_BUILDLINK3_MK) -XFCE4_GENMON_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-genmon-plugin+= xfce4-genmon-plugin>=3.1 -BUILDLINK_ABI_DEPENDS.xfce4-genmon-plugin+= xfce4-genmon-plugin>=3.1nb21 -BUILDLINK_PKGSRCDIR.xfce4-genmon-plugin?= ../../sysutils/xfce4-genmon-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_GENMON_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-genmon-plugin diff --git a/sysutils/xfce4-genmon-plugin/distinfo b/sysutils/xfce4-genmon-plugin/distinfo index aa224c2134d..fe1470d4fe9 100644 --- a/sysutils/xfce4-genmon-plugin/distinfo +++ b/sysutils/xfce4-genmon-plugin/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ +$NetBSD: distinfo,v 1.2 2015/04/21 08:56:40 jperkin Exp $ -SHA1 (xfce4-genmon-plugin-3.1.tar.bz2) = afec76670999efd8a17db791451aa26bf62ce58d -RMD160 (xfce4-genmon-plugin-3.1.tar.bz2) = 7b082dd130a889e17e9f1c9ab30dca6cea34502c -Size (xfce4-genmon-plugin-3.1.tar.bz2) = 117704 bytes +SHA1 (xfce4-genmon-plugin-3.4.0.tar.bz2) = 6c249521394ee97704f2d10d0b5dd18bbb171f64 +RMD160 (xfce4-genmon-plugin-3.4.0.tar.bz2) = 9198decdcc9918ae068292e7bf98bfeb04d70a1f +Size (xfce4-genmon-plugin-3.4.0.tar.bz2) = 307493 bytes +SHA1 (patch-panel-plugin_cmdspawn.c) = 7611155db0de99ba45a6d8e94b94b75e8cac8c96 diff --git a/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c b/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c new file mode 100644 index 00000000000..ea6f1d9b305 --- /dev/null +++ b/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c @@ -0,0 +1,92 @@ +$NetBSD: patch-panel-plugin_cmdspawn.c,v 1.1 2015/04/21 08:56:40 jperkin Exp $ + +Fix SunOS build. +--- panel-plugin/cmdspawn.c.orig 2012-05-10 02:09:21.000000000 +0000 ++++ panel-plugin/cmdspawn.c +@@ -12,7 +12,7 @@ + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * but WITHGENMON_OUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + +@@ -59,12 +59,12 @@ char *genmon_Spawn (char **argv, int wai + /* Spawn a command and capture its output from stdout or stderr */ + /* Return allocated string on success, otherwise NULL */ + { +- enum { OUT, ERR, OUT_ERR }; ++ enum { GENMON_OUT, GENMON_ERR, GENMON_OUT_ERR }; + enum { RD, WR, RD_WR }; + +- int aaiPipe[OUT_ERR][RD_WR]; ++ int aaiPipe[GENMON_OUT_ERR][RD_WR]; + pid_t pid; +- struct pollfd aoPoll[OUT_ERR]; ++ struct pollfd aoPoll[GENMON_OUT_ERR]; + int status; + int i, j, k; + char *str = NULL; +@@ -73,19 +73,19 @@ char *genmon_Spawn (char **argv, int wai + fprintf (stderr, "Spawn() error: No parameters passed!\n"); + return (NULL); + } +- for (i = 0; i < OUT_ERR; i++) ++ for (i = 0; i < GENMON_OUT_ERR; i++) + pipe (aaiPipe[i]); + switch (pid = fork ()) { + case -1: + perror ("fork()"); +- for (i = 0; i < OUT_ERR; i++) ++ for (i = 0; i < GENMON_OUT_ERR; i++) + for (j = 0; j < RD_WR; j++) + close (aaiPipe[i][j]); + return (NULL); + case 0: + close(0); /* stdin is not used in child */ + /* Redirect stdout/stderr to associated pipe's write-ends */ +- for (i = 0; i < OUT_ERR; i++) { ++ for (i = 0; i < GENMON_OUT_ERR; i++) { + j = i + 1; // stdout/stderr file descriptor + close (j); + k = dup2 (aaiPipe[i][WR], j); +@@ -100,7 +100,7 @@ char *genmon_Spawn (char **argv, int wai + exit (-1); + } + +- for (i = 0; i < OUT_ERR; i++) ++ for (i = 0; i < GENMON_OUT_ERR; i++) + close (aaiPipe[i][WR]); /* close write end of pipes in parent */ + + /* Wait for child completion */ +@@ -113,16 +113,16 @@ char *genmon_Spawn (char **argv, int wai + } + + /* Read stdout/stderr pipes' read-ends */ +- for (i = 0; i < OUT_ERR; i++) { ++ for (i = 0; i < GENMON_OUT_ERR; i++) { + aoPoll[i].fd = aaiPipe[i][RD]; + aoPoll[i].events = POLLIN; + aoPoll[i].revents = 0; + } +- poll (aoPoll, OUT_ERR, ~0); +- for (i = 0; i < OUT_ERR; i++) ++ poll (aoPoll, GENMON_OUT_ERR, ~0); ++ for (i = 0; i < GENMON_OUT_ERR; i++) + if (aoPoll[i].revents & POLLIN) + break; +- if (i == OUT_ERR) ++ if (i == GENMON_OUT_ERR) + goto End; + + j = 0; +@@ -143,7 +143,7 @@ char *genmon_Spawn (char **argv, int wai + + End: + /* Close read end of pipes */ +- for (i = 0; i < OUT_ERR; i++) ++ for (i = 0; i < GENMON_OUT_ERR; i++) + close (aaiPipe[i][RD]); + + return (str); diff --git a/sysutils/xfce4-mount-plugin/DESCR b/sysutils/xfce4-mount-plugin/DESCR new file mode 100644 index 00000000000..a9ab7c1763c --- /dev/null +++ b/sysutils/xfce4-mount-plugin/DESCR @@ -0,0 +1,4 @@ +Add it to the panel, close the appearing options dialog and simply click +the new hard disk icon in your panel. You will see a menu containing all +items from fstab, i.e. any partitions and removable media, that is +currently inserted. diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile new file mode 100644 index 00000000000..8a8aace62b7 --- /dev/null +++ b/sysutils/xfce4-mount-plugin/Makefile @@ -0,0 +1,14 @@ +# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:40 jperkin Exp $ + +.include "../../meta-pkgs/xfce4/Makefile.common" + +DISTNAME= xfce4-mount-plugin-0.6.7 +CATEGORIES= sysutils +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/0.6/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin +COMMENT= Xfce mount/umount utility for the panel + +.include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-mount-plugin/PLIST b/sysutils/xfce4-mount-plugin/PLIST new file mode 100644 index 00000000000..00db0aa703e --- /dev/null +++ b/sysutils/xfce4-mount-plugin/PLIST @@ -0,0 +1,39 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:40 jperkin Exp $ +lib/xfce4/panel/plugins/libmount.la +share/icons/hicolor/scalable/apps/xfce-mount.svg +share/locale/ar/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/ca/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/cs/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/de/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/eu/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/fr/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/gl/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/ko/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/lt/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/pl/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/uk/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/vi/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-mount-plugin.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-mount-plugin.mo +share/xfce4/panel/plugins/xfce4-mount-plugin.desktop diff --git a/sysutils/xfce4-mount-plugin/distinfo b/sysutils/xfce4-mount-plugin/distinfo new file mode 100644 index 00000000000..9218354646c --- /dev/null +++ b/sysutils/xfce4-mount-plugin/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2015/04/21 08:56:40 jperkin Exp $ + +SHA1 (xfce4-mount-plugin-0.6.7.tar.bz2) = aff1b5883cd6b3e80989dcc963579b0078631712 +RMD160 (xfce4-mount-plugin-0.6.7.tar.bz2) = b17828ee08c28bd7ceaf083d1d1d94f7d66c98f3 +Size (xfce4-mount-plugin-0.6.7.tar.bz2) = 390163 bytes +SHA1 (patch-panel-plugin_devices.c) = 95685dd7eaf73028985ddbe85b8ea1ad9fcb1e3f diff --git a/sysutils/xfce4-mount-plugin/patches/patch-panel-plugin_devices.c b/sysutils/xfce4-mount-plugin/patches/patch-panel-plugin_devices.c new file mode 100644 index 00000000000..9a8d132bfa9 --- /dev/null +++ b/sysutils/xfce4-mount-plugin/patches/patch-panel-plugin_devices.c @@ -0,0 +1,297 @@ +$NetBSD: patch-panel-plugin_devices.c,v 1.1 2015/04/21 08:56:40 jperkin Exp $ + +Fix NetBSD build. +Add SunOS support. +--- panel-plugin/devices.c.orig 2014-04-26 21:31:42.000000000 +0000 ++++ panel-plugin/devices.c +@@ -25,7 +25,12 @@ Foundation, Inc., 675 Mass Ave, Cambridg + #include <config.h> + #endif + ++#ifdef __sun ++#include <stdio.h> ++#include <sys/vfstab.h> ++#else + #include <fstab.h> ++#endif + #include <glib.h> + #include <stdio.h> + #include <string.h> +@@ -33,7 +38,12 @@ Foundation, Inc., 675 Mass Ave, Cambridg + #include <sys/types.h> + #include <sys/wait.h> + #ifdef HAVE_GETMNTENT ++#ifdef __sun ++#include <sys/mntent.h> ++#include <sys/mnttab.h> ++#else + #include <mntent.h> ++#endif + #include <sys/vfs.h> + #elif defined (HAVE_GETMNTINFO) + #include <sys/param.h> +@@ -42,6 +52,10 @@ Foundation, Inc., 675 Mass Ave, Cambridg + #error no getmntent/getmntinfo ? send patches ! + #endif + ++#if defined(__NetBSD__) || defined(__sun) ++#define statfs statvfs ++#endif ++ + #include <libxfce4panel/xfce-panel-plugin.h> + #include <libxfce4util/libxfce4util.h> + #include <libxfce4ui/libxfce4ui.h> +@@ -57,7 +71,6 @@ t_mount_info * mount_info_new_from_stat + + #define MTAB "/etc/mtab" + +- + /** + * Return a string containing a size expressed in KB, MB or GB and the unit + * it is expressed in. +@@ -427,7 +440,15 @@ disks_new (gboolean include_NFSs, gboole + { + GPtrArray * pdisks; /* to be returned */ + t_disk * pdisk; ++#ifdef __sun ++ struct vfstab *pfstab; ++ FILE *fd = NULL; ++ fd = fopen(VFSTAB, "r"); ++ if (fd == NULL) ++ return NULL; ++#else + struct fstab *pfstab; ++#endif + gboolean has_valid_mount_device; + GtkWidget *dialog; + +@@ -452,23 +473,46 @@ disks_new (gboolean include_NFSs, gboole + } + + ++#ifdef __sun ++ for (getvfsent(fd, pfstab); pfstab!=NULL; getvfsent(fd, pfstab)) ++#else + for (pfstab = getfsent(); pfstab!=NULL; pfstab = getfsent()) ++#endif + { + has_valid_mount_device = ++#ifdef __sun ++ g_str_has_prefix(pfstab->vfs_special, "/dev/") || g_str_has_prefix(pfstab->vfs_special, "UUID=") || g_str_has_prefix(pfstab->vfs_special, "LABEL="); ++#else + g_str_has_prefix(pfstab->fs_spec, "/dev/") || g_str_has_prefix(pfstab->fs_spec, "UUID=") || g_str_has_prefix(pfstab->fs_spec, "LABEL="); ++#endif + + if (include_NFSs) + has_valid_mount_device = has_valid_mount_device | ++#ifdef __sun ++ g_str_has_prefix(pfstab->vfs_fstype, "fuse") | ++ g_str_has_prefix(pfstab->vfs_fstype, "shfs") | ++ g_str_has_prefix(pfstab->vfs_fstype, "nfs") | ++ g_str_has_prefix(pfstab->vfs_fstype, "cifs") | ++ g_str_has_prefix(pfstab->vfs_fstype, "smbfs"); ++#else + g_str_has_prefix(pfstab->fs_vfstype, "fuse") | + g_str_has_prefix(pfstab->fs_vfstype, "shfs") | + g_str_has_prefix(pfstab->fs_vfstype, "nfs") | + g_str_has_prefix(pfstab->fs_vfstype, "cifs") | + g_str_has_prefix(pfstab->fs_vfstype, "smbfs"); ++#endif + ++#ifdef __sun ++ if ( has_valid_mount_device && ++ g_str_has_prefix(pfstab->vfs_mountp, "/") ) { ++ pdisk = disk_new (pfstab->vfs_special, pfstab->vfs_mountp, length); ++ pdisk->dc = disk_classify (pfstab->vfs_special, pfstab->vfs_mountp); ++#else + if ( has_valid_mount_device && + g_str_has_prefix(pfstab->fs_file, "/") ) { + pdisk = disk_new (pfstab->fs_spec, pfstab->fs_file, length); + pdisk->dc = disk_classify (pfstab->fs_spec, pfstab->fs_file); ++#endif + if (!device_or_mountpoint_exists(pdisks, pdisk)) + g_ptr_array_add (pdisks , pdisk); + +@@ -476,6 +520,9 @@ disks_new (gboolean include_NFSs, gboole + + } /* end for */ + ++#ifdef __sun ++ fclose(fd); ++#endif + endfsent(); /* close file */ + + return pdisks; +@@ -697,7 +744,11 @@ disks_refresh(GPtrArray * pdisks, GPtrAr + + #ifdef HAVE_GETMNTENT + FILE * fmtab = NULL; /* file /etc/mtab */ ++#ifdef __sun ++ struct mnttab * pmntent = NULL; ++#else + struct mntent * pmntent = NULL; /* struct for mnt info */ ++#endif + #elif defined (HAVE_GETMNTINFO) + int i, nb_mounted_fs = 0; + #endif +@@ -717,7 +768,13 @@ disks_refresh(GPtrArray * pdisks, GPtrAr + pstatfs = g_new0 (struct statfs, 1); + + /* open file */ ++#ifdef __sun ++ fmtab = fopen(MTAB, "r"); ++ if (fmtab == NULL) ++ return; ++#else + fmtab = setmntent (MTAB, "r"); /* mtab file */ ++#endif + #elif defined (HAVE_GETMNTINFO) + /* get mounted fs */ + nb_mounted_fs = getmntinfo(&pstatfs,MNT_WAIT); +@@ -725,11 +782,19 @@ disks_refresh(GPtrArray * pdisks, GPtrAr + + /* start looking for mounted devices */ + #ifdef HAVE_GETMNTENT ++#ifdef __sun ++ for (getmntent(fmtab, pmntent); pmntent!=NULL; getmntent(fmtab, pmntent)) { ++#else + for (pmntent=getmntent(fmtab); pmntent!=NULL; pmntent=getmntent(fmtab)) { ++#endif + + DBG (" have entry: %s on %s", pmntent->mnt_fsname, pmntent->mnt_dir ); + ++#ifdef __sun ++ statfs (pmntent->mnt_mountp, pstatfs); ++#else + statfs (pmntent->mnt_dir, pstatfs); ++#endif + #elif defined (HAVE_GETMNTINFO) + for (i = 0; i < nb_mounted_fs ; i++) { + DBG (" have entry: %s on %s : type %s", pstatfs[i].f_mntfromname, pstatfs[i].f_mntonname, pstatfs[i].f_fstypename ); +@@ -740,13 +805,21 @@ disks_refresh(GPtrArray * pdisks, GPtrAr + /* get pointer on disk from pdisks */ + /* CHANGED to reflect change in disk_search */ + #ifdef HAVE_GETMNTENT ++#ifdef __sun ++ pdisk = disks_search (pdisks, pmntent->mnt_mountp); ++#else + pdisk = disks_search (pdisks, pmntent->mnt_dir); ++#endif + #elif defined (HAVE_GETMNTINFO) + pdisk = disks_search (pdisks, pstatfs[i].f_mntonname); + #endif + if (excluded_FSs!=NULL) + #ifdef HAVE_GETMNTENT ++#ifdef __sun ++ exclude = exclude_filesystem (excluded_FSs, pmntent->mnt_mountp, pmntent->mnt_special); ++#else + exclude = exclude_filesystem (excluded_FSs, pmntent->mnt_dir, pmntent->mnt_fsname); ++#endif + #elif defined (HAVE_GETMNTINFO) + exclude = exclude_filesystem (excluded_FSs, pstatfs[i].f_mntonname, pstatfs[i].f_mntfromname); + #endif +@@ -757,6 +830,18 @@ disks_refresh(GPtrArray * pdisks, GPtrAr + /* test for mnt_dir==none or neither block device nor NFS or system device */ + if ( exclude || + #ifdef HAVE_GETMNTENT ++#ifdef __sun ++ g_ascii_strcasecmp(pmntent->mnt_mountp, "none") == 0 || ++ g_str_has_prefix(pmntent->mnt_special, "gvfs-fuse-daemon") || ++ !(g_str_has_prefix(pmntent->mnt_special, "/dev/") || ++ g_str_has_prefix(pmntent->mnt_fstype, "fuse") || ++ g_str_has_prefix(pmntent->mnt_fstype, "nfs") || ++ g_str_has_prefix(pmntent->mnt_fstype, "smbfs") || ++ g_str_has_prefix(pmntent->mnt_fstype, "cifs") || ++ g_str_has_prefix(pmntent->mnt_fstype, "shfs") ++ ) || ++ g_str_has_prefix(pmntent->mnt_mountp, "/sys/") ++#else + g_ascii_strcasecmp(pmntent->mnt_dir, "none") == 0 || + g_str_has_prefix(pmntent->mnt_fsname, "gvfs-fuse-daemon") || + !(g_str_has_prefix(pmntent->mnt_fsname, "/dev/") || +@@ -767,6 +852,7 @@ disks_refresh(GPtrArray * pdisks, GPtrAr + g_str_has_prefix(pmntent->mnt_type, "shfs") + ) || + g_str_has_prefix(pmntent->mnt_dir, "/sys/") ++#endif + #elif defined (HAVE_GETMNTINFO) + /* TODO: add support for more fs types on BSD */ + g_ascii_strcasecmp(pstatfs[i].f_mntonname, "none") == 0 || +@@ -779,8 +865,13 @@ disks_refresh(GPtrArray * pdisks, GPtrAr + + /* else have valid entry reflecting block device or NFS */ + #ifdef HAVE_GETMNTENT ++#ifdef __sun ++ pdisk = disk_new (pmntent->mnt_special, pmntent->mnt_mountp, length); ++ pdisk->dc = disk_classify (pmntent->mnt_special, pmntent->mnt_mountp); ++#else + pdisk = disk_new (pmntent->mnt_fsname, pmntent->mnt_dir, length); + pdisk->dc = disk_classify (pmntent->mnt_fsname, pmntent->mnt_dir); ++#endif + #elif defined (HAVE_GETMNTINFO) + pdisk = disk_new (pstatfs[i].f_mntfromname, pstatfs[i].f_mntonname, length); + pdisk->dc = disk_classify (pstatfs[i].f_mntfromname, pstatfs[i].f_mntonname); +@@ -790,8 +881,13 @@ disks_refresh(GPtrArray * pdisks, GPtrAr + + /* create new t_mount_info */ + #ifdef HAVE_GETMNTENT ++#ifdef __sun ++ mount_info = mount_info_new_from_stat (pstatfs, pmntent->mnt_fstype, ++ pmntent->mnt_mountp); ++#else + mount_info = mount_info_new_from_stat (pstatfs, pmntent->mnt_type, + pmntent->mnt_dir); ++#endif + #elif defined (HAVE_GETMNTINFO) + mount_info = mount_info_new_from_stat (&pstatfs[i], pstatfs[i].f_fstypename, + pstatfs[i].f_mntonname); +@@ -847,7 +943,11 @@ disk_check_mounted (const char *disk) + { + #ifdef HAVE_GETMNTENT + FILE *fmtab = NULL; /* file /etc/mtab */ ++#ifdef __sun ++ struct mnttab *pmntent = NULL; ++#else + struct mntent *pmntent = NULL; /* struct for mnt info */ ++#endif + #elif defined (HAVE_GETMNTINFO) + struct statfs * pstatfs = NULL; + int i, nb_mounted_fs = 0; +@@ -856,7 +956,13 @@ disk_check_mounted (const char *disk) + + #ifdef HAVE_GETMNTENT + /* open file */ ++#ifdef __sun ++ fmtab = fopen(MTAB, "r"); ++ if (fmtab == NULL) ++ return; ++#else + fmtab = setmntent (MTAB, "r"); /* mtab file */ ++#endif + #elif defined (HAVE_GETMNTINFO) + /* get mounted fs */ + nb_mounted_fs = getmntinfo(&pstatfs,MNT_WAIT); +@@ -864,14 +970,23 @@ disk_check_mounted (const char *disk) + + /* start looking for mounted devices */ + #ifdef HAVE_GETMNTENT ++#ifdef __sun ++ for (getmntent(fmtab, pmntent); pmntent!=NULL; getmntent(fmtab, pmntent)) ++#else + for (pmntent=getmntent(fmtab); pmntent!=NULL; pmntent=getmntent(fmtab)) ++#endif + #elif defined (HAVE_GETMNTINFO) + for (i = 0; i < nb_mounted_fs ; i++) + #endif + { + #ifdef HAVE_GETMNTENT ++#ifdef __sun ++ if (strcmp(pmntent->mnt_mountp, disk)==0 || ++ strcmp(pmntent->mnt_special, disk)==0 ) ++#else + if (strcmp(pmntent->mnt_dir, disk)==0 || + strcmp(pmntent->mnt_fsname, disk)==0 ) ++#endif + #elif defined (HAVE_GETMNTINFO) + if (strcmp(pstatfs[i].f_mntonname, disk)==0 || + strcmp(pstatfs[i].f_mntfromname, disk)==0 ) diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile index 6f592ef0667..b6cddecad7a 100644 --- a/sysutils/xfce4-netload-plugin/Makefile +++ b/sysutils/xfce4-netload-plugin/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.41 2014/08/21 14:51:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.42 2015/04/21 08:56:41 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.4.0 - -DISTNAME= xfce4-netload-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-netload-plugin-1.2.4 CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-netload-plugin/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.2/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin COMMENT= Xfce network load plugin LDFLAGS.SunOS+= -lnsl .include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-netload-plugin/PLIST b/sysutils/xfce4-netload-plugin/PLIST index 165707d67fe..d6460b2e6be 100644 --- a/sysutils/xfce4-netload-plugin/PLIST +++ b/sysutils/xfce4-netload-plugin/PLIST @@ -1,10 +1,56 @@ -@comment $NetBSD: PLIST,v 1.7 2007/04/12 09:55:16 martti Exp $ -libexec/xfce4/panel-plugins/xfce4-netload-plugin +@comment $NetBSD: PLIST,v 1.8 2015/04/21 08:56:41 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.8 2015/04/21 08:56:41 jperkin Exp $ +lib/xfce4/panel/plugins/libnetload.la +share/icons/hicolor/24x24/apps/xfce4-netload-plugin.png +share/icons/hicolor/48x48/apps/xfce4-netload-plugin.png +share/icons/hicolor/scalable/apps/xfce4-netload-plugin.svg +share/locale/ar/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/bg/LC_MESSAGES/xfce4-netload-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/cs/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-netload-plugin.mo share/locale/de/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/en_AU/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/eo/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/eu/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-netload-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/gl/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/he/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/is/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-netload-plugin.mo share/locale/ko/LC_MESSAGES/xfce4-netload-plugin.mo share/locale/lt/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/ms/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/oc/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/pa/LC_MESSAGES/xfce4-netload-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/th/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-netload-plugin.mo share/locale/uk/LC_MESSAGES/xfce4-netload-plugin.mo -share/xfce4/panel-plugins/netload.desktop +share/locale/ur/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/vi/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-netload-plugin.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-netload-plugin.mo +share/xfce4/panel/plugins/netload.desktop diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk deleted file mode 100644 index eb8f17ae550..00000000000 --- a/sysutils/xfce4-netload-plugin/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.41 2014/05/05 00:48:22 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-netload-plugin - -.if !defined(XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK) -XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-netload-plugin+= xfce4-netload-plugin>=0.4.0 -BUILDLINK_ABI_DEPENDS.xfce4-netload-plugin+= xfce4-netload-plugin>=0.4.0nb21 -BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?= ../../sysutils/xfce4-netload-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-netload-plugin diff --git a/sysutils/xfce4-netload-plugin/distinfo b/sysutils/xfce4-netload-plugin/distinfo index e88552efce1..2a53b1e5156 100644 --- a/sysutils/xfce4-netload-plugin/distinfo +++ b/sysutils/xfce4-netload-plugin/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2007/06/30 18:14:35 joerg Exp $ +$NetBSD: distinfo,v 1.11 2015/04/21 08:56:41 jperkin Exp $ -SHA1 (xfce4-netload-plugin-0.4.0.tar.bz2) = 197231f99773f4e299c64125dd0d1a25bfb533bb -RMD160 (xfce4-netload-plugin-0.4.0.tar.bz2) = 47d8183da3885b6a476504fd8d5762be7d4fffac -Size (xfce4-netload-plugin-0.4.0.tar.bz2) = 125046 bytes -SHA1 (patch-aa) = c58b274d5bc8f065a3d002bd60cd2b1315f6b543 -SHA1 (patch-ab) = 427f7330e5c39738b12ab7fdf23be64ce60a61f4 -SHA1 (patch-ac) = de6c9c1df01be8da6228cff02741204c12aecd6d +SHA1 (xfce4-netload-plugin-1.2.4.tar.bz2) = 2d038dc675ebf2e4d28842f0d33e3d215fe2bcb3 +RMD160 (xfce4-netload-plugin-1.2.4.tar.bz2) = 45ef4df8da5525d81da4bf3e3dea6abe697516c2 +Size (xfce4-netload-plugin-1.2.4.tar.bz2) = 361889 bytes +SHA1 (patch-panel-plugin_Makefile.in) = 4fad81348816506d6b89a471d72ecfccb2182bfe +SHA1 (patch-panel-plugin_net.c) = fbe62641a28154cf9b3ee8c9e5a5ba0c5691f09b +SHA1 (patch-panel-plugin_net.h) = 5626f945ad552f313f07be857d74fe42604ab963 diff --git a/sysutils/xfce4-netload-plugin/patches/patch-aa b/sysutils/xfce4-netload-plugin/patches/patch-aa deleted file mode 100644 index bca95c4bfbb..00000000000 --- a/sysutils/xfce4-netload-plugin/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2007/06/30 18:14:36 joerg Exp $ - ---- panel-plugin/net.c.orig 2007-06-30 17:58:57.000000000 +0000 -+++ panel-plugin/net.c -@@ -46,7 +46,7 @@ - #elif __APPLE__ - # include "src/macos.h" - # include "src/macos.c" --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - # include "wormulon/freebsd.h" - # include "wormulon/freebsd.c" - #elif __linux__ diff --git a/sysutils/xfce4-netload-plugin/patches/patch-ab b/sysutils/xfce4-netload-plugin/patches/patch-ab deleted file mode 100644 index d7c3e5efd18..00000000000 --- a/sysutils/xfce4-netload-plugin/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2007/06/30 18:14:36 joerg Exp $ - ---- panel-plugin/net.h.orig 2007-06-30 17:58:11.000000000 +0000 -+++ panel-plugin/net.h -@@ -62,7 +62,7 @@ typedef struct - #ifdef __HPUX__ - int wait_pcks_counter; - nmapi_logstat* if_ptr; --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - int watchif; - int dev_opened; - #elif __NetBSD__ diff --git a/sysutils/xfce4-netload-plugin/patches/patch-ac b/sysutils/xfce4-netload-plugin/patches/patch-ac deleted file mode 100644 index 0ae4417676e..00000000000 --- a/sysutils/xfce4-netload-plugin/patches/patch-ac +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2007/06/30 18:14:36 joerg Exp $ - ---- panel-plugin/os.h.orig 2007-06-30 17:53:50.000000000 +0000 -+++ panel-plugin/os.h -@@ -72,7 +72,7 @@ - #include <net/if_media.h> - #include <net/if_mib.h> - #include <arpa/inet.h> --#elif __FreeBSD__ /* F R E E B S D */ -+#elif defined(__FreeBSD__) || defined(__DragonFly__) /* F R E E B S D */ - #include <stdio.h> - #include <stdlib.h> - #include <stdarg.h> -@@ -94,8 +94,13 @@ - #include <net/if_media.h> - #include <net/if_mib.h> - #include <arpa/inet.h> -+# if defined(__DragonFly__) -+#include <net/ppp_layer/ppp_defs.h> -+#include <net/ppp/if_ppp.h> -+# else - #include <net/ppp_defs.h> - #include <net/if_ppp.h> -+# endif - #elif __NetBSD__ /* N E T B S D */ - #include <stdio.h> - #include <sys/param.h> diff --git a/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_Makefile.in b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_Makefile.in new file mode 100644 index 00000000000..d2dd25ae2b7 --- /dev/null +++ b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_Makefile.in @@ -0,0 +1,23 @@ +$NetBSD: patch-panel-plugin_Makefile.in,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +Adjust config path. +--- panel-plugin/Makefile.in.orig 2014-11-22 21:10:32.000000000 +0000 ++++ panel-plugin/Makefile.in +@@ -355,7 +355,7 @@ commandline_LDADD = @LIBXFCE4PANEL_LIBS@ + # + desktop_in_in_files = netload.desktop.in.in + desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) +-desktopdir = $(datadir)/xfce4/panel-plugins ++desktopdir = $(datadir)/xfce4/panel/plugins + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ + wormulon commandline.c \ +@@ -791,7 +791,7 @@ uninstall-am: uninstall-desktopDATA unin + + # get full path into .desktop file + %.desktop.in: %.desktop.in.in +- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \ ++ sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel/plugins^" \ + $< > $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.c b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.c new file mode 100644 index 00000000000..5a246ef4945 --- /dev/null +++ b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.c @@ -0,0 +1,18 @@ +$NetBSD: patch-panel-plugin_net.c,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +Fix DragonFly build. +--- panel-plugin/net.c.orig 2014-11-02 11:50:26.000000000 +0000 ++++ panel-plugin/net.c +@@ -48,9 +48,9 @@ + # include "wormulon/hpux.h" + # include "wormulon/hpux.c" + #elif __APPLE__ +-# include "src/macos.h" +-# include "src/macos.c" +-#elif __FreeBSD__ || __DragonFly__ || __FreeBSD_kernel__ ++# include "wormulon/macos.h" ++# include "wormulon/macos.c" ++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) + # include "wormulon/freebsd.h" + # include "wormulon/freebsd.c" + #elif __linux__ diff --git a/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.h b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.h new file mode 100644 index 00000000000..48f248c516c --- /dev/null +++ b/sysutils/xfce4-netload-plugin/patches/patch-panel-plugin_net.h @@ -0,0 +1,14 @@ +$NetBSD: patch-panel-plugin_net.h,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +Fix DragonFly build. +--- panel-plugin/net.h.orig 2014-11-22 17:11:26.000000000 +0000 ++++ panel-plugin/net.h +@@ -69,7 +69,7 @@ typedef struct + #ifdef __HPUX__ + int wait_pcks_counter; + nmapi_logstat* if_ptr; +-#elif __FreeBSD__ || __DragonFly__ || __FreeBSD_kernel__ ++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) + int watchif; + int dev_opened; + #elif __NetBSD__ diff --git a/sysutils/xfce4-quicklauncher-plugin/Makefile b/sysutils/xfce4-quicklauncher-plugin/Makefile index 9830070838a..5722c1fc7a3 100644 --- a/sysutils/xfce4-quicklauncher-plugin/Makefile +++ b/sysutils/xfce4-quicklauncher-plugin/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.32 2014/05/05 00:48:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.33 2015/04/21 08:56:41 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 1.9.4 - -DISTNAME= xfce4-quicklauncher-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-quicklauncher-plugin-1.9.4 CATEGORIES= sysutils MASTER_SITES= http://goodies.xfce.org/releases/xfce4-quicklauncher-plugin/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-quicklauncher-plugin COMMENT= Xfce quicklaunch plugin .include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-quicklauncher-plugin/PLIST b/sysutils/xfce4-quicklauncher-plugin/PLIST index 12bb1febc93..2bec510abb7 100644 --- a/sysutils/xfce4-quicklauncher-plugin/PLIST +++ b/sysutils/xfce4-quicklauncher-plugin/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2007/04/12 09:55:17 martti Exp $ -lib/xfce4/panel-plugins/libquicklauncher.la +@comment $NetBSD: PLIST,v 1.5 2015/04/21 08:56:41 jperkin Exp $ +lib/xfce4/panel/plugins/libquicklauncher.la share/locale/cs/LC_MESSAGES/xfce4-quicklauncher-plugin.mo share/locale/el/LC_MESSAGES/xfce4-quicklauncher-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-quicklauncher-plugin.mo @@ -10,4 +10,4 @@ share/locale/ja/LC_MESSAGES/xfce4-quicklauncher-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-quicklauncher-plugin.mo share/locale/ru/LC_MESSAGES/xfce4-quicklauncher-plugin.mo share/locale/vi/LC_MESSAGES/xfce4-quicklauncher-plugin.mo -share/xfce4/panel-plugins/quicklauncher.desktop +share/xfce4/panel/plugins/quicklauncher.desktop diff --git a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk deleted file mode 100644 index 7fa0853307a..00000000000 --- a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.37 2014/05/05 00:48:22 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-quicklauncher-plugin - -.if !defined(XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK) -XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+= xfce4-quicklauncher-plugin>=1.9.4 -BUILDLINK_ABI_DEPENDS.xfce4-quicklauncher-plugin+= xfce4-quicklauncher-plugin>=1.9.4nb21 -BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?= ../../sysutils/xfce4-quicklauncher-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-quicklauncher-plugin diff --git a/sysutils/xfce4-quicklauncher-plugin/distinfo b/sysutils/xfce4-quicklauncher-plugin/distinfo index 7d10c348a1e..ed9ccc4501b 100644 --- a/sysutils/xfce4-quicklauncher-plugin/distinfo +++ b/sysutils/xfce4-quicklauncher-plugin/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.3 2007/12/05 07:50:17 martti Exp $ +$NetBSD: distinfo,v 1.4 2015/04/21 08:56:41 jperkin Exp $ SHA1 (xfce4-quicklauncher-plugin-1.9.4.tar.bz2) = ad2b7b344ddb611cee25ee130c1f2d4765072fa1 RMD160 (xfce4-quicklauncher-plugin-1.9.4.tar.bz2) = c039d2244f08f99d4a764bd8ee38bc017a372923 Size (xfce4-quicklauncher-plugin-1.9.4.tar.bz2) = 282545 bytes +SHA1 (patch-panel-plugin_Makefile.in) = ab3a25da936dc7303afe96730b59bf8d31439a95 diff --git a/sysutils/xfce4-quicklauncher-plugin/patches/patch-panel-plugin_Makefile.in b/sysutils/xfce4-quicklauncher-plugin/patches/patch-panel-plugin_Makefile.in new file mode 100644 index 00000000000..3a8ab859a97 --- /dev/null +++ b/sysutils/xfce4-quicklauncher-plugin/patches/patch-panel-plugin_Makefile.in @@ -0,0 +1,34 @@ +$NetBSD: patch-panel-plugin_Makefile.in,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +Ahjust panel plugin path. +--- panel-plugin/Makefile.in.orig 2007-06-27 19:07:13.000000000 +0000 ++++ panel-plugin/Makefile.in +@@ -238,7 +238,7 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-plugindir = $(libdir)/xfce4/panel-plugins ++plugindir = $(libdir)/xfce4/panel/plugins + plugin_LTLIBRARIES = \ + libquicklauncher.la + +@@ -271,7 +271,7 @@ libquicklauncher_la_LIBADD = \ + # additional level of indirection: a <name>.desktop.in.in file. + desktop_in_in_files = quicklauncher.desktop.in.in + desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) +-desktopdir = $(datadir)/xfce4/panel-plugins ++desktopdir = $(datadir)/xfce4/panel/plugins + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ + $(desktop_in_in_files) +@@ -595,8 +595,8 @@ uninstall-am: uninstall-desktopDATA unin + + # get full path into .desktop file + %.desktop.in: %.desktop.in.in +- sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \ +- $< > $@ ++ sed -e "s^@INTERNAL_PLUGIN_PATH@/libquicklauncher.so^quicklauncher^" \ ++ $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile index 3ff70eb8163..7472195a31b 100644 --- a/sysutils/xfce4-systemload-plugin/Makefile +++ b/sysutils/xfce4-systemload-plugin/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.38 2014/05/05 00:48:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.39 2015/04/21 08:56:41 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.4.2 - -DISTNAME= xfce4-systemload-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-systemload-plugin-1.1.2 CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-systemload-plugin/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.1/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin COMMENT= Xfce system load plugin .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/xfce4-systemload-plugin/PLIST b/sysutils/xfce4-systemload-plugin/PLIST index d047d224822..e2034129a54 100644 --- a/sysutils/xfce4-systemload-plugin/PLIST +++ b/sysutils/xfce4-systemload-plugin/PLIST @@ -1,19 +1,49 @@ -@comment $NetBSD: PLIST,v 1.5 2007/04/12 09:55:17 martti Exp $ -libexec/xfce4/panel-plugins/xfce4-systemload-plugin +@comment $NetBSD: PLIST,v 1.6 2015/04/21 08:56:41 jperkin Exp $ +lib/xfce4/panel/plugins/libsystemload.la +share/locale/ar/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/bg/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/de/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/en_AU/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/gl/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/is/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/ko/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/lt/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/ms/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/nl/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/oc/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/sl/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/sv/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/th/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/uk/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/vi/LC_MESSAGES/xfce4-systemload-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-systemload-plugin.mo share/locale/zh_TW/LC_MESSAGES/xfce4-systemload-plugin.mo -share/xfce4/panel-plugins/systemload.desktop +share/xfce4/panel/plugins/systemload.desktop diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk deleted file mode 100644 index 80a48918dca..00000000000 --- a/sysutils/xfce4-systemload-plugin/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.39 2014/05/05 00:48:23 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-systemload-plugin - -.if !defined(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK) -XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.4.2 -BUILDLINK_ABI_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.4.2nb21 -BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?= ../../sysutils/xfce4-systemload-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-systemload-plugin diff --git a/sysutils/xfce4-systemload-plugin/distinfo b/sysutils/xfce4-systemload-plugin/distinfo index aa0a117cf1c..a86673bd5b5 100644 --- a/sysutils/xfce4-systemload-plugin/distinfo +++ b/sysutils/xfce4-systemload-plugin/distinfo @@ -1,10 +1,5 @@ -$NetBSD: distinfo,v 1.10 2007/04/16 18:20:17 joerg Exp $ +$NetBSD: distinfo,v 1.11 2015/04/21 08:56:41 jperkin Exp $ -SHA1 (xfce4-systemload-plugin-0.4.2.tar.bz2) = 517cc051633cc6f28147d5adeaf5db56219dddfb -RMD160 (xfce4-systemload-plugin-0.4.2.tar.bz2) = 228ad33b12a6a1151be6d079bd4c5a18fd50ba76 -Size (xfce4-systemload-plugin-0.4.2.tar.bz2) = 184575 bytes -SHA1 (patch-aa) = 5526126b144359686781e6ddc1ef43fcd0afc03a -SHA1 (patch-ab) = 9b7c4c4fd0db26a3ac239d1ffe5f3be7c32902f8 -SHA1 (patch-ac) = 961993f0273ba5ffcf0fa03e7e89aef2d55ab2ca -SHA1 (patch-ad) = 4b428566ae952a4adeea6a6365a762eb92237593 -SHA1 (patch-ae) = 2054a2351a2338c721480bd19d9bf3f03dc80632 +SHA1 (xfce4-systemload-plugin-1.1.2.tar.bz2) = 05de6cebb2c2c4934f808932ce7711059850a7a5 +RMD160 (xfce4-systemload-plugin-1.1.2.tar.bz2) = 36d86ef3d9ff8fcb0cf7d04d65d8035201c8d228 +Size (xfce4-systemload-plugin-1.1.2.tar.bz2) = 305948 bytes diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-aa b/sysutils/xfce4-systemload-plugin/patches/patch-aa deleted file mode 100644 index 796ea5fafe2..00000000000 --- a/sysutils/xfce4-systemload-plugin/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:17 martti Exp $ - ---- panel-plugin/memswap.c.orig 2007-01-17 18:01:09.000000000 +0000 -+++ panel-plugin/memswap.c 2007-01-23 21:42:59.000000000 +0000 -@@ -113,7 +113,7 @@ - return 0; - } - --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - /* - * This is inspired by /usr/src/usr.bin/top/machine.c - * diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-ab b/sysutils/xfce4-systemload-plugin/patches/patch-ab deleted file mode 100644 index 5f5da767e92..00000000000 --- a/sysutils/xfce4-systemload-plugin/patches/patch-ab +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2007/04/12 09:55:17 martti Exp $ - ---- panel-plugin/cpu.c.orig 2007-01-17 18:01:09.000000000 +0000 -+++ panel-plugin/cpu.c 2007-01-23 21:46:41.000000000 +0000 -@@ -78,6 +78,31 @@ - return cpu_used; - } - -+#elif defined(__DragonFly__) -+#include <kinfo.h> -+ -+static struct kinfo_cputime old_cp_time; -+ -+gulong read_cpuload() -+{ -+ gulong used, total; -+ struct kinfo_cputime cp_time; -+ -+ if (kinfo_get_sched_cputime(&cp_time) < 0) { -+ g_warning("kinfo_get_sched_cputime failed"); -+ return 0; -+ } -+ used = cp_time.cp_user + cp_time.cp_nice + cp_time.cp_sys; -+ used -= old_cp_time.cp_user + old_cp_time.cp_nice + old_cp_time.cp_sys; -+ total = used + cp_time.cp_idle - old_cp_time.cp_idle; -+ old_cp_time = cp_time; -+ -+ if (total) -+ return 100 * (used + used / 2) / total; -+ else -+ return 0; -+} -+ - #elif defined(__FreeBSD__) - - #include <osreldate.h> diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-ac b/sysutils/xfce4-systemload-plugin/patches/patch-ac deleted file mode 100644 index 67d2409f52d..00000000000 --- a/sysutils/xfce4-systemload-plugin/patches/patch-ac +++ /dev/null @@ -1,81 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2007/04/16 18:20:17 joerg Exp $ - ---- configure.orig 2007-01-17 18:01:14.000000000 +0000 -+++ configure -@@ -4516,6 +4516,76 @@ _ACEOF - - fi - -+{ echo "$as_me:$LINENO: checking for kinfo_get_sched_cputime in -lkinfo" >&5 -+echo $ECHO_N "checking for kinfo_get_sched_cputime in -lkinfo... $ECHO_C" >&6; } -+if test "${ac_cv_lib_kinfo_kinfo_get_sched_cputime+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lkinfo $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char kinfo_get_sched_cputime (); -+int -+main () -+{ -+return kinfo_get_sched_cputime (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_kinfo_kinfo_get_sched_cputime=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_kinfo_kinfo_get_sched_cputime=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_kinfo_kinfo_get_sched_cputime" >&5 -+echo "${ECHO_T}$ac_cv_lib_kinfo_kinfo_get_sched_cputime" >&6; } -+if test $ac_cv_lib_kinfo_kinfo_get_sched_cputime = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBkinfo 1 -+_ACEOF -+ -+ LIBS="-lkinfo $LIBS" -+ -+fi -+ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-ad b/sysutils/xfce4-systemload-plugin/patches/patch-ad deleted file mode 100644 index eb18f47263e..00000000000 --- a/sysutils/xfce4-systemload-plugin/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2007/04/16 18:20:18 joerg Exp $ - ---- configure.in.orig 2007-04-16 16:44:55.000000000 +0000 -+++ configure.in -@@ -44,6 +44,9 @@ dnl *** Check for kvm, needed for BSD ** - dnl ************************************* - AC_CHECK_LIB([kvm], [kvm_open]) - -+dnl *** Check for kinfo, needed for DragonFly *** -+AC_CHECK_LIB([kinfo], [kinfo_get_sched_cputime]) -+ - dnl ********************************** - dnl *** Check for standard headers *** - dnl ********************************** diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-ae b/sysutils/xfce4-systemload-plugin/patches/patch-ae deleted file mode 100644 index b695e64442c..00000000000 --- a/sysutils/xfce4-systemload-plugin/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2007/04/16 18:20:18 joerg Exp $ - ---- panel-plugin/uptime.c.orig 2007-04-16 17:42:39.000000000 +0000 -+++ panel-plugin/uptime.c -@@ -58,7 +58,7 @@ gulong read_uptime() - return uptime; - } - --#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - - #ifdef __NetBSD__ - /* diff --git a/sysutils/xfce4-taskmanager/DESCR b/sysutils/xfce4-taskmanager/DESCR new file mode 100644 index 00000000000..ecc3f73ef9f --- /dev/null +++ b/sysutils/xfce4-taskmanager/DESCR @@ -0,0 +1 @@ +Task manager for Xfce. diff --git a/sysutils/xfce4-taskmanager/Makefile b/sysutils/xfce4-taskmanager/Makefile new file mode 100644 index 00000000000..9e53fad6056 --- /dev/null +++ b/sysutils/xfce4-taskmanager/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +.include "../../meta-pkgs/xfce4/Makefile.common" + +DISTNAME= xfce4-taskmanager-1.1.0 +CATEGORIES= sysutils +MASTER_SITES= http://archive.xfce.org/src/apps/xfce4-taskmanager/1.1/ + +HOMEPAGE= http://goodies.xfce.org/projects/applications/xfce4-taskmanager +COMMENT= Xfce task manager + +MASTER_SITES= http://archive.xfce.org/src/apps/xfce4-taskmanager/1.1/ + +# patch needs libkvm. +LDFLAGS+= -lkvm + +.include "../../x11/libxfce4ui/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-taskmanager/PLIST b/sysutils/xfce4-taskmanager/PLIST new file mode 100644 index 00000000000..353c7b527ad --- /dev/null +++ b/sysutils/xfce4-taskmanager/PLIST @@ -0,0 +1,56 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:41 jperkin Exp $ +bin/xfce4-taskmanager +share/applications/xfce4-taskmanager.desktop +share/locale/ar/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/ast/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/be/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/bg/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/ca/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/cs/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/da/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/de/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/el/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/en_AU/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/en_GB/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/es/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/eu/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/fi/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/fr/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/gl/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/he/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/hr/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/hu/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/id/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/is/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/it/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/ja/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/kk/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/ko/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/lt/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/lv/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/ms/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/nb/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/nl/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/oc/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/pa/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/pl/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/pt/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/ru/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/si/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/sk/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/sl/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/sq/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/sr/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/sv/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/te/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/th/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/tr/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/ug/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/uk/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/ur/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/vi/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/zh_HK/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-taskmanager.mo diff --git a/sysutils/xfce4-taskmanager/distinfo b/sysutils/xfce4-taskmanager/distinfo new file mode 100644 index 00000000000..44aabe87af3 --- /dev/null +++ b/sysutils/xfce4-taskmanager/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +SHA1 (xfce4-taskmanager-1.1.0.tar.bz2) = 4a45d19169fab4270250633a46cfb5be536c3cd7 +RMD160 (xfce4-taskmanager-1.1.0.tar.bz2) = 4c22f73fbafa40674281a4719ac71de1a591d210 +Size (xfce4-taskmanager-1.1.0.tar.bz2) = 365866 bytes +SHA1 (patch-src_task-manager-bsd.c) = 0b93dccd43d56b36da951710e39c0da426933b19 diff --git a/sysutils/xfce4-taskmanager/patches/patch-src_task-manager-bsd.c b/sysutils/xfce4-taskmanager/patches/patch-src_task-manager-bsd.c new file mode 100644 index 00000000000..29b30eaa4fe --- /dev/null +++ b/sysutils/xfce4-taskmanager/patches/patch-src_task-manager-bsd.c @@ -0,0 +1,441 @@ +$NetBSD: patch-src_task-manager-bsd.c,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +Attempt to bring netbsd, DragonFly while keeping OpenBSD support. +--- src/task-manager-bsd.c.orig 2014-12-23 20:40:14.000000000 +0000 ++++ src/task-manager-bsd.c +@@ -25,8 +25,18 @@ + #include <sys/param.h> + #include <sys/sched.h> + #include <sys/sysctl.h> ++ ++#ifdef __DragonFly__ ++#include <sys/kinfo.h> ++#include <sys/resource.h> ++#include <vm/vm_param.h> ++#else + /* for swapctl() */ + #include <sys/swap.h> ++#include <uvm/uvm_extern.h> ++#endif ++ ++#include <kvm.h> + /* for strlcpy() */ + #include <string.h> + /* for getpagesize() */ +@@ -46,108 +56,107 @@ char *state_abbrev[] = { + + gboolean get_task_list (GArray *task_list) + { +- int mib[6]; +- size_t size; +-#ifdef __OpenBSD__ +- struct kinfo_proc *kp; +-#else +- struct kinfo_proc2 *kp; +-#endif +- Task t; +- struct passwd *passwdp; +- char **args; +- gchar* buf; +- int nproc, i; ++ Task t; ++#ifdef __NetBSD__ ++ struct kinfo_proc2 *kp = NULL; ++#else ++ struct kinfo_proc *kp = NULL; ++#endif ++ ++ struct passwd *passwdp; ++ char **args = NULL; ++ char *buf = NULL; ++ unsigned int i = 0; ++ int nproc = 0; ++ ++ ++ /* get process number, stolen from ps */ ++ /* example with kvm functions */ ++ char errbuf[_POSIX2_LINE_MAX]; ++ kvm_t *kdp = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, errbuf); ++ if (kdp == NULL) ++ errx(1, "%s", errbuf); ++ ++ /* fill kinfo_proc2 structure */ ++ /* XXX does it return sleeping processes ? */ ++#ifdef __OpenBSD__ ++ if (!(kp = kvm_getprocs(kdp, KERN_PROC_ALL, 0, ++ sizeof(struct kinfo_proc), &nproc))) ++#elif __DragonFly__ ++ if (!(kp = kvm_getprocs(kdp, KERN_PROC_ALL, 0, &nproc))) ++#else /* probably NetBSD or MirBSD */ ++ if (!(kp = kvm_getproc2(kdp, KERN_PROC_ALL, 0, ++ sizeof(struct kinfo_proc2), &nproc))) ++#endif ++ err(1, "%s", kvm_geterr(kdp)); ++ ++ for (i = 0; i < nproc; i++) { ++ if (kp[i].p_pid < 1) ++ continue; /* not valid */ + +- mib[0] = CTL_KERN; +-#ifdef __OpenBSD__ +- mib[1] = KERN_PROC; +-#else +- mib[1] = KERN_PROC2; +-#endif +- mib[2] = KERN_PROC_ALL; +- mib[3] = 0; +-#ifdef __OpenBSD__ +- mib[4] = sizeof(struct kinfo_proc); +-#else +- mib[4] = sizeof(struct kinfo_proc2); +-#endif +- mib[5] = 0; +- if (sysctl(mib, 6, NULL, &size, NULL, 0) < 0) +-#ifdef __OpenBSD__ +- errx(1, "could not get kern.proc size"); +-#else +- errx(1, "could not get kern.proc2 size"); +-#endif +- size = 5 * size / 4; /* extra slop */ +- if ((kp = malloc(size)) == NULL) +- errx(1,"failed to allocate memory for proc structures"); +-#ifdef __OpenBSD__ +- mib[5] = (int)(size / sizeof(struct kinfo_proc)); +-#else +- mib[5] = (int)(size / sizeof(struct kinfo_proc2)); +-#endif +- if (sysctl(mib, 6, kp, &size, NULL, 0) < 0) +-#ifdef __OpenBSD__ +- errx(1, "could not read kern.proc"); +- nproc = (int)(size / sizeof(struct kinfo_proc)); +-#else +- errx(1, "could not read kern.proc2"); +- nproc = (int)(size / sizeof(struct kinfo_proc2)); +-#endif +- for (i=0 ; i < nproc ; i++) +- { +-#ifdef __OpenBSD__ +- struct kinfo_proc p = kp[i]; +-#else ++ /* get per-process information in our entry */ ++#ifdef __NetBSD__ + struct kinfo_proc2 p = kp[i]; ++#else ++ struct kinfo_proc p = kp[i]; + #endif +- t.pid = p.p_pid; +- t.ppid = p.p_ppid; +- t.uid = p.p_uid; +- t.prio = p.p_priority - PZERO; +- t.vsz = p.p_vm_dsize + p.p_vm_ssize + p.p_vm_tsize; +- t.vsz *= getpagesize(); +- t.rss = p.p_vm_rssize * getpagesize(); +- g_snprintf(t.state, sizeof t.state, "%s", state_abbrev[p.p_stat]); +- g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1); +- /* shamelessly stolen from top/machine.c */ +- if (!P_ZOMBIE(&p)) { +- size = 128; +- if ((args = malloc(size)) == NULL) +- errx(1,"failed to allocate memory for argv structures at %zu", size); +- for (;; size *= 2) { +- if ((args = realloc(args, size)) == NULL) +- errx(1,"failed to allocate memory (size=%zu) for argv structures of pid %d", size, t.pid); +- mib[0] = CTL_KERN; +- mib[1] = KERN_PROC_ARGS; +- mib[2] = t.pid; +- mib[3] = KERN_PROC_ARGV; +- if (sysctl(mib, 4, args, &size, NULL, 0) == 0) +- break; +- if (errno != ENOMEM) { /* ESRCH: process disappeared */ +- /* printf ("process with pid %d disappeared, errno=%d\n", t.pid, errno); */ +- args[0] ='\0'; +- args[1] = NULL; +- break; +- } +- } +- buf = g_strjoinv(" ", args); +- g_assert(g_utf8_validate(buf, -1, NULL)); +- g_strlcpy(t.cmdline, buf, sizeof t.cmdline); +- g_free(buf); +- free(args); +- } +- +- t.cpu_user = (100.0 * ((double) p.p_pctcpu / FSCALE)); +- t.cpu_system = 0; /* TODO ? */ +- /* get username from uid */ +- passwdp = getpwuid(t.uid); +- if(passwdp != NULL && passwdp->pw_name != NULL) +- g_strlcpy(t.uid_name, passwdp->pw_name, sizeof t.uid_name); +- g_array_append_val(task_list, t); +- } +- free(kp); ++ ++#ifdef __DragonFly__ ++ t.pid = p.kp_pid; ++ t.ppid = p.kp_ppid; ++ t.uid = p.kp_uid; ++ t.prio = p.kp_nice; ++ t.vsz = p.kp_vm_dsize + p.kp_vm_ssize + p.kp_vm_tsize; ++ t.vsz *= getpagesize(); ++ t.rss = p.kp_vm_rssize * getpagesize(); ++ g_snprintf(t.state, sizeof(t.state), "%s", ++ state_abbrev[p.kp_stat]); ++ g_strlcpy(t.name, p.kp_comm, strlen(p.kp_comm) + 1); ++#else ++ t.pid = p.p_pid; ++ t.ppid = p.p_ppid; ++ t.uid = p.p_uid; ++ t.prio = p.p_priority - PZERO; ++ t.vsz = p.p_vm_dsize + p.p_vm_ssize + p.p_vm_tsize; ++ t.vsz *= getpagesize(); ++ t.rss = p.p_vm_rssize * getpagesize(); ++ g_snprintf(t.state, sizeof(t.state), "%s", ++ state_abbrev[p.p_stat]); ++ g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1); ++#endif ++#ifdef __DragonFly__ ++ if (!(p.kp_stat == SDEAD)) { /* same as OpenBSD P_ZOMBIE */ ++#else ++ if (!(p.p_stat == SDEAD)) { ++#endif ++ /* get process args */ ++#ifdef __NetBSD__ ++ args = kvm_getargv2(kdp, &kp[i], BUFSIZ); ++#else ++ args = kvm_getargv(kdp, &kp[i], BUFSIZ); ++#endif ++ if (args != NULL) { ++ buf = g_strjoinv(" ", args); ++ g_strlcpy(t.cmdline, buf, ++ sizeof(t.cmdline)); ++ } ++#ifdef __DragonFly__ ++ t.cpu_user = 0; /* TODO */ ++#else ++ t.cpu_user = (100.0 * ++ ((double) p.p_pctcpu / FSCALE)); ++#endif ++ t.cpu_system = 0; /* XXX TODO */ ++ passwdp = getpwuid(t.uid); ++ if (passwdp != NULL && passwdp->pw_name != NULL) ++ g_strlcpy(t.uid_name, passwdp->pw_name, ++ sizeof(t.uid_name)); ++ g_array_append_val(task_list, t); ++ } ++ } ++ g_free(args); ++ g_free(buf); ++ g_free(kp); + + return TRUE; + } +@@ -156,26 +165,26 @@ gboolean + pid_is_sleeping (guint pid) + { + int mib[6]; +-#ifdef __OpenBSD__ +- struct kinfo_proc kp; +- size_t size = sizeof(struct kinfo_proc); +-#else ++#ifdef __NetBSD__ + struct kinfo_proc2 kp; + size_t size = sizeof(struct kinfo_proc2); ++#else ++ struct kinfo_proc kp; ++ size_t size = sizeof(struct kinfo_proc); + #endif + + mib[0] = CTL_KERN; +-#ifdef __OpenBSD__ +- mib[1] = KERN_PROC; +-#else ++#ifdef __NetBSD__ + mib[1] = KERN_PROC2; ++#else ++ mib[1] = KERN_PROC; + #endif + mib[2] = KERN_PROC_PID; + mib[3] = pid; +-#ifdef __OpenBSD__ +- mib[4] = sizeof(struct kinfo_proc); +-#else ++#ifdef __NetBSD__ + mib[4] = sizeof(struct kinfo_proc2); ++#else ++ mib[4] = sizeof(struct kinfo_proc); + #endif + mib[5] = 1; + if (sysctl(mib, 6, &kp, &size, NULL, 0) < 0) +@@ -184,7 +193,11 @@ pid_is_sleeping (guint pid) + #else + errx(1, "could not read kern.proc2 for pid %d", pid); + #endif ++#ifdef __DragonFly__ ++ return (kp.kp_stat == SSTOP ? TRUE : FALSE); ++#else + return (kp.p_stat == SSTOP ? TRUE : FALSE); ++#endif + } + + gboolean get_cpu_usage (gushort *cpu_count, gfloat *cpu_user, gfloat *cpu_system) +@@ -192,12 +205,31 @@ gboolean get_cpu_usage (gushort *cpu_cou + static gulong cur_user = 0, cur_system = 0, cur_total = 0; + static gulong old_user = 0, old_system = 0, old_total = 0; + +- int mib[] = {CTL_KERN, KERN_CPTIME}; +- glong cp_time[CPUSTATES]; +- gsize size = sizeof( cp_time ); ++#if defined(__DragonFly__) ++ int mib[2]; ++ struct kinfo_cputime percpu; ++ size_t size = sizeof(percpu); ++ uint64_t cp_time[CPUSTATES]; ++ ++ if (sysctlbyname("kern.cputime", &percpu, &size, NULL, 0) < 0) ++ errx(1, "failed to sysctl kern.cputime"); ++ ++ cp_time[CP_USER] = percpu.cp_user; ++ cp_time[CP_NICE] = percpu.cp_nice; ++ cp_time[CP_SYS] = percpu.cp_sys; ++ cp_time[CP_INTR] = percpu.cp_intr; ++ cp_time[CP_IDLE] = percpu.cp_idle; ++#else ++#ifdef __NetBSD__ ++ int mib[] = {CTL_KERN, KERN_CP_TIME}; ++#else ++ int mib[] = {CTL_KERN, KERN_CPTIME}; ++#endif ++ glong cp_time[CPUSTATES]; ++ gsize size = sizeof( cp_time ); + if (sysctl(mib, 2, &cp_time, &size, NULL, 0) < 0) + errx(1,"failed to get kern.cptime"); +- ++#endif + old_user = cur_user; + old_system = cur_system; + old_total = cur_total; +@@ -217,65 +249,72 @@ gboolean get_cpu_usage (gushort *cpu_cou + errx(1,"failed to get cpu count"); + return TRUE; + } +- + /* vmtotal values in #pg */ + #define pagetok(nb) ((nb) * (getpagesize())) + + gboolean get_memory_usage (guint64 *memory_total, guint64 *memory_free, guint64 *memory_cache, guint64 *memory_buffers, guint64 *swap_total, guint64 *swap_free) + { + #ifdef __OpenBSD__ +- int mib[] = {CTL_VM, VM_UVMEXP}; +- struct uvmexp uvmexp; ++ int mib[] = {CTL_VM, VM_UVMEXP}; ++ struct uvmexp uvmexp; + #else +- int mib[] = {CTL_VM, VM_METER}; +- struct vmtotal vmtotal; ++ int mib[] = {CTL_VM, VM_METER}; ++ struct vmtotal vmtotal; + #endif +- struct swapent *swdev; +- int nswap, i; +- size_t size; +-#ifdef __OpenBSD__ +- size = sizeof(uvmexp); +- if (sysctl(mib, 2, &uvmexp, &size, NULL, 0) < 0) +- errx(1,"failed to get vm.uvmexp"); +- /* cheat : rm = tot used, add free to get total */ +- *memory_free = pagetok((guint64)uvmexp.free); +- *memory_total = pagetok((guint64)uvmexp.npages); +- *memory_cache = 0; +- *memory_buffers = 0; /*pagetok(uvmexp.npages - uvmexp.free - uvmexp.active);*/ +-#else +- size = sizeof(vmtotal); +- if (sysctl(mib, 2, &vmtotal, &size, NULL, 0) < 0) +- errx(1,"failed to get vm.meter"); +- /* cheat : rm = tot used, add free to get total */ +- *memory_total = pagetok(vmtotal.t_rm + vmtotal.t_free); +- *memory_free = pagetok(vmtotal.t_free); +- *memory_cache = 0; +- *memory_buffers = pagetok(vmtotal.t_rm - vmtotal.t_arm); +-#endif +- +- /* get swap stats */ +- if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) == 0) +- errx(1,"failed to get swap device count"); +- +- if ((swdev = calloc(nswap, sizeof(*swdev))) == NULL) +- errx(1,"failed to allocate memory for swdev structures"); +- +- if (swapctl(SWAP_STATS, swdev, nswap) == -1) { +- free(swdev); +- errx(1,"failed to get swap stats"); +- } +- +- /* Total things up */ +- *swap_total = *swap_free = 0; +- for (i = 0; i < nswap; i++) { +- if (swdev[i].se_flags & SWF_ENABLE) { +- *swap_free += (swdev[i].se_nblks - swdev[i].se_inuse); +- *swap_total += swdev[i].se_nblks; +- } +- } +- *swap_total *= DEV_BSIZE; +- *swap_free *= DEV_BSIZE; +- free(swdev); +- return TRUE; ++ struct swapent *swdev; ++ int nswap, i; ++ size_t size; ++#ifdef __OpenBSD__ ++ size = sizeof(uvmexp); ++ if (sysctl(mib, 2, &uvmexp, &size, NULL, 0) < 0) ++ errx(1,"failed to get vm.uvmexp"); ++ /* cheat : rm = tot used, add free to get total */ ++ *memory_free = pagetok((guint64)uvmexp.free); ++ *memory_total = pagetok((guint64)uvmexp.npages); ++ *memory_cache = 0; ++ *memory_buffers = 0; /*pagetok(uvmexp.npages - uvmexp.free - uvmexp.active);*/ ++#else ++ size = sizeof(vmtotal); ++ if (sysctl(mib, 2, &vmtotal, &size, NULL, 0) < 0) ++ errx(1,"failed to get vm.meter"); ++ ++ mib[0] = CTL_HW; ++ mib[1] = HW_PHYSMEM64; ++ uint64_t physmem; ++ size_t physmemlen = sizeof(physmem); ++ ++ if (sysctl(mib, 2, &physmem, &physmemlen, NULL, 0) < 0) ++ errx(1, "failed to get physmem"); ++ ++ *memory_total = (guint64)physmem; ++ *memory_free = pagetok((guint64)vmtotal.t_free); ++ *memory_cache = 0; ++ *memory_buffers = pagetok(vmtotal.t_rm - vmtotal.t_arm); ++#endif ++ ++ /* get swap stats */ ++ if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) == 0) ++ errx(1,"failed to get swap device count"); ++ ++ if ((swdev = calloc(nswap, sizeof(*swdev))) == NULL) ++ errx(1,"failed to allocate memory for swdev structures"); ++ ++ if (swapctl(SWAP_STATS, swdev, nswap) == -1) { ++ free(swdev); ++ errx(1,"failed to get swap stats"); ++ } ++ ++ /* Total things up */ ++ *swap_total = *swap_free = 0; ++ for (i = 0; i < nswap; i++) { ++ if (swdev[i].se_flags & SWF_ENABLE) { ++ *swap_free += (swdev[i].se_nblks - swdev[i].se_inuse); ++ *swap_total += swdev[i].se_nblks; ++ } ++ } ++ *swap_total *= DEV_BSIZE; ++ *swap_free *= DEV_BSIZE; ++ free(swdev); ++ return TRUE; + } + diff --git a/sysutils/xfce4-thunar-vcs/DESCR b/sysutils/xfce4-thunar-vcs/DESCR new file mode 100644 index 00000000000..fa7f246bf2b --- /dev/null +++ b/sysutils/xfce4-thunar-vcs/DESCR @@ -0,0 +1,8 @@ +Thunar vcs plugin adds Subversion actions to the context menu of thunar. +The current features are: +* Most of the svn action: add, checkout, cleanup, commit, copy, delete, + export, import, lock, log, move, properties, resolved, revert, status, + unlock, update. +* Subversion info in file properties dialog. +* Basic git actions: add, blame, branch, clean, clone, log, move, reset, + stash, status. diff --git a/sysutils/xfce4-thunar-vcs/Makefile b/sysutils/xfce4-thunar-vcs/Makefile new file mode 100644 index 00000000000..5ed167b5730 --- /dev/null +++ b/sysutils/xfce4-thunar-vcs/Makefile @@ -0,0 +1,18 @@ +# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +.include "../../meta-pkgs/xfce4/Makefile.common" + +DISTNAME= thunar-vcs-plugin-0.1.4 +PKGNAME= xfce4-${DISTNAME} +CATEGORIES= devel +MASTER_SITES= http://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.1/ + +MAINTAINER= gls@NetBSD.org +HOMEPAGE= http://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin +COMMENT= Thunar vcs integration plugin + +.include "../../devel/apr/buildlink3.mk" +.include "../../devel/subversion-base/buildlink3.mk" +.include "../../sysutils/xfce4-thunar/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-thunar-vcs/PLIST b/sysutils/xfce4-thunar-vcs/PLIST new file mode 100644 index 00000000000..8c212735800 --- /dev/null +++ b/sysutils/xfce4-thunar-vcs/PLIST @@ -0,0 +1,28 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:41 jperkin Exp $ +lib/thunarx-2/thunar-vcs-plugin.la +libexec/tvp-git-helper +libexec/tvp-svn-helper +share/icons/hicolor/24x24/apps/git.png +share/icons/hicolor/24x24/apps/subversion.png +share/icons/hicolor/48x48/apps/git.png +share/icons/hicolor/48x48/apps/subversion.png +share/locale/ar/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/ca/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/cs/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/da/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/de/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/en_GB/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/es/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/fr/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/gl/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/hu/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/id/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/lv/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/nl/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/pl/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/pt/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/pt_BR/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/sv/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/ur/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/ur_PK/LC_MESSAGES/thunar-vcs-plugin.mo +share/locale/zh_CN/LC_MESSAGES/thunar-vcs-plugin.mo diff --git a/sysutils/xfce4-thunar-vcs/TODO b/sysutils/xfce4-thunar-vcs/TODO new file mode 100644 index 00000000000..b248505c011 --- /dev/null +++ b/sysutils/xfce4-thunar-vcs/TODO @@ -0,0 +1,2 @@ +Decide we want to ship git, svn or both enabled. +Maybe decide for one and optionalize the other ? diff --git a/sysutils/xfce4-thunar-vcs/distinfo b/sysutils/xfce4-thunar-vcs/distinfo new file mode 100644 index 00000000000..e0fdea81cad --- /dev/null +++ b/sysutils/xfce4-thunar-vcs/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +SHA1 (thunar-vcs-plugin-0.1.4.tar.bz2) = 221c633ec2bdf7c0d9d008ad9cd5094ddbc90ce1 +RMD160 (thunar-vcs-plugin-0.1.4.tar.bz2) = 53019485581c27d094b422697f3b1cb1f144f36b +Size (thunar-vcs-plugin-0.1.4.tar.bz2) = 435835 bytes diff --git a/sysutils/xfce4-thunar/Makefile b/sysutils/xfce4-thunar/Makefile index f65ca665494..e1d45fdfb16 100644 --- a/sysutils/xfce4-thunar/Makefile +++ b/sysutils/xfce4-thunar/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.38 2014/05/05 00:48:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.39 2015/04/21 08:56:41 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 1.0.1 - -DISTNAME= Thunar-${XFCE4_VERSION} -PKGNAME= xfce4-thunar-${XFCE4_VERSION} -PKGREVISION= 23 +VERSION= 1.6.6 +DISTNAME= Thunar-${VERSION} +PKGNAME= xfce4-thunar-${VERSION} CATEGORIES= sysutils +MASTER_SITES= http://archive.xfce.org/src/xfce/thunar/1.6/ + +HOMEPAGE= http://docs.xfce.org/xfce/thunar/start COMMENT= Xfce file manager -PKGCONFIG_OVERRIDE+= thunar-vfs/thunar-vfs-1.pc.in -PKGCONFIG_OVERRIDE+= thunarx/thunarx-1.pc.in +PKGCONFIG_OVERRIDE+= thunarx/thunarx-2.pc.in PKG_SYSCONFSUBDIR= xdg/Thunar EGDIR= ${XFCE4_EGBASE}/Thunar @@ -19,22 +19,14 @@ EGDIR= ${XFCE4_EGBASE}/Thunar MAKE_DIRS+= ${XFCE4_EGBASE} ${PREFIX}/share/xfce4 CONF_FILES= ${EGDIR}/uca.xml ${PKG_SYSCONFDIR}/uca.xml -.include "options.mk" - -.include "../../devel/GConf/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/libnotify/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" +.include "../../x11/libxfce4ui/buildlink3.mk" .include "../../x11/xfce4-exo/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.include "../../mk/fam.buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-thunar/PLIST b/sysutils/xfce4-thunar/PLIST index b40619ee979..440724e6acf 100644 --- a/sysutils/xfce4-thunar/PLIST +++ b/sysutils/xfce4-thunar/PLIST @@ -1,54 +1,29 @@ -@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:34 reed Exp $ -bin/Thunar +@comment $NetBSD: PLIST,v 1.7 2015/04/21 08:56:41 jperkin Exp $ bin/thunar bin/thunar-settings -include/thunar-vfs-1/thunar-vfs/thunar-vfs-config.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-enum-types.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-info.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-interactive-job.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-job.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-mime-action.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-mime-application.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-mime-database.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-mime-handler.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-mime-info.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-monitor.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-path.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-thumb.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-types.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-user.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-util.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs-volume.h -include/thunar-vfs-1/thunar-vfs/thunar-vfs.h -include/thunarx-1/thunarx/thunarx-config.h -include/thunarx-1/thunarx/thunarx-file-info.h -include/thunarx-1/thunarx/thunarx-menu-provider.h -include/thunarx-1/thunarx/thunarx-preferences-provider.h -include/thunarx-1/thunarx/thunarx-property-page-provider.h -include/thunarx-1/thunarx/thunarx-property-page.h -include/thunarx-1/thunarx/thunarx-provider-factory.h -include/thunarx-1/thunarx/thunarx-provider-plugin.h -include/thunarx-1/thunarx/thunarx-renamer-provider.h -include/thunarx-1/thunarx/thunarx-renamer.h -include/thunarx-1/thunarx/thunarx.h -lib/libthunar-vfs-1.la -lib/libthunarx-1.la -lib/pkgconfig/thunar-vfs-1.pc -lib/pkgconfig/thunarx-1.pc -lib/thunarx-1/thunar-apr.la -lib/thunarx-1/thunar-sbr.la -lib/thunarx-1/thunar-uca.la -lib/thunarx-1/thunar-wallpaper-plugin.la -libexec/ThunarBulkRename -libexec/ThunarHelp -libexec/thunar-sendto-email -libexec/thunar-vfs-font-thumbnailer-1 -libexec/thunar-vfs-mime-cleaner-1 -libexec/thunar-vfs-pixbuf-thumbnailer-1 -libexec/thunar-vfs-update-thumbnailers-cache-1 -libexec/xfce4/panel-plugins/thunar-tpa +include/thunarx-2/thunarx/thunarx-config.h +include/thunarx-2/thunarx/thunarx-file-info.h +include/thunarx-2/thunarx/thunarx-menu-provider.h +include/thunarx-2/thunarx/thunarx-preferences-provider.h +include/thunarx-2/thunarx/thunarx-property-page-provider.h +include/thunarx-2/thunarx/thunarx-property-page.h +include/thunarx-2/thunarx/thunarx-provider-factory.h +include/thunarx-2/thunarx/thunarx-provider-plugin.h +include/thunarx-2/thunarx/thunarx-renamer-provider.h +include/thunarx-2/thunarx/thunarx-renamer.h +include/thunarx-2/thunarx/thunarx.h +lib/Thunar/ThunarBulkRename +lib/Thunar/thunar-sendto-email +lib/libthunarx-2.la +lib/pkgconfig/thunarx-2.pc +lib/thunarx-2/thunar-apr.la +lib/thunarx-2/thunar-sbr.la +lib/thunarx-2/thunar-uca.la +lib/thunarx-2/thunar-wallpaper-plugin.la +lib/xfce4/panel/plugins/libthunar-tpa.la man/man1/Thunar.1 share/Thunar/sendto/thunar-sendto-email.desktop +share/appdata/thunar.appdata.xml share/applications/Thunar-bulk-rename.desktop share/applications/Thunar-folder-handler.desktop share/applications/Thunar.desktop @@ -56,308 +31,7 @@ share/applications/thunar-settings.desktop share/dbus-1/services/org.xfce.FileManager.service share/dbus-1/services/org.xfce.Thunar.service share/doc/Thunar/README.gtkrc -share/doc/Thunar/README.thunarrc -share/doc/Thunar/README.volumes -share/doc/Thunar/ThumbnailersCacheFormat.txt -share/doc/Thunar/html/C/advanced-topics.html -share/doc/Thunar/html/C/copyright.html -share/doc/Thunar/html/C/customizing-thunar.html -share/doc/Thunar/html/C/faq.html -share/doc/Thunar/html/C/images/bulk-rename.png -share/doc/Thunar/html/C/images/file-manager-window.png -share/doc/Thunar/html/C/images/file-properties.png -share/doc/Thunar/html/C/images/preferences-advanced.png -share/doc/Thunar/html/C/images/preferences-behavior.png -share/doc/Thunar/html/C/images/preferences-side-pane.png -share/doc/Thunar/html/C/images/preferences-views.png -share/doc/Thunar/html/C/images/removable-drives-and-media.png -share/doc/Thunar/html/C/images/removable-media-unmount.png -share/doc/Thunar/html/C/images/sendto-menu.png -share/doc/Thunar/html/C/images/visible-columns.png -share/doc/Thunar/html/C/index.html -share/doc/Thunar/html/C/preferences.html -share/doc/Thunar/html/C/support.html -share/doc/Thunar/html/C/the-file-manager-window.html -share/doc/Thunar/html/C/using-removable-media.html -share/doc/Thunar/html/C/working-with-files-and-folders.html -share/doc/Thunar/html/da/advanced-topics.html -share/doc/Thunar/html/da/copyright.html -share/doc/Thunar/html/da/customizing-thunar.html -share/doc/Thunar/html/da/faq.html -share/doc/Thunar/html/da/images/bulk-rename.png -share/doc/Thunar/html/da/images/file-manager-window.png -share/doc/Thunar/html/da/images/file-properties.png -share/doc/Thunar/html/da/images/preferences-advanced.png -share/doc/Thunar/html/da/images/preferences-behavior.png -share/doc/Thunar/html/da/images/preferences-side-pane.png -share/doc/Thunar/html/da/images/preferences-views.png -share/doc/Thunar/html/da/images/removable-drives-and-media.png -share/doc/Thunar/html/da/images/removable-media-unmount.png -share/doc/Thunar/html/da/images/sendto-menu.png -share/doc/Thunar/html/da/images/visible-columns.png -share/doc/Thunar/html/da/index.html -share/doc/Thunar/html/da/preferences.html -share/doc/Thunar/html/da/support.html -share/doc/Thunar/html/da/the-file-manager-window.html -share/doc/Thunar/html/da/using-removable-media.html -share/doc/Thunar/html/da/working-with-files-and-folders.html -share/doc/Thunar/html/es/advanced-topics.html -share/doc/Thunar/html/es/copyright.html -share/doc/Thunar/html/es/customizing-thunar.html -share/doc/Thunar/html/es/faq.html -share/doc/Thunar/html/es/images/bulk-rename.png -share/doc/Thunar/html/es/images/file-manager-window.png -share/doc/Thunar/html/es/images/file-properties.png -share/doc/Thunar/html/es/images/preferences-advanced.png -share/doc/Thunar/html/es/images/preferences-behavior.png -share/doc/Thunar/html/es/images/preferences-side-pane.png -share/doc/Thunar/html/es/images/preferences-views.png -share/doc/Thunar/html/es/images/removable-drives-and-media.png -share/doc/Thunar/html/es/images/removable-media-unmount.png -share/doc/Thunar/html/es/images/sendto-menu.png -share/doc/Thunar/html/es/images/visible-columns.png -share/doc/Thunar/html/es/index.html -share/doc/Thunar/html/es/preferences.html -share/doc/Thunar/html/es/support.html -share/doc/Thunar/html/es/the-file-manager-window.html -share/doc/Thunar/html/es/using-removable-media.html -share/doc/Thunar/html/es/working-with-files-and-folders.html -share/doc/Thunar/html/eu/advanced-topics.html -share/doc/Thunar/html/eu/copyright.html -share/doc/Thunar/html/eu/customizing-thunar.html -share/doc/Thunar/html/eu/faq.html -share/doc/Thunar/html/eu/images/bulk-rename.png -share/doc/Thunar/html/eu/images/file-manager-window.png -share/doc/Thunar/html/eu/images/file-properties.png -share/doc/Thunar/html/eu/images/preferences-advanced.png -share/doc/Thunar/html/eu/images/preferences-behavior.png -share/doc/Thunar/html/eu/images/preferences-side-pane.png -share/doc/Thunar/html/eu/images/preferences-views.png -share/doc/Thunar/html/eu/images/removable-drives-and-media.png -share/doc/Thunar/html/eu/images/removable-media-unmount.png -share/doc/Thunar/html/eu/images/sendto-menu.png -share/doc/Thunar/html/eu/images/visible-columns.png -share/doc/Thunar/html/eu/index.html -share/doc/Thunar/html/eu/preferences.html -share/doc/Thunar/html/eu/support.html -share/doc/Thunar/html/eu/the-file-manager-window.html -share/doc/Thunar/html/eu/using-removable-media.html -share/doc/Thunar/html/eu/working-with-files-and-folders.html -share/doc/Thunar/html/fr/advanced-topics.html -share/doc/Thunar/html/fr/copyright.html -share/doc/Thunar/html/fr/customizing-thunar.html -share/doc/Thunar/html/fr/faq.html -share/doc/Thunar/html/fr/images/bulk-rename.png -share/doc/Thunar/html/fr/images/file-manager-window.png -share/doc/Thunar/html/fr/images/file-properties.png -share/doc/Thunar/html/fr/images/preferences-advanced.png -share/doc/Thunar/html/fr/images/preferences-behavior.png -share/doc/Thunar/html/fr/images/preferences-side-pane.png -share/doc/Thunar/html/fr/images/preferences-views.png -share/doc/Thunar/html/fr/images/removable-drives-and-media.png -share/doc/Thunar/html/fr/images/removable-media-unmount.png -share/doc/Thunar/html/fr/images/sendto-menu.png -share/doc/Thunar/html/fr/images/visible-columns.png -share/doc/Thunar/html/fr/index.html -share/doc/Thunar/html/fr/preferences.html -share/doc/Thunar/html/fr/support.html -share/doc/Thunar/html/fr/the-file-manager-window.html -share/doc/Thunar/html/fr/using-removable-media.html -share/doc/Thunar/html/fr/working-with-files-and-folders.html -share/doc/Thunar/html/gl/advanced-topics.html -share/doc/Thunar/html/gl/copyright.html -share/doc/Thunar/html/gl/customizing-thunar.html -share/doc/Thunar/html/gl/faq.html -share/doc/Thunar/html/gl/index.html -share/doc/Thunar/html/gl/preferences.html -share/doc/Thunar/html/gl/support.html -share/doc/Thunar/html/gl/the-file-manager-window.html -share/doc/Thunar/html/gl/using-removable-media.html -share/doc/Thunar/html/gl/working-with-files-and-folders.html -share/doc/Thunar/html/it/advanced-topics.html -share/doc/Thunar/html/it/copyright.html -share/doc/Thunar/html/it/customizing-thunar.html -share/doc/Thunar/html/it/faq.html -share/doc/Thunar/html/it/images/bulk-rename.png -share/doc/Thunar/html/it/images/file-manager-window.png -share/doc/Thunar/html/it/images/file-properties.png -share/doc/Thunar/html/it/images/preferences-advanced.png -share/doc/Thunar/html/it/images/preferences-behavior.png -share/doc/Thunar/html/it/images/preferences-side-pane.png -share/doc/Thunar/html/it/images/preferences-views.png -share/doc/Thunar/html/it/images/removable-drives-and-media.png -share/doc/Thunar/html/it/images/removable-media-unmount.png -share/doc/Thunar/html/it/images/sendto-menu.png -share/doc/Thunar/html/it/images/visible-columns.png -share/doc/Thunar/html/it/index.html -share/doc/Thunar/html/it/preferences.html -share/doc/Thunar/html/it/support.html -share/doc/Thunar/html/it/the-file-manager-window.html -share/doc/Thunar/html/it/using-removable-media.html -share/doc/Thunar/html/it/working-with-files-and-folders.html -share/doc/Thunar/html/ja/advanced-topics.html -share/doc/Thunar/html/ja/copyright.html -share/doc/Thunar/html/ja/customizing-thunar.html -share/doc/Thunar/html/ja/faq.html -share/doc/Thunar/html/ja/images/bulk-rename.png -share/doc/Thunar/html/ja/images/file-manager-window.png -share/doc/Thunar/html/ja/images/file-properties.png -share/doc/Thunar/html/ja/images/preferences-advanced.png -share/doc/Thunar/html/ja/images/preferences-behavior.png -share/doc/Thunar/html/ja/images/preferences-side-pane.png -share/doc/Thunar/html/ja/images/preferences-views.png -share/doc/Thunar/html/ja/images/removable-drives-and-media.png -share/doc/Thunar/html/ja/images/removable-media-unmount.png -share/doc/Thunar/html/ja/images/sendto-menu.png -share/doc/Thunar/html/ja/images/visible-columns.png -share/doc/Thunar/html/ja/index.html -share/doc/Thunar/html/ja/preferences.html -share/doc/Thunar/html/ja/support.html -share/doc/Thunar/html/ja/the-file-manager-window.html -share/doc/Thunar/html/ja/using-removable-media.html -share/doc/Thunar/html/ja/working-with-files-and-folders.html -share/doc/Thunar/html/nl/advanced-topics.html -share/doc/Thunar/html/nl/copyright.html -share/doc/Thunar/html/nl/customizing-thunar.html -share/doc/Thunar/html/nl/faq.html -share/doc/Thunar/html/nl/images/bulk-rename.png -share/doc/Thunar/html/nl/images/file-manager-window.png -share/doc/Thunar/html/nl/images/file-properties.png -share/doc/Thunar/html/nl/images/preferences-advanced.png -share/doc/Thunar/html/nl/images/preferences-behavior.png -share/doc/Thunar/html/nl/images/preferences-side-pane.png -share/doc/Thunar/html/nl/images/preferences-views.png -share/doc/Thunar/html/nl/images/removable-drives-and-media.png -share/doc/Thunar/html/nl/images/removable-media-unmount.png -share/doc/Thunar/html/nl/images/sendto-menu.png -share/doc/Thunar/html/nl/images/visible-columns.png -share/doc/Thunar/html/nl/index.html -share/doc/Thunar/html/nl/preferences.html -share/doc/Thunar/html/nl/support.html -share/doc/Thunar/html/nl/the-file-manager-window.html -share/doc/Thunar/html/nl/using-removable-media.html -share/doc/Thunar/html/nl/working-with-files-and-folders.html -share/doc/Thunar/html/pl/advanced-topics.html -share/doc/Thunar/html/pl/copyright.html -share/doc/Thunar/html/pl/customizing-thunar.html -share/doc/Thunar/html/pl/faq.html -share/doc/Thunar/html/pl/images/bulk-rename.png -share/doc/Thunar/html/pl/images/file-manager-window.png -share/doc/Thunar/html/pl/images/file-properties.png -share/doc/Thunar/html/pl/images/preferences-advanced.png -share/doc/Thunar/html/pl/images/preferences-behavior.png -share/doc/Thunar/html/pl/images/preferences-side-pane.png -share/doc/Thunar/html/pl/images/preferences-views.png -share/doc/Thunar/html/pl/images/removable-drives-and-media.png -share/doc/Thunar/html/pl/images/removable-media-unmount.png -share/doc/Thunar/html/pl/images/sendto-menu.png -share/doc/Thunar/html/pl/images/visible-columns.png -share/doc/Thunar/html/pl/index.html -share/doc/Thunar/html/pl/preferences.html -share/doc/Thunar/html/pl/support.html -share/doc/Thunar/html/pl/the-file-manager-window.html -share/doc/Thunar/html/pl/using-removable-media.html -share/doc/Thunar/html/pl/working-with-files-and-folders.html -share/doc/Thunar/html/ru/advanced-topics.html -share/doc/Thunar/html/ru/copyright.html -share/doc/Thunar/html/ru/customizing-thunar.html -share/doc/Thunar/html/ru/faq.html -share/doc/Thunar/html/ru/images/bulk-rename.png -share/doc/Thunar/html/ru/images/file-manager-window.png -share/doc/Thunar/html/ru/images/file-properties.png -share/doc/Thunar/html/ru/images/preferences-advanced.png -share/doc/Thunar/html/ru/images/preferences-behavior.png -share/doc/Thunar/html/ru/images/preferences-side-pane.png -share/doc/Thunar/html/ru/images/preferences-views.png -share/doc/Thunar/html/ru/images/removable-drives-and-media.png -share/doc/Thunar/html/ru/images/removable-media-unmount.png -share/doc/Thunar/html/ru/images/sendto-menu.png -share/doc/Thunar/html/ru/images/visible-columns.png -share/doc/Thunar/html/ru/index.html -share/doc/Thunar/html/ru/preferences.html -share/doc/Thunar/html/ru/support.html -share/doc/Thunar/html/ru/the-file-manager-window.html -share/doc/Thunar/html/ru/using-removable-media.html -share/doc/Thunar/html/ru/working-with-files-and-folders.html -share/doc/Thunar/html/thunar.css -share/doc/Thunar/html/tr/advanced-topics.html -share/doc/Thunar/html/tr/copyright.html -share/doc/Thunar/html/tr/customizing-thunar.html -share/doc/Thunar/html/tr/faq.html -share/doc/Thunar/html/tr/images/bulk-rename.png -share/doc/Thunar/html/tr/images/file-manager-window.png -share/doc/Thunar/html/tr/images/file-properties.png -share/doc/Thunar/html/tr/images/preferences-advanced.png -share/doc/Thunar/html/tr/images/preferences-behavior.png -share/doc/Thunar/html/tr/images/preferences-side-pane.png -share/doc/Thunar/html/tr/images/preferences-views.png -share/doc/Thunar/html/tr/images/removable-drives-and-media.png -share/doc/Thunar/html/tr/images/removable-media-unmount.png -share/doc/Thunar/html/tr/images/sendto-menu.png -share/doc/Thunar/html/tr/images/visible-columns.png -share/doc/Thunar/html/tr/index.html -share/doc/Thunar/html/tr/preferences.html -share/doc/Thunar/html/tr/support.html -share/doc/Thunar/html/tr/the-file-manager-window.html -share/doc/Thunar/html/tr/using-removable-media.html -share/doc/Thunar/html/tr/working-with-files-and-folders.html -share/doc/Thunar/html/zh_TW/advanced-topics.html -share/doc/Thunar/html/zh_TW/copyright.html -share/doc/Thunar/html/zh_TW/customizing-thunar.html -share/doc/Thunar/html/zh_TW/faq.html -share/doc/Thunar/html/zh_TW/images/bulk-rename.png -share/doc/Thunar/html/zh_TW/images/file-manager-window.png -share/doc/Thunar/html/zh_TW/images/file-properties.png -share/doc/Thunar/html/zh_TW/images/preferences-advanced.png -share/doc/Thunar/html/zh_TW/images/preferences-behavior.png -share/doc/Thunar/html/zh_TW/images/preferences-side-pane.png -share/doc/Thunar/html/zh_TW/images/preferences-views.png -share/doc/Thunar/html/zh_TW/images/removable-drives-and-media.png -share/doc/Thunar/html/zh_TW/images/removable-media-unmount.png -share/doc/Thunar/html/zh_TW/images/sendto-menu.png -share/doc/Thunar/html/zh_TW/images/visible-columns.png -share/doc/Thunar/html/zh_TW/index.html -share/doc/Thunar/html/zh_TW/preferences.html -share/doc/Thunar/html/zh_TW/support.html -share/doc/Thunar/html/zh_TW/the-file-manager-window.html -share/doc/Thunar/html/zh_TW/using-removable-media.html -share/doc/Thunar/html/zh_TW/working-with-files-and-folders.html share/examples/xfce4/Thunar/uca.xml -share/gtk-doc/html/thunar-vfs/ThunarVfsGroup.html -share/gtk-doc/html/thunar-vfs/ThunarVfsJob.html -share/gtk-doc/html/thunar-vfs/ThunarVfsMimeAction.html -share/gtk-doc/html/thunar-vfs/ThunarVfsMimeApplication.html -share/gtk-doc/html/thunar-vfs/ThunarVfsMimeDatabase.html -share/gtk-doc/html/thunar-vfs/ThunarVfsMimeHandler.html -share/gtk-doc/html/thunar-vfs/ThunarVfsMonitor.html -share/gtk-doc/html/thunar-vfs/ThunarVfsUser.html -share/gtk-doc/html/thunar-vfs/ThunarVfsUserManager.html -share/gtk-doc/html/thunar-vfs/ThunarVfsVolume.html -share/gtk-doc/html/thunar-vfs/ThunarVfsVolumeManager.html -share/gtk-doc/html/thunar-vfs/filesystem-monitoring.html -share/gtk-doc/html/thunar-vfs/fundamentals.html -share/gtk-doc/html/thunar-vfs/home.png -share/gtk-doc/html/thunar-vfs/index.html -share/gtk-doc/html/thunar-vfs/index.sgml -share/gtk-doc/html/thunar-vfs/introduction.html -share/gtk-doc/html/thunar-vfs/ix01.html -share/gtk-doc/html/thunar-vfs/jobs.html -share/gtk-doc/html/thunar-vfs/left.png -share/gtk-doc/html/thunar-vfs/mime-types.html -share/gtk-doc/html/thunar-vfs/right.png -share/gtk-doc/html/thunar-vfs/style.css -share/gtk-doc/html/thunar-vfs/thunar-vfs-Basic-Types.html -share/gtk-doc/html/thunar-vfs/thunar-vfs-Initialization-and-Shutdown.html -share/gtk-doc/html/thunar-vfs/thunar-vfs-Jobs.html -share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsInfo.html -share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsMimeInfo.html -share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsPath.html -share/gtk-doc/html/thunar-vfs/thunar-vfs-Utility-Functions.html -share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp -share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp2 -share/gtk-doc/html/thunar-vfs/up.png -share/gtk-doc/html/thunar-vfs/users-and-groups-handling.html -share/gtk-doc/html/thunar-vfs/volume-handling.html share/gtk-doc/html/thunarx/ThunarxFileInfo.html share/gtk-doc/html/thunarx/ThunarxMenuProvider.html share/gtk-doc/html/thunarx/ThunarxPreferencesProvider.html @@ -373,8 +47,10 @@ share/gtk-doc/html/thunarx/home.png share/gtk-doc/html/thunarx/index.html share/gtk-doc/html/thunarx/index.sgml share/gtk-doc/html/thunarx/ix01.html +share/gtk-doc/html/thunarx/left-insensitive.png share/gtk-doc/html/thunarx/left.png share/gtk-doc/html/thunarx/menu-provider.png +share/gtk-doc/html/thunarx/right-insensitive.png share/gtk-doc/html/thunarx/right.png share/gtk-doc/html/thunarx/say-hello.png share/gtk-doc/html/thunarx/style.css @@ -387,23 +63,32 @@ share/gtk-doc/html/thunarx/thunarx-using-extensions.html share/gtk-doc/html/thunarx/thunarx-writing-extensions-advanced-topics.html share/gtk-doc/html/thunarx/thunarx-writing-extensions-getting-started.html share/gtk-doc/html/thunarx/thunarx-writing-extensions.html -share/gtk-doc/html/thunarx/thunarx.devhelp share/gtk-doc/html/thunarx/thunarx.devhelp2 +share/gtk-doc/html/thunarx/up-insensitive.png share/gtk-doc/html/thunarx/up.png +share/icons/hicolor/128x128/apps/Thunar.png share/icons/hicolor/16x16/apps/Thunar.png +share/icons/hicolor/16x16/stock/navigation/stock_folder-copy.png +share/icons/hicolor/16x16/stock/navigation/stock_folder-move.png share/icons/hicolor/16x16/stock/navigation/stock_thunar-shortcuts.png -share/icons/hicolor/16x16/stock/navigation/stock_thunar-templates.png share/icons/hicolor/24x24/apps/Thunar.png +share/icons/hicolor/24x24/stock/navigation/stock_folder-copy.png +share/icons/hicolor/24x24/stock/navigation/stock_folder-move.png share/icons/hicolor/48x48/apps/Thunar.png +share/icons/hicolor/64x64/apps/Thunar.png share/icons/hicolor/scalable/apps/Thunar.svg +share/locale/am/LC_MESSAGES/Thunar.mo share/locale/ar/LC_MESSAGES/Thunar.mo +share/locale/ast/LC_MESSAGES/Thunar.mo share/locale/be/LC_MESSAGES/Thunar.mo +share/locale/bg/LC_MESSAGES/Thunar.mo +share/locale/bn/LC_MESSAGES/Thunar.mo share/locale/ca/LC_MESSAGES/Thunar.mo share/locale/cs/LC_MESSAGES/Thunar.mo share/locale/da/LC_MESSAGES/Thunar.mo share/locale/de/LC_MESSAGES/Thunar.mo -share/locale/dz/LC_MESSAGES/Thunar.mo share/locale/el/LC_MESSAGES/Thunar.mo +share/locale/en_AU/LC_MESSAGES/Thunar.mo share/locale/en_GB/LC_MESSAGES/Thunar.mo share/locale/eo/LC_MESSAGES/Thunar.mo share/locale/es/LC_MESSAGES/Thunar.mo @@ -413,34 +98,44 @@ share/locale/fi/LC_MESSAGES/Thunar.mo share/locale/fr/LC_MESSAGES/Thunar.mo share/locale/gl/LC_MESSAGES/Thunar.mo share/locale/he/LC_MESSAGES/Thunar.mo +share/locale/hr/LC_MESSAGES/Thunar.mo share/locale/hu/LC_MESSAGES/Thunar.mo share/locale/id/LC_MESSAGES/Thunar.mo +share/locale/is/LC_MESSAGES/Thunar.mo share/locale/it/LC_MESSAGES/Thunar.mo share/locale/ja/LC_MESSAGES/Thunar.mo -share/locale/ka/LC_MESSAGES/Thunar.mo +share/locale/kk/LC_MESSAGES/Thunar.mo share/locale/ko/LC_MESSAGES/Thunar.mo -share/locale/ku/LC_MESSAGES/Thunar.mo share/locale/lt/LC_MESSAGES/Thunar.mo share/locale/lv/LC_MESSAGES/Thunar.mo -share/locale/mk/LC_MESSAGES/Thunar.mo +share/locale/ms/LC_MESSAGES/Thunar.mo share/locale/nb/LC_MESSAGES/Thunar.mo share/locale/nl/LC_MESSAGES/Thunar.mo share/locale/nn/LC_MESSAGES/Thunar.mo +share/locale/oc/LC_MESSAGES/Thunar.mo share/locale/pa/LC_MESSAGES/Thunar.mo share/locale/pl/LC_MESSAGES/Thunar.mo share/locale/pt/LC_MESSAGES/Thunar.mo share/locale/pt_BR/LC_MESSAGES/Thunar.mo share/locale/ro/LC_MESSAGES/Thunar.mo share/locale/ru/LC_MESSAGES/Thunar.mo +share/locale/si/LC_MESSAGES/Thunar.mo share/locale/sk/LC_MESSAGES/Thunar.mo +share/locale/sl/LC_MESSAGES/Thunar.mo share/locale/sq/LC_MESSAGES/Thunar.mo +share/locale/sr/LC_MESSAGES/Thunar.mo share/locale/sv/LC_MESSAGES/Thunar.mo +share/locale/te/LC_MESSAGES/Thunar.mo +share/locale/th/LC_MESSAGES/Thunar.mo share/locale/tr/LC_MESSAGES/Thunar.mo +share/locale/ug/LC_MESSAGES/Thunar.mo share/locale/uk/LC_MESSAGES/Thunar.mo share/locale/ur/LC_MESSAGES/Thunar.mo +share/locale/ur_PK/LC_MESSAGES/Thunar.mo +share/locale/vi/LC_MESSAGES/Thunar.mo share/locale/zh_CN/LC_MESSAGES/Thunar.mo +share/locale/zh_HK/LC_MESSAGES/Thunar.mo share/locale/zh_TW/LC_MESSAGES/Thunar.mo share/pixmaps/Thunar/Thunar-about-logo.png -share/pixmaps/Thunar/Thunar-fallback-icon.png -share/thumbnailers/thunar-vfs-font-thumbnailer-1.desktop -share/xfce4/panel-plugins/thunar-tpa.desktop +share/polkit-1/actions/org.xfce.thunar.policy +share/xfce4/panel/plugins/thunar-tpa.desktop diff --git a/sysutils/xfce4-thunar/buildlink3.mk b/sysutils/xfce4-thunar/buildlink3.mk index 42aa5c35daf..ecde9add104 100644 --- a/sysutils/xfce4-thunar/buildlink3.mk +++ b/sysutils/xfce4-thunar/buildlink3.mk @@ -1,33 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.33 2014/05/05 00:48:23 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2015/04/21 08:56:41 jperkin Exp $ BUILDLINK_TREE+= xfce4-thunar .if !defined(XFCE4_THUNAR_BUILDLINK3_MK) XFCE4_THUNAR_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-thunar+= xfce4-thunar>=1.0.0 -BUILDLINK_ABI_DEPENDS.xfce4-thunar+= xfce4-thunar>=1.0.1nb23 +BUILDLINK_API_DEPENDS.xfce4-thunar+= xfce4-thunar>=1.6.6 BUILDLINK_PKGSRCDIR.xfce4-thunar?= ../../sysutils/xfce4-thunar -pkgbase := xfce4-thunar -.include "../../mk/pkg-build-options.mk" - -.if !empty(PKG_BUILD_OPTIONS.xfce4-thunar:Mhal) -.include "../../sysutils/hal/buildlink3.mk" -.endif - -.include "../../devel/GConf/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/xfce4-exo/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.include "../../mk/fam.buildlink3.mk" -.endif # XFCE4_THUNAR_BUILDLINK3_MK +.endif # XFCE4_THUNAR_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-thunar diff --git a/sysutils/xfce4-thunar/distinfo b/sysutils/xfce4-thunar/distinfo index 0f09b3aa233..cc9e9d19d06 100644 --- a/sysutils/xfce4-thunar/distinfo +++ b/sysutils/xfce4-thunar/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.7 2012/01/25 23:37:16 tez Exp $ +$NetBSD: distinfo,v 1.8 2015/04/21 08:56:41 jperkin Exp $ -SHA1 (Thunar-1.0.1.tar.bz2) = 2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064 -RMD160 (Thunar-1.0.1.tar.bz2) = 203690b9eb05ca8e5248bb026f98b8e3e6881f2c -Size (Thunar-1.0.1.tar.bz2) = 8802672 bytes -SHA1 (patch-aa) = c9d9dfb4c177aab2e8a43e46998652cc72daefa5 -SHA1 (patch-ab) = e5c3f1e853bf59f69047c7160a3e29df54298879 -SHA1 (patch-ac) = 745f240ff44b0b21eb727b0a9887c9d8f1ee8a47 -SHA1 (patch-thunar-vfs_thunar-vfs-io-jobs.c) = 8529460dea3353b7b8bb034c65c95e4561f61aab +SHA1 (Thunar-1.6.6.tar.bz2) = 9d7ba73376efa1ecb580b227cfc4fd29fe4b8ecb +RMD160 (Thunar-1.6.6.tar.bz2) = f5c13a06f3b983f0a5ca90b8745d1b3da65ee477 +Size (Thunar-1.6.6.tar.bz2) = 2160158 bytes +SHA1 (patch-ThunarBulkRename.in) = 794e3a3182b9aa9604d8013810d5cde63edf99fb +SHA1 (patch-ac) = 2ea54cce7c432857fe558726c6fcd5d396ad2385 +SHA1 (patch-org.xfce.FileManager.service.in) = 94b0e3f3571f9b5c616294bfad4581e1aa9b04d5 +SHA1 (patch-org.xfce.Thunar.service.in) = 5793694a69de0fcbebf19bcfe5d9bd0f42de0b79 +SHA1 (patch-thunar_Makefile.in) = 7f337d5c654495ce5b246ead50b0e2aad118fe1f diff --git a/sysutils/xfce4-thunar/options.mk b/sysutils/xfce4-thunar/options.mk index b922c37213b..f819d685cd1 100644 --- a/sysutils/xfce4-thunar/options.mk +++ b/sysutils/xfce4-thunar/options.mk @@ -1,14 +1,12 @@ -# $NetBSD: options.mk,v 1.1 2008/12/09 10:36:24 ahoka Exp $ +# $NetBSD: options.mk,v 1.2 2015/04/21 08:56:41 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xfce4-thunar -PKG_SUPPORTED_OPTIONS= hal -PKG_SUGGESTED_OPTIONS= hal +PKG_SUPPORTED_OPTIONS= gvfs +PKG_SUGGESTED_OPTIONS= .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mhal) -.include "../../sysutils/hal/buildlink3.mk" -CONFIGURE_ARGS+= --enable-hal -.else -CONFIGURE_ARGS+= --disable-hal +# for trash support, and remote filesystems +.if !empty(PKG_OPTIONS:Mgvfs) +DEPENDS+= gvfs-[0-9]*:../../sysutils/gvfs .endif diff --git a/sysutils/xfce4-thunar/patches/patch-ThunarBulkRename.in b/sysutils/xfce4-thunar/patches/patch-ThunarBulkRename.in new file mode 100644 index 00000000000..1d0f2d4bd29 --- /dev/null +++ b/sysutils/xfce4-thunar/patches/patch-ThunarBulkRename.in @@ -0,0 +1,13 @@ +$NetBSD: patch-ThunarBulkRename.in,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +Look for the right thunar binary. +--- ThunarBulkRename.in.orig 2013-07-30 05:44:48.000000000 +0000 ++++ ThunarBulkRename.in +@@ -22,6 +22,6 @@ + # This is an ugly hack, required because xfdesktop simply + # strips off all parameters from the Exec field, and so + # we cannot just invoke Thunar --bulk-rename %F there +-exec @bindir@/Thunar --bulk-rename $@ ++exec @bindir@/thunar --bulk-rename $@ + + # vim:set ts=2 sw=2 et ai: diff --git a/sysutils/xfce4-thunar/patches/patch-aa b/sysutils/xfce4-thunar/patches/patch-aa deleted file mode 100644 index 2ee0d023017..00000000000 --- a/sysutils/xfce4-thunar/patches/patch-aa +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2008/06/20 15:37:43 joerg Exp $ - ---- thunar-vfs/thunar-vfs-marshal.h.orig 2007-12-02 13:48:10.000000000 +0000 -+++ thunar-vfs/thunar-vfs-marshal.h -@@ -12,7 +12,7 @@ extern void _thunar_vfs_marshal_BOOLEAN_ - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, -- gpointer marshal_data) G_GNUC_INTERNAL; -+ gpointer marshal_data); - - /* FLAGS:BOXED,BOXED (thunar-vfs-marshal.list:2) */ - extern void _thunar_vfs_marshal_FLAGS__BOXED_BOXED (GClosure *closure, -@@ -20,7 +20,7 @@ extern void _thunar_vfs_marshal_FLAGS__B - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, -- gpointer marshal_data) G_GNUC_INTERNAL; -+ gpointer marshal_data); - - /* FLAGS:STRING,FLAGS (thunar-vfs-marshal.list:3) */ - extern void _thunar_vfs_marshal_FLAGS__STRING_FLAGS (GClosure *closure, -@@ -28,7 +28,7 @@ extern void _thunar_vfs_marshal_FLAGS__S - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, -- gpointer marshal_data) G_GNUC_INTERNAL; -+ gpointer marshal_data); - - /* VOID:UINT64,UINT,UINT,UINT (thunar-vfs-marshal.list:4) */ - extern void _thunar_vfs_marshal_VOID__UINT64_UINT_UINT_UINT (GClosure *closure, -@@ -36,7 +36,7 @@ extern void _thunar_vfs_marshal_VOID__UI - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, -- gpointer marshal_data) G_GNUC_INTERNAL; -+ gpointer marshal_data); - - G_END_DECLS - diff --git a/sysutils/xfce4-thunar/patches/patch-ab b/sysutils/xfce4-thunar/patches/patch-ab deleted file mode 100644 index dbaa69a9dd1..00000000000 --- a/sysutils/xfce4-thunar/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2009/09/16 01:15:34 reed Exp $ - ---- configure.orig 2009-02-24 21:09:38.000000000 +0000 -+++ configure -@@ -21169,7 +21169,7 @@ fi - { echo "$as_me:$LINENO: checking for operating system support" >&5 - echo $ECHO_N "checking for operating system support... $ECHO_C" >&6; } - case "$target_os" in -- dragonfly*|freebsd*|netbsd*|openbsd*|darwin*) -+ freebsd*|netbsd*|openbsd*|darwin*) - ac_bm_thunar_vfs_os_impl=bsd - ;; - diff --git a/sysutils/xfce4-thunar/patches/patch-ac b/sysutils/xfce4-thunar/patches/patch-ac index 585cf91f0c0..a5542e112cd 100644 --- a/sysutils/xfce4-thunar/patches/patch-ac +++ b/sysutils/xfce4-thunar/patches/patch-ac @@ -1,10 +1,11 @@ -$NetBSD: patch-ac,v 1.2 2009/09/16 01:15:34 reed Exp $ +$NetBSD: patch-ac,v 1.3 2015/04/21 08:56:41 jperkin Exp $ ---- plugins/thunar-uca/Makefile.in.orig 2008-11-29 17:25:52.000000000 +0900 -+++ plugins/thunar-uca/Makefile.in 2008-11-29 17:27:26.000000000 +0900 -@@ -383,7 +383,7 @@ - -module \ - $(PLATFORM_LDFLAGS) +Adjust config path. +--- plugins/thunar-uca/Makefile.in.orig 2015-02-28 16:51:04.000000000 +0000 ++++ plugins/thunar-uca/Makefile.in +@@ -510,7 +510,7 @@ thunar_uca_la_LIBADD = \ + thunar_uca_la_DEPENDENCIES = \ + $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la -defaultsdir = $(sysconfdir)/xdg/Thunar +defaultsdir = $(datadir)/examples/xfce4/Thunar diff --git a/sysutils/xfce4-thunar/patches/patch-org.xfce.FileManager.service.in b/sysutils/xfce4-thunar/patches/patch-org.xfce.FileManager.service.in new file mode 100644 index 00000000000..83a307d8afd --- /dev/null +++ b/sysutils/xfce4-thunar/patches/patch-org.xfce.FileManager.service.in @@ -0,0 +1,10 @@ +$NetBSD: patch-org.xfce.FileManager.service.in,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +Our installed thunar is all lower-case. +--- org.xfce.FileManager.service.in.orig 2013-07-30 05:44:48.000000000 +0000 ++++ org.xfce.FileManager.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.xfce.FileManager +-Exec=@bindir@/Thunar --daemon ++Exec=@bindir@/thunar --daemon diff --git a/sysutils/xfce4-thunar/patches/patch-org.xfce.Thunar.service.in b/sysutils/xfce4-thunar/patches/patch-org.xfce.Thunar.service.in new file mode 100644 index 00000000000..332031cb6fa --- /dev/null +++ b/sysutils/xfce4-thunar/patches/patch-org.xfce.Thunar.service.in @@ -0,0 +1,10 @@ +$NetBSD: patch-org.xfce.Thunar.service.in,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +Our installed thunar is all lower-case. +--- org.xfce.Thunar.service.in.orig 2013-07-30 05:44:48.000000000 +0000 ++++ org.xfce.Thunar.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.xfce.Thunar +-Exec=@bindir@/Thunar --daemon ++Exec=@bindir@/thunar --daemon diff --git a/sysutils/xfce4-thunar/patches/patch-thunar-vfs_thunar-vfs-io-jobs.c b/sysutils/xfce4-thunar/patches/patch-thunar-vfs_thunar-vfs-io-jobs.c deleted file mode 100644 index aca87c26e73..00000000000 --- a/sysutils/xfce4-thunar/patches/patch-thunar-vfs_thunar-vfs-io-jobs.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-thunar-vfs_thunar-vfs-io-jobs.c,v 1.1 2012/01/25 23:37:17 tez Exp $ - -Per PR#45871 Solaris derived OSs haven't DEFFILEMODE defined -so define it if it is not defined. - ---- thunar-vfs/thunar-vfs-io-jobs.c.orig 2012-01-25 23:28:41.920049200 +0000 -+++ thunar-vfs/thunar-vfs-io-jobs.c -@@ -60,6 +60,9 @@ - #endif - - -+#ifndef DEFFILEMODE -+#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) -+#endif - - static GList *tvij_collect_nofollow (ThunarVfsJob *job, - GList *base_path_list, diff --git a/sysutils/xfce4-thunar/patches/patch-thunar_Makefile.in b/sysutils/xfce4-thunar/patches/patch-thunar_Makefile.in new file mode 100644 index 00000000000..695381c1e5e --- /dev/null +++ b/sysutils/xfce4-thunar/patches/patch-thunar_Makefile.in @@ -0,0 +1,27 @@ +$NetBSD: patch-thunar_Makefile.in,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +Don't link Thunar to thunar. +--- thunar/Makefile.in.orig 2015-04-01 17:26:19.000000000 +0000 ++++ thunar/Makefile.in +@@ -2617,7 +2617,7 @@ install-dvi-am: + + install-exec-am: install-binPROGRAMS install-binSCRIPTS + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook ++ $(MAKE) $(AM_MAKEFLAGS) #install-exec-hook + install-html: install-html-am + + install-html-am: +@@ -2681,9 +2681,9 @@ uninstall-am: uninstall-binPROGRAMS unin + @INTLTOOL_DESKTOP_RULE@ + + # install symlink to 'thunar' +-install-exec-hook: +- $(mkinstalldirs) $(DESTDIR)$(bindir) +- -( cd $(DESTDIR)$(bindir) ; test -x Thunar || ln -sf thunar Thunar ) ++#install-exec-hook: ++# $(mkinstalldirs) $(DESTDIR)$(bindir) ++# -( cd $(DESTDIR)$(bindir) ; test -x Thunar || ln -sf thunar Thunar ) + + clean-local: + rm -f *.core core core.* diff --git a/sysutils/xfce4-verve-plugin/DESCR b/sysutils/xfce4-verve-plugin/DESCR new file mode 100644 index 00000000000..4770e2ca762 --- /dev/null +++ b/sysutils/xfce4-verve-plugin/DESCR @@ -0,0 +1,8 @@ +The Verve panel plugin is a comfortable command line plugin for the Xfce panel. +It supports several nice features, such as: + + Command history + Auto-completion (including command history) + Open URLs and eMail addresses in your favourite applications + Focus grabbing via D-BUS (so you can bind a shortcut to it) + Custom input field width diff --git a/sysutils/xfce4-verve-plugin/Makefile b/sysutils/xfce4-verve-plugin/Makefile new file mode 100644 index 00000000000..b54eb8c4be1 --- /dev/null +++ b/sysutils/xfce4-verve-plugin/Makefile @@ -0,0 +1,14 @@ +# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +.include "../../meta-pkgs/xfce4/Makefile.common" + +DISTNAME= xfce4-verve-plugin-1.0.1 +CATEGORIES= sysutils +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/1.0/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin +COMMENT= Xfce command line plugin + +.include "../../x11/xfce4-exo/buildlink3.mk" +.include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-verve-plugin/PLIST b/sysutils/xfce4-verve-plugin/PLIST new file mode 100644 index 00000000000..e0107f6f287 --- /dev/null +++ b/sysutils/xfce4-verve-plugin/PLIST @@ -0,0 +1,51 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:41 jperkin Exp $ +bin/verve-focus +lib/xfce4/panel/plugins/libverve.la +share/locale/ar/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/bg/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/ca/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/cs/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/de/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/en_AU/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/eo/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/eu/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/fr/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/gl/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/is/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/ko/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/ms/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/oc/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/pa/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/pl/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/ro/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/th/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/uk/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/vi/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-verve-plugin.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-verve-plugin.mo +share/xfce4/panel/plugins/xfce4-verve-plugin.desktop diff --git a/sysutils/xfce4-verve-plugin/distinfo b/sysutils/xfce4-verve-plugin/distinfo new file mode 100644 index 00000000000..1a1bc4b90da --- /dev/null +++ b/sysutils/xfce4-verve-plugin/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2015/04/21 08:56:41 jperkin Exp $ + +SHA1 (xfce4-verve-plugin-1.0.1.tar.bz2) = 3dd97de37046469506883dff06bf2f71703f60c8 +RMD160 (xfce4-verve-plugin-1.0.1.tar.bz2) = 5ce9fc6892cf19dee4ab42eb8858e02e28a8d82e +Size (xfce4-verve-plugin-1.0.1.tar.bz2) = 325191 bytes diff --git a/sysutils/xfce4-volman/DESCR b/sysutils/xfce4-volman/DESCR deleted file mode 100644 index 4398fcf1b81..00000000000 --- a/sysutils/xfce4-volman/DESCR +++ /dev/null @@ -1 +0,0 @@ -HAL backed volume manager for Thunar and Xfce. diff --git a/sysutils/xfce4-volman/Makefile b/sysutils/xfce4-volman/Makefile deleted file mode 100644 index 74a0a38943c..00000000000 --- a/sysutils/xfce4-volman/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.30 2014/05/05 00:48:23 ryoon Exp $ - -.include "../../meta-pkgs/xfce4/Makefile.common" - -XFCE4_VERSION= 0.2.0 - -DISTNAME= thunar-volman-${XFCE4_VERSION} -PKGNAME= ${DISTNAME:S/thunar/xfce4/} -PKGREVISION= 25 -CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/thunar-volman/ -COMMENT= Thunar volume manager - - -.include "../../x11/xfce4-exo/buildlink3.mk" -.include "../../sysutils/xfce4-thunar/buildlink3.mk" -.include "../../sysutils/hal/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-volman/PLIST b/sysutils/xfce4-volman/PLIST deleted file mode 100644 index 51947c89a66..00000000000 --- a/sysutils/xfce4-volman/PLIST +++ /dev/null @@ -1,22 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:22 joerg Exp $ -bin/thunar-volman -libexec/thunar-volman-settings -share/applications/thunar-volman-settings.desktop -share/icons/hicolor/48x48/apps/tvm-burn-cd.png -share/icons/hicolor/48x48/apps/tvm-dev-pocketpc.png -share/icons/hicolor/48x48/apps/tvm-dev-tablet.png -share/icons/hicolor/scalable/apps/tvm-burn-cd.svg -share/locale/de/LC_MESSAGES/thunar-volman.mo -share/locale/en_GB/LC_MESSAGES/thunar-volman.mo -share/locale/eu/LC_MESSAGES/thunar-volman.mo -share/locale/fi/LC_MESSAGES/thunar-volman.mo -share/locale/fr/LC_MESSAGES/thunar-volman.mo -share/locale/hu/LC_MESSAGES/thunar-volman.mo -share/locale/it/LC_MESSAGES/thunar-volman.mo -share/locale/lv/LC_MESSAGES/thunar-volman.mo -share/locale/nb_NO/LC_MESSAGES/thunar-volman.mo -share/locale/pl/LC_MESSAGES/thunar-volman.mo -share/locale/pt_BR/LC_MESSAGES/thunar-volman.mo -share/locale/uk/LC_MESSAGES/thunar-volman.mo -share/locale/ur/LC_MESSAGES/thunar-volman.mo -share/locale/zh_TW/LC_MESSAGES/thunar-volman.mo diff --git a/sysutils/xfce4-volman/buildlink3.mk b/sysutils/xfce4-volman/buildlink3.mk deleted file mode 100644 index 18382bf3bc4..00000000000 --- a/sysutils/xfce4-volman/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.1 2009/11/05 20:15:40 reinoud Exp $ - -BUILDLINK_TREE+= xfce4-volman - -.if !defined(XFCE4_VOLMAN_BUILDLINK3_MK) -XFCE4_VOLMAN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-volman+= xfce4-volman>=0.2.0nb2 -BUILDLINK_PKGSRCDIR.xfce4-volman?= ../../sysutils/xfce4-volman - -.endif # XFCE4_VOLMAN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-volman diff --git a/sysutils/xfce4-volman/distinfo b/sysutils/xfce4-volman/distinfo deleted file mode 100644 index ea6fe2d4670..00000000000 --- a/sysutils/xfce4-volman/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/12/09 10:32:26 ahoka Exp $ - -SHA1 (thunar-volman-0.2.0.tar.bz2) = d5be8b7d35da7527b73b6b7c178d2d274c81263d -RMD160 (thunar-volman-0.2.0.tar.bz2) = 15af5f63fc0c2a94f870d860cbbea01affc66517 -Size (thunar-volman-0.2.0.tar.bz2) = 348443 bytes diff --git a/sysutils/xfce4-xarchiver/Makefile b/sysutils/xfce4-xarchiver/Makefile index 9c3c1927567..e04126c1b81 100644 --- a/sysutils/xfce4-xarchiver/Makefile +++ b/sysutils/xfce4-xarchiver/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.28 2014/05/05 00:48:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.29 2015/04/21 08:56:42 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.5.2 - -DISTNAME= xarchiver-${XFCE4_VERSION} -PKGNAME= xfce4-xarchiver-${XFCE4_VERSION} -PKGREVISION= 22 +VERSION= 0.5.4 +DISTNAME= xarchiver-${VERSION} +PKGNAME= xfce4-xarchiver-${VERSION} CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xarchiver/} + +HOMEPAGE= http://xarchiver.sourceforge.net/ COMMENT= Xfce archiver handler .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-xarchiver/PLIST b/sysutils/xfce4-xarchiver/PLIST index 3ca77fbe9ea..9f73d14a08c 100644 --- a/sysutils/xfce4-xarchiver/PLIST +++ b/sysutils/xfce4-xarchiver/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:22 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2015/04/21 08:56:42 jperkin Exp $ bin/xarchiver libexec/thunar-archive-plugin/xarchiver.tap share/applications/xarchiver.desktop @@ -45,9 +45,9 @@ share/icons/hicolor/24x24/apps/xarchiver.png share/icons/hicolor/48x48/apps/xarchiver.png share/icons/hicolor/scalable/apps/xarchiver.svg share/locale/bg/LC_MESSAGES/xarchiver.mo -share/locale/da/LC_MESSAGES/xarchiver.mo share/locale/ca/LC_MESSAGES/xarchiver.mo share/locale/cs/LC_MESSAGES/xarchiver.mo +share/locale/da/LC_MESSAGES/xarchiver.mo share/locale/de/LC_MESSAGES/xarchiver.mo share/locale/el/LC_MESSAGES/xarchiver.mo share/locale/en_GB/LC_MESSAGES/xarchiver.mo @@ -61,8 +61,8 @@ share/locale/ja/LC_MESSAGES/xarchiver.mo share/locale/nb_NO/LC_MESSAGES/xarchiver.mo share/locale/nl/LC_MESSAGES/xarchiver.mo share/locale/pl/LC_MESSAGES/xarchiver.mo -share/locale/pt_PT/LC_MESSAGES/xarchiver.mo share/locale/pt_BR/LC_MESSAGES/xarchiver.mo +share/locale/pt_PT/LC_MESSAGES/xarchiver.mo share/locale/ru/LC_MESSAGES/xarchiver.mo share/locale/sq/LC_MESSAGES/xarchiver.mo share/locale/sv/LC_MESSAGES/xarchiver.mo diff --git a/sysutils/xfce4-xarchiver/buildlink3.mk b/sysutils/xfce4-xarchiver/buildlink3.mk deleted file mode 100644 index f2012617e89..00000000000 --- a/sysutils/xfce4-xarchiver/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.26 2014/05/05 00:48:23 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-xarchiver - -.if !defined(XFCE4_XARCHIVER_BUILDLINK3_MK) -XFCE4_XARCHIVER_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-xarchiver+= xfce4-xarchiver>=0.5.2nb1 -BUILDLINK_ABI_DEPENDS.xfce4-xarchiver+= xfce4-xarchiver>=0.5.2nb22 -BUILDLINK_PKGSRCDIR.xfce4-xarchiver?= ../../sysutils/xfce4-xarchiver - -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_XARCHIVER_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-xarchiver diff --git a/sysutils/xfce4-xarchiver/distinfo b/sysutils/xfce4-xarchiver/distinfo index 2f76f464eed..ebdb1fd0a84 100644 --- a/sysutils/xfce4-xarchiver/distinfo +++ b/sysutils/xfce4-xarchiver/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.3 2015/04/21 08:56:42 jperkin Exp $ -SHA1 (xarchiver-0.5.2.tar.bz2) = 8c8f0ee82c93abcdcf9974fa30611aa05fa51bd0 -RMD160 (xarchiver-0.5.2.tar.bz2) = 77b1daadd39fd86c5582c75f774282f4bec41bf7 -Size (xarchiver-0.5.2.tar.bz2) = 755418 bytes +SHA1 (xarchiver-0.5.4.tar.bz2) = 4a02a6f77b03be72065f19dd98db1fa5325d3bb6 +RMD160 (xarchiver-0.5.4.tar.bz2) = af130364d48678ee74a818eccfc8c7de34294e20 +Size (xarchiver-0.5.4.tar.bz2) = 1003045 bytes diff --git a/sysutils/xfce4-xkb-plugin/Makefile b/sysutils/xfce4-xkb-plugin/Makefile index a1a5faae68f..4502eb7e972 100644 --- a/sysutils/xfce4-xkb-plugin/Makefile +++ b/sysutils/xfce4-xkb-plugin/Makefile @@ -1,17 +1,20 @@ -# $NetBSD: Makefile,v 1.37 2014/08/21 14:32:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.38 2015/04/21 08:56:42 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.4.3 - -DISTNAME= xfce4-xkb-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-xkb-plugin-0.7.0 CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-xkb-plugin/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.7/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin COMMENT= Xfce Keyboard plugin LDFLAGS.DragonFly= -lX11 LDFLAGS.SunOS+= -lX11 .include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../x11/libxklavier/buildlink3.mk" +.include "../../graphics/librsvg/buildlink3.mk" +.include "../../devel/libwnck/buildlink3.mk" +.include "../../x11/xfce4-garcon/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-xkb-plugin/PLIST b/sysutils/xfce4-xkb-plugin/PLIST index 1eec8454fff..ee77eca0502 100644 --- a/sysutils/xfce4-xkb-plugin/PLIST +++ b/sysutils/xfce4-xkb-plugin/PLIST @@ -1,90 +1,130 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:22 joerg Exp $ -libexec/xfce4/panel-plugins/xfce4-xkb-plugin +@comment $NetBSD: PLIST,v 1.6 2015/04/21 08:56:42 jperkin Exp $ +libexec/xfce4/panel/plugins/xfce4-xkb-plugin +share/locale/ar/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/be/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/el/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/ka/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/ko/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/lt/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/ro/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/uk/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo -share/xfce4/panel-plugins/xkb-plugin.desktop -share/xfce4/xkb/flags/ae.png -share/xfce4/xkb/flags/am.png -share/xfce4/xkb/flags/ar.png -share/xfce4/xkb/flags/at.png -share/xfce4/xkb/flags/az.png -share/xfce4/xkb/flags/be.png -share/xfce4/xkb/flags/bg.png -share/xfce4/xkb/flags/bh.png -share/xfce4/xkb/flags/br.png -share/xfce4/xkb/flags/by.png -share/xfce4/xkb/flags/ca.png -share/xfce4/xkb/flags/ch.png -share/xfce4/xkb/flags/cu.png -share/xfce4/xkb/flags/cz.png -share/xfce4/xkb/flags/de.png -share/xfce4/xkb/flags/dj.png -share/xfce4/xkb/flags/dk.png -share/xfce4/xkb/flags/dz.png -share/xfce4/xkb/flags/ee.png -share/xfce4/xkb/flags/eg.png -share/xfce4/xkb/flags/es.png -share/xfce4/xkb/flags/eu.png -share/xfce4/xkb/flags/fi.png -share/xfce4/xkb/flags/fr.png -share/xfce4/xkb/flags/ge.png -share/xfce4/xkb/flags/gr.png -share/xfce4/xkb/flags/hr.png -share/xfce4/xkb/flags/hu.png -share/xfce4/xkb/flags/il.png -share/xfce4/xkb/flags/iq.png -share/xfce4/xkb/flags/is.png -share/xfce4/xkb/flags/it.png -share/xfce4/xkb/flags/jo.png -share/xfce4/xkb/flags/jp.png -share/xfce4/xkb/flags/km.png -share/xfce4/xkb/flags/kr.png -share/xfce4/xkb/flags/kw.png -share/xfce4/xkb/flags/la.png -share/xfce4/xkb/flags/lb.png -share/xfce4/xkb/flags/lt.png -share/xfce4/xkb/flags/ly.png -share/xfce4/xkb/flags/ma.png -share/xfce4/xkb/flags/mk.png -share/xfce4/xkb/flags/mn.png -share/xfce4/xkb/flags/mx.png -share/xfce4/xkb/flags/nl.png -share/xfce4/xkb/flags/no.png -share/xfce4/xkb/flags/om.png -share/xfce4/xkb/flags/pl.png -share/xfce4/xkb/flags/ps.png -share/xfce4/xkb/flags/pt.png -share/xfce4/xkb/flags/qa.png -share/xfce4/xkb/flags/qc.png -share/xfce4/xkb/flags/ro.png -share/xfce4/xkb/flags/ru.png -share/xfce4/xkb/flags/sa.png -share/xfce4/xkb/flags/sd.png -share/xfce4/xkb/flags/se.png -share/xfce4/xkb/flags/si.png -share/xfce4/xkb/flags/sk.png -share/xfce4/xkb/flags/so.png -share/xfce4/xkb/flags/sr.png -share/xfce4/xkb/flags/sy.png -share/xfce4/xkb/flags/th.png -share/xfce4/xkb/flags/tn.png -share/xfce4/xkb/flags/tr.png -share/xfce4/xkb/flags/ua.png -share/xfce4/xkb/flags/uk.png -share/xfce4/xkb/flags/un.png -share/xfce4/xkb/flags/us.png -share/xfce4/xkb/flags/uy.png -share/xfce4/xkb/flags/vn.png -share/xfce4/xkb/flags/ye.png -share/xfce4/xkb/flags/yu.png +share/xfce4/panel/plugins/xkb-plugin.desktop +share/xfce4/xkb/flags/ae.svg +share/xfce4/xkb/flags/al.svg +share/xfce4/xkb/flags/am.svg +share/xfce4/xkb/flags/ar.svg +share/xfce4/xkb/flags/at.svg +share/xfce4/xkb/flags/az.svg +share/xfce4/xkb/flags/ba.svg +share/xfce4/xkb/flags/be.svg +share/xfce4/xkb/flags/ben.svg +share/xfce4/xkb/flags/bg.svg +share/xfce4/xkb/flags/bh.svg +share/xfce4/xkb/flags/br.svg +share/xfce4/xkb/flags/by.svg +share/xfce4/xkb/flags/ca.svg +share/xfce4/xkb/flags/ch.svg +share/xfce4/xkb/flags/cu.svg +share/xfce4/xkb/flags/cz.svg +share/xfce4/xkb/flags/de.svg +share/xfce4/xkb/flags/dev.svg +share/xfce4/xkb/flags/dj.svg +share/xfce4/xkb/flags/dk.svg +share/xfce4/xkb/flags/dvorak.svg +share/xfce4/xkb/flags/dz.svg +share/xfce4/xkb/flags/ee.svg +share/xfce4/xkb/flags/eg.svg +share/xfce4/xkb/flags/epo.svg +share/xfce4/xkb/flags/es.svg +share/xfce4/xkb/flags/fi.svg +share/xfce4/xkb/flags/fo.svg +share/xfce4/xkb/flags/fr.svg +share/xfce4/xkb/flags/gb.svg +share/xfce4/xkb/flags/ge.svg +share/xfce4/xkb/flags/gr.svg +share/xfce4/xkb/flags/hr.svg +share/xfce4/xkb/flags/hu.svg +share/xfce4/xkb/flags/ie.svg +share/xfce4/xkb/flags/il.svg +share/xfce4/xkb/flags/iq.svg +share/xfce4/xkb/flags/ir.svg +share/xfce4/xkb/flags/is.svg +share/xfce4/xkb/flags/it.svg +share/xfce4/xkb/flags/jo.svg +share/xfce4/xkb/flags/jp.svg +share/xfce4/xkb/flags/kh.svg +share/xfce4/xkb/flags/km.svg +share/xfce4/xkb/flags/kp.svg +share/xfce4/xkb/flags/kr.svg +share/xfce4/xkb/flags/kw.svg +share/xfce4/xkb/flags/kz.svg +share/xfce4/xkb/flags/la.svg +share/xfce4/xkb/flags/lb.svg +share/xfce4/xkb/flags/lt.svg +share/xfce4/xkb/flags/lv.svg +share/xfce4/xkb/flags/ly.svg +share/xfce4/xkb/flags/ma.svg +share/xfce4/xkb/flags/mk.svg +share/xfce4/xkb/flags/mm.svg +share/xfce4/xkb/flags/mn.svg +share/xfce4/xkb/flags/mt.svg +share/xfce4/xkb/flags/mx.svg +share/xfce4/xkb/flags/nl.svg +share/xfce4/xkb/flags/no.svg +share/xfce4/xkb/flags/om.svg +share/xfce4/xkb/flags/pl.svg +share/xfce4/xkb/flags/pt.svg +share/xfce4/xkb/flags/qa.svg +share/xfce4/xkb/flags/ro.svg +share/xfce4/xkb/flags/rs.svg +share/xfce4/xkb/flags/ru.svg +share/xfce4/xkb/flags/sa.svg +share/xfce4/xkb/flags/sd.svg +share/xfce4/xkb/flags/se.svg +share/xfce4/xkb/flags/si.svg +share/xfce4/xkb/flags/sk.svg +share/xfce4/xkb/flags/so.svg +share/xfce4/xkb/flags/sr.svg +share/xfce4/xkb/flags/sy.svg +share/xfce4/xkb/flags/th.svg +share/xfce4/xkb/flags/tn.svg +share/xfce4/xkb/flags/tr.svg +share/xfce4/xkb/flags/ua.svg +share/xfce4/xkb/flags/us.svg +share/xfce4/xkb/flags/uy.svg +share/xfce4/xkb/flags/uz.svg +share/xfce4/xkb/flags/vn.svg +share/xfce4/xkb/flags/ye.svg diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk deleted file mode 100644 index 35dc81fea4d..00000000000 --- a/sysutils/xfce4-xkb-plugin/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.38 2014/05/05 00:48:23 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-xkb-plugin - -.if !defined(XFCE4_XKB_PLUGIN_BUILDLINK3_MK) -XFCE4_XKB_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+= xfce4-xkb-plugin>=0.4.3 -BUILDLINK_ABI_DEPENDS.xfce4-xkb-plugin+= xfce4-xkb-plugin>=0.4.3nb21 -BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?= ../../sysutils/xfce4-xkb-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_XKB_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-xkb-plugin diff --git a/sysutils/xfce4-xkb-plugin/distinfo b/sysutils/xfce4-xkb-plugin/distinfo index 9df43eed585..836b81f9abf 100644 --- a/sysutils/xfce4-xkb-plugin/distinfo +++ b/sysutils/xfce4-xkb-plugin/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2007/04/12 09:55:19 martti Exp $ +$NetBSD: distinfo,v 1.8 2015/04/21 08:56:42 jperkin Exp $ -SHA1 (xfce4-xkb-plugin-0.4.3.tar.bz2) = 962f1fdc6b373fa5d8a886aaaa4d0fbb45c44234 -RMD160 (xfce4-xkb-plugin-0.4.3.tar.bz2) = b2f80e3a44123b82792a3fa981f40799cb29477f -Size (xfce4-xkb-plugin-0.4.3.tar.bz2) = 231843 bytes +SHA1 (xfce4-xkb-plugin-0.7.0.tar.bz2) = 39e019e9b92ef4483987695ba9a2291e3acbb46a +RMD160 (xfce4-xkb-plugin-0.7.0.tar.bz2) = 49322989395d4557ca4d724cf54f9b75c72b4bae +Size (xfce4-xkb-plugin-0.7.0.tar.bz2) = 807921 bytes +SHA1 (patch-panel-plugin_Makefile.in) = 226fd1e324c4dc97378631bab5c1ce32a3e1ac2c diff --git a/sysutils/xfce4-xkb-plugin/patches/patch-panel-plugin_Makefile.in b/sysutils/xfce4-xkb-plugin/patches/patch-panel-plugin_Makefile.in new file mode 100644 index 00000000000..fddcb86b2d5 --- /dev/null +++ b/sysutils/xfce4-xkb-plugin/patches/patch-panel-plugin_Makefile.in @@ -0,0 +1,32 @@ +$NetBSD: patch-panel-plugin_Makefile.in,v 1.1 2015/04/21 08:56:42 jperkin Exp $ + +Adjust config path. +--- panel-plugin/Makefile.in.orig 2013-05-20 22:01:11.000000000 +0000 ++++ panel-plugin/Makefile.in +@@ -327,7 +327,7 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-plugindir = $(libexecdir)/xfce4/panel-plugins ++plugindir = $(libexecdir)/xfce4/panel/plugins + xfce4_xkb_plugin_SOURCES = \ + xfce4-xkb-plugin.h \ + xfce4-xkb-plugin-private.h \ +@@ -370,7 +370,7 @@ xfce4_xkb_plugin_LDADD = \ + # + # Desktop file + # +-desktopdir = $(datadir)/xfce4/panel-plugins ++desktopdir = $(datadir)/xfce4/panel/plugins + desktop_in_in_files = xkb-plugin.desktop.in.in + desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +@@ -833,7 +833,7 @@ uninstall-am: uninstall-desktopDATA unin + uninstall-pluginPROGRAMS + + %.desktop.in: %.desktop.in.in +- sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@ ++ sed -e "s,\@libexecdir\@/xfce4/panel-plugins,$(libexecdir)/xfce4/panel/plugins,g" < $< > $@ + @INTLTOOL_DESKTOP_RULE@ + + # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: |