- Respect CC. [1]

- Fix detection of GNUTLS.  WITH_GNUTLS should work, again.
- Bump PORTREVISION.

PR:		ports/107164 [1]

4 files changed, 42 insertions, 12 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 82a63d6e1e10..73224efb773c 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellm
 PORTVERSION=	2.2.10
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -84,7 +84,7 @@ MAN1PREFIX=	${X11BASE}
 ALL_TARGET=	freebsd
 INSTALL_TARGET=	install_freebsd
 
-MAKE_ENV+=	INSTALLROOT=${X11BASE} INSTALLDIR=${X11BASE}/bin \
+MAKE_ENV+=	CC="${CC}" INSTALLROOT=${X11BASE} INSTALLDIR=${X11BASE}/bin \
 		PKGCONFIGDIR=${X11BASE}/libdata/pkgconfig \
 		SINSTALLROOT=${PREFIX} SINSTALLDIR=${PREFIX}/sbin \
 		SPKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
diff --git a/sysutils/gkrellm2/files/patch-src::configure b/sysutils/gkrellm2/files/patch-src::configure
index 9518c7169f7c..091f2ee06083 100644
--- a/sysutils/gkrellm2/files/patch-src::configure
+++ b/sysutils/gkrellm2/files/patch-src::configure
@@ -1,8 +1,16 @@
 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 @@
+--- src/configure.orig	Wed Oct 25 13:25:45 2006
++++ src/configure	Tue Dec 26 11:18:57 2006
+@@ -39,6 +39,7 @@
+ 
+ cat << EOF > test.c
+ #include <gnutls/openssl.h>
++#include <gcrypt.h>
+ #include <errno.h>
+ #include <pthread.h>
+ 
+@@ -59,8 +60,8 @@
  	}
  EOF
  
@@ -11,9 +19,9 @@ diff -u src/configure.orig src/configure
 +$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
+ if [ -x ./test ] && ./test
  then
-@@ -88,8 +88,8 @@
+@@ -99,8 +100,8 @@
  	}
  EOF
  
@@ -22,5 +30,5 @@ diff -u src/configure.orig src/configure
 +$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
+ if [ -x ./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..110a1d51991e
--- /dev/null
+++ b/sysutils/gkrellm2/files/patch-src::mail.c
@@ -0,0 +1,12 @@
+Index: src/mail.c
+diff -u -p src/mail.c.orig src/mail.c
+--- src/mail.c.orig	Wed Aug  9 07:31:30 2006
++++ src/mail.c	Tue Dec 26 11:25:25 2006
+@@ -39,6 +39,7 @@
+ 
+ #if defined(HAVE_GNUTLS)
+ #include <gnutls/openssl.h>
++#include <gcrypt.h>
+ #include <pthread.h>
+ #define MD5Init		MD5_Init
+ #define MD5Update	MD5_Update
diff --git a/sysutils/gkrellm2/files/patch-src:Makefile b/sysutils/gkrellm2/files/patch-src:Makefile
index e311f2c8a47c..4ab6d329b2c8 100644
--- a/sysutils/gkrellm2/files/patch-src:Makefile
+++ b/sysutils/gkrellm2/files/patch-src:Makefile
@@ -1,7 +1,7 @@
 Index: src/Makefile
 diff -u src/Makefile.orig src/Makefile
 --- src/Makefile.orig	Wed Oct 25 08:42:42 2006
-+++ src/Makefile	Fri Oct 27 12:44:24 2006
++++ src/Makefile	Tue Dec 26 10:46:38 2006
 @@ -39,17 +39,19 @@
  endif
  
@@ -25,14 +25,14 @@ diff -u src/Makefile.orig src/Makefile
  else
      EXTRAOBJS ?= md5c.o
  endif
-@@ -68,8 +70,16 @@
+@@ -68,9 +70,17 @@
  
  PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
  
 -FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
 +FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
  FLAGS+= $(PTHREAD_INC)
-+
+ 
 +ifeq ($(HAVE_GNUTLS),1)
 +    FLAGS+= -I$(GNUTLSINC)
 +else
@@ -40,6 +40,16 @@ diff -u src/Makefile.orig src/Makefile
 +    FLAGS+= -I$(OPENSSLINC)
 +endif
 +endif
- 
++
  LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)
  
+ ifeq ($(debug),1)
+@@ -96,7 +106,7 @@
+ endif
+ 
+ 
+-override CC += -Wall $(FLAGS)
++CFLAGS += -Wall $(FLAGS)
+ 
+ OBJS =	main.o alerts.o battery.o base64.o clock.o cpu.o disk.o fs.o \
+ 	hostname.o inet.o mail.o mem.o net.o proc.o sensors.o uptime.o \