13 files changed, 190 insertions, 149 deletions

diff --git a/devel/fortytwo-encore/pkg-plist b/devel/fortytwo-encore/pkg-plist
index dcfb74a6cc36..df64eab199b0 100644
--- a/devel/fortytwo-encore/pkg-plist
+++ b/devel/fortytwo-encore/pkg-plist
@@ -1,55 +1,57 @@
+Local/Library/Frameworks/Encore.framework/Encore
 Local/Library/Frameworks/Encore.framework/Headers
 Local/Library/Frameworks/Encore.framework/Resources
-Local/Library/Frameworks/Encore.framework/Versions/A/Encore
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECArrayIterator.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECCache.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECCacheItem.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECDefaultLoggingFormatter.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECEmptyIterator.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECEnumeratorIterator.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECExceptions.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECFileLoggingWriter.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECIterator.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECKeyToListMap.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLogger.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLogging.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLoggingConfiguration.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLoggingFormatter.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLoggingWriter.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECLoggingXMLConfiguration.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECMemory.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECNSLogLoggingWriter.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECObject.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECParameterString.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECStack.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECStandardOutput.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECStringUtils.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECTestResult.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECTestSuite.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECTestcase.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControl.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlContext.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlDefaultAllocatorRule.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlDefaultRule.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlDelegateMessageRule.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlEvent.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlReferenceRule.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlRule.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlRuleSelector.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/ECXMLControlState.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Headers/Encore.h
-Local/Library/Frameworks/Encore.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/Encore.framework/Versions/A/libEncore.so
-Local/Library/Frameworks/Encore.framework/Versions/A/libEncore.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/Encore.framework/Versions/A/libEncore.so.%%LIBVERSION%%
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Encore
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECArrayIterator.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECCache.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECCacheItem.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECDefaultLoggingFormatter.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECEmptyIterator.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECEnumeratorIterator.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECExceptions.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECFileLoggingWriter.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECIterator.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECKeyToListMap.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLogger.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLogging.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingConfiguration.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingFormatter.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingWriter.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECLoggingXMLConfiguration.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECMemory.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECNSLogLoggingWriter.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECObject.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECParameterString.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStack.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStandardOutput.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECStringUtils.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestResult.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestSuite.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECTestcase.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControl.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlContext.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDefaultAllocatorRule.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDefaultRule.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlDelegateMessageRule.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlEvent.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlReferenceRule.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlRule.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlRuleSelector.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/ECXMLControlState.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers/Encore.h
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/libEncore.so.%%LIBVERSION%%
 Local/Library/Frameworks/Encore.framework/Versions/Current
+Local/Library/Frameworks/Encore.framework/libEncore.so
 Local/Library/Headers/Encore
 Local/Library/Libraries/libEncore.so
 Local/Library/Libraries/libEncore.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libEncore.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/Encore.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/Encore.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/Encore.framework/Versions/A
+@dirrm Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/Encore.framework/Versions/%%MAJORVERSION%%
 @dirrm Local/Library/Frameworks/Encore.framework/Versions
 @dirrm Local/Library/Frameworks/Encore.framework
 %%PORTDOCS%%%%DOCSDIR%%/ECArrayIterator/Classes/ECArrayIterator/CompositePage.html
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 6e692ebc1a43..6dac5b965d60 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnustep-make
-PORTVERSION=	1.13.0
-PORTREVISION=	4
+PORTVERSION=	2.0.0
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
@@ -33,6 +32,28 @@ GNUSTEP_WITHOUT_LIBOBJC=	yes
 
 post-install:
 	${LN} -s Library/Makefiles ${PREFIX}/System/
