Depend on gnustep-1.5.1 (via buildlink2)

Fix PLIST to accommodate gnustep-1.5.1 changes
Bump PKGREVISION

2 files changed, 120 insertions, 188 deletions

diff --git a/devel/gnustep-examples/Makefile b/devel/gnustep-examples/Makefile
index 0ae5334fb47..f3fd15626d3 100644
--- a/devel/gnustep-examples/Makefile
+++ b/devel/gnustep-examples/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/28 00:02:06 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/03 04:14:11 rh Exp $
 #
 
 DISTNAME=	gnustep-examples-0.9.7
+PKGREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/devel/gnustep-examples/PLIST b/devel/gnustep-examples/PLIST
index d7b39bb6173..756dd2e6aec 100644
--- a/devel/gnustep-examples/PLIST
+++ b/devel/gnustep-examples/PLIST
@@ -1,275 +1,206 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/28 00:02:06 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/03 04:14:11 rh Exp $
 share/GNUstep/Local/Applications/Calculator.app/Calculator
 share/GNUstep/Local/Applications/Calculator.app/Resources/Calculator.app.tiff
 share/GNUstep/Local/Applications/Calculator.app/Resources/Calculator.desktop
 share/GNUstep/Local/Applications/Calculator.app/Resources/Info-gnustep.plist
-share/GNUstep/Local/Applications/Calculator.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/Calculator
-share/GNUstep/Local/Applications/Calculator.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/library_paths.openapp
+share/GNUstep/Local/Applications/Calculator.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/Calculator
+share/GNUstep/Local/Applications/Calculator.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/library_paths.openapp
 share/GNUstep/Local/Applications/CurrencyConverter.app/CurrencyConverter
 share/GNUstep/Local/Applications/CurrencyConverter.app/Resources/CurrencyConverter.desktop
 share/GNUstep/Local/Applications/CurrencyConverter.app/Resources/Info-gnustep.plist
-share/GNUstep/Local/Applications/CurrencyConverter.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/CurrencyConverter
-share/GNUstep/Local/Applications/CurrencyConverter.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/library_paths.openapp
+share/GNUstep/Local/Applications/CurrencyConverter.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/CurrencyConverter
+share/GNUstep/Local/Applications/CurrencyConverter.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/library_paths.openapp
 share/GNUstep/Local/Applications/GSTest.app/GSTest
 share/GNUstep/Local/Applications/GSTest.app/Resources/GSTest.desktop
 share/GNUstep/Local/Applications/GSTest.app/Resources/Info-gnustep.plist
-share/GNUstep/Local/Applications/GSTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/GSTest
-share/GNUstep/Local/Applications/GSTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/library_paths.openapp
+share/GNUstep/Local/Applications/GSTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/GSTest
+share/GNUstep/Local/Applications/GSTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/library_paths.openapp
 share/GNUstep/Local/Applications/Ink.app/Ink
 share/GNUstep/Local/Applications/Ink.app/Resources/Info-gnustep.plist
 share/GNUstep/Local/Applications/Ink.app/Resources/Ink.desktop
 share/GNUstep/Local/Applications/Ink.app/Resources/Ink_app.tiff
 share/GNUstep/Local/Applications/Ink.app/Resources/Ink_app_Tile.jpg
 share/GNUstep/Local/Applications/Ink.app/Resources/Readme.rtf
-share/GNUstep/Local/Applications/Ink.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/Ink
-share/GNUstep/Local/Applications/Ink.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/library_paths.openapp
+share/GNUstep/Local/Applications/Ink.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/Ink
+share/GNUstep/Local/Applications/Ink.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/library_paths.openapp
 share/GNUstep/Local/Applications/NSBrowserTest.app/NSBrowserTest
 share/GNUstep/Local/Applications/NSBrowserTest.app/Resources/Info-gnustep.plist
 share/GNUstep/Local/Applications/NSBrowserTest.app/Resources/NSBrowserTest.desktop
-share/GNUstep/Local/Applications/NSBrowserTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSBrowserTest
-share/GNUstep/Local/Applications/NSBrowserTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/library_paths.openapp
-share/GNUstep/Local/Applications/NSPanelTest.app/NSPanelTest
-share/GNUstep/Local/Applications/NSPanelTest.app/Resources/Info-gnustep.plist
-share/GNUstep/Local/Applications/NSPanelTest.app/Resources/NSPanelTest.desktop
-share/GNUstep/Local/Applications/NSPanelTest.app/Resources/Test.strings
-share/GNUstep/Local/Applications/NSPanelTest.app/Resources/icon.tiff
-share/GNUstep/Local/Applications/NSPanelTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSPanelTest
-share/GNUstep/Local/Applications/NSPanelTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/library_paths.openapp
+share/GNUstep/Local/Applications/NSBrowserTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSBrowserTest
+share/GNUstep/Local/Applications/NSBrowserTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/library_paths.openapp
 share/GNUstep/Local/Applications/NSScreenTest.app/NSScreenTest
 share/GNUstep/Local/Applications/NSScreenTest.app/Resources/Info-gnustep.plist
 share/GNUstep/Local/Applications/NSScreenTest.app/Resources/NSScreenTest.desktop
-share/GNUstep/Local/Applications/NSScreenTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSScreenTest
-share/GNUstep/Local/Applications/NSScreenTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/library_paths.openapp
-share/GNUstep/Local/Library/Bundles/Composite-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/Composite-test.bundle/Contents/Resources
+share/GNUstep/Local/Applications/NSScreenTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSScreenTest
+share/GNUstep/Local/Applications/NSScreenTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/library_paths.openapp
 share/GNUstep/Local/Library/Bundles/Composite-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/Composite-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/Composite-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/Composite-test
