Update to 0.10.0.

5 files changed, 23 insertions, 15 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 71a586caffb8..5ff071531193 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	0.9.10
+PORTVERSION=	0.10.0
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 INCLUDES=	gkrellm.h gkrellm_public_proto.h gkrellm_private_proto.h
-DOCS=		COPYRIGHT README Themes
+DOCS=		COPYRIGHT README Themes.html
 
 # You should aware that GKrellM must be setuid root to obtain
 # temperatures.  If your motherboard doesn't support LM78/79 feature,
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 6b49f1a54349..e5d8d2b4c055 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-0.9.10.tar.gz) = 84ee552e4dec8c3001642bba1a7ab371
+MD5 (gkrellm-0.10.0.tar.gz) = 4cdbebbf617132614dd3504a25162c0e
diff --git a/sysutils/gkrellm/files/patch-ad b/sysutils/gkrellm/files/patch-ad
index c287e04f4007..802d45cb8ffc 100644
--- a/sysutils/gkrellm/files/patch-ad
+++ b/sysutils/gkrellm/files/patch-ad
@@ -1,7 +1,7 @@
 Index: Makefile.top
 diff -u Makefile.top.orig Makefile.top
---- Makefile.top.orig	Wed May 17 14:33:59 2000
-+++ Makefile.top	Fri May 19 04:52:52 2000
+--- Makefile.top.orig	Sun Jun 18 00:24:58 2000
++++ Makefile.top	Thu Jun 22 09:33:42 2000
 @@ -24,7 +24,7 @@
  #
  # Default
@@ -11,15 +11,16 @@ diff -u Makefile.top.orig Makefile.top
  BINMODE = 755
  
  # FreeBSD 2.X
-@@ -65,11 +65,11 @@
- 	(cd src && ${MAKE} clean)
+@@ -71,12 +71,12 @@
  
  freebsd2:
+ 	(cd locale && ${MAKE} all)
 -	(cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
 +	(cd src && ${MAKE} GTK_CONFIG=$(GTK_CONFIG) GTOP_LIBS= GTOP_INCLUDE= \
  		SYS_LIBS="-lkvm" gkrellm )
  
  freebsd3 freebsd:
+ 	(cd locale && ${MAKE} all)
 -	(cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
 +	(cd src && ${MAKE} GTK_CONFIG=$(GTK_CONFIG) GTOP_LIBS= GTOP_INCLUDE= \
  		SYS_LIBS="-lkvm -ldevstat" gkrellm )
diff --git a/sysutils/gkrellm/files/patch-ae b/sysutils/gkrellm/files/patch-ae
index 3bcc8e42cb6d..2d097ca2da9c 100644
--- a/sysutils/gkrellm/files/patch-ae
+++ b/sysutils/gkrellm/files/patch-ae
@@ -1,19 +1,26 @@
 Index: src/Makefile.src
 diff -u src/Makefile.src.orig src/Makefile.src
---- src/Makefile.src.orig	Thu May 11 01:58:22 2000
-+++ src/Makefile.src	Fri May 19 04:53:27 2000
-@@ -13,14 +13,9 @@
- GTK_LIB = `$(GTK_CONFIG) --libs`
+--- src/Makefile.src.orig	Thu Jun 22 01:54:28 2000
++++ src/Makefile.src	Thu Jun 22 09:38:17 2000
+@@ -13,19 +13,18 @@
+ GTK_LIB = `$(GTK_CONFIG) --libs gthread`
  IMLIB_LIB = `imlib-config --libs-gdk`
  
 -FLAGS = -O2 -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
 +CFLAGS += -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE) \
 +	-DPREFIX=\"$(PREFIX)\"
  LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
--
--ifeq ($(debug),1)
+ 
+ ifeq ($(debug),1)
 -    FLAGS += -g
--endif
++    CFLAGS += -g
+ endif
+ 
+ ifeq ($(enable_nls),1)
+-    FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
++    CFLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
+ endif
+ 
 -
 -CC = gcc -Wall $(FLAGS)
  
diff --git a/sysutils/gkrellm/pkg-plist b/sysutils/gkrellm/pkg-plist
index 3d10787b48c9..7c39f5c0aed1 100644
--- a/sysutils/gkrellm/pkg-plist
+++ b/sysutils/gkrellm/pkg-plist
@@ -4,5 +4,5 @@ include/gkrellm/gkrellm_public_proto.h
 include/gkrellm/gkrellm_private_proto.h
 share/doc/gkrellm/COPYRIGHT
 share/doc/gkrellm/README
-share/doc/gkrellm/Themes
+share/doc/gkrellm/Themes.html
 @dirrm share/doc/gkrellm