5 files changed, 56 insertions, 45 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 0d416c35b04a..08023115d60d 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	2.2.10
-PORTREVISION=	4
+PORTVERSION=	2.3.0
+#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 c703da305225..49485cfa57f3 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gkrellm-2.2.10.tar.bz2) = 57ef0525c0997ac2e7720712811f5a84
-SHA256 (gkrellm-2.2.10.tar.bz2) = d7676d7734d4821454a840a1ef05020c9c4f4797ab96ec54f2351e26d437c88c
-SIZE (gkrellm-2.2.10.tar.bz2) = 718894
+MD5 (gkrellm-2.3.0.tar.bz2) = 8ced6843f4681ad8501fd04285ecff1f
+SHA256 (gkrellm-2.3.0.tar.bz2) = eae0a6862fe6131c67c2f8bca451b0410e69229a5a16463dd1f2266b3ff13dcb
+SIZE (gkrellm-2.3.0.tar.bz2) = 742468
diff --git a/sysutils/gkrellm2/files/patch-server::Makefile b/sysutils/gkrellm2/files/patch-server::Makefile
index b36c836878f9..6ce87f645446 100644
--- a/sysutils/gkrellm2/files/patch-server::Makefile
+++ b/sysutils/gkrellm2/files/patch-server::Makefile
@@ -1,16 +1,16 @@
 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 @@
+--- server/Makefile.orig	Tue May 29 04:12:20 2007
++++ server/Makefile	Sat Jul 21 03:43:25 2007
+@@ -21,6 +21,7 @@
  MANMODE ?= 644
  MANDIRMODE ?= 755
  INSTALL ?= install
 +PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig
  LINK_FLAGS ?= -Wl,-E
+ EXTRAOBJS =
  
