Make NLS optional and move it to options.mk, but enabled by default. Move

gettext-lib dependency to that option. Buildlink libiconv and pthread.
USE_TOOLS+=bison msgfmt msgmerge xgettext. USE_LIBTOOL=yes.
Bump PKGREVISION.

3 files changed, 61 insertions, 49 deletions

diff --git a/net/aria2/Makefile b/net/aria2/Makefile
index 4858ecf6e48..1eb75ed7f73 100644
--- a/net/aria2/Makefile
+++ b/net/aria2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2013/06/09 02:11:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.45 2013/07/14 15:03:14 rodent Exp $
 #
 
 DISTNAME=	aria2-1.17.1
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aria2/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +13,9 @@ COMMENT=	Multi-threaded, multi-protocol, flexible download accelerator
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
+USE_TOOLS+=		bison msgfmt msgmerge xgettext
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--enable-bittorrent
@@ -38,8 +41,8 @@ CONFIGURE_ARGS+=	--disable-xmltest
 .include "options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../net/libcares/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/aria2/PLIST b/net/aria2/PLIST
index 77ec3714dbb..c20f212c8a1 100644
--- a/net/aria2/PLIST
+++ b/net/aria2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2013/06/09 02:11:34 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.18 2013/07/14 15:03:14 rodent Exp $
 bin/aria2c
 man/man1/aria2c.1
 man/pt/man1/aria2c.1
@@ -10,45 +10,45 @@ share/doc/aria2/bash_completion/aria2c
 share/doc/aria2/xmlrpc/README.txt
 share/doc/aria2/xmlrpc/aria2mon
 share/doc/aria2/xmlrpc/aria2rpc
-share/locale/ar/LC_MESSAGES/aria2.mo
-share/locale/bg/LC_MESSAGES/aria2.mo
-share/locale/bn/LC_MESSAGES/aria2.mo
-share/locale/ca/LC_MESSAGES/aria2.mo
-share/locale/da/LC_MESSAGES/aria2.mo
-share/locale/de/LC_MESSAGES/aria2.mo
-share/locale/el/LC_MESSAGES/aria2.mo
-share/locale/en@boldquot/LC_MESSAGES/aria2.mo
-share/locale/en@quot/LC_MESSAGES/aria2.mo
-share/locale/es/LC_MESSAGES/aria2.mo
-share/locale/fa/LC_MESSAGES/aria2.mo
-share/locale/fi/LC_MESSAGES/aria2.mo
-share/locale/fil/LC_MESSAGES/aria2.mo
-share/locale/fr/LC_MESSAGES/aria2.mo
-share/locale/he/LC_MESSAGES/aria2.mo
-share/locale/hr/LC_MESSAGES/aria2.mo
-share/locale/hu/LC_MESSAGES/aria2.mo
-share/locale/id/LC_MESSAGES/aria2.mo
-share/locale/it/LC_MESSAGES/aria2.mo
-share/locale/ja/LC_MESSAGES/aria2.mo
-share/locale/kk/LC_MESSAGES/aria2.mo
-share/locale/ko/LC_MESSAGES/aria2.mo
-share/locale/ms/LC_MESSAGES/aria2.mo
-share/locale/nb/LC_MESSAGES/aria2.mo
-share/locale/nl/LC_MESSAGES/aria2.mo
-share/locale/nn/LC_MESSAGES/aria2.mo
-share/locale/oc/LC_MESSAGES/aria2.mo
-share/locale/pl/LC_MESSAGES/aria2.mo
-share/locale/pt/LC_MESSAGES/aria2.mo
-share/locale/pt_BR/LC_MESSAGES/aria2.mo
-share/locale/ro/LC_MESSAGES/aria2.mo
-share/locale/ru/LC_MESSAGES/aria2.mo
-share/locale/sk/LC_MESSAGES/aria2.mo
-share/locale/sr/LC_MESSAGES/aria2.mo
-share/locale/sv/LC_MESSAGES/aria2.mo
-share/locale/th/LC_MESSAGES/aria2.mo
-share/locale/tr/LC_MESSAGES/aria2.mo
-share/locale/uk/LC_MESSAGES/aria2.mo
-share/locale/vi/LC_MESSAGES/aria2.mo
-share/locale/zh_CN/LC_MESSAGES/aria2.mo
-share/locale/zh_HK/LC_MESSAGES/aria2.mo
-share/locale/zh_TW/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ar/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/bg/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/bn/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ca/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/el/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/en@quot/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/fa/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/fil/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/he/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/hr/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/hu/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/id/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/kk/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ms/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/nn/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/oc/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/pt/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/sk/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/th/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/zh_HK/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/aria2.mo
diff --git a/net/aria2/options.mk b/net/aria2/options.mk
index dd002227054..78ea96fc20a 100644
--- a/net/aria2/options.mk
+++ b/net/aria2/options.mk
@@ -1,14 +1,23 @@
-# $NetBSD: options.mk,v 1.13 2012/04/25 15:59:59 drochner Exp $
+# $NetBSD: options.mk,v 1.14 2013/07/14 15:03:14 rodent Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.aria2
 
 PKG_OPTIONS_GROUP.ssl=		gnutls ssl
 PKG_OPTIONS_REQUIRED_GROUPS=	ssl
 
-PKG_SUPPORTED_OPTIONS=		sqlite
-PKG_SUGGESTED_OPTIONS=		ssl sqlite
+PKG_SUPPORTED_OPTIONS=		nls sqlite
+PKG_SUGGESTED_OPTIONS=		nls sqlite ssl
+PLIST_VARS=			nls
 
 .include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mnls)
+.include "../../devel/gettext-lib/buildlink3.mk"
+PLIST.nls=		yes
+.else
+CONFIGURE_ARGS+=	--disable-nls
+.endif
+
 ###
 ###	SSL/TLS implementation
 ###