Fixed pkglint warnings. The warnings are mostly quoting issues, for

example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html

4 files changed, 23 insertions, 23 deletions

diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common
index 326e27c25c2..31540c430c5 100644
--- a/lang/ruby/Makefile.common
+++ b/lang/ruby/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/03/06 16:42:30 taca Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/12/05 20:50:27 rillig Exp $
 #
 # Ruby base distribution common definition
 
@@ -36,10 +36,10 @@ DIST_SUBDIR?=		${RUBY_DIST_SUBDIR}
 #
 # PLIST substitution
 #
-PLIST_SUBST+=		RUBY_SHLIBVER="${RUBY_SHLIBVER}" \
-			RUBY_SHLIBMAJOR="${RUBY_SHLIBMAJOR}" \
-			RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR} \
-			RUBY_NAME="${RUBY_NAME}"
+PLIST_SUBST+=		RUBY_SHLIBVER=${RUBY_SHLIBVER:Q} \
+			RUBY_SHLIBMAJOR=${RUBY_SHLIBMAJOR:Q} \
+			RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR:Q} \
+			RUBY_NAME=${RUBY_NAME:Q}
 
 # Common macros.
 .if ${OPSYS} == "NetBSD"
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk
index 861d04cd8ca..8d62c1d4107 100644
--- a/lang/ruby/modules.mk
+++ b/lang/ruby/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.12 2005/11/02 07:44:24 taca Exp $
+# $NetBSD: modules.mk,v 1.13 2005/12/05 20:50:27 rillig Exp $
 
 .if !defined(_RUBY_MODULE_MK)
 _RUBY_MODULE_MK=	# defined
@@ -16,7 +16,7 @@ DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base
 .include "../../lang/ruby/buildlink3.mk"
 .endif
 
-CONFIGURE_ENV+=		RUBY=${RUBY} RDOC=${RDOC}
+CONFIGURE_ENV+=		RUBY=${RUBY:Q} RDOC=${RDOC:Q}
 
 #
 # extconf.rb support
diff --git a/lang/ruby/replace.mk b/lang/ruby/replace.mk
index 4d783b0a505..5e83b3584ef 100644
--- a/lang/ruby/replace.mk
+++ b/lang/ruby/replace.mk
@@ -1,7 +1,7 @@
-# $NetBSD: replace.mk,v 1.2 2005/11/02 07:44:33 taca Exp $
+# $NetBSD: replace.mk,v 1.3 2005/12/05 20:50:27 rillig Exp $
 #
 
-.ifndef _RUBY_REPLACE_MK
+.if !defined(_RUBY_REPLACE_MK)
 _RUBY_REPLACE_MK=	# defined
 
 # fix shebang line.
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index 5d9c9905ef4..5060813f0df 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,7 +1,7 @@
-# $NetBSD: rubyversion.mk,v 1.17 2005/11/10 00:17:36 minskim Exp $
+# $NetBSD: rubyversion.mk,v 1.18 2005/12/05 20:50:27 rillig Exp $
 #
 
-.ifndef _RUBYVERSION_MK
+.if !defined(_RUBYVERSION_MK)
 _RUBYVERSION_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
@@ -183,12 +183,12 @@ DIST_SUBDIR?=		${_RUBY_DIST_SUBDIR}
 #
 # MAKE_ENV
 #
-MAKE_ENV+=		RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
-			RUBY_VERSION="${RUBY_VERSION}" \
-			RUBY_VERSION_DEFAULT="${RUBY_VERSION_DEFAULT}"
+MAKE_ENV+=		RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
+			RUBY_VERSION=${RUBY_VERSION:Q} \
+			RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q}
 
-MAKEFLAGS+=		RUBY_VERSION="${RUBY_VERSION}" \
-			RUBY_VERSION_DEFAULT="${RUBY_VERSION_DEFAULT}"
+MAKEFLAGS+=		RUBY_VERSION=${RUBY_VERSION:Q} \
+			RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q}
 
 # PLIST
 #
@@ -206,9 +206,9 @@ PLIST_RUBY_DIRS=	RUBY_LIBDIR="${RUBY_LIBDIR}" \
 #
 # substitutions
 #
-FILES_SUBST+=		RUBY="${RUBY}" RUBY_NAME="${RUBY_NAME}" \
-			RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
-			RUBY_VER="${RUBY_VER}" \
+FILES_SUBST+=		RUBY=${RUBY:Q} RUBY_NAME=${RUBY_NAME:Q} \
+			RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} \
+			RUBY_VER=${RUBY_VER:Q} \
 			${PLIST_RUBY_DIRS}
 
 MESSAGE_SUBST+=		RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
@@ -216,10 +216,10 @@ MESSAGE_SUBST+=		RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
 			RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
 			${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
 
-PLIST_SUBST+=		RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
-			RUBY_VERSION="${RUBY_VERSION}" \
-			RUBY_VER_DIR="${RUBY_VER_DIR}" \
-			RUBY_DLEXT="${RUBY_DLEXT}" \
+PLIST_SUBST+=		RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
+			RUBY_VERSION=${RUBY_VERSION:Q} \
+			RUBY_VER_DIR=${RUBY_VER_DIR:Q} \
+			RUBY_DLEXT=${RUBY_DLEXT:Q} \
 			${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
 
 .endif # _RUBY_MK