+	-${MKDIR} ${PREFIX}/System/Applications
+	-${MKDIR} ${PREFIX}/System/Library/ApplicationSupport
+	-${MKDIR} ${PREFIX}/System/Library/Bundles
+	-${MKDIR} ${PREFIX}/System/Library/ColorPickers
+	-${MKDIR} ${PREFIX}/System/Library/Colors
+	-${MKDIR} ${PREFIX}/System/Library/DocTemplates
+	-${MKDIR} ${PREFIX}/System/Library/Documentation/info
+	-${MKDIR} ${PREFIX}/System/Library/Documentation/man
+	-${MKDIR} ${PREFIX}/System/Library/Documentation/Developer
+	-${MKDIR} ${PREFIX}/System/Library/Documentation/User
+	-${MKDIR} ${PREFIX}/System/Library/Fonts
+	-${MKDIR} ${PREFIX}/System/Library/Frameworks
+	-${MKDIR} ${PREFIX}/System/Library/Headers
+	-${MKDIR} ${PREFIX}/System/Library/Images
+	-${MKDIR} ${PREFIX}/System/Library/KeyBindings
+	-${MKDIR} ${PREFIX}/System/Library/Libraries/Java
+	-${MKDIR} ${PREFIX}/System/Library/Libraries/Resources
+	-${MKDIR} ${PREFIX}/System/Library/PostScript
+	-${MKDIR} ${PREFIX}/System/Library/Services
+	-${MKDIR} ${PREFIX}/System/Library/Sounds
+	-${MKDIR} ${PREFIX}/System/Tools/Java
+	-${MKDIR} ${PREFIX}/System/Tools/Resources
 	-${MKDIR} ${PREFIX}/Local/Applications
 	-${MKDIR} ${PREFIX}/Local/Library/ApplicationSupport
 	-${MKDIR} ${PREFIX}/Local/Library/Bundles
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 16567ab0c336..91b7865e24bf 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnustep-make-1.13.0.tar.gz) = 1d7a434e751c58c6390055c14ada302b
-SHA256 (gnustep-make-1.13.0.tar.gz) = d79c11bada9ccd32d0ab08a0dfbd776731b02103975a22b6b95284046b740e8f
-SIZE (gnustep-make-1.13.0.tar.gz) = 400157
+MD5 (gnustep-make-2.0.0.tar.gz) = d452546f56dbc0c66417bd2059548e71
+SHA256 (gnustep-make-2.0.0.tar.gz) = 12aa107dc7911e21066f8f5d4f05ec9b17be1bd61abef9019b18181db7cef292
+SIZE (gnustep-make-2.0.0.tar.gz) = 441630
diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist
index db474e47809a..844a975401c0 100644
--- a/devel/gnustep-make/pkg-plist
+++ b/devel/gnustep-make/pkg-plist
@@ -59,6 +59,7 @@ System/Library/Makefiles/Master/test-library.make
 System/Library/Makefiles/Master/test-tool.make
 System/Library/Makefiles/Master/tool.make
 System/Library/Makefiles/aggregate.make
+System/Library/Makefiles/app-wrapper.template
 System/Library/Makefiles/application.make
 System/Library/Makefiles/bundle.make
 System/Library/Makefiles/clean_cpu.sh
@@ -66,15 +67,21 @@ System/Library/Makefiles/clean_os.sh
 System/Library/Makefiles/clean_vendor.sh
 System/Library/Makefiles/clibrary.make
 System/Library/Makefiles/common.make
+System/Library/Makefiles/config-noarch.make
 System/Library/Makefiles/config.guess
 System/Library/Makefiles/config.make
 System/Library/Makefiles/config.sub
 System/Library/Makefiles/cpu.sh
 System/Library/Makefiles/ctool.make
 System/Library/Makefiles/documentation.make
+System/Library/Makefiles/empty.make
 System/Library/Makefiles/executable.template
+System/Library/Makefiles/filesystem.sh
+System/Library/Makefiles/filesystem.csh
+System/Library/Makefiles/filesystem.make
 System/Library/Makefiles/fixpath.sh
 System/Library/Makefiles/framework.make
