Remove @dirrm related logic.

jsonn · Jun 14, 2009 · 4f663bc · 4f663bc
1 parent 55e3cd8
commit 4f663bc
Show file tree

Hide file tree

Showing 141 changed files with 211 additions and 1,048 deletions.
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:23:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/06/14 22:57:58 joerg Exp $
 
 BUILDLINK_TREE+=	arts
 
@@ -9,9 +9,6 @@ BUILDLINK_API_DEPENDS.arts+=	arts>=1.1.4nb1
 BUILDLINK_ABI_DEPENDS.arts+=	arts>=1.5.8nb1
 BUILDLINK_PKGSRCDIR.arts?=	../../audio/arts
 
-PRINT_PLIST_AWK+=	/^@dirrm include\/arts$$/ \
-				{ print "@comment in arts: " $$0; next; }
-
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"

diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/06/14 22:57:58 joerg Exp $
 
 BUILDLINK_TREE+=	audacious
 
@@ -9,11 +9,6 @@ BUILDLINK_API_DEPENDS.audacious+=	audacious>=1.5.0
 BUILDLINK_PKGSRCDIR.audacious?=	../../audio/audacious
 BUILDLINK_DEPMETHOD.audacious?=	build
 
-PRINT_PLIST_AWK+=       /^@dirrm share\/audacious\/images$$/ \
-                                { print "@comment in audacious: " $$0; next; }
-PRINT_PLIST_AWK+=       /^@dirrm share\/audacious$$/ \
-                                { print "@comment in audacious: " $$0; next; }
-
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/06/14 22:57:58 joerg Exp $
 
 BUILDLINK_TREE+=	bmp
 
@@ -9,13 +9,6 @@ BUILDLINK_API_DEPENDS.bmp+=	bmp>=0.9.7rc2nb3
 BUILDLINK_ABI_DEPENDS.bmp?=	bmp>=0.9.7nb5
 BUILDLINK_PKGSRCDIR.bmp?=	../../audio/bmp
 
-PRINT_PLIST_AWK+=	/^@dirrm lib\/bmp\/Input$$/ \
-			{ print "@comment in bmp: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/bmp\/Output$$/ \
-			{ print "@comment in bmp: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/bmp\/Visualization$$/ \
-			{ print "@comment in bmp: " $$0; next; }
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/06/14 22:57:58 joerg Exp $
 
 BUILDLINK_TREE+=	libao
 
@@ -24,8 +24,6 @@ DEPENDS+=	libao-[a-z]*-[0-9]*:../../audio/libao-${_LIBAO_DEFAULT_PLUGIN}
 .    endif
 .  endif
 
-PRINT_PLIST_AWK+=	/^@dirrm lib\/ao\/plugins-2$$/ \
-				{ print "@comment in libao: " $$0; next }
 .endif # LIBAO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libao
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2009/06/05 22:17:08 zafer Exp $
+# $NetBSD: Makefile,v 1.54 2009/06/14 22:57:58 joerg Exp $
 #
 
 DISTNAME=		${SILC_CLIENT_DISTNAME}
@@ -69,11 +69,7 @@ post-install:
 # Create PLIST fragment for Perl modules.
 #
 	@cd ${PREFIX} &&						     \
-		(							     \
-		${FIND} lib/${PKGBASE}/perl5 -type f > ${WRKDIR}/PLIST.perl; \
-		${FIND} lib/${PKGBASE}/perl5 -type d | ${SORT} -r |	     \
-			${SED} 's,^,@dirrm ,g' >> ${WRKDIR}/PLIST.perl	     \
-		)
+		${FIND} lib/${PKGBASE}/perl5 -type f > ${WRKDIR}/PLIST.perl
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"

diff --git a/chat/telepathy-glib/buildlink3.mk b/chat/telepathy-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/06/14 22:57:58 joerg Exp $
 
 BUILDLINK_TREE+=	telepathy-glib
 
@@ -8,9 +8,6 @@ TELEPATHY_GLIB_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.telepathy-glib+=	telepathy-glib>=0.7.18
 BUILDLINK_PKGSRCDIR.telepathy-glib?=	../../chat/telepathy-glib
 
-PRINT_PLIST_AWK+=	/^@dirrm include\/telepathy-1.0$$/ \
-			{ print "@comment in telepathy-glib: " $$0; next; }
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"

diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: cross.mk,v 1.39 2008/05/26 02:13:16 joerg Exp $
+#	$NetBSD: cross.mk,v 1.40 2009/06/14 22:57:58 joerg Exp $
 
 # Shared definitions for building a cross-compile environment.
 
@@ -287,12 +287,8 @@ post-install-plist:
 	@${SED} -e 's|$${TARGET_ARCH}|${TARGET_ARCH}|' \
 		-e 's|$${EGCS_INTVERSION}|${EGCS_INTVERSION}|' \
 		${PLIST_PRE} >${PLIST_SRC}
-	@${ECHO} '@dirrm ${TARGET_ARCH}/bin' >>${PLIST_SRC}
-	@${ECHO} '@exec mkdir -p ${TARGET_ARCH}/include' >>${PLIST_SRC}
-	@${ECHO} '@dirrm ${TARGET_ARCH}/include' >>${PLIST_SRC}
-	@${ECHO} '@exec mkdir -p ${TARGET_ARCH}/lib' >>${PLIST_SRC}
-	@${ECHO} '@dirrm ${TARGET_ARCH}/lib' >>${PLIST_SRC}
-	@${ECHO} '@dirrm ${TARGET_ARCH}' >>${PLIST_SRC}
+	@${ECHO} '@pkgdir ${TARGET_ARCH}/include' >>${PLIST_SRC}
+	@${ECHO} '@pkgdir ${TARGET_ARCH}/lib' >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
 

diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/05/20 00:58:09 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2009/06/14 22:57:58 joerg Exp $
 
 DISTNAME=	freetds-0.82
 PKGREVISION=	2
@@ -56,8 +56,6 @@ GENERATE_PLIST+=	\
 	( cd ${WRKSRC}/doc/doc/${DISTNAME} &&				\
 	  ${FIND} reference userguide -type d -print &&			\
 	  cd ${WRKSRC}/doc && ${FIND} images -type d -print ) |		\
-	${SED} -e "s,^,@dirrm "${DOCDIR:S|${PREFIX}/||:Q}"/," | ${SORT} -r && \
-	${ECHO} "@dirrm "${DOCDIR:S|${PREFIX}/||:Q};
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"

diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/05/20 00:58:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/06/14 22:57:58 joerg Exp $
 
 BUILDLINK_TREE+=	libgda
 
@@ -9,11 +9,6 @@ BUILDLINK_API_DEPENDS.libgda+=	libgda>=2.99.2
 BUILDLINK_ABI_DEPENDS.libgda+=	libgda>=3.0.1
 BUILDLINK_PKGSRCDIR.libgda?=	../../databases/libgda
 
-PRINT_PLIST_AWK+=	/^@dirrm lib\/libgda-3.0\/providers$$/ \
-				{ print "@comment in libgda: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/libgda-3.0$$/ \
-				{ print "@comment in libgda: " $$0; next; }
-
 .include "../../mk/bsd.fast.prefs.mk"
 
 pkgbase := libgda

diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/05/20 00:58:11 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2009/06/14 22:57:58 joerg Exp $
 
 PKGNAME=	postgresql81-client-${BASE_VERS}
 PKGREVISION=	1
@@ -52,11 +52,6 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql81-client
 .for _file_ in pg_service.conf psqlrc
 CONF_FILES+=	${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_}
 .endfor
-.if !empty(PG_SUBPREFIX)
-PLIST_SUBST+=	PG_DIRRM_SUBPREFIX="@dirrm ${PG_SUBPREFIX}"
-.else
-PLIST_SUBST+=	PG_DIRRM_SUBPREFIX="@comment empty line"
-.endif
 
 # XXX work around core dumps with the native libedit
 USE_GNU_READLINE=	yes

diff --git a/databases/postgresql81-client/PLIST b/databases/postgresql81-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 17:43:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/06/14 22:57:58 joerg Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -1469,4 +1469,3 @@ ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/psql.mo
 ${PG_SUBPREFIX}share/postgresql/pg_service.conf.sample
 ${PG_SUBPREFIX}share/postgresql/psqlrc.sample
-${PG_DIRRM_SUBPREFIX}
diff --git a/databases/postgresql82-client/Makefile b/databases/postgresql82-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/05/20 00:58:11 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/06/14 22:57:59 joerg Exp $
 
 PKGNAME=	postgresql82-client-${BASE_VERS}
 PKGREVISION=	1
@@ -54,11 +54,6 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql82-client
 .for _file_ in pg_service.conf psqlrc
 CONF_FILES+=	${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_}
 .endfor
-.if !empty(PG_SUBPREFIX)
-PLIST_SUBST+=	PG_DIRRM_SUBPREFIX="@dirrm ${PG_SUBPREFIX}"
-.else
-PLIST_SUBST+=	PG_DIRRM_SUBPREFIX="@comment empty line"
-.endif
 
 # XXX work around core dumps with the native libedit
 USE_GNU_READLINE=	yes

diff --git a/databases/postgresql82-client/PLIST b/databases/postgresql82-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:43:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/06/14 22:57:59 joerg Exp $
 ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/af/LC_MESSAGES/libpq.mo
 ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/initdb.mo
 ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libpq.mo
@@ -1546,4 +1546,3 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/xplang.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/xtypes.html
 ${PG_SUBPREFIX}share/postgresql/pg_service.conf.sample
 ${PG_SUBPREFIX}share/postgresql/psqlrc.sample
-${PG_DIRRM_SUBPREFIX}
diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/20 00:58:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/14 22:57:59 joerg Exp $
 
 PKGNAME=	postgresql83-client-${BASE_VERS}
 PKGREVISION=	1
@@ -51,11 +51,6 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql83-client
 .for _file_ in pg_service.conf psqlrc
 CONF_FILES+=	${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_}
 .endfor
-.if !empty(PG_SUBPREFIX)
-PLIST_SUBST+=	PG_DIRRM_SUBPREFIX="@dirrm ${PG_SUBPREFIX}"
-.else
-PLIST_SUBST+=	PG_DIRRM_SUBPREFIX="@comment empty line"
-.endif
 
 # XXX work around core dumps with the native libedit
 USE_GNU_READLINE=	yes

diff --git a/databases/postgresql83-client/PLIST b/databases/postgresql83-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:43:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/06/14 22:57:59 joerg Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -1752,4 +1752,3 @@ ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/psql.mo
 ${PG_SUBPREFIX}share/postgresql/pg_service.conf.sample
 ${PG_SUBPREFIX}share/postgresql/psqlrc.sample
-${PG_DIRRM_SUBPREFIX}
diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2009/02/23 09:05:02 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2009/06/14 22:57:59 joerg Exp $
 #
 
 DISTNAME=	shared-mime-info-0.60
@@ -30,8 +30,6 @@ FILES_SUBST+=		UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database"
 
 PRINT_PLIST_AWK+=	/^share\/mime\/packages/ { print; next; }
 PRINT_PLIST_AWK+=	/^share\/mime/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/mime\/packages$$/ { print; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/mime/ { next; }
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

diff --git a/databases/shared-mime-info/mimedb.mk b/databases/shared-mime-info/mimedb.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mimedb.mk,v 1.5 2006/06/15 22:13:58 jlam Exp $
+# $NetBSD: mimedb.mk,v 1.6 2009/06/14 22:57:59 joerg Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # mime customization files.  It takes care of registering them in the global
@@ -18,11 +18,6 @@ FILES_SUBST+=		UPDATE_MIMEDB="${BUILDLINK_PREFIX.shared-mime-info}/bin/update-mi
 
 PRINT_PLIST_AWK+=	/^share\/mime\/packages/ { print; next; }
 PRINT_PLIST_AWK+=	/^share\/mime\// { next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/mime\/packages$$/ \
-				{ print "@comment in shared-mime-info: " $$0; \
-				  next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/mime\// { next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/mime$$/ { next; }
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
 

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2009/05/18 08:26:24 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2009/06/14 22:57:59 joerg Exp $
 #
 
 .include "../../devel/GConf/Makefile.common"
@@ -18,10 +18,6 @@ CONF_FILES=	${EGDIR}/path ${PKG_SYSCONFDIR}/2/path
 CONF_FILES+=	${EGDIR}/org.gnome.GConf.Defaults.conf \
 		${PKG_SYSCONFBASEDIR}/dbus-1/system.d/org.gnome.GConf.Defaults.conf
 
-PRINT_PLIST_AWK+=	/^@dirrm (include\/gconf|lib\/GConf|share\/gconf)$$/ \
-				{ print "@unexec $${RMDIR} -p %D/" $$2 \
-				        " 2>/dev/null || $${TRUE}"; next}
-
 # XXX: We need to use XML_CATALOGS here to register the installed DTD.
 #      But we have to wait until a public identifier is choosen for it.
 

diff --git a/devel/GConf/schemas.mk b/devel/GConf/schemas.mk
@@ -1,4 +1,4 @@
-# $NetBSD: schemas.mk,v 1.1 2007/09/21 12:58:13 wiz Exp $
+# $NetBSD: schemas.mk,v 1.2 2009/06/14 22:57:59 joerg Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GConf schema files.  It takes care of registering them in the GConf
@@ -51,10 +51,6 @@ INSTALL_TEMPLATES+=	${.CURDIR}/../../devel/GConf/files/install.tmpl
 DEINSTALL_TEMPLATES+=	${.CURDIR}/../../devel/GConf/files/deinstall.tmpl
 .endif
 
-PRINT_PLIST_AWK+=	/^@dirrm share\/gconf$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/gconf\/schemas$$/ \
-				{ print "@comment in GConf: " $$0; next; }
-
 .include "../../mk/bsd.prefs.mk"
 .include "../../devel/GConf/buildlink3.mk"
 

diff --git a/devel/bzr/plugin.mk b/devel/bzr/plugin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugin.mk,v 1.1 2008/08/26 01:17:33 epg Exp $
+# $NetBSD: plugin.mk,v 1.2 2009/06/14 22:57:59 joerg Exp $
 
 BZR_PLUGIN_NAME?=	${PKGBASE:S/^bzr-//}
 BZR_PLUGIN_TEST?=	yes
@@ -8,15 +8,6 @@ DEPENDS+=		bzr>=1.6:../../devel/bzr
 
 # stolen from graphics/hicolor-icon-theme
 .include "../../mk/bsd.fast.prefs.mk"
-dirs!=	${GREP} '^@dirrm ${PYSITELIB}' ${.CURDIR}/../../devel/bzr/PLIST | \
-	${CUT} -d ' ' -f 2 | ${SED} 's,\$${PYSITELIB},,'
-.for d in ${dirs}
-PRINT_PLIST_AWK+=	/^@dirrm ${PYSITELIB:S/\//\\\//g}${d:S/\//\\\//g}$$/ \
-			{ \
-			  sub(/${PYSITELIB:S/\//\\\//g}/, "$${PYSITELIB}"); \
-			  print "@comment in bzr: " $$0; next; }
-.endfor
-.undef dirs
 
 .if !defined(TEST_TARGET) && !empty(BZR_PLUGIN_TEST:M[Yy][Ee][Ss])
 # stolen from bzr-svn

diff --git a/devel/distcc/Makefile.common b/devel/distcc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2009/06/13 06:46:41 rillig Exp $
+# $NetBSD: Makefile.common,v 1.9 2009/06/14 22:57:59 joerg Exp $
 # used by devel/distcc-pump/Makefile
 # used by devel/distccmon-gnome/Makefile
 # used by devel/distccmon-gtk/Makefile
@@ -35,8 +35,6 @@ SUBST_MESSAGE.doc=	Fixing paths.
 
 .if empty(PKGNAME:Mdistcc-[0-9]*)
 DEPENDS+=		distcc>=${DISTCC_VERSION}:../../devel/distcc
-PRINT_PLIST_AWK+=	/^@dirrm share\/distcc$$/ \
-				{ print "@comment in distcc: " $$0; next }
 .endif
 
 INSTALLATION_DIRS+=	bin

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2009/06/05 16:08:25 drochner Exp $
+# $NetBSD: Makefile,v 1.163 2009/06/14 22:57:59 joerg Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
@@ -82,11 +82,6 @@ TOOLS_NOOP+=		gtkdoc-rebase
 CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
 .endif
 
-# Handle directories shared with devel/glib.
-PRINT_PLIST_AWK+=	/^@dirrm include\/glib$$/ \
-				{ print "@unexec $${RMDIR} %D/" $$2 \
-				  " 2>/dev/null || $${TRUE}"; next; }
-
 PLIST_VARS+=		fam
 
 .if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1"

diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/06/14 22:57:59 joerg Exp $
 
 BUILDLINK_TREE+=	glib2
 
@@ -9,10 +9,6 @@ BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0
 BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.14.3
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 
-PRINT_PLIST_AWK+=	/^@dirrm lib\/gio$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/gio\/modules$$/ \
-				{ print "@comment in glib2: " $$0; next; }
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"