summaryrefslogtreecommitdiff
path: root/graphics/xpm
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2003-09-28 12:54:52 +0000
committerjlam <jlam@pkgsrc.org>2003-09-28 12:54:52 +0000
commitaaa25bfe593e524db2009866634e3d181e1a80cb (patch)
treee8a80101bb5d7e62c96926aa4a164d29dde4db19 /graphics/xpm
parent9e14aa4f473411217e5a42a3ddb9644608ebf06e (diff)
downloadpkgsrc-aaa25bfe593e524db2009866634e3d181e1a80cb.tar.gz
Rewrite buildlink3.mk files to match the updated buildlink3.mk template
in bsd.buildlink3.mk: the *_BUILDLINK3_MK multiple inclusion guards are removed and we ensure that things that should be defined only once really are defined only once by using section-specific or variable-specific guards.
Diffstat (limited to 'graphics/xpm')
-rw-r--r--graphics/xpm/buildlink3.mk15
1 files changed, 8 insertions, 7 deletions
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index c7db9041cba..ec6a4f72e24 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,7 +1,5 @@
-# $NetBSD: buildlink3.mk,v 1.4 2003/09/14 01:47:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2003/09/28 12:54:52 jlam Exp $
-.if !defined(XPM_BUILDLINK3_MK)
-XPM_BUILDLINK3_MK= # defined
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
.include "../../mk/bsd.prefs.mk"
@@ -38,9 +36,7 @@ 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
-.else
+.if !defined(_NEED_XPM)
. if !empty(BUILDLINK_IS_BUILTIN.xpm:M[nN][oO])
_NEED_XPM= YES
. else
@@ -66,16 +62,21 @@ _NEED_XPM!= \
${ECHO} "YES"; \
fi
. endif
+.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)
BUILDLINK_PACKAGES+= xpm
+. endif
.else
BUILDLINK_PREFIX.xpm= ${X11BASE}
.endif
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
-.endif # XPM_BUILDLINK3_MK