Currently, ruby.port.mk supports a ruby18 FLAVOR for all gem and extconf
ports, which it makes the same as no FLAVOR at all. One of the original
plans to allow building ruby 1.8, ruby 1.9, and jruby packages from the
same port was going to use the ruby18 FLAVOR for ruby 1.8 ports.
However, that was going to complicate updating, so we changed it back so
that no FLAVOR or an empty FLAVOR would build a ruby 1.8 package.
However, we left support so that the ruby18 FLAVOR was converted to the
empty FLAVOR.
Unfortunately, I broke that support in revision 1.35. As nobody noticed
since and nothing uses the ruby18 FLAVOR, I think it's best to remove
it.
Tested on amd64. Looking for OKs.
Jeremy
Index: ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.40
diff -u -p -r1.40 ruby.port.mk
--- ruby.port.mk 2 Dec 2010 01:38:40 -0000 1.40
+++ ruby.port.mk 9 Dec 2010 17:47:40 -0000
@@ -13,7 +13,7 @@ CATEGORIES+= lang/ruby
.if !defined(MODRUBY_REV)
. if ${CONFIGURE_STYLE:L:Mgem} || ${CONFIGURE_STYLE:L:Mextconf}
. if !defined(FLAVORS)
-FLAVORS?= ruby18 ruby19 rbx
+FLAVORS?= ruby19 rbx
. if !${CONFIGURE_STYLE:L:Mext} && !${CONFIGURE_STYLE:L:Mextconf}
FLAVORS+= jruby
. endif
@@ -34,32 +34,24 @@ FULLPKGNAME?= ${MODRUBY_PKG_PREFIX}-${P
# versions of ruby.
SUBST_VARS+= GEM_BIN_SUFFIX
-# The unset flavor is the same as the ruby18 FLAVOR, but the FLAVOR is
-# not set by default, as otherwise it breaks pkg_add -u for previously
-# installed ports.
FLAVOR?=
+# Without a FLAVOR, assume the use of ruby 1.8.
. if empty(FLAVOR)
MODRUBY_REV= 1.8
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
# on the FLAVOR.
-. elif ${FLAVOR:L:Mruby18}
-. if ${FLAVOR:L:Mruby19} || ${FLAVOR:L:Mjruby} || ${FLAVOR:L:Mrbx}
-ERRORS+= "Fatal: Conflicting flavors used: ${FLAVOR}"
-. endif
-FLAVOR= ${FLAVOR:L:Nruby18}
-MODRUBY_REV= 1.8
. elif ${FLAVOR:L:Mruby19}
-. if ${FLAVOR:L:Mruby18} || ${FLAVOR:L:Mjruby} || ${FLAVOR:L:Mrbx}
+. if ${FLAVOR:L:Mjruby} || ${FLAVOR:L:Mrbx}
ERRORS+= "Fatal: Conflicting flavors used: ${FLAVOR}"
. endif
MODRUBY_REV= 1.9
. elif ${FLAVOR:L:Mjruby}
-. if ${FLAVOR:L:Mruby18} || ${FLAVOR:L:Mruby19} || ${FLAVOR:L:Mrbx}
+. if ${FLAVOR:L:Mruby19} || ${FLAVOR:L:Mrbx}
ERRORS+= "Fatal: Conflicting flavors used: ${FLAVOR}"
. endif
MODRUBY_REV= jruby
. elif ${FLAVOR:L:Mrbx}
-. if ${FLAVOR:L:Mruby18} || ${FLAVOR:L:Mruby19} || ${FLAVOR:L:Mjruby}
+. if ${FLAVOR:L:Mruby19} || ${FLAVOR:L:Mjruby}
ERRORS+= "Fatal: Conflicting flavors used: ${FLAVOR}"
. endif
MODRUBY_REV= rbx
