From 0f8edfef3c63676d5a1a468b147644db3131f20a Mon Sep 17 00:00:00 2001 From: xtraeme Date: Sun, 25 Apr 2004 00:50:46 +0000 Subject: bl3ify --- textproc/sablotron/Makefile | 10 +++++----- textproc/sablotron/buildlink3.mk | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 textproc/sablotron/buildlink3.mk (limited to 'textproc') diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index 91a1933dc57..d4d8259bd19 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/03/06 11:44:59 grant Exp $ +# $NetBSD: Makefile,v 1.28 2004/04/25 00:50:46 xtraeme Exp $ DISTNAME= Sablot-1.0.1 PKGNAME= ${DISTNAME:S/Sablot/sablotron/} @@ -11,7 +11,7 @@ COMMENT= XML toolkit implementing XSLT, DOM, and XPath BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_LANGUAGES= c c++ @@ -19,7 +19,7 @@ USE_LIBTOOL= YES # sablotron needs iconv but assumes it is in libc, so add what # buildlink2 finds. -LIBS+= ${_BLNK_ICONV_LDFLAGS} +LIBS+= ${_BUILDLINK_LDADD.iconv} .include "../../mk/compiler.mk" @@ -36,7 +36,7 @@ LIBS+= -lstdc++ -lm LIBS+= -lstdc++ -lm .endif -.include "../../converters/libiconv/buildlink2.mk" -.include "../../textproc/expat/buildlink2.mk" +.include "../../converters/libiconv/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/sablotron/buildlink3.mk b/textproc/sablotron/buildlink3.mk new file mode 100644 index 00000000000..50c8338451b --- /dev/null +++ b/textproc/sablotron/buildlink3.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 00:50:46 xtraeme Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +SABLOTRON_BUILDLINK3_MK:= ${SABLOTRON_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= sablotron +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsablotron} +BUILDLINK_PACKAGES+= sablotron + +.if !empty(SABLOTRON_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.sablotron+= sablotron>=1.0 +BUILDLINK_PKGSRCDIR.sablotron?= ../../textproc/sablotron +.endif # SABLOTRON_BUILDLINK3_MK + +.include "../../converters/libiconv/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3