head 1.5; access; symbols pkgsrc-2015Q1:1.4.0.68 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.66 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.64 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.62 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.60 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.58 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.56 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.54 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.52 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.50 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.48 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.46 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.44 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.42 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.40 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.38 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.36 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.34 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.32 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.30 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.28 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.26 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.24 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.22 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.20 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.18 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.16 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.14 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.12 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.10 pkgsrc-2008Q1:1.4.0.8 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.6 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.4 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.2 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.3.0.2 pkgsrc-2007Q1-base:1.3 XFCE-4_2_x:1.3 pkgsrc-2006Q4:1.2.0.10 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.8 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.6 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.2 pkgsrc-2005Q3-base:1.1; locks; strict; comment @# @; 1.5 date 2015.04.21.08.56.41; author jperkin; state dead; branches; next 1.4; commitid 7bC9eaQQq3KiZqiy; 1.4 date 2007.04.12.09.55.17; author martti; state Exp; branches; next 1.3; 1.3 date 2007.01.19.16.28.15; author joerg; state Exp; branches; next 1.2; 1.2 date 2005.09.27.12.49.08; author martti; state Exp; branches; next 1.1; 1.1 date 2005.09.14.11.55.57; author martti; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2005.09.27.13.54.31; author salo; state Exp; branches; next ; desc @@ 1.5 log @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. @ text @$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 * @ 1.4 log @Updated to Xfce 4.4.1 See http://www.xfce.org/documentation/changelogs/4.4.1 for details. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Add DragonFly support. @ text @d3 3 a5 3 --- panel-plugin/memswap.c.orig 2003-11-06 00:39:52.000000000 +0000 +++ panel-plugin/memswap.c @@@@ -113,7 +113,7 @@@@ gint read_memswap(gulong *mem, gulong *s a13 52 @@@@ -284,7 +284,24 @@@@ gint read_memswap(gulong *mem, gulong *s #define ARRLEN(X) (sizeof(X)/sizeof(X[0])) { - static int mib[]={ CTL_HW, HW_PHYSMEM }; + static int mib[2]; + +#ifdef HW_PHYSMEM64 + /* 64-bit datatype */ + if (sizeof(size_t) == 8) { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM64; + } + /* assume 32-bit datatype */ + else { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; + } +#else + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; +#endif + len = sizeof(MTotal); sysctl(mib, ARRLEN(mib), &MTotal, &len, NULL, 0); MTotal >>= 10; @@@@ -395,7 +412,24 @@@@ gint read_memswap(gulong *mem, gulong *s #define ARRLEN(X) (sizeof(X)/sizeof(X[0])) { - static int mib[]={ CTL_HW, HW_PHYSMEM }; + static int mib[2]; + +#ifdef HW_PHYSMEM64 + /* 64-bit datatype */ + if (sizeof(size_t) == 8) { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM64; + } + /* assume 32-bit datatype */ + else { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; + } +#else + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; +#endif + len = sizeof(MTotal); sysctl(mib, ARRLEN(mib), &MTotal, &len, NULL, 0); MTotal >>= 10; @ 1.2 log @Fix compilation problems on NetBSD 1.6.2 @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2005/09/14 11:55:57 martti Exp $ d3 12 a14 3 --- panel-plugin/memswap.c.orig 2003-11-06 02:39:52.000000000 +0200 +++ panel-plugin/memswap.c 2005-09-27 12:39:16.000000000 +0300 @@@@ -284,7 +284,24 @@@@ d40 1 a40 1 @@@@ -395,7 +412,24 @@@@ @ 1.1 log @Updated xfce4-systemload-plugin to 0.3.6nb1 Fix sparc64 problems (pkg/31017) @ text @d1 1 a1 1 $NetBSD$ d4 2 a5 2 +++ panel-plugin/memswap.c 2005-09-14 11:47:37.000000000 +0300 @@@@ -284,7 +284,17 @@@@ d10 18 a27 11 + static int mib[2]; + /* 64-bit datatype */ + if(sizeof(size_t) == 8) { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM64; + } + /* assume 32-bit datatype */ + else { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; + } d31 1 a31 1 @@@@ -395,7 +405,17 @@@@ d36 18 a53 11 + static int mib[2]; + /* 64-bit datatype */ + if(sizeof(size_t) == 8) { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM64; + } + /* assume 32-bit datatype */ + else { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; + } @ 1.1.2.1 log @Pullup ticket 783 - requested by Martti Kuparinen build fix for xfce4-systemload-plugin Revisions pulled up: - pkgsrc/sysutils/xfce4-systemload-plugin/distinfo 1.6 - pkgsrc/sysutils/xfce4-systemload-plugin/patches/patch-aa 1.2 Module Name: pkgsrc Committed By: martti Date: Tue Sep 27 12:49:08 UTC 2005 Modified Files: pkgsrc/sysutils/xfce4-systemload-plugin: distinfo pkgsrc/sysutils/xfce4-systemload-plugin/patches: patch-aa Log Message: Fix compilation problems on NetBSD 1.6.2 @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2005/09/27 12:49:08 martti Exp $ d4 2 a5 2 +++ panel-plugin/memswap.c 2005-09-27 12:39:16.000000000 +0300 @@@@ -284,7 +284,24 @@@@ d10 11 a20 18 + static int mib[2]; + +#ifdef HW_PHYSMEM64 + /* 64-bit datatype */ + if (sizeof(size_t) == 8) { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM64; + } + /* assume 32-bit datatype */ + else { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; + } +#else + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; +#endif + d24 1 a24 1 @@@@ -395,7 +412,24 @@@@ d29 11 a39 18 + static int mib[2]; + +#ifdef HW_PHYSMEM64 + /* 64-bit datatype */ + if (sizeof(size_t) == 8) { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM64; + } + /* assume 32-bit datatype */ + else { + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; + } +#else + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; +#endif + @