Remove @dirrm related logic.

6 files changed, 12 insertions, 28 deletions

diff --git a/print/foomatic-ppds/Makefile b/print/foomatic-ppds/Makefile
index b156863f1a9..836760dc829 100644
--- a/print/foomatic-ppds/Makefile
+++ b/print/foomatic-ppds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/10/25 21:04:23 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/14 22:58:08 joerg Exp $
 
 .include "Makefile.common"
 
@@ -26,10 +26,7 @@ CHECK_PORTABILITY_SKIP=		install
 GENERATE_PLIST+=							\
 	( cd ${WRKSRC}/share;						\
 	  ${FIND} ppd -type f -print | ${SORT} -u |			\
-	  ${SED} -e "s|^|share/foomatic/|";				\
-	  ${FIND} ppd -type d -print | ${SORT} -ur |			\
-	  ${SED} -e "s|^|@dirrm share/foomatic/|";			\
-	  ${ECHO} "@dirrm share/foomatic" );
+	  ${SED} -e "s|^|share/foomatic/|" )
 
 do-build:	# nothing
 
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index c01293f2e5b..959f7309440 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2009/02/27 10:00:29 tron Exp $
+# $NetBSD: Makefile,v 1.54 2009/06/14 22:58:08 joerg Exp $
 
 DISTNAME=	magicfilter-1.2
 PKGREVISION=	7
@@ -44,11 +44,10 @@ SUBST_SED.gs=		-e 's,${PREFIX}/bin/gs,${SETENV} TEMP=$${TMPDIR:-/tmp} &,'
 INSTALLATION_DIRS+=	bin ${FILTER_DIR} ${PKGMANDIR}/man8
 
 GENERATE_PLIST+= \
-	(cd ${WRKSRC}/filters;						\
+	cd ${WRKSRC}/filters &&						\
 	for f in *-filter; do						\
 	  ${ECHO} ${FILTER_DIR}/"$$f";					\
-	done;								\
-	${ECHO} "@dirrm ${FILTER_DIR}");
+	done								\
 
 post-install:
 	set -e;								\
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index 05938ccf642..2bba2a9bd7b 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/06/14 22:58:08 joerg Exp $
 
 BUILDLINK_TREE+=	poppler
 
@@ -9,10 +9,6 @@ BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.5.1
 BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.10.0
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler
 
-PRINT_PLIST_AWK+=	/^@exec ..MKDIR. %D\/include\/poppler$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm include\/poppler$$/ \
-				{ print "@comment in poppler: " $$0; next; }
-
 pkgbase := poppler
 .include "../../mk/pkg-build-options.mk"
 .if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk
index 8b5fab47adc..ffdc46bcad9 100644
--- a/print/teTeX/module.mk
+++ b/print/teTeX/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.18 2008/12/07 06:41:51 minskim Exp $
+# $NetBSD: module.mk,v 1.19 2009/06/14 22:58:08 joerg Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX packages.  It takes care of rebuilding the ls-R database
@@ -29,11 +29,11 @@ FILES_SUBST+=		TEX_FONTMAPS=${TEX_FONTMAPS:Q}
 INSTALL_TEMPLATES+=	../../print/teTeX/files/texmf.tmpl
 DEINSTALL_TEMPLATES+=	../../print/teTeX/files/texmf.tmpl
 
-PRINT_PLIST_AWK+=	/^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/ls-R)?$$/ \
+PRINT_PLIST_AWK+=	/^${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/ls-R)?$$/ \
 			{ next; }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/ \
 			{ gsub(/${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, "$${PKG_LOCALTEXMFPREFIX}"); }
-PRINT_PLIST_AWK+=	/^(@dirrm )?${TEXMFDIST:S|${PREFIX}/||:S|/|\\/|g}/ \
+PRINT_PLIST_AWK+=	/^${TEXMFDIST:S|${PREFIX}/||:S|/|\\/|g}/ \
 			{ gsub(/${TEXMFDIST:S|${PREFIX}/||:S|/|\\/|g}/, "$${TEXMFDIST}"); }
 
 .include "../../mk/tex.buildlink3.mk"
diff --git a/print/texlive/module.mk b/print/texlive/module.mk
index ac759970d93..72dcb8a1091 100644
--- a/print/texlive/module.mk
+++ b/print/texlive/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.4 2009/04/17 17:41:23 minskim Exp $
+# $NetBSD: module.mk,v 1.5 2009/06/14 22:58:08 joerg Exp $
 #
 # This Makefile fragment is inteded to be included by packages that build
 # TeX Live packages.
@@ -81,6 +81,3 @@ _texlive-install:
 
 post-extract: _texlive-set-permission
 do-install: _texlive-install
-
-PRINT_PLIST_AWK+=	/^@dirrm share\/texmf/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/doc\/texmf/ { next; }
diff --git a/print/texmf-dirs/dirs.mk b/print/texmf-dirs/dirs.mk
index 6a06d945fd2..41a0366f28e 100644
--- a/print/texmf-dirs/dirs.mk
+++ b/print/texmf-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.9 2006/12/05 21:00:12 minskim Exp $
+# $NetBSD: dirs.mk,v 1.10 2009/06/14 22:58:08 joerg Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -48,11 +48,6 @@ TEXMF_DIRS+=	web2c
 
 .if defined(_USE_TEXMF_DIRS) && !empty(_USE_TEXMF_DIRS)
 DEPENDS+=	texmf-dirs>=${_USE_TEXMF_DIRS}:../../print/texmf-dirs
-
-.  for dir in ${TEXMF_DIRS}
-PRINT_PLIST_AWK+=	/^@dirrm \$${PKG_LOCALTEXMFPREFIX}\/${dir:S|/|\\/|g}$$/ \
-			{ print "@comment In texmf-dirs: " $$0; next; }
-.  endfor
 .endif
 
 .endif			# !defined(DIRS_TEXMF_MK)