+System/Library/Makefiles/gnustep-make-help
 System/Library/Makefiles/gswapp.make
 System/Library/Makefiles/gswbundle.make
 System/Library/Makefiles/install-sh
@@ -93,12 +100,11 @@ System/Library/Makefiles/native-library.make
 System/Library/Makefiles/objc.make
 System/Library/Makefiles/os.sh
 System/Library/Makefiles/palette.make
+System/Library/Makefiles/print_unique_pathlist.sh
 System/Library/Makefiles/relative_path.sh
 System/Library/Makefiles/resource-set.make
 System/Library/Makefiles/rules.make
 System/Library/Makefiles/service.make
-System/Library/Makefiles/spec-debug-alone-rules.template
-System/Library/Makefiles/spec-debug-rules.template
 System/Library/Makefiles/spec-rules.template
 System/Library/Makefiles/strip_makefiles.sh
 System/Library/Makefiles/tar-exclude-list
@@ -108,15 +114,12 @@ System/Library/Makefiles/test-application.make
 System/Library/Makefiles/test-library.make
 System/Library/Makefiles/test-tool.make
 System/Library/Makefiles/tool.make
-System/Library/Makefiles/transform_paths.sh
 System/Library/Makefiles/vendor.sh
-System/Library/Makefiles/which_lib
 System/Tools/debugapp
+System/Tools/gnustep-config
 System/Tools/openapp
 System/Tools/opentool
-System/share/config.site
 @exec ln -s Library/Makefiles %D/System
-@dirrm System/share
 @dirrm System/Tools/Resources
 @dirrm System/Tools/Java
 @dirrm System/Tools
diff --git a/devel/highlighterkit/pkg-plist b/devel/highlighterkit/pkg-plist
index 647d3644800f..24630aff0651 100644
--- a/devel/highlighterkit/pkg-plist
+++ b/devel/highlighterkit/pkg-plist
@@ -1,27 +1,29 @@
 Local/Library/Frameworks/HighlighterKit.framework/Headers
+Local/Library/Frameworks/HighlighterKit.framework/HighlighterKit
 Local/Library/Frameworks/HighlighterKit.framework/Resources
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Headers/HKSyntaxDefinition.h
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Headers/HKSyntaxHighlighter.h
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Headers/HKTextPattern.h
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Headers/HighlighterKit.h
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/HighlighterKit
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/C++.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/C-Header.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/C.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/ObjC++.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/ObjC.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources/Plist.syntax
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/libHighlighterKit.so
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/libHighlighterKit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/HighlighterKit.framework/Versions/A/libHighlighterKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKSyntaxDefinition.h
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKSyntaxHighlighter.h
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HKTextPattern.h
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/HighlighterKit.h
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/HighlighterKit
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C++.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C-Header.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/C.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ObjC++.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ObjC.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Plist.syntax
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/libHighlighterKit.so.%%LIBVERSION%%
 Local/Library/Frameworks/HighlighterKit.framework/Versions/Current
+Local/Library/Frameworks/HighlighterKit.framework/libHighlighterKit.so
 Local/Library/Headers/HighlighterKit
 Local/Library/Libraries/libHighlighterKit.so
 Local/Library/Libraries/libHighlighterKit.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libHighlighterKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/A
+@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions/%%MAJORLIBVERSION%%
 @dirrm Local/Library/Frameworks/HighlighterKit.framework/Versions
 @dirrm Local/Library/Frameworks/HighlighterKit.framework
diff --git a/devel/objcunit/Makefile b/devel/objcunit/Makefile
index a296536ddd9c..e23f4984ac2b 100644
--- a/devel/objcunit/Makefile
+++ b/devel/objcunit/Makefile
@@ -24,5 +24,10 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/ObjcUnit-${PORTVERSION}/ObjcUnit
+ADDITIONAL_INCLUDE_DIRS+=	-I${WRKSRC}
+MAKE_ENV+=	ObjcUnit_CURRENT_VERSION_NAME=0
+
+post-patch:
+	${LN} -s "Classes" ${WRKSRC}/ObjcUnit
 
 .include <bsd.port.mk>
