pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/libgtop2 Updated to 2.0.7.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/14f1fcfc89e7
branches:  trunk
changeset: 464632:14f1fcfc89e7
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Dec 13 20:27:42 2003 +0000

description:
Updated to 2.0.7.

Changes:

        o Added more locale files.
        o Makefile.am: Change subdirectory build order so that
          'distclean' target work (and other targets remain working).
        o libgtop-2.0.pc.in: Fix missing build flags. Patch from
        Julio Merino.
        o sysdeps/linux/mem.c: (glibtop_get_mem_s): Fix memory calculation
        under Linux. Patch from <rwahl%gmx.de@localhost>.

And more... please review Changelog for a complete list of changes.

pkgsrc-changes:

        o FreeBSD 4.x/5.x support (only tested on 5.x)

diffstat:

 devel/libgtop2/Makefile         |    7 +-
 devel/libgtop2/PLIST            |   44 ++++++++++++----
 devel/libgtop2/distinfo         |   26 +++++----
 devel/libgtop2/patches/patch-aa |   33 ++++--------
 devel/libgtop2/patches/patch-ab |   66 ++++++++++++++++++-------
 devel/libgtop2/patches/patch-ag |   66 ++++++++++++++++++++-----
 devel/libgtop2/patches/patch-ah |   84 ++++++++++++++++++++++++++------
 devel/libgtop2/patches/patch-aj |   42 ++++-----------
 devel/libgtop2/patches/patch-ak |  102 ++++++++++++++++++++++++++++++++++++++++
 devel/libgtop2/patches/patch-al |   83 +++++++++++++++++++++++++++-----
 devel/libgtop2/patches/patch-am |   62 ++++++++++++++++++++----
 devel/libgtop2/patches/patch-an |   65 ++++++++++++++++++++++---
 devel/libgtop2/patches/patch-ao |   90 +++++++++++++++++++++++++++++++---
 devel/libgtop2/patches/patch-aq |   32 ++++++++++++
 14 files changed, 633 insertions(+), 169 deletions(-)

diffs (truncated from 1183 to 300 lines):

diff -r dc21a5cc4491 -r 14f1fcfc89e7 devel/libgtop2/Makefile
--- a/devel/libgtop2/Makefile   Sat Dec 13 20:26:03 2003 +0000
+++ b/devel/libgtop2/Makefile   Sat Dec 13 20:27:42 2003 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/08/09 10:44:45 seb Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/13 20:27:42 xtraeme Exp $
 
-DISTNAME=              libgtop-2.0.0
+DISTNAME=              libgtop-2.0.7
 PKGNAME=               ${DISTNAME:S/-/2-/}
-PKGREVISION=           4
 CATEGORIES=            devel gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/libgtop/2.0/}
 EXTRACT_SUFX=          .tar.bz2
@@ -38,6 +37,7 @@
 USE_LIBTOOL=           YES
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=    ${WRKSRC}/libgtop-2.0.pc.in
+PKGCONFIG_OVERRIDE+=   ${WRKSRC}/support/gnome-support-2.0.pc.in
 USE_MAKEINFO=          YES
 INFO_FILES=            libgtop2.info
 
@@ -52,6 +52,7 @@
 CONFIGURE_ARGS+=       --with-catgets --with-libgtop-guile=no
 CONFIGURE_ENV+=                AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}"
 
+.include "../../devel/popt/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r dc21a5cc4491 -r 14f1fcfc89e7 devel/libgtop2/PLIST
--- a/devel/libgtop2/PLIST      Sat Dec 13 20:26:03 2003 +0000
+++ b/devel/libgtop2/PLIST      Sat Dec 13 20:27:42 2003 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2003/06/23 11:27:51 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/12/13 20:27:42 xtraeme Exp $
 bin/libgtop_daemon2
 bin/libgtop_server2
+include/gnome/gnomesupport.h
 include/libgtop-2.0/glibtop.h
 include/libgtop-2.0/glibtop/close.h
 include/libgtop-2.0/glibtop/command.h
@@ -46,6 +47,8 @@
 include/libgtop-2.0/glibtop_server.h
 include/libgtop-2.0/glibtop_suid.h
 info/libgtop2.info
+info/libgtop2.info-1
+info/libgtop2.info-2
 lib/libgnomesupport-2.0.a
 lib/libgnomesupport-2.0.la
 lib/libgnomesupport-2.0.so
@@ -55,48 +58,64 @@
 lib/libgtop-2.0.la
 lib/libgtop-2.0.so
 lib/libgtop-2.0.so.0
-lib/libgtop-2.0.so.0.0
-lib/libgtop/include/gnomesupport.h
+lib/libgtop-2.0.so.0.7
 lib/libgtop_common-2.0.a
 lib/libgtop_common-2.0.la
 lib/libgtop_common-2.0.so
 lib/libgtop_common-2.0.so.0
-lib/libgtop_common-2.0.so.0.0
+lib/libgtop_common-2.0.so.0.7
 lib/libgtop_names-2.0.a
 lib/libgtop_names-2.0.la
 lib/libgtop_names-2.0.so
 lib/libgtop_names-2.0.so.0
