- Add support for WITHOUT_NLS knob [1]

- Bump PORTREVISION after claws-mail update

PR:		124108 [1]
Submitted by:	Pawel Pekala <c0rn@o2.pl> (maintainer)

4 files changed, 49 insertions, 35 deletions

diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index da9951acead7..f787429e74b7 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	attach_warner
 PORTVERSION=	0.2.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,17 +16,24 @@ DISTNAME=	attachwarner-${PORTVERSION}
 MAINTAINER=	c0rn@o2.pl
 COMMENT=	Not attached file warning plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.4.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.4.0:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.5.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.5.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--with-iconv-prefix=${LOCALBASE} \
-	--with-libintl-prefix=${LOCALBASE}
+		--with-libintl-prefix=${LOCALBASE}
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-attach_warner/pkg-plist b/mail/claws-mail-attach_warner/pkg-plist
index bd5e73c45bfb..97c18bddbb2f 100644
--- a/mail/claws-mail-attach_warner/pkg-plist
+++ b/mail/claws-mail-attach_warner/pkg-plist
@@ -1,15 +1,15 @@
-lib/claws-mail/plugins/attachwarner.so
-lib/claws-mail/plugins/attachwarner.la
 lib/claws-mail/plugins/attachwarner.a
-share/locale/cs/LC_MESSAGES/attachwarner.mo
-share/locale/sr/LC_MESSAGES/attachwarner.mo
-share/locale/de/LC_MESSAGES/attachwarner.mo
-share/locale/es/LC_MESSAGES/attachwarner.mo
-share/locale/fr/LC_MESSAGES/attachwarner.mo
-share/locale/hu/LC_MESSAGES/attachwarner.mo
-share/locale/it/LC_MESSAGES/attachwarner.mo
-share/locale/pt_BR/LC_MESSAGES/attachwarner.mo
-share/locale/ca/LC_MESSAGES/attachwarner.mo
-share/locale/fi/LC_MESSAGES/attachwarner.mo
-share/locale/pl/LC_MESSAGES/attachwarner.mo
-share/locale/sk/LC_MESSAGES/attachwarner.mo
+lib/claws-mail/plugins/attachwarner.la
+lib/claws-mail/plugins/attachwarner.so
+%%NLS%%share/locale/ca/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/de/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/es/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/it/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/attachwarner.mo
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index cd2eb694348b..3d274bc60915 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pdf_viewer
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,13 +16,12 @@ MAINTAINER=	c0rn@o2.pl
 COMMENT=	This claws-mail plugin enables viewing of PDF and PS files
 
 LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-gtk
-BUILD_DEPENDS=	claws-mail>=3.4.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.4.0:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.5.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.5.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_ICONV=	yes
-USE_GHOSTSCRIPT=	yes
+USE_GHOSTSCRIPT=yes
 USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -30,4 +29,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--with-iconv-prefix=${LOCALBASE} \
 	--with-libintl-prefix=${LOCALBASE}
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-pdf_viewer/pkg-plist b/mail/claws-mail-pdf_viewer/pkg-plist
index d302a0745721..a95506f8ac10 100644
--- a/mail/claws-mail-pdf_viewer/pkg-plist
+++ b/mail/claws-mail-pdf_viewer/pkg-plist
@@ -1,14 +1,14 @@
 lib/claws-mail/plugins/pdf_viewer.a
 lib/claws-mail/plugins/pdf_viewer.la
 lib/claws-mail/plugins/pdf_viewer.so
-share/locale/ca/LC_MESSAGES/pdf_viewer.mo
-share/locale/de/LC_MESSAGES/pdf_viewer.mo
-share/locale/es/LC_MESSAGES/pdf_viewer.mo
-share/locale/fi/LC_MESSAGES/pdf_viewer.mo
-share/locale/fr/LC_MESSAGES/pdf_viewer.mo
-share/locale/hu/LC_MESSAGES/pdf_viewer.mo
-share/locale/it/LC_MESSAGES/pdf_viewer.mo
-share/locale/pl/LC_MESSAGES/pdf_viewer.mo
-share/locale/pt_BR/LC_MESSAGES/pdf_viewer.mo
-share/locale/sk/LC_MESSAGES/pdf_viewer.mo
-share/locale/sr/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/pdf_viewer.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/pdf_viewer.mo