Updated mail/deforaos-mailer to version 0.1.6

This version brought many bugfixes (IMAP4, SSL support) and
improvements to the user interface and manual pages.

5 files changed, 28 insertions, 36 deletions

diff --git a/mail/deforaos-mailer/Makefile b/mail/deforaos-mailer/Makefile
index 3800f12442f..8ceacb74e31 100644
--- a/mail/deforaos-mailer/Makefile
+++ b/mail/deforaos-mailer/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2013/10/10 14:42:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2013/11/06 23:40:40 khorben Exp $
 #
 
-DISTNAME=	Mailer-0.1.5
-PKGNAME=	deforaos-mailer-0.1.5
-PKGREVISION=	8
+DISTNAME=	Mailer-0.1.6
+PKGNAME=	deforaos-mailer-0.1.6
 CATEGORIES=	mail
-MASTER_SITES=	http://www.defora.org/os/download/download/3704/
+MASTER_SITES=	http://www.defora.org/os/download/download/4029/
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
@@ -26,11 +25,15 @@ AUTO_MKDIRS=	yes
 
 CONFLICTS=	john-[0-9]*
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${PKGMANDIR} != "share/man"
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/compose.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/compose.1
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/mailer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/mailer.1
 	${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
 	${RMDIR} ${DESTDIR}${PREFIX}/share/man
+.endif
 
 .include "options.mk"
 
diff --git a/mail/deforaos-mailer/PLIST b/mail/deforaos-mailer/PLIST
index 1bf246c8ef5..b20e511dbc1 100644
--- a/mail/deforaos-mailer/PLIST
+++ b/mail/deforaos-mailer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/12/17 00:59:54 khorben Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/11/06 23:40:40 khorben Exp $
 bin/compose
 bin/mailer
 include/Desktop/Mailer.h
diff --git a/mail/deforaos-mailer/distinfo b/mail/deforaos-mailer/distinfo
index aeef020cb36..0f28baa5c1e 100644
--- a/mail/deforaos-mailer/distinfo
+++ b/mail/deforaos-mailer/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2012/12/17 00:59:54 khorben Exp $
+$NetBSD: distinfo,v 1.2 2013/11/06 23:40:40 khorben Exp $
 
-SHA1 (Mailer-0.1.5.tar.gz) = 341a3915d8b2d5a8a20472d27bf997468366a9b7
-RMD160 (Mailer-0.1.5.tar.gz) = 557a29902df4549e564c4b7aaef422170d16a317
-Size (Mailer-0.1.5.tar.gz) = 105898 bytes
-SHA1 (patch-doc_Makefile) = d47469aec0c1cb52099356ec30b5bf3bcbc0d9df
+SHA1 (Mailer-0.1.6.tar.gz) = eab85c0c5d4d23e52a81d4a026ee82384271eea0
+RMD160 (Mailer-0.1.6.tar.gz) = 0699c2ba44bd731ed1e4f7ba72d52b90e1e2a3eb
+Size (Mailer-0.1.6.tar.gz) = 112910 bytes
+SHA1 (patch-Makefile) = 7584cf06a22de91d428710153169777547f35b0a
diff --git a/mail/deforaos-mailer/patches/patch-Makefile b/mail/deforaos-mailer/patches/patch-Makefile
new file mode 100644
index 00000000000..7b5d18d93d7
--- /dev/null
+++ b/mail/deforaos-mailer/patches/patch-Makefile
@@ -0,0 +1,14 @@
+$NetBSD: patch-Makefile,v 1.1 2013/11/06 23:40:40 khorben Exp $
+
+Do not attempt to run the tests
+
+--- Makefile.orig	2012-12-26 16:21:23.000000000 +0000
++++ Makefile
+@@ -1,6 +1,6 @@
+ PACKAGE	= Mailer
+ VERSION	= 0.1.6
+-SUBDIRS	= data doc include po src src/plugins tests
++SUBDIRS	= data doc include po src src/plugins
+ RM	?= rm -f
+ LN	?= ln -f
+ TAR	?= tar -czvf
diff --git a/mail/deforaos-mailer/patches/patch-doc_Makefile b/mail/deforaos-mailer/patches/patch-doc_Makefile
deleted file mode 100644
index f421f6b69c0..00000000000
--- a/mail/deforaos-mailer/patches/patch-doc_Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-doc_Makefile,v 1.1 2012/12/17 00:59:55 khorben Exp $
-
-Also install the manual pages.
-
---- doc/Makefile.orig	2012-10-14 17:06:02.000000000 +0000
-+++ doc/Makefile
-@@ -48,14 +48,18 @@ distclean:
- 
- install: $(TARGETS)
- 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
-+	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "compose.1"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "compose.html"
- 	./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -i -- "gtkdoc/html.stamp"
-+	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "mailer.1"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "mailer.html"
- 
- uninstall:
- 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
-+	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "compose.1"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "compose.html"
- 	./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -u -- "gtkdoc/html.stamp"
-+	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "mailer.1"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "mailer.html"
- 
- .PHONY: all subdirs clean distclean install uninstall