Update to 2.6.0.

5 files changed, 7 insertions, 58 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 6bb388973510..7f3e435d7184 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgtop2
-PORTVERSION=	2.5.2
+PORTVERSION=	2.6.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
 DISTNAME=	libgtop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 7614d6251656..5f14e960bd87 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgtop-2.5.2.tar.bz2) = 92b9665293df3b54a00ddfda40c9d04e
-SIZE (gnome2/libgtop-2.5.2.tar.bz2) = 935545
+MD5 (gnome2/libgtop-2.6.0.tar.bz2) = 5d0ec207842b54d2f2d04c99af7c98b9
+SIZE (gnome2/libgtop-2.6.0.tar.bz2) = 946822
diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
deleted file mode 100644
index b64ec49863bf..000000000000
--- a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- sysdeps/common/fsusage.c.orig	Thu Mar 11 15:53:36 2004
-+++ sysdeps/common/fsusage.c	Thu Mar 11 15:56:37 2004
-@@ -28,7 +28,7 @@
- # endif
- #endif
- #ifndef UINTMAX_MAX
--# define UINTMAX_MAX ((uintmax_t) -1)
-+# define UINTMAX_MAX ((uint64_t) -1)
- #endif
- 
- #include <sys/types.h>
-@@ -84,7 +84,7 @@
-    a uintmax_t value that is all 1 bits if X is all 1 bits, even if X
-    is unsigned and narrower than uintmax_t.  */
- #define PROPAGATE_ALL_ONES(x) \
--  ((sizeof (x) < sizeof (uintmax_t) \
-+  ((sizeof (x) < sizeof (uint64_t) \
-     && (~ (x) == (sizeof (x) < sizeof (int) \
- 		  ? - (1 << (sizeof (x) * CHAR_BIT)) \
- 		  : 0))) \
-@@ -92,7 +92,7 @@
- 
- /* Extract the top bit of X as an uintmax_t value.  */
- #define EXTRACT_TOP_BIT(x) ((x) \
--			    & ((uintmax_t) 1 << (sizeof (x) * CHAR_BIT - 1)))
-+			    & ((uint64_t) 1 << (sizeof (x) * CHAR_BIT - 1)))
- 
- /* If a value is negative, many space usage primitives store it into an
-    integer variable by assignment, even if the variable's type is unsigned.
diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.h b/devel/libgtop2/files/patch-sysdeps_common_fsusage.h
deleted file mode 100644
index bca23d9aea9d..000000000000
--- a/devel/libgtop2/files/patch-sysdeps_common_fsusage.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- sysdeps/common/fsusage.h.orig	Thu Mar 11 15:54:03 2004
-+++ sysdeps/common/fsusage.h	Thu Mar 11 15:56:12 2004
-@@ -20,15 +20,17 @@
- #if !defined FSUSAGE_H_
- # define FSUSAGE_H_
- 
-+#include <sys/types.h>
-+
- struct fs_usage
- {
-   int fsu_blocksize;		/* Size of a block.  */
--  uintmax_t fsu_blocks;		/* Total blocks. */
--  uintmax_t fsu_bfree;		/* Free blocks available to superuser. */
--  uintmax_t fsu_bavail;		/* Free blocks available to non-superuser. */
-+  uint64_t fsu_blocks;		/* Total blocks. */
-+  uint64_t fsu_bfree;		/* Free blocks available to superuser. */
-+  uint64_t fsu_bavail;		/* Free blocks available to non-superuser. */
-   int fsu_bavail_top_bit_set;	/* 1 if fsu_bavail represents a value < 0.  */
--  uintmax_t fsu_files;		/* Total file nodes. */
--  uintmax_t fsu_ffree;		/* Free file nodes. */
-+  uint64_t fsu_files;		/* Total file nodes. */
-+  uint64_t fsu_ffree;		/* Free file nodes. */
- };
- 
- # ifndef PARAMS
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index e7d4a4b74b93..4c48f567fd7e 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -59,6 +59,8 @@ share/locale/cy/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
+share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
+share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
 share/locale/es/LC_MESSAGES/libgtop-2.0.mo
 share/locale/et/LC_MESSAGES/libgtop-2.0.mo
 share/locale/fa/LC_MESSAGES/libgtop-2.0.mo
@@ -83,6 +85,7 @@ 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
 share/locale/no/LC_MESSAGES/libgtop-2.0.mo
+share/locale/pa/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pt/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo