Update to 1.0.0.

6 files changed, 22 insertions, 42 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 5bbbea7..8ec5168 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	0.10.5
+PORTVERSION=	1.0.0
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index d0fa73c..e90baa6 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-0.10.5.tar.gz) = 53c0be125f2f139d8b900f303b4ec560
+MD5 (gkrellm-1.0.0.tar.gz) = 099486926aec809002c88640c3f00de6
diff --git a/sysutils/gkrellm/files/patch-ae b/sysutils/gkrellm/files/patch-ae
index 2a170bf..c46d5cc 100644
--- a/sysutils/gkrellm/files/patch-ae
+++ b/sysutils/gkrellm/files/patch-ae
@@ -1,33 +1,23 @@
 Index: src/Makefile.src
 diff -u src/Makefile.src.orig src/Makefile.src
---- src/Makefile.src.orig	Sun Jul  9 00:55:41 2000
-+++ src/Makefile.src	Mon Jul 10 20:04:52 2000
-@@ -13,23 +13,22 @@
+--- src/Makefile.src.orig	Fri Oct 13 01:00:12 2000
++++ src/Makefile.src	Sat Oct 14 04:01:17 2000
+@@ -13,7 +13,7 @@
  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)
--    FLAGS += -g
-+    CFLAGS += -g
- endif
++FLAGS = -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
+ FLAGS+= $(PTHREAD_INC)
  
- ifeq ($(enable_nls),1)
--    FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
-+    CFLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
- endif
- 
- ifeq ($(HAVE_GETADDRINFO),1)
--    FLAGS += -DHAVE_GETADDRINFO
-+    CFLAGS += -DHAVE_GETADDRINFO
+ LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
+@@ -33,8 +33,7 @@
+     FLAGS += -DHAVE_GETADDRINFO
  endif
  
 -
 -CC = gcc -Wall $(FLAGS)
++CFLAGS += $(FLAGS)
  
  GNOME_PREFIX = `gnome-config --prefix`
  
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 5bbbea7..8ec5168 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	0.10.5
+PORTVERSION=	1.0.0
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index d0fa73c..e90baa6 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-0.10.5.tar.gz) = 53c0be125f2f139d8b900f303b4ec560
+MD5 (gkrellm-1.0.0.tar.gz) = 099486926aec809002c88640c3f00de6
diff --git a/sysutils/gkrellm2/files/patch-ae b/sysutils/gkrellm2/files/patch-ae
index 2a170bf..c46d5cc 100644
--- a/sysutils/gkrellm2/files/patch-ae
+++ b/sysutils/gkrellm2/files/patch-ae
@@ -1,33 +1,23 @@
 Index: src/Makefile.src
 diff -u src/Makefile.src.orig src/Makefile.src
---- src/Makefile.src.orig	Sun Jul  9 00:55:41 2000
-+++ src/Makefile.src	Mon Jul 10 20:04:52 2000
-@@ -13,23 +13,22 @@
+--- src/Makefile.src.orig	Fri Oct 13 01:00:12 2000
++++ src/Makefile.src	Sat Oct 14 04:01:17 2000
+@@ -13,7 +13,7 @@
  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)
--    FLAGS += -g
-+    CFLAGS += -g
- endif
++FLAGS = -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
+ FLAGS+= $(PTHREAD_INC)
  
- ifeq ($(enable_nls),1)
--    FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
-+    CFLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
- endif
- 
- ifeq ($(HAVE_GETADDRINFO),1)
--    FLAGS += -DHAVE_GETADDRINFO
-+    CFLAGS += -DHAVE_GETADDRINFO
+ LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
+@@ -33,8 +33,7 @@
+     FLAGS += -DHAVE_GETADDRINFO
  endif
  
 -
 -CC = gcc -Wall $(FLAGS)
++CFLAGS += $(FLAGS)
  
  GNOME_PREFIX = `gnome-config --prefix`