diff options
| author | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
| commit | f22b8c42a61ccfbb462bf2b94c3486b7baec18bd (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /textproc/libxml | |
| parent | 71eaa77968f19e23d72fdc88e5f38259b8f7cdf3 (diff) | |
| download | pkgsrc-f22b8c42a61ccfbb462bf2b94c3486b7baec18bd.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'textproc/libxml')
| -rw-r--r-- | textproc/libxml/Makefile | 6 | ||||
| -rw-r--r-- | textproc/libxml/buildlink.mk | 2 | ||||
| -rw-r--r-- | textproc/libxml/buildlink2.mk | 22 |
3 files changed, 26 insertions, 4 deletions
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index cbcbdb69ea6..bdda8279c5b 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/02/03 22:29:11 skrll Exp $ +# $NetBSD: Makefile,v 1.23 2002/08/25 18:40:09 jlam Exp $ # DISTNAME= libxml-1.8.16 @@ -10,11 +10,11 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://xmlsoft.org/ COMMENT= XML parser, mainly used by the GNOME project -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -.include "../../devel/zlib/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libxml/buildlink.mk b/textproc/libxml/buildlink.mk index 85a5a28369e..f69f1dee9b8 100644 --- a/textproc/libxml/buildlink.mk +++ b/textproc/libxml/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.12 2002/07/14 02:09:38 rh Exp $ +# $NetBSD: buildlink.mk,v 1.13 2002/08/25 18:40:10 jlam Exp $ # # This Makefile fragment is included by packages that use libxml. # diff --git a/textproc/libxml/buildlink2.mk b/textproc/libxml/buildlink2.mk new file mode 100644 index 00000000000..aeb062f59c0 --- /dev/null +++ b/textproc/libxml/buildlink2.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:10 jlam Exp $ + +.if !defined(LIBXML_BUILDLINK2_MK) +LIBXML_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libxml +BUILDLINK_DEPENDS.libxml?= libxml>=1.8.11 +BUILDLINK_PKGSRCDIR.libxml?= ../../textproc/libxml + +EVAL_PREFIX+= BUILDLINK_PREFIX.libxml=libxml +BUILDLINK_PREFIX.libxml_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libxml= include/gnome-xml/* +BUILDLINK_FILES.libxml+= lib/libxml.* +BUILDLINK_FILES.libxml+= lib/xmlConf.sh + +.include "../../devel/zlib/buildlink2.mk" + +BUILDLINK_TARGETS+= libxml-buildlink + +libxml-buildlink: _BUILDLINK_USE + +.endif # LIBXML_BUILDLINK2_MK |