summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam>2003-09-30 00:42:32 +0000
committerjlam <jlam>2003-09-30 00:42:32 +0000
commit5aeb0750cfd9886aca1ce6903542158c1f6fd263 (patch)
tree7eef7de4759a72b61b44674205a52ebf7669a4dd /x11
parentb76d2796a892c09e8fe297f538f83b976d7e4f4d (diff)
downloadpkgsrc-5aeb0750cfd9886aca1ce6903542158c1f6fd263.tar.gz
Conform to latest buildlink3.mk guidelines using *_BUILDLINK3_MK guards
to protect more parts of buildlink3.mk files against multiple inclusion.
Diffstat (limited to 'x11')
-rw-r--r--x11/Xrender/buildlink3.mk28
1 files changed, 18 insertions, 10 deletions
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index 913294c317e..eb36403718d 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/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(XRENDER_BUILDLINK3_MK)
+XRENDER_BUILDLINK3_MK= YES
+
+. include "../../mk/bsd.prefs.mk"
BUILDLINK_DEPENDS.Xrender?= Xrender>=0.2
BUILDLINK_PKGSRCDIR.Xrender?= ../../x11/Xrender
+.endif # XRENDER_BUILDLINK3_MK
BUILDLINK_CHECK_BUILTIN.Xrender?= NO
@@ -25,6 +29,10 @@ 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
+.endif
+
.if !defined(_NEED_XRENDER)
. if !empty(BUILDLINK_IS_BUILTIN.Xrender:M[nN][oO])
_NEED_XRENDER= YES
@@ -49,12 +57,9 @@ _NEED_XRENDER!= \
${ECHO} "YES"; \
fi
. endif
+MAKEFLAGS+= _NEED_XRENDER="${_NEED_XRENDER}"
.endif # _NEED_XRENDER
-.if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[yY][eE][sS])
-_NEED_XRENDER= NO
-.endif
-
.if ${_NEED_XRENDER} == "YES"
#
# If we depend on the package, depend on the latest version with a library
@@ -64,11 +69,14 @@ BUILDLINK_DEPENDS.Xrender= Xrender>=0.7
. if !empty(BUILDLINK_DEPTH:M\+)
BUILDLINK_DEPENDS+= Xrender
. endif
-. if !defined(BUILDLINK_PACKAGES) || empty(BUILDLINK_PACKAGES:MXrender)
+.endif
+
+.if !defined(XRENDER_BUILDLINK3_MK)
+. if ${_NEED_XRENDER} == "YES"
BUILDLINK_PACKAGES+= Xrender
-. endif
-.else
+. else
BUILDLINK_PREFIX.Xrender= ${X11BASE}
-.endif
+. endif
+.endif # XRENDER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}