-lib/libgtop_names-2.0.so.0.0
+lib/libgtop_names-2.0.so.0.7
 lib/libgtop_suid_common-2.0.a
 lib/libgtop_suid_common-2.0.la
 lib/libgtop_suid_common-2.0.so
 lib/libgtop_suid_common-2.0.so.0
-lib/libgtop_suid_common-2.0.so.0.0
+lib/libgtop_suid_common-2.0.so.0.7
 lib/libgtop_sysdeps-2.0.a
 lib/libgtop_sysdeps-2.0.la
 lib/libgtop_sysdeps-2.0.so
 lib/libgtop_sysdeps-2.0.so.0
-lib/libgtop_sysdeps-2.0.so.0.0
+lib/libgtop_sysdeps-2.0.so.0.7
 lib/libgtop_sysdeps_suid-2.0.a
 lib/libgtop_sysdeps_suid-2.0.la
 lib/libgtop_sysdeps_suid-2.0.so
 lib/libgtop_sysdeps_suid-2.0.so.0
-lib/libgtop_sysdeps_suid-2.0.so.0.0
+lib/libgtop_sysdeps_suid-2.0.so.0.7
+lib/pkgconfig/gnome-support-2.0.pc
 lib/pkgconfig/libgtop-2.0.pc
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgtop-2.0.mo
-${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgtop-2.0.mo
@@ -104,16 +123,19 @@
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
-@dirrm lib/libgtop/include
-@dirrm lib/libgtop
 @dirrm include/libgtop-2.0/glibtop
 @dirrm include/libgtop-2.0
diff -r dc21a5cc4491 -r 14f1fcfc89e7 devel/libgtop2/distinfo
--- a/devel/libgtop2/distinfo   Sat Dec 13 20:26:03 2003 +0000
+++ b/devel/libgtop2/distinfo   Sat Dec 13 20:27:42 2003 +0000
@@ -1,19 +1,21 @@
-$NetBSD: distinfo,v 1.6 2003/09/27 20:22:33 danw Exp $
+$NetBSD: distinfo,v 1.7 2003/12/13 20:27:42 xtraeme Exp $
 
-SHA1 (libgtop-2.0.0.tar.bz2) = 9178e5cede22ae5a8928677b195fe585b84b3b86
-Size (libgtop-2.0.0.tar.bz2) = 690581 bytes
-SHA1 (patch-aa) = 20cc13d5965815271f85f2dec086460176b2d1cd
-SHA1 (patch-ab) = 3ce99bf4d72cf4e4203364d78361c8a2df081d8d
+SHA1 (libgtop-2.0.7.tar.bz2) = e2e31b08a1609f3ba9f9a12e6d8f82ebe9e138fa
+Size (libgtop-2.0.7.tar.bz2) = 944207 bytes
+SHA1 (patch-aa) = b01ba86612ed2613034bfbfdc878ce5178eede6b
+SHA1 (patch-ab) = 83d16a720eaaa113bf714fa8d60fcb9acf11c988
 SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8
 SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893
 SHA1 (patch-ae) = cf277165382c17d938593934b59d8035175fd8d0
 SHA1 (patch-af) = 0374fc36c418871e929fbb3c53ab4979e780e8d5
-SHA1 (patch-ag) = 470e29d999b079a5f75993978b3cdcdec2fd7d9c
-SHA1 (patch-ah) = 93ebb47710f1c4cc70406a92503bdc4a5bfa50d2
+SHA1 (patch-ag) = 7d46fc3b996e39e8532d2e20a47587a54e37b654
+SHA1 (patch-ah) = 29cfc8b7f98610efb2b6013367c06f0e09a32312
 SHA1 (patch-ai) = 07a83340eb9d6a36a3f5b2db33eb50c74fbc4777
-SHA1 (patch-aj) = e262a47aca7871420321d6fa5259a127b69d2095
-SHA1 (patch-al) = 6f3613fab44bbf27e5a60fdab35d26b93a04de47
-SHA1 (patch-am) = a1fd84155a76246276e952f5288636d2f086b3e7
-SHA1 (patch-an) = 2db9a77b2b021ecd6e0f8c82cebf0455ae6ce501
-SHA1 (patch-ao) = 8a3d4b50c00363527a00e3dba9ff4292ae777907
+SHA1 (patch-aj) = 0a0ca01be2a33a1a3b9f17e1d52db1a1b7502177
+SHA1 (patch-ak) = 95170aa2786c5313f859b2381031be9bc7f7cd76
+SHA1 (patch-al) = 93dbdb01e268005f231c00ce7e640dc68b7d6ca2
+SHA1 (patch-am) = cc12e383f36e7f3c0f25fd3a3ea2e0ceff04d43c
+SHA1 (patch-an) = 5ea04c27db91067733ab75d4ce4959446031cb91
+SHA1 (patch-ao) = f54754a2bdcce99a0d953186aee6d2bcbc5d7bae
 SHA1 (patch-ap) = c47c57d77424d18a3184a0625e0d953745d929fe
+SHA1 (patch-aq) = 8efdb60a0bf66b6d0614620a0523238b41e72b8b
diff -r dc21a5cc4491 -r 14f1fcfc89e7 devel/libgtop2/patches/patch-aa
--- a/devel/libgtop2/patches/patch-aa   Sat Dec 13 20:26:03 2003 +0000
+++ b/devel/libgtop2/patches/patch-aa   Sat Dec 13 20:27:42 2003 +0000
@@ -1,38 +1,29 @@
-$NetBSD: patch-aa,v 1.2 2002/11/30 23:21:38 salo Exp $
+$NetBSD: patch-aa,v 1.3 2003/12/13 20:27:42 xtraeme Exp $
 
---- configure.orig     Tue Jun 11 07:46:22 2002
-+++ configure
-@@ -7738,13 +7738,13 @@ echo $ECHO_N "checking for libgtop sysde
+--- configure.orig     2003-12-13 08:32:17.000000000 +0100
++++ configure  2003-12-13 08:33:16.000000000 +0100
+@@ -19717,13 +19717,13 @@
          libgtop_sysdeps_dir=freebsd
          libgtop_use_machine_h=yes
          libgtop_need_server=yes
 -        libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-+        libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
++        libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server'
          ;;
        solaris*)
          libgtop_sysdeps_dir=solaris
          libgtop_use_machine_h=yes
          libgtop_need_server=yes
 -        libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-+        libgtop_postinstall='chgrp sys $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
