5 files changed, 94 insertions, 12 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 9a6a5182e3f7..b9499883dd3b 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnustep-make
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.0
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/ \
 		http://ftp.codefactory.se/pub/gnu/gstep/ \
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 5d367be82709..c0952edba4c0 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1 +1 @@
-MD5 (gnustep-make-1.2.1.tar.gz) = dd1e05a533b3a6b7d64b90befd08c5d4
+MD5 (gnustep-make-1.3.0.tar.gz) = 489c6e4252a4f68c6cc63a40b1d86427
diff --git a/devel/gnustep-make/files/patch-GNUstep.sh.in b/devel/gnustep-make/files/patch-GNUstep.sh.in
new file mode 100644
index 000000000000..8d58ff3ce8ad
--- /dev/null
+++ b/devel/gnustep-make/files/patch-GNUstep.sh.in
@@ -0,0 +1,22 @@
+--- GNUstep.sh.in~	Mon Mar 11 09:06:16 2002
++++ GNUstep.sh.in	Wed Mar 20 15:58:45 2002
+@@ -136,14 +136,14 @@
+ if [ "$convert_win_paths" = "yes" ]; then
+   # FIXME - G_U_R might not have been defined
+   gnustep_class_path="$G_U_R/Libraries/Java:$G_L_R/Libraries/Java:$G_N_R/Libraries/Java:$G_S_R/Libraries/Java"
++  unset convert_win_paths
++  unset G_U_R
++  unset G_L_R
++  unset G_N_R
++  unset G_S_R
+ else
+   gnustep_class_path="$GNUSTEP_USER_ROOT/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Libraries/Java:$GNUSTEP_NETWORK_ROOT/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Libraries/Java"
+ fi
+-unset convert_win_paths
+-unset G_U_R
+-unset G_L_R
+-unset G_N_R
+-unset G_S_R
+ 
+ if [ -z "$CLASSPATH" ]; then
+   CLASSPATH="$gnustep_class_path"
diff --git a/devel/gnustep-make/files/patch-ld_lib_path.sh b/devel/gnustep-make/files/patch-ld_lib_path.sh
new file mode 100644
index 000000000000..361872a90ea5
--- /dev/null
+++ b/devel/gnustep-make/files/patch-ld_lib_path.sh
@@ -0,0 +1,11 @@
+--- ld_lib_path.sh~	Mon Feb  4 05:43:38 2002
++++ ld_lib_path.sh	Wed Mar 20 16:00:00 2002
+@@ -50,6 +50,8 @@
+     additional="${additional}${dir}:"
+   done
+   unset dir
++else
++  additional=
+ fi
+ lib_paths="${additional}${lib_paths}"
+ unset additional
diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist
index 0de1f8f978c3..a4e55a192b68 100644
--- a/devel/gnustep-make/pkg-plist
+++ b/devel/gnustep-make/pkg-plist
@@ -1,7 +1,53 @@
+System/Makefiles/Instance/Shared/bundle.make
+System/Makefiles/Instance/Shared/headers.make
+System/Makefiles/Instance/Shared/java.make
+System/Makefiles/Instance/application.make
+System/Makefiles/Instance/bundle.make
+System/Makefiles/Instance/clibrary.make
+System/Makefiles/Instance/ctool.make
+System/Makefiles/Instance/documentation.make
+System/Makefiles/Instance/framework.make
+System/Makefiles/Instance/gswapp.make
+System/Makefiles/Instance/gswbundle.make
+System/Makefiles/Instance/java-tool.make
+System/Makefiles/Instance/java.make
+System/Makefiles/Instance/library.make
+System/Makefiles/Instance/objc.make
+System/Makefiles/Instance/palette.make
+System/Makefiles/Instance/resource-set.make
+System/Makefiles/Instance/rules.make
+System/Makefiles/Instance/service.make
+System/Makefiles/Instance/subproject.make
+System/Makefiles/Instance/test-application.make
+System/Makefiles/Instance/test-library.make
+System/Makefiles/Instance/test-tool.make
+System/Makefiles/Instance/tool.make
+System/Makefiles/Master/aggregate.make
+System/Makefiles/Master/application.make
+System/Makefiles/Master/bundle.make
+System/Makefiles/Master/clibrary.make
+System/Makefiles/Master/ctool.make
+System/Makefiles/Master/documentation.make
+System/Makefiles/Master/framework.make
+System/Makefiles/Master/gswapp.make
+System/Makefiles/Master/gswbundle.make
+System/Makefiles/Master/java-tool.make
+System/Makefiles/Master/java.make
+System/Makefiles/Master/library.make
+System/Makefiles/Master/objc.make
+System/Makefiles/Master/palette.make
+System/Makefiles/Master/resource-set.make
+System/Makefiles/Master/rpm.make
+System/Makefiles/Master/rules.make
+System/Makefiles/Master/service.make
+System/Makefiles/Master/source-distribution.make
+System/Makefiles/Master/subproject.make
+System/Makefiles/Master/test-application.make
+System/Makefiles/Master/test-library.make
+System/Makefiles/Master/test-tool.make
+System/Makefiles/Master/tool.make
 System/Makefiles/GNUstep.csh
 System/Makefiles/GNUstep.sh
