The "rename" rule is a published synonym for the "opt" transform rule, however

only the latter is supported by cwrappers.  Change them all to "opt" rules for
consistency and to gain compatibility with cwrappers.

5 files changed, 14 insertions, 14 deletions

diff --git a/lang/ocaml/hacks.mk b/lang/ocaml/hacks.mk
index b1f225d7ae8..f81eeb9fdce 100644
--- a/lang/ocaml/hacks.mk
+++ b/lang/ocaml/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.5 2014/11/25 11:09:51 obache Exp $
+# $NetBSD: hacks.mk,v 1.6 2014/12/15 11:46:35 jperkin Exp $
 
 .if !defined(OCAML_HACKS_MK)
 OCAML_HACKS_MK=	defined
@@ -31,7 +31,7 @@ SUBST_STAGE.no_compact_unwind=	pre-configure
 #.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
 #.  if !empty(CC_VERSION:Mgcc-4.4.*)
 #PKG_HACKS+=		optimisation
-#BUILDLINK_TRANSFORM+=	rename:-O[0-9]*:-O
+#BUILDLINK_TRANSFORM+=	opt:-O[0-9]*:-O
 #.  endif
 #.endif
 
diff --git a/lang/perl5/hacks.mk b/lang/perl5/hacks.mk
index 598af120bb6..08cd9eda417 100644
--- a/lang/perl5/hacks.mk
+++ b/lang/perl5/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.13 2014/06/04 09:19:56 obache Exp $
+# $NetBSD: hacks.mk,v 1.14 2014/12/15 11:46:35 jperkin Exp $
 
 .if !defined(PERL5_HACKS_MK)
 PERL5_HACKS_MK=	defined
@@ -61,7 +61,7 @@ CFLAGS+=	-fno-cse-skip-blocks
 
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "m68k"
 PKG_HACKS+=		m68k-codegen
-BUILDLINK_TRANSFORM+=	rename:-O[0-9]*:-Os
+BUILDLINK_TRANSFORM+=	opt:-O[0-9]*:-Os
 .endif
 
 ### [Fri Jan 31 11:09:04 CST 2014 : schnoebe]
@@ -71,7 +71,7 @@ BUILDLINK_TRANSFORM+=	rename:-O[0-9]*:-Os
 	&& !empty(CC_VERSION:Mgcc-4.*.*)
 # XXX: is there any good way to replace the default -O2 with multiple args?
 PKG_HACKS+=		alpha-optimisation
-#BUILDLINK_TRANSFORM+=  rename:-O[2-9]*:-O2 -fno-tree-ter
+#BUILDLINK_TRANSFORM+=  opt:-O[2-9]*:-O2 -fno-tree-ter
 CFLAGS+=-fno-tree-ter
 .endif
 
diff --git a/lang/ruby193-base/hacks.mk b/lang/ruby193-base/hacks.mk
index 9eca03e1ddb..9a6903f7093 100644
--- a/lang/ruby193-base/hacks.mk
+++ b/lang/ruby193-base/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.5 2013/02/12 12:47:18 taca Exp $
+# $NetBSD: hacks.mk,v 1.6 2014/12/15 11:46:35 jperkin Exp $
 
 .if !defined(RUBY193_BASE_HACKS_MK)
 RUBY193_BASE_HACKS_MK=	defined
@@ -21,7 +21,7 @@ BUILDLINK_TRANSFORM+=	rm:-O[0-9]*
 ### Using -O1 works around.
 .  if !empty(CC_VERSION:Mgcc-4.5.*)
 PKG_HACKS+=		optimisation
-BUILDLINK_TRANSFORM+=	rename:-O2:-O1
+BUILDLINK_TRANSFORM+=	opt:-O2:-O1
 .  endif
 .endif
 
@@ -31,7 +31,7 @@ BUILDLINK_TRANSFORM+=	rename:-O2:-O1
 # and -O1 works around.
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sh3*) && !empty(CC_VERSION:Mgcc-4.5.*)
 PKG_HACKS+=		optimisation
-BUILDLINK_TRANSFORM+=	rename:-Os:-O1 rm:-freorder-blocks
+BUILDLINK_TRANSFORM+=	opt:-Os:-O1 rm:-freorder-blocks
 .endif
 
 .endif	# RUBY193_BASE_HACKS_MK
diff --git a/lang/ruby200-base/hacks.mk b/lang/ruby200-base/hacks.mk
index 9e493eed48b..0944c416aed 100644
--- a/lang/ruby200-base/hacks.mk
+++ b/lang/ruby200-base/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2013/07/21 02:32:58 taca Exp $
+# $NetBSD: hacks.mk,v 1.2 2014/12/15 11:46:35 jperkin Exp $
 
 .if !defined(RUBY200_BASE_HACKS_MK)
 RUBY200_BASE_HACKS_MK=	defined
@@ -21,7 +21,7 @@ BUILDLINK_TRANSFORM+=	rm:-O[0-9]*
 ### Using -O1 works around.
 .  if !empty(CC_VERSION:Mgcc-4.5.*)
 PKG_HACKS+=		optimisation
-BUILDLINK_TRANSFORM+=	rename:-O2:-O1
+BUILDLINK_TRANSFORM+=	opt:-O2:-O1
 .  endif
 .endif
 
@@ -31,7 +31,7 @@ BUILDLINK_TRANSFORM+=	rename:-O2:-O1
 # and -O1 works around.
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sh3*) && !empty(CC_VERSION:Mgcc-4.5.*)
 PKG_HACKS+=		optimisation
-BUILDLINK_TRANSFORM+=	rename:-Os:-O1 rm:-freorder-blocks
+BUILDLINK_TRANSFORM+=	opt:-Os:-O1 rm:-freorder-blocks
 .endif
 
 .endif	# RUBY200_BASE_HACKS_MK
diff --git a/lang/ruby21-base/hacks.mk b/lang/ruby21-base/hacks.mk
index ca9fbb6b4d6..b40e46d71c7 100644
--- a/lang/ruby21-base/hacks.mk
+++ b/lang/ruby21-base/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2014/03/14 19:40:47 taca Exp $
+# $NetBSD: hacks.mk,v 1.2 2014/12/15 11:46:35 jperkin Exp $
 
 .if !defined(RUBY21_BASE_HACKS_MK)
 RUBY21_BASE_HACKS_MK=	defined
@@ -21,7 +21,7 @@ BUILDLINK_TRANSFORM+=	rm:-O[0-9]*
 ### Using -O1 works around.
 .  if !empty(CC_VERSION:Mgcc-4.5.*)
 PKG_HACKS+=		optimisation
-BUILDLINK_TRANSFORM+=	rename:-O2:-O1
+BUILDLINK_TRANSFORM+=	opt:-O2:-O1
 .  endif
 .endif
 
@@ -31,7 +31,7 @@ BUILDLINK_TRANSFORM+=	rename:-O2:-O1
 # and -O1 works around.
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sh3*) && !empty(CC_VERSION:Mgcc-4.5.*)
 PKG_HACKS+=		optimisation
-BUILDLINK_TRANSFORM+=	rename:-Os:-O1 rm:-freorder-blocks
+BUILDLINK_TRANSFORM+=	opt:-Os:-O1 rm:-freorder-blocks
 .endif
 
 .endif	# RUBY21_BASE_HACKS_MK