diff options
author | jlam <jlam> | 2003-09-28 12:54:52 +0000 |
---|---|---|
committer | jlam <jlam> | 2003-09-28 12:54:52 +0000 |
commit | b2cfc86036140494fcbc36124eefbcd9c3fd3c48 (patch) | |
tree | e8a80101bb5d7e62c96926aa4a164d29dde4db19 | |
parent | 08cbb8399f7795abb3efd1bbd44f6c1f33f3a44a (diff) | |
download | pkgsrc-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.
-rw-r--r-- | graphics/MesaLib/buildlink3.mk | 17 | ||||
-rw-r--r-- | graphics/glu/buildlink3.mk | 17 | ||||
-rw-r--r-- | graphics/xpm/buildlink3.mk | 15 | ||||
-rw-r--r-- | x11/Xrender/buildlink3.mk | 15 |
4 files changed, 34 insertions, 30 deletions
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk index 9a221586425..25e9455fc26 100644 --- a/graphics/MesaLib/buildlink3.mk +++ b/graphics/MesaLib/buildlink3.mk @@ -1,7 +1,5 @@ -# $NetBSD: buildlink3.mk,v 1.5 2003/09/14 01:47:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2003/09/28 12:54:52 jlam Exp $ -.if !defined(MESALIB_BUILDLINK3_MK) -MESALIB_BUILDLINK3_MK= # defined BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ .include "../../mk/bsd.prefs.mk" @@ -29,9 +27,7 @@ BUILDLINK_IS_BUILTIN.MesaLib!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.MesaLib=${BUILDLINK_IS_BUILTIN.MesaLib} .endif -.if !empty(BUILDLINK_CHECK_BUILTIN.MesaLib:M[yY][eE][sS]) -_NEED_MESALIB= NO -.else +.if !defined(_NEED_MESALIB) . if !empty(BUILDLINK_IS_BUILTIN.MesaLib:M[nN][oO]) _NEED_MESALIB= YES . else @@ -41,7 +37,7 @@ _NEED_MESALIB= YES # BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version # or if the built-in one is sufficient. # -. include "../../graphics/Mesa/version.mk" +. include "../../graphics/Mesa/version.mk" _MESALIB_PKG= MesaLib-${_MESA_VERSION} _MESALIB_DEPENDS= ${BUILDLINK_DEPENDS.MesaLib} _NEED_MESALIB!= \ @@ -51,6 +47,10 @@ _NEED_MESALIB!= \ ${ECHO} "YES"; \ fi . endif +.endif # _NEED_MESALIB + +.if !empty(BUILDLINK_CHECK_BUILTIN.MesaLib:M[yY][eE][sS]) +_NEED_MESALIB= NO .endif .if ${_NEED_MESALIB} == "YES" @@ -62,11 +62,12 @@ BUILDLINK_DEPENDS.MesaLib= MesaLib>=5.0 . if !empty(BUILDLINK_DEPTH:M\+) BUILDLINK_DEPENDS+= MesaLib . endif +. if !defined(BUILDLINK_PACKAGES) || empty(BUILDLINK_PACKAGES:MMesaLib) BUILDLINK_PACKAGES+= MesaLib BUILDLINK_CPPFLAGS.MesaLib= -DGLX_GLXEXT_LEGACY +. endif .else BUILDLINK_PREFIX.MesaLib= ${X11BASE} .endif BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} -.endif # MESALIB_BUILDLINK3_MK diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk index 16aaec0de80..dd2b37fa686 100644 --- a/graphics/glu/buildlink3.mk +++ b/graphics/glu/buildlink3.mk @@ -1,7 +1,5 @@ -# $NetBSD: buildlink3.mk,v 1.3 2003/09/14 01:47:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2003/09/28 12:54:52 jlam Exp $ -.if !defined(GLU_BUILDLINK3_MK) -GLU_BUILDLINK3_MK= # defined BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ .include "../../mk/bsd.prefs.mk" @@ -29,9 +27,7 @@ BUILDLINK_IS_BUILTIN.glu!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.glu=${BUILDLINK_IS_BUILTIN.glu} .endif -.if !empty(BUILDLINK_CHECK_BUILTIN.glu:M[yY][eE][sS]) -_NEED_GLU= NO -.else +.if !defined(_NEED_GLU) . if !empty(BUILDLINK_IS_BUILTIN.glu:M[nN][oO]) _NEED_GLU= YES . else @@ -41,7 +37,7 @@ _NEED_GLU= YES # BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version # or if the built-in one is sufficient. # -. include "../../graphics/Mesa/version.mk" +. include "../../graphics/Mesa/version.mk" _GLU_PKG= glu-${_MESA_VERSION} _GLU_DEPENDS= ${BUILDLINK_DEPENDS.glu} _NEED_GLU!= \ @@ -51,6 +47,10 @@ _NEED_GLU!= \ ${ECHO} "YES"; \ fi . endif +.endif # _NEED_GLU + +.if !empty(BUILDLINK_CHECK_BUILTIN.glu:M[yY][eE][sS]) +_NEED_GLU= NO .endif .if ${_NEED_GLU} == "YES" @@ -62,10 +62,11 @@ BUILDLINK_DEPENDS.glu= glu>=5.0 . if !empty(BUILDLINK_DEPTH:M\+) BUILDLINK_DEPENDS+= glu . endif +. if !defined(BUILDLINK_PACKAGES) || empty(BUILDLINK_PACKAGES:Mglu) BUILDLINK_PACKAGES+= glu +. endif .else BUILDLINK_PREFIX.glu= ${X11BASE} .endif BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} -.endif # GLU_BUILDLINK3_MK 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 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 |