++        libgtop_postinstall='chgrp sys $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server'
          ;;
-       *)
-         if test x$hacker_mode = xyes ; then
-@@ -15698,7 +15703,7 @@ LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS
- LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
- LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
- LIBGTOP_BINDIR='$(bindir)'
--LIBGTOP_SERVER='$(bindir)/libgtop_server'
-+LIBGTOP_SERVER='$(bindir)/libgtop_server2'
+         aix*)
+         libgtop_sysdeps_dir=aix
+@@ -30160,7 +30160,7 @@
  
- sysdeps_dir="$libgtop_sysdeps_dir"
- 
-@@ -15747,7 +15752,7 @@ INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -D
  
  if test x$libgtop_need_server = xyes ; then
-    sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
--   server_programs='libgtop_server'
-+   server_programs='libgtop_server2'
+-   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
++   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la \$(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la"
+    server_programs='libgtop_server2'
  else
     sysdeps_suid_lib=
-    server_programs=
diff -r dc21a5cc4491 -r 14f1fcfc89e7 devel/libgtop2/patches/patch-ab
--- a/devel/libgtop2/patches/patch-ab   Sat Dec 13 20:26:03 2003 +0000
+++ b/devel/libgtop2/patches/patch-ab   Sat Dec 13 20:27:42 2003 +0000
@@ -1,48 +1,76 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
+$NetBSD: patch-ab,v 1.2 2003/12/13 20:27:42 xtraeme Exp $
 
---- sysdeps/freebsd/procsignal.c.orig  Sun Feb 13 22:31:39 2000
-+++ sysdeps/freebsd/procsignal.c       Wed Jan  3 00:42:45 2001
-@@ -70,7 +70,9 @@
+--- sysdeps/freebsd/procsignal.c.orig  Sat Sep  6 00:25:33 2003
++++ sysdeps/freebsd/procsignal.c       Sat Sep  6 00:30:38 2003
+@@ -67,11 +67,30 @@
+               return;
+       }
+ 
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
++
++#define       XXX_P_SIGLIST   ki_siglist
++#define       XXX_P_SIGMASK   ki_sigmask
++#define       XXX_P_SIGIGNORE ki_sigignore
++#define       XXX_P_SIGCATCH  ki_sigcatch
++
++#else
++
++#define       XXX_P_SIGLIST   kp_proc.p_siglist
++#define       XXX_P_SIGMASK   kp_proc.p_sigmask
++#define       XXX_P_SIGIGNORE kp_proc.p_sigignore
++#define       XXX_P_SIGCATCH  kp_proc.p_sigcatch
++
++#endif
++
++
        /* signal: mask of pending signals.
         *         pinfo [0].kp_proc.p_siglist
         */
 -#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000)
+-      buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0];
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
 +      buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0];
-+#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
-       buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0];
++#elif (defined(__NetBSD__) && (NSIG > 32)) || defined(__FreeBSD__) && (__FreeBSD_version >= 400011)
++      buf->signal [0] = pinfo [0].XXX_P_SIGLIST.__bits[0];
  #else
        buf->signal [0] = pinfo [0].kp_proc.p_siglist;
-@@ -79,7 +81,9 @@
+ #endif
+@@ -79,8 +98,10 @@
        /* blocked: mask of blocked signals.
         *          pinfo [0].kp_proc.p_sigmask
         */
 -#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000)
+-      buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0];
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
 +      buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0];
-+#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
-       buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0];
++#elif (defined(__NetBSD__) && (NSIG > 32)) || defined(__FreeBSD__) && (__FreeBSD_version >= 400011)
++      buf->blocked [0] = pinfo [0].XXX_P_SIGMASK.__bits[0];
  #else



Home | Main Index | Thread Index | Old Index