Update to 2.2.10.

5 files changed, 26 insertions, 22 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 12309a9da42b..82a63d6e1e10 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	2.2.9
-PORTREVISION=	1
+PORTVERSION=	2.2.10
+PORTREVISION=	0
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index e8751a7c463a..c703da305225 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gkrellm-2.2.9.tar.bz2) = 5334155797901724f4eb46a82ad72395
-SHA256 (gkrellm-2.2.9.tar.bz2) = 5f243958342fe0e27432c1d4b01900c5e593b49f00a8bdd29200433b17059de9
-SIZE (gkrellm-2.2.9.tar.bz2) = 691133
+MD5 (gkrellm-2.2.10.tar.bz2) = 57ef0525c0997ac2e7720712811f5a84
+SHA256 (gkrellm-2.2.10.tar.bz2) = d7676d7734d4821454a840a1ef05020c9c4f4797ab96ec54f2351e26d437c88c
+SIZE (gkrellm-2.2.10.tar.bz2) = 718894
diff --git a/sysutils/gkrellm2/files/patch-server::Makefile b/sysutils/gkrellm2/files/patch-server::Makefile
index 91706c2b4273..b36c836878f9 100644
--- a/sysutils/gkrellm2/files/patch-server::Makefile
+++ b/sysutils/gkrellm2/files/patch-server::Makefile
@@ -1,14 +1,16 @@
---- server/Makefile.orig	Mon Apr 12 08:30:48 2004
-+++ server/Makefile	Mon Jun 13 07:45:44 2005
+Index: server/Makefile
+diff -u server/Makefile.orig server/Makefile
+--- server/Makefile.orig	Wed Oct 25 08:41:53 2006
++++ server/Makefile	Fri Oct 27 12:39:38 2006
 @@ -18,6 +18,7 @@
  MANMODE ?= 644
  MANDIRMODE ?= 755
  INSTALL ?= install
 +PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig
  LINK_FLAGS ?= -Wl,-E
- CC ?= gcc
- STRIP ?= -s
-@@ -27,18 +28,18 @@
+ 
+ 
+@@ -44,18 +45,18 @@
  PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0`
  PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0`
  
@@ -31,9 +33,9 @@
 -FLAGS+= $(PTHREAD_INC)
 +FLAGS+= $(PTHREAD_INC) -I$(LOCALBASE)/include
  
- LIBS = $(PKG_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) 
- ifeq ($(glib12),1)
-@@ -87,10 +88,18 @@
+ LIBS = $(PKG_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS)
+ 
+@@ -105,10 +106,18 @@
  
  all:	gkrellmd
  
@@ -54,7 +56,7 @@
  	$(CC) $(OBJS) -o gkrellmd.static -static \
  		$(LIBS) $(LINK_FLAGS)
  
-@@ -127,17 +136,22 @@
+@@ -145,17 +154,22 @@
  		LINK_FLAGS="" gkrellmd
  endif
  
@@ -79,10 +81,10 @@
  
  install_darwin:
  	$(MAKE) install STRIP=
-@@ -162,6 +176,7 @@
+@@ -180,6 +194,7 @@
  
  clean:
- 	rm -f *.o *~ *.bak gkrellmd core
+ 	rm -f *.o *~ *.bak configure.h configure.log gkrellmd core
 +	rm -f gkrellmd.pc
  
  SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \
diff --git a/sysutils/gkrellm2/files/patch-src:Makefile b/sysutils/gkrellm2/files/patch-src:Makefile
index 80f8580d50f9..e311f2c8a47c 100644
--- a/sysutils/gkrellm2/files/patch-src:Makefile
+++ b/sysutils/gkrellm2/files/patch-src:Makefile
@@ -1,11 +1,11 @@
 Index: src/Makefile
 diff -u src/Makefile.orig src/Makefile
---- src/Makefile.orig	Tue May 10 01:54:03 2005
-+++ src/Makefile	Mon May 16 18:38:15 2005
-@@ -32,16 +32,18 @@
- 	CONFIGURE_ARGS += --without-ssl
+--- src/Makefile.orig	Wed Oct 25 08:42:42 2006
++++ src/Makefile	Fri Oct 27 12:44:24 2006
+@@ -39,17 +39,19 @@
  endif
  
+ 
 -DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
 +DUMMY_VAR := $(shell env OPENSSLINC=$(OPENSSLINC) OPENSSLLIB=$(OPENSSLLIB) \
 +		GNUTLSINC=$(GNUTLSINC) GNUTLSLIB=$(GNUTLSLIB) \
@@ -13,6 +13,7 @@ diff -u src/Makefile.orig src/Makefile
  
  HAVE_GNUTLS = $(shell grep -c HAVE_GNUTLS configure.h)
  HAVE_SSL = $(shell grep -c HAVE_SSL configure.h)
+ HAVE_LIBSENSORS = $(shell grep -c HAVE_LIBSENSORS configure.h)
  
  ifeq ($(HAVE_GNUTLS),1)
 -    SSL_LIBS ?= -lgnutls-openssl
@@ -24,7 +25,7 @@ diff -u src/Makefile.orig src/Makefile
  else
      EXTRAOBJS ?= md5c.o
  endif
-@@ -56,8 +58,16 @@
+@@ -68,8 +70,16 @@
  
  PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
  
@@ -40,5 +41,5 @@ diff -u src/Makefile.orig src/Makefile
 +endif
 +endif
  
- LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS)
+ LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)
  
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index 8b5c47b73a4b..f7dfdf92463b 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -27,6 +27,7 @@ sbin/gkrellmd
 %%NLS%%share/locale/ja/LC_MESSAGES/gkrellm.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/gkrellm.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gkrellm.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gkrellm.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/gkrellm.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/gkrellm.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gkrellm.mo