Remove @dirrm related logic.

10 files changed, 15 insertions, 59 deletions

diff --git a/misc/gnome1-dirs/dirs.mk b/misc/gnome1-dirs/dirs.mk
index 0306076fee6..b05001a5e8b 100644
--- a/misc/gnome1-dirs/dirs.mk
+++ b/misc/gnome1-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.4 2005/12/05 20:50:39 rillig Exp $
+# $NetBSD: dirs.mk,v 1.5 2009/06/14 22:58:04 joerg Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -14,12 +14,6 @@ GNOME1_DIRS=		# none yet
 
 .if defined(_USE_GNOME1_DIRS) && !empty(_USE_GNOME1_DIRS)
 DEPENDS+=		gnome1-dirs>=${_USE_GNOME1_DIRS}:../../misc/gnome1-dirs
-
-.  for dir in ${GNOME_DIRS} ${GNOME1_DIRS}
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
-				{ print "@comment in gnome1-dirs: " $$0; next; }
-.  endfor
 .endif
 
 .endif			# !defined(DIRS_GNOME1_MK)
diff --git a/misc/gnome2-dirs/dirs.mk b/misc/gnome2-dirs/dirs.mk
index 3c6657bbfc0..c8fb5606bbb 100644
--- a/misc/gnome2-dirs/dirs.mk
+++ b/misc/gnome2-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.5 2006/03/30 21:14:32 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.6 2009/06/14 22:58:04 joerg Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -20,12 +20,6 @@ GNOME2_DIRS+=		share/gnome/wm-properties
 
 .if defined(_USE_GNOME2_DIRS) && !empty(_USE_GNOME2_DIRS)
 DEPENDS+=		gnome2-dirs>=${_USE_GNOME2_DIRS}:../../misc/gnome2-dirs
-
-.  for dir in ${GNOME_DIRS} ${GNOME2_DIRS}
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
-				{ print "@comment in gnome2-dirs: " $$0; next; }
-.  endfor
 .endif
 
 .endif			# !defined(DIRS_GNOME2_MK)
diff --git a/misc/kde3-dirs/dirs.mk b/misc/kde3-dirs/dirs.mk
index f73cf3321d8..d9623c51419 100644
--- a/misc/kde3-dirs/dirs.mk
+++ b/misc/kde3-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.1.1.1 2007/01/26 02:30:13 markd Exp $
+# $NetBSD: dirs.mk,v 1.2 2009/06/14 22:58:04 joerg Exp $
 #
 
 .if !defined(DIRS_KDE3_MK)
@@ -142,12 +142,6 @@ KDE3_DIRS+=	share/kde/wallpapers
 
 .if defined(_USE_KDE3_DIRS) && !empty(_USE_KDE3_DIRS)
 DEPENDS+=	kde3-dirs>=${_USE_KDE3_DIRS}:../../misc/kde3-dirs
-
-.  for dir in ${KDE3_DIRS}
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+=       /^@dirrm ${dir:S|/|\\/|g}$$/ \
-				{ print "@comment in kde: " $$0; next; }
-.  endfor
 .endif
 
 .endif		# !defined(DIRS_KDE3_MK)
diff --git a/misc/kde4-dirs/dirs.mk b/misc/kde4-dirs/dirs.mk
index a86446e42a0..f1fc908d98f 100644
--- a/misc/kde4-dirs/dirs.mk
+++ b/misc/kde4-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.3 2008/11/06 11:01:21 markd Exp $
+# $NetBSD: dirs.mk,v 1.4 2009/06/14 22:58:05 joerg Exp $
 #
 
 .if !defined(DIRS_KDE4_MK)
@@ -111,12 +111,6 @@ KDE4_DIRS+=	share/kde4/servicetypes
 
 .if defined(_USE_KDE4_DIRS) && !empty(_USE_KDE4_DIRS)
 DEPENDS+=	kde4-dirs>=${_USE_KDE4_DIRS}:../../misc/kde4-dirs
-
-.  for dir in ${KDE4_DIRS}
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+=       /^@dirrm ${dir:S|/|\\/|g}$$/ \
-				{ print "@comment in kde: " $$0; next; }
-.  endfor
 .endif
 
 .endif		# !defined(DIRS_KDE4_MK)
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 768e0d34103..59438cbe710 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2009/04/16 21:42:43 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2009/06/14 22:58:05 joerg Exp $
 #
 
 OO_VER=			2.4.2
@@ -177,9 +177,7 @@ do-install:
 post-install:
 	cd ${DESTDIR}${PREFIX} &&				\
 	find lib/${OO_RELEASE} \! -type d -print |		\
