3 files changed, 60 insertions, 4 deletions

diff --git a/sysutils/gkrellm2/files/patch-Makefile b/sysutils/gkrellm2/files/patch-Makefile
new file mode 100644
index 000000000000..967ba8562b63
--- /dev/null
+++ b/sysutils/gkrellm2/files/patch-Makefile
@@ -0,0 +1,13 @@
+Index: Makefile
+diff -u Makefile.orig Makefile
+--- Makefile.orig	Fri May 13 23:56:35 2005
++++ Makefile	Mon May 16 20:26:00 2005
+@@ -116,7 +116,7 @@
+ export MANDIR SMANDIR MANDIRMODE MANMODE
+ export OS_NAME OS_RELEASE
+ 
+-enable_nls=1
++enable_nls?=1
+ debug=0
+ export enable_nls
+ export debug
diff --git a/sysutils/gkrellm2/files/patch-src::configure b/sysutils/gkrellm2/files/patch-src::configure
new file mode 100644
index 000000000000..9518c7169f7c
--- /dev/null
+++ b/sysutils/gkrellm2/files/patch-src::configure
@@ -0,0 +1,26 @@
+Index: src/configure
+diff -u src/configure.orig src/configure
+--- src/configure.orig	Tue May 10 03:54:30 2005
++++ src/configure	Mon May 16 18:44:38 2005
+@@ -48,8 +48,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 ${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
+ 
+ if [ -e ./test ] && ./test
+ then
+@@ -88,8 +88,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 ${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
+ 
+ if [ -e ./test ] && ./test
+ then
diff --git a/sysutils/gkrellm2/files/patch-src:Makefile b/sysutils/gkrellm2/files/patch-src:Makefile
index d90a5289645d..80f8580d50f9 100644
--- a/sysutils/gkrellm2/files/patch-src:Makefile
+++ b/sysutils/gkrellm2/files/patch-src:Makefile
@@ -1,17 +1,30 @@
 Index: src/Makefile
 diff -u src/Makefile.orig src/Makefile
---- src/Makefile.orig	Wed Dec 17 01:53:06 2003
-+++ src/Makefile	Thu Dec 18 04:30:43 2003
-@@ -31,7 +31,7 @@
+--- src/Makefile.orig	Tue May 10 01:54:03 2005
++++ src/Makefile	Mon May 16 18:38:15 2005
+@@ -32,16 +32,18 @@
+ 	CONFIGURE_ARGS += --without-ssl
+ endif
+ 
+-DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
++DUMMY_VAR := $(shell env OPENSSLINC=$(OPENSSLINC) OPENSSLLIB=$(OPENSSLLIB) \
++		GNUTLSINC=$(GNUTLSINC) GNUTLSLIB=$(GNUTLSLIB) \
++		./configure $(CONFIGURE_ARGS))
+ 
+ HAVE_GNUTLS = $(shell grep -c HAVE_GNUTLS configure.h)
  HAVE_SSL = $(shell grep -c HAVE_SSL configure.h)
  
+ ifeq ($(HAVE_GNUTLS),1)
+-    SSL_LIBS ?= -lgnutls-openssl
++    SSL_LIBS ?= -L$(GNUTLSLIB) -lgnutls-openssl
+ else
  ifeq ($(HAVE_SSL),1)
 -    SSL_LIBS ?= -lssl -lcrypto
 +    SSL_LIBS ?= -L$(OPENSSLLIB) -lssl -lcrypto
  else
      EXTRAOBJS ?= md5c.o
  endif
-@@ -45,8 +45,12 @@
+@@ -56,8 +58,16 @@
  
  PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
  
@@ -19,9 +32,13 @@ diff -u src/Makefile.orig src/Makefile
 +FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
  FLAGS+= $(PTHREAD_INC)
 +
++ifeq ($(HAVE_GNUTLS),1)
++    FLAGS+= -I$(GNUTLSINC)
++else
 +ifeq ($(HAVE_SSL),1)
 +    FLAGS+= -I$(OPENSSLINC)
 +endif
++endif
  
  LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS)