Remove @dirrm related logic.

6 files changed, 6 insertions, 150 deletions

diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk
index a9ee7fed11e..047eb290851 100644
--- a/x11/gnustep-back/buildlink3.mk
+++ b/x11/gnustep-back/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/04/13 12:21:37 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/06/14 22:58:11 joerg Exp $
 
 BUILDLINK_TREE+=	gnustep-back
 
@@ -9,19 +9,6 @@ BUILDLINK_API_DEPENDS.gnustep-back+=	gnustep-back>=0.9.2
 BUILDLINK_ABI_DEPENDS.gnustep-back+=	gnustep-back>=0.12.0nb1
 BUILDLINK_PKGSRCDIR.gnustep-back?=	../../x11/gnustep-back
 
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/English.lproj$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/Swedish.lproj$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Fonts$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Fonts\/Helvetica.nfont$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/English.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/Swedish.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Fonts$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Fonts\/Helvetica.nfont$$/ { next; }
-
 .include "../../x11/gnustep-gui/buildlink3.mk"
 .endif # GNUSTEP_BACK_BUILDLINK3_MK
 
diff --git a/x11/gnustep-gui/buildlink3.mk b/x11/gnustep-gui/buildlink3.mk
index 33c6d1e5862..a7e694e3d24 100644
--- a/x11/gnustep-gui/buildlink3.mk
+++ b/x11/gnustep-gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/04/13 12:19:14 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/06/14 22:58:11 joerg Exp $
 
 BUILDLINK_TREE+=	gnustep-gui
 
@@ -9,95 +9,6 @@ BUILDLINK_API_DEPENDS.gnustep-gui+=	gnustep-gui>=0.16.0
 BUILDLINK_ABI_DEPENDS.gnustep-gui+=	gnustep-gui>=0.16.0
 BUILDLINK_PKGSRCDIR.gnustep-gui?=	../../x11/gnustep-gui
 
-PRINT_PLIST_AWK+=	/^@dirrm include\/AppKit$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm include\/Cocoa$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm include\/GNUstepGUI$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm include\/gnustep\/gui$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Applications$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/GSPrinting$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/GSPrinting\/GSLPR.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/GSPrinting\/GSLPR.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/TextConverters$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/TextConverters\/RTFConverter.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/TextConverters\/RTFConverter.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/libgmodel.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/libgmodel.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/ColorPickers$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/ColorPickers\/NamedPicker.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/ColorPickers\/NamedPicker.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/ColorPickers\/StandardPicker.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/English.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/French.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/Swedish.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/ColorPickers\/WheelPicker.bundle$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/ColorPickers\/WheelPicker.bundle\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Images$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/KeyBindings$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSDataLinkPanel.gorm$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSPageLayout.gorm$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSPrintPanel.gorm$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSSpellPanel.gorm$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Esperanto.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/German.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Italian.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Lojban.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/PostScript$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/PostScript\/PPD$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/PostScript\/PPD\/English.lproj$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Services$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Services\/GSspell.service$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Services\/GSspell.service\/Resources$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/include\/AppKit$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/include\/Cocoa$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/include\/GNUstepGUI$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/include\/gnustep\/gui$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/GSPrinting$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/GSPrinting\/GSLPR.bundle$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/GSPrinting\/GSLPR.bundle\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/TextConverters$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/TextConverters\/RTFConverter.bundle$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/TextConverters\/RTFConverter.bundle\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgmodel.bundle$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgmodel.bundle\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/NamedPicker.bundle$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/NamedPicker.bundle\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/StandardPicker.bundle$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/English.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/French.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/StandardPicker.bundle\/Resources\/Swedish.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/WheelPicker.bundle$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/ColorPickers\/WheelPicker.bundle\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Images$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/KeyBindings$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSDataLinkPanel.gorm$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSPageLayout.gorm$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSPrintPanel.gorm$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/English.lproj\/GSSpellPanel.gorm$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Esperanto.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/German.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Italian.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Libraries\/gnustep-gui\/Versions\/0.16\/Resources\/Lojban.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/PostScript$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/PostScript\/PPD$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/PostScript\/PPD\/English.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Services$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Services\/GSspell.service$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Services\/GSspell.service\/Resources$$/ { next; }
-
 .include "../../devel/gnustep-base/buildlink3.mk"
 .endif # GNUSTEP_GUI_BUILDLINK3_MK
 
diff --git a/x11/gnustep-preferences/buildlink3.mk b/x11/gnustep-preferences/buildlink3.mk
index 2f483ff2545..4c8752332e7 100644
--- a/x11/gnustep-preferences/buildlink3.mk
+++ b/x11/gnustep-preferences/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/04/19 09:29:57 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/06/14 22:58:11 joerg Exp $
 
 BUILDLINK_TREE+=	gnustep-preferences
 
@@ -12,33 +12,6 @@ BUILDLINK_INCDIRS.gnustep-preferences+=	lib/GNUstep/Frameworks/PrefsModule.frame
 BUILDLINK_FILES.gnustep-preferences+=	lib/GNUstep/Frameworks/PrefsModule.framework/Headers/*.h
 BUILDLINK_FILES.gnustep-preferences+= 	include/PrefsModule/PrefsModule.h
 
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Applications\/Preferences.app$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources\/English.lproj$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Headers$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Preferences$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Preferences\/Keyboard.prefs$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Preferences\/Keyboard.prefs\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources\/English.lproj$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Headers$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Preferences$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Preferences\/Keyboard.prefs$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Preferences\/Keyboard.prefs\/Resources$$/ { next; }
-
 #.include "../../x11/gnustep-back/buildlink3.mk"
 .endif	# GNUSTEP_PREFERENCES_BUILDLINK3_MK
 
diff --git a/x11/gtk-sharp/buildlink3.mk b/x11/gtk-sharp/buildlink3.mk
index 28092ee0b8c..96fc4a3a79d 100644
--- a/x11/gtk-sharp/buildlink3.mk
+++ b/x11/gtk-sharp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/06/14 22:58:11 joerg Exp $
 
 BUILDLINK_TREE+=	gtk-sharp
 
@@ -7,13 +7,6 @@ GTK_SHARP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtk-sharp+=	gtk-sharp>=2.12.1
 BUILDLINK_PKGSRCDIR.gtk-sharp?=		../../x11/gtk-sharp
-
-PRINT_PLIST_AWK+=	/^@dirrm share\/gapi-2.0$$/ \
-				{ print "@comment in gtk-sharp: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/mono\/gtk-sharp-2.0$$/ \
-				{ print "@comment in gtk-sharp: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-sharp-2.0$$/ \
-				{ print "@comment in gtk-sharp: " $$0; next; }
 .endif # GTK_SHARP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gtk-sharp
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 2d75994aa87..75351cdb0bd 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.40 2009/03/20 19:25:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.41 2009/06/14 22:58:11 joerg Exp $
 
 BUILDLINK_TREE+=	gtk2
 
@@ -9,13 +9,6 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
 BUILDLINK_ABI_DEPENDS.gtk2+=	gtk2+>=2.8.17nb1
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
-PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0\/(engines|filesystems|immodules|loaders|modules)$$/ \
-				{ print "@comment in gtk2: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0\/2.10.0$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0\/2.10.0\/(engines|filesystems|immodules|loaders|modules|printbackends)$$/ \
-				{ print "@comment in gtk2: " $$0; next; }
-
 .include "../../mk/bsd.fast.prefs.mk"
 
 pkgbase := gtk2
diff --git a/x11/gtk2/modules.mk b/x11/gtk2/modules.mk
index 6208121d614..56270e9a26a 100644
--- a/x11/gtk2/modules.mk
+++ b/x11/gtk2/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.14 2006/06/15 22:13:59 jlam Exp $
+# $NetBSD: modules.mk,v 1.15 2009/06/14 22:58:11 joerg Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GTK2 modules.  It takes care of rebuilding the corresponding databases at
@@ -38,7 +38,6 @@ DEINSTALL_TEMPLATES+=	../../x11/gtk2/files/loaders.tmpl
 .endif
 
 PRINT_PLIST_AWK+=	/^libdata\/gtk-2.0/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm libdata\/gtk-2.0/ { next; }
 
 .if !defined(_BUILDING_GTK2)
 .  include "../../x11/gtk2/buildlink3.mk"