-	sort > ${WRKDIR}/PLIST &&				\
-	find lib/${OO_RELEASE} -type d -print | sort -r |	\
-	awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST
+	sort > ${WRKDIR}/PLIST
 
 # OS specific Makefile
 .if exists(Makefile.${OPSYS})
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index 959c69e2750..49406c867c6 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/05/10 03:41:22 hira Exp $
+# $NetBSD: Makefile,v 1.33 2009/06/14 22:58:05 joerg Exp $
 #
 
 OO_VER=			3.1.0
@@ -185,9 +185,7 @@ do-install:
 post-install:
 	cd ${DESTDIR}${PREFIX} &&				\
 	find lib/${OO_RELEASE} \! -type d -print |		\
-	sort > ${WRKDIR}/PLIST &&				\
-	find lib/${OO_RELEASE} -type d -print | sort -r |	\
-	awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST
+	sort > ${WRKDIR}/PLIST
 
 # OS specific Makefile
 .if exists(Makefile.${OPSYS})
diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index 5f7913cf07f..bf8c6c73299 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/06/12 23:02:57 minskim Exp $
+# $NetBSD: Makefile,v 1.26 2009/06/14 22:58:05 joerg Exp $
 
 DISTNAME=	rubygems-1.3.4
 PKGREVISION=	1
@@ -41,11 +41,9 @@ SUBST_MESSAGE.conf=	Fixing configuration files.
 # Generate a dynamic PLIST for the rubygems documentation directory.
 GENERATE_PLIST+=	\
 	${ECHO} "@comment The following lines are automatically generated." && \
-	( cd ${DESTDIR}${PREFIX} && \
+	cd ${DESTDIR}${PREFIX} && \
 	  ${FIND} ${GEM_DOCDIR:S|${PREFIX}/||} \! -type d -print | \
-		${SORT} && \
-	  ${FIND} ${GEM_DOCDIR:S|${PREFIX}/||} -type d -print | \
-		${SORT} -r | ${SED} -e "s,^,@dirrm ," );
+		${SORT}
 
 .include "../../lang/ruby/modules.mk"
 
diff --git a/misc/theme-dirs/dirs.mk b/misc/theme-dirs/dirs.mk
index 0868626daef..5a717ced16d 100644
--- a/misc/theme-dirs/dirs.mk
+++ b/misc/theme-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.5 2005/12/05 20:50:40 rillig Exp $
+# $NetBSD: dirs.mk,v 1.6 2009/06/14 22:58:05 joerg Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -37,12 +37,6 @@ THEME_DIRS+=		share/themes/Traditional
 
 .if defined(_USE_THEME_DIRS) && !empty(_USE_THEME_DIRS)
 DEPENDS+=		theme-dirs>=${_USE_THEME_DIRS}:../../misc/theme-dirs
-
-.  for dir in ${THEME_DIRS}
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
-				{ print "@comment in theme-dirs: " $$0; next; }
-.  endfor
 .endif
 
 .endif			# !defined(DIRS_THEME_MK)
diff --git a/misc/xdg-dirs/dirs.mk b/misc/xdg-dirs/dirs.mk
index 84448b2f73d..f822c4c073d 100644
--- a/misc/xdg-dirs/dirs.mk
+++ b/misc/xdg-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.7 2006/09/08 16:27:34 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.8 2009/06/14 22:58:05 joerg Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -20,12 +20,6 @@ XDG_DIRS+=		share/themes
 
 .if defined(_USE_XDG_DIRS) && !empty(_USE_XDG_DIRS)
 DEPENDS+=		xdg-dirs>=${_USE_XDG_DIRS}:../../misc/xdg-dirs
-
-.  for dir in ${XDG_DIRS}
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
-				{ print "@comment in xdg-dirs: " $$0; next; }
-.  endfor
 .endif
 
 .endif			# !defined(DIRS_XDG_MK)
diff --git a/misc/xdg-x11-dirs/dirs.mk b/misc/xdg-x11-dirs/dirs.mk
index 2cb79162c8f..4f3054466b4 100644
--- a/misc/xdg-x11-dirs/dirs.mk
+++ b/misc/xdg-x11-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.7 2006/09/08 16:27:34 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.8 2009/06/14 22:58:05 joerg Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -22,9 +22,7 @@ XDG_X11_DIRS+=		share/themes
 DEPENDS+=		xdg-x11-dirs>=${_USE_XDG_X11_DIRS}:../../misc/xdg-x11-dirs
 
 .  for dir in ${XDG_X11_DIRS}
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
-				{ print "@comment in xdg-x11-dirs: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@pkgdir ${dir:S|/|\\/|g}$$/ { next; }
 .  endfor
 .endif