Use the new BUILDLINK_TRANSFORM commands to more precisely state the

intended transformation: use "rm" to remove an option, "rmdir" to remove
all options containing a path starting with a given directory name, and
"rename" to rename options to something else.

27 files changed, 63 insertions, 65 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 8fdad0b8b93..490bcbc18ea 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/05/15 14:39:54 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/08/28 06:05:31 jlam Exp $
 #
 
 DISTNAME=		flac-1.1.0
@@ -32,7 +32,7 @@ NOT_FOR_COMPILER=	sunpro
 #
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mmipspro)
-BUILDLINK_TRANSFORM+=	S:-O3:
+BUILDLINK_TRANSFORM+=	rm:-O3
 .endif
 
 .include "../../multimedia/libogg/buildlink3.mk"
diff --git a/audio/oss/buildlink3.mk b/audio/oss/buildlink3.mk
index a7965e784f6..a3cc741996c 100644
--- a/audio/oss/buildlink3.mk
+++ b/audio/oss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/08/28 06:05:31 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OSS_BUILDLINK3_MK:=	${OSS_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_INCDIRS.oss=		include lib/oss/include
 # If we are using audio/oss, then we don't need the NetBSD OSS
 # compatibility library.
 #
-BUILDLINK_TRANSFORM+=	l:ossaudio:
+BUILDLINK_TRANSFORM+=	rm:-lossaudio
 
 BUILDLINK_TARGETS+=	buildlink-oss-soundcard-h
 
diff --git a/chat/icb/Makefile b/chat/icb/Makefile
index 1884a768e92..967f8affed2 100644
--- a/chat/icb/Makefile
+++ b/chat/icb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/29 03:30:57 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2004/08/28 06:05:31 jlam Exp $
 #
 
 # Note: The file ftp://ftp.icb.net/pub/icb/icb-0.9grok2.tar.gz is way
@@ -20,7 +20,7 @@ USE_BUILDLINK3=		YES
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
-BUILDLINK_TRANSFORM+=	s:-ltermcap:
+BUILDLINK_TRANSFORM+=	rm:-ltermcap
 .endif
 
 INSTALLATION_DIRS=	bin libdata libdata/icb
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk
index 6ecc476c4df..86193a3f3f9 100644
--- a/converters/libiconv/builtin.mk
+++ b/converters/libiconv/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2004/06/04 05:21:14 reed Exp $
+# $NetBSD: builtin.mk,v 1.6 2004/08/28 06:05:31 jlam Exp $
 
 .if !defined(_LIBICONV_FOUND)
 _LIBICONV_FOUND!=							\
@@ -130,7 +130,7 @@ _LIBICONV=		-liconv
 _LIBICONV=		-liconv
 .  else
 _LIBICONV=		# empty
-BUILDLINK_TRANSFORM+=	l:iconv:
+BUILDLINK_TRANSFORM+=	rm:-liconv
 .  endif
 .endif
 
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index 392aecf2a31..b3675cbe6a4 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/07/01 15:17:21 recht Exp $
+# $NetBSD: Makefile,v 1.22 2004/08/28 06:05:31 jlam Exp $
 
 DISTNAME=		db-4.2.52
 PKGNAME=		${DISTNAME:S/db/db4/}
@@ -45,9 +45,9 @@ MAKEFLAGS+=	_GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD}
 .    if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS])
 #
 # Pre-3.3 GCC has an optimization bug tickled by the db4 code, so remove
-# optimization when 
+# optimization.
 #
-BUILDLINK_TRANSFORM+=	S:-O[0-9]*:
+BUILDLINK_TRANSFORM+=	rm:-O[0-9]*
 .    endif
 .  endif
 .endif
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 6b2e689c53d..170b8a640b1 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/04/19 13:41:28 recht Exp $
+# $NetBSD: Makefile,v 1.15 2004/08/28 06:05:31 jlam Exp $
 
 DISTNAME=		devhelp-0.7
 PKGREVISION=		9
