aboutsummaryrefslogtreecommitdiffstats
path: root/devel/libgtop2
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-11-08 06:24:32 +0800
committermarcus <marcus@FreeBSD.org>2004-11-08 06:24:32 +0800
commitfb8541d2d8cfc686242832e1c242a6e16a71f562 (patch)
treeeb4a9f17e9018ff5a01b23a7dcb55603930cc5cf /devel/libgtop2
parent9d873617ccf0d009f3c169794dbfcb0741259b2e (diff)
downloadfreebsd-ports-gnome-fb8541d2d8cfc686242832e1c242a6e16a71f562.tar.gz
freebsd-ports-gnome-fb8541d2d8cfc686242832e1c242a6e16a71f562.tar.zst
freebsd-ports-gnome-fb8541d2d8cfc686242832e1c242a6e16a71f562.zip
Presenting GNOME 2.8 for FreeBSD (2.8.1 to be exact).
This release notes detailing all of the new goodies in GNOME 2.8 can be found at http://www.gnome.org/start/2.8/notes/, and the list of what was fixed in GNOME 2.8.1 can be found at http://lists.gnome.org/archives/gnome-announce-list/2004-October/msg00056.html. This release, as well as all of our others, would not have been possible without the great efforts of our FreeBSD GNOME Team. The list of current members can be found at http://www.freebsd.org/gnome/contact.html (including our newest member, Michael Johnson <ahze@FreeBSD.org>). Special thanks also goes out to all of the loyal FreeBSD GNOME users that put up with crashes and hangs to test and debug GNOME on FreeBSD. We would especially like to thank those users that provided patches for GNOME 2.7 and 2.8: Franz Klammer <klammer@webonaut.com> Piotr Smyrak <piotr.smyrak@heron.pl> Radek Kozlowski <radek@raadradd.com> Khairil Yusof <kaeru@pd.jaring.my> Yasuda Keisuke <kysd@po.harenet.ne.jp> Tom McLaughlin <tmclaugh@sdf.lonestar.org> Vladimir Grebenschikov <vova@fbsd.ru> GNOME 2.8 also features a new, FreeBSD-specific splashscreen that was designed by jimmac for GNOME 2.8, then daemonized by Franz Klammer <klammer@webonaut.com> and Radek Kozlowski <radek@raadradd.com>. As with GNOME 2.6, you cannot just "portupgrade" to GNOME 2.8. There is a script provided at http://www.marcuscom.com/downloads/gnome_upgrade28.sh that will aid in the upgrade process. Full documentation on the GNOME 2.8 upgrade is coming following this commit. From all of us at FreeBSD GNOME, ENJOY!
Diffstat (limited to 'devel/libgtop2')
-rw-r--r--devel/libgtop2/Makefile6
-rw-r--r--devel/libgtop2/distinfo4
-rw-r--r--devel/libgtop2/files/patch-ah6
-rw-r--r--devel/libgtop2/files/patch-lib::command.c10
-rw-r--r--devel/libgtop2/files/patch-lib::read.c26
-rw-r--r--devel/libgtop2/files/patch-ltmain.sh42
-rw-r--r--devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c12
-rw-r--r--devel/libgtop2/files/patch-sysdeps_common_fsusage.c14
-rw-r--r--devel/libgtop2/files/patch-sysdeps_common_mountlist.c20
-rw-r--r--devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c13
-rw-r--r--devel/libgtop2/pkg-plist6
11 files changed, 48 insertions, 111 deletions
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 53854f7d9a69..4a3196dd9851 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= libgtop2
-PORTVERSION= 2.6.0
+PORTVERSION= 2.8.1
PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8
DISTNAME= libgtop-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack glib20
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 5f14e960bd87..50d3ac436835 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgtop-2.6.0.tar.bz2) = 5d0ec207842b54d2f2d04c99af7c98b9
-SIZE (gnome2/libgtop-2.6.0.tar.bz2) = 946822
+MD5 (gnome2/libgtop-2.8.1.tar.bz2) = 5d191cbf2b5b2a84dfee1972c99b1a78
+SIZE (gnome2/libgtop-2.8.1.tar.bz2) = 1046174
diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah
index e270a82213e8..3728441bebb7 100644
--- a/devel/libgtop2/files/patch-ah
+++ b/devel/libgtop2/files/patch-ah
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/procmap.c.orig Wed Mar 10 06:18:59 2004
-+++ sysdeps/freebsd/procmap.c Thu Oct 28 21:08:55 2004
+--- sysdeps/freebsd/procmap.c.orig Fri Sep 24 18:49:06 2004
++++ sysdeps/freebsd/procmap.c Thu Oct 28 15:42:58 2004
@@ -47,7 +47,13 @@
#endif
#endif
@@ -35,7 +35,7 @@
/* Now we get the memory maps. */
-@@ -280,13 +288,9 @@
+@@ -278,13 +286,9 @@
&inode, sizeof (inode)) != sizeof (inode))
glibtop_error_io_r (server, "kvm_read (inode)");
diff --git a/devel/libgtop2/files/patch-lib::command.c b/devel/libgtop2/files/patch-lib::command.c
deleted file mode 100644
index 4bb3aefb1b9a..000000000000
--- a/devel/libgtop2/files/patch-lib::command.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/command.c.orig Tue Sep 9 09:47:58 2003
-+++ lib/command.c Tue Sep 9 08:14:33 2003
-@@ -38,6 +38,7 @@
- glibtop_init_r (&server, 0, 0);
-
- memset (&cmnd, 0, sizeof (glibtop_command));
-+ memset (&response, 0, sizeof (glibtop_response));
-
- cmnd.command = command;
-
diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c
index 38583f8766a9..53d091a32b04 100644
--- a/devel/libgtop2/files/patch-lib::read.c
+++ b/devel/libgtop2/files/patch-lib::read.c
@@ -1,14 +1,14 @@
---- lib/read.c.orig Mon Oct 20 11:19:41 2003
-+++ lib/read.c Fri Nov 14 14:37:00 2003
+--- lib/read.c.orig Fri Jun 18 04:03:55 2004
++++ lib/read.c Sat Aug 7 16:05:41 2004
@@ -22,6 +22,7 @@
*/
#include <config.h>
+#include <errno.h>
#include <glibtop/read.h>
- #include <libgnome/gnome-i18n.h>
+ #include "libgtop-i18n.h"
-@@ -68,12 +69,16 @@
+@@ -56,14 +57,18 @@
fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
#endif
@@ -16,13 +16,15 @@
if (server->socket) {
do_read (server->socket, buf, size);
} else {
- ret = read (server->input [0], buf, size);
+- if(read (server->input [0], buf, size) < 0)
++ if(read (server->input [0], buf, size) < 0) {
++ if (errno == EINTR)
++ goto retry;
+ glibtop_error_io_r (
+ server,
+ ngettext ("read %d byte",
+ "read %d bytes", size),
+ size);
++ }
}
-
-- if (ret < 0)
-+ if (ret < 0) {
-+ if (errno == EINTR)
-+ goto retry;
- glibtop_error_io_r (server, _("read %d bytes"), size);
-+ }
}
diff --git a/devel/libgtop2/files/patch-ltmain.sh b/devel/libgtop2/files/patch-ltmain.sh
deleted file mode 100644
index 54bbcbc5777e..000000000000
--- a/devel/libgtop2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,42 +0,0 @@
---- ltmain.sh.orig Sun Aug 24 18:53:15 2003
-+++ ltmain.sh Sun Aug 24 18:57:42 2003
-@@ -1060,8 +1060,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_command="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2444,6 +2452,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4210,10 +4221,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
index e61274b13864..0713da61925e 100644
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
+++ b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/procmem.c.orig Wed Mar 10 21:23:52 2004
-+++ sysdeps/freebsd/procmem.c Thu Mar 11 15:46:05 2004
+--- sysdeps/freebsd/procmem.c.orig Mon Jul 19 02:07:03 2004
++++ sysdeps/freebsd/procmem.c Tue Jul 20 22:03:29 2004
@@ -125,7 +125,7 @@
#else
struct vm_object object;
@@ -17,14 +17,14 @@
- (unsigned long) pinfo [0].PROC_VMSPACE,
- (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) {
- glibtop_warn_io_r (server, "kvm_read (plimit)");
-+ if (getrlimit (RLIMIT_RSS, &rlimit) < 0) {
-+ glibtop_warn_io_r (server, "getrlimit");
++ if (getrlimit (RLIMIT_RSS, &rlimit) < 0) {
++ glibtop_warn_io_r (server, "getrlimit");
return;
}
-- buf->rss_rlim = (guint64)
+- buf->rss_rlim = (guint64)
- (plimit.pl_rlimit [RLIMIT_RSS].rlim_cur);
+ buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur);
-
+
vms = &pinfo [0].kp_eproc.e_vm;
diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
new file mode 100644
index 000000000000..de564dcfd5f6
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
@@ -0,0 +1,14 @@
+--- sysdeps/common/fsusage.c.orig Sun Oct 17 00:51:26 2004
++++ sysdeps/common/fsusage.c Sun Oct 17 00:52:07 2004
+@@ -253,8 +253,9 @@
+ if (statvfs (path, &fsd) < 0)
+ return;
+
+-#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
+- /* Solaris but not SunOS */
++#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \
++ || defined(__FreeBSD__)
++ /* Solaris but not SunOS and FreeBSD */
+ buf->block_size = fsd.f_frsize;
+ #else
+ /* else, including Linux */
diff --git a/devel/libgtop2/files/patch-sysdeps_common_mountlist.c b/devel/libgtop2/files/patch-sysdeps_common_mountlist.c
deleted file mode 100644
index 62269380b46b..000000000000
--- a/devel/libgtop2/files/patch-sysdeps_common_mountlist.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- sysdeps/common/mountlist.c.orig Mon Dec 1 13:59:28 2003
-+++ sysdeps/common/mountlist.c Mon Dec 1 16:13:15 2003
-@@ -127,7 +127,7 @@
- }
- #endif /* MOUNTED_GETMNTENT1. */
-
--#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__)
-+#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) && !defined(__FreeBSD__)
- static char *
- fstype_to_string (t)
- short t;
-@@ -345,7 +345,7 @@
- me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
- me->me_devname = g_strdup (fsp->f_mntfromname);
- me->me_mountdir = g_strdup (fsp->f_mntonname);
--#if defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- me->me_type = g_strdup (fsp->f_fstypename);
- #else
- me->me_type = g_strdup (fstype_to_string (fsp->f_type));
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c b/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c
deleted file mode 100644
index 7dbba8c37ab1..000000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- sysdeps/freebsd/uptime.c.orig Thu Mar 11 15:59:16 2004
-+++ sysdeps/freebsd/uptime.c Thu Mar 11 15:59:38 2004
-@@ -68,9 +68,8 @@
- buf->flags = _glibtop_sysdeps_uptime;
- }
- #else
-- buf->flags = _glibtop_sysdeps_uptime;
--
- glibtop_cpu cpu;
-+ buf->flags = _glibtop_sysdeps_uptime;
-
- glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0);
-
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 4c48f567fd7e..cc1d2ecda163 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -53,6 +53,7 @@ share/locale/az/LC_MESSAGES/libgtop-2.0.mo
share/locale/be/LC_MESSAGES/libgtop-2.0.mo
share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
share/locale/bn/LC_MESSAGES/libgtop-2.0.mo
+share/locale/bs/LC_MESSAGES/libgtop-2.0.mo
share/locale/ca/LC_MESSAGES/libgtop-2.0.mo
share/locale/cs/LC_MESSAGES/libgtop-2.0.mo
share/locale/cy/LC_MESSAGES/libgtop-2.0.mo
@@ -63,11 +64,13 @@ share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
share/locale/es/LC_MESSAGES/libgtop-2.0.mo
share/locale/et/LC_MESSAGES/libgtop-2.0.mo
+share/locale/eu/LC_MESSAGES/libgtop-2.0.mo
share/locale/fa/LC_MESSAGES/libgtop-2.0.mo
share/locale/fi/LC_MESSAGES/libgtop-2.0.mo
share/locale/fr/LC_MESSAGES/libgtop-2.0.mo
share/locale/ga/LC_MESSAGES/libgtop-2.0.mo
share/locale/gl/LC_MESSAGES/libgtop-2.0.mo
+share/locale/gu/LC_MESSAGES/libgtop-2.0.mo
share/locale/he/LC_MESSAGES/libgtop-2.0.mo
share/locale/hi/LC_MESSAGES/libgtop-2.0.mo
share/locale/hr/LC_MESSAGES/libgtop-2.0.mo
@@ -78,13 +81,16 @@ share/locale/ja/LC_MESSAGES/libgtop-2.0.mo
share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
share/locale/lt/LC_MESSAGES/libgtop-2.0.mo
share/locale/lv/LC_MESSAGES/libgtop-2.0.mo
+share/locale/mi/LC_MESSAGES/libgtop-2.0.mo
share/locale/mk/LC_MESSAGES/libgtop-2.0.mo
share/locale/ml/LC_MESSAGES/libgtop-2.0.mo
share/locale/mn/LC_MESSAGES/libgtop-2.0.mo
share/locale/ms/LC_MESSAGES/libgtop-2.0.mo
+share/locale/nb/LC_MESSAGES/libgtop-2.0.mo
share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
share/locale/no/LC_MESSAGES/libgtop-2.0.mo
+share/locale/or/LC_MESSAGES/libgtop-2.0.mo
share/locale/pa/LC_MESSAGES/libgtop-2.0.mo
share/locale/pl/LC_MESSAGES/libgtop-2.0.mo
share/locale/pt/LC_MESSAGES/libgtop-2.0.mo