- Layout for GnuSTEP 1.8.0

3 files changed, 53 insertions, 95 deletions

diff --git a/devel/projectcenter.app/pkg-plist b/devel/projectcenter.app/pkg-plist
index 595227181f36..53839f64c9bc 100644
--- a/devel/projectcenter.app/pkg-plist
+++ b/devel/projectcenter.app/pkg-plist
@@ -1,5 +1,4 @@
-%%GNUSTEP_STABLE%%System/Applications/ProjectCenter.app/%%NOFLAT%%ProjectCenter
-System/Applications/ProjectCenter.app/%%NOFLAT%%library_paths.openapp
+System/Applications/ProjectCenter.app/library_paths.openapp
 System/Applications/ProjectCenter.app/ProjectCenter
 System/Applications/ProjectCenter.app/Resources/ButtonTile.tiff
 System/Applications/ProjectCenter.app/Resources/FileIcon_.c.tiff
@@ -7,7 +6,7 @@ System/Applications/ProjectCenter.app/Resources/FileIcon_.h.tiff
 System/Applications/ProjectCenter.app/Resources/FileIcon_.m.tiff
 System/Applications/ProjectCenter.app/Resources/FileIcon_rtf.tiff
 System/Applications/ProjectCenter.app/Resources/Info-gnustep.plist
-System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/%%NOFLAT%%PCAppProj
+System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/PCAppProj
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/AppController.h
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/AppController.m
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/GNUmakefile.postamble
@@ -16,7 +15,7 @@ System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/Info-
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/PC.proj
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/main.m
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/stamp.make
-System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/%%NOFLAT%%PCBaseFileTypes
+System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/PCBaseFileTypes
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/cfile.template
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/cheader.template
@@ -25,25 +24,25 @@ System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/header.template
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/protocol.template
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/stamp.make
-System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/%%NOFLAT%%PCBundleProj
+System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/PCBundleProj
 System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/Resources/PC.proj
 System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/stamp.make
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/nsviewclass.template
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/nsviewheader.template
-System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/%%NOFLAT%%PCGormProj
+System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/PCGormProj
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources/PC.proj
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources/baseInterface.classes
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources/baseInterface.gorm
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources/main.m
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/stamp.make
-System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/%%NOFLAT%%PCLibProj
+System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/PCLibProj
 System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/Resources/PC.proj
 System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/Resources/Version
 System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/stamp.make
-System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/%%NOFLAT%%PCRenaissanceProj
+System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/PCRenaissanceProj
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources/PC.proj
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources/main.m
@@ -53,7 +52,7 @@ System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resourc
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources/MainMenu-GNUstep.gsmarkup
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources/MainMenu-OSX.gsmarkup
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/stamp.make
-System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/%%NOFLAT%%PCToolProj
+System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/PCToolProj
 System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/Resources/Info-project.plist
 System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/Resources/PC.proj
