Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk.

13 files changed, 72 insertions, 96 deletions

diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 95f1fa70f80..f8ab82733bb 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.8 2003/09/30 10:18:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
 
-.if !empty(MESALIB_BUILDLINK3_MK:M\+)
+.if !empty(MESALIB_BUILDLINK3_MK:M+)
 .  include "../../mk/bsd.prefs.mk"
 
 MESA_REQD?=		3.4.2
@@ -63,12 +63,12 @@ MAKEFLAGS+=	_NEED_MESALIB="${_NEED_MESALIB}"
 # major number bump.
 #
 BUILDLINK_DEPENDS.MesaLib=	MesaLib>=5.0
-.  if !empty(BUILDLINK_DEPTH:M\+)
+.  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=		MesaLib
 .  endif
 .endif
 
-.if !empty(MESALIB_BUILDLINK3_MK:M\+)
+.if !empty(MESALIB_BUILDLINK3_MK:M+)
 .  if ${_NEED_MESALIB} == "YES"
 BUILDLINK_PACKAGES+=		MesaLib
 BUILDLINK_CPPFLAGS.MesaLib=	-DGLX_GLXEXT_LEGACY
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index fbb3c3b54d8..4ca7dc72ffc 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_IMAGE_BUILDLINK3_MK:=	${SDL_IMAGE_BUILDLINK3_MK}+
 
-.if !empty(SDL_IMAGE_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.SDL_image?=	SDL_image>=1.2.2nb2
-BUILDLINK_PKGSRCDIR.SDL_image?=	../../graphics/SDL_image
-.endif	# SDL_IMAGE_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	SDL_image
 .endif
 
-.if !empty(SDL_IMAGE_BUILDLINK3_MK:M\+)
+.if !empty(SDL_IMAGE_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		SDL_image
+BUILDLINK_DEPENDS.SDL_image?=	SDL_image>=1.2.2nb2
+BUILDLINK_PKGSRCDIR.SDL_image?=	../../graphics/SDL_image
 BUILDLINK_INCDIRS.SDL_image?=	include/SDL
 
 .  include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk
index ac1a61750cc..9d150dc8397 100644
--- a/graphics/aalib-x11/buildlink3.mk
+++ b/graphics/aalib-x11/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AALIB_X11_BUILDLINK3_MK:=	${AALIB_X11_BUILDLINK3_MK}+
 
-.if !empty(AALIB_X11_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.aalib-x11?=	aalib-x11>=1.4.0.4nb1
-BUILDLINK_PKGSRCDIR.aalib-x11?=	../../graphics/aalib-x11
-.endif # AALIB_X11_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=		aalib-x11
 .endif
 
-.if !empty(AALIB_X11_BUILDLINK3_MK:M\+)
+.if !empty(AALIB_X11_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		aalib-x11
+BUILDLINK_DEPENDS.aalib-x11?=	aalib-x11>=1.4.0.4nb1
+BUILDLINK_PKGSRCDIR.aalib-x11?=	../../graphics/aalib-x11
 
 BUILDLINK_FILES.aalib-x11=	include/aalib-x11.h
 BUILDLINK_TRANSFORM.aalib-x11+=	-e "s|/aalib-x11.h|/aalib.h|g"
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index cc74e905284..455bbebb2b5 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE_BUILDLINK3_MK:=	${FREETYPE_BUILDLINK3_MK}+
 
-.if !empty(FREETYPE_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.freetype?=	freetype-lib>=1.3.1nb1
-BUILDLINK_PKGSRCDIR.freetype?=	../../graphics/freetype-lib
-.endif	# FREETYPE_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	freetype
 .endif
 
-.if !empty(FREETYPE_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	freetype
+.if !empty(FREETYPE_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		freetype
+BUILDLINK_DEPENDS.freetype?=	freetype-lib>=1.3.1nb1
+BUILDLINK_PKGSRCDIR.freetype?=	../../graphics/freetype-lib
 
 .  include "../../devel/gettext-lib/buildlink3.mk"
 .endif	# FREETYPE_BUILDLINK3_MK
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index 4433b25f6ea..d007badf629 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.6 2003/09/30 10:18:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
 
-.if !empty(FREETYPE2_BUILDLINK3_MK:M\+)
+.if !empty(FREETYPE2_BUILDLINK3_MK:M+)
 .  include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_DEPENDS.freetype2?=	freetype2>=2.0.1
@@ -67,17 +67,20 @@ MAKEFLAGS+=	_NEED_FREETYPE2="${_NEED_FREETYPE2}"
 # major number bump.
 #
 BUILDLINK_DEPENDS.freetype2=	freetype2>=2.1.3
-.  if !empty(BUILDLINK_DEPTH:M\+)
+.  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=		freetype2
 .  endif
 .endif
 
-.if !empty(FREETYPE2_BUILDLINK3_MK:M\+)
+.if !empty(FREETYPE2_BUILDLINK3_MK:M+)
 .  if ${_NEED_FREETYPE2} == "YES"
 BUILDLINK_PACKAGES+=		freetype2
 .  else
 BUILDLINK_PREFIX.freetype2=	${X11BASE}
 .  endif
+
+FREETYPE_CONFIG?=	${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
+CONFIGURE_ENV+=		FREETYPE_CONFIG="${FREETYPE_CONFIG}"
 .endif	# FREETYPE2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:C/\+$//}
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 865d959f18a..dbe5ff44e0d 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GD_BUILDLINK3_MK:=	${GD_BUILDLINK3_MK}+
 
-.if !empty(GD_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.gd?=		gd>=2.0.15
-BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd
-.endif	# GD_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gd
 .endif
 
-.if !empty(GD_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	gd
+.if !empty(GD_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		gd
+BUILDLINK_DEPENDS.gd?=		gd>=2.0.15
+BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd
 
 .  include "../../devel/zlib/buildlink3.mk"
 .  include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 4be30c194a7..b69b0fe22d8 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.6 2003/09/30 10:18:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
 
-.if !empty(GLU_BUILDLINK3_MK:M\+)
+.if !empty(GLU_BUILDLINK3_MK:M+)
 .  include "../../mk/bsd.prefs.mk"
 
 MESA_REQD?=		3.4.2
@@ -62,13 +62,13 @@ MAKEFLAGS+=	_NEED_GLU="${_NEED_GLU}"
 # If we depend on the package, depend on the latest version with a library
 # major number bump.
 #
-BUILDLINK_DEPENDS.glu=	glu>=5.0
-.  if !empty(BUILDLINK_DEPTH:M\+)
+BUILDLINK_DEPENDS.glu=	glu>=5.0.2nb3
+.  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	glu
 .  endif
 .endif
 
-.if !empty(GLU_BUILDLINK3_MK:M\+)
+.if !empty(GLU_BUILDLINK3_MK:M+)
 .  if ${_NEED_GLU} == "YES"
 BUILDLINK_PACKAGES+=	glu
 .  else
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index 75ae012bf87..3af156c071c 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLUT_BUILDLINK3_MK:=	${GLUT_BUILDLINK3_MK}+
 
-.if !empty(GLUT_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.glut?=	glut>=${MESA_VERSION}
-BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
-.endif	# GLUT_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	glut
 .endif
 
-.if !empty(GLUT_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	glut
+.if !empty(GLUT_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		glut
+BUILDLINK_DEPENDS.glut?=	glut>=${MESA_VERSION}
+BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
 
 .  include "../../graphics/MesaLib/buildlink3.mk"
 .endif	# GLUT_BUILDLINK3_MK
diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk
index 16649eb7959..73a01491479 100644
--- a/graphics/jpeg/buildlink3.mk
+++ b/graphics/jpeg/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JPEG_BUILDLINK3_MK:=	${JPEG_BUILDLINK3_MK}+
 
-.if !empty(JPEG_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.jpeg?=	jpeg>=6b
-BUILDLINK_PKGSRCDIR.jpeg?=	../../graphics/jpeg
-.endif	# JPEG_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	jpeg
 .endif
 
-.if !empty(JPEG_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	jpeg
+.if !empty(JPEG_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		jpeg
+BUILDLINK_DEPENDS.jpeg?=	jpeg>=6b
+BUILDLINK_PKGSRCDIR.jpeg?=	../../graphics/jpeg
 .endif	# JPEG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk
index fad48c44a93..50ce55a9daa 100644
--- a/graphics/libungif/buildlink3.mk
+++ b/graphics/libungif/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBUNGIF_BUILDLINK3_MK:=	${LIBUNGIF_BUILDLINK3_MK}+
 
-.if !empty(LIBUNGIF_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.libungif?=	libungif>=4.1.0
-BUILDLINK_PKGSRCDIR.libungif?=	../../graphics/libungif
-.endif	# LIBUNGIF_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libungif
 .endif
 
-.if !empty(LIBUNGIF_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	libungif
+.if !empty(LIBUNGIF_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		libungif
+BUILDLINK_DEPENDS.libungif?=	libungif>=4.1.0
+BUILDLINK_PKGSRCDIR.libungif?=	../../graphics/libungif
 .endif	# LIBUNGIF_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index 0b9894da10b..f82994527d8 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNG_BUILDLINK3_MK:=	${PNG_BUILDLINK3_MK}+
 
-.if !empty(PNG_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.png?=		png>=1.2.4
-BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
-.endif	# PNG_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	png
 .endif
 
-.if !empty(PNG_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	png
+.if !empty(PNG_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		png
+BUILDLINK_DEPENDS.png?=		png>=1.2.4
+BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
 
 .  include "../../devel/zlib/buildlink3.mk"
 .endif	# PNG_BUILDLINK3_MK
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index 05bdfa5fdf6..20b685f60c6 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TIFF_BUILDLINK3_MK:=	${TIFF_BUILDLINK3_MK}+
 
-.if !empty(TIFF_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.tiff?=	tiff>=3.5.4
-BUILDLINK_PKGSRCDIR.tiff?=	../../graphics/tiff
-.endif	# TIFF_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	tiff
 .endif
 
-.if !empty(TIFF_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+=	tiff
+.if !empty(TIFF_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		tiff
+BUILDLINK_DEPENDS.tiff?=	tiff>=3.5.4
+BUILDLINK_PKGSRCDIR.tiff?=	../../graphics/tiff
 
 .  include "../../devel/zlib/buildlink3.mk"
 .  include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index de74fd43b92..2a8dbed0f40 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.7 2003/09/30 10:18:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/01/04 23:34:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XPM_BUILDLINK3_MK:=	${XPM_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(XPM_BUILDLINK3_MK:M\+)
+.if !empty(XPM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xpm?=		xpm>=3.4k
 BUILDLINK_PKGSRCDIR.xpm?=	../../graphics/xpm
 .endif	# XPM_BUILDLINK3_MK
@@ -73,12 +73,12 @@ MAKEFLAGS+=	_NEED_XPM="${_NEED_XPM}"
 .endif	# _NEED_XPM
 
 .if ${_NEED_XPM} == "YES"
-.  if !empty(BUILDLINK_DEPTH:M\+)
+.  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	xpm
 .  endif
 .endif
 
-.if !empty(XPM_BUILDLINK3_MK:M\+)
+.if !empty(XPM_BUILDLINK3_MK:M+)
 .  if ${_NEED_XPM} == "YES"
 BUILDLINK_PACKAGES+=	xpm
 .  else