summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorobache <obache>2012-01-12 08:43:22 +0000
committerobache <obache>2012-01-12 08:43:22 +0000
commitbaf7bcf69b829ee6c9cf88193ec2b464fec96c5d (patch)
treedadd48de83e039c3dbb5eee187e888376be476fd /lang
parentbf4991a957b6d2e090bce1a48ba25c9440832e17 (diff)
downloadpkgsrc-baf7bcf69b829ee6c9cf88193ec2b464fec96c5d.tar.gz
Move PRINT_PLIST_AWK stuff for Gems before other ruby related PRINT_PLIST_AWK
will be added, or not works as expected.
Diffstat (limited to 'lang')
-rw-r--r--lang/ruby/gem.mk34
1 files changed, 17 insertions, 17 deletions
diff --git a/lang/ruby/gem.mk b/lang/ruby/gem.mk
index ab03fc80ecd..e96db684e7f 100644
--- a/lang/ruby/gem.mk
+++ b/lang/ruby/gem.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gem.mk,v 1.10 2011/12/13 15:47:06 taca Exp $
+# $NetBSD: gem.mk,v 1.11 2012/01/12 08:43:22 obache Exp $
#
# This Makefile fragment is intended to be included by packages that build
# and install Ruby gems.
@@ -114,6 +114,22 @@ USE_RAKE= YES
USE_TOOLS+= expr
.endif
+# print-PLIST support
+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"); }
+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"
@@ -207,22 +223,6 @@ PLIST_SUBST+= GEM_NAME=${GEM_NAME}
PLIST_SUBST+= GEM_LIBDIR=${GEM_LIBDIR}
PLIST_SUBST+= GEM_DOCDIR=${GEM_DOCDIR}
-# print-PLIST support
-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"); }
-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
###