summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/aria2/Makefile6
-rw-r--r--net/aria2/options.mk3
2 files changed, 3 insertions, 6 deletions
diff --git a/net/aria2/Makefile b/net/aria2/Makefile
index 8515a280d0a..7f7cc9171f7 100644
--- a/net/aria2/Makefile
+++ b/net/aria2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2020/04/12 08:29:03 adam Exp $
+# $NetBSD: Makefile,v 1.84 2020/05/21 07:56:37 rillig Exp $
DISTNAME= aria2-1.35.0
PKGREVISION= 3
@@ -20,9 +20,9 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= bison msgfmt msgmerge xgettext
GNU_CONFIGURE= yes
+GNU_CONFIGURE_STRICT= no # has sub-configures
CONFIGURE_ARGS+= --enable-bittorrent
CONFIGURE_ARGS+= --enable-metalink
-CONFIGURE_ARGS+= --with-included-gettext=no
CONFIGURE_ARGS+= --with-libexpat
CONFIGURE_ARGS+= --without-libxml2
CONFIGURE_ARGS.SunOS+= --disable-epoll
@@ -37,8 +37,6 @@ USE_FEATURES= getopt_long snprintf
BUILDLINK_DEPMETHOD.cppunit= build
BUILDLINK_API_DEPENDS.cppunit+= cppunit>=1.10.2
. include "../../devel/cppunit/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-xmltest
.endif
.include "options.mk"
diff --git a/net/aria2/options.mk b/net/aria2/options.mk
index 4c01597be98..5dad12c2ca2 100644
--- a/net/aria2/options.mk
+++ b/net/aria2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2020/01/01 16:21:02 leot Exp $
+# $NetBSD: options.mk,v 1.19 2020/05/21 07:56:37 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.aria2
@@ -38,7 +38,6 @@ USE_TOOLS+= pkg-config
###
.if !empty(PKG_OPTIONS:Msqlite)
CONFIGURE_ARGS+= --with-sqlite3
-CONFIGURE_ARGS+= --with-sqlite3-prefix=${BUILDLINK_PREFIX.sqlite3}
. include "../../databases/sqlite3/buildlink3.mk"
USE_TOOLS+= pkg-config
.else