Update to 2.1.22.

5 files changed, 68 insertions, 6 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 4b3279c966ac..ca4e429b8c32 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	2.1.21
+PORTVERSION=	2.1.22
 #PORTREVISION=	0
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index 276f7fcafddf..31fa700c311e 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-2.1.21.tar.bz2) = ad5cc23638abb665406effbba58725df
+MD5 (gkrellm-2.1.22.tar.bz2) = 036823ec64a2c496d46adc5e3f019337
diff --git a/sysutils/gkrellm2/files/patch-src::configure b/sysutils/gkrellm2/files/patch-src::configure
new file mode 100644
index 000000000000..18e51ec48951
--- /dev/null
+++ b/sysutils/gkrellm2/files/patch-src::configure
@@ -0,0 +1,13 @@
+Index: src/configure
+diff -u src/configure.orig src/configure
+--- src/configure.orig	Fri Dec 12 04:06:52 2003
++++ src/configure	Sat Dec 13 14:15:14 2003
+@@ -45,7 +45,7 @@
+ EOF
+ 
+ $CC ${PKG_INCLUDE} -c test.c -o test.o 2>& 5
+-$CC test.o -o test ${PKG_LIBS} -lssl 2>& 5
++$CC test.o -o test ${PKG_LIBS} -lssl -lcrypto 2>& 5
+ 
+ if [ -e ./test ] && ./test
+ then
diff --git a/sysutils/gkrellm2/files/patch-src::mail.c b/sysutils/gkrellm2/files/patch-src::mail.c
new file mode 100644
index 000000000000..e121112c7aac
--- /dev/null
+++ b/sysutils/gkrellm2/files/patch-src::mail.c
@@ -0,0 +1,40 @@
+Index: src/mail.c
+diff -u src/mail.c.orig src/mail.c
+--- src/mail.c.orig	Sat Dec 13 02:26:21 2003
++++ src/mail.c	Sat Dec 13 14:35:20 2003
+@@ -72,11 +72,17 @@
+ # endif
+ #endif
+ 
++#if defined(HAVE_SSL)
++#define MD5Init		MD5_Init
++#define MD5Update	MD5_Update
++#define MD5Final	MD5_Final
++#else
+ #if defined(HAVE_MD5_H)
+ #include <md5.h>
+ #else
+ #include "md5.h"
+ #endif
++#endif
+ 
+ #define MUTE_FLAG	-1
+ 
+@@ -654,7 +660,7 @@
+ 	unsigned char opad[64];
+ 	unsigned char hash_passwd[16];
+ 
+-	MD5_CTX_ ctx;
++	MD5_CTX ctx;
+     
+ 	if (resp_len != 16)
+ 		return;
+@@ -846,7 +852,7 @@
+ 	if (account->authtype == AUTH_POP3_APOP)
+ 		{
+ 		static const gchar hex[] = "0123456789abcdef";
+-		MD5_CTX_ ctx;
++		MD5_CTX ctx;
+ 		gint	i;
+ 		gchar	*key, *p;
+ 		guchar	digest[16];
diff --git a/sysutils/gkrellm2/files/patch-src:Makefile b/sysutils/gkrellm2/files/patch-src:Makefile
index 90272078f3a4..231522e3dce5 100644
--- a/sysutils/gkrellm2/files/patch-src:Makefile
+++ b/sysutils/gkrellm2/files/patch-src:Makefile
@@ -1,8 +1,17 @@
 Index: src/Makefile
 diff -u src/Makefile.orig src/Makefile
---- src/Makefile.orig	Tue Sep 17 04:36:16 2002
-+++ src/Makefile	Fri Sep 20 18:23:48 2002
-@@ -21,7 +21,7 @@
+--- src/Makefile.orig	Fri Dec 12 03:31:04 2003
++++ src/Makefile	Sat Dec 13 14:29:56 2003
+@@ -32,7 +32,7 @@
+ HAVE_SSL = $(shell grep -c HAVE_SSL configure.h)
+ 
+ ifeq ($(HAVE_SSL),1)
+-    SSL_LIBS ?= -lssl
++    SSL_LIBS ?= -lssl -lcrypto
+ endif
+ 
+ CC ?= gcc
+@@ -44,7 +44,7 @@
  
  PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
  
@@ -10,4 +19,4 @@ diff -u src/Makefile.orig src/Makefile
 +FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
  FLAGS+= $(PTHREAD_INC)
  
- LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS)
+ LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS)