6 files changed, 12 insertions, 75 deletions
diff --git a/mail/deforaos-mailer/Makefile b/mail/deforaos-mailer/Makefile
index ad650d7a840..4ef0255872a 100644
--- a/mail/deforaos-mailer/Makefile
+++ b/mail/deforaos-mailer/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.22 2016/03/05 11:28:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2016/04/05 20:52:34 khorben Exp $
 
-DISTNAME=	Mailer-0.1.7
-PKGNAME=	deforaos-mailer-0.1.7
-PKGREVISION=	1
+DISTNAME=	Mailer-0.1.8
+PKGNAME=	deforaos-mailer-0.1.8
 CATEGORIES=	mail
-MASTER_SITES=	http://www.defora.org/os/download/download/4426/
+MASTER_SITES=	http://www.defora.org/os/download/download/4439/
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
 COMMENT=	DeforaOS desktop e-mail client
-LICENSE=	gnu-gpl-v3
+LICENSE=	modified-bsd
 
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
diff --git a/mail/deforaos-mailer/PLIST b/mail/deforaos-mailer/PLIST
index a94ed9fed3e..47f74c70d12 100644
--- a/mail/deforaos-mailer/PLIST
+++ b/mail/deforaos-mailer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/02/20 14:52:09 khorben Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/04/05 20:52:34 khorben Exp $
 bin/compose
 bin/mailer
 include/Desktop/Mailer.h
@@ -60,4 +60,5 @@ share/icons/hicolor/48x48/apps/mailer-inbox.png
 share/icons/hicolor/48x48/apps/mailer-outbox.png
 share/icons/hicolor/48x48/apps/mailer-sent.png
 share/icons/hicolor/48x48/apps/mailer.png
+share/locale/es/LC_MESSAGES/Mailer.mo
 share/locale/fr/LC_MESSAGES/Mailer.mo
diff --git a/mail/deforaos-mailer/distinfo b/mail/deforaos-mailer/distinfo
index 4bbc2330519..26a29779256 100644
--- a/mail/deforaos-mailer/distinfo
+++ b/mail/deforaos-mailer/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.6 2016/02/22 12:42:56 khorben Exp $
+$NetBSD: distinfo,v 1.7 2016/04/05 20:52:34 khorben Exp $
 
-SHA1 (Mailer-0.1.7.tar.gz) = 33ffa684ef30c541bb3e37c2de39bd64c1e3df4b
-RMD160 (Mailer-0.1.7.tar.gz) = e82282a8fc72af497a41b896946dd199c8eb4cc8
-SHA512 (Mailer-0.1.7.tar.gz) = 21124ad22ebcfdcb8479c60817a5934c710626a03246a684902139464e25f52acc437594880e4081dbc4bdbe3d68fd4267a2d90e38dee9af64f5569d0ee770b1
-Size (Mailer-0.1.7.tar.gz) = 117673 bytes
-SHA1 (patch-src_Makefile) = 3fb9b33e2a3e28446d45ef3137e61c98672ab380
-SHA1 (patch-src_account_Makefile) = e86345144a78f48d2d1caf670f29702df5a4ef1a
-SHA1 (patch-src_plugins_Makefile) = 1c55d7d99f64e737faf1ce7635117624e1d30696
+SHA1 (Mailer-0.1.8.tar.gz) = a31bbeb22f11f692e937b6450a3c913424a80b0d
+RMD160 (Mailer-0.1.8.tar.gz) = 5bc95b752896c8b9fc6019d13767b6663672d019
+SHA512 (Mailer-0.1.8.tar.gz) = fff0b8e6a7796bfb10d76dcfc36297a44b377e14bc0de2c8c939880e5fd956dd0b837f8c7788a3adc295aad18ab6f98001ff1cea03076bffed291f35d77bdd33
+Size (Mailer-0.1.8.tar.gz) = 108980 bytes
diff --git a/mail/deforaos-mailer/patches/patch-src_Makefile b/mail/deforaos-mailer/patches/patch-src_Makefile
deleted file mode 100644
index 89f3b0081f5..00000000000
--- a/mail/deforaos-mailer/patches/patch-src_Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_Makefile,v 1.1 2016/02/22 12:42:56 khorben Exp $
-
-Always build libraries with -fPIC
-
---- src/Makefile.orig	2016-02-20 14:42:07.000000000 +0000
-+++ src/Makefile
-@@ -7,8 +7,8 @@ LIBDIR	= $(PREFIX)/lib
- CC	= cc
- CPPFLAGSF=
- CPPFLAGS=
--CFLAGSF	= -W `pkg-config --cflags libDesktop`
--CFLAGS	= -Wall -g -O2 -pedantic -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-all
-+CFLAGSF	= `pkg-config --cflags libDesktop`
-+CFLAGS	= -W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
- LDFLAGSF= `pkg-config --libs libDesktop` -lintl
- LDFLAGS	= -Wl,-z,relro -Wl,-z,now
- EXEEXT	=
-@@ -34,7 +34,7 @@ subdirs:
- 		else $(MAKE); fi) || exit; done
- 
- libMailer_OBJS = $(OBJDIR)account.o $(OBJDIR)callbacks.o $(OBJDIR)compose.o $(OBJDIR)folder.o $(OBJDIR)helper.o $(OBJDIR)mailer.o $(OBJDIR)message.o
--libMailer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-+libMailer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -fPIC
- libMailer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl
- 
- $(OBJDIR)libMailer.a: $(libMailer_OBJS)
diff --git a/mail/deforaos-mailer/patches/patch-src_account_Makefile b/mail/deforaos-mailer/patches/patch-src_account_Makefile
deleted file mode 100644
index b2172bfe0f0..00000000000
--- a/mail/deforaos-mailer/patches/patch-src_account_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_account_Makefile,v 1.1 2016/02/22 12:42:56 khorben Exp $
-
-Always build plug-ins with -fPIC
-
---- src/account/Makefile.orig	2016-02-20 14:42:07.000000000 +0000
-+++ src/account/Makefile
-@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
- CC	= cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF	= -W `pkg-config --cflags openssl` `pkg-config --cflags glib-2.0`
--CFLAGS	= -Wall -g -O2 -pedantic -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-all
-+CFLAGSF	= `pkg-config --cflags openssl` `pkg-config --cflags glib-2.0` -fPIC
-+CFLAGS	= -W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
- LDFLAGSF= `pkg-config --libs openssl` -lssl `pkg-config --libs glib-2.0`
- LDFLAGS	= -Wl,-z,relro -Wl,-z,now
- EXEEXT	=
diff --git a/mail/deforaos-mailer/patches/patch-src_plugins_Makefile b/mail/deforaos-mailer/patches/patch-src_plugins_Makefile
deleted file mode 100644
index 26fdf15127e..00000000000
--- a/mail/deforaos-mailer/patches/patch-src_plugins_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_plugins_Makefile,v 1.1 2016/02/22 12:42:56 khorben Exp $
-
-Always build plug-ins with -fPIC
-
---- src/plugins/Makefile.orig	2016-02-20 14:42:07.000000000 +0000
-+++ src/plugins/Makefile
-@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
- CC	= cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF	= -W `pkg-config --cflags libDesktop`
--CFLAGS	= -Wall -g -O2 -pedantic -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-all
-+CFLAGSF	= `pkg-config --cflags libDesktop` -fPIC
-+CFLAGS	= -W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
- LDFLAGSF= `pkg-config --libs openssl` -lssl `pkg-config --libs libDesktop`
- LDFLAGS	= -Wl,-z,relro -Wl,-z,now
- EXEEXT	=