From c6499c793778031084f9d3e7eff35eb9ce3dbada Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 15 Nov 2008 19:34:11 +0000 Subject: Update to 2.24.0. New cpu affinity code (see changes for 2.23.2 below) is ifdef'd out. 22 Septembre 2008: Overview of changes in 2.24.0 ================================================ * Translation updates. 18 August 2008: Overview of changes in 2.23.90 ============================================== * freebsd: - updated port by Joe Marcus Clarke. 23 June 2008: Overview of changes in 2.23.4 =========================================== * linux: - Fixed and improved glibtop_get_fsusage with kernel >= 2.6.25. Closes #539360. 24 May 2008: Overview of changes in 2.23.2 ========================================== * glibtop_get_proc_open_files API can also lists IPv6 TCP sockets. * glibtop_get_proc_affinity : new API to retrieve process CPU affinity. (Let's hope one day i'll find the gtk-doc documentation ...) * linux: - fixed parsing of big /proc/stat for uptime. 04 April 2008: Overview of changes in 2.22.1 ============================================ * Fixed compilation/dist for !linux. Closes #525953. 10 Mars 2008: Overview of changes in 2.22.0 =========================================== * linux: - fixed proc_kernel. 25 February 2008: Overview of changes in 2.21.92 ================================================ * linux: - fixed smaps parsing on >= 2.6.24.x. 14 January 2008: Overview of changes in 2.21.5 ============================================== * freebsd: - fixed build on GNU/kfreebsd. Petr Salinger. - fixed procmem units. Kuang-che Wu. 28 October 2007: Overview of changes in 2.21.1 ============================================== * don't export _p/_s private symbols anymore. This is not an API/ABI breakage. * darwin implementation by Benjamin Reed. * linux: - splitted fsusage and mountlist implementations; - smarter mountlist(allfs = False); - fixed some compile warning on 64bit; * solaris: - fixed netload build by Henry Zhang. --- sysutils/libgtop/Makefile | 38 ++++++++++++++++++++------------------ sysutils/libgtop/PLIST | 6 ++++-- sysutils/libgtop/buildlink3.mk | 4 ++-- sysutils/libgtop/distinfo | 12 +++++++----- sysutils/libgtop/patches/patch-aa | 32 ++++++++++++++++++++++++++++++++ sysutils/libgtop/patches/patch-ad | 23 +++++++++++++++++++++++ sysutils/libgtop/patches/patch-cb | 7 ++++--- 7 files changed, 92 insertions(+), 30 deletions(-) create mode 100644 sysutils/libgtop/patches/patch-aa create mode 100644 sysutils/libgtop/patches/patch-ad (limited to 'sysutils/libgtop') diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile index 007acb82a8a..c57c3de3d01 100644 --- a/sysutils/libgtop/Makefile +++ b/sysutils/libgtop/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2008/04/12 22:43:12 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2008/11/15 19:34:11 wiz Exp $ -DISTNAME= libgtop-2.20.2 +DISTNAME= libgtop-2.24.0 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.20/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.24/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -11,27 +11,30 @@ COMMENT= Library to retrieve system information, used in GNOME2 OSVERSION_SPECIFIC= YES -USE_PKGLOCALEDIR= YES -USE_TOOLS+= gmake makeinfo msgfmt perl pkg-config intltool -USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= libgtop-2.0.pc.in -PKGCONFIG_OVERRIDE+= support/gnome-support-2.0.pc.in +GNU_CONFIGURE= YES INFO_FILES= YES +PKGCONFIG_OVERRIDE= libgtop-2.0.pc.in TEXINFO_REQD= 4.6 +USE_LIBTOOL= YES +USE_PKGLOCALEDIR= YES +USE_TOOLS+= gmake makeinfo msgfmt perl pkg-config intltool + +CONFIGURE_ARGS+= --enable-gtk-doc +CONFIGURE_ARGS+= --without-x +CONFIGURE_ENV+= LN_S="${LN} -s" + CONFLICTS+= libgtop2-[0-9]* +post-patch: + cd ${WRKSRC}/sysdeps && \ + ${CP} freebsd/procaffinity.c bsd/procaffinity.c + # The following flags are for debugging purposes. They don't need to # be used unless you are actively developing/debugging libgtop. #CPPFLAGS+= -DLIBGTOP_ENABLE_DEBUG -DLIBGTOP_FATAL_WARNINGS #CFLAGS+= -g #LDFLAGS+= -g -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-glib-prefix=${BUILDLINK_PREFIX.glib2} -CONFIGURE_ARGS+= --with-catgets --with-libgtop-guile=no -CONFIGURE_ARGS+= --without-x -CONFIGURE_ENV+= LN_S="${LN} -s" - PRINT_PLIST_AWK+= /^bin\/libgtop_server2$$/ \ { print "$${LIBGTOP_SERVER}" $$0; next } PRINT_PLIST_AWK+= /^include\/libgtop-2.0\/glibtop_suid.h$$/ \ @@ -78,10 +81,9 @@ CPPFLAGS+= -DHAVE_STATVFS_WRITES_COUNT .endif .undef statvfs_h -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 - .include "../../devel/gettext-lib/buildlink3.mk" +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libgnome/buildlink3.mk" -.include "../../devel/popt/buildlink3.mk" +.include "../../textproc/gtk-doc/buildlink3.mk" +.include "../../x11/libXau/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/libgtop/PLIST b/sysutils/libgtop/PLIST index 9062acf7e60..6bf84d2335f 100644 --- a/sysutils/libgtop/PLIST +++ b/sysutils/libgtop/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:12 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/11/15 19:34:11 wiz Exp $ ${PLIST.server}bin/libgtop_daemon2 ${PLIST.server}bin/libgtop_server2 include/libgtop-2.0/glibtop.h @@ -17,6 +17,7 @@ include/libgtop-2.0/glibtop/netload.h include/libgtop-2.0/glibtop/open.h include/libgtop-2.0/glibtop/parameter.h include/libgtop-2.0/glibtop/ppp.h +include/libgtop-2.0/glibtop/procaffinity.h include/libgtop-2.0/glibtop/procargs.h include/libgtop-2.0/glibtop/prockernel.h include/libgtop-2.0/glibtop/proclist.h @@ -137,6 +138,7 @@ 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/mr/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/ne/LC_MESSAGES/libgtop-2.0.mo @@ -155,7 +157,7 @@ share/locale/sk/LC_MESSAGES/libgtop-2.0.mo share/locale/sl/LC_MESSAGES/libgtop-2.0.mo share/locale/sq/LC_MESSAGES/libgtop-2.0.mo share/locale/sr/LC_MESSAGES/libgtop-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo +share/locale/sr@latin/LC_MESSAGES/libgtop-2.0.mo share/locale/sv/LC_MESSAGES/libgtop-2.0.mo share/locale/ta/LC_MESSAGES/libgtop-2.0.mo share/locale/te/LC_MESSAGES/libgtop-2.0.mo diff --git a/sysutils/libgtop/buildlink3.mk b/sysutils/libgtop/buildlink3.mk index eec7d85b026..e203c1190e2 100644 --- a/sysutils/libgtop/buildlink3.mk +++ b/sysutils/libgtop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2007/09/20 21:12:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2008/11/15 19:34:11 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGTOP_BUILDLINK3_MK:= ${LIBGTOP_BUILDLINK3_MK}+ @@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.libgtop?= ../../sysutils/libgtop .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/popt/buildlink3.mk" +.include "../../x11/libXau/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/libgtop/distinfo b/sysutils/libgtop/distinfo index 098ac8fbba1..6cee1c125d6 100644 --- a/sysutils/libgtop/distinfo +++ b/sysutils/libgtop/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.7 2008/03/12 21:43:30 drochner Exp $ +$NetBSD: distinfo,v 1.8 2008/11/15 19:34:11 wiz Exp $ -SHA1 (libgtop-2.20.2.tar.bz2) = 50078297b18745696cf37318395e8f61216216f0 -RMD160 (libgtop-2.20.2.tar.bz2) = 3164940c9a0211f59451a4c38c05c750098f6675 -Size (libgtop-2.20.2.tar.bz2) = 773428 bytes +SHA1 (libgtop-2.24.0.tar.bz2) = 934b9a83f8042dbbacdfb02cf85f4078d8b6fd14 +RMD160 (libgtop-2.24.0.tar.bz2) = f007316559118c02acd7f0eafba79b7c8dfd28f3 +Size (libgtop-2.24.0.tar.bz2) = 775351 bytes +SHA1 (patch-aa) = 031a8128a89bd1d0adcd04d46fb6822ba16bb1b1 SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161 SHA1 (patch-ac) = 3dd59355e36657df4c8575c35ef11c28d4192d77 +SHA1 (patch-ad) = 737186e6245f66a8650b0c4bf91702a5ffa1c186 SHA1 (patch-ag) = 8ed7b66b4250dbc6f6321cef24941f58106fcbaf SHA1 (patch-ai) = 856c457b14e384b2c991bf51274f97a3a9c853f1 SHA1 (patch-aj) = 94e41923f13732118e8e809a09ec4162bf2ca422 @@ -16,6 +18,6 @@ SHA1 (patch-aq) = bb44484df341a009aa269fbaf5039e351e105e6c SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914 SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8 SHA1 (patch-ca) = e92c33e38ef522c179ec4508b239e4eb84a83c9c -SHA1 (patch-cb) = f95adc119389b75fd4d1954a2f6ef8ff0431bf91 +SHA1 (patch-cb) = cabc971530d8113694ff6d04108490749d40bcec SHA1 (patch-cc) = 2cb1d2da57a8622c93ed255a416ed9c811e775a2 SHA1 (patch-cd) = cf96896ddde9c830c1e808d8bf37b9fdb611ed24 diff --git a/sysutils/libgtop/patches/patch-aa b/sysutils/libgtop/patches/patch-aa new file mode 100644 index 00000000000..5b306ad4c3d --- /dev/null +++ b/sysutils/libgtop/patches/patch-aa @@ -0,0 +1,32 @@ +$NetBSD: patch-aa,v 1.7 2008/11/15 19:34:11 wiz Exp $ + +--- sysdeps/bsd/Makefile.in.orig 2008-11-15 14:27:48.000000000 +0000 ++++ sysdeps/bsd/Makefile.in +@@ -60,7 +60,8 @@ am_libgtop_sysdeps_suid_2_0_la_OBJECTS = + msg_limits.lo sem_limits.lo proclist.lo procstate.lo \ + procuid.lo proctime.lo procmem.lo procsignal.lo prockernel.lo \ + procsegment.lo procargs.lo procmap.lo netlist.lo netload.lo \ +- ppp.lo procopenfiles.lo fsusage.lo ++ ppp.lo procopenfiles.lo fsusage.lo \ ++ procaffinity.lo + libgtop_sysdeps_suid_2_0_la_OBJECTS = \ + $(am_libgtop_sysdeps_suid_2_0_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -308,7 +309,8 @@ libgtop_sysdeps_suid_2_0_la_SOURCES = op + sem_limits.c proclist.c procstate.c procuid.c \ + proctime.c procmem.c procsignal.c prockernel.c \ + procsegment.c procargs.c procmap.c netlist.c \ +- netload.c ppp.c procopenfiles.c fsusage.c ++ netload.c ppp.c procopenfiles.c fsusage.c \ ++ procaffinity.c + + libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) + libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h \ +@@ -380,6 +382,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procargs.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procaffinity.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prockernel.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proclist.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmap.Plo@am__quote@ diff --git a/sysutils/libgtop/patches/patch-ad b/sysutils/libgtop/patches/patch-ad new file mode 100644 index 00000000000..c08a9198aa6 --- /dev/null +++ b/sysutils/libgtop/patches/patch-ad @@ -0,0 +1,23 @@ +$NetBSD: patch-ad,v 1.7 2008/11/15 19:34:11 wiz Exp $ + +--- sysdeps/freebsd/procaffinity.c.orig 2008-08-18 15:23:36.000000000 +0000 ++++ sysdeps/freebsd/procaffinity.c +@@ -21,7 +21,9 @@ + #include + #include + ++#if defined(__FreeBSD__) + #include ++#endif + + #include + #if __FreeBSD_version > 800024 +@@ -41,7 +43,7 @@ _glibtop_init_proc_affinity_s(glibtop *s + guint16 * + glibtop_get_proc_affinity_s(glibtop *server, glibtop_proc_affinity *buf, pid_t pid) + { +-#if __FreeBSD_version > 800024 ++#if defined(__FreeBSD__) && __FreeBSD_version > 800024 + id_t id; + cpulevel_t level; + cpuwhich_t which; diff --git a/sysutils/libgtop/patches/patch-cb b/sysutils/libgtop/patches/patch-cb index fdb0c928d1b..6d35fa791b1 100644 --- a/sysutils/libgtop/patches/patch-cb +++ b/sysutils/libgtop/patches/patch-cb @@ -1,12 +1,13 @@ -$NetBSD: patch-cb,v 1.1 2007/11/05 19:06:06 drochner Exp $ +$NetBSD: patch-cb,v 1.2 2008/11/15 19:34:11 wiz Exp $ ---- sysdeps/bsd/glibtop_server.h.orig 2007-04-27 00:27:34.000000000 +0200 +--- sysdeps/bsd/glibtop_server.h.orig 2008-05-23 22:13:21.000000000 +0000 +++ sysdeps/bsd/glibtop_server.h -@@ -45,6 +45,7 @@ G_BEGIN_DECLS +@@ -45,6 +45,8 @@ G_BEGIN_DECLS #define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD) #define GLIBTOP_SUID_NETLIST 0 #define GLIBTOP_SUID_PPP (1 << GLIBTOP_SYSDEPS_PPP) +#define GLIBTOP_SUID_PROC_WD 0 ++#define GLIBTOP_SUID_PROC_AFFINITY 0 G_END_DECLS -- cgit v1.2.3