Update to 2.0.1, and sync with the main FreeBSD tree.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@458 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 73 insertions, 38 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 38482e17d..d1318a4f6 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -2,12 +2,11 @@
 # Date Created:			29 April 2002
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/devel/libgtop2/Makefile,v 1.59 2002/11/01 23:42:37 marcus Exp $
+# $FreeBSD: ports/devel/libgtop2/Makefile,v 1.60 2003/01/19 19:44:28 marcus Exp $
 #
 
 PORTNAME=	libgtop2
-PORTVERSION=	2.0.0
-PORTREVISION=	5
+PORTVERSION=	2.0.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
@@ -21,19 +20,15 @@ LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
-
 post-install:
 	install-info --section="Programming \& development tools" \
 	--entry="* libgtop2: (libgtop2).	libgtop2 programming manual" \
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index cefc83513..ee968083b 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgtop-2.0.0.tar.bz2) = 80cda9d8541b3e7404a65f180e98f42d
+MD5 (gnome2/libgtop-2.0.1.tar.bz2) = 1757801cb39ad7be19b1a472e7fc9060
diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure
index d62e2fc92..c03e5eea2 100644
--- a/devel/libgtop2/files/patch-configure
+++ b/devel/libgtop2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Feb 10 09:30:14 2002
-+++ configure	Thu May  9 01:40:00 2002
-@@ -1249,10 +1249,10 @@
+--- configure.orig	Sun Jan 12 21:40:08 2003
++++ configure	Tue Jan 14 00:17:38 2003
+@@ -1479,10 +1479,10 @@
  
  # The aliases save the names the user supplied, while $host etc.
  # will get canonicalized.
@@ -13,9 +13,9 @@
 +#    NONENONEs,x,x, &&
 +#  program_prefix=${target_alias}-
  
- LIBGTOP_MAJOR_VERSION=1
- LIBGTOP_MINOR_VERSION=90
-@@ -1526,9 +1526,9 @@
+ LIBGTOP_MAJOR_VERSION=2
+ LIBGTOP_MINOR_VERSION=0
+@@ -1777,9 +1777,9 @@
  
  # libtool versioning
  LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
@@ -27,30 +27,13 @@
 +LT_AGE=0
  LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
  
- 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
+@@ -18514,7 +18514,7 @@
  
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -15639,7 +15640,7 @@
- LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
- LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
- LIBGTOP_BINDIR='$(bindir)'
--LIBGTOP_SERVER='$(bindir)/libgtop_server'
-+LIBGTOP_SERVER='$(bindir)/libgtop_server2'
- 
- sysdeps_dir="$libgtop_sysdeps_dir"
- 
-@@ -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'
+-   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 --git a/devel/libgtop2/files/patch-ltmain.sh b/devel/libgtop2/files/patch-ltmain.sh
new file mode 100644
index 000000000..3e04e21df
--- /dev/null
+++ b/devel/libgtop2/files/patch-ltmain.sh
@@ -0,0 +1,42 @@
+--- ltmain.sh.orig	Tue Jan 14 00:02:45 2003
++++ ltmain.sh	Tue Jan 14 00:05:36 2003
+@@ -1073,8 +1073,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
+ 	;;
+ 
+@@ -2502,6 +2510,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FReeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4286,10 +4297,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-sysdeps_freebsd_mem.c b/devel/libgtop2/files/patch-sysdeps_freebsd_mem.c
new file mode 100644
index 000000000..2aa4b7534
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_mem.c
@@ -0,0 +1,11 @@
+--- sysdeps/freebsd/mem.c.orig	Tue Jan 14 17:22:18 2003
++++ sysdeps/freebsd/mem.c	Tue Jan 14 17:22:28 2003
+@@ -75,7 +75,7 @@
+ 
+ /* MIB array for sysctl */
+ static int mib_length=2;
+-#ifdef __bsdi__
++#ifndef VM_METER
+ static int mib [] = { CTL_VM, VM_TOTAL };
+ #else
+ static int mib [] = { CTL_VM, VM_METER };
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 9c645a295..37f7a8a73 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -71,7 +71,10 @@ lib/libgtop_sysdeps_suid-2.0.so
 lib/libgtop_sysdeps_suid-2.0.so.2
 libdata/pkgconfig/libgtop-2.0.pc
 share/locale/az/LC_MESSAGES/libgtop-2.0.mo
+share/locale/be/LC_MESSAGES/libgtop-2.0.mo
+share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ca/LC_MESSAGES/libgtop-2.0.mo
+share/locale/cs/LC_MESSAGES/libgtop-2.0.mo
 share/locale/da/LC_MESSAGES/libgtop-2.0.mo
 share/locale/de/LC_MESSAGES/libgtop-2.0.mo
 share/locale/el/LC_MESSAGES/libgtop-2.0.mo
@@ -84,6 +87,7 @@ share/locale/gl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/hu/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ja/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
+share/locale/lv/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ms/LC_MESSAGES/libgtop-2.0.mo
 share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/nn/LC_MESSAGES/libgtop-2.0.mo