-System/Makefiles/MediaBook.func
-System/Makefiles/MediaBook.sh
 System/Makefiles/aggregate.make
 System/Makefiles/application.make
 System/Makefiles/bundle.make
@@ -14,14 +60,15 @@ System/Makefiles/config.guess
 System/Makefiles/config.sub
 System/Makefiles/cpu.sh
 System/Makefiles/ctool.make
-System/Makefiles/cygpath.sh
 System/Makefiles/documentation.make
 System/Makefiles/executable.template
+System/Makefiles/fixpath.sh
 System/Makefiles/framework.make
 System/Makefiles/gswapp.make
 System/Makefiles/gswbundle.make
 System/Makefiles/install-sh
 System/Makefiles/%%GNU_ARCH%%/%%OPSYS%%/config.make
+System/Makefiles/%%GNU_ARCH%%/%%OPSYS%%/user_home
 System/Makefiles/%%GNU_ARCH%%/%%OPSYS%%/which_lib
 System/Makefiles/java-executable.template
 System/Makefiles/java-tool.make
@@ -36,10 +83,9 @@ System/Makefiles/names.make
 System/Makefiles/objc.make
 System/Makefiles/os.sh
 System/Makefiles/palette.make
-System/Makefiles/rpm.make
+System/Makefiles/resource-set.make
 System/Makefiles/rules.make
 System/Makefiles/service.make
-System/Makefiles/source-distribution.make
 System/Makefiles/spec-debug-alone-rules.template
 System/Makefiles/spec-debug-rules.template
 System/Makefiles/spec-rules.template
@@ -55,11 +101,11 @@ System/Tools/debugapp
 System/Tools/openapp
 System/Tools/opentool
 System/share/config.site
-@exec mkdir -p %D/Local/Apps
+@exec mkdir -p %D/Local/Applications
 @exec mkdir -p %D/Local/Developer/Palettes
 @exec mkdir -p %D/Local/Documentation/Developer
 @exec mkdir -p %D/Local/Documentation/User
-@exec mkdir -p %D/Local/Headers/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@exec mkdir -p %D/Local/Headers/%%GNU_ARCH%%/%%OPSYS%%
 @exec mkdir -p %D/Local/Libraries/Java
 @exec mkdir -p %D/Local/Libraries/Resources
 @exec mkdir -p %D/Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
@@ -72,7 +118,7 @@ System/share/config.site
 @exec mkdir -p %D/Local/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
 @exec mkdir -p %D/Local/Users/Administrator
 @exec mkdir -p %D/Network
-@exec mkdir -p %D/System/Apps
+@exec mkdir -p %D/System/Applications
 @exec mkdir -p %D/System/Developer/Palettes
 @exec mkdir -p %D/System/Documentation/Developer
 @exec mkdir -p %D/System/Documentation/User
@@ -98,6 +144,9 @@ System/share/config.site
 @dirrm System/Tools
 @dirrm System/Makefiles/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm System/Makefiles/%%GNU_ARCH%%
+@dirrm System/Makefiles/Master
+@dirrm System/Makefiles/Instance/Shared
+@dirrm System/Makefiles/Instance
 @dirrm System/Makefiles/Additional
 @dirrm System/Makefiles
 @dirrm System/Library/Services
@@ -122,7 +171,7 @@ System/share/config.site
 @dirrm System/Documentation
 @dirrm System/Developer/Palettes
 @dirrm System/Developer
-@dirrm System/Apps
+@dirrm System/Applications
 @dirrm System
 @dirrm Network
 @dirrm Local/Users/Administrator
@@ -152,5 +201,5 @@ System/share/config.site
 @dirrm Local/Documentation
 @dirrm Local/Developer/Palettes
 @dirrm Local/Developer
-@dirrm Local/Apps
+@dirrm Local/Applications
 @dirrm Local