Adopted to work with GNUstep 0.9.0

2 files changed, 59 insertions, 116 deletions

diff --git a/devel/gnustep-examples/Makefile b/devel/gnustep-examples/Makefile
index e24f5d854cf..06007373eca 100644
--- a/devel/gnustep-examples/Makefile
+++ b/devel/gnustep-examples/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:30:53 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/12/05 10:20:27 adam Exp $
 #
 
 DISTNAME=	gnustep-examples-0.9.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -10,11 +10,11 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	Some GUI programming examples for GNUstep
 
-USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
-USE_X11=	YES
-MAKEFILE=	GNUmakefile
-NO_CONFIGURE=	YES
+USE_BUILDLINK2=		YES
+USE_GMAKE=		YES
+USE_X11=		YES
+MAKEFILE=		GNUmakefile
+NO_CONFIGURE=		YES
 
 .include "../../x11/gnustep-back/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
diff --git a/devel/gnustep-examples/PLIST b/devel/gnustep-examples/PLIST
index 756dd2e6aec..d05af5eea9d 100644
--- a/devel/gnustep-examples/PLIST
+++ b/devel/gnustep-examples/PLIST
@@ -1,206 +1,149 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/03 04:14:11 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/12/05 10:20:27 adam 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/${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/Calculator.app/library_paths.openapp
+share/GNUstep/Local/Applications/Calculator.app/stamp.make
 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/${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/CurrencyConverter.app/library_paths.openapp
+share/GNUstep/Local/Applications/CurrencyConverter.app/stamp.make
 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/${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/GSTest.app/library_paths.openapp
+share/GNUstep/Local/Applications/GSTest.app/stamp.make
 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/${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/Ink.app/library_paths.openapp
+share/GNUstep/Local/Applications/Ink.app/stamp.make
 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/${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/NSBrowserTest.app/library_paths.openapp
+share/GNUstep/Local/Applications/NSBrowserTest.app/stamp.make
 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/${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/Applications/NSScreenTest.app/library_paths.openapp
+share/GNUstep/Local/Applications/NSScreenTest.app/stamp.make
+share/GNUstep/Local/Library/Bundles/Composite-test.bundle/Composite-test
 share/GNUstep/Local/Library/Bundles/Composite-test.bundle/Resources/Info-gnustep.plist
-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/Composite-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/CoordinateCheck-test
 share/GNUstep/Local/Library/Bundles/CoordinateCheck-test.bundle/Resources/Info-gnustep.plist
-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/CoordinateCheck-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/GSHbox-test
 share/GNUstep/Local/Library/Bundles/GSHbox-test.bundle/Resources/Info-gnustep.plist
-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/GSHbox-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/KeyboardInput-test
 share/GNUstep/Local/Library/Bundles/KeyboardInput-test.bundle/Resources/Info-gnustep.plist
-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/KeyboardInput-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/NSBox-test
 share/GNUstep/Local/Library/Bundles/NSBox-test.bundle/Resources/Info-gnustep.plist
-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/NSBox-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/NSColorList-test
 share/GNUstep/Local/Library/Bundles/NSColorList-test.bundle/Resources/Info-gnustep.plist
-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/NSColorList-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/NSColorWell-test
 share/GNUstep/Local/Library/Bundles/NSColorWell-test.bundle/Resources/Info-gnustep.plist
-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/NSColorWell-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/NSForm-test
 share/GNUstep/Local/Library/Bundles/NSForm-test.bundle/Resources/Info-gnustep.plist
-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/NSForm-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/NSOutlineView-test
 share/GNUstep/Local/Library/Bundles/NSOutlineView-test.bundle/Resources/Info-gnustep.plist
-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/NSOutlineView-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/NSSavePanel-test
 share/GNUstep/Local/Library/Bundles/NSSavePanel-test.bundle/Resources/Info-gnustep.plist
-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/NSSavePanel-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/NSScrollView-test
 share/GNUstep/Local/Library/Bundles/NSScrollView-test.bundle/Resources/Info-gnustep.plist
-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/NSScrollView-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/NSSecureTextField-test
 share/GNUstep/Local/Library/Bundles/NSSecureTextField-test.bundle/Resources/Info-gnustep.plist
-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/NSSecureTextField-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/NSSlider-test
 share/GNUstep/Local/Library/Bundles/NSSlider-test.bundle/Resources/Info-gnustep.plist
-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/NSSlider-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/NSSplitView-test
 share/GNUstep/Local/Library/Bundles/NSSplitView-test.bundle/Resources/Info-gnustep.plist
-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/NSSplitView-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/NSTableView-test
 share/GNUstep/Local/Library/Bundles/NSTableView-test.bundle/Resources/Info-gnustep.plist
-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/NSTableView-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/NSTextView-test
 share/GNUstep/Local/Library/Bundles/NSTextView-test.bundle/Resources/Info-gnustep.plist
-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/NSTextView-test.bundle/stamp.make
+share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/NSWindowStyleMask-test
 share/GNUstep/Local/Library/Bundles/NSWindowStyleMask-test.bundle/Resources/Info-gnustep.plist
-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/NSWindowStyleMask-test.bundle/stamp.make
 share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/StringDrawing-test
+share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/StringDrawing-test
+share/GNUstep/Local/Library/Bundles/StringDrawing-test.bundle/stamp.make
 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}
+share/GNUstep/System/Applications/NSPanelTest.app/library_paths.openapp
+share/GNUstep/System/Applications/NSPanelTest.app/stamp.make
 @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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
-@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
 @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/Library
 @dirrm share/GNUstep/Local/Applications/NSScreenTest.app/Resources
 @dirrm share/GNUstep/Local/Applications/NSScreenTest.app
-@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/${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/${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/${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/${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