[pkgsrc/trunk]: pkgsrc Match the buildlink3.mk guidelines set out in revision...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/04f93d6f6bf4
branches:  trunk
changeset: 462316:04f93d6f6bf4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Sep 30 10:18:57 2003 +0000

description:
Match the buildlink3.mk guidelines set out in revision 1.22 of
bsd.buildlink3.mk.

diffstat:

 graphics/MesaLib/buildlink3.mk   |   9 ++++-----
 graphics/freetype2/buildlink3.mk |  13 ++++++-------
 graphics/glu/buildlink3.mk       |  11 +++++------
 graphics/xpm/buildlink3.mk       |   9 ++++-----
 x11/Xrender/buildlink3.mk        |   9 ++++-----
 5 files changed, 23 insertions(+), 28 deletions(-)

diffs (145 lines):

diff -r f614257ad74b -r 04f93d6f6bf4 graphics/MesaLib/buildlink3.mk
--- a/graphics/MesaLib/buildlink3.mk    Tue Sep 30 10:17:30 2003 +0000
+++ b/graphics/MesaLib/buildlink3.mk    Tue Sep 30 10:18:57 2003 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.7 2003/09/30 00:42:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2003/09/30 10:18:57 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+MESALIB_BUILDLINK3_MK:=        ${MESALIB_BUILDLINK3_MK}+
 
-.if !defined(MESALIB_BUILDLINK3_MK)
-MESALIB_BUILDLINK3_MK= YES
-
+.if !empty(MESALIB_BUILDLINK3_MK:M\+)
 .  include "../../mk/bsd.prefs.mk"
 
 MESA_REQD?=            3.4.2
@@ -69,7 +68,7 @@
 .  endif
 .endif
 
-.if !defined(MESALIB_BUILDLINK3_MK)
+.if !empty(MESALIB_BUILDLINK3_MK:M\+)
 .  if ${_NEED_MESALIB} == "YES"
 BUILDLINK_PACKAGES+=           MesaLib
 BUILDLINK_CPPFLAGS.MesaLib=    -DGLX_GLXEXT_LEGACY
diff -r f614257ad74b -r 04f93d6f6bf4 graphics/freetype2/buildlink3.mk
--- a/graphics/freetype2/buildlink3.mk  Tue Sep 30 10:17:30 2003 +0000
+++ b/graphics/freetype2/buildlink3.mk  Tue Sep 30 10:18:57 2003 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.5 2003/09/30 00:42:32 jlam Exp $
-
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.6 2003/09/30 10:18:57 jlam Exp $
 
-.if !defined(FREETYPE2_BUILDLINK3_MK)
-FREETYPE2_BUILDLINK3_MK=       YES
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+FREETYPE2_BUILDLINK3_MK:=      ${FREETYPE2_BUILDLINK3_MK}+
 
+.if !empty(FREETYPE2_BUILDLINK3_MK:M\+)
 .  include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_DEPENDS.freetype2?=  freetype2>=2.0.1
@@ -73,7 +72,7 @@
 .  endif
 .endif
 
-.if !defined(FREETYPE2_BUILDLINK3_MK)
+.if !empty(FREETYPE2_BUILDLINK3_MK:M\+)
 .  if ${_NEED_FREETYPE2} == "YES"
 BUILDLINK_PACKAGES+=           freetype2
 .  else
@@ -81,4 +80,4 @@
 .  endif
 .endif # FREETYPE2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:C/\+$//}
diff -r f614257ad74b -r 04f93d6f6bf4 graphics/glu/buildlink3.mk
--- a/graphics/glu/buildlink3.mk        Tue Sep 30 10:17:30 2003 +0000
+++ b/graphics/glu/buildlink3.mk        Tue Sep 30 10:18:57 2003 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.5 2003/09/30 00:42:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2003/09/30 10:18:57 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+GLU_BUILDLINK3_MK:=    ${GLU_BUILDLINK3_MK}+
 
-.if !defined(GLU_BUILDLINK3_MK)
-GLU_BUILDLINK3_MK=     YES
-
+.if !empty(GLU_BUILDLINK3_MK:M\+)
 .  include "../../mk/bsd.prefs.mk"
 
 MESA_REQD?=            3.4.2
@@ -69,12 +68,12 @@
 .  endif
 .endif
 
-.if !defined(GLU_BUILDLINK3_MK)
+.if !empty(GLU_BUILDLINK3_MK:M\+)
 .  if ${_NEED_GLU} == "YES"
 BUILDLINK_PACKAGES+=   glu
 .  else
 BUILDLINK_PREFIX.glu=  ${X11BASE}
 .  endif
-.endif
+.endif # GLU_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:C/\+$//}
diff -r f614257ad74b -r 04f93d6f6bf4 graphics/xpm/buildlink3.mk
--- a/graphics/xpm/buildlink3.mk        Tue Sep 30 10:17:30 2003 +0000
+++ b/graphics/xpm/buildlink3.mk        Tue Sep 30 10:18:57 2003 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.6 2003/09/30 00:42:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2003/09/30 10:18:57 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+XPM_BUILDLINK3_MK:=    ${XPM_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !defined(XPM_BUILDLINK3_MK)
-XPM_BUILDLINK3_MK=     YES
-
+.if !empty(XPM_BUILDLINK3_MK:M\+)
 BUILDLINK_DEPENDS.xpm?=                xpm>=3.4k
 BUILDLINK_PKGSRCDIR.xpm?=      ../../graphics/xpm
 .endif # XPM_BUILDLINK3_MK
@@ -79,7 +78,7 @@
 .  endif
 .endif
 
-.if !defined(XPM_BUILDLINK3_MK)
+.if !empty(XPM_BUILDLINK3_MK:M\+)
 .  if ${_NEED_XPM} == "YES"
 BUILDLINK_PACKAGES+=   xpm
 .  else
diff -r f614257ad74b -r 04f93d6f6bf4 x11/Xrender/buildlink3.mk
--- a/x11/Xrender/buildlink3.mk Tue Sep 30 10:17:30 2003 +0000
+++ b/x11/Xrender/buildlink3.mk Tue Sep 30 10:18:57 2003 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.6 2003/09/30 00:42:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2003/09/30 10:18:57 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+XRENDER_BUILDLINK3_MK:=        ${XRENDER_BUILDLINK3_MK}+
 
-.if !defined(XRENDER_BUILDLINK3_MK)
-XRENDER_BUILDLINK3_MK= YES
-
+.if !empty(XRENDER_BUILDLINK3_MK:M\+)
 .  include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_DEPENDS.Xrender?=    Xrender>=0.2
@@ -71,7 +70,7 @@
 .  endif
 .endif
 
-.if !defined(XRENDER_BUILDLINK3_MK)
+.if !empty(XRENDER_BUILDLINK3_MK:M\+)
 .  if ${_NEED_XRENDER} == "YES"
 BUILDLINK_PACKAGES+=           Xrender
 .  else