Sun Jul 14 15:03:14 2013 UTC ()
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.


(rodent)
diff -r1.44 -r1.45 pkgsrc/net/aria2/Makefile
diff -r1.17 -r1.18 pkgsrc/net/aria2/PLIST
diff -r1.13 -r1.14 pkgsrc/net/aria2/options.mk
cvs diff -r1.44 -r1.45 pkgsrc/net/aria2/Makefile (expand / switch to unified diff)

--- pkgsrc/net/aria2/Makefile 2013/06/09 02:11:34 1.44
+++ pkgsrc/net/aria2/Makefile 2013/07/14 15:03:14 1.45
@@ -1,45 +1,48 @@ @@ -1,45 +1,48 @@
1# $NetBSD: Makefile,v 1.44 2013/06/09 02:11:34 ryoon Exp $ 1# $NetBSD: Makefile,v 1.45 2013/07/14 15:03:14 rodent Exp $
2# 2#
3 3
4DISTNAME= aria2-1.17.1 4DISTNAME= aria2-1.17.1
 5PKGREVISION= 1
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aria2/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aria2/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://aria2.sourceforge.net/ 11HOMEPAGE= http://aria2.sourceforge.net/
11COMMENT= Multi-threaded, multi-protocol, flexible download accelerator 12COMMENT= Multi-threaded, multi-protocol, flexible download accelerator
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
 16USE_LIBTOOL= yes
15USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
 18USE_TOOLS+= bison msgfmt msgmerge xgettext
16USE_PKGLOCALEDIR= yes 19USE_PKGLOCALEDIR= yes
17 20
18CONFIGURE_ARGS+= --enable-bittorrent 21CONFIGURE_ARGS+= --enable-bittorrent
19CONFIGURE_ARGS+= --enable-metalink 22CONFIGURE_ARGS+= --enable-metalink
20CONFIGURE_ARGS+= --with-included-gettext=no 23CONFIGURE_ARGS+= --with-included-gettext=no
21CONFIGURE_ARGS+= --with-libexpat 24CONFIGURE_ARGS+= --with-libexpat
22CONFIGURE_ARGS+= --without-libxml2 25CONFIGURE_ARGS+= --without-libxml2
23 26
24GCC_REQD+= 3.4 27GCC_REQD+= 3.4
25TEST_TARGET= check 28TEST_TARGET= check
26USE_FEATURES= getopt_long snprintf 29USE_FEATURES= getopt_long snprintf
27 30
28.include "../../mk/compiler.mk" 31.include "../../mk/compiler.mk"
29 32
30.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss]) 33.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
31BUILDLINK_DEPMETHOD.cppunit= build 34BUILDLINK_DEPMETHOD.cppunit= build
32BUILDLINK_API_DEPENDS.cppunit+= cppunit>=1.10.2 35BUILDLINK_API_DEPENDS.cppunit+= cppunit>=1.10.2
33. include "../../devel/cppunit/buildlink3.mk" 36. include "../../devel/cppunit/buildlink3.mk"
34.else 37.else
35CONFIGURE_ARGS+= --disable-xmltest 38CONFIGURE_ARGS+= --disable-xmltest
36.endif 39.endif
37 40
38.include "options.mk" 41.include "options.mk"
39 42
40.include "../../devel/zlib/buildlink3.mk" 43.include "../../devel/zlib/buildlink3.mk"
41.include "../../devel/gettext-lib/buildlink3.mk" 
42.include "../../net/libcares/buildlink3.mk" 44.include "../../net/libcares/buildlink3.mk"
43.include "../../textproc/expat/buildlink3.mk" 45.include "../../textproc/expat/buildlink3.mk"
44 46.include "../../converters/libiconv/buildlink3.mk"
 47.include "../../mk/pthread.buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/net/aria2/PLIST (expand / switch to unified diff)