@@ -81,84 +80,59 @@ System/Applications/ProjectCenter.app/Resources/ProjectCenter_settings.tiff
 System/Applications/ProjectCenter.app/Resources/ProjectCenter_uml.tiff
 System/Applications/ProjectCenter.app/Resources/Stop.tiff
 System/Applications/ProjectCenter.app/stamp.make
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/FileCreator.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCBrowserController.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCBundleLoader.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCButton.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCDataSource.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCDefines.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCEditor+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCEditor.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCEditorController.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCEditorView+Highlighting.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCEditorView.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCFileManager+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCFileManager.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCHistoryController.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCMakefileFactory.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProject+ComponentHandling.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProject.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProject+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectBuilder.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectDebugger+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectDebugger.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectEditor.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectManager+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectManager.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCServer.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCSplitView.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCTextFinder+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCTextFinder.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PreferenceController.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectBuilder.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectCenter.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectComponent.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectDebugger.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectEditor.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectType.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/Server.h
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libProjectCenter.so
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libProjectCenter.so.0
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libProjectCenter.so.%%VERSION%%
-@dirrm %%SYSTEMLIBRARY%%/Headers/ProjectCenter
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/%%GNU_ARCH%%
+System/Library/Headers/ProjectCenter/FileCreator.h
+System/Library/Headers/ProjectCenter/PCBrowserController.h
+System/Library/Headers/ProjectCenter/PCBundleLoader.h
+System/Library/Headers/ProjectCenter/PCButton.h
+System/Library/Headers/ProjectCenter/PCDataSource.h
+System/Library/Headers/ProjectCenter/PCDefines.h
+System/Library/Headers/ProjectCenter/PCEditor+UInterface.h
+System/Library/Headers/ProjectCenter/PCEditor.h
+System/Library/Headers/ProjectCenter/PCEditorController.h
+System/Library/Headers/ProjectCenter/PCEditorView+Highlighting.h
+System/Library/Headers/ProjectCenter/PCEditorView.h
+System/Library/Headers/ProjectCenter/PCFileManager+UInterface.h
+System/Library/Headers/ProjectCenter/PCFileManager.h
+System/Library/Headers/ProjectCenter/PCHistoryController.h
+System/Library/Headers/ProjectCenter/PCMakefileFactory.h
+System/Library/Headers/ProjectCenter/PCProject+ComponentHandling.h
+System/Library/Headers/ProjectCenter/PCProject.h
+System/Library/Headers/ProjectCenter/PCProject+UInterface.h
+System/Library/Headers/ProjectCenter/PCProjectBuilder.h
+System/Library/Headers/ProjectCenter/PCProjectDebugger+UInterface.h
+System/Library/Headers/ProjectCenter/PCProjectDebugger.h
+System/Library/Headers/ProjectCenter/PCProjectEditor.h
+System/Library/Headers/ProjectCenter/PCProjectManager+UInterface.h
+System/Library/Headers/ProjectCenter/PCProjectManager.h
+System/Library/Headers/ProjectCenter/PCServer.h
+System/Library/Headers/ProjectCenter/PCSplitView.h
+System/Library/Headers/ProjectCenter/PCTextFinder+UInterface.h
+System/Library/Headers/ProjectCenter/PCTextFinder.h
+System/Library/Headers/ProjectCenter/PreferenceController.h
+System/Library/Headers/ProjectCenter/ProjectBuilder.h
+System/Library/Headers/ProjectCenter/ProjectCenter.h
+System/Library/Headers/ProjectCenter/ProjectComponent.h
+System/Library/Headers/ProjectCenter/ProjectDebugger.h
+System/Library/Headers/ProjectCenter/ProjectEditor.h
+System/Library/Headers/ProjectCenter/ProjectType.h
+System/Library/Headers/ProjectCenter/Server.h
+System/Library/Libraries/libProjectCenter.so
+System/Library/Libraries/libProjectCenter.so.0
+System/Library/Libraries/libProjectCenter.so.%%VERSION%%
+@dirrm System/Library/Headers/ProjectCenter
 @dirrm System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources
 @dirrm System/Applications/ProjectCenter.app
-%%GNUSTEP_STABLE%%@dirrm System/Applications
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 9a8a723ec810..4f625d900e5a 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -47,22 +47,10 @@ GNUSTEP_NETWORK_ROOT=	${GNUSTEP_PREFIX}/Network
 GNUSTEP_USER_ROOT=	${GNUSTEP_PREFIX}/Local/Users
 GNUSTEP_MAKEFILES=	${GNUSTEP_SYSTEM_ROOT}/Makefiles
 
-.if defined(WITH_GNUSTEP_DEVEL)
 BACKBUNDLEDIR=	${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle
 SYSLIBDIR=	${GNUSTEP_PREFIX}/System/Library/Libraries
 COMBOLIBDIR=	${SYSLIBDIR}
-PLIST_SUB+=	LOCALLIBRARY=Local/Library
-PLIST_SUB+=	NOFLAT=""
-PLIST_SUB+=	GNUSTEP_STABLE="@comment "
 MAKE_ENV+=	GNUSTEP_FLATTENED=yes
-.else
-BACKBUNDLEDIR=	${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/
-SYSLIBDIR=	${GNUSTEP_PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}
-COMBOLIBDIR=	${SYSLIBDIR}/gnu-gnu-gnu
-PLIST_SUB+=	LOCALLIBRARY=Local
-PLIST_SUB+=	NOFLAT="${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/"
-PLIST_SUB+=	GNUSTEP_STABLE=""
-.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/ruby-gnustep/pkg-plist b/devel/ruby-gnustep/pkg-plist
index 60ea2d033212..e684c3484859 100644
--- a/devel/ruby-gnustep/pkg-plist
+++ b/devel/ruby-gnustep/pkg-plist
@@ -63,15 +63,11 @@
 %%RUBY_SITELIBDIR%%/rigs/NSWindow.rb
 %%RUBY_SITEARCHLIBDIR%%/librigs.so
 @dirrm %%RUBY_SITELIBDIR%%/rigs
-GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so.0.2.1
-GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so.0
-GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so
-%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu 2> /dev/null || true
-%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%% 2> /dev/null || true
-%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%% 2> /dev/null || true
-@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries 2> /dev/null || true
-@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Headers 2> /dev/null || true
-@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%% 2> /dev/null || true
+GNUstep/Local/Library/Libraries/librigs.so.0.2.1
+GNUstep/Local/Library/Libraries/librigs.so.0
+GNUstep/Local/Library/Libraries/librigs.so
+@dirrm GNUstep/Local/Library/Libraries
+@dirrm GNUstep/Local/Library
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Base/Simple.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverter.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverterIcon.tiff