@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2017/02/05 18:46:29 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2017/02/08 10:13:29 wiz Exp $
 
 DISTNAME=	dpkg_1.18.22
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -11,7 +11,7 @@
 COMMENT=	Package maintenance system for Debian
 LICENSE=	gnu-gpl-v2
 
-BUILD_DEPENDS+=		po4a>=0:../../textproc/po4a
+BUILD_DEPENDS+=		po4a-[0-9]*:../../textproc/po4a
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 BUILD_DEFS+=	VARBASE
@@ -20,18 +20,16 @@
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake msgfmt perl:run gtar:run pod2man
+TEST_TARGET=		check
 INCOMPAT_CURSES+=	NetBSD-[0-5].*-*
 
 REPLACE_PERL=		scripts/*.pl
 
-CONFIGURE_ARGS+=	--with-zlib
 CONFIGURE_ARGS+=	--disable-start-stop-daemon
 CONFIGURE_ARGS+=	--with-admindir=${VARBASE}/db/dpkg
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/dpkg
-# or uses GCC version specific warning flags unconditionally.
-CONFIGURE_ARGS+=	--disable-compiler-warnings
 
-CONFIGURE_ARGS.Darwin+=	--enable-linker-optimisations=no
+CONFIGURE_ARGS.Darwin+=	--enable-linker-optimizations=no
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"