diff --git a/devel/objcunit/pkg-plist b/devel/objcunit/pkg-plist
index b502a7167526..9a462e96e45d 100644
--- a/devel/objcunit/pkg-plist
+++ b/devel/objcunit/pkg-plist
@@ -1,37 +1,39 @@
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/AbstractExpectation.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/AbstractExpectationCollection.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/AssertionFailedException.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ExpectationCounter.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ExpectationGroup.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ExpectationList.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ExpectationSet.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ExpectationValue.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/NSObject-ObjcUnitAdditions.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/ObjcUnit.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/Test.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestCase.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestFailure.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestListener.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestResult.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestRunner.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/TestSuite.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/_WarningTest.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/MockCoder.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers/MockObjects.h
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/ObjcUnit
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/libObjcUnit.so
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/libObjcUnit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/ObjcUnit.framework/Versions/A/libObjcUnit.so.%%LIBVERSION%%
-Local/Library/Frameworks/ObjcUnit.framework/Versions/Current
-Local/Library/Frameworks/ObjcUnit.framework/Resources
 Local/Library/Frameworks/ObjcUnit.framework/Headers
+Local/Library/Frameworks/ObjcUnit.framework/ObjcUnit
+Local/Library/Frameworks/ObjcUnit.framework/Resources
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AbstractExpectation.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AbstractExpectationCollection.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AssertionFailedException.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ExpectationCounter.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ExpectationGroup.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ExpectationList.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ExpectationSet.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ExpectationValue.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MockCoder.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MockObjects.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject-ObjcUnitAdditions.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ObjcUnit.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Test.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestCase.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestFailure.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestListener.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestResult.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestRunner.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/TestSuite.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers/_WarningTest.h
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/ObjcUnit
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/libObjcUnit.so
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/libObjcUnit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/libObjcUnit.so.%%LIBVERSION%%
+Local/Library/Frameworks/ObjcUnit.framework/Versions/Current
+Local/Library/Frameworks/ObjcUnit.framework/libObjcUnit.so
 Local/Library/Libraries/libObjcUnit.so
 Local/Library/Libraries/libObjcUnit.so.%%LIBVERSION%%
 Local/Library/Libraries/libObjcUnit.so.%%MAJORLIBVERSION%%
 Local/Library/Headers/ObjcUnit
-@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/A
+@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions/%%MAJORLIBVERSION%%
 @dirrm Local/Library/Frameworks/ObjcUnit.framework/Versions
 @dirrm Local/Library/Frameworks/ObjcUnit.framework
diff --git a/devel/projectcenter.app/Makefile b/devel/projectcenter.app/Makefile
index 890cd3220c51..f8bf407f4dc2 100644
--- a/devel/projectcenter.app/Makefile
+++ b/devel/projectcenter.app/Makefile
@@ -24,5 +24,6 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 PLIST_SUB+=	FRAMEVERSION=${PORTVERSION}
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
 .include <bsd.port.mk>
diff --git a/devel/projectcenter.app/pkg-plist b/devel/projectcenter.app/pkg-plist
index 0d11f3d8a44e..1ef7346cad4a 100644
--- a/devel/projectcenter.app/pkg-plist
+++ b/devel/projectcenter.app/pkg-plist
@@ -1,4 +1,3 @@
-System/Applications/ProjectCenter.app/library_paths.openapp
 System/Applications/ProjectCenter.app/ProjectCenter
 System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/AggregateProject
 System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/Resources/Info-gnustep.plist
@@ -111,6 +110,9 @@ System/Applications/ProjectCenter.app/Resources/soundSuitcaseH.tiff
 System/Applications/ProjectCenter.app/Resources/subprojectSuitcase.tiff
 System/Applications/ProjectCenter.app/Resources/subprojectSuitcaseH.tiff
 System/Applications/ProjectCenter.app/stamp.make
