2 files changed, 16 insertions, 10 deletions
diff --git a/textproc/tokyodystopia/Makefile b/textproc/tokyodystopia/Makefile
index 2a536206fab..f608ef1908f 100644
--- a/textproc/tokyodystopia/Makefile
+++ b/textproc/tokyodystopia/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/11/25 11:33:56 obache Exp $
+# $NetBSD: Makefile,v 1.13 2009/12/19 12:56:45 obache Exp $
 #
 
 DISTNAME=	tokyodystopia-0.9.13
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
@@ -17,15 +18,22 @@ USE_TOOLS+=	gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=	tokyodystopia.pc.in
 
-CONFIGURE_ARGS+=	--enable-zlib
-CONFIGURE_ARGS+=	--enable-bzip
-
 TEST_TARGET=	check
 
 BUILDLINK_API_DEPENDS.tokyocabinet+=	tokyocabinet>=1.4.29
 .include "../../databases/tokyocabinet/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../archivers/bzip2/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mbzip2)
+CONFIGURE_ARGS+=	--enable-bzip
+CONFIGURE_ARGS+=	--with-bzip=${BUILDLINK_PREFIX.bzip2}
+.else
+CONFIGURE_ARGS+=	--disable-bzip
+.endif
+.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mzlib)
+CONFIGURE_ARGS+=	--enable-zlib
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+.else
+CONFIGURE_ARGS+=	--disable-zlib
+.endif
 .include "../../mk/pthread.buildlink3.mk"
 PTHREAD_AUTO_VARS=	yes
 CONFIGURE_ARGS+=	--enable-pthread
diff --git a/textproc/tokyodystopia/buildlink3.mk b/textproc/tokyodystopia/buildlink3.mk
index 7b9fde7fc53..3aad0937c48 100644
--- a/textproc/tokyodystopia/buildlink3.mk
+++ b/textproc/tokyodystopia/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/21 05:35:38 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/12/19 12:56:45 obache Exp $
 
 BUILDLINK_TREE+=	tokyodystopia
 
@@ -6,12 +6,10 @@ BUILDLINK_TREE+=	tokyodystopia
 TOKYODYSTOPIA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tokyodystopia+=	tokyodystopia>=0.9.5
-BUILDLINK_ABI_DEPENDS.tokyodystopia+=	tokyodystopia>=0.9.9nb1
+BUILDLINK_ABI_DEPENDS.tokyodystopia+=	tokyodystopia>=0.9.13nb1
 BUILDLINK_PKGSRCDIR.tokyodystopia?=	../../textproc/tokyodystopia
 
 .include "../../databases/tokyocabinet/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../archivers/bzip2/buildlink3.mk"
 .endif # TOKYODYSTOPIA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-tokyodystopia