- 
-@@ -44,18 +45,18 @@
+@@ -48,18 +49,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`
  
@@ -35,11 +35,11 @@ diff -u server/Makefile.orig server/Makefile
  
  LIBS = $(PKG_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS)
  
-@@ -105,10 +106,18 @@
+@@ -111,10 +112,18 @@
  
  all:	gkrellmd
  
--gkrellmd: $(OBJS)
+-gkrellmd: $(OBJS) $(EXTRAOBJS)
 +gkrellmd.pc: Makefile
 +	echo "prefix=$(INSTALLROOT)" > gkrellmd.pc
 +	echo "Name: GKrellMd" >> gkrellmd.pc
@@ -48,44 +48,46 @@ diff -u server/Makefile.orig server/Makefile
 +	echo "Requires: glib-2.0" >> gkrellmd.pc
 +	echo "Cflags: -I$(INCLUDEDIR)" >> gkrellmd.pc
 +
-+gkrellmd: gkrellmd.pc $(OBJS)
- 	$(CC) $(OBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS)
++gkrellmd: gkrellmd.pc $(OBJS) $(EXTRAOBJS)
+ 	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS)
  
--static: $(OBJS)
-+static: gkrellmd.pc $(OBJS)
- 	$(CC) $(OBJS) -o gkrellmd.static -static \
+-static: $(OBJS) $(EXTRAOBJS)
++static: gkrellmd.pc $(OBJS) $(EXTRAOBJS)
+ 	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \
  		$(LIBS) $(LINK_FLAGS)
  
-@@ -145,17 +154,22 @@
- 		LINK_FLAGS="" gkrellmd
- endif
+@@ -159,7 +168,7 @@
+ 	SYS_LIBS=" -llargeint -lws2_32 -lpdh -lnetapi32 -liphlpapi -lntdll -lintl" \
+ 	gkrellmd
  
--install:
-+install: install_gkrellmd.pc
+-install: install_bin install_inc install_man
++install: install_bin install_inc install_man install_gkrellmd.pc
+ 
+ install_bin:
  	$(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR)
- 	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)
- 	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
- 	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2
+@@ -171,11 +180,16 @@
+ 
+ install_man:
  	$(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
 -	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1
 +	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).8
++
++install_gkrellmd.pc:
++	$(INSTALL) -d $(PKGCONFIGDIR)
++	$(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(PKGCONFIGDIR)
  
  uninstall:
  	rm -f $(SINSTALLDIR)/$(PACKAGE_D)
  	rm -f $(SMANDIR)/$(PACKAGE_D).1
 +	rm -f $(PKGCONFIGDIR)/gkrellmd.pc
-+
-+install_gkrellmd.pc:
-+	$(INSTALL) -d $(PKGCONFIGDIR)
-+	$(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(PKGCONFIGDIR)
  
  install_darwin:
  	$(MAKE) install STRIP=
-@@ -180,6 +194,7 @@
- 
+@@ -205,6 +219,7 @@
  clean:
- 	rm -f *.o *~ *.bak configure.h configure.log gkrellmd core
-+	rm -f gkrellmd.pc
+ 	$(RM) *.o *~ *.bak configure.h configure.log gkrellmd gkrellmd.exe \
+ 		libgkrellmd.a core
++	$(RM) gkrellmd.pc
  
  SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \
  	../src/sysdeps/freebsd.c ../src/sysdeps/gtop.c \
diff --git a/sysutils/gkrellm2/files/patch-src::configure b/sysutils/gkrellm2/files/patch-src::configure
index 091f2ee06083..590631851251 100644
--- a/sysutils/gkrellm2/files/patch-src::configure
+++ b/sysutils/gkrellm2/files/patch-src::configure
@@ -1,8 +1,8 @@
 Index: src/configure
 diff -u src/configure.orig src/configure
---- src/configure.orig	Wed Oct 25 13:25:45 2006
-+++ src/configure	Tue Dec 26 11:18:57 2006
-@@ -39,6 +39,7 @@
+--- src/configure.orig	Mon May  7 08:45:55 2007
++++ src/configure	Sun Jul 22 03:01:53 2007
+@@ -41,6 +41,7 @@
  
  cat << EOF > test.c
  #include <gnutls/openssl.h>
@@ -10,25 +10,34 @@ diff -u src/configure.orig src/configure
  #include <errno.h>
  #include <pthread.h>
  
-@@ -59,8 +60,8 @@
+@@ -61,8 +62,8 @@
  	}
  EOF
  
--$CC ${PKG_INCLUDE} -c test.c -o test.o 2>& 5
--$CC test.o -o test ${PKG_LIBS} -lgnutls-openssl 2>& 5
+-$CC ${CFLAGS} ${PKG_INCLUDE} -c test.c -o test.o 2>& 5
+-$CC test.o -o test ${LINK_FLAGS} ${PKG_LIBS} -lgnutls-openssl 2>& 5
 +$CC ${PKG_INCLUDE} -I${GNUTLSINC} -c test.c -o test.o 2>& 5
-+$CC test.o -o test ${PKG_LIBS} -L${GNUTLSLIB} -lgnutls-openssl 2>& 5
++$CC test.o -o test ${LINK_FLAGS} ${PKG_LIBS} -L${GNUTLSLIB} -lgnutls-openssl 2>& 5
  
  if [ -x ./test ] && ./test
  then
-@@ -99,8 +100,8 @@
+@@ -101,8 +102,8 @@
  	}
  EOF
  
--$CC ${PKG_INCLUDE} -c test.c -o test.o 2>& 5
--$CC test.o -o test ${PKG_LIBS} -lssl -lcrypto 2>& 5
+-$CC ${CFLAGS} ${PKG_INCLUDE} -c test.c -o test.o 2>& 5
+-$CC test.o -o test ${LINK_FLAGS} ${PKG_LIBS} -lssl -lcrypto 2>& 5
 +$CC ${PKG_INCLUDE} -I${OPENSSLINC} -c test.c -o test.o 2>& 5
-+$CC test.o -o test ${PKG_LIBS} -L${OPENSSLLIB} -lssl -lcrypto 2>& 5
++$CC test.o -o test ${LINK_FLAGS} ${PKG_LIBS} -L${OPENSSLLIB} -lssl -lcrypto 2>& 5
  
  if [ -x ./test ] && ./test
  then
+@@ -141,7 +142,7 @@
+ 	}
+ EOF
+ 
+-$CC ${CFLAGS} ${PKG_INCLUDE} -c test.c -o test.o 2>& 5
++$CC ${PKG_INCLUDE} -c test.c -o test.o 2>& 5
+ $CC test.o -o test ${LINK_FLAGS} ${PKG_LIBS} -lsensors 2>& 5
+ 
+ if [ -x ./test ] && ./test
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index f7dfdf92463b..430ca8c99061 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -1,5 +1,5 @@
 include/gkrellm2/gkrellmd.h
-@dirrm include/gkrellm2
+@dirrmtry include/gkrellm2
 libdata/pkgconfig/gkrellmd.pc
 sbin/gkrellmd
 @exec mkdir -p %D/libexec/gkrellm2/plugins-gkrellmd