Remove @dirrm related logic.

2 files changed, 15 insertions, 41 deletions

diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk
index 62befd9046f..8242dddf44f 100644
--- a/lang/ruby/modules.mk
+++ b/lang/ruby/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.26 2009/05/16 07:22:04 rillig Exp $
+# $NetBSD: modules.mk,v 1.27 2009/06/14 22:58:03 joerg Exp $
 
 .if !defined(_RUBY_MODULE_MK)
 _RUBY_MODULE_MK=	# defined
@@ -163,14 +163,4 @@ ruby-simple-install:
 .endif # USE_RUBY_INSTALL
 
 .include "replace.mk"
-
-PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_SITEARCHLIB:S|/|\\/|g}$$/ \
-			{ next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_SITELIB:S|/|\\/|g}$$/ \
-			{ next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_VENDORARCHLIB:S|/|\\/|g}$$/ \
-			{ next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_VENDORLIB:S|/|\\/|g}$$/ \
-			{ next; }
-
 .endif
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index 06875e78902..b3627a2c129 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.46 2009/06/10 12:45:34 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.47 2009/06/14 22:58:03 joerg Exp $
 #
 
 .if !defined(_RUBYVERSION_MK)
@@ -305,13 +305,9 @@ RUBY_PLIST_COMMENT_CMD= \
 RUBY_PLIST_FILES_CMD= ( cd ${DESTDIR}${PREFIX}; \
 	${FIND} ${RUBY_DYNAMIC_DIRS} \( -type f -o -type l \) -print ) | \
 	${SORT} -u
-RUBY_PLIST_DIRS_CMD= ( cd ${DESTDIR}${PREFIX}; \
-	${FIND} ${RUBY_DYNAMIC_DIRS} -type d -print ) | ${SORT} -ru | \
-	${SED} -e 's|^|@dirrm |'
 RUBY_GENERATE_PLIST =	( \
 	${RUBY_PLIST_COMMENT_CMD}; \
-	${RUBY_PLIST_FILES_CMD}; \
-	${RUBY_PLIST_DIRS_CMD} ) > ${RUBY_PLIST_DYNAMIC}
+	${RUBY_PLIST_FILES_CMD} ) > ${RUBY_PLIST_DYNAMIC}
 .endif
 
 .if !empty(RUBY_NOVERSION:M[nN][oO])
@@ -327,52 +323,40 @@ RUBY_GENERATE_PLIST =	( \
 
 PRINT_PLIST_AWK+=	/\.${RUBY_DLEXT}$$/ \
 			{ gsub(/${RUBY_DLEXT}$$/, "$${RUBY_DLEXT}") }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_ARCHLIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${RUBY_ARCHLIB:S|/|\\/|g}/ \
 			{ gsub(/${RUBY_ARCHLIB:S|/|\\/|g}/, "$${RUBY_ARCHLIB}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_VENDORARCHLIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${RUBY_VENDORARCHLIB:S|/|\\/|g}/ \
 			{ gsub(/${RUBY_VENDORARCHLIB:S|/|\\/|g}/, "$${RUBY_VENDORARCHLIB}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_VENDORLIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${RUBY_VENDORLIB:S|/|\\/|g}/ \
 			{ gsub(/${RUBY_VENDORLIB:S|/|\\/|g}/, "$${RUBY_VENDORLIB}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_SITEARCHLIB:S|/|\\/|g}$$/ \
-			{ next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_SITELIB:S|/|\\/|g}$$/ \
-			{ next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_SITEARCHLIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${RUBY_SITEARCHLIB:S|/|\\/|g}/ \
 			{ gsub(/${RUBY_SITEARCHLIB:S|/|\\/|g}/, "$${RUBY_SITEARCHLIB}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_SITELIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${RUBY_SITELIB:S|/|\\/|g}/ \
 			{ gsub(/${RUBY_SITELIB:S|/|\\/|g}/, "$${RUBY_SITELIB}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_SITELIB_BASE:S|/|\\/|g}$$/ \
+PRINT_PLIST_AWK+=	/^${RUBY_SITELIB_BASE:S|/|\\/|g}$$/ \
 			{ gsub(/${RUBY_SITELIB_BASE:S|/|\\/|g}/, "$${RUBY_SITELIB_BASE}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_VENDORLIB_BASE:S|/|\\/|g}$$/ \
+PRINT_PLIST_AWK+=	/^${RUBY_VENDORLIB_BASE:S|/|\\/|g}$$/ \
 			{ gsub(/${RUBY_VENDORLIB_BASE:S|/|\\/|g}/, "$${RUBY_VENDORLIB_BASE}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_LIB:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${RUBY_LIB:S|/|\\/|g}/ \
 			{ gsub(/${RUBY_LIB:S|/|\\/|g}/, "$${RUBY_LIB}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_DOC:S|/|\\/|g}$$/ \
-			{ next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_DOC:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${RUBY_DOC:S|/|\\/|g}/ \
 			{ gsub(/${RUBY_DOC:S|/|\\/|g}/, "$${RUBY_DOC}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_EG:S|/|\\/|g}$$/ \
-			{ next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_EG:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${RUBY_EG:S|/|\\/|g}/ \
 			{ gsub(/${RUBY_EG:S|/|\\/|g}/, "$${RUBY_EG}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_SITERIDIR:S|/|\\/|g}$$/ \
-			{ next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_SITERIDIR:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${RUBY_SITERIDIR:S|/|\\/|g}/ \
 			{ gsub(/${RUBY_SITERIDIR:S|/|\\/|g}/, "$${RUBY_SITERIDIR}"); \
 			print; next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${RUBY_SYSRIDIR:S|/|\\/|g}$$/ \
-			{ next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${RUBY_SYSRIDIR:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${RUBY_SYSRIDIR:S|/|\\/|g}/ \
 			{ gsub(/${RUBY_SYSRIDIR:S|/|\\/|g}/, "$${RUBY_SYSRIDIR}"); \
 			print; next; }