summaryrefslogtreecommitdiff
path: root/Mk/bsd.ruby.mk
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2014-02-15 07:23:56 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2014-02-15 07:23:56 +0000
commit7c6ecde8988e24ccb7d84bc5f616ed50bdd14e82 (patch)
tree321d70a5b78464af77d4a3fadbf474fbefcf8792 /Mk/bsd.ruby.mk
parentgraphics/py-pillow: Update to 2.3.0, Add OPTIONS, Modernise (diff)
- Group common variable declarations together
Reviewed by: swills
Notes
Notes: svn path=/head/; revision=344325
Diffstat (limited to 'Mk/bsd.ruby.mk')
-rw-r--r--Mk/bsd.ruby.mk31
1 files changed, 10 insertions, 21 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 4b5e62cd0160..3aa55e1e7edc 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -181,16 +181,6 @@ RUBY_PORTREVISION= 1
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 484
-RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
-RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
-
-RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION}
-
-RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-1.9/" \
- --with-rubylibprefix="${PREFIX}/lib/ruby" \
- --docdir="${RUBY_DOCDIR}" \
- --with-soname=ruby19
-
#
# PLIST_SUB helpers
#
@@ -206,23 +196,12 @@ RUBY_PORTREVISION= 4
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 353
-RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
-RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
-
-RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION}
-
-RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-2.0/" \
- --with-rubylibprefix="${PREFIX}/lib/ruby" \
- --docdir="${RUBY_DOCDIR}" \
- --with-soname=ruby20
-
#
# PLIST_SUB helpers
#
RUBY19= "@comment "
RUBY20= ""
-
. else
#
# Other versions
@@ -231,6 +210,16 @@ IGNORE= Only ruby 1.9 and 2.0 are supported
. endif
.endif # defined(RUBY_VER)
+RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
+RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
+
+RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION}
+
+RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \
+ --with-rubylibprefix="${PREFIX}/lib/ruby" \
+ --docdir="${RUBY_DOCDIR}" \
+ --with-soname=ruby${RUBY_SUFFIX}
+
CONFIGURE_TARGET?= ${ARCH}-portbld-freebsd${OSREL:C/\..*//}
RUBY_ARCH?= ${ARCH}-freebsd${OSREL:C/\..*//}