Add libgtop2 after repo copy from libgtop. This is the GNU top API for

GNOME 2.0.

7 files changed, 135 insertions, 105 deletions

diff --git a/devel/libgtop2/files/patch-ab b/devel/libgtop2/files/patch-ab
index 6c8bb313de70..9c88c62bc771 100644
--- a/devel/libgtop2/files/patch-ab
+++ b/devel/libgtop2/files/patch-ab
@@ -1,32 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Mon Jan 28 16:22:04 2002
-+++ Makefile.in	Mon Jan 28 16:23:07 2002
-@@ -193,7 +193,7 @@
- EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in 	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 	RELNOTES-1.0 RELNOTES-1.0.x libgtop-sysdeps.m4 README 	libgtop-mirror.sh
- 
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = $(top_builddir)/libgtopConf.sh 		  $(top_builddir)/libgtop-features.def
- 
- 
-@@ -565,7 +565,7 @@
+--- Makefile.in.orig	Mon Apr 29 12:00:07 2002
++++ Makefile.in	Mon Apr 29 12:00:24 2002
+@@ -503,7 +503,7 @@
  $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
  
  libgtopConf.sh: libgtopConf.sh.in Makefile
 -	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(confexecdir)#g' \
- 	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-1.0#g' \
++	sed -e 's#\@LIBGTOP_LIBDIR\@#$(sysconfdir)#g' \
+ 	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-2.0#g' \
  	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
  	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
-@@ -594,7 +594,7 @@
- 	  && mv libgtopConf.tmp libgtopConf.sh
- 
- libgtop-config: libgtop-config.in Makefile
--	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(confexecdir)#g' \
- 	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
- 	  && mv libgtop-config.tmp libgtop-config && \
- 		chmod 755 libgtop-config
diff --git a/devel/libgtop2/files/patch-aj b/devel/libgtop2/files/patch-aj
index 712d069f09ee..101a29532b41 100644
--- a/devel/libgtop2/files/patch-aj
+++ b/devel/libgtop2/files/patch-aj
@@ -24,11 +24,35 @@
 -		pids [j++] = (unsigned) pinfo[i].kp_proc.p_pid;
 +		pids [j++] = (unsigned) pinfo[i].XXX_P_PID;
  	} /* end for */
---- sysdeps/freebsd/procstate.c.orig	Sat Oct 16 13:01:39 1999
-+++ sysdeps/freebsd/procstate.c	Fri Dec 22 18:00:55 2000
-@@ -78,11 +78,29 @@
+--- sysdeps/freebsd/procstate.c.orig	Sun Feb 10 09:30:11 2002
++++ sysdeps/freebsd/procstate.c	Mon Apr 29 11:42:22 2002
+@@ -28,7 +28,7 @@
+ #include <glibtop_suid.h>
+ 
+ #if !defined(__OpenBSD__) 
+-//&& (!defined __bsdi__)
++/*&& (!defined __bsdi__)*/
+ #include <sys/user.h>
+ #endif
+ 
+@@ -37,11 +37,7 @@
+ (1L << GLIBTOP_PROC_STATE_GID);
+ 
+ static const unsigned long _glibtop_sysdeps_proc_state_new =
+-#if LIBGTOP_VERSION_CODE >= 1001000
+-(1L << GLIBTOP_PROC_STATE_RUID) + (1L << GLIBTOP_PROC_STATE_RGID);
+-#else
+ 0;
+-#endif
+ 
+ /* Init function. */
+ 
+@@ -76,43 +72,35 @@
+ 		return;
+ 	}
  
 -	strncpy (buf->cmd, pinfo [0].kp_proc.p_comm, sizeof (buf->cmd)-1);
+-	buf->cmd [sizeof (buf->cmd)-1] = 0;
 +#if __FreeBSD_version >= 500013
 +#define	XXX_P_COMM	ki_comm
 +#define	XXX_P_SVUID	ki_svuid
@@ -36,7 +60,9 @@
 +#define	XXX_P_RUID	ki_ruid
 +#define	XXX_P_RGID	ki_rgid
 +#define XXX_P_STAT	ki_stat
