summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam>2003-09-28 12:54:52 +0000
committerjlam <jlam>2003-09-28 12:54:52 +0000
commitb2cfc86036140494fcbc36124eefbcd9c3fd3c48 (patch)
treee8a80101bb5d7e62c96926aa4a164d29dde4db19 /x11
parent08cbb8399f7795abb3efd1bbd44f6c1f33f3a44a (diff)
downloadpkgsrc-b2cfc86036140494fcbc36124eefbcd9c3fd3c48.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 'x11')
-rw-r--r--x11/Xrender/buildlink3.mk15
1 files changed, 8 insertions, 7 deletions
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index 3036ee95b96..913294c317e 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/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(XRENDER_BUILDLINK3_MK)
-XRENDER_BUILDLINK3_MK= # defined
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
.include "../../mk/bsd.prefs.mk"
@@ -27,9 +25,7 @@ BUILDLINK_IS_BUILTIN.Xrender!= \
MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xrender=${BUILDLINK_IS_BUILTIN.Xrender}
.endif
-.if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[yY][eE][sS])
-_NEED_XRENDER= NO
-.else
+.if !defined(_NEED_XRENDER)
. if !empty(BUILDLINK_IS_BUILTIN.Xrender:M[nN][oO])
_NEED_XRENDER= YES
. else
@@ -53,6 +49,10 @@ _NEED_XRENDER!= \
${ECHO} "YES"; \
fi
. endif
+.endif # _NEED_XRENDER
+
+.if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[yY][eE][sS])
+_NEED_XRENDER= NO
.endif
.if ${_NEED_XRENDER} == "YES"
@@ -64,10 +64,11 @@ BUILDLINK_DEPENDS.Xrender= Xrender>=0.7
. if !empty(BUILDLINK_DEPTH:M\+)
BUILDLINK_DEPENDS+= Xrender
. endif
+. if !defined(BUILDLINK_PACKAGES) || empty(BUILDLINK_PACKAGES:MXrender)
BUILDLINK_PACKAGES+= Xrender
+. endif
.else
BUILDLINK_PREFIX.Xrender= ${X11BASE}
.endif
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
-.endif # XRENDER_BUILDLINK3_MK