svn commit: r344325 - head/Mk

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sat Feb 15 07:23:56 2014
New Revision: 344325
URL: http://svnweb.freebsd.org/changeset/ports/344325
QAT: https://qat.redports.org/buildarchive/r344325/

Log:
  - Group common variable declarations together
  
  Reviewed by:	swills

Modified:
  head/Mk/bsd.ruby.mk

Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk	Sat Feb 15 03:03:18 2014	(r344324)
+++ head/Mk/bsd.ruby.mk	Sat Feb 15 07:23:56 2014	(r344325)
@@ -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 suppor
 . 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/\..*//}