Update to 0.6.5

6 files changed, 52 insertions, 9 deletions

diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index a6fe9350fd20..6d064a6e2248 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -6,19 +6,25 @@
 #
 
 PORTNAME=	spruce
-PORTVERSION= 	0.4.9f
+PORTVERSION= 	0.6.5
 CATEGORIES=	mail
-MASTER_SITES=	http://www.xtorshun.org/spruce/ \
-		http://fundy.linuxberg.com/files/x11/network/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/mail/
+MASTER_SITES=	http://www.xtorshun.org/spruce/v0.6/ \
+		http://fundy.linuxberg.com/files/x11/network/
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
+GTK_CONFIG=	${X11BASE}/bin/gtk12-config
+GLIB_CONFIG=	${LOCALBASE}/bin/glib12-config
+
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
+CONFIGURE_ENV=	GTK_CONFIG=${GTK_CONFIG} GLIB_CONFIG=${GLIB_CONFIG} \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
 USE_GMAKE=	yes
 
+MAN1=		spruce.1
+
 .include <bsd.port.mk>
diff --git a/mail/spruce/distinfo b/mail/spruce/distinfo
index 17cd584f4af0..19c59aba8d89 100644
--- a/mail/spruce/distinfo
+++ b/mail/spruce/distinfo
@@ -1 +1 @@
-MD5 (spruce-0.4.9f.tar.gz) = 7f22ae23268cdbdaeaa272d707514311
+MD5 (spruce-0.6.5.tar.gz) = 9109cd1a7ccd82e5138bd831f4920c31
diff --git a/mail/spruce/files/patch-ab b/mail/spruce/files/patch-ab
index fcfa32ee1ecb..3ac7be1dc3a7 100644
--- a/mail/spruce/files/patch-ab
+++ b/mail/spruce/files/patch-ab
@@ -1,11 +1,13 @@
---- server.h.orig	Wed Dec 22 10:57:01 1999
-+++ server.h	Wed Dec 22 10:57:03 1999
-@@ -26,9 +26,9 @@
+--- server.h.orig	Sun May 21 14:33:13 2000
++++ server.h	Sun May 21 14:33:30 2000
+@@ -26,11 +26,11 @@
  #include <sys/types.h>
  #include <sys/socket.h>
  /*#include <sys/param.h>*/
 +#include <netinet/in.h>
+ #ifdef __unix__
  #include <arpa/inet.h>
+ #endif
  #include <netdb.h>
 -#include <netinet/in.h>
  #include <unistd.h>
diff --git a/mail/spruce/files/patch-ad b/mail/spruce/files/patch-ad
new file mode 100644
index 000000000000..f11ace70b96a
--- /dev/null
+++ b/mail/spruce/files/patch-ad
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun May 21 14:32:23 2000
++++ Makefile.in	Sun May 21 14:32:44 2000
+@@ -98,7 +98,7 @@
+ spruce_SOURCES = defines.h 	about.c about.h 	accounts.c accounts.h 	addrbook.c addrbook.h 	composer.c composer.h 	cram_md5.c cram_md5.h 	date.c date.h 	filters.h filters.c 	globals.c globals.h 	gti.c gti.h 	gtkmanip.c gtkmanip.h 	gui.c gui.h 	imap.c imap.h 	init.c init.h 	mailbox.c mailbox.h 	mbox.c mbox.h 	md5.c md5.h 	mime.c mime.h 	mesgreader.c mesgreader.h 	msgid.c msgid.h 	options.c options.h 	parse.c parse.h 	pop3io.c pop3io.h 	pgp.c pgp.h 	print.c print.h 	rc.c rc.h 	server.c server.h 	smtpio.c smtpio.h 	sockio.c sockio.h 	sort.c sort.h 	status.c status.h 	main.c main.h
+ 
+ 
+-spruce_LDADD = @GTK_LIBS@ -lpthread -lgthread
++spruce_LDADD = @GTK_LIBS@ `@GTK_CONFIG@ --libs gthread` 
+ 
+ spruce_MANS = man/spruce.1
+ 
diff --git a/mail/spruce/files/patch-ae b/mail/spruce/files/patch-ae
new file mode 100644
index 000000000000..ac9b506f69a4
--- /dev/null
+++ b/mail/spruce/files/patch-ae
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	Sun May 21 14:41:15 2000
++++ po/Makefile.in.in	Sun May 21 14:41:44 2000
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(gnulocaledir) 
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/mail/spruce/pkg-plist b/mail/spruce/pkg-plist
index bb294f290a82..83896dd55157 100644
--- a/mail/spruce/pkg-plist
+++ b/mail/spruce/pkg-plist
@@ -1 +1,14 @@
 bin/spruce
+share/locale/ca/LC_MESSAGES/spruce.mo
+share/locale/da/LC_MESSAGES/spruce.mo
+share/locale/de/LC_MESSAGES/spruce.mo
+share/locale/es/LC_MESSAGES/spruce.mo
+share/locale/fr/LC_MESSAGES/spruce.mo
+share/locale/it/LC_MESSAGES/spruce.mo
+share/locale/ko/LC_MESSAGES/spruce.mo
+share/locale/nl/LC_MESSAGES/spruce.mo
+share/locale/pt/LC_MESSAGES/spruce.mo
+share/locale/ru_RU/LC_MESSAGES/spruce.mo
+share/locale/sk/LC_MESSAGES/spruce.mo
+share/locale/sv/LC_MESSAGES/spruce.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/spruce.mo