--- pkgsrc/net/aria2/PLIST 2013/06/09 02:11:34 1.17
+++ pkgsrc/net/aria2/PLIST 2013/07/14 15:03:14 1.18
@@ -1,54 +1,54 @@ @@ -1,54 +1,54 @@
1@comment $NetBSD: PLIST,v 1.17 2013/06/09 02:11:34 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.18 2013/07/14 15:03:14 rodent Exp $
2bin/aria2c 2bin/aria2c
3man/man1/aria2c.1 3man/man1/aria2c.1
4man/pt/man1/aria2c.1 4man/pt/man1/aria2c.1
5man/ru/man1/aria2c.1 5man/ru/man1/aria2c.1
6share/doc/aria2/README 6share/doc/aria2/README
7share/doc/aria2/README.rst 7share/doc/aria2/README.rst
8share/doc/aria2/bash_completion/README.txt 8share/doc/aria2/bash_completion/README.txt
9share/doc/aria2/bash_completion/aria2c 9share/doc/aria2/bash_completion/aria2c
10share/doc/aria2/xmlrpc/README.txt 10share/doc/aria2/xmlrpc/README.txt
11share/doc/aria2/xmlrpc/aria2mon 11share/doc/aria2/xmlrpc/aria2mon
12share/doc/aria2/xmlrpc/aria2rpc 12share/doc/aria2/xmlrpc/aria2rpc
13share/locale/ar/LC_MESSAGES/aria2.mo 13${PLIST.nls}share/locale/ar/LC_MESSAGES/aria2.mo
14share/locale/bg/LC_MESSAGES/aria2.mo 14${PLIST.nls}share/locale/bg/LC_MESSAGES/aria2.mo
15share/locale/bn/LC_MESSAGES/aria2.mo 15${PLIST.nls}share/locale/bn/LC_MESSAGES/aria2.mo
16share/locale/ca/LC_MESSAGES/aria2.mo 16${PLIST.nls}share/locale/ca/LC_MESSAGES/aria2.mo
17share/locale/da/LC_MESSAGES/aria2.mo 17${PLIST.nls}share/locale/da/LC_MESSAGES/aria2.mo
18share/locale/de/LC_MESSAGES/aria2.mo 18${PLIST.nls}share/locale/de/LC_MESSAGES/aria2.mo
19share/locale/el/LC_MESSAGES/aria2.mo 19${PLIST.nls}share/locale/el/LC_MESSAGES/aria2.mo
20share/locale/en@boldquot/LC_MESSAGES/aria2.mo 20${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/aria2.mo
21share/locale/en@quot/LC_MESSAGES/aria2.mo 21${PLIST.nls}share/locale/en@quot/LC_MESSAGES/aria2.mo
22share/locale/es/LC_MESSAGES/aria2.mo 22${PLIST.nls}share/locale/es/LC_MESSAGES/aria2.mo
23share/locale/fa/LC_MESSAGES/aria2.mo 23${PLIST.nls}share/locale/fa/LC_MESSAGES/aria2.mo
24share/locale/fi/LC_MESSAGES/aria2.mo 24${PLIST.nls}share/locale/fi/LC_MESSAGES/aria2.mo
25share/locale/fil/LC_MESSAGES/aria2.mo 25${PLIST.nls}share/locale/fil/LC_MESSAGES/aria2.mo
26share/locale/fr/LC_MESSAGES/aria2.mo 26${PLIST.nls}share/locale/fr/LC_MESSAGES/aria2.mo
27share/locale/he/LC_MESSAGES/aria2.mo 27${PLIST.nls}share/locale/he/LC_MESSAGES/aria2.mo
28share/locale/hr/LC_MESSAGES/aria2.mo 28${PLIST.nls}share/locale/hr/LC_MESSAGES/aria2.mo
29share/locale/hu/LC_MESSAGES/aria2.mo 29${PLIST.nls}share/locale/hu/LC_MESSAGES/aria2.mo
30share/locale/id/LC_MESSAGES/aria2.mo 30${PLIST.nls}share/locale/id/LC_MESSAGES/aria2.mo
31share/locale/it/LC_MESSAGES/aria2.mo 31${PLIST.nls}share/locale/it/LC_MESSAGES/aria2.mo
32share/locale/ja/LC_MESSAGES/aria2.mo 32${PLIST.nls}share/locale/ja/LC_MESSAGES/aria2.mo
33share/locale/kk/LC_MESSAGES/aria2.mo 33${PLIST.nls}share/locale/kk/LC_MESSAGES/aria2.mo
34share/locale/ko/LC_MESSAGES/aria2.mo 34${PLIST.nls}share/locale/ko/LC_MESSAGES/aria2.mo
35share/locale/ms/LC_MESSAGES/aria2.mo 35${PLIST.nls}share/locale/ms/LC_MESSAGES/aria2.mo
36share/locale/nb/LC_MESSAGES/aria2.mo 36${PLIST.nls}share/locale/nb/LC_MESSAGES/aria2.mo
37share/locale/nl/LC_MESSAGES/aria2.mo 37${PLIST.nls}share/locale/nl/LC_MESSAGES/aria2.mo
38share/locale/nn/LC_MESSAGES/aria2.mo 38${PLIST.nls}share/locale/nn/LC_MESSAGES/aria2.mo
39share/locale/oc/LC_MESSAGES/aria2.mo 39${PLIST.nls}share/locale/oc/LC_MESSAGES/aria2.mo
40share/locale/pl/LC_MESSAGES/aria2.mo 40${PLIST.nls}share/locale/pl/LC_MESSAGES/aria2.mo
41share/locale/pt/LC_MESSAGES/aria2.mo 41${PLIST.nls}share/locale/pt/LC_MESSAGES/aria2.mo
42share/locale/pt_BR/LC_MESSAGES/aria2.mo 42${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/aria2.mo
43share/locale/ro/LC_MESSAGES/aria2.mo 43${PLIST.nls}share/locale/ro/LC_MESSAGES/aria2.mo
44share/locale/ru/LC_MESSAGES/aria2.mo 44${PLIST.nls}share/locale/ru/LC_MESSAGES/aria2.mo
45share/locale/sk/LC_MESSAGES/aria2.mo 45${PLIST.nls}share/locale/sk/LC_MESSAGES/aria2.mo
46share/locale/sr/LC_MESSAGES/aria2.mo 46${PLIST.nls}share/locale/sr/LC_MESSAGES/aria2.mo
47share/locale/sv/LC_MESSAGES/aria2.mo 47${PLIST.nls}share/locale/sv/LC_MESSAGES/aria2.mo
48share/locale/th/LC_MESSAGES/aria2.mo 48${PLIST.nls}share/locale/th/LC_MESSAGES/aria2.mo
49share/locale/tr/LC_MESSAGES/aria2.mo 49${PLIST.nls}share/locale/tr/LC_MESSAGES/aria2.mo
50share/locale/uk/LC_MESSAGES/aria2.mo 50${PLIST.nls}share/locale/uk/LC_MESSAGES/aria2.mo
51share/locale/vi/LC_MESSAGES/aria2.mo 51${PLIST.nls}share/locale/vi/LC_MESSAGES/aria2.mo
52share/locale/zh_CN/LC_MESSAGES/aria2.mo 52${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/aria2.mo
53share/locale/zh_HK/LC_MESSAGES/aria2.mo 53${PLIST.nls}share/locale/zh_HK/LC_MESSAGES/aria2.mo
54share/locale/zh_TW/LC_MESSAGES/aria2.mo 54${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/aria2.mo
cvs diff -r1.13 -r1.14 pkgsrc/net/aria2/options.mk (expand / switch to unified diff)

--- pkgsrc/net/aria2/options.mk 2012/04/25 15:59:59 1.13
+++ pkgsrc/net/aria2/options.mk 2013/07/14 15:03:14 1.14
@@ -1,24 +1,33 @@ @@ -1,24 +1,33 @@
1# $NetBSD: options.mk,v 1.13 2012/04/25 15:59:59 drochner Exp $ 1# $NetBSD: options.mk,v 1.14 2013/07/14 15:03:14 rodent Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.aria2 3PKG_OPTIONS_VAR= PKG_OPTIONS.aria2
4 4
5PKG_OPTIONS_GROUP.ssl= gnutls ssl 5PKG_OPTIONS_GROUP.ssl= gnutls ssl
6PKG_OPTIONS_REQUIRED_GROUPS= ssl 6PKG_OPTIONS_REQUIRED_GROUPS= ssl
7 7
8PKG_SUPPORTED_OPTIONS= sqlite 8PKG_SUPPORTED_OPTIONS= nls sqlite
9PKG_SUGGESTED_OPTIONS= ssl sqlite 9PKG_SUGGESTED_OPTIONS= nls sqlite ssl
 10PLIST_VARS= nls
10 11
11.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
 13
 14.if !empty(PKG_OPTIONS:Mnls)
 15.include "../../devel/gettext-lib/buildlink3.mk"
 16PLIST.nls= yes
 17.else
 18CONFIGURE_ARGS+= --disable-nls
 19.endif
 20
12### 21###
13### SSL/TLS implementation 22### SSL/TLS implementation
14### 23###
15.if !empty(PKG_OPTIONS:Mssl) 24.if !empty(PKG_OPTIONS:Mssl)
16CONFIGURE_ARGS+= --with-openssl 25CONFIGURE_ARGS+= --with-openssl
17CONFIGURE_ARGS+= --with-gnutls=no 26CONFIGURE_ARGS+= --with-gnutls=no
18. include "../../security/openssl/buildlink3.mk" 27. include "../../security/openssl/buildlink3.mk"
19.else 28.else
20CONFIGURE_ARGS+= --with-gnutls 29CONFIGURE_ARGS+= --with-gnutls
21CONFIGURE_ARGS+= --with-openssl=no 30CONFIGURE_ARGS+= --with-openssl=no
22. include "../../security/gnutls/buildlink3.mk" 31. include "../../security/gnutls/buildlink3.mk"
23USE_TOOLS+= pkg-config 32USE_TOOLS+= pkg-config
24.endif 33.endif