+System/Library/Frameworks/ProjectCenter.framework/Headers
+System/Library/Frameworks/ProjectCenter.framework/ProjectCenter
+System/Library/Frameworks/ProjectCenter.framework/Resources
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/PCAddFilesPanel.h
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/PCBuildPanel.h
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/PCBundleLoader.h
@@ -142,6 +144,7 @@ System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Head
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/ProjectCenter.h
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/ProjectType.h
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers/Server.h
+System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/ProjectCenter
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/BuildAttributes.gorm/data.classes
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/BuildAttributes.gorm/data.info
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/BuildAttributes.gorm/objects.gorm
@@ -177,37 +180,13 @@ System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Reso
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/libProjectCenter.so
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/libProjectCenter.so.%%MAJORVERSION%%
 System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/libProjectCenter.so.%%FRAMEVERSION%%
+System/Library/Frameworks/ProjectCenter.framework/Versions/Current
+System/Library/Frameworks/ProjectCenter.framework/libProjectCenter.so
+System/Library/Headers/ProjectCenter
 System/Library/Libraries/libProjectCenter.so
 System/Library/Libraries/libProjectCenter.so.%%MAJORVERSION%%
 System/Library/Libraries/libProjectCenter.so.%%FRAMEVERSION%%
-@unexec rm -f %D/System/Library/Frameworks/ProjectCenter.framework/Headers
-@unexec rm -f %D/System/Library/Frameworks/ProjectCenter.framework/Resources
-@unexec rm -f %D/System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/ProjectCenter
-@unexec rm -f %D/System/Library/Frameworks/ProjectCenter.framework/Versions/Current
-@unexec rm -f %D/System/Library/Headers/ProjectCenter
-@dirrm System/Applications/ProjectCenter.app/Resources/ProjectCenter.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources/Main.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle/Resources/Inspector.gorm
-@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle/Resources
-@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle
-@dirrm System/Applications/ProjectCenter.app/Resources
-@dirrm System/Applications/ProjectCenter.app
-@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers
+System/Tools/ProjectCenter
 @dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/ProjectInspector.gorm
 @dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/ProjectDescription.gorm
 @dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/Preferences.gorm
@@ -217,11 +196,29 @@ System/Library/Libraries/libProjectCenter.so.%%FRAMEVERSION%%
 @dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/FileAttributes.gorm
 @dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources/BuildAttributes.gorm
 @dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Resources
+@dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/Headers
 @dirrm System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%
 @dirrm System/Library/Frameworks/ProjectCenter.framework/Versions
 @dirrm System/Library/Frameworks/ProjectCenter.framework
-@exec ln -s %%FRAMEVERSION%% %D/System/Library/Frameworks/ProjectCenter.framework/Versions/Current
-@exec ln -s Versions/Current/Headers %D/System/Library/Frameworks/ProjectCenter.framework/Headers
-@exec ln -s Versions/Current/Resources %D/System/Library/Frameworks/ProjectCenter.framework/Resources
-@exec ln -s libProjectCenter.so %D/System/Library/Frameworks/ProjectCenter.framework/Versions/%%FRAMEVERSION%%/ProjectCenter
-@exec ln -s ../Frameworks/ProjectCenter.framework/Headers %D/System/Library/Headers/ProjectCenter
+@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/ToolProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/RenaissanceProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources/ProjectCenter.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/LibraryProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/BundleProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources/Main.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/ApplicationProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/Resources/Inspector.gorm
+@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle/Resources
+@dirrm System/Applications/ProjectCenter.app/Resources/AggregateProject.bundle
+@dirrm System/Applications/ProjectCenter.app/Resources
+@dirrm System/Applications/ProjectCenter.app
diff --git a/devel/projectmanager/Makefile b/devel/projectmanager/Makefile
index 94fa3d1bfaff..054af3d26210 100644
--- a/devel/projectmanager/Makefile
+++ b/devel/projectmanager/Makefile
@@ -24,6 +24,8 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	WizardKit:${WIZARDKIT_PORT}
 USE_GNUSTEP_LOCAL_LIBS+=	HighlighterKit:${HIGHLIGHTERKIT_PORT}
 
