4 files changed, 49 insertions, 46 deletions

diff --git a/lang/gnustep-guile/pkg-plist b/lang/gnustep-guile/pkg-plist
index 779714ef6459..6884819a7080 100644
--- a/lang/gnustep-guile/pkg-plist
+++ b/lang/gnustep-guile/pkg-plist
@@ -1,9 +1,7 @@
-%%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%%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
@@ -36,7 +34,9 @@ System/Library/Libraries/libgstep_guile.so.%%VERSION%%
 System/Library/Libraries/libgstep_guile.so.1
 System/Library/Makefiles/Additional/guile.make
 System/Tools/go
+%%USEX11%%System/Tools/gui
 System/Tools/guile-base
+%%USEX11%%System/Tools/guile-gui
 bin/greg
 info/dir
 @comment @unexec install-info --delete %D/info/greg.info %D/info/dir
diff --git a/lang/gscheme/pkg-plist b/lang/gscheme/pkg-plist
index b69c8b99535e..89e9f573b597 100644
--- a/lang/gscheme/pkg-plist
+++ b/lang/gscheme/pkg-plist
@@ -4,7 +4,7 @@ Local/Applications/GScheme.app/Resources/GScheme.tiff
 Local/Applications/GScheme.app/Resources/Info-gnustep.plist
 Local/Applications/GScheme.app/Resources/lambda1.tiff
 Local/Applications/GScheme.app/Resources/library.scm
-Local/Applications/GScheme.app/library_paths.openapp
 Local/Applications/GScheme.app/stamp.make
+Local/Tools/GScheme
 @dirrm Local/Applications/GScheme.app/Resources
 @dirrm Local/Applications/GScheme.app
diff --git a/lang/steptalk/Makefile b/lang/steptalk/Makefile
index 84cd65103a7d..53f15a6b52d6 100644
--- a/lang/steptalk/Makefile
+++ b/lang/steptalk/Makefile
@@ -24,5 +24,6 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/StepTalk
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 
 .include <bsd.port.mk>
diff --git a/lang/steptalk/pkg-plist b/lang/steptalk/pkg-plist
index c0355feb5577..5dbb9148458a 100644
--- a/lang/steptalk/pkg-plist
+++ b/lang/steptalk/pkg-plist
@@ -9,46 +9,48 @@ Local/Library/Bundles/ApplicationScripting.bundle/Resources/Info-gnustep.plist
 Local/Library/Bundles/ApplicationScripting.bundle/stamp.make
 Local/Library/Frameworks/StepTalk.framework/Headers
 Local/Library/Frameworks/StepTalk.framework/Resources
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/NSInvocation+additions.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/NSObject+additions.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STActor.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STBundleInfo.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STContext.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STConversation.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STEngine.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STEnvironment.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STEnvironmentDescription.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STExterns.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STFileScript.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STFunctions.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STLanguageManager.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STMethod.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STObjCRuntime.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STObjectReference.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STRemoteConversation.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STScript.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STScriptObject.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STScripting.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STScriptsManager.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STSelector.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/STUndefinedObject.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers/StepTalk.h
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/AppKit.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Common.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Distributed.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Foundation-operators.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Foundation.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Safe.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/Standard.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/StepTalk.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments/SymbolicSelectors.stenv
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/ScriptingInfo.plist
-Local/Library/Frameworks/StepTalk.framework/Versions/A/StepTalk
-Local/Library/Frameworks/StepTalk.framework/Versions/A/libStepTalk.so
-Local/Library/Frameworks/StepTalk.framework/Versions/A/libStepTalk.so.%%MAJORVERSION%%
-Local/Library/Frameworks/StepTalk.framework/Versions/A/libStepTalk.so.%%VERSION%%
+Local/Library/Frameworks/StepTalk.framework/StepTalk
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSInvocation+additions.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject+additions.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STActor.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STBundleInfo.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STContext.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STConversation.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STEngine.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STEnvironment.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STEnvironmentDescription.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STExterns.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STFileScript.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STFunctions.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STLanguageManager.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STMethod.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STObjCRuntime.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STObjectReference.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STRemoteConversation.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STScript.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STScriptObject.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STScripting.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STScriptsManager.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STSelector.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/STUndefinedObject.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers/StepTalk.h
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/AppKit.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Common.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Distributed.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Foundation-operators.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Foundation.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Safe.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/Standard.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/StepTalk.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments/SymbolicSelectors.stenv
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/ScriptingInfo.plist
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/StepTalk
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/libStepTalk.so
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/libStepTalk.so.%%MAJORVERSION%%
+Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/libStepTalk.so.%%VERSION%%
 Local/Library/Frameworks/StepTalk.framework/Versions/Current
+Local/Library/Frameworks/StepTalk.framework/libStepTalk.so
 Local/Library/Headers/StepTalk
 Local/Library/Libraries/libStepTalk.so
 Local/Library/Libraries/libStepTalk.so.%%MAJORVERSION%%
@@ -98,10 +100,10 @@ Local/Tools/stexec
 @dirrm Local/Library/StepTalk/Finders/ApplicationFinder.bundle
 @dirrm Local/Library/StepTalk/Finders
 @dirrm Local/Library/StepTalk
-@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources/Environments
-@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/A
+@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources/Environments
+@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/StepTalk.framework/Versions/%%MAJORLIBVERSION%%
 @dirrm Local/Library/Frameworks/StepTalk.framework/Versions
 @dirrm Local/Library/Frameworks/StepTalk.framework
 @dirrm Local/Library/Bundles/ApplicationScripting.bundle/Resources/English.lproj/TranscriptWindow.gorm