From b503f9ffc57a2018c9fd3bd73464cdba9093fa70 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 5 Jan 2004 11:05:44 +0000
Subject: Use S/+$// instead of C/\+$// to save a backslash.  Very highly
 recommended by seb :)

---
 archivers/bzip2/buildlink3.mk          | 4 ++--
 audio/SDL_mixer/buildlink3.mk          | 4 ++--
 audio/esound/buildlink3.mk             | 4 ++--
 audio/libaudiofile/buildlink3.mk       | 4 ++--
 audio/libogg/buildlink3.mk             | 4 ++--
 audio/oss/buildlink3.mk                | 4 ++--
 converters/libiconv/buildlink3.mk      | 4 ++--
 databases/db/buildlink3.mk             | 4 ++--
 databases/db3/buildlink3.mk            | 4 ++--
 databases/db4/buildlink3.mk            | 4 ++--
 databases/mysql-client/buildlink3.mk   | 4 ++--
 databases/openldap/buildlink3.mk       | 4 ++--
 databases/p5-DBI/buildlink3.mk         | 4 ++--
 databases/postgresql-lib/buildlink3.mk | 4 ++--
 devel/SDL/buildlink3.mk                | 4 ++--
 devel/binutils/buildlink3.mk           | 4 ++--
 devel/boehm-gc/buildlink3.mk           | 4 ++--
 devel/dlcompat/buildlink3.mk           | 4 ++--
 devel/gettext-lib/buildlink3.mk        | 4 ++--
 devel/glib/buildlink3.mk               | 4 ++--
 devel/libgetopt/buildlink3.mk          | 4 ++--
 devel/libmm/buildlink3.mk              | 4 ++--
 devel/libslang/buildlink3.mk           | 4 ++--
 devel/ncurses/buildlink3.mk            | 4 ++--
 devel/pcre/buildlink3.mk               | 4 ++--
 devel/pkgconfig/buildlink3.mk          | 4 ++--
 devel/popt/buildlink3.mk               | 4 ++--
 devel/pth/buildlink3.mk                | 4 ++--
 devel/readline/buildlink3.mk           | 4 ++--
 devel/smpeg/buildlink3.mk              | 4 ++--
 devel/zlib/buildlink3.mk               | 4 ++--
 graphics/MesaLib/buildlink3.mk         | 4 ++--
 graphics/SDL_image/buildlink3.mk       | 4 ++--
 graphics/aalib-x11/buildlink3.mk       | 4 ++--
 graphics/freetype-lib/buildlink3.mk    | 4 ++--
 graphics/freetype2/buildlink3.mk       | 4 ++--
 graphics/gd/buildlink3.mk              | 4 ++--
 graphics/glu/buildlink3.mk             | 4 ++--
 graphics/glut/buildlink3.mk            | 4 ++--
 graphics/jpeg/buildlink3.mk            | 4 ++--
 graphics/libungif/buildlink3.mk        | 4 ++--
 graphics/png/buildlink3.mk             | 4 ++--
 graphics/tiff/buildlink3.mk            | 4 ++--
 graphics/xpm/buildlink3.mk             | 4 ++--
 lang/libperl/buildlink3.mk             | 4 ++--
 lang/ocaml/buildlink3.mk               | 4 ++--
 lang/perl5/buildlink3.mk               | 4 ++--
 lang/tcl/buildlink3.mk                 | 4 ++--
 mk/buildlink3/bsd.buildlink3.mk        | 8 ++++----
 net/libpcap/buildlink3.mk              | 4 ++--
 net/openslp/buildlink3.mk              | 4 ++--
 net/socks4/buildlink3.mk               | 4 ++--
 net/socks5/buildlink3.mk               | 4 ++--
 pkgtools/libnbcompat/buildlink3.mk     | 4 ++--
 print/cups/buildlink3.mk               | 4 ++--
 security/PAM/buildlink3.mk             | 4 ++--
 security/cyrus-sasl2/buildlink3.mk     | 4 ++--
 security/libcrack/buildlink3.mk        | 4 ++--
 security/openssl/buildlink3.mk         | 4 ++--
 security/rsaref/buildlink3.mk          | 4 ++--
 security/tcp_wrappers/buildlink3.mk    | 4 ++--
 textproc/expat/buildlink3.mk           | 4 ++--
 www/apache/buildlink3.mk               | 4 ++--
 x11/Xrandr-mixedcase/buildlink3.mk     | 4 ++--
 x11/Xrender/buildlink3.mk              | 4 ++--
 x11/gtk/buildlink3.mk                  | 4 ++--
 x11/tk/buildlink3.mk                   | 4 ++--
 x11/xcursor/buildlink3.mk              | 4 ++--
 68 files changed, 138 insertions(+), 138 deletions(-)

diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk
index a1a44a395fe..5cede0713a0 100644
--- a/archivers/bzip2/buildlink3.mk
+++ b/archivers/bzip2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 09:34:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/05 11:05:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BZIP2_BUILDLINK3_MK:=	${BZIP2_BUILDLINK3_MK}+
@@ -60,4 +60,4 @@ BUILDLINK_DEPENDS+=	bzip2
 .  endif
 .endif
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index 45812e57978..8d0018fdc9d 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_MIXER_BUILDLINK3_MK:=	${SDL_MIXER_BUILDLINK3_MK}+
@@ -16,4 +16,4 @@ BUILDLINK_INCDIRS.SDL_mixer?=	include/SDL
 .  include "../../devel/SDL/buildlink3.mk"
 .endif	# SDL_MIXER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
index 8375d43acd5..ba168194fac 100644
--- a/audio/esound/buildlink3.mk
+++ b/audio/esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ESOUND_BUILDLINK3_MK:=	${ESOUND_BUILDLINK3_MK}+
@@ -15,4 +15,4 @@ BUILDLINK_PKGSRCDIR.esound?=	../../audio/esound
 .  include "../../audio/libaudiofile/buildlink3.mk"
 .endif	# ESOUND_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
index 0bb38bd6ba3..0ff8ed8e050 100644
--- a/audio/libaudiofile/buildlink3.mk
+++ b/audio/libaudiofile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AUDIOFILE_BUILDLINK3_MK:=	${AUDIOFILE_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.audiofile?=	libaudiofile>=0.2.1
 BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
 .endif	# AUDIOFILE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libogg/buildlink3.mk b/audio/libogg/buildlink3.mk
index afa11d38d31..cc0a831914c 100644
--- a/audio/libogg/buildlink3.mk
+++ b/audio/libogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBOGG_BUILDLINK3_MK:=	${LIBOGG_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.libogg?=	libogg>=1.0.0.8
 BUILDLINK_PKGSRCDIR.libogg?=	../../audio/libogg
 .endif	# LIBOGG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/oss/buildlink3.mk b/audio/oss/buildlink3.mk
index 5043d28317c..b4019189d2b 100644
--- a/audio/oss/buildlink3.mk
+++ b/audio/oss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OSS_BUILDLINK3_MK:=	${OSS_BUILDLINK3_MK}+
@@ -43,4 +43,4 @@ buildlink-oss-soundcard-h:
         fi
 .endif	# OSS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index e6a874b5ec8..f604244858b 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=	${ICONV_BUILDLINK3_MK}+
@@ -81,4 +81,4 @@ CONFIGURE_ARGS+=	--without-libiconv-prefix
 .  endif
 .endif	# ICONV_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index 2136defaad3..bfbce3ea2c3 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB2_BUILDLINK3_MK:=	${DB2_BUILDLINK3_MK}+
@@ -36,4 +36,4 @@ BUILDLINK_TRANSFORM+=	l:db:db2
 .  endif
 .endif	# DB2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index fb46d1ce397..a57b5ef3ccb 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB3_BUILDLINK3_MK:=	${DB3_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.db3?=		db3>=2.9.2
 BUILDLINK_PKGSRCDIR.db3?=	../../databases/db3
 .endif	# DB3_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index 7956bab5af2..3cf4daaa6f8 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/04 23:46:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:44 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB4_BUILDLINK3_MK:=	${DB4_BUILDLINK3_MK}+
@@ -14,4 +14,4 @@ BUILDLINK_PKGSRCDIR.db4?=	../../databases/db4
 BUILDLINK_INCDIRS.db4?=		include/db4
 .endif	# DB4_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk
index 6685b16288a..233faca64b5 100644
--- a/databases/mysql-client/buildlink3.mk
+++ b/databases/mysql-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/04 23:46:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -16,4 +16,4 @@ BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 .  include "../../devel/zlib/buildlink3.mk"
 .endif	# MYSQL_CLIENT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index b932e274033..981e61a6b6d 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
@@ -22,4 +22,4 @@ BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap
 .  include "../../security/openssl/buildlink3.mk"
 .endif	# OPENLDAP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk
index 0c302fcd7c7..026ab44e23c 100644
--- a/databases/p5-DBI/buildlink3.mk
+++ b/databases/p5-DBI/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 P5_DBI_BUILDLINK3_MK:=	${P5_DBI_BUILDLINK3_MK}+
@@ -16,4 +16,4 @@ BUILDLINK_INCDIRS.p5-DBI?=	${PERL5_SUB_INSTALLSITEARCH}/auto/DBI
 .  include "../../lang/perl5/buildlink3.mk"
 .endif	# P5_DBI_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/postgresql-lib/buildlink3.mk b/databases/postgresql-lib/buildlink3.mk
index d4fc7a050ab..4c2cdcdf4da 100644
--- a/databases/postgresql-lib/buildlink3.mk
+++ b/databases/postgresql-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 POSTGRESQL_LIB_BUILDLINK3_MK:=	${POSTGRESQL_LIB_BUILDLINK3_MK}+
@@ -16,4 +16,4 @@ BUILDLINK_INCDIRS.postgresql-lib?=	include/postgresql
 .  include "../../security/openssl/buildlink3.mk"
 .endif	# POSTGRESQL_LIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 36a3d815b49..1fc2defd0c5 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_BUILDLINK3_MK:=	${SDL_BUILDLINK3_MK}+
@@ -21,4 +21,4 @@ PTHREAD_OPTS+=		require
 .  include "../../mk/pthread.buildlink3.mk"
 .endif	# SDL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index c5dbab449e4..dddee12dbe3 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
@@ -68,4 +68,4 @@ RANLIB=	${BUILDLINK_PREFIX.binutils}/bin/ranlib
 .  endif
 .endif	# BINUTILS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index 4ead28595a9..9c23a33ea9c 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOEHM_GC_BUILDLINK3_MK:=	${BOEHM_GC_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.boehm-gc?=	boehm-gc>=6.2nb1
 BUILDLINK_PKGSRCDIR.boehm-gc?=	../../devel/boehm-gc
 .endif	# BOEHM_GC_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk
index a1decc3f4ae..c1320712457 100644
--- a/devel/dlcompat/buildlink3.mk
+++ b/devel/dlcompat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 DLCOMPAT_BUILDLINK3_MK:=	${DLCOMPAT_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.dlcompat?=	dlcompat>=20020606
 BUILDLINK_PKGSRCDIR.dlcompat?=	../../devel/dlcompat
 .endif  # DLCOMPAT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index b33975e9b0e..d910ba9c2ef 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 09:37:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -130,4 +130,4 @@ CONFIGURE_ARGS+=	--without-libintl-prefix
 .  endif
 .endif	# GETTEXT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 273da9a898a..221739bd8a7 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB_BUILDLINK3_MK:=	${GLIB_BUILDLINK3_MK}+
@@ -17,4 +17,4 @@ PTHREAD_OPTS+=	require
 .  include "../../mk/pthread.buildlink3.mk"
 .endif	# GLIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk
index ce63a76dcee..b3a7f22570e 100644
--- a/devel/libgetopt/buildlink3.mk
+++ b/devel/libgetopt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETOPT_BUILDLINK3_MK:=	${GETOPT_BUILDLINK3_MK}+
@@ -49,4 +49,4 @@ CONFIGURE_ENV+=		LIBGETOPT="${LIBGETOPT}"
 MAKE_ENV+=		LIBGETOPT="${LIBGETOPT}"
 .endif	# GETOPT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk
index be5151c5014..392d91e616e 100644
--- a/devel/libmm/buildlink3.mk
+++ b/devel/libmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBMM_BUILDLINK3_MK:=	${LIBMM_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.libmm?=	libmm>=1.2.1
 BUILDLINK_PKGSRCDIR.libmm?=	../../devel/libmm
 .endif	# LIBMM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index 62a57a34740..617a47d7b02 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSLANG_BUILDLINK3_MK:=	${LIBSLANG_BUILDLINK3_MK}+
@@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.libslang?=	../../devel/libslang
 .  endif
 .endif	# LIBSLANG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index 2ea8d2662cc..09342530cdf 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 09:34:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
@@ -107,4 +107,4 @@ buildlink-ncurses-curses-h:
 	fi 
 .endif	# NCURSES_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index 7b135e4a219..ae222579a22 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PCRE_BUILDLINK3_MK:=	${PCRE_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.pcre?=	pcre>=3.4nb1
 BUILDLINK_PKGSRCDIR.pcre?=	../../devel/pcre
 .endif	# PCRE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pkgconfig/buildlink3.mk b/devel/pkgconfig/buildlink3.mk
index 21a1e971157..b71c4bad5cd 100644
--- a/devel/pkgconfig/buildlink3.mk
+++ b/devel/pkgconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PKGCONFIG_BUILDLINK3_MK:=	${PKGCONFIG_BUILDLINK3_MK}+
@@ -18,4 +18,4 @@ CONFIGURE_ENV+=		PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
 MAKE_ENV+=		PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
 .endif	# PKGCONFIG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index 19f118a89e8..3145b0464f2 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 POPT_BUILDLINK3_MK:=	${POPT_BUILDLINK3_MK}+
@@ -15,4 +15,4 @@ BUILDLINK_PKGSRCDIR.popt?=	../../devel/popt
 .  include "../../devel/gettext-lib/buildlink3.mk"
 .endif	# POPT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk
index fab52bdfffa..550a96453a0 100644
--- a/devel/pth/buildlink3.mk
+++ b/devel/pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PTH_BUILDLINK3_MK:=	${PTH_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.pth?=		pth>=2.0.0
 BUILDLINK_PKGSRCDIR.pth?=	../../devel/pth
 .endif	# PTH_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 3f64661f67a..c3a9832c5f3 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:44:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:45 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -85,4 +85,4 @@ BUILDLINK_TRANSFORM.readline=	\
 	-e "s|include/readline.h|include/readline/readline.h|g"
 .endif	# READLINE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/smpeg/buildlink3.mk b/devel/smpeg/buildlink3.mk
index e38b99c4b2e..c5934824516 100644
--- a/devel/smpeg/buildlink3.mk
+++ b/devel/smpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPMEG_BUILDLINK3_MK:=	${SPMEG_BUILDLINK3_MK}+
@@ -16,4 +16,4 @@ BUILDLINK_PKGSRCDIR.smpeg?=	../../devel/smpeg
 .  include "../../devel/gettext-lib/buildlink3.mk"
 .endif	# SMPEG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index 5017d389e26..7a2e981e8e1 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
@@ -63,4 +63,4 @@ BUILDLINK_DEPENDS+=	zlib
 .  endif
 .endif
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 37de2c2b6fe..a6de4793bc4 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
@@ -78,4 +78,4 @@ BUILDLINK_CPPFLAGS.MesaLib=	-DGLX_GLXEXT_LEGACY
 .  endif
 .endif	# MESALIB_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index 4ca7dc72ffc..b2aec64cb9d 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_IMAGE_BUILDLINK3_MK:=	${SDL_IMAGE_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_INCDIRS.SDL_image?=	include/SDL
 .  include "../../devel/SDL/buildlink3.mk"
 .endif	# SDL_IMAGE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk
index 9d150dc8397..4ba5d611199 100644
--- a/graphics/aalib-x11/buildlink3.mk
+++ b/graphics/aalib-x11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AALIB_X11_BUILDLINK3_MK:=	${AALIB_X11_BUILDLINK3_MK}+
@@ -21,4 +21,4 @@ CONFIGURE_ENV+=		AALIB_CONFIG="${AALIB_CONFIG}"
 MAKE_ENV+=		AALIB_CONFIG="${AALIB_CONFIG}"
 .endif # AALIB_X11_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index 455bbebb2b5..9e1e5bb486f 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE_BUILDLINK3_MK:=	${FREETYPE_BUILDLINK3_MK}+
@@ -15,4 +15,4 @@ BUILDLINK_PKGSRCDIR.freetype?=	../../graphics/freetype-lib
 .  include "../../devel/gettext-lib/buildlink3.mk"
 .endif	# FREETYPE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index 4ecb9661a57..bc7cafb0be8 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
@@ -84,4 +84,4 @@ FREETYPE_CONFIG?=	${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
 CONFIGURE_ENV+=		FREETYPE_CONFIG="${FREETYPE_CONFIG}"
 .endif	# FREETYPE2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index dbe5ff44e0d..69f3de13db1 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GD_BUILDLINK3_MK:=	${GD_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd
 .  include "../../graphics/xpm/buildlink3.mk"
 .endif	# GD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 54c40dfd1e3..f8f710fc13d 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/01/05 11:05:45 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
@@ -75,4 +75,4 @@ BUILDLINK_PREFIX.glu=	${X11BASE}
 .  endif
 .endif	# GLU_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index 3af156c071c..9cdcb82c634 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLUT_BUILDLINK3_MK:=	${GLUT_BUILDLINK3_MK}+
@@ -15,4 +15,4 @@ BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
 .  include "../../graphics/MesaLib/buildlink3.mk"
 .endif	# GLUT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk
index 73a01491479..9b7d841107c 100644
--- a/graphics/jpeg/buildlink3.mk
+++ b/graphics/jpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JPEG_BUILDLINK3_MK:=	${JPEG_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.jpeg?=	jpeg>=6b
 BUILDLINK_PKGSRCDIR.jpeg?=	../../graphics/jpeg
 .endif	# JPEG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk
index 50ce55a9daa..76cda0b5be1 100644
--- a/graphics/libungif/buildlink3.mk
+++ b/graphics/libungif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBUNGIF_BUILDLINK3_MK:=	${LIBUNGIF_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.libungif?=	libungif>=4.1.0
 BUILDLINK_PKGSRCDIR.libungif?=	../../graphics/libungif
 .endif	# LIBUNGIF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index f82994527d8..e5cbb396229 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNG_BUILDLINK3_MK:=	${PNG_BUILDLINK3_MK}+
@@ -15,4 +15,4 @@ BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
 .  include "../../devel/zlib/buildlink3.mk"
 .endif	# PNG_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index 20b685f60c6..0f2e7af874f 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TIFF_BUILDLINK3_MK:=	${TIFF_BUILDLINK3_MK}+
@@ -16,4 +16,4 @@ BUILDLINK_PKGSRCDIR.tiff?=	../../graphics/tiff
 .  include "../../graphics/jpeg/buildlink3.mk"
 .endif	# TIFF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index f983413ec58..9f8978c4fd4 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XPM_BUILDLINK3_MK:=	${XPM_BUILDLINK3_MK}+
@@ -85,4 +85,4 @@ BUILDLINK_PREFIX.xpm=	${X11BASE}
 .  endif
 .endif	# XPM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk
index f744bcea9ba..5a00c656103 100644
--- a/lang/libperl/buildlink3.mk
+++ b/lang/libperl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBPERL_BUILDLINK3_MK:=	${LIBPERL_BUILDLINK3_MK}+
@@ -17,4 +17,4 @@ LIBPERL5_REQD?=		${PERL5_REQD}
 .  include "../../lang/perl5/buildlink3.mk"
 .endif	# LIBPERL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index 871d01aa92b..6b50672782a 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OCAML_BUILDLINK3_MK:=	${OCAML_BUILDLINK3_MK}+
@@ -14,4 +14,4 @@ BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 BUILDLINK_DEPMETHOD.ocaml?=	build
 .endif	# OCAML_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index f21086052fc..be29524c2c5 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -81,4 +81,4 @@ BUILDLINK_FILES.perl=							\
 .  endif
 .endif  # PERL5_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index c8e3a572f7b..4ce8be95b67 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
@@ -22,4 +22,4 @@ BUILDLINK_TRANSFORM+=	l:tcl:tcl83
 TCLCONFIG_SH?=		${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 .endif	# TCL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index e440172be82..d89a0bee6f1 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.35 2004/01/05 07:01:43 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.36 2004/01/05 11:05:47 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -21,7 +21,7 @@
 # .  include "../../category/baz/buildlink3.mk"
 # .endif # FOO_BUILDLINK3_MK
 #
-# BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+# BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
 # -------------8<-------------8<-------------8<-------------8<-------------
 #
 # Most of the buildlink3.mk file is protected against multiple inclusion,
@@ -209,9 +209,9 @@ MAKEFLAGS+=	_BLNK_PKG_DBDIR.${_pkg_}=${_BLNK_PKG_DBDIR.${_pkg_}}
 .  endif
 
 .  if empty(_BLNK_PKG_DBDIR.${_pkg_}:Mnot_found)
-_BLNK_PKG_INFO.${_pkg_}=	${PKG_INFO_CMD} -K ${_BLNK_PKG_DBDIR.${_pkg_}:H}
+_BLNK_PKG_INFO.${_pkg_}?=	${PKG_INFO_CMD} -K ${_BLNK_PKG_DBDIR.${_pkg_}:H}
 .  else
-_BLNK_PKG_INFO.${_pkg_}=	${PKG_INFO_CMD} -K ${_PKG_DBDIR}
+_BLNK_PKG_INFO.${_pkg_}?=	${PKG_INFO_CMD} -K ${_PKG_DBDIR}
 .  endif
 
 BUILDLINK_PKGNAME.${_pkg_}?=	${_BLNK_PKG_DBDIR.${_pkg_}:T}
diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk
index e7af7aad3e4..fcf6ecb1003 100644
--- a/net/libpcap/buildlink3.mk
+++ b/net/libpcap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPCAP_BUILDLINK3_MK:=	${LIBPCAP_BUILDLINK3_MK}+
@@ -38,4 +38,4 @@ BUILDLINK_DEPENDS+=	libpcap
 .  endif
 .endif
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk
index 9d262783f68..f75485c9cf2 100644
--- a/net/openslp/buildlink3.mk
+++ b/net/openslp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSLP_BUILDLINK3_MK:=	${OPENSLP_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.openslp?=	openslp>=1.0.1
 BUILDLINK_PKGSRCDIR.openslp?=	../../net/openslp
 .endif	# OPENSLP_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk
index 59880886b5e..36ceed50ba6 100644
--- a/net/socks4/buildlink3.mk
+++ b/net/socks4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOCKS4_BUILDLINK3_MK:=	${SOCKS4_BUILDLINK3_MK}+
@@ -15,4 +15,4 @@ BUILDLINK_PKGSRCDIR.socks4?=	../../net/socks4
 BUILDLINK_TRANSFORM+=	l:socks:socks4
 .endif	# SOCKS4_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk
index ab2477fed16..e8805f938bb 100644
--- a/net/socks5/buildlink3.mk
+++ b/net/socks5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOCKS5_BUILDLINK3_MK:=	${SOCKS5_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.socks5?=	socks5>=1.0.2
 BUILDLINK_PKGSRCDIR.socks5?=	../../net/socks5
 .endif	# SOCKS5_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/pkgtools/libnbcompat/buildlink3.mk b/pkgtools/libnbcompat/buildlink3.mk
index 383781b1331..3a57c2f68b8 100644
--- a/pkgtools/libnbcompat/buildlink3.mk
+++ b/pkgtools/libnbcompat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBNBCOMPAT_BUILDLINK3_MK:=	${LIBNBCOMPAT_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ LIBS+=	${BUILDLINK_LDADD.libnbcompat}
 .  endif
 .endif  # LIBNBCOMPAT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk
index 3975a262d55..939f4618a31 100644
--- a/print/cups/buildlink3.mk
+++ b/print/cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CUPS_BUILDLINK3_MK:=	${CUPS_BUILDLINK3_MK}+
@@ -16,4 +16,4 @@ BUILDLINK_PKGSRCDIR.cups?=	../../print/cups
 .  include "../../graphics/tiff/buildlink3.mk"
 .endif	# CUPS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index 526312e7877..29c2aac5536 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PAM_BUILDLINK3_MK:=	${PAM_BUILDLINK3_MK}+
@@ -38,4 +38,4 @@ BUILDLINK_DEPENDS+=	pam
 .  endif
 .endif
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/cyrus-sasl2/buildlink3.mk b/security/cyrus-sasl2/buildlink3.mk
index 479255e3449..45c106b53a4 100644
--- a/security/cyrus-sasl2/buildlink3.mk
+++ b/security/cyrus-sasl2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CYRUS_SASL_BUILDLINK3_MK:=	${CYRUS_SASL_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=2.1.12
 BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl2
 .endif	# CYRUS_SASL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libcrack/buildlink3.mk b/security/libcrack/buildlink3.mk
index 61a3f4c2f1b..5bbec4c325b 100644
--- a/security/libcrack/buildlink3.mk
+++ b/security/libcrack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCRACK_BUILDLINK3_MK:=	${LIBCRACK_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.libcrack?=	libcrack>=2.7
 BUILDLINK_PKGSRCDIR.libcrack?=	../../security/libcrack
 .endif	# LIBCRACK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 4d2ecc28210..7a8ce8508d3 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -160,4 +160,4 @@ BUILD_DEFS+=	SSLCERTS
 .  endif
 .endif	# OPENSSL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/rsaref/buildlink3.mk b/security/rsaref/buildlink3.mk
index 71e5b4de9fa..6f4d7bf49e9 100644
--- a/security/rsaref/buildlink3.mk
+++ b/security/rsaref/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RSAREF_BUILDLINK3_MK:=	${RSAREF_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.rsaref?=	rsaref-2.0p3
 BUILDLINK_PKGSRCDIR.rsaref?=	../../security/rsaref
 .endif	# RSAREF_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/tcp_wrappers/buildlink3.mk b/security/tcp_wrappers/buildlink3.mk
index 3193d018909..fd7a1e63f09 100644
--- a/security/tcp_wrappers/buildlink3.mk
+++ b/security/tcp_wrappers/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCP_WRAPPERS_BUILDLINK3_MK:=	${TCP_WRAPPERS_BUILDLINK3_MK}+
@@ -38,4 +38,4 @@ BUILDLINK_DEPENDS+=	tcp_wrappers
 .  endif
 .endif
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk
index 80d2a9f64dc..62c4f619493 100644
--- a/textproc/expat/buildlink3.mk
+++ b/textproc/expat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EXPAT_BUILDLINK3_MK:=	${EXPAT_BUILDLINK3_MK}+
@@ -13,4 +13,4 @@ BUILDLINK_DEPENDS.expat?=	expat>=1.95.4
 BUILDLINK_PKGSRCDIR.expat?=	../../textproc/expat
 .endif	# EXPAT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 2ed238ec748..1fab0099213 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -25,4 +25,4 @@ CONFIGURE_ARGS+=	--with-apxs="${APXS}"
 .  endif
 .endif	# APACHE_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index 72f77f59eae..479dcd71691 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRANDR_BUILDLINK3_MK:=	${XRANDR_BUILDLINK3_MK}+
@@ -15,4 +15,4 @@ BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/Xrandr
 BUILDLINK_PACKAGES+=		Xrandr
 .endif	# XRANDR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index af421afb1c6..0bef69988bd 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/01/05 09:31:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
@@ -78,4 +78,4 @@ BUILDLINK_PREFIX.Xrender=	${X11BASE}
 .  endif
 .endif	# XRENDER_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index 1c45f1c3763..d3bf4299932 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
@@ -18,4 +18,4 @@ USE_X11=	YES
 .  include "../../devel/glib/buildlink3.mk"
 .endif	# GTK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index 77ed49eb9b7..375ea138104 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -25,4 +25,4 @@ TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 .  include "../../lang/tcl/buildlink3.mk"
 .endif	# TK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index fcc51afb4aa..63658ef464f 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XCURSOR_BUILDLINK3_MK:=	${XCURSOR_BUILDLINK3_MK}+
@@ -15,4 +15,4 @@ BUILDLINK_PKGSRCDIR.xcursor?=	../../x11/xcursor
 BUILDLINK_PACKAGES+=		xcursor
 .endif	# XCURSOR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:C/\+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
-- 
cgit v1.2.3