-+
+ 
+-	buf->uid = pinfo [0].kp_eproc.e_pcred.p_svuid;
+-	buf->gid = pinfo [0].kp_eproc.e_pcred.p_svgid;
 +#else
 +#define	XXX_P_COMM	kp_proc.p_comm
 +#define	XXX_P_SVUID	kp_eproc.e_pcred.p_svuid
@@ -44,33 +70,56 @@
 +#define	XXX_P_RUID	kp_eproc.e_pcred.p_ruid
 +#define	XXX_P_RGID	kp_eproc.e_pcred.p_rgid
 +#define	XXX_P_STAT	kp_proc.p_stat
-+
-+#endif
-+
-+	strncpy (buf->cmd, pinfo [0].XXX_P_COMM, sizeof (buf->cmd)-1);
- 	buf->cmd [sizeof (buf->cmd)-1] = 0;
  
--	buf->uid = pinfo [0].kp_eproc.e_pcred.p_svuid;
--	buf->gid = pinfo [0].kp_eproc.e_pcred.p_svgid;
-+	buf->uid = pinfo [0].XXX_P_SVUID;
-+	buf->gid = pinfo [0].XXX_P_SVGID;
- 
- #if LIBGTOP_VERSION_CODE >= 1001000
+-#if LIBGTOP_VERSION_CODE >= 1001000
 -	buf->ruid = pinfo [0].kp_eproc.e_pcred.p_ruid;
 -	buf->rgid = pinfo [0].kp_eproc.e_pcred.p_rgid;
-+	buf->ruid = pinfo [0].XXX_P_RUID;
-+	buf->rgid = pinfo [0].XXX_P_RGID;
  #endif
-@@ -94,3 +112,3 @@
- #if LIBGTOP_VERSION_CODE >= 1001000
+ 
++	strncpy (buf->cmd, pinfo [0].XXX_P_COMM, sizeof (buf->cmd)-1);
++	buf->cmd [sizeof (buf->cmd)-1] = 0;
++
++	buf->uid = pinfo [0].XXX_P_SVUID;
++	buf->gid = pinfo [0].XXX_P_SVGID;
++
+ 	/* Set the flags for the data we're about to return*/
+ 	buf->flags = _glibtop_sysdeps_proc_state |
+ 		_glibtop_sysdeps_proc_state_new;
+ 
+-#if LIBGTOP_VERSION_CODE >= 1001000
 -	switch (pinfo [0].kp_proc.p_stat) {
-+	switch (pinfo [0].XXX_P_STAT) {
- 	case SIDL:
-@@ -114,3 +132,3 @@
- #else
+-	case SIDL:
+-		buf->state = 0;
+-		break;
+-	case SRUN:
+-		buf->state = GLIBTOP_PROCESS_RUNNING;
+-		break;
+-	case SSLEEP:
+-		buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE;
+-		break;
+-	case SSTOP:
+-		buf->state = GLIBTOP_PROCESS_STOPPED;
+-		break;
+-	case SZOMB:
+-		buf->state = GLIBTOP_PROCESS_ZOMBIE;
+-		break;
+-	default:
+-		return;
+-	}
+-#else
 -	switch (pinfo [0].kp_proc.p_stat) {
 +	switch (pinfo [0].XXX_P_STAT) {
  	case SIDL:
+ 		buf->state = 'S';
+ 		break;
+@@ -131,7 +119,6 @@
+ 	default:
+ 		return;
+ 	}
+-#endif
+ 
+ 	buf->flags |= (1L << GLIBTOP_PROC_STATE_STATE);
+ }
 --- 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 @@
diff --git a/devel/libgtop2/files/patch-ac b/devel/libgtop2/files/patch-configure
index 586694a034dd..f26f6d731684 100644
--- a/devel/libgtop2/files/patch-ac
+++ b/devel/libgtop2/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Mon Jan 28 16:26:32 2002
-+++ configure	Mon Jan 28 16:34:25 2002
-@@ -1260,10 +1260,10 @@
+--- configure.orig	Mon Apr 29 12:37:16 2002
++++ configure	Mon Apr 29 12:44:17 2002
+@@ -1249,10 +1249,10 @@
  
  # The aliases save the names the user supplied, while $host etc.
  # will get canonicalized.
@@ -16,18 +13,35 @@ $FreeBSD$
 +#    NONENONEs,x,x, &&
 +#  program_prefix=${target_alias}-
  
- # Extract the first word of "dc", so it can be a program name with args.
- set dummy dc; ac_word=$2
-@@ -1580,9 +1580,9 @@
+ LIBGTOP_MAJOR_VERSION=1
+ LIBGTOP_MINOR_VERSION=90
+@@ -1526,9 +1526,9 @@
  
  # libtool versioning
  LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
 -LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE`
 -LT_REVISION=$LIBGTOP_INTERFACE_AGE
 -LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE`
-+LT_CURRENT=1
++LT_CURRENT=2
 +LT_REVISION=0
 +LT_AGE=0
  LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
  
- if test x = y; then
+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ."
+@@ -7491,6 +7491,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -15688,7 +15689,7 @@
+ 
+ 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'
+ else
+    sysdeps_suid_lib=
+    server_programs=
diff --git a/devel/libgtop2/files/patch-libgtop-2.0.pc.in b/devel/libgtop2/files/patch-libgtop-2.0.pc.in
new file mode 100644
index 000000000000..fae24611ed6c
--- /dev/null
+++ b/devel/libgtop2/files/patch-libgtop-2.0.pc.in
@@ -0,0 +1,11 @@
+--- libgtop-2.0.pc.in.orig	Mon Apr 29 22:35:22 2002
++++ libgtop-2.0.pc.in	Mon Apr 29 22:35:35 2002
+@@ -7,7 +7,7 @@
+ Description: Portable System Access Library
+ Requires: glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} @LIBGTOP_LIBS@
++Libs: -L${libdir} @LIBGTOP_LIBS@ @LIBGTOP_EXTRA_LIBS@
+ Cflags: -I${includedir}/libgtop-2.0
+ 
+ 
diff --git a/devel/libgtop2/files/patch-ltmain.sh b/devel/libgtop2/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/devel/libgtop2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,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-src_daemon_Makefile.in b/devel/libgtop2/files/patch-src_daemon_Makefile.in
new file mode 100644
index 000000000000..04aa141eb588
--- /dev/null
+++ b/devel/libgtop2/files/patch-src_daemon_Makefile.in
@@ -0,0 +1,11 @@
+--- src/daemon/Makefile.in.orig	Mon Apr 29 12:05:45 2002
++++ src/daemon/Makefile.in	Mon Apr 29 12:12:14 2002
+@@ -92,7 +92,7 @@
+ LIBGTOP_GUILE_NAMES_LIBS = @LIBGTOP_GUILE_NAMES_LIBS@
+ LIBGTOP_INCS = @LIBGTOP_INCS@
+ LIBGTOP_INTERFACE_AGE = @LIBGTOP_INTERFACE_AGE@
+-LIBGTOP_LIBS = @LIBGTOP_LIBS@
++LIBGTOP_LIBS =
+ LIBGTOP_MAJOR_VERSION = @LIBGTOP_MAJOR_VERSION@
+ LIBGTOP_MICRO_VERSION = @LIBGTOP_MICRO_VERSION@
+ LIBGTOP_MINOR_VERSION = @LIBGTOP_MINOR_VERSION@
diff --git a/devel/libgtop2/files/patch-support_Makefile.in b/devel/libgtop2/files/patch-support_Makefile.in
new file mode 100644
index 000000000000..d86420f5cc1f
--- /dev/null
+++ b/devel/libgtop2/files/patch-support_Makefile.in
@@ -0,0 +1,11 @@
+--- support/Makefile.in.orig	Mon Apr 29 13:02:18 2002
++++ support/Makefile.in	Mon Apr 29 13:03:33 2002
+@@ -146,7 +146,7 @@
+ sysdeps_dir = @sysdeps_dir@
+ sysdeps_suid_lib = @sysdeps_suid_lib@
+ 
+-supportexecincludedir = $(pkglibdir)/include
++supportexecincludedir = $(includedir)/libgtop-2.0
+ 
+ INCLUDES = -D_GNU_SOURCE
+