diff --git a/x11/xfce4/xfce4-diskperf/Makefile b/x11/xfce4/xfce4-diskperf/Makefile index 220b439b851..8aee9f9dfb1 100644 --- a/x11/xfce4/xfce4-diskperf/Makefile +++ b/x11/xfce4/xfce4-diskperf/Makefile @@ -1,11 +1,12 @@ -# $OpenBSD: Makefile,v 1.10 2006/12/16 12:22:37 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2007/05/11 14:02:02 steven Exp $ COMMENT= "displays instant disk performance in the xfce4 panel" -DISTNAME= xfce4-diskperf-plugin-1.5 -PKGNAME= ${DISTNAME:S/-plugin//}p4 -MASTER_SITES= ${MASTER_SITE_BERLIOS:=xfce-goodies/} -HOMEPAGE= http://xfce-goodies.berlios.de/ +V= 2.1.0 +DISTNAME= xfce4-diskperf-plugin-${V} +PKGNAME= xfce4-diskperf-${V} + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin # BSD PERMIT_DISTFILES_CDROM= Yes @@ -13,15 +14,21 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes +MASTER_SITES= http://goodies.xfce.org/releases/xfce4-diskperf-plugin/ +EXTRACT_SUFX= .tar.bz2 + +USE_GMAKE= Yes MODULES= devel/gettext -BUILD_DEPENDS= :xfce4-panel-*:x11/xfce4/xfce4-panel -LIB_DEPENDS= xfcegui4.>=3.4::x11/xfce4/libxfcegui4 \ - xml2.>=9.0::textproc/libxml -RUN_DEPENDS= :xfce4-panel-*:x11/xfce4/xfce4-panel -WANTLIB= ICE SM X11 Xext Xrender fontconfig freetype m z \ +LIB_DEPENDS= xfce4panel.>=2.2::x11/xfce4/xfce4-panel \ + xfcegui4.>=4::x11/xfce4/libxfcegui4 \ + +RUN_DEPENDS= :xfce4-panel->=4.4.1:x11/xfce4/xfce4-panel + +WANTLIB= X11 Xdmcp Xrender Xau fontconfig freetype m z c \ + Xcursor Xext Xfixes Xi Xinerama Xrandr expat \ atk-1.0 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \ gmodule-2.0 gobject-2.0 gtk-x11-2.0 pango-1.0 \ pangoft2-1.0 pangocairo-1.0 cairo glitz png \ - startup-notification-1 xfce4util.>=1 + xfce4util.>=1 .include diff --git a/x11/xfce4/xfce4-diskperf/distinfo b/x11/xfce4/xfce4-diskperf/distinfo index 7aab45f1160..1feb529504c 100644 --- a/x11/xfce4/xfce4-diskperf/distinfo +++ b/x11/xfce4/xfce4-diskperf/distinfo @@ -1,5 +1,5 @@ -MD5 (xfce4/xfce4-diskperf-plugin-1.5.tar.gz) = yxsmNxZrikNVs9+F5ZNkDw== -RMD160 (xfce4/xfce4-diskperf-plugin-1.5.tar.gz) = LusHCusr4rU/9X6G9oTJ1DDWN6s= -SHA1 (xfce4/xfce4-diskperf-plugin-1.5.tar.gz) = HB8r6mHUjFpawl3QctVzSvBJGFQ= -SHA256 (xfce4/xfce4-diskperf-plugin-1.5.tar.gz) = p7yx1N6NHiL+4OURW/9fELfuUiqbmOmZUIlFGdubK7Y= -SIZE (xfce4/xfce4-diskperf-plugin-1.5.tar.gz) = 226767 +MD5 (xfce4/xfce4-diskperf-plugin-2.1.0.tar.bz2) = /HSgx9K5SGzbcEoHLNcrgw== +RMD160 (xfce4/xfce4-diskperf-plugin-2.1.0.tar.bz2) = fmZjTUhJncm+d3WArEjmbJ5RA5s= +SHA1 (xfce4/xfce4-diskperf-plugin-2.1.0.tar.bz2) = ZtuTrzL0o8oM6TH+0xKyZ6Oj3s4= +SHA256 (xfce4/xfce4-diskperf-plugin-2.1.0.tar.bz2) = SSpF1lIOtlRDTuLuClGPBgWiGXBuhjJ5r9fpwBZbF9U= +SIZE (xfce4/xfce4-diskperf-plugin-2.1.0.tar.bz2) = 183492 diff --git a/x11/xfce4/xfce4-diskperf/patches/patch-panel-plugin_devperf_c b/x11/xfce4/xfce4-diskperf/patches/patch-panel-plugin_devperf_c index 3d7c22f0886..8c2c5778a43 100644 --- a/x11/xfce4/xfce4-diskperf/patches/patch-panel-plugin_devperf_c +++ b/x11/xfce4/xfce4-diskperf/patches/patch-panel-plugin_devperf_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-panel-plugin_devperf_c,v 1.1.1.1 2005/05/12 04:38:50 jolan Exp $ ---- panel-plugin/devperf.c.orig Sun Nov 30 04:58:54 2003 -+++ panel-plugin/devperf.c Sat Feb 19 21:44:08 2005 -@@ -317,6 +317,82 @@ int DevGetPerfData (const void *p_pvDevi +$OpenBSD: patch-panel-plugin_devperf_c,v 1.2 2007/05/11 14:02:02 steven Exp $ +--- panel-plugin/devperf.c.orig Thu Jan 18 18:12:07 2007 ++++ panel-plugin/devperf.c Fri May 11 15:48:55 2007 +@@ -305,6 +305,82 @@ int DevGetPerfData (const void *p_pvDevice, struct dev /* *INDENT-ON* */ /************************** NetBSD End ***************/ diff --git a/x11/xfce4/xfce4-diskperf/patches/patch-panel-plugin_main_c b/x11/xfce4/xfce4-diskperf/patches/patch-panel-plugin_main_c index b213c714f8a..7c501d87ff8 100644 --- a/x11/xfce4/xfce4-diskperf/patches/patch-panel-plugin_main_c +++ b/x11/xfce4/xfce4-diskperf/patches/patch-panel-plugin_main_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-panel-plugin_main_c,v 1.1.1.1 2005/05/12 04:38:50 jolan Exp $ ---- panel-plugin/main.c.orig Wed Aug 25 05:08:40 2004 -+++ panel-plugin/main.c Sat Feb 19 21:44:08 2005 -@@ -94,7 +94,7 @@ typedef enum monitor_bar_order_t { +$OpenBSD: patch-panel-plugin_main_c,v 1.2 2007/05/11 14:02:02 steven Exp $ +--- panel-plugin/main.c.orig Thu Jan 18 18:12:07 2007 ++++ panel-plugin/main.c Fri May 11 15:52:04 2007 +@@ -80,7 +80,7 @@ typedef enum monitor_bar_order_t { typedef struct param_t { /* Configurable parameters */ char acDevice[64]; @@ -10,7 +10,7 @@ $OpenBSD: patch-panel-plugin_main_c,v 1.1.1.1 2005/05/12 04:38:50 jolan Exp $ dev_t st_rdev; #endif int fTitleDisplayed; -@@ -162,7 +162,7 @@ static int DisplayPerf (struct plugin_t +@@ -151,7 +151,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin) const double K = 1.0 * 1000 * 1000 * 1000 / 1024 / 1024; /* bytes/ns --> MB/s */ double arPerf[NMONITORS], arBusy[NMONITORS], *prData, *pr; @@ -19,7 +19,7 @@ $OpenBSD: patch-panel-plugin_main_c,v 1.1.1.1 2005/05/12 04:38:50 jolan Exp $ int status, i; if (!s_poToolTips) -@@ -170,7 +170,7 @@ static int DisplayPerf (struct plugin_t +@@ -159,7 +159,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin) memset (&oPerf, 0, sizeof (oPerf)); oPerf.qlen = -1; @@ -28,7 +28,7 @@ $OpenBSD: patch-panel-plugin_main_c,v 1.1.1.1 2005/05/12 04:38:50 jolan Exp $ status = DevGetPerfData (poConf->acDevice, &oPerf); #else status = DevGetPerfData (&(poConf->st_rdev), &oPerf); -@@ -210,7 +210,7 @@ static int DisplayPerf (struct plugin_t +@@ -199,7 +199,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin) } } @@ -37,8 +37,8 @@ $OpenBSD: patch-panel-plugin_main_c,v 1.1.1.1 2005/05/12 04:38:50 jolan Exp $ "----------------\n" "I/O (MB/s)\n" " Read :%3u\n" -@@ -408,7 +408,7 @@ static plugin_t *NewPlugin () - struct plugin_t *poPlugin; +@@ -400,7 +400,7 @@ static diskperf_t *diskperf_create_control (XfcePanelP + struct diskperf_t *poPlugin; struct param_t *poConf; struct monitor_t *poMonitor; -#if !defined(__NetBSD__) @@ -46,35 +46,26 @@ $OpenBSD: patch-panel-plugin_main_c,v 1.1.1.1 2005/05/12 04:38:50 jolan Exp $ struct stat oStat; int status; #endif -@@ -418,7 +418,7 @@ static plugin_t *NewPlugin () - poConf = &(poPlugin->oConf.oParam); - poMonitor = &(poPlugin->oMonitor); +@@ -412,7 +412,7 @@ static diskperf_t *diskperf_create_control (XfcePanelP + poPlugin->plugin = plugin; + -#if defined(__NetBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) strcpy (poConf->acDevice, "wd0"); strcpy (poConf->acTitle, "wd0"); #else -@@ -510,7 +510,7 @@ static void plugin_read_config (Control - Widget_t *pw2ndBar = poPlugin->oMonitor.awProgressBar + 1; - xmlNodePtr poNode; - char *pc; +@@ -500,7 +500,7 @@ static void diskperf_read_config (XfcePanelPlugin *plu + if ((value = xfce_rc_read_entry (rc, (CONF_DEVICE), NULL))) { + memset (poConf->acDevice, 0, sizeof (poConf->acDevice)); + strncpy (poConf->acDevice, value, sizeof (poConf->acDevice) - 1); -#if !defined(__NetBSD__) +#if !defined(__NetBSD__) && !defined(__OpenBSD__) - struct stat oStat; - int status; + status = stat (poConf->acDevice, &oStat); + poConf->st_rdev = (status == -1 ? 0 : oStat.st_rdev); #endif -@@ -526,7 +526,7 @@ static void plugin_read_config (Control - memset (poConf->acDevice, 0, sizeof (poConf->acDevice)); - strncpy (poConf->acDevice, pc, sizeof (poConf->acDevice) - 1); - xmlFree (pc); --#if !defined(__NetBSD__) -+#if !defined(__NetBSD__) && !defined(__OpenBSD__) - status = stat (poConf->acDevice, &oStat); - poConf->st_rdev = (status == -1 ? 0 : oStat.st_rdev); - #endif -@@ -662,7 +662,7 @@ static void SetDevice (Widget_t p_wTF, v - struct plugin_t *poPlugin = (plugin_t *) p_pvPlugin; +@@ -623,7 +623,7 @@ static void SetDevice (Widget_t p_wTF, void *p_pvPlugi + struct diskperf_t *poPlugin = (diskperf_t *) p_pvPlugin; struct param_t *poConf = &(poPlugin->oConf.oParam); const char *pcDevice = gtk_entry_get_text (GTK_ENTRY (p_wTF)); -#if !defined(__NetBSD__) diff --git a/x11/xfce4/xfce4-diskperf/pkg/PFRAG.shared b/x11/xfce4/xfce4-diskperf/pkg/PFRAG.shared deleted file mode 100644 index 620824147fa..00000000000 --- a/x11/xfce4/xfce4-diskperf/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/05/12 04:38:50 jolan Exp $ -lib/xfce4/panel-plugins/libdiskperf.so diff --git a/x11/xfce4/xfce4-diskperf/pkg/PLIST b/x11/xfce4/xfce4-diskperf/pkg/PLIST index ae76ba928b4..7b2d4997265 100644 --- a/x11/xfce4/xfce4-diskperf/pkg/PLIST +++ b/x11/xfce4/xfce4-diskperf/pkg/PLIST @@ -1,5 +1,11 @@ -@comment $OpenBSD: PLIST,v 1.2 2005/08/16 09:49:55 espie Exp $ +@comment $OpenBSD: PLIST,v 1.3 2007/05/11 14:02:02 steven Exp $ @conflict xfce4-diskperf-plugin-* -%%SHARED%% -lib/xfce4/panel-plugins/libdiskperf.a -lib/xfce4/panel-plugins/libdiskperf.la +libexec/xfce4/ +libexec/xfce4/panel-plugins/ +libexec/xfce4/panel-plugins/xfce4-diskperf-plugin +share/locale/ca/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/locale/cs/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/pl/LC_MESSAGES/xfce4-diskperf-plugin.mo +share/xfce4/panel-plugins/diskperf.desktop