@@ -21,8 +21,8 @@ USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-html-widget=gtkhtml2
 
-BUILDLINK_TRANSFORM+=	S:-DG_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/devhelp
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index f9803ca0e12..b710016cdce 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2004/05/09 20:31:07 danw Exp $
+# $NetBSD: builtin.mk,v 1.8 2004/08/28 06:05:31 jlam Exp $
 
 .if !defined(_BLNK_LIBINTL_FOUND)
 _BLNK_LIBINTL_FOUND!=	\
@@ -135,7 +135,7 @@ _BLNK_LIBINTL+=			${BUILDLINK_LDADD.iconv}
 _BLNK_LIBINTL=		-lintl
 .  else
 _BLNK_LIBINTL=		# empty
-BUILDLINK_TRANSFORM+=	l:intl:
+BUILDLINK_TRANSFORM+=	rm:-lintl
 .  endif
 .endif
 
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 0b19713f829..6be5cbdeaf0 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2004/02/14 15:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	slang-1.4.9
@@ -32,8 +32,8 @@ post-install:
 .include "../../mk/bsd.prefs.mk"
 
 # Debian doesn't have -ltermcap, use -lncurses instead
-.if ${OPSYS} == "Linux" && ${LOWER_VENDOR} == "debian"
-BUILDLINK_TRANSFORM+=	l:termcap:
+.if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian")
+BUILDLINK_TRANSFORM+=	rm:-ltermcap
 .  include "../../devel/ncurses/buildlink3.mk"
 .endif
 
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index fc02387609d..9d589703fbc 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/24 23:11:17 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	quake2-0.2.1
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 USE_BUILTIN.glu=	yes
 USE_BUILTIN.MesaLib=	yes
 
-BUILDLINK_TRANSFORM+=	S:-Werror:
+BUILDLINK_TRANSFORM+=	rm:-Werror
 CONFIGURE_ARGS+=	--program-transform-name='s/^quake2$$/quake2forge/'
 
 post-install:
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 2d09dc9ee4b..e840e1d517b 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/03/03 00:20:19 snj Exp $
+# $NetBSD: Makefile,v 1.32 2004/08/28 06:05:32 jlam Exp $
 #
 
 PKGNAME=	MesaLib-${MESA_VERSION}
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--disable-sparc
 .endif
 
 .if !empty(CC_VERSION:Mgcc-3*)
-BUILDLINK_TRANSFORM+=   S:-O[23]:
+BUILDLINK_TRANSFORM+=   rm:-O[23]
 .endif
 
 pre-build:
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 7092bc6c608..a845e0d0305 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/05/16 00:57:24 kristerw Exp $
+# $NetBSD: Makefile,v 1.38 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	giram-0.3.5
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}/0.3
 
 SHLIBTOOL_OVERRIDE=	libtool
 
-BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 OWN_DIRS+=	${PKG_SYSCONFDIR}/0.3
 CONF_FILES+=	${PREFIX}/share/examples/giram/giramrc		\
diff --git a/ham/xdx/Makefile b/ham/xdx/Makefile
index 3cd036d2bec..3ed7ff18af3 100644
--- a/ham/xdx/Makefile
+++ b/ham/xdx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/05/03 22:37:30 kristerw Exp $
+# $NetBSD: Makefile,v 1.3 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	xdx-1.1
@@ -14,7 +14,7 @@ USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 USE_PKGLOCALEDIR=yes
 
-BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index a15d55be34e..75be079f739 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/08/18 13:51:50 minoura Exp $
+# $NetBSD: Makefile,v 1.25 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	Gauche-0.8.1
@@ -38,5 +38,5 @@ CONFIGURE_ARGS+=	--enable-multibyte=${GAUCHE_MULTIBYTE}
 .if !empty(_WITH_ICONV_LIB)
 CONFIGURE_ARGS+=	--with-iconv-lib=${_WITH_ICONV_LIB}
 .else
-BUILDLINK_TRANSFORM+=	S:-liconv:
+BUILDLINK_TRANSFORM+=	rm:-liconv
 .endif
diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile
index 614b1455742..d252f785339 100644
--- a/lang/sablevm/Makefile
+++ b/lang/sablevm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/05/23 10:25:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	sablevm-1.1.3
@@ -34,7 +34,7 @@ BUILDLINK_PASSTHRU_RPATHDIRS+=	${JAVA_HOME}/lib
 
 .if !exists(/usr/include/semaphore.h)
 LDFLAGS+=	-lsemaphore
-BUILDLINK_TRANSFORM+=	l:rt:semaphore:
+BUILDLINK_TRANSFORM+=	l:rt:semaphore
 .include "../../devel/pthread-sem/buildlink3.mk"
 .endif
 .include "../../devel/libffi/buildlink3.mk"
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index de8735216ab..abb0e5ee042 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2004/05/06 10:03:54 recht Exp $
+# $NetBSD: Makefile,v 1.63 2004/08/28 06:05:32 jlam Exp $
 
 DISTNAME=		evolution-1.4.6
 CATEGORIES=		mail time gnome
@@ -69,8 +69,8 @@ GCONF2_SCHEMAS+=	apps_evolution_calendar.schemas
 GCONF2_SCHEMAS+=	apps_evolution_summary.schemas
 GCONF2_SCHEMAS+=	evolution-mail.schemas
 
-BUILDLINK_TRANSFORM+=	S:-DG_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 .if !exists(/usr/include/semaphore.h)
 LDFLAGS+=	-lsemaphore
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index d67491c0a9f..6ca3d99a07f 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/04/28 05:33:58 snj Exp $
+# $NetBSD: Makefile,v 1.25 2004/08/28 06:05:32 jlam Exp $
 
 DISTNAME=		gperiodic-2.0.7
 PKGREVISION=		2
@@ -17,10 +17,10 @@ USE_PKGLOCALEDIR=	# defined
 USE_X11=		# defined
 USE_GNU_TOOLS+=		make
 
-BUILDLINK_TRANSFORM+=	S:-DG_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=	S:-DGDK_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=	S:-DGDK_PIXBUF_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 ALL_TARGET=		gperiodic
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index e7027e73d89..77ce3946bb0 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/19 23:56:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	avidemux-2.0.18
@@ -22,7 +22,7 @@ LDFLAGS+=		${LIBOSSAUDIO}
 
 CONFIGURE_ARGS+=	--disable-warnings
 
-BUILDLINK_TRANSFORM+=   S:-O3:
+BUILDLINK_TRANSFORM+=   rm:-O3
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile
index 0b0da6ee728..b8f12165330 100644
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/05/30 08:14:48 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2004/08/28 06:05:32 jlam Exp $
 
 DISTNAME=		ed2k-gtk-gui-0.6.2
 PKGREVISION=		1
@@ -22,7 +22,7 @@ SUBST_STAGE.shell=	post-patch
 SUBST_FILES.shell=	ed2k_gui/misc.c
 SUBST_SED.shell=	-e 's,/bin/bash,/bin/sh,g'
 
-BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 6ac96f8e549..e05bcab3d8f 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2004/08/05 04:20:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2004/08/28 06:05:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -13,13 +13,13 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenssl}
 BUILDLINK_PACKAGES+=	openssl
 
 .if !empty(OPENSSL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.6m
+BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.6
 BUILDLINK_PKGSRCDIR.openssl?=	../../security/openssl
 
 # Ensure that -lcrypt comes before -lcrypto when linking so that the
 # system crypt() routine is used.
 #
-BUILDLINK_TRANSFORM+=	reorder:l:crypt:crypto
+WRAPPER_REORDER_CMDS+=	reorder:l:crypt:crypto
 
 SSLBASE=	${BUILDLINK_PREFIX.openssl}
 BUILD_DEFS+=	SSLBASE
diff --git a/sysutils/cdrecord-xcdroast/Makefile b/sysutils/cdrecord-xcdroast/Makefile
index 3c6515f3e22..5533e5146a5 100644
--- a/sysutils/cdrecord-xcdroast/Makefile
+++ b/sysutils/cdrecord-xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/05/30 02:19:16 snj Exp $
+# $NetBSD: Makefile,v 1.12 2004/08/28 06:05:32 jlam Exp $
 
 DISTNAME=	cdrtools-2.01a21
 PKGNAME=	cdrecord-xcdroast-0.98a15.2.01a21
@@ -20,8 +20,7 @@ USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
 .if ${LOCALBASE} != "/opt/schily"
-BUILDLINK_TRANSFORM=	r:-I/opt/schily
-BUILDLINK_TRANSFORM+=	r:-L/opt/schily
+BUILDLINK_TRANSFORM=	rmdir:/opt/schily
 .endif
 
 # avoid picking up a bad ${ARCH} during the build
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index ae3f03c77bb..e09397c68d2 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/08/04 21:20:54 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/08/28 06:05:32 jlam Exp $
 
 DISTNAME=	cdrtools-2.01a27
 PKGNAME=	cdrtools-ossdvd-2.01.1.27
@@ -24,8 +24,7 @@ USE_GNU_TOOLS+=		make
 USE_TBL=		yes
 
 .if ${LOCALBASE} != "/opt/schily"
-BUILDLINK_TRANSFORM=	r:/opt/schily
-BUILDLINK_TRANSFORM+=	r:/opt/schily
+BUILDLINK_TRANSFORM+=	rmdir:/opt/schily
 .endif
 
 # avoid picking up a bad ${ARCH} during the build
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 854a0bea7f8..bfa6453c328 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/08/02 16:47:40 recht Exp $
+# $NetBSD: Makefile,v 1.28 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	grub-0.95
@@ -18,7 +18,7 @@ USE_BUILDLINK3=		YES
 
 INFO_FILES=		grub.info multiboot.info
 
-BUILDLINK_TRANSFORM+=	S:-fno-builtin:-ffreestanding:
+BUILDLINK_TRANSFORM+=	rename:-fno-builtin:-ffreestanding
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile
index de523bf6d90..aff610cdea2 100644
--- a/sysutils/gtk-send-pr/Makefile
+++ b/sysutils/gtk-send-pr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/04/20 20:46:39 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=		gtk-send-pr-0.3.3
@@ -13,7 +13,7 @@ COMMENT=		GTK+ based problem report tool
 USE_BUILDLINK3=		yes
 USE_X11=		yes
 
-BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../mail/libesmtp/buildlink3.mk"
diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile
index c90aa1a8e26..c23719a802c 100644
--- a/textproc/p5-XML-Xerces/Makefile
+++ b/textproc/p5-XML-Xerces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/11 04:14:02 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	XML-Xerces-2.3.0-4
@@ -22,7 +22,7 @@ PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Xerces/.packlist
 MAKE_ENV+=	XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}" LANG=""
 
 # Xerces-C is built unthreaded in pkgsrc (for now).
-BUILDLINK_TRANSFORM+=	s:-lpthread:
+BUILDLINK_TRANSFORM+=	rm:-lpthread
 
 BUILDLINK_DEPENDS.xerces-c=     xerces-c>=2.3.0
 .include "../../textproc/xerces-c/buildlink3.mk"
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index b40a7260a92..e2479505817 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/06/21 20:24:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	gnome-themes-extras-0.7
@@ -21,8 +21,8 @@ GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
-BUILDLINK_TRANSFORM+=	S:-DG_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index 12e2cc36695..da75fdde93e 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/17 12:46:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=		gtk-theme-switch-2.0.0rc2
@@ -14,7 +14,7 @@ COMMENT=		Allows quick & easy switching of GTK+ 2.x themes
 USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 
-BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/switch2 \
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index da8b669fb9e..1c61c007775 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/06/14 20:23:30 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=	xpad-1.12
@@ -22,7 +22,7 @@ USE_X11=		yes
 
 LIBS.SunOS=		-lX11
 
-BUILDLINK_TRANSFORM+=	S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"