+MAKE_FLAGS+=	debug=no
+
 WIZARDKIT_PORT?=		devel/wizardkit
 HIGHLIGHTERKIT_PORT?=		devel/highlighterkit
 
diff --git a/devel/projectmanager/pkg-plist b/devel/projectmanager/pkg-plist
index 4832abd3acf7..94a755c11905 100644
--- a/devel/projectmanager/pkg-plist
+++ b/devel/projectmanager/pkg-plist
@@ -329,8 +329,8 @@ Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/Resour
 Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/Resources/Info-gnustep.plist
 Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/UserPipePreferences
 Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/stamp.make
-Local/Applications/ProjectManager.app/library_paths.openapp
 Local/Applications/ProjectManager.app/stamp.make
+Local/Tools/ProjectManager
 @dirrm Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/Resources/English.lproj/UserPipes.gorm
 @dirrm Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/Resources/English.lproj
 @dirrm Local/Applications/ProjectManager.app/Resources/UserPipePreferences.prefs/Resources
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 6da1cc0caa56..f16484447c03 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -24,11 +24,14 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
+MAKE_FLAGS+=	debug=no
+
 post-extract:
 	${FIND} ${WRKSRC}/ -type f -name '.cvsignore' -delete
 	${FIND} -d ${WRKSRC}/ -type d -name CVS -exec ${RM} -rf "{}" ";"
 
 post-patch:
+	${ECHO_CMD} "" > ${WRKSRC}/Source/${MAKEFILE}.postamble
 	${RUBY} -i~ -p \
 		-e 'gsub(/-lpthread/, "-pthread");' \
 		-e 'gsub(/-lgmodel/, "");' \
@@ -37,6 +40,7 @@ post-patch:
 		${XARGS} ${RUBY} -i -pe 'gsub(/ ruby -/, " ${RUBY} -")'
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/Source/obj/librigs.so $(RUBY_SITEARCHLIBDIR)/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/Examples/* ${RUBY_MODEXAMPLESDIR}/
diff --git a/devel/wizardkit/pkg-plist b/devel/wizardkit/pkg-plist
index eea6f277d3c1..d3002adc042b 100644
--- a/devel/wizardkit/pkg-plist
+++ b/devel/wizardkit/pkg-plist
@@ -1,19 +1,21 @@
 Local/Library/Frameworks/WizardKit.framework/Headers
 Local/Library/Frameworks/WizardKit.framework/Resources
-Local/Library/Frameworks/WizardKit.framework/Versions/A/Headers/WKWizardPanel.h
-Local/Library/Frameworks/WizardKit.framework/Versions/A/Headers/WizardKit.h
-Local/Library/Frameworks/WizardKit.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/WizardKit.framework/Versions/A/WizardKit
-Local/Library/Frameworks/WizardKit.framework/Versions/A/libWizardKit.so
-Local/Library/Frameworks/WizardKit.framework/Versions/A/libWizardKit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/WizardKit.framework/Versions/A/libWizardKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Headers/WKWizardPanel.h
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Headers/WizardKit.h
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/WizardKit
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/libWizardKit.so.%%LIBVERSION%%
 Local/Library/Frameworks/WizardKit.framework/Versions/Current
+Local/Library/Frameworks/WizardKit.framework/WizardKit
+Local/Library/Frameworks/WizardKit.framework/libWizardKit.so
 Local/Library/Headers/WizardKit
 Local/Library/Libraries/libWizardKit.so
 Local/Library/Libraries/libWizardKit.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libWizardKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/A
+@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/WizardKit.framework/Versions/%%MAJORVERSION%%
 @dirrm Local/Library/Frameworks/WizardKit.framework/Versions
 @dirrm Local/Library/Frameworks/WizardKit.framework