-share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/Composite-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/Composite-test
 share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/CoordinateCheck-test
-share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/CoordinateCheck-test
 share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/GSHbox-test
-share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/GSHbox-test
 share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/KeyboardInput-test
-share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/KeyboardInput-test
 share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSBox-test
-share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSBox-test
 share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSColorList-test
-share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSColorList-test
 share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSColorWell-test
-share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSColorWell-test
 share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSForm-test
-share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSForm-test
 share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSOutlineView-test
-share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSOutlineView-test
 share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSSavePanel-test
-share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSSavePanel-test
 share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSScrollView-test
-share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSScrollView-test
 share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSSecureTextField-test
-share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSSecureTextField-test
 share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSSlider-test
-share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSSlider-test
 share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSSplitView-test
-share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSSplitView-test
 share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSTableView-test
-share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSTableView-test
 share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSTextView-test
-share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSTextView-test
 share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/NSWindowStyleMask-test
-share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/Contents/Info.plist
-share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/Contents/Resources
+share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSWindowStyleMask-test
 share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/Resources/Info.plist
-share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/StringDrawing-test
-@dirrm share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/ix86
+share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/StringDrawing-test
+share/GNUstep/System/Applications/NSPanelTest.app/NSPanelTest
+share/GNUstep/System/Applications/NSPanelTest.app/Resources/Info-gnustep.plist
+share/GNUstep/System/Applications/NSPanelTest.app/Resources/NSPanelTest.desktop
+share/GNUstep/System/Applications/NSPanelTest.app/Resources/Test.strings
+share/GNUstep/System/Applications/NSPanelTest.app/Resources/icon.tiff
+share/GNUstep/System/Applications/NSPanelTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/NSPanelTest
+share/GNUstep/System/Applications/NSPanelTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/library_paths.openapp
+@dirrm share/GNUstep/System/Applications/NSPanelTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/NSPanelTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/System/Applications/NSPanelTest.app/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/NSPanelTest.app/Resources
+@dirrm share/GNUstep/System/Applications/NSPanelTest.app
+@dirrm share/GNUstep/System/Applications
+@dirrm share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSForm-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/NSBox-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle
-@dirrm share/GNUstep/Local/Library/Bundles/Composite-test.bundle/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Library/Bundles/Composite-test.bundle/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Library/Bundles/Composite-test.bundle/ix86
+@dirrm share/GNUstep/Local/Library/Bundles/Composite-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Library/Bundles/Composite-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Library/Bundles/Composite-test.bundle/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Library/Bundles/Composite-test.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/Composite-test.bundle/Contents
 @dirrm share/GNUstep/Local/Library/Bundles/Composite-test.bundle
-@dirrm share/GNUstep/Local/Applications/NSScreenTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Applications/NSScreenTest.app/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Applications/NSScreenTest.app/ix86
+@dirrm share/GNUstep/Local/Library/Bundles
+@dirrm share/GNUstep/Local/Applications/NSScreenTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Applications/NSScreenTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Applications/NSScreenTest.app/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Applications/NSScreenTest.app/Resources
 @dirrm share/GNUstep/Local/Applications/NSScreenTest.app
-@dirrm share/GNUstep/Local/Applications/NSPanelTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Applications/NSPanelTest.app/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Applications/NSPanelTest.app/ix86
-@dirrm share/GNUstep/Local/Applications/NSPanelTest.app/Resources
-@dirrm share/GNUstep/Local/Applications/NSPanelTest.app
-@dirrm share/GNUstep/Local/Applications/NSBrowserTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Applications/NSBrowserTest.app/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Applications/NSBrowserTest.app/ix86
+@dirrm share/GNUstep/Local/Applications/NSBrowserTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Applications/NSBrowserTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Applications/NSBrowserTest.app/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Applications/NSBrowserTest.app/Resources
 @dirrm share/GNUstep/Local/Applications/NSBrowserTest.app
-@dirrm share/GNUstep/Local/Applications/Ink.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Applications/Ink.app/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Applications/Ink.app/ix86
+@dirrm share/GNUstep/Local/Applications/Ink.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Applications/Ink.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Applications/Ink.app/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Applications/Ink.app/Resources
 @dirrm share/GNUstep/Local/Applications/Ink.app
-@dirrm share/GNUstep/Local/Applications/GSTest.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Applications/GSTest.app/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Applications/GSTest.app/ix86
+@dirrm share/GNUstep/Local/Applications/GSTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Applications/GSTest.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Applications/GSTest.app/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Applications/GSTest.app/Resources
 @dirrm share/GNUstep/Local/Applications/GSTest.app
-@dirrm share/GNUstep/Local/Applications/CurrencyConverter.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Applications/CurrencyConverter.app/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Applications/CurrencyConverter.app/ix86
+@dirrm share/GNUstep/Local/Applications/CurrencyConverter.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Applications/CurrencyConverter.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Applications/CurrencyConverter.app/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Applications/CurrencyConverter.app/Resources
 @dirrm share/GNUstep/Local/Applications/CurrencyConverter.app
-@dirrm share/GNUstep/Local/Applications/Calculator.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Applications/Calculator.app/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/Local/Applications/Calculator.app/ix86
+@dirrm share/GNUstep/Local/Applications/Calculator.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
+@dirrm share/GNUstep/Local/Applications/Calculator.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
+@dirrm share/GNUstep/Local/Applications/Calculator.app/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/Local/Applications/Calculator.app/Resources
 @dirrm share/GNUstep/Local/Applications/Calculator.app
+@dirrm share/GNUstep/Local/Applications