Remove @dirrm related logic.

6 files changed, 6 insertions, 24 deletions

diff --git a/textproc/docbook-simple/Makefile b/textproc/docbook-simple/Makefile
index a242f4698d2..eb298c14983 100644
--- a/textproc/docbook-simple/Makefile
+++ b/textproc/docbook-simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/03/04 16:44:28 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2009/06/14 22:58:09 joerg Exp $
 #
 
 DISTNAME=	docbook-simple-1.1
@@ -29,11 +29,6 @@ XML_CATALOGS=	${DTDDIR}/catalog.xml
 XML_ENTRIES=	rewriteSystem http://www.oasis-open.org/docbook/xml/simple/1.1 \
 		${DTDDIR}
 
-# share/xml/docbook is shared with docbook-xml.
-PRINT_PLIST_AWK+=	/^@dirrm share\/xml\/docbook$$/ \
-			{ print "@unexec $${RMDIR} %D/share/xml/docbook" \
-			  " >/dev/null 2>&1"; next }
-
 do-install:
 	${INSTALL_DATA_DIR} ${DTDDIR}
 	(cd ${WRKSRC}; ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index 01f35b898ab..80806ca7282 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/11/03 19:17:39 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2009/06/14 22:58:09 joerg Exp $
 #
 
 DISTNAME=	docbook-xml-4.4
@@ -41,11 +41,6 @@ XML_CATALOGS+= ${DTDDIR}/4.2/catalog-4.1.2
 XML_ENTRIES+=	rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 \
 		${DTDDIR}/4.2
 
-# share/xml/docbook is shared with docbook-simple.
-PRINT_PLIST_AWK+=	/^@dirrm share\/xml\/docbook$$/ \
-			{ print "@unexec $${RMDIR} %D/share/xml/docbook" \
-			  " >/dev/null 2>&1"; next }
-
 pre-install:
 .for ver in ${VER}
 	${INSTALL_DATA_DIR} ${DESTDIR}${DTDDIR}/${ver}
diff --git a/textproc/lout/Makefile b/textproc/lout/Makefile
index b17d133ef0a..61430cb2b1b 100644
--- a/textproc/lout/Makefile
+++ b/textproc/lout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/03/24 19:21:32 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2009/06/14 22:58:09 joerg Exp $
 #
 
 DISTNAME=	lout-3.26
@@ -23,8 +23,6 @@ post-install:
 	(cd ${PREFIX}; ${FIND} share/doc/lout -type f -print >>${PLIST_SRC})
 	(cd ${PREFIX}; ${FIND} share/lout -type f -print >>${PLIST_SRC})
 	${ECHO} "@unexec ${RM} -rf %D/share/doc/lout" >>${PLIST_SRC}
-	(cd ${PREFIX}; ${FIND} -d share/lout -type d -print | \
-	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 4dcbc81e45b..748aecd824e 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/11/03 06:56:24 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2009/06/14 22:58:09 joerg Exp $
 #
 
 DISTNAME=	xmlcatmgr-2.2
@@ -25,8 +25,6 @@ CONF_FILES+=	${EGDIR}/catalog.share.sgml ${PREFIX}/share/sgml/catalog
 CONF_FILES+=	${EGDIR}/catalog.share.xml ${PREFIX}/share/xml/catalog
 REQD_DIRS=	${PREFIX}/share/sgml ${PREFIX}/share/xml
 
-PRINT_PLIST_AWK+=	/^@dirrm share\/(sgml|xml)$$/ { next; }
-
 INSTALLATION_DIRS+=	share/examples/xmlcatmgr
 
 post-build:
diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk
index 41f88a5fa1c..405d2819381 100644
--- a/textproc/xmlcatmgr/buildlink3.mk
+++ b/textproc/xmlcatmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/06/14 22:58:09 joerg Exp $
 #
 # This Makefile fragment is included by packages that use xmlcatmgr.
 #
@@ -34,8 +34,6 @@ SGML_DEFAULT_CATALOG=	${PKG_SYSCONFBASEDIR}/sgml/catalog
 XML_DEFAULT_CATALOG=	${PKG_SYSCONFBASEDIR}/xml/catalog
 .endif
 
-PRINT_PLIST_AWK+=	/^@dirrm share\/(sgml|xml)$$/ \
-				{ print "@comment in xmlcatmgr: " $$0; next }
 .endif # XMLCATMGR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xmlcatmgr
diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk
index 985a54ca3e7..92a3e5ae43a 100644
--- a/textproc/xmlcatmgr/catalogs.mk
+++ b/textproc/xmlcatmgr/catalogs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: catalogs.mk,v 1.18 2006/10/12 08:56:56 dsainty Exp $
+# $NetBSD: catalogs.mk,v 1.19 2009/06/14 22:58:09 joerg Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # catalog files or DTDs.  It takes care of registering them into the right
@@ -58,8 +58,6 @@ DEINSTALL_TEMPLATES+=	../../textproc/xmlcatmgr/files/deinstall.tmpl
 
 PRINT_PLIST_AWK+=	/^share\/(sgml|xml)\/catalog$$/ \
 				{ print "@comment in xmlcatmgr: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/(sgml|xml)$$/ \
-				{ print "@comment in xmlcatmgr: " $$0; next; }
 
 .include "../../textproc/xmlcatmgr/buildlink3.mk"