aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2001-02-15 19:21:55 +0000
committerAde Lovett <ade@FreeBSD.org>2001-02-15 19:21:55 +0000
commit564f01076d1a2deae479a4705a0c62424608113a (patch)
treed3d3bc0ce9566bcb8e1249bc3e695cb2c2cb8305 /devel
parent6b669add32b4f43aeb1a795508d54b7dd3eafb39 (diff)
downloadports-564f01076d1a2deae479a4705a0c62424608113a.tar.gz
ports-564f01076d1a2deae479a4705a0c62424608113a.zip
Update to 1.0.11
Unbreak (again) for -current (from knu)
Notes
Notes: svn path=/head/; revision=38383
Diffstat (limited to 'devel')
-rw-r--r--devel/libgtop/Makefile3
-rw-r--r--devel/libgtop/distinfo2
-rw-r--r--devel/libgtop/files/patch-ab11
-rw-r--r--devel/libgtop/files/patch-aj22
-rw-r--r--devel/libgtop/pkg-plist4
-rw-r--r--devel/libgtop2/Makefile3
-rw-r--r--devel/libgtop2/distinfo2
-rw-r--r--devel/libgtop2/files/patch-ab11
-rw-r--r--devel/libgtop2/files/patch-aj22
-rw-r--r--devel/libgtop2/pkg-plist4
10 files changed, 42 insertions, 42 deletions
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index be68a51b240f..7bb3906e8a14 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libgtop
-PORTVERSION= 1.0.10
-PORTREVISION= 3
+PORTVERSION= 1.0.11
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libgtop
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 8c072b08c59a..18aa9ec1e84d 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1 +1 @@
-MD5 (libgtop-1.0.10.tar.gz) = f8aefa42abd6be0db114432bf59853a6
+MD5 (libgtop-1.0.11.tar.gz) = 29f349af7494882b15c4de805534d778
diff --git a/devel/libgtop/files/patch-ab b/devel/libgtop/files/patch-ab
index 3072888d0891..c1b39624b2fe 100644
--- a/devel/libgtop/files/patch-ab
+++ b/devel/libgtop/files/patch-ab
@@ -1,14 +1,3 @@
---- src/daemon/Makefile.in.orig Tue Mar 2 18:48:38 1999
-+++ src/daemon/Makefile.in Tue Mar 2 18:49:07 1999
-@@ -191,7 +191,7 @@
-
-
- libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h
--libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@
-+libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
-
-
- EXTRA_DIST = server_config.h.in server_config.pl
--- Makefile.in.orig Tue Oct 19 06:04:23 1999
+++ Makefile.in Tue Oct 26 11:42:07 1999
@@ -187,7 +187,7 @@
diff --git a/devel/libgtop/files/patch-aj b/devel/libgtop/files/patch-aj
index da75746963c1..9adf3b28d865 100644
--- a/devel/libgtop/files/patch-aj
+++ b/devel/libgtop/files/patch-aj
@@ -71,9 +71,9 @@
- switch (pinfo [0].kp_proc.p_stat) {
+ switch (pinfo [0].XXX_P_STAT) {
case SIDL:
---- sysdeps/freebsd/procuid.c.orig Thu Sep 16 16:08:07 1999
-+++ sysdeps/freebsd/procuid.c Fri Dec 22 18:37:41 2000
-@@ -86,13 +86,38 @@
+--- sysdeps/freebsd/procuid.c.orig Fri Sep 17 06:08:07 1999
++++ sysdeps/freebsd/procuid.c Thu Feb 15 01:16:50 2001
+@@ -86,13 +86,42 @@
- buf->uid = pinfo [0].kp_eproc.e_pcred.p_ruid;
- buf->euid = pinfo [0].kp_eproc.e_pcred.p_svuid;
@@ -95,7 +95,11 @@
+#define XXX_E_PGID ki_pgid
+#define XXX_E_TPGID ki_tpgid
+#define XXX_P_NICE ki_nice
++#if __FreeBSD_version >= 500013
++#define XXX_P_PRIORITY ki_pri.pri_user
++#else
+#define XXX_P_PRIORITY ki_priority
++#endif
+#else
+
+#define XXX_P_RUID kp_eproc.e_pcred.p_ruid
@@ -122,8 +126,8 @@
+ buf->nice = pinfo [0].XXX_P_NICE;
+ buf->priority = pinfo [0].XXX_P_PRIORITY;
---- sysdeps/freebsd/proctime.c.orig Thu Sep 16 16:08:07 1999
-+++ sysdeps/freebsd/proctime.c Fri Dec 22 22:45:57 2000
+--- sysdeps/freebsd/proctime.c.orig Fri Sep 17 06:08:07 1999
++++ sysdeps/freebsd/proctime.c Thu Feb 15 01:15:11 2001
@@ -68,5 +68,2 @@
u_quad_t u, st, ut, it, tot;
-#if (__FreeBSD_version < 300003)
@@ -150,10 +154,14 @@
- buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime);
+ buf->rtime = pinfo [0].kp_proc.p_runtime;
#endif
-@@ -194,2 +186,13 @@
+@@ -194,2 +186,17 @@
#else
+#if __FreeBSD_version >= 500013
++#if __FreeBSD_version >= 500016
++ if ((pinfo [0].ki_flag & PS_INMEM)) {
++#else
+ if ((pinfo [0].ki_flag & P_INMEM)) {
++#endif
+ buf->utime = pinfo [0].ki_runtime;
+ buf->stime = 0; /* XXX */
+ buf->cutime = tv2sec (pinfo [0].ki_childtime);
@@ -164,7 +172,7 @@
+
+#else
glibtop_suid_enter (server);
-@@ -224,2 +227,3 @@
+@@ -224,2 +231,3 @@
}
+#endif
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index 4fb9e9034f38..bb47391746ec 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -74,6 +74,7 @@ lib/libgtop_sysdeps.so.1
lib/libgtop_sysdeps_suid.a
lib/libgtop_sysdeps_suid.so
lib/libgtop_sysdeps_suid.so.1
+share/locale/az/LC_MESSAGES/libgtop.mo
share/locale/da/LC_MESSAGES/libgtop.mo
share/locale/de/LC_MESSAGES/libgtop.mo
share/locale/es/LC_MESSAGES/libgtop.mo
@@ -92,5 +93,8 @@ share/locale/ko/LC_MESSAGES/libgtop.mo
share/locale/nl/LC_MESSAGES/libgtop.mo
share/locale/no/LC_MESSAGES/libgtop.mo
share/locale/pl/LC_MESSAGES/libgtop.mo
+share/locale/pt_BR/LC_MESSAGES/libgtop.mo
+share/locale/sk/LC_MESSAGES/libgtop.mo
+share/locale/sl/LC_MESSAGES/libgtop.mo
share/locale/sv/LC_MESSAGES/libgtop.mo
@dirrm include/glibtop
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index be68a51b240f..7bb3906e8a14 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libgtop
-PORTVERSION= 1.0.10
-PORTREVISION= 3
+PORTVERSION= 1.0.11
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libgtop
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 8c072b08c59a..18aa9ec1e84d 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1 +1 @@
-MD5 (libgtop-1.0.10.tar.gz) = f8aefa42abd6be0db114432bf59853a6
+MD5 (libgtop-1.0.11.tar.gz) = 29f349af7494882b15c4de805534d778
diff --git a/devel/libgtop2/files/patch-ab b/devel/libgtop2/files/patch-ab
index 3072888d0891..c1b39624b2fe 100644
--- a/devel/libgtop2/files/patch-ab
+++ b/devel/libgtop2/files/patch-ab
@@ -1,14 +1,3 @@
---- src/daemon/Makefile.in.orig Tue Mar 2 18:48:38 1999
-+++ src/daemon/Makefile.in Tue Mar 2 18:49:07 1999
-@@ -191,7 +191,7 @@
-
-
- libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h
--libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@
-+libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
-
-
- EXTRA_DIST = server_config.h.in server_config.pl
--- Makefile.in.orig Tue Oct 19 06:04:23 1999
+++ Makefile.in Tue Oct 26 11:42:07 1999
@@ -187,7 +187,7 @@
diff --git a/devel/libgtop2/files/patch-aj b/devel/libgtop2/files/patch-aj
index da75746963c1..9adf3b28d865 100644
--- a/devel/libgtop2/files/patch-aj
+++ b/devel/libgtop2/files/patch-aj
@@ -71,9 +71,9 @@
- switch (pinfo [0].kp_proc.p_stat) {
+ switch (pinfo [0].XXX_P_STAT) {
case SIDL:
---- sysdeps/freebsd/procuid.c.orig Thu Sep 16 16:08:07 1999
-+++ sysdeps/freebsd/procuid.c Fri Dec 22 18:37:41 2000
-@@ -86,13 +86,38 @@
+--- sysdeps/freebsd/procuid.c.orig Fri Sep 17 06:08:07 1999
++++ sysdeps/freebsd/procuid.c Thu Feb 15 01:16:50 2001
+@@ -86,13 +86,42 @@
- buf->uid = pinfo [0].kp_eproc.e_pcred.p_ruid;
- buf->euid = pinfo [0].kp_eproc.e_pcred.p_svuid;
@@ -95,7 +95,11 @@
+#define XXX_E_PGID ki_pgid
+#define XXX_E_TPGID ki_tpgid
+#define XXX_P_NICE ki_nice
++#if __FreeBSD_version >= 500013
++#define XXX_P_PRIORITY ki_pri.pri_user
++#else
+#define XXX_P_PRIORITY ki_priority
++#endif
+#else
+
+#define XXX_P_RUID kp_eproc.e_pcred.p_ruid
@@ -122,8 +126,8 @@
+ buf->nice = pinfo [0].XXX_P_NICE;
+ buf->priority = pinfo [0].XXX_P_PRIORITY;
---- sysdeps/freebsd/proctime.c.orig Thu Sep 16 16:08:07 1999
-+++ sysdeps/freebsd/proctime.c Fri Dec 22 22:45:57 2000
+--- sysdeps/freebsd/proctime.c.orig Fri Sep 17 06:08:07 1999
++++ sysdeps/freebsd/proctime.c Thu Feb 15 01:15:11 2001
@@ -68,5 +68,2 @@
u_quad_t u, st, ut, it, tot;
-#if (__FreeBSD_version < 300003)
@@ -150,10 +154,14 @@
- buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime);
+ buf->rtime = pinfo [0].kp_proc.p_runtime;
#endif
-@@ -194,2 +186,13 @@
+@@ -194,2 +186,17 @@
#else
+#if __FreeBSD_version >= 500013
++#if __FreeBSD_version >= 500016
++ if ((pinfo [0].ki_flag & PS_INMEM)) {
++#else
+ if ((pinfo [0].ki_flag & P_INMEM)) {
++#endif
+ buf->utime = pinfo [0].ki_runtime;
+ buf->stime = 0; /* XXX */
+ buf->cutime = tv2sec (pinfo [0].ki_childtime);
@@ -164,7 +172,7 @@
+
+#else
glibtop_suid_enter (server);
-@@ -224,2 +227,3 @@
+@@ -224,2 +231,3 @@
}
+#endif
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 4fb9e9034f38..bb47391746ec 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -74,6 +74,7 @@ lib/libgtop_sysdeps.so.1
lib/libgtop_sysdeps_suid.a
lib/libgtop_sysdeps_suid.so
lib/libgtop_sysdeps_suid.so.1
+share/locale/az/LC_MESSAGES/libgtop.mo
share/locale/da/LC_MESSAGES/libgtop.mo
share/locale/de/LC_MESSAGES/libgtop.mo
share/locale/es/LC_MESSAGES/libgtop.mo
@@ -92,5 +93,8 @@ share/locale/ko/LC_MESSAGES/libgtop.mo
share/locale/nl/LC_MESSAGES/libgtop.mo
share/locale/no/LC_MESSAGES/libgtop.mo
share/locale/pl/LC_MESSAGES/libgtop.mo
+share/locale/pt_BR/LC_MESSAGES/libgtop.mo
+share/locale/sk/LC_MESSAGES/libgtop.mo
+share/locale/sl/LC_MESSAGES/libgtop.mo
share/locale/sv/LC_MESSAGES/libgtop.mo
@dirrm include/glibtop
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 02:59:08 +0000