Adopted to work with GNUstep 0.9.0

6 files changed, 83 insertions, 151 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
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index 54f4f7774b2..e5c8b1fa70a 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:29 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/05 10:23:55 adam Exp $
 #
 
 DISTNAME=	Preferences-1.2.0
 PKGNAME=	gnustep-${DISTNAME:S/P/p/}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=prefsapp/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://prefsapp.sourceforge.net/
 COMMENT=	Application for setting preferences for the GNUstep system
 
-NO_CONFIGURE=	YES
-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
 
 .include "../../x11/gnustep-back/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
diff --git a/x11/gnustep-preferences/PLIST b/x11/gnustep-preferences/PLIST
index ebf7126a512..d8c51a27423 100644
--- a/x11/gnustep-preferences/PLIST
+++ b/x11/gnustep-preferences/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/05/06 05:58:53 rh Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/05 10:23:55 adam Exp $
 share/GNUstep/System/Applications/Preferences.app/Preferences
 share/GNUstep/System/Applications/Preferences.app/Resources/English.lproj/Localizable.strings
 share/GNUstep/System/Applications/Preferences.app/Resources/English.lproj/Preferences.gorm
@@ -6,9 +6,9 @@ share/GNUstep/System/Applications/Preferences.app/Resources/Info-gnustep.plist
 share/GNUstep/System/Applications/Preferences.app/Resources/Preferences.desktop
 share/GNUstep/System/Applications/Preferences.app/Resources/Preferences.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PreferencesInfo.plist
+share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/PrefsApp
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/Info-gnustep.plist
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/PrefsApp.gorm
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/PrefsApp
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/stamp.make
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Appearances.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Keyboard.tiff
@@ -18,47 +18,36 @@ share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Mouse.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Screen.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_SelectSpooler.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsModule.tiff
-share/GNUstep/System/Applications/Preferences.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/Preferences
-share/GNUstep/System/Applications/Preferences.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/library_paths.openapp
+share/GNUstep/System/Applications/Preferences.app/library_paths.openapp
 share/GNUstep/System/Applications/Preferences.app/stamp.make
-share/GNUstep/System/Headers/PrefsModule
-share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/libPrefsModule.so
-share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/libPrefsModule.so.1.0.0
+share/GNUstep/System/Library/Headers/PrefsModule
+share/GNUstep/System/Library/Libraries/libPrefsModule.so
+share/GNUstep/System/Library/Libraries/libPrefsModule.so.1.0.0
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Headers
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Resources
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers/PrefsModule.h
+share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/PrefsModule
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources/Info-gnustep.plist
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources/Info.plist
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/PrefsModule
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/libPrefsModule.so
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/libPrefsModule.so.1.0.0
+share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so
+share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so.1.0.0
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/Current
+share/GNUstep/System/Library/Preferences/Keyboard.prefs/Keyboard
 share/GNUstep/System/Library/Preferences/Keyboard.prefs/Resources/Info-gnustep.plist
 share/GNUstep/System/Library/Preferences/Keyboard.prefs/Resources/Keyboard.gorm
-share/GNUstep/System/Library/Preferences/Keyboard.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/Keyboard
 share/GNUstep/System/Library/Preferences/Keyboard.prefs/stamp.make
-@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/Resources
 @dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs
 @dirrm share/GNUstep/System/Library/Preferences
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources
 @dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers
 @dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A
 @dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions
 @dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework
-@dirrm share/GNUstep/System/Applications/Preferences.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/Preferences.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/Preferences.app/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${GNUSTEP_HOST_CPU}
 @dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources
 @dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs
 @dirrm share/GNUstep/System/Applications/Preferences.app/Resources/English.lproj
 @dirrm share/GNUstep/System/Applications/Preferences.app/Resources
 @dirrm share/GNUstep/System/Applications/Preferences.app
+@dirrm share/GNUsrep/Network/Library/Preferences
+@dirrm share/GNUsrep/Local/Library/Preferences
diff --git a/x11/gnustep-preferences/distinfo b/x11/gnustep-preferences/distinfo
index a12d5e62100..a4919fe256f 100644
--- a/x11/gnustep-preferences/distinfo
+++ b/x11/gnustep-preferences/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2003/04/01 08:07:47 rh Exp $
+$NetBSD: distinfo,v 1.3 2003/12/05 10:23:55 adam Exp $
 
 SHA1 (Preferences-1.2.0.tar.bz2) = eb6b727c4f9eac2fd55237b3a3dc95e00bf748e9
 Size (Preferences-1.2.0.tar.bz2) = 52293 bytes
-SHA1 (patch-aa) = 72234b83635b5adef5a55de7b3c3188245f87a0c
+SHA1 (patch-aa) = ebe63b030deac8865addddcee8e577dd05dae515
 SHA1 (patch-ab) = b2e59ffd762d4e519aa1385a391ece62e92c8530
 SHA1 (patch-ac) = 7916a627f395a3b141d7cb1b07d7fb72f4d98da6
 SHA1 (patch-ad) = aee5e8ae6ba4546991a43c25e12b0bc8d9054139
diff --git a/x11/gnustep-preferences/patches/patch-aa b/x11/gnustep-preferences/patches/patch-aa
index 23fe132bb54..6fd9c5c71bf 100644
--- a/x11/gnustep-preferences/patches/patch-aa
+++ b/x11/gnustep-preferences/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2003/04/01 08:07:47 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/05 10:23:55 adam Exp $
 
 --- GNUmakefile.preamble.orig	Tue Feb 12 14:35:17 2002
 +++ GNUmakefile.preamble
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1 2003/04/01 08:07:47 rh Exp $
  
  # Additional flags to pass to the Objective-C compiler
 -ADDITIONAL_OBJCFLAGS += -Wall -Werror
-+ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Werror
++ADDITIONAL_OBJCFLAGS += -Wall -Wno-import
  
  # Additional flags to pass to the C compiler
 -ADDITIONAL_CFLAGS += -Wall -Werror