Instead of using BUILDLINK_TRANSFORM.<pkg> to change the location of

headers in ${BUILDLINK_DIR}, simply create BUILDLINK_CPPFLAGS.<pkg>
variables whose values are appended to CPPFLAGS, which are automatically
passed to the configure and build processes.

BUILDLINK_TRANSFORM.<pkg> has little use in buildlink2 since packages are
now told that the software may be found where it really is installed, not
in ${BUILDLINK_DIR} as was the case with buildlink1.  Eventually, these
variables will be declared unsupported by buildlink2.

5 files changed, 18 insertions, 13 deletions

diff --git a/chat/libyahoo/buildlink2.mk b/chat/libyahoo/buildlink2.mk
index d6039f99a2e..82089fcfb1d 100644
--- a/chat/libyahoo/buildlink2.mk
+++ b/chat/libyahoo/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/21 06:58:41 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2002/09/23 09:22:14 jlam Exp $
 
 .if !defined(LIBYAHOO_BUILDLINK2_MK)
 LIBYAHOO_BUILDLINK2_MK=	# defined
@@ -12,7 +12,8 @@ BUILDLINK_PREFIX.libyahoo_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libyahoo=		include/libyahoo/*.h
 BUILDLINK_FILES.libyahoo+=		lib/libyahoo.*
 
-BUILDLINK_TRANSFORM.libyahoo=	-e "s|include/libyahoo/|include/|g"
+BUILDLINK_CPPFLAGS.libyahoo=	-I${BUILDLINK_PREFIX.libyahoo}/include/libyahoo
+CPPFLAGS+=			${BUILDLINK_CPPFLAGS.libyahoo}
 
 BUILDLINK_TARGETS+=	libyahoo-buildlink
 
diff --git a/graphics/gdk-pixbuf/buildlink2.mk b/graphics/gdk-pixbuf/buildlink2.mk
index 6d69dffe476..4884805e3eb 100644
--- a/graphics/gdk-pixbuf/buildlink2.mk
+++ b/graphics/gdk-pixbuf/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/11 10:15:33 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/09/23 09:22:15 jlam Exp $
 
 .if !defined(GDK_PIXBUF_BUILDLINK2_MK)
 GDK_PIXBUF_BUILDLINK2_MK=	# defined
@@ -28,7 +28,9 @@ BUILDLINK_FILES.gdk-pixbuf+=	lib/libgdk_pixbuf.*
 BUILDLINK_FILES.gdk-pixbuf+=	lib/libgdk_pixbuf_xlib.*
 
 # The gdk-pixbuf headers should be found at the usual location.
-BUILDLINK_TRANSFORM.gdk-pixbuf=	-e "s|/include/gdk-pixbuf-1.0/|/include/|g"
+BUILDLINK_CPPFLAGS.gdk-pixbuf= \
+	-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0
+CPPFLAGS+=	${BUILDLINK_CPPFLAGS.gdk-pixbuf}
 
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/net/ORBit/buildlink2.mk b/net/ORBit/buildlink2.mk
index 66c21133be4..925ec2eaa15 100644
--- a/net/ORBit/buildlink2.mk
+++ b/net/ORBit/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/11 10:16:10 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/09/23 09:22:15 jlam Exp $
 
 .if !defined(ORBIT_BUILDLINK2_MK)
 ORBIT_BUILDLINK2_MK=	# defined
@@ -23,8 +23,7 @@ BUILDLINK_FILES.ORBit+=	lib/libORBitutil.*
 BUILDLINK_FILES.ORBit+=	lib/libname-server.*
 BUILDLINK_FILES.ORBit+=	lib/liborbit-c-backend.*
 
-# The ORBit headers should be found at the same location as for libxml.
-#BUILDLINK_TRANSFORM.ORBit=    -e "s|/include/orbit-1.0/|/include/|g"
+BUILDLINK_CPPFLAGS.ORBit=	-I${BUILDLINK_PREFIX.ORBit}/include/orbit-1.0
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
diff --git a/security/libmcrypt22/buildlink2.mk b/security/libmcrypt22/buildlink2.mk
index 92fbb2e31dd..9a37aead9a2 100644
--- a/security/libmcrypt22/buildlink2.mk
+++ b/security/libmcrypt22/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:55 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 09:22:15 jlam Exp $
 
 .if !defined(LIBMCRYPT22_BUILDLINK2_MK)
 LIBMCRYPT22_BUILDLINK2_MK=	# defined
@@ -11,10 +11,12 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.libmcrypt22=libmcrypt22
 BUILDLINK_PREFIX.libmcrypt22_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libmcrypt22=	include/libmcrypt22/mcrypt.h
 BUILDLINK_FILES.libmcrypt22+=	lib/libmcrypt22.*
-
-BUILDLINK_TRANSFORM.libmcrypt22=	-e "s|include/libmcrypt22/|include/|g"
 BUILDLINK_TRANSFORM+=			l:mcrypt:mcrypt22
 
+BUILDLINK_CPPFLAGS.libmcrypt22= \
+	-I${BUILDLINK_PREFIX.libmcrypt22}/include/libmcrypt22
+CPPFLAGS+=	${BUILDLINK_CPPFLAGS.libmcrypt22}
+
 BUILDLINK_TARGETS+=	libmcrypt22-buildlink
 
 libmcrypt22-buildlink: _BUILDLINK_USE
diff --git a/x11/controlcenter/buildlink2.mk b/x11/controlcenter/buildlink2.mk
index 9a65792b471..a4ccdd53630 100644
--- a/x11/controlcenter/buildlink2.mk
+++ b/x11/controlcenter/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/11 12:16:23 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/09/23 09:22:15 jlam Exp $
 
 .if !defined(CONTROLCENTER_BUILDLINK2_MK)
 CONTROLCENTER_BUILDLINK2_MK=	# defined
@@ -13,8 +13,9 @@ BUILDLINK_PREFIX.controlcenter_DEFAULTS=	${X11PREFIX}
 BUILDLINK_FILES.controlcenter=	include/libcapplet1/*
 BUILDLINK_FILES.controlcenter+=	lib/libcapplet.*
 
-BUILDLINK_TRANSFORM.controlcenter= \
-	-e "s|/include/libcapplet1/|/include/|g"
+BUILDLINK_CPPFLAGS.controlcenter= \
+	-I${BUILDLINK_PREFIX.controlcenter}/include/libcapplet1
+CPPFLAGS+=	${BUILDLINK_CPPFLAGS.controlcenter}
 
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"