Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

3 files changed, 17 insertions, 19 deletions

diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index da1824db190..d7284f65891 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/04/17 03:04:18 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2002/08/25 21:52:28 jlam Exp $
 #
 
 DISTNAME=       XmHTML-1.1.7
@@ -10,12 +10,10 @@ MAINTAINER=	mellon@isc.org
 HOMEPAGE=	http://www.xs4all.nl/~ripley/XmHTML/
 COMMENT=	Motif Widget capable of displaying HTML 3.2 conforming text
 
-USE_X11BASE=		YES
-USE_GMAKE=		YES
-USE_LIBTOOL=		YES
-USE_BUILDLINK_ONLY=	YES
-
-MAKE_ENV+=	CC="${CC}"
+USE_X11BASE=	YES
+USE_GMAKE=	YES
+USE_LIBTOOL=	YES
+USE_BUILDLINK2=	YES
 
 do-install:
 	${LIBTOOL} ${LIBTOOL_FLAGS} ${INSTALL_DATA} \
@@ -23,9 +21,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/XmHTML
 	${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${PREFIX}/include/XmHTML
 
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/XmHTML/distinfo b/x11/XmHTML/distinfo
index c84bb47ca84..0acfcf413ca 100644
--- a/x11/XmHTML/distinfo
+++ b/x11/XmHTML/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/09/12 04:05:03 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:52:28 jlam Exp $
 
 SHA1 (XmHTML-1.1.7.tar.gz) = 4d8c82f88cf0700f6fc8898323d865b83d2a1ff1
 Size (XmHTML-1.1.7.tar.gz) = 1289780 bytes
-SHA1 (patch-aa) = 5ca0d5976c61e488207c731a80f7094fb5270850
+SHA1 (patch-aa) = 6008cf68c80010399071ddaed56c00dac2ce060c
 SHA1 (patch-ab) = 2f9e88b74913c735caf139646c2637a77a1232cd
 SHA1 (patch-ac) = cf48e4eb9887df7bd5d82615aa505939ba97bee8
 SHA1 (patch-ad) = d96f518c05f27fd7e7b4fc756467c6dca4a570ef
diff --git a/x11/XmHTML/patches/patch-aa b/x11/XmHTML/patches/patch-aa
index 88c49b9d660..fb02e9ff4f2 100644
--- a/x11/XmHTML/patches/patch-aa
+++ b/x11/XmHTML/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:29 jlam Exp $
 
 --- Makefile.orig	Thu Feb  4 00:43:27 1999
 +++ Makefile
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $
 -ZLIBINC       =
 -IMAGEINCLUDES = $(ZLIBINC)
 +ZLIBINC       = 
-+IMAGEINCLUDES = -I${BUILDLINK_DIR}/include $(ZLIBINC)
++IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC)
  
  # Image libraries
  # No need to add -lXpm if you need to include it with LIBS below
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $
  # Platform specific includes
  ifeq ($(PLATFORM),Motif)
 -PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include
-+PLATFORMINC=-I../../include/XmHTML -I${BUILDLINK_X11_DIR}/include
++PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include
  else
  ifeq ($(PLATFORM),gtk)
  PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $
  ifeq ($(PLATFORM),Motif)
  
 -LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${BUILDLINK_X11_DIR}/lib
++LIBDIR = -L${X11BASE}/lib
  # This is what is required under Linux (Motif 2.0.1).
  # Your mileage may vary.
 -LIBS   = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
@@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $
  ifeq($(PLATFORM),gtk)
  
 -LIBDIR = -L/usr/local/lib
-+LIBDIR = -L${BUILDLINK_X11_DIR}/lib
++LIBDIR = -L${X11BASE}/lib
  LIBS   = -lgdk -lgtk -lX11
  
  # endif gtk