- Layout for GnuSTEP 1.8.0

2 files changed, 34 insertions, 46 deletions

diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 41658ed..7fcc072 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -48,9 +48,5 @@ GUILE_VER!=	(cd ${PORTSDIR}/lang/guile && make -V GUILE_VER)
 
 pre-configure:
 	${TOUCH} ${WRKSRC}/Greg/ac_nonexistent.h
-.if !defined(WITH_GNUSTEP_DEVEL)
-	${REINPLACE_CMD} -e 's=ROOT/Library/Headers=ROOT/Headers=g' \
-		${WRKSRC}/configure
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/gnustep-guile/pkg-plist b/lang/gnustep-guile/pkg-plist
index 60a0223..6d759ee 100644
--- a/lang/gnustep-guile/pkg-plist
+++ b/lang/gnustep-guile/pkg-plist
@@ -1,42 +1,40 @@
-%%USEX11%%%%GNUSTEP_STABLE%%System/Applications/guile-gui.app/%%NOFLAT%%guile-gui
-%%USEX11%%System/Applications/guile-gui.app/%%NOFLAT%%library_paths.openapp
+%%USEX11%%System/Applications/guile-gui.app/library_paths.openapp
 %%USEX11%%System/Applications/guile-gui.app/Resources/Info-gnustep.plist
 %%USEX11%%System/Applications/guile-gui.app/Resources/guile-gui.desktop
 %%USEX11%%System/Applications/guile-gui.app/guile-gui
 %%USEX11%%System/Applications/guile-gui.app/stamp.make
-%%USEX11%%%%GNUSTEP_STABLE%%System/Applications/gui.app/%%NOFLAT%%gui
-%%USEX11%%System/Applications/gui.app/%%NOFLAT%%library_paths.openapp
+%%USEX11%%System/Applications/gui.app/library_paths.openapp
 %%USEX11%%System/Applications/gui.app/Resources/Info-gnustep.plist
 %%USEX11%%System/Applications/gui.app/Resources/gui.desktop
 %%USEX11%%System/Applications/gui.app/gui
 %%USEX11%%System/Applications/gui.app/stamp.make
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/Guile.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileInterpreter.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileInvocation.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileProcedure.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileSCM.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileScript.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/SKInterpreter.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/SKScript.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/ScriptKit.h
-%%SYSTEMLIBRARY%%/Headers/gnustep/guile/gstep_guile.h
-%%SYSTEMLIBRARY%%/Headers/gnustep/guile/gg_Object.h
-%%SYSTEMLIBRARY%%/Libraries/Guile/languages/gstep-guile.scm
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libScriptKit.so
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libScriptKit.so.1
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libScriptKit.so.1.0.0
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_base.so
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_base.so.%%VERSION%%
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_base.so.1
-%%USEX11%%%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_gui.so
-%%USEX11%%%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_gui.so.%%VERSION%%
-%%USEX11%%%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_gui.so.1
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgstep_guile.so
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgstep_guile.so.%%VERSION%%
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgstep_guile.so.1
+System/Library/Headers/ScriptKit/Guile.h
+System/Library/Headers/ScriptKit/GuileInterpreter.h
+System/Library/Headers/ScriptKit/GuileInvocation.h
+System/Library/Headers/ScriptKit/GuileProcedure.h
+System/Library/Headers/ScriptKit/GuileSCM.h
+System/Library/Headers/ScriptKit/GuileScript.h
+System/Library/Headers/ScriptKit/SKInterpreter.h
+System/Library/Headers/ScriptKit/SKScript.h
+System/Library/Headers/ScriptKit/ScriptKit.h
+System/Library/Headers/gnustep/guile/gstep_guile.h
+System/Library/Headers/gnustep/guile/gg_Object.h
+System/Library/Libraries/Guile/languages/gstep-guile.scm
+System/Library/Libraries/libScriptKit.so
+System/Library/Libraries/libScriptKit.so.1
+System/Library/Libraries/libScriptKit.so.1.0.0
+System/Library/Libraries/libgg_base.so
+System/Library/Libraries/libgg_base.so.%%VERSION%%
+System/Library/Libraries/libgg_base.so.1
+%%USEX11%%System/Library/Libraries/libgg_gui.so
+%%USEX11%%System/Library/Libraries/libgg_gui.so.%%VERSION%%
+%%USEX11%%System/Library/Libraries/libgg_gui.so.1
+System/Library/Libraries/libgstep_guile.so
+System/Library/Libraries/libgstep_guile.so.%%VERSION%%
+System/Library/Libraries/libgstep_guile.so.1
 System/Makefiles/Additional/guile.make
-System/Tools/%%NOFLAT%%go
-System/Tools/%%NOFLAT%%guile-base
+System/Tools/go
+System/Tools/guile-base
 bin/greg
 info/dir
 @comment @unexec install-info --delete %D/info/greg.info %D/info/dir
@@ -46,26 +44,20 @@ lib/libgreg.a
 lib/libgreg.la
 lib/libgreg.so
 lib/libgreg.so.1
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/guile-gui.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/guile-gui.app/%%GNU_ARCH%%/%%OPSYS%%
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/guile-gui.app/%%GNU_ARCH%%
 %%USEX11%%@dirrm System/Applications/guile-gui.app/Resources
 %%USEX11%%@dirrm System/Applications/guile-gui.app
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/gui.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/gui.app/%%GNU_ARCH%%/%%OPSYS%%
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/gui.app/%%GNU_ARCH%%
 %%USEX11%%@dirrm System/Applications/gui.app/Resources
 %%USEX11%%@dirrm System/Applications/gui.app
-@dirrm %%SYSTEMLIBRARY%%/Libraries/Guile/languages/gstep-guile
-@dirrm %%SYSTEMLIBRARY%%/Libraries/Guile/languages
-@dirrm %%SYSTEMLIBRARY%%/Libraries/Guile
-@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep/guile
-@dirrm %%SYSTEMLIBRARY%%/Headers/ScriptKit
+@dirrm System/Library/Libraries/Guile/languages/gstep-guile
+@dirrm System/Library/Libraries/Guile/languages
+@dirrm System/Library/Libraries/Guile
+@dirrm System/Library/Headers/gnustep/guile
+@dirrm System/Library/Headers/ScriptKit
 @dirrm man/man1
 @dirrm man
 @dirrm lib
 @dirrm info
 @dirrm bin
-@exec mkdir -p %D/%%SYSTEMLIBRARY%%/Libraries/Guile/languages/gstep-guile
+@exec mkdir -p %D/System/Library/Libraries/Guile/languages/gstep-guile
 @cwd %%LOCALBASE%%
 share/guile/%%GUILE_VER%%/ice-9/greg.scm