head 1.5; access; symbols pkgsrc-2015Q1:1.4.0.60 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.58 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.56 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.54 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.52 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.50 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.48 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.46 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.44 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.42 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.40 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.38 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.36 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.34 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.32 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.30 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.28 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.26 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.24 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.22 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.20 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.18 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.16 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.14 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.12 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.10 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.8 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.6 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.4 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.2 pkgsrc-2008Q1:1.3.0.4 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.2 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.2.0.2 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.1.1.1.0.2 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2015.04.21.08.56.44; author jperkin; state dead; branches; next 1.4; commitid 7bC9eaQQq3KiZqiy; 1.4 date 2008.07.01.13.41.08; author obache; state Exp; branches; next 1.3; 1.3 date 2007.12.07.19.43.29; author martti; state Exp; branches; next 1.2; 1.2 date 2007.07.06.11.15.01; author martti; state Exp; branches; next 1.1; 1.1 date 2007.04.12.09.50.50; author martti; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.04.12.09.50.50; author martti; 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-ad,v 1.4 2008/07/01 13:41:08 obache Exp $ --- exo/exo-mount-point.c.orig 2007-12-02 14:33:44 +0200 +++ exo/exo-mount-point.c 2008-06-06 15:14:00 +0300 @@@@ -253,57 +253,57 @@@@ exo_mount_point_list_match_active (ExoMo /* close the file handle */ fclose (fp); -#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */ - struct statfs *mntbuf = NULL; - glong bufsize = 0; - gint mntsize; - gint n; +#elif defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__) /* Newer NetBSD */ + struct statvfs *mntbuf = NULL; + glong bufsize = 0; + gint mntsize; + gint n; /* determine the number of active mount points */ - mntsize = getfsstat (NULL, 0, MNT_NOWAIT); + mntsize = getvfsstat (NULL, 0, MNT_NOWAIT); if (G_LIKELY (mntsize > 0)) { /* allocate a new buffer */ bufsize = (mntsize + 4) * sizeof (*mntbuf); - mntbuf = (struct statfs *) malloc (bufsize); + mntbuf = (struct statvfs *) malloc (bufsize); /* determine the mount point for the device file */ - mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT); + mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT); for (n = 0; n < mntsize; ++n) { /* check if we have a match here */ - exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname, - mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points); + exo_mount_point_add_if_matches (mask, device, folder, fstype, + mntbuf[n].f_mntfromname, + mntbuf[n].f_mntonname, + mntbuf[n].f_fstypename, + ((mntbuf[n].f_flag & MNT_RDONLY) != 0), + &mount_points); } /* release the buffer */ free (mntbuf); } -#elif defined(HAVE_GETVFSSTAT) /* Newer NetBSD */ - struct statvfs *mntbuf = NULL; - glong bufsize = 0; - gint mntsize; - gint n; +#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */ + struct statfs *mntbuf = NULL; + glong bufsize = 0; + gint mntsize; + gint n; /* determine the number of active mount points */ - mntsize = getvfsstat (NULL, 0, MNT_NOWAIT); + mntsize = getfsstat (NULL, 0, MNT_NOWAIT); if (G_LIKELY (mntsize > 0)) { /* allocate a new buffer */ bufsize = (mntsize + 4) * sizeof (*mntbuf); - mntbuf = (struct statvfs *) malloc (bufsize); + mntbuf = (struct statfs *) malloc (bufsize); /* determine the mount point for the device file */ - mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT); + mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT); for (n = 0; n < mntsize; ++n) { /* check if we have a match here */ - exo_mount_point_add_if_matches (mask, device, folder, fstype, - mntbuf[n].f_mntfromname, - mntbuf[n].f_mntonname, - mntbuf[n].f_fstypename, - ((mntbuf[n].f_flag & MNT_RDONLY) != 0), - &mount_points); + exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname, + mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points); } /* release the buffer */ @ 1.4 log @getvfsstat() of DragonFly is not compatible with NetBSD's one. Patch provided by Hasso Tepper in PR 38877. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2007/12/07 19:43:29 martti Exp $ @ 1.3 log @Updated Xfce to 4.4.2 Lots of bug fixes. For the official ChangeLog, please see http://www.xfce.org/documentation/changelogs/4.4.2 @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- exo/exo-mount-point.c.orig 2007-12-04 11:46:28.000000000 +0000 +++ exo/exo-mount-point.c 2007-12-04 11:52:46.000000000 +0000 @@@@ -253,57 +253,57 @@@@ d14 1 a14 1 +#elif defined(HAVE_GETVFSSTAT) /* Newer NetBSD */ @ 1.2 log @Fix build problems on Solaris 10 (pkg/36311). @ text @d1 5 a5 21 --- exo/exo-mount-point.c.orig 2007-01-20 15:58:22.000000000 +0200 +++ exo/exo-mount-point.c 2007-07-06 14:10:50.000000000 +0300 @@@@ -25,6 +25,9 @@@@ #ifdef HAVE_SYS_TYPES_H #include #endif +#ifdef HAVE_SYS_STATVFS_H +#include +#endif #ifdef HAVE_SYS_STAT_H #include #endif @@@@ -38,6 +41,7 @@@@ #include #endif #ifdef HAVE_SYS_MNTTAB_H +#include #include #endif @@@@ -250,6 +254,33 @@@@ d9 6 a14 1 +#elif defined(HAVE_GETVFSSTAT) d19 68 a86 25 + + /* determine the number of active mount points */ + mntsize = getvfsstat(NULL, 0, MNT_NOWAIT); + if (G_LIKELY(mntsize > 0)) { + /* allocate a new buffer */ + bufsize = (mntsize + 4) * sizeof(*mntbuf); + mntbuf = (struct statvfs *)malloc(bufsize); + + /* determine the mount point for the device file */ + mntsize = getvfsstat(mntbuf, bufsize, ST_NOWAIT); + for (n = 0; n < mntsize; ++n) { + /* check if we have a match here */ + exo_mount_point_add_if_matches(mask, device, folder, fstype, + mntbuf[n].f_mntfromname, + mntbuf[n].f_mntonname, + mntbuf[n].f_fstypename, + ((mntbuf[n].f_flag & MNT_RDONLY) != 0), + &mount_points); + } + /* release the buffer */ + free(mntbuf); + } #elif defined(HAVE_GETFSSTAT) /* BSD */ struct statfs *mntbuf = NULL; glong bufsize = 0; @ 1.1 log @Initial revision @ text @d1 2 a2 4 $NetBSD$ --- exo/exo-mount-point.c.orig 2007-01-22 15:32:55.000000000 +0000 +++ exo/exo-mount-point.c 2007-01-22 16:10:55.000000000 +0000 d13 9 a21 1 @@@@ -250,6 +257,33 @@@@ @ 1.1.1.1 log @The Xfce extension library is targeted at application development. @ text @@