3 files changed, 35 insertions, 11 deletions

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