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.

7 files changed, 37 insertions, 13 deletions

diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index ec13828fa6a..2698c8756ad 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/08/12 16:23:23 skrll Exp $
+# $NetBSD: Makefile,v 1.21 2002/08/25 18:40:03 jlam Exp $
 
 DISTNAME=	jade-1.2.1
 PKGREVISION=	4
@@ -17,7 +17,7 @@ PATCH_DIST_STRIP=	-p1
 
 CONFLICTS+=	sp-[0-9]*
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
@@ -49,7 +49,7 @@ post-install:
 # Installed by print/tex-jadetex
 	${RM} ${PREFIX}/share/sgml/jade/*jadetex.*
 
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # Turn off C++ optimization as there seem to be problems with the generated
diff --git a/textproc/jade/buildlink2.mk b/textproc/jade/buildlink2.mk
new file mode 100644
index 00000000000..1f30b866476
--- /dev/null
+++ b/textproc/jade/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:03 jlam Exp $
+
+.if !defined(JADE_BUILDLINK2_MK)
+JADE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		jade
+BUILDLINK_DEPENDS.jade?=	jade>=1.2.1
+BUILDLINK_PKGSRCDIR.jade?=	../../textproc/jade
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.jade=jade
+BUILDLINK_PREFIX.jade_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.jade=	include/sp/*
+BUILDLINK_FILES.jade+=	lib/libgrove.*
+BUILDLINK_FILES.jade+=	lib/libsp.*
+BUILDLINK_FILES.jade+=	lib/libspgrove.*
+BUILDLINK_FILES.jade+=	lib/libstyle.*
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	jade-buildlink
+
+jade-buildlink: _BUILDLINK_USE
+
+.endif	# JADE_BUILDLINK2_MK
diff --git a/textproc/jade/distinfo b/textproc/jade/distinfo
index 36d0015968f..85b49c7ccca 100644
--- a/textproc/jade/distinfo
+++ b/textproc/jade/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/08/12 16:23:23 skrll Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 18:40:04 jlam Exp $
 
 SHA1 (jade-1.2.1.tar.gz) = 4326e73b7f0b865515e1bb90c622a8b2aa6ecd06
 Size (jade-1.2.1.tar.gz) = 1092062 bytes
@@ -9,6 +9,6 @@ SHA1 (patch-ab) = 1742175ec89ea8e796b4e874a488225850cf78e1
 SHA1 (patch-ac) = c96ca44b40bbcc9c588dfe40045f4d386e32998d
 SHA1 (patch-ad) = 1afe17aeabda9f7f5c8531b09fb0af6085a8526f
 SHA1 (patch-ae) = a01bd39d4be17884f902a06c5c7324912935241f
-SHA1 (patch-af) = ef312d2f090bc32cdac60296d6b85940205da2a3
-SHA1 (patch-ag) = e6772fab67961e12ee8870a15763cde466b60636
+SHA1 (patch-af) = eb8c986dd4051cb183ccbb8d6aa97f1e801eab58
+SHA1 (patch-ag) = 593c1b6488fee22cd634fa10c90c89fd858c8981
 SHA1 (patch-ah) = d829ea273b99c06d83a6d7944ece12fbae513b6c
diff --git a/textproc/jade/patches/patch-ad b/textproc/jade/patches/patch-ad
index eeaedb9ca00..0a939261818 100644
--- a/textproc/jade/patches/patch-ad
+++ b/textproc/jade/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2002/05/20 18:18:03 cjep Exp $
+$NetBSD: patch-ad,v 1.5 2002/08/25 18:40:04 jlam Exp $
 --- Makefile.prog.in.orig	Wed Aug 29 15:59:35 2001
 +++ Makefile.prog.in	Wed Aug 29 16:01:13 2001
 @@ -13,7 +13,7 @@
diff --git a/textproc/jade/patches/patch-af b/textproc/jade/patches/patch-af
index 16148ce5709..3ef2977a951 100644
--- a/textproc/jade/patches/patch-af
+++ b/textproc/jade/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2001/10/14 12:19:16 tron Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 18:40:04 jlam Exp $
 
 --- spgrove/Makefile.sub.orig	Sun Oct 14 13:51:50 2001
 +++ spgrove/Makefile.sub	Sun Oct 14 13:58:15 2001
@@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.1 2001/10/14 12:19:16 tron Exp $
  LIB=spgrove
  INCLUDE=-I$(srcdir)/../grove
 -DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp $(LIB_THREADS)
-+DEPLIBS=-lm -L$(TOP)/grove -lgrove -L$(TOP)/lib -lsp $(LIB_THREADS)
++DEPLIBS=-lm $(TOP)/grove/libgrove.la $(TOP)/lib/libsp.la $(LIB_THREADS)
  OBJS=GroveApp.o GroveBuilder.o SdNode.o
  GENSRCS=grove_inst.cxx
  
diff --git a/textproc/jade/patches/patch-ag b/textproc/jade/patches/patch-ag
index 052fdafaf92..8d45b0e5935 100644
--- a/textproc/jade/patches/patch-ag
+++ b/textproc/jade/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2001/10/14 12:19:16 tron Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/25 18:40:04 jlam Exp $
 
 --- style/Makefile.sub.orig	Sun Oct 14 13:51:50 2001
 +++ style/Makefile.sub	Sun Oct 14 14:01:26 2001
@@ -6,8 +6,8 @@ $NetBSD: patch-ag,v 1.1 2001/10/14 12:19:16 tron Exp $
  LIB=style
 -DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp 	\
 -  -L$(TOP)/spgrove/.libs -lspgrove
-+DEPLIBS=-lm -L$(TOP)/grove -lgrove -L$(TOP)/lib -lsp 	\
-+  -L$(TOP)/spgrove -lspgrove
++DEPLIBS=-lm $(TOP)/grove/libgrove.la $(TOP)/lib/libsp.la 	\
++  $(TOP)/spgrove/libspgrove.la
  OBJS=Collector.o \
    DssslApp.o \
    DssslSpecEventHandler.o \
diff --git a/textproc/jade/patches/patch-ah b/textproc/jade/patches/patch-ah
index 70a49e7a0c6..1665bd25cdc 100644
--- a/textproc/jade/patches/patch-ah
+++ b/textproc/jade/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2002/08/13 10:49:05 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2002/08/25 18:40:05 jlam Exp $
 --- Makefile.lib.in.orig	Mon Aug 12 16:56:51 2002
 +++ Makefile.lib.in	Mon Aug 12 16:56:48 2002
 @@ -18,7 +18,7 @@