* Follow the new buildlink3 standard and append to BUILDLINK_DEPENDS.<pkg>.

* Use BUILDLINK_{INCDIRS,LIBDIRS}.<pkg> instead of using
  BUILDLINK_{CPPFLAGS,LDFLAGS}.<pkg> since we're just dealing with adding
  directories to the various search paths.

8 files changed, 71 insertions, 111 deletions

diff --git a/lang/python15/buildlink3.mk b/lang/python15/buildlink3.mk
index 7f6f94fcc9b..6b17dff8f69 100644
--- a/lang/python15/buildlink3.mk
+++ b/lang/python15/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/25 14:23:39 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/25 17:15:12 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON15_BUILDLINK3_MK:=	${PYTHON15_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -9,22 +8,18 @@ BUILDLINK_DEPENDS+=	python15
 .endif
 
 .if !empty(PYTHON15_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			python15
-BUILDLINK_DEPENDS.python15?=		python15>=1.5.2
-BUILDLINK_PKGSRCDIR.python15?=		../../lang/python15
+BUILDLINK_PACKAGES+=		python15
+BUILDLINK_DEPENDS.python15+=	python15>=1.5.2
+BUILDLINK_PKGSRCDIR.python15?=	../../lang/python15
 
-.if defined(BUILDLINK_DEPMETHOD.python)
+.  if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python15?=	${BUILDLINK_DEPMETHOD.python}
-.endif
+.  endif
 
+BUILDLINK_INCDIRS.python15=	include/python1.5
+BUILDLINK_LIBDIRS.python15=	lib/python1.5/config
 BUILDLINK_TRANSFORM+=		l:python:python1.5
 
-BUILDLINK_CPPFLAGS.python15+= \
-	-I${BUILDLINK_PREFIX.python15}/include/python1.5
-BUILDLINK_LDFLAGS.python15+= \
-	-L${BUILDLINK_PREFIX.python15}/lib/python1.5/config		\
-	-Wl,-R${BUILDLINK_PREFIX.python15}/lib/python1.5/config
-
 .endif # PYTHON15_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python20/buildlink3.mk b/lang/python20/buildlink3.mk
index 0b6085f522d..a63b9ffec11 100644
--- a/lang/python20/buildlink3.mk
+++ b/lang/python20/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/25 14:23:39 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/25 17:15:12 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON20_BUILDLINK3_MK:=	${PYTHON20_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -9,22 +8,18 @@ BUILDLINK_DEPENDS+=	python20
 .endif
 
 .if !empty(PYTHON20_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			python20
-BUILDLINK_DEPENDS.python20?=		python20>=2.0.1
-BUILDLINK_PKGSRCDIR.python20?=		../../lang/python20
+BUILDLINK_PACKAGES+=		python20
+BUILDLINK_DEPENDS.python20+=	python20>=2.0.1
+BUILDLINK_PKGSRCDIR.python20?=	../../lang/python20
 
-.if defined(BUILDLINK_DEPMETHOD.python)
+.  if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python20?=	${BUILDLINK_DEPMETHOD.python}
-.endif
+.  endif
 
+BUILDLINK_INCDIRS.python20+=	include/python2.0
+BUILDLINK_LIBDIRS.python20+=	lib/python2.0/config
 BUILDLINK_TRANSFORM+=		l:python:python2.0
 
-BUILDLINK_CPPFLAGS.python20+= \
-	-I${BUILDLINK_PREFIX.python20}/include/python2.0
-BUILDLINK_LDFLAGS.python20+= \
-	-L${BUILDLINK_PREFIX.python20}/lib/python2.0/config		\
-	-Wl,-R${BUILDLINK_PREFIX.python20}/lib/python2.0/config
-
 .endif # PYTHON20_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python21-pth/buildlink3.mk b/lang/python21-pth/buildlink3.mk
index 1c3290e887c..354c60a8074 100644
--- a/lang/python21-pth/buildlink3.mk
+++ b/lang/python21-pth/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/25 14:23:39 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/25 17:15:12 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON21_PTH_BUILDLINK3_MK:=	${PYTHON21_PTH_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -10,20 +9,16 @@ BUILDLINK_DEPENDS+=	python21-pth
 
 .if !empty(PYTHON21_PTH_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			python21-pth
-BUILDLINK_DEPENDS.python21-pth?=		python21-pth>=2.1.3
-BUILDLINK_PKGSRCDIR.python21-pth?=		../../lang/python21-pth
+BUILDLINK_DEPENDS.python21-pth+=	python21-pth>=2.1.3
+BUILDLINK_PKGSRCDIR.python21-pth?=	../../lang/python21-pth
 
-.if defined(BUILDLINK_DEPMETHOD.python)
+.  if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python21pth?=	${BUILDLINK_DEPMETHOD.python}
-.endif
-
-BUILDLINK_TRANSFORM+=		l:python:python2p1
+.  endif
 
-BUILDLINK_CPPFLAGS.python21pth+= \
-	-I${BUILDLINK_PREFIX.python21pth}/include/python2p1
-BUILDLINK_LDFLAGS.python21pth+= \
-	-L${BUILDLINK_PREFIX.python21pth}/lib/python2p1/config		\
-	-Wl,-R${BUILDLINK_PREFIX.python21pth}/lib/python2p1/config
+BUILDLINK_INCDIRS.python21-pth+=	include/python2p1
+BUILDLINK_LIBDIRS.python21-pth+=	lib/python2p1/config
+BUILDLINK_TRANSFORM+=			l:python:python2p1
 
 .endif # PYTHON21_PTH_BUILDLINK3_MK
 
diff --git a/lang/python21/buildlink3.mk b/lang/python21/buildlink3.mk
index 5d09dca4417..8a6cc3639ce 100644
--- a/lang/python21/buildlink3.mk
+++ b/lang/python21/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/25 14:23:39 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/25 17:15:12 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON21_BUILDLINK3_MK:=	${PYTHON21_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -9,22 +8,18 @@ BUILDLINK_DEPENDS+=	python21
 .endif
 
 .if !empty(PYTHON21_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			python21
-BUILDLINK_DEPENDS.python21?=		python21>=2.1.3
-BUILDLINK_PKGSRCDIR.python21?=		../../lang/python21
+BUILDLINK_PACKAGES+=		python21
+BUILDLINK_DEPENDS.python21+=	python21>=2.1.3
+BUILDLINK_PKGSRCDIR.python21?=	../../lang/python21
 
-.if defined(BUILDLINK_DEPMETHOD.python)
+.  if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python21?=	${BUILDLINK_DEPMETHOD.python}
-.endif
+.  endif
 
+BUILDLINK_INCDIRS.python21+=	include/python2.1
+BUILDLINK_LIBDIRS.python21+=	lib/python2.1/config
 BUILDLINK_TRANSFORM+=		l:python:python2.1
 
-BUILDLINK_CPPFLAGS.python21+= \
-	-I${BUILDLINK_PREFIX.python21}/include/python2.1
-BUILDLINK_LDFLAGS.python21+= \
-	-L${BUILDLINK_PREFIX.python21}/lib/python2.1/config		\
-	-Wl,-R${BUILDLINK_PREFIX.python21}/lib/python2.1/config
-
 .endif # PYTHON21_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python22-pth/buildlink3.mk b/lang/python22-pth/buildlink3.mk
index c6450e5617b..f8a68a2672a 100644
--- a/lang/python22-pth/buildlink3.mk
+++ b/lang/python22-pth/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/25 14:15:33 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/25 17:15:12 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON22_PTH_BUILDLINK3_MK:=	${PYTHON22_PTH_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -10,20 +9,16 @@ BUILDLINK_DEPENDS+=	python22-pth
 
 .if !empty(PYTHON22_PTH_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			python22-pth
-BUILDLINK_DEPENDS.python22-pth?=		python22-pth>=2.2.3
-BUILDLINK_PKGSRCDIR.python22-pth?=		../../lang/python22-pth
+BUILDLINK_DEPENDS.python22-pth+=	python22-pth>=2.2.3
+BUILDLINK_PKGSRCDIR.python22-pth?=	../../lang/python22-pth
 
 .if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python22pth?=	${BUILDLINK_DEPMETHOD.python}
+BUILDLINK_DEPMETHOD.python22-pth?=	${BUILDLINK_DEPMETHOD.python}
 .endif
 
-BUILDLINK_TRANSFORM+=		l:python:python2p2
-
-BUILDLINK_CPPFLAGS.python22pth+= \
-	-I${BUILDLINK_PREFIX.python22pth}/include/python2p2
-BUILDLINK_LDFLAGS.python22pth+= \
-	-L${BUILDLINK_PREFIX.python22pth}/lib/python2p2/config		\
-	-Wl,-R${BUILDLINK_PREFIX.python22pth}/lib/python2p2/config
+BUILDLINK_INCDIRS.python22-pth+=	include/python2p2
+BUILDLINK_LIBDIRS.python22-pth+=	lib/python2p2/config
+BUILDLINK_TRANSFORM+=			l:python:python2p2
 
 .endif # PYTHON22_PTH_BUILDLINK3_MK
 
diff --git a/lang/python22/buildlink3.mk b/lang/python22/buildlink3.mk
index a81d32ddcfe..e5163f126d5 100644
--- a/lang/python22/buildlink3.mk
+++ b/lang/python22/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/25 14:13:17 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/25 17:15:12 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON22_BUILDLINK3_MK:=	${PYTHON22_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -9,22 +8,18 @@ BUILDLINK_DEPENDS+=	python22
 .endif
 
 .if !empty(PYTHON22_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			python22
-BUILDLINK_DEPENDS.python22?=		python22>=2.2.2
-BUILDLINK_PKGSRCDIR.python22?=		../../lang/python22
+BUILDLINK_PACKAGES+=		python22
+BUILDLINK_DEPENDS.python22+=	python22>=2.2.2
+BUILDLINK_PKGSRCDIR.python22?=	../../lang/python22
 
-.if defined(BUILDLINK_DEPMETHOD.python)
+.  if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python22?=	${BUILDLINK_DEPMETHOD.python}
-.endif
+.  endif
 
+BUILDLINK_INCDIRS.python22+=	include/python2.2
+BUILDLINK_LIBDIRS.python22+=	lib/python2.2/config
 BUILDLINK_TRANSFORM+=		l:python:python2.2
 
-BUILDLINK_CPPFLAGS.python22+= \
-	-I${BUILDLINK_PREFIX.python22}/include/python2.2
-BUILDLINK_LDFLAGS.python22+= \
-	-L${BUILDLINK_PREFIX.python22}/lib/python2.2/config		\
-	-Wl,-R${BUILDLINK_PREFIX.python22}/lib/python2.2/config
-
 .endif # PYTHON22_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python23-pth/buildlink3.mk b/lang/python23-pth/buildlink3.mk
index 2b70d58cfab..5c73549bc36 100644
--- a/lang/python23-pth/buildlink3.mk
+++ b/lang/python23-pth/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/25 14:11:13 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/25 17:15:12 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON23_PTH_BUILDLINK3_MK:=	${PYTHON23_PTH_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -10,20 +9,16 @@ BUILDLINK_DEPENDS+=	python23-pth
 
 .if !empty(PYTHON23_PTH_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			python23-pth
-BUILDLINK_DEPENDS.python23-pth?=		python23-pth>=2.3.3
-BUILDLINK_PKGSRCDIR.python23-pth?=		../../lang/python23-pth
+BUILDLINK_DEPENDS.python23-pth+=	python23-pth>=2.3.3
+BUILDLINK_PKGSRCDIR.python23-pth?=	../../lang/python23-pth
 
-.if defined(BUILDLINK_DEPMETHOD.python)
+.  if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python23pth?=	${BUILDLINK_DEPMETHOD.python}
-.endif
-
-BUILDLINK_TRANSFORM+=		l:python:python2p3
+.  endif
 
-BUILDLINK_CPPFLAGS.python23pth+= \
-	-I${BUILDLINK_PREFIX.python23pth}/include/python2p3
-BUILDLINK_LDFLAGS.python23pth+= \
-	-L${BUILDLINK_PREFIX.python23pth}/lib/python2p3/config		\
-	-Wl,-R${BUILDLINK_PREFIX.python23pth}/lib/python2p3/config
+BUILDLINK_INCDIRS.python23-pth+=	include/python2p3
+BUILDLINK_LIBDIRS.python23-pth+=	lib/python2p3/config
+BUILDLINK_TRANSFORM+=			l:python:python2p3
 
 .endif # PYTHON23_PTH_BUILDLINK3_MK
 
diff --git a/lang/python23/buildlink3.mk b/lang/python23/buildlink3.mk
index 8ab78ea22b2..8e720a1113b 100644
--- a/lang/python23/buildlink3.mk
+++ b/lang/python23/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/25 14:10:29 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/25 17:15:12 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON23_BUILDLINK3_MK:=	${PYTHON23_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -9,22 +8,18 @@ BUILDLINK_DEPENDS+=	python23
 .endif
 
 .if !empty(PYTHON23_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			python23
-BUILDLINK_DEPENDS.python23?=		python23>=2.3.3
-BUILDLINK_PKGSRCDIR.python23?=		../../lang/python23
+BUILDLINK_PACKAGES+=		python23
+BUILDLINK_DEPENDS.python23+=	python23>=2.3.3
+BUILDLINK_PKGSRCDIR.python23?=	../../lang/python23
 
-.if defined(BUILDLINK_DEPMETHOD.python)
+.  if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python23?=	${BUILDLINK_DEPMETHOD.python}
-.endif
+.  endif
 
+BUILDLINK_INCDIRS.python23+=	include/python2.3
+BUILDLINK_LIBDIRS.python23+=	lib/python2.3/config
 BUILDLINK_TRANSFORM+=		l:python:python2.3
 
-BUILDLINK_CPPFLAGS.python23+= \
-	-I${BUILDLINK_PREFIX.python23}/include/python2.3
-BUILDLINK_LDFLAGS.python23+= \
-	-L${BUILDLINK_PREFIX.python23}/lib/python2.3/config		\
-	-Wl,-R${BUILDLINK_PREFIX.python23}/lib/python2.3/config
-
 .endif # PYTHON23_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}