Remove @dirrm related logic.

4 files changed, 4 insertions, 28 deletions

diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
index eeffdfe0672..d39d82910ad 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2009/03/20 19:24:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2009/06/14 22:58:04 joerg Exp $
 
 BUILDLINK_TREE+=	evolution-data-server
 
@@ -9,13 +9,6 @@ BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.8.0
 BUILDLINK_ABI_DEPENDS.evolution-data-server?=	evolution-data-server>=2.22.3nb1
 BUILDLINK_PKGSRCDIR.evolution-data-server?=	../../mail/evolution-data-server
 
-PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2\/extensions$$/ \
-		{ print "@comment in evolution-data-server: " $$0; next }
-PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2\/camel-providers$$/ \
-		{ print "@comment in evolution-data-server: " $$0; next }
-PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2$$/ \
-		{ print "@comment in evolution-data-server: " $$0; next }
-
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
index a56580e4f0f..52830961023 100644
--- a/mail/evolution/buildlink3.mk
+++ b/mail/evolution/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/06/14 22:58:04 joerg Exp $
 
 BUILDLINK_TREE+=	evolution
 
@@ -9,15 +9,6 @@ BUILDLINK_API_DEPENDS.evolution+=	evolution>=2.8.0
 BUILDLINK_ABI_DEPENDS.evolution?=	evolution>=2.22.3.1nb1
 BUILDLINK_PKGSRCDIR.evolution?=	../../mail/evolution
 
-PRINT_PLIST_AWK+=	/^@dirrm lib\/evolution\/2.10$$/ \
-				{ print "@comment in evolution: " $$0; next }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/evolution$$/ \
-				{ print "@comment in evolution: " $$0; next }
-PRINT_PLIST_AWK+=	/^@dirrm libexec\/evolution\/2.10$$/ \
-				{ print "@comment in evolution: " $$0; next }
-PRINT_PLIST_AWK+=	/^@dirrm libexec\/evolution$$/ \
-				{ print "@comment in evolution: " $$0; next }
-
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index eb359500992..5bcbc2a1f41 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2009/06/14 22:58:04 joerg Exp $
 #
 
 DISTNAME=		MailScanner-4.30.3-2
@@ -140,10 +140,5 @@ post-install:
 		| ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g" \
 		>> ${PLIST_SRC}
 .endfor
-.for _dir_ in ${DOCSDIR} ${EGDIR} ${LIBDIR} ${LIBEXECDIR}
-	${FIND} ${DESTDIR}${_dir_} -type d -print \
-		| ${SORT} -r | ${SED} -e "s,${DESTDIR}${PREFIX}/,@dirrm ,g" \
-		>> ${PLIST_SRC}
-.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 1811be42bba..ea513c19ebe 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2009/05/19 08:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2009/06/14 22:58:04 joerg Exp $
 
 DISTNAME=	Mail-SpamAssassin-3.2.5
 PKGNAME=	spamassassin-3.2.5
@@ -166,9 +166,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR}
-	set -e ; { for d in ${SA_INSTALLDIRS}; do			\
-		${ECHO} "@dirrm $$d";					\
-	done; } | ${SORT} -r >> ${PLIST_ADD};
 
 # make sure we install the patched version of init.pre but can run the
 # tests with the original file