From 5aeb0750cfd9886aca1ce6903542158c1f6fd263 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 30 Sep 2003 00:42:32 +0000
Subject: Conform to latest buildlink3.mk guidelines using *_BUILDLINK3_MK
 guards to protect more parts of buildlink3.mk files against multiple
 inclusion.

---
 graphics/xpm/buildlink3.mk | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'graphics/xpm')

diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index ec6a4f72e24..26f177e07b3 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,11 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.5 2003/09/28 12:54:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2003/09/30 00:42:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !defined(XPM_BUILDLINK3_MK)
+XPM_BUILDLINK3_MK=	YES
+
 BUILDLINK_DEPENDS.xpm?=		xpm>=3.4k
 BUILDLINK_PKGSRCDIR.xpm?=	../../graphics/xpm
+.endif	# XPM_BUILDLINK3_MK
 
 BUILDLINK_CHECK_BUILTIN.xpm?=	NO
 
@@ -36,6 +40,10 @@ BUILDLINK_IS_BUILTIN.xpm=	NO
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.xpm=${BUILDLINK_IS_BUILTIN.xpm}
 .endif
 
+.if !empty(BUILDLINK_CHECK_BUILTIN.xpm:M[yY][eE][sS])
+_NEED_XPM=	NO
+.endif
+
 .if !defined(_NEED_XPM)
 .  if !empty(BUILDLINK_IS_BUILTIN.xpm:M[nN][oO])
 _NEED_XPM=	YES
@@ -62,21 +70,21 @@ _NEED_XPM!=	\
 		${ECHO} "YES";						\
 	fi
 .  endif
+MAKEFLAGS+=	_NEED_XPM="${_NEED_XPM}"
 .endif	# _NEED_XPM
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.xpm:M[yY][eE][sS])
-_NEED_XPM=	NO
-.endif
-
 .if ${_NEED_XPM} == "YES"
 .  if !empty(BUILDLINK_DEPTH:M\+)
 BUILDLINK_DEPENDS+=	xpm
 .  endif
-.  if !defined(BUILDLINK_PACKAGES) || empty(BUILDLINK_PACKAGES:Mxpm)
+.endif
+
+.if !defined(XPM_BUILDLINK3_MK)
+.  if ${_NEED_XPM} == "YES"
 BUILDLINK_PACKAGES+=	xpm
-.  endif
-.else
+.  else
 BUILDLINK_PREFIX.xpm=	${X11BASE}
-.endif
+.  endif
+.endif	# XPM_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
-- 
cgit v1.2.3