6 files changed, 47 insertions, 93 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index f9ed7bf3f750..7db1992e9a0b 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	gkrellm
-PORTVERSION=	2.3.5
-PORTREVISION=	7
+PORTVERSION=	2.3.7
+#PORTREVISION=	0
 CATEGORIES=	sysutils ipv6
-MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
+MASTER_SITES=	http://gkrellm.srcbox.net/releases/ \
 		LOCAL/ume
 PKGNAMESUFFIX=	2
 
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index abb346911083..00268dd3f184 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gkrellm-2.3.5.tar.bz2) = 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b
-SIZE (gkrellm-2.3.5.tar.bz2) = 765011
+TIMESTAMP = 1465143229
+SHA256 (gkrellm-2.3.7.tar.bz2) = f7a4642d2cc6b61242215e58e1bd8fe394e6fd984cd3c3f8964c1c554029735d
+SIZE (gkrellm-2.3.7.tar.bz2) = 777841
diff --git a/sysutils/gkrellm2/files/patch-Makefile b/sysutils/gkrellm2/files/patch-Makefile
index f18260cad62c..86c9cc0c644b 100644
--- a/sysutils/gkrellm2/files/patch-Makefile
+++ b/sysutils/gkrellm2/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2010-10-02 16:21:01 UTC
+--- Makefile.orig	2016-06-03 16:29:10 UTC
 +++ Makefile
 @@ -3,7 +3,9 @@
  #	make
@@ -11,19 +11,28 @@
  #	make freebsd
  # For NetBSD 1.5 - 1.6.X
  #	make netbsd1
-@@ -120,7 +122,7 @@
+@@ -118,7 +120,7 @@ export INSTALLDIR SINSTALLDIR INCLUDEDIR
  export MANDIR SMANDIR MANDIRMODE MANMODE
- export OS_NAME OS_RELEASE
+ export OS_RELEASE
  
 -enable_nls=1
 +enable_nls?=1
  debug=0
  export enable_nls
  export debug
-@@ -162,8 +164,8 @@
+@@ -131,7 +133,7 @@ all gkrellm: gkrellm.pc
+ 	(cd server && ${MAKE} gkrellmd)
+ 
+ gkrellm.pc: Makefile
+-	echo 'prefix=$(INSTALLROOT)\n'\
++	printf 'prefix=$(INSTALLROOT)\n'\
+ 	'Name: GKrellM\n'\
+ 	'Description: Extensible GTK system monitoring application\n'\
+ 	'Version: $(VERSION)\n'\
+@@ -151,8 +153,8 @@ uninstall:
  	rm -f $(PKGCONFIGDIR)/gkrellm.pc
  
- install_gkrellm.pc:
+ install_gkrellm.pc: gkrellm.pc
 -	$(INSTALL) -d $(PKGCONFIGDIR)
 -	$(INSTALL) -m $(INCLUDEMODE) -c gkrellm.pc $(PKGCONFIGDIR)
 +	$(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
diff --git a/sysutils/gkrellm2/files/patch-server__Makefile b/sysutils/gkrellm2/files/patch-server__Makefile
index 5cc6b1f0dfcc..6ec810d46b29 100644
--- a/sysutils/gkrellm2/files/patch-server__Makefile
+++ b/sysutils/gkrellm2/files/patch-server__Makefile
@@ -1,49 +1,27 @@
---- server/Makefile.orig	2010-10-02 16:21:01 UTC
-+++ server/Makefile
-@@ -26,6 +26,7 @@
- MANMODE ?= 644
- MANDIRMODE ?= 755
- INSTALL ?= install
-+PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig
- LINK_FLAGS ?= -Wl,-E
- EXTRAOBJS =
- 
-@@ -57,18 +58,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`
- 
--GLIB12_INCLUDE = `glib-config --cflags`
--GLIB12_LIB = `glib-config --libs glib gmodule`
-+GLIB12_INCLUDE = `$(GLIB_CONFIG) --cflags`
-+GLIB12_LIB = `$(GLIB_CONFIG) --libs glib gmodule`
+Index: server/Makefile
+diff -u server/Makefile.orig server/Makefile
+--- server/Makefile.orig	2016-02-03 08:37:50.000000000 +0900
++++ server/Makefile	2016-06-06 01:46:16.352492000 +0900
+@@ -31,7 +31,7 @@
+ PKG_INCLUDE := $(shell $(PKG_CONFIG) --cflags glib-2.0 gmodule-2.0 gthread-2.0)
+ PKG_LIB := $(shell $(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0)
  
 -FLAGS = -O2 $(PKG_INCLUDE)
 +FLAGS = $(PKG_INCLUDE)
  
- ifeq ($(glib12),1)
--    FLAGS = -O2 $(GLIB12_INCLUDE)
-+    FLAGS = $(GLIB12_INCLUDE)
- endif
- ifeq ($(glib12),yes)
--    FLAGS = -O2  $(GLIB12_INCLUDE)
-+    FLAGS = $(GLIB12_INCLUDE)
- endif
--FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER
-+FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -I$(LOCALBASE)/include -DGKRELLM_SERVER
- 
- LIBS = $(PKG_LIB)
- ifeq ($(glib12),1)
-@@ -115,20 +116,31 @@
- 
- all:	gkrellmd
- 
--gkrellmd: $(OBJS) $(EXTRAOBJS)
-+gkrellmd: gkrellmd.pc $(OBJS) $(EXTRAOBJS)
- 	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd \
+ FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER
+ 
+@@ -73,20 +73,31 @@
+ 
+ all:	gkrellmd$(BINEXT)
+ 
+-gkrellmd$(BINEXT): check_env $(OBJS) $(EXTRAOBJS)
++gkrellmd$(BINEXT): check_env gkrellmd.pc $(OBJS) $(EXTRAOBJS)
+ 	$(CC) $(OBJS) $(EXTRAOBJS) -o $@ \
  		$(LDFLAGS) $(LIBS) $(LINK_FLAGS)
  
--static: $(OBJS) $(EXTRAOBJS)
-+static: gkrellmd.pc $(OBJS) $(EXTRAOBJS)
+-static: check_env $(OBJS) $(EXTRAOBJS)
++static: check_env gkrellmd.pc $(OBJS) $(EXTRAOBJS)
  	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \
  		$(LDFLAGS) $(LIBS) $(LINK_FLAGS)
  
@@ -68,9 +46,9 @@
  # Darwin target for systems that still have libkvm
  darwin: 
  	$(MAKE) STRIP= HAVE_GETADDRINFO=1 \
-@@ -176,27 +188,32 @@
+@@ -135,27 +146,32 @@
  		SYS_LIBS="-lws2_32 -lwtsapi32 -lpdh -lnetapi32 -liphlpapi -lintl" \
- 		gkrellmd
+ 		all
  
 -install: install_bin install_inc install_man
 +install: install_bin install_inc install_man install_gkrellmd.pc
@@ -110,7 +88,7 @@
  
  install_darwin install_darwin9 install_macosx:
  	$(MAKE) install STRIP=
-@@ -227,6 +244,7 @@
+@@ -186,6 +202,7 @@
  clean:
  	$(RM) *.o *~ *.bak configure.h configure.log gkrellmd gkrellmd.exe \
  		libgkrellmd.a core
diff --git a/sysutils/gkrellm2/files/patch-src__configure b/sysutils/gkrellm2/files/patch-src__configure
index c4efb397740d..4b7d52d47cdc 100644
--- a/sysutils/gkrellm2/files/patch-src__configure
+++ b/sysutils/gkrellm2/files/patch-src__configure
@@ -1,49 +1,13 @@
---- src/configure.orig	2010-09-14 14:40:38 UTC
+--- src/configure.orig	2014-10-11 14:00:45 UTC
 +++ src/configure
-@@ -46,8 +46,8 @@
+@@ -46,8 +46,8 @@ then
  echo -n "Checking for OpenSSL... "
  echo "Checking for OpenSSL... " 1>& 5
  
--OPENSSL_INCLUDE="$(pkg-config openssl --cflags 2>& 5 || true)"
--OPENSSL_LIBS="$(pkg-config openssl --libs 2>& 5 || true)"
+-OPENSSL_INCLUDE="$(${PKG_CONFIG} openssl --cflags 2>& 5 || true)"
+-OPENSSL_LIBS="$(${PKG_CONFIG} openssl --libs 2>& 5 || true)"
 +OPENSSL_INCLUDE="-I${OPENSSLINC}"
 +OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
  if [ -z "$OPENSSL_LIBS" ]
  then
  	echo "OpenSSL not found via pkg-config, using hardcoded library names" 1>& 5
-@@ -69,7 +69,7 @@
- 	}
- EOF
- 
--$CC ${CFLAGS} ${GTK_INCLUDE} ${OPENSSL_INCLUDE} -c test.c -o test.o 2>& 5 || true
-+$CC ${GTK_INCLUDE} ${OPENSSL_INCLUDE} -c test.c -o test.o 2>& 5 || true
- $CC test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${OPENSSL_LIBS} 2>& 5 || true
- 
- if [ -x ./test ] && ./test
-@@ -117,7 +117,7 @@
- 	}
- EOF
- 
--${CC} ${CFLAGS} ${GTK_INCLUDE} ${GNUTLS_INCLUDE} -c test.c -o test.o 2>& 5 || true
-+${CC} ${GTK_INCLUDE} ${GNUTLS_INCLUDE} -c test.c -o test.o 2>& 5 || true
- ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${GNUTLS_LIBS} 2>& 5 || true
- 
- if [ -x ./test ] && ./test
-@@ -159,7 +159,7 @@
- 	}
- EOF
- 
--${CC} ${CFLAGS} ${GTK_INCLUDE} ${PKG_NTLM_INCLUDE} -c test.c -o test.o 2>& 5 || true
-+${CC} ${GTK_INCLUDE} ${PKG_NTLM_INCLUDE} -c test.c -o test.o 2>& 5 || true
- ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${PKG_NTLM_LIBS} 2>& 5 || true
- 
- if [ -x ./test ] && ./test
-@@ -209,7 +209,7 @@
- 	}
- EOF
- 
--${CC} ${CFLAGS} ${GTK_INCLUDE} -c test.c -o test.o 2>& 5 || true
-+${CC} ${GTK_INCLUDE} -c test.c -o test.o 2>& 5 || true
- ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} -lsensors 2>& 5 || true
- 
- if [ -x ./test ] && ./test
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index 86689a24df10..215a582d5897 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -19,10 +19,12 @@ sbin/gkrellmd
 %%CLIENT%%%%NLS%%share/locale/ja/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/nl/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/pl/LC_MESSAGES/gkrellm.mo
+%%CLIENT%%%%NLS%%share/locale/pt/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/ru/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/sl/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/sv/LC_MESSAGES/gkrellm.mo
+%%CLIENT%%%%NLS%%share/locale/uk/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%@dir libexec/gkrellm2/plugins
 @dir libexec/gkrellm2/plugins-gkrellmd
 %%CLIENT%%@dir %%DATADIR%%2/themes