[pkgsrc/trunk]: pkgsrc/lang/ruby Move definition of GEM_EXTSDIR and PRINT_PLI...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/262de4561cf1
branches:  trunk
changeset: 632101:262de4561cf1
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Mar 15 12:30:26 2014 +0000

description:
Move definition of GEM_EXTSDIR and PRINT_PLIST_AWK definition block to
appropriate place.  Noted by obache@.

diffstat:

 lang/ruby/gem.mk |  60 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diffs (88 lines):

diff -r cae2bd26778f -r 262de4561cf1 lang/ruby/gem.mk
--- a/lang/ruby/gem.mk  Sat Mar 15 09:20:31 2014 +0000
+++ b/lang/ruby/gem.mk  Sat Mar 15 12:30:26 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gem.mk,v 1.29 2014/03/14 22:31:31 asau Exp $
+# $NetBSD: gem.mk,v 1.30 2014/03/15 12:30:26 taca Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install Ruby gems.
@@ -151,35 +151,6 @@
 USE_RAKE?=             YES
 .endif
 
-.if !empty(RUBY_GEMS_VERSION)
-.if ${_RUBYGEMS_MAJOR} >= 2 && ${_RUBYGEMS_MINORS} >= 2
-GEM_EXTSDIR=   ${GEM_HOME}/extensions/${RUBY_ARCH}/${RUBY_VERSION}/${GEM_NAME}
-.endif
-.endif
-
-# print-PLIST support
-PRINT_PLIST_AWK+=      /${GEM_NAME}\.info$$/ \
-                       { gsub(/${GEM_NAME}\.info/, "$${GEM_NAME}.info"); }
-PRINT_PLIST_AWK+=      /${GEM_NAME}\.(gem|gemspec)$$/ \
-                       { gsub(/${GEM_NAME}\.gem/, "$${GEM_NAME}.gem"); }
-PRINT_PLIST_AWK+=      /${GEM_NAME:S/./[.]/g}[.](gem|gemspec)$$/ \
-       { gsub(/${PKGVERSION_NOREV:S|/|\\/|g}[.]gem/, "$${PKGVERSION}.gem"); }
-.if !empty(GEM_EXTSDIR)
-PRINT_PLIST_AWK+=      /^${GEM_EXTSDIR:S|/|\\/|g}/ \
-               { gsub(/${GEM_EXTSDIR:S|/|\\/|g}/, "$${GEM_EXTSDIR}"); \
-                       print; next; }
-.endif
-PRINT_PLIST_AWK+=      /^${GEM_LIBDIR:S|/|\\/|g}/ \
-       { gsub(/${GEM_LIBDIR:S|/|\\/|g}/, "$${GEM_LIBDIR}"); print; next; }
-PRINT_PLIST_AWK+=      /^${GEM_DOCDIR:S|/|\\/|g}/ \
-                       { next; }
-PRINT_PLIST_AWK+=      /^${GEM_HOME:S|/|\\/|g}/ \
-                       { gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); \
-                       print; next; }
-PRINT_PLIST_AWK+=      /^${RUBY_GEM_BASE:S|/|\\/|g}/ \
-               { gsub(/${RUBY_GEM_BASE:S|/|\\/|g}/, "$${RUBY_GEM_BASE}"); \
-                       print; next; }
-
 # Include this early in case some of its target are needed
 .include "../../lang/ruby/modules.mk"
 
@@ -222,6 +193,12 @@
 . endif
 .endif # !ruby18
 
+.if !empty(RUBY_GEMS_VERSION)
+.if ${_RUBYGEMS_MAJOR} >= 2 && ${_RUBYGEMS_MINORS} >= 2
+GEM_EXTSDIR=   ${GEM_HOME}/extensions/${RUBY_ARCH}/${RUBY_VERSION}/${GEM_NAME}
+.endif
+.endif
+
 CATEGORIES+=   ruby
 MASTER_SITES?= ${MASTER_SITE_RUBYGEMS}
 
@@ -272,6 +249,29 @@
 PLIST_SUBST+=          GEM_EXTSDIR="@comment "
 .endif
 
+# print-PLIST support
+PRINT_PLIST_AWK+=      /${GEM_NAME}\.info$$/ \
+                       { gsub(/${GEM_NAME}\.info/, "$${GEM_NAME}.info"); }
+PRINT_PLIST_AWK+=      /${GEM_NAME}\.(gem|gemspec)$$/ \
+                       { gsub(/${GEM_NAME}\.gem/, "$${GEM_NAME}.gem"); }
+PRINT_PLIST_AWK+=      /${GEM_NAME:S/./[.]/g}[.](gem|gemspec)$$/ \
+       { gsub(/${PKGVERSION_NOREV:S|/|\\/|g}[.]gem/, "$${PKGVERSION}.gem"); }
+.if !empty(GEM_EXTSDIR)
+PRINT_PLIST_AWK+=      /^${GEM_EXTSDIR:S|/|\\/|g}/ \
+               { gsub(/${GEM_EXTSDIR:S|/|\\/|g}/, "$${GEM_EXTSDIR}"); \
+                       print; next; }
+.endif
+PRINT_PLIST_AWK+=      /^${GEM_LIBDIR:S|/|\\/|g}/ \
+       { gsub(/${GEM_LIBDIR:S|/|\\/|g}/, "$${GEM_LIBDIR}"); print; next; }
+PRINT_PLIST_AWK+=      /^${GEM_DOCDIR:S|/|\\/|g}/ \
+                       { next; }
+PRINT_PLIST_AWK+=      /^${GEM_HOME:S|/|\\/|g}/ \
+                       { gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); \
+                       print; next; }
+PRINT_PLIST_AWK+=      /^${RUBY_GEM_BASE:S|/|\\/|g}/ \
+               { gsub(/${RUBY_GEM_BASE:S|/|\\/|g}/, "$${RUBY_GEM_BASE}"); \
+                       print; next; }
+
 ###
 ### gem-extract
 ###