From c4efad747963a9dd9627d3dc20179818fb2d424b Mon Sep 17 00:00:00 2001
From: "David W. Chapman Jr." <dwcjr@FreeBSD.org>
Date: Mon, 17 Sep 2001 04:07:35 +0000
Subject: [PATCH] Update to 0.6b

PR:		29832
Submitted by:	pat@databits.net
No response:	maintainer
---
 mail/gkrellmmailwatch/Makefile                |  2 +-
 mail/gkrellmmailwatch/distinfo                |  2 +-
 mail/gkrellmmailwatch/files/patch-aa          | 32 +++++++------------
 mail/gkrellmmailwatch/files/patch-mailwatch.c |  6 ++--
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/mail/gkrellmmailwatch/Makefile b/mail/gkrellmmailwatch/Makefile
index 802df18c5110..c0aee4081930 100644
--- a/mail/gkrellmmailwatch/Makefile
+++ b/mail/gkrellmmailwatch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellmmailwatch
-PORTVERSION=	0.5
+PORTVERSION=	0.6b
 CATEGORIES=	mail
 MASTER_SITES=	http://gkrellm.luon.net/files/
 DISTNAME=	mailwatch-${PORTVERSION}
diff --git a/mail/gkrellmmailwatch/distinfo b/mail/gkrellmmailwatch/distinfo
index 98df1101a8ed..aa336409617c 100644
--- a/mail/gkrellmmailwatch/distinfo
+++ b/mail/gkrellmmailwatch/distinfo
@@ -1 +1 @@
-MD5 (mailwatch-0.5.tar.gz) = ee53dabf084120e113709a922916aadd
+MD5 (mailwatch-0.6b.tar.gz) = 8291712c808c6f291ee824768568475b
diff --git a/mail/gkrellmmailwatch/files/patch-aa b/mail/gkrellmmailwatch/files/patch-aa
index 575bf0b53274..40d08ea03ad5 100644
--- a/mail/gkrellmmailwatch/files/patch-aa
+++ b/mail/gkrellmmailwatch/files/patch-aa
@@ -1,30 +1,29 @@
---- Makefile.orig	Fri Apr 13 13:52:32 2001
-+++ Makefile	Mon Apr 16 23:24:03 2001
-@@ -1,32 +1,30 @@
+--- Makefile.orig	Mon Jul  2 00:34:11 2001
++++ Makefile	Fri Aug 17 15:21:47 2001
+@@ -1,27 +1,25 @@
  # Makefile for the GKrellM mailwatch plugin
  
 -GTK_INCLUDE = `gtk-config --cflags`
 -GTK_LIB = `gtk-config --libs`
-+GTK_INCLUDE = `$(GTK_CONFIG) --cflags`
-+GTK_LIB = `$(GTK_CONFIG) --libs`
++GTK_INCLUDE = `${GTK_CONFIG} --cflags`
++GTK_LIB = `${GTK_CONFIG} --libs`
  
 -GKRELLM_INCLUDE= -I/usr/local/include
-+GKRELLM_INCLUDE= -I$(PREFIX)/include
++GKRELLM_INCLUDE= -I${PREFIX}/include
  
 -IMLIB_INCLUDE = `imlib-config --cflags-gdk`
 -IMLIB_LIB = `imlib-config --libs-gdk`
-+IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk`
-+IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk`
++IMLIB_INCLUDE = `${IMLIB_CONFIG} --cflags-gdk`
++IMLIB_LIB = `${IMLIB_CONFIG} --libs-gdk`
  
- INSTALL=install -c -s -m 755
+ INSTALL=install -c -m 755
  
 -FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE)
--LIBS = $(GTK_LIB) $(IMLIB_LIB)
-+CFLAGS+= -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE)
-+LIBS = $(GTK_LIB) $(IMLIB_LIB) -lc_r
++CFLAGS = -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB) $(IMLIB_LIB)
  LFLAGS = -shared
  
--CC = gcc $(CFLAGS) $(FLAGS)
+-CC = gcc-3.0 $(CFLAGS) $(FLAGS)
 -
  OBJS = mailwatch.o
  
@@ -36,10 +35,3 @@
  
  clean:
  	rm -f *.o core *.so* *.bak *~
-+
- install: 
--	$(INSTALL) -c -s -m 755  mailwatch.so /usr/share/gkrellm/plugins
-+	$(INSTALL) mailwatch.so $(PREFIX)/libexec/gkrellm/plugins
- 
- mailwatch.c.o: mailwatch.c
--
diff --git a/mail/gkrellmmailwatch/files/patch-mailwatch.c b/mail/gkrellmmailwatch/files/patch-mailwatch.c
index d050783e97bc..b2b53236438b 100644
--- a/mail/gkrellmmailwatch/files/patch-mailwatch.c
+++ b/mail/gkrellmmailwatch/files/patch-mailwatch.c
@@ -1,10 +1,10 @@
---- mailwatch.c.orig	Mon Apr 16 23:00:40 2001
-+++ mailwatch.c	Mon Apr 16 23:02:26 2001
+--- mailwatch.c.orig	Sun Aug 12 07:15:30 2001
++++ mailwatch.c	Fri Aug 17 15:20:54 2001
 @@ -19,6 +19,7 @@
  */
  
  #include <dirent.h>
 +#include <sys/types.h>
+ #include <time.h>
  #include <utime.h>
  #include <string.h>
- #include "mailwatch.h"