Update to 2.0.1.

5 files changed, 19 insertions, 37 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index fe0491026828..7e56f2815d5b 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgtop2
-PORTVERSION=	2.0.0
-PORTREVISION=	3
+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.0:${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 cefc83513e58..ee968083bd5a 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 d62e2fc92512..c03e5eea29a5 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.orig b/devel/libgtop2/files/patch-ltmain.sh.orig
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/devel/libgtop2/files/patch-ltmain.sh.orig
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 9c645a295359..37f7a8a737c1 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