summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-03-05 19:25:06 +0000
committerjlam <jlam@pkgsrc.org>2004-03-05 19:25:06 +0000
commit9ff0e10340db36b9d69d9c894831dee901dd82e7 (patch)
treea3daf9a5fb572d8089372ce24f3f353d4bac8d47 /textproc
parent07634a03fa5b47f44a90b982d8294e55a2d3dd01 (diff)
downloadpkgsrc-9ff0e10340db36b9d69d9c894831dee901dd82e7.tar.gz
Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/aspell/buildlink3.mk18
-rw-r--r--textproc/enchant/buildlink3.mk17
-rw-r--r--textproc/gnome-spell/buildlink3.mk19
-rw-r--r--textproc/gtkspell/buildlink3.mk17
-rw-r--r--textproc/icu/buildlink3.mk8
-rw-r--r--textproc/intltool/buildlink3.mk24
-rw-r--r--textproc/libcroco/buildlink3.mk19
-rw-r--r--textproc/libpathan/buildlink3.mk17
-rw-r--r--textproc/libunicode/buildlink3.mk16
-rw-r--r--textproc/libxml/buildlink3.mk11
-rw-r--r--textproc/libxml2/buildlink3.mk13
-rw-r--r--textproc/libxslt/buildlink3.mk19
-rw-r--r--textproc/opensp/buildlink3.mk17
-rw-r--r--textproc/py-xml/buildlink3.mk13
-rw-r--r--textproc/scrollkeeper/buildlink3.mk17
-rw-r--r--textproc/xalan-c/buildlink3.mk17
-rw-r--r--textproc/xerces-c/buildlink3.mk19
-rw-r--r--textproc/xmlcatmgr/buildlink3.mk17
18 files changed, 137 insertions, 161 deletions
diff --git a/textproc/aspell/buildlink3.mk b/textproc/aspell/buildlink3.mk
index 608b9786149..89f5e098626 100644
--- a/textproc/aspell/buildlink3.mk
+++ b/textproc/aspell/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/15 14:55:09 wiz Exp $
-#
-# This Makefile fragment is included by packages that use aspell.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ASPELL_BUILDLINK3_MK:= ${ASPELL_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ ASPELL_BUILDLINK3_MK:= ${ASPELL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= aspell
.endif
-.if !empty(ASPELL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= aspell
-BUILDLINK_DEPENDS.aspell+= aspell>=0.50.3nb2
-BUILDLINK_PKGSRCDIR.aspell?= ../../textproc/aspell
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naspell}
+BUILDLINK_PACKAGES+= aspell
-.endif # ASPELL_BUILDLINK3_MK
+.if !empty(ASPELL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.aspell+= aspell>=0.50.3nb2
+BUILDLINK_PKGSRCDIR.aspell?= ../../textproc/aspell
+.endif # ASPELL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/enchant/buildlink3.mk b/textproc/enchant/buildlink3.mk
index 916738ff8a1..0b50abb2414 100644
--- a/textproc/enchant/buildlink3.mk
+++ b/textproc/enchant/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 23:25:38 wiz Exp $
-#
-# This Makefile fragment is included by packages that use enchant.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ENCHANT_BUILDLINK3_MK:= ${ENCHANT_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ ENCHANT_BUILDLINK3_MK:= ${ENCHANT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= enchant
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nenchant}
+BUILDLINK_PACKAGES+= enchant
+
.if !empty(ENCHANT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= enchant
-BUILDLINK_DEPENDS.enchant+= enchant>=1.1.3
-BUILDLINK_PKGSRCDIR.enchant?= ../../textproc/enchant
+BUILDLINK_DEPENDS.enchant+= enchant>=1.1.3
+BUILDLINK_PKGSRCDIR.enchant?= ../../textproc/enchant
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
-.endif # ENCHANT_BUILDLINK3_MK
+.endif # ENCHANT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk
index 12369f2d02b..0e911007a04 100644
--- a/textproc/gnome-spell/buildlink3.mk
+++ b/textproc/gnome-spell/buildlink3.mk
@@ -1,30 +1,27 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/14 22:46:55 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gnome-spell.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_SPELL_BUILDLINK3_MK:= ${GNOME_SPELL_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome-spell
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-spell}
+BUILDLINK_PACKAGES+= gnome-spell
+
.if !empty(GNOME_SPELL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-spell
BUILDLINK_DEPENDS.gnome-spell+= gnome-spell>=1.0.5
-BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell
+BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell
-.include "../../net/ORBit2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GNOME_SPELL_BUILDLINK3_MK
+.endif # GNOME_SPELL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk
index 35266fd4a19..28f0244ef12 100644
--- a/textproc/gtkspell/buildlink3.mk
+++ b/textproc/gtkspell/buildlink3.mk
@@ -1,23 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:04:39 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gtkspell.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKSPELL_BUILDLINK3_MK:= ${GTKSPELL_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gtkspell
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkspell}
+BUILDLINK_PACKAGES+= gtkspell
+
.if !empty(GTKSPELL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gtkspell
-BUILDLINK_DEPENDS.gtkspell+= gtkspell>=2.0.2nb6
-BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell
+BUILDLINK_DEPENDS.gtkspell+= gtkspell>=2.0.2nb6
+BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell
.include "../../textproc/aspell/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GTKSPELL_BUILDLINK3_MK
+.endif # GTKSPELL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk
index 2cb7b27f153..26ed0c997af 100644
--- a/textproc/icu/buildlink3.mk
+++ b/textproc/icu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ICU_BUILDLINK3_MK:= ${ICU_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ ICU_BUILDLINK3_MK:= ${ICU_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= icu
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nicu}
+BUILDLINK_PACKAGES+= icu
+
.if !empty(ICU_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= icu
BUILDLINK_DEPENDS.icu+= icu>=2.6
BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu
-.endif # ICU_BUILDLINK3_MK
+.endif # ICU_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk
index 62d3c7289e9..ae5b435a2b0 100644
--- a/textproc/intltool/buildlink3.mk
+++ b/textproc/intltool/buildlink3.mk
@@ -1,22 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:48:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use intltool.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
INTLTOOL_BUILDLINK3_MK:= ${INTLTOOL_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= intltool
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nintltool}
+BUILDLINK_PACKAGES+= intltool
+
.if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= intltool
-BUILDLINK_DEPENDS.intltool+= intltool>=0.30
-BUILDLINK_PKGSRCDIR.intltool?= ../../textproc/intltool
-BUILDLINK_DEPMETHOD.intltool?= build
+BUILDLINK_DEPENDS.intltool+= intltool>=0.30
+BUILDLINK_PKGSRCDIR.intltool?= ../../textproc/intltool
+BUILDLINK_DEPMETHOD.intltool?= build
USE_PERL5?= build
@@ -27,11 +24,12 @@ INTLTOOLIZE= ${BUILDLINK_PREFIX.intltool}/bin/intltoolize
_CONFIGURE_PREREQ+= intltoolize
+.PHONY: intltoolize
intltoolize:
${_PKG_SILENT}${_PKG_DEBUG} \
${ECHO} "=> Overriding intltool."
@cd ${WRKSRC} && ${INTLTOOLIZE} --force >/dev/null 2>&1
-.endif # INTLTOOL_BUILDLINK3_MK
+.endif # INTLTOOL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk
index 7d81a95668d..2981bbc2814 100644
--- a/textproc/libcroco/buildlink3.mk
+++ b/textproc/libcroco/buildlink3.mk
@@ -1,27 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 06:18:33 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libcroco.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCROCO_BUILDLINK3_MK:= ${LIBCROCO_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libcroco
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcroco}
+BUILDLINK_PACKAGES+= libcroco
+
.if !empty(LIBCROCO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libcroco
-BUILDLINK_DEPENDS.libcroco+= libcroco>=0.4.0
-BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco
+BUILDLINK_DEPENDS.libcroco+= libcroco>=0.4.0
+BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # LIBCROCO_BUILDLINK3_MK
+.endif # LIBCROCO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libpathan/buildlink3.mk b/textproc/libpathan/buildlink3.mk
index e681f70ae18..58de2f30f91 100644
--- a/textproc/libpathan/buildlink3.mk
+++ b/textproc/libpathan/buildlink3.mk
@@ -1,22 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/13 06:58:31 minskim Exp $
-#
-# This Makefile fragment is included by packages that use libpathan.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPATHAN_BUILDLINK3_MK:= ${LIBPATHAN_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libpathan
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpathan}
+BUILDLINK_PACKAGES+= libpathan
+
.if !empty(LIBPATHAN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libpathan
-BUILDLINK_DEPENDS.libpathan+= libpathan>=1.2.2
-BUILDLINK_PKGSRCDIR.libpathan?= ../../textproc/libpathan
+BUILDLINK_DEPENDS.libpathan+= libpathan>=1.2.2
+BUILDLINK_PKGSRCDIR.libpathan?= ../../textproc/libpathan
.include "../../textproc/xerces-c/buildlink3.mk"
-.endif # LIBPATHAN_BUILDLINK3_MK
+.endif # LIBPATHAN_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libunicode/buildlink3.mk b/textproc/libunicode/buildlink3.mk
index f903cd7b275..e89577abedd 100644
--- a/textproc/libunicode/buildlink3.mk
+++ b/textproc/libunicode/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/20 12:48:07 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use libunicode.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUNICODE_BUILDLINK3_MK:= ${LIBUNICODE_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libunicode
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibunicode}
+BUILDLINK_PACKAGES+= libunicode
+
.if !empty(LIBUNICODE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libunicode
BUILDLINK_DEPENDS.libunicode+= libunicode>=0.4
BUILDLINK_PKGSRCDIR.libunicode?= ../../textproc/libunicode
-
-.endif # LIBUNICODE_BUILDLINK3_MK
+.endif # LIBUNICODE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxml/buildlink3.mk b/textproc/libxml/buildlink3.mk
index 89c5dc0ea65..628e7296a92 100644
--- a/textproc/libxml/buildlink3.mk
+++ b/textproc/libxml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 12:27:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXML_BUILDLINK3_MK:= ${LIBXML_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ LIBXML_BUILDLINK3_MK:= ${LIBXML_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libxml
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml}
+BUILDLINK_PACKAGES+= libxml
+
.if !empty(LIBXML_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libxml
BUILDLINK_DEPENDS.libxml+= libxml>=1.8.11
BUILDLINK_PKGSRCDIR.libxml?= ../../textproc/libxml
-. include "../../devel/zlib/buildlink3.mk"
-.endif # LIBXML_BUILDLINK3_MK
+.include "../../devel/zlib/buildlink3.mk"
+
+.endif # LIBXML_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index 4c1251d1701..0eb1270b840 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libxml2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml2}
+BUILDLINK_PACKAGES+= libxml2
+
.if !empty(LIBXML2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libxml2
BUILDLINK_DEPENDS.libxml2+= libxml2>=2.6.2
BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2
-. include "../../converters/libiconv/buildlink3.mk"
-. include "../../devel/zlib/buildlink3.mk"
-.endif # LIBXML2_BUILDLINK3_MK
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
+.endif # LIBXML2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk
index 3aba17c6dbe..927f025ecba 100644
--- a/textproc/libxslt/buildlink3.mk
+++ b/textproc/libxslt/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/10 20:45:02 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libxslt.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXSLT_BUILDLINK3_MK:= ${LIBXSLT_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ LIBXSLT_BUILDLINK3_MK:= ${LIBXSLT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libxslt
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxslt}
+BUILDLINK_PACKAGES+= libxslt
+
.if !empty(LIBXSLT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libxslt
-BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.0
-BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt
+BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.0
+BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt
-.include "../../textproc/libxml2/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
-.endif # LIBXSLT_BUILDLINK3_MK
+.endif # LIBXSLT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk
index 282ce9caa01..29456094231 100644
--- a/textproc/opensp/buildlink3.mk
+++ b/textproc/opensp/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/22 21:59:22 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use opensp.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSP_BUILDLINK3_MK:= ${OPENSP_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ OPENSP_BUILDLINK3_MK:= ${OPENSP_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= opensp
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopensp}
+BUILDLINK_PACKAGES+= opensp
+
.if !empty(OPENSP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= opensp
-BUILDLINK_DEPENDS.opensp+= opensp>=1.5nb1
-BUILDLINK_PKGSRCDIR.opensp?= ../../textproc/opensp
+BUILDLINK_DEPENDS.opensp+= opensp>=1.5nb1
+BUILDLINK_PKGSRCDIR.opensp?= ../../textproc/opensp
PTHREAD_OPTS+= native
@@ -26,6 +23,6 @@ PTHREAD_OPTS+= native
. include "../../devel/unproven-pthreads/buildlink3.mk"
.endif
-.endif # OPENSP_BUILDLINK3_MK
+.endif # OPENSP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk
index 6df8abb7324..820d6b655e5 100644
--- a/textproc/py-xml/buildlink3.mk
+++ b/textproc/py-xml/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/23 12:36:25 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+
@@ -10,13 +9,15 @@ PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pyxml
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyxml}
+BUILDLINK_PACKAGES+= pyxml
+
.if !empty(PYXML_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pyxml
-BUILDLINK_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1
-BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml
+BUILDLINK_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1
+BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml
.include "../../textproc/expat/buildlink3.mk"
-.endif # PYXML_BUILDLINK3_MK
+.endif # PYXML_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/scrollkeeper/buildlink3.mk b/textproc/scrollkeeper/buildlink3.mk
index 310478f8f26..77a65f2c6d0 100644
--- a/textproc/scrollkeeper/buildlink3.mk
+++ b/textproc/scrollkeeper/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/15 21:39:14 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use scrollkeeper.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SCROLLKEEPER_BUILDLINK3_MK:= ${SCROLLKEEPER_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= scrollkeeper
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nscrollkeeper}
+BUILDLINK_PACKAGES+= scrollkeeper
+
.if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= scrollkeeper
BUILDLINK_DEPENDS.scrollkeeper+= scrollkeeper>=0.3.12nb2
BUILDLINK_PKGSRCDIR.scrollkeeper?= ../../textproc/scrollkeeper
@@ -45,6 +42,6 @@ scrollkeeper-buildlink-fake:
${CHMOD} +x ${_SK_FAKE_REBUILDDB}; \
fi
-.endif # SCROLLKEEPER_BUILDLINK3_MK
+.endif # SCROLLKEEPER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/xalan-c/buildlink3.mk b/textproc/xalan-c/buildlink3.mk
index 9068992f4ee..0a2ac62a402 100644
--- a/textproc/xalan-c/buildlink3.mk
+++ b/textproc/xalan-c/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:20:16 minskim Exp $
-#
-# This Makefile fragment is included by packages that use xalan-c.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XALAN_C_BUILDLINK3_MK:= ${XALAN_C_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ XALAN_C_BUILDLINK3_MK:= ${XALAN_C_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= xalan-c
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxalan-c}
+BUILDLINK_PACKAGES+= xalan-c
+
.if !empty(XALAN_C_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xalan-c
-BUILDLINK_DEPENDS.xalan-c+= xalan-c>=1.6
-BUILDLINK_PKGSRCDIR.xalan-c?= ../../textproc/xalan-c
+BUILDLINK_DEPENDS.xalan-c+= xalan-c>=1.6
+BUILDLINK_PKGSRCDIR.xalan-c?= ../../textproc/xalan-c
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/xerces-c/buildlink3.mk"
-.endif # XALAN_C_BUILDLINK3_MK
+.endif # XALAN_C_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk
index 909c266b455..3fe141e76f2 100644
--- a/textproc/xerces-c/buildlink3.mk
+++ b/textproc/xerces-c/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:06:04 minskim Exp $
-#
-# This Makefile fragment is included by packages that use xerces-c.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XERCES_C_BUILDLINK3_MK:= ${XERCES_C_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= xerces-c
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxerces-c}
+BUILDLINK_PACKAGES+= xerces-c
+
.if !empty(XERCES_C_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xerces-c
-BUILDLINK_DEPENDS.xerces-c+= xerces-c>=2.3.0
-BUILDLINK_PKGSRCDIR.xerces-c?= ../../textproc/xerces-c
+BUILDLINK_DEPENDS.xerces-c+= xerces-c>=2.3.0
+BUILDLINK_PKGSRCDIR.xerces-c?= ../../textproc/xerces-c
.include "../../converters/libiconv/buildlink3.mk"
-.endif # XERCES_C_BUILDLINK3_MK
+.endif # XERCES_C_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk
index 22af994fea4..1f6894d9a2e 100644
--- a/textproc/xmlcatmgr/buildlink3.mk
+++ b/textproc/xmlcatmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 10:11:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
#
# This Makefile fragment is included by packages that use xmlcatmgr.
#
@@ -12,15 +12,17 @@
# type of tool they are.
#
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XMLCATMGR_BUILDLINK3_MK:= ${XMLCATMGR_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= xmlcatmgr
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmlcatmgr}
+BUILDLINK_PACKAGES+= xmlcatmgr
+
.if !empty(XMLCATMGR_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xmlcatmgr
BUILDLINK_DEPENDS.xmlcatmgr+= xmlcatmgr>=0.2
BUILDLINK_RECOMMENDED.xmlcatmgr+= xmlcatmgr>=2.0beta1
BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr
@@ -29,13 +31,14 @@ BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr
XMLCATMGR= ${BUILDLINK_PREFIX.xmlcatmgr}/bin/xmlcatmgr
# System-wide configurable catalogs.
-. if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr)
+.if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr)
SGML_DEFAULT_CATALOG= ${PKG_SYSCONFDIR.xmlcatmgr}/sgml/catalog
XML_DEFAULT_CATALOG= ${PKG_SYSCONFDIR.xmlcatmgr}/xml/catalog
-. else
+.else
SGML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/sgml/catalog
XML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/xml/catalog
-. endif
-.endif # XMLCATMGR_BUILDLINK3_MK
+.endif
+
+.endif # XMLCATMGR_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}