Kick off local gnome-support nonsense. All we need is libpopt.

This also unscrew pkgconfig database.

4 files changed, 50 insertions, 15 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 0017964121f3..36570e2a4358 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgtop2
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure
index 42b3620caad7..e451557e7674 100644
--- a/devel/libgtop2/files/patch-configure
+++ b/devel/libgtop2/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sat Oct 25 00:01:15 2003
-+++ configure	Sat Oct 25 00:14:56 2003
+--- configure.orig	Tue Nov  4 14:55:15 2003
++++ configure	Tue Nov  4 15:10:15 2003
 @@ -1580,10 +1580,10 @@
  
  # The aliases save the names the user supplied, while $host etc.
@@ -28,6 +28,36 @@
  LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
  
  
+@@ -20821,7 +20821,7 @@
+ 
+ 
+   # this should go away soon
+-  need_gnome_support=yes
++  need_gnome_support=no
+ 
+ 
+ for ac_func in getopt_long
+@@ -30052,13 +30052,13 @@
+ 
+ fi;
+ 
+-if test "x$gnome_found" = xyes ; then
+-  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
+-  SUPPORTINCS="$GNOME_INCLUDEDIR"
+-else
+-  LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la'
+-  SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
+-fi
++#if test "x$gnome_found" = xyes ; then
++#  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
++#  SUPPORTINCS="$GNOME_INCLUDEDIR"
++#else
++#  LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la'
++#  SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
++#fi
+ 
+ case "$GNOME_LIBS" in
+ 	'*-lgnomesupport*' )
 @@ -30160,7 +30160,7 @@
  
  
diff --git a/devel/libgtop2/files/patch-src::daemon::gnuserv.c b/devel/libgtop2/files/patch-src::daemon::gnuserv.c
index 8b0712a8d041..a398b2aca70d 100644
--- a/devel/libgtop2/files/patch-src::daemon::gnuserv.c
+++ b/devel/libgtop2/files/patch-src::daemon::gnuserv.c
@@ -1,15 +1,24 @@
---- src/daemon/gnuserv.c.orig	Thu Nov 29 08:58:40 2001
-+++ src/daemon/gnuserv.c	Thu Nov 29 08:58:17 2001
-@@ -200,6 +200,12 @@
+--- src/daemon/gnuserv.c.orig	Mon Oct 20 01:54:32 2003
++++ src/daemon/gnuserv.c	Tue Nov  4 15:22:38 2003
+@@ -42,7 +42,7 @@
+ #include <glibtop/gnuserv.h>
  
- 	auth_data_len = atoi (buf);
+ #include <errno.h>
+-#include <popt-gnome.h>
++#include <popt.h>
  
-+	if (auth_data_len < 1 || auth_data_len > sizeof(buf)) {
-+	    syslog_message(LOG_WARNING,
-+			   "Invalid data length supplied by client");
+ #include "daemon.h"
+ 
+@@ -202,6 +202,12 @@
+ 	
+ 	if (auth_data_len < 1 || auth_data_len > sizeof(buf)) {
+ 	    syslog_message(LOG_WARNING, "Invalid data length supplied by client");
 +	    return FALSE;
 +	}
 +
- 	if (timed_read (fd, buf, auth_data_len, AUTH_TIMEOUT, 0) != auth_data_len)
++	if (auth_data_len < 1 || auth_data_len > sizeof(buf)) {
++	    syslog_message(LOG_WARNING,
++			   "Invalid data length supplied by client");
  	    return FALSE;
+ 	}
  
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index e028f670a161..3d8cfeed90f2 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -44,10 +44,6 @@ include/libgtop-2.0/glibtop/xmalloc.h
 include/libgtop-2.0/glibtop_machine.h
 include/libgtop-2.0/glibtop_server.h
 include/libgtop-2.0/glibtop_suid.h
-include/libgtop-2.0/gnomesupport.h
-lib/libgnomesupport-2.0.a
-lib/libgnomesupport-2.0.so
-lib/libgnomesupport-2.0.so.0
 lib/libgtop-2.0.a
 lib/libgtop-2.0.so
 lib/libgtop-2.0.so.2
@@ -66,7 +62,6 @@ lib/libgtop_sysdeps-2.0.so.2
 lib/libgtop_sysdeps_suid-2.0.a
 lib/libgtop_sysdeps_suid-2.0.so
 lib/libgtop_sysdeps_suid-2.0.so.2
-libdata/pkgconfig/gnome-support-2.0.pc
 libdata/pkgconfig/libgtop-2.0.pc
 share/locale/am/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ar/LC_MESSAGES/libgtop-2.0.mo