8 files changed, 32 insertions, 18 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index c8fa3788acda..b520a87e93eb 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	0.10.2
+PORTVERSION=	0.10.3
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -34,8 +34,10 @@ DOCS=		COPYRIGHT README Themes.html
 
 .if ${OSVERSION} < 300000
 ALL_TARGET=	freebsd2
-.else
+.elif ${OSVERSION} < 400000
 ALL_TARGET=	freebsd3
+.else
+ALL_TARGET=	freebsd
 .endif
 
 BINGRP=		kmem
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 02a30d569350..331b47484e50 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-0.10.2.tar.gz) = 118c0235d49a2bd62d21b4e6c2379eb2
+MD5 (gkrellm-0.10.3.tar.gz) = 5f04f3bc385a53e1bc959d4b8c0d6b04
diff --git a/sysutils/gkrellm/files/patch-ad b/sysutils/gkrellm/files/patch-ad
index 802d45cb8ffc..b6bd8edf9a92 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	Sun Jun 18 00:24:58 2000
-+++ Makefile.top	Thu Jun 22 09:33:42 2000
+--- Makefile.top.orig	Sun Jul  9 04:03:15 2000
++++ Makefile.top	Mon Jul 10 20:01:27 2000
 @@ -24,7 +24,7 @@
  #
  # Default
@@ -19,7 +19,7 @@ diff -u Makefile.top.orig Makefile.top
 +	(cd src && ${MAKE} GTK_CONFIG=$(GTK_CONFIG) GTOP_LIBS= GTOP_INCLUDE= \
  		SYS_LIBS="-lkvm" gkrellm )
  
- freebsd3 freebsd:
+ freebsd3 freebsd4 freebsd5 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= \
diff --git a/sysutils/gkrellm/files/patch-ae b/sysutils/gkrellm/files/patch-ae
index 2d097ca2da9c..2a170bfc9cbe 100644
--- a/sysutils/gkrellm/files/patch-ae
+++ b/sysutils/gkrellm/files/patch-ae
@@ -1,8 +1,8 @@
 Index: src/Makefile.src
 diff -u src/Makefile.src.orig src/Makefile.src
---- 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 @@
+--- 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 @@
  GTK_LIB = `$(GTK_CONFIG) --libs gthread`
  IMLIB_LIB = `imlib-config --libs-gdk`
  
@@ -21,6 +21,11 @@ diff -u src/Makefile.src.orig src/Makefile.src
 +    CFLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
  endif
  
+ ifeq ($(HAVE_GETADDRINFO),1)
+-    FLAGS += -DHAVE_GETADDRINFO
++    CFLAGS += -DHAVE_GETADDRINFO
+ endif
+ 
 -
 -CC = gcc -Wall $(FLAGS)
  
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index c8fa3788acda..b520a87e93eb 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	0.10.2
+PORTVERSION=	0.10.3
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -34,8 +34,10 @@ DOCS=		COPYRIGHT README Themes.html
 
 .if ${OSVERSION} < 300000
 ALL_TARGET=	freebsd2
-.else
+.elif ${OSVERSION} < 400000
 ALL_TARGET=	freebsd3
+.else
+ALL_TARGET=	freebsd
 .endif
 
 BINGRP=		kmem
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index 02a30d569350..331b47484e50 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-0.10.2.tar.gz) = 118c0235d49a2bd62d21b4e6c2379eb2
+MD5 (gkrellm-0.10.3.tar.gz) = 5f04f3bc385a53e1bc959d4b8c0d6b04
diff --git a/sysutils/gkrellm2/files/patch-ad b/sysutils/gkrellm2/files/patch-ad
index 802d45cb8ffc..b6bd8edf9a92 100644
--- a/sysutils/gkrellm2/files/patch-ad
+++ b/sysutils/gkrellm2/files/patch-ad
@@ -1,7 +1,7 @@
 Index: Makefile.top
 diff -u Makefile.top.orig Makefile.top
---- Makefile.top.orig	Sun Jun 18 00:24:58 2000
-+++ Makefile.top	Thu Jun 22 09:33:42 2000
+--- Makefile.top.orig	Sun Jul  9 04:03:15 2000
++++ Makefile.top	Mon Jul 10 20:01:27 2000
 @@ -24,7 +24,7 @@
  #
  # Default
@@ -19,7 +19,7 @@ diff -u Makefile.top.orig Makefile.top
 +	(cd src && ${MAKE} GTK_CONFIG=$(GTK_CONFIG) GTOP_LIBS= GTOP_INCLUDE= \
  		SYS_LIBS="-lkvm" gkrellm )
  
- freebsd3 freebsd:
+ freebsd3 freebsd4 freebsd5 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= \
diff --git a/sysutils/gkrellm2/files/patch-ae b/sysutils/gkrellm2/files/patch-ae
index 2d097ca2da9c..2a170bfc9cbe 100644
--- a/sysutils/gkrellm2/files/patch-ae
+++ b/sysutils/gkrellm2/files/patch-ae
@@ -1,8 +1,8 @@
 Index: src/Makefile.src
 diff -u src/Makefile.src.orig src/Makefile.src
---- 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 @@
+--- 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 @@
  GTK_LIB = `$(GTK_CONFIG) --libs gthread`
  IMLIB_LIB = `imlib-config --libs-gdk`
  
@@ -21,6 +21,11 @@ diff -u src/Makefile.src.orig src/Makefile.src
 +    CFLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
  endif
  
+ ifeq ($(HAVE_GETADDRINFO),1)
+-    FLAGS += -DHAVE_GETADDRINFO
++    CFLAGS += -DHAVE_GETADDRINFO
+ endif
+ 
 -
 -CC = gcc -Wall $(FLAGS)