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.

5 files changed, 57 insertions, 7 deletions

diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 60daf90961a..d150f932df3 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/08/30 11:11:24 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/25 18:39:24 jlam Exp $
 
 DISTNAME=       xpm-3.4k
 CATEGORIES=	graphics x11
@@ -9,12 +9,20 @@ MAINTAINER=	mycroft@netbsd.org
 HOMEPAGE=	http://www.inria.fr/koala/lehors/xpm.html
 COMMENT=	The X Pixmap library
 
-USE_IMAKE=		# defined
-CHECK_XPM=		# defined
+USE_BUILDLINK2=	# defined
+USE_IMAKE=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${HAVE_BUILTIN_XPM} != "NO"
+# Check if we got Xpm distributed with XFree86 4.x.
+.if exists(${X11BASE}/include/X11/xpm.h) && \
+    exists(${X11BASE}/lib/X11/config/X11.tmpl)
+_IS_BUILTIN_XPM!=	${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
+.else
+_IS_BUILTIN_XPM=	0
+.endif
+
+.if ${_IS_BUILTIN_XPM} != "0"
 IGNORE=		"The Xpm library is included in your X11 distribution."
 .endif
 
diff --git a/graphics/xpm/buildlink.mk b/graphics/xpm/buildlink.mk
index 0fbed366c5d..cb4d46a79c8 100644
--- a/graphics/xpm/buildlink.mk
+++ b/graphics/xpm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.11 2002/06/26 05:40:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.12 2002/08/25 18:39:25 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xpm.
 #
diff --git a/graphics/xpm/buildlink2.mk b/graphics/xpm/buildlink2.mk
new file mode 100644
index 00000000000..ab420b75f74
--- /dev/null
+++ b/graphics/xpm/buildlink2.mk
@@ -0,0 +1,42 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:25 jlam Exp $
+
+.if !defined(XPM_BUILDLINK2_MK)
+XPM_BUILDLINK2_MK=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_DEPENDS.xpm?=		xpm-3.4k
+BUILDLINK_PKGSRCDIR.xpm?=	../../graphics/xpm
+
+# Check if we got Xpm distributed with XFree86 4.x or if we need to
+# depend on the Xpm package.
+#
+_REQUIRE_BUILTIN_XPM?=	NO
+.if exists(${X11BASE}/include/X11/xpm.h) && \
+    exists(${X11BASE}/lib/X11/config/X11.tmpl)
+_IS_BUILTIN_XPM!=	${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
+.else
+_IS_BUILTIN_XPM=	0
+.endif
+.if (${_IS_BUILTIN_XPM} == "0") && (${_REQUIRE_BUILTIN_XPM} == "NO")
+_NEED_XPM=		YES
+.else
+_NEED_XPM=		NO
+.endif
+
+.if ${_NEED_XPM} == "YES"
+BUILDLINK_PACKAGES+=	xpm
+EVAL_PREFIX+=		BUILDLINK_PREFIX.xpm=xpm
+BUILDLINK_PREFIX.xpm_DEFAULT=	${X11PREFIX}
+.else
+BUILDLINK_PREFIX.xpm=	${X11BASE}
+.endif
+
+BUILDLINK_FILES.xpm+=	include/X11/xpm.h
+BUILDLINK_FILES.xpm+=	lib/libXpm.*
+
+BUILDLINK_TARGETS+=	xpm-buildlink
+
+xpm-buildlink: _BUILDLINK_USE
+
+.endif	# XPM_BUILDLINK2_MK
diff --git a/graphics/xpm/distinfo b/graphics/xpm/distinfo
index 463de0cf89d..175e00e71b0 100644
--- a/graphics/xpm/distinfo
+++ b/graphics/xpm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/05/24 14:57:31 agc Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 18:39:26 jlam Exp $
 
 SHA1 (xpm-3.4k.tar.gz) = a8eac19e5772bf7b3b177353686c1401fbf334bd
 Size (xpm-3.4k.tar.gz) = 148887 bytes
diff --git a/graphics/xpm/patches/patch-ad b/graphics/xpm/patches/patch-ad
index fdd9074af11..2e6bdd2ba23 100644
--- a/graphics/xpm/patches/patch-ad
+++ b/graphics/xpm/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2002/05/24 14:57:32 agc Exp $
+$NetBSD: patch-ad,v 1.4 2002/08/25 18:39:26 jlam Exp $
 
 --- lib/XpmI.h.orig	Thu Mar 19 20:51:00 1998
 +++ lib/XpmI.h	Mon May 13 00:33:23 2002