Changes 2.0.5:

* Bug fixes

5 files changed, 34 insertions, 26 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 4362da7bf0d..ec75aa9d154 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2008/03/08 22:03:22 tnn Exp $
+# $NetBSD: Makefile,v 1.42 2008/05/25 08:16:06 adam Exp $
 
-DISTNAME=	gnustep-make-2.0.2
-PKGREVISION=	1
+DISTNAME=	gnustep-make-2.0.5
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/devel/gnustep-make/PLIST b/devel/gnustep-make/PLIST
index c5258fa1cd4..52142919d2b 100644
--- a/devel/gnustep-make/PLIST
+++ b/devel/gnustep-make/PLIST
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.14 2007/11/25 14:42:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2008/05/25 08:16:06 adam Exp $
+share/GNUstep/System/Library/Documentation/man/man1/debugapp.1.gz
+share/GNUstep/System/Library/Documentation/man/man1/gnustep-config.1.gz
+share/GNUstep/System/Library/Documentation/man/man1/openapp.1.gz
+share/GNUstep/System/Library/Documentation/man/man1/opentool.1.gz
+share/GNUstep/System/Library/Documentation/man/man7/GNUstep.7.gz
+share/GNUstep/System/Library/Documentation/man/man7/library-combo.7.gz
 share/GNUstep/System/Library/Makefiles/GNUstep-reset.sh
 share/GNUstep/System/Library/Makefiles/GNUstep.csh
 share/GNUstep/System/Library/Makefiles/GNUstep.sh
@@ -46,6 +52,7 @@ share/GNUstep/System/Library/Makefiles/Master/gswbundle.make
 share/GNUstep/System/Library/Makefiles/Master/java-tool.make
 share/GNUstep/System/Library/Makefiles/Master/java.make
 share/GNUstep/System/Library/Makefiles/Master/library.make
+share/GNUstep/System/Library/Makefiles/Master/nsis.make
 share/GNUstep/System/Library/Makefiles/Master/objc.make
 share/GNUstep/System/Library/Makefiles/Master/palette.make
 share/GNUstep/System/Library/Makefiles/Master/resource-set.make
@@ -97,6 +104,7 @@ share/GNUstep/System/Library/Makefiles/messages.make
 share/GNUstep/System/Library/Makefiles/mkinstalldirs
 share/GNUstep/System/Library/Makefiles/names.make
 share/GNUstep/System/Library/Makefiles/native-library.make
+share/GNUstep/System/Library/Makefiles/nsi-app.template
 share/GNUstep/System/Library/Makefiles/objc.make
 share/GNUstep/System/Library/Makefiles/os.sh
 share/GNUstep/System/Library/Makefiles/palette.make
@@ -158,7 +166,8 @@ share/examples/GNUstep/GNUstep.conf
 @dirrm share/GNUstep/System/Library/Frameworks
 @exec ${MKDIR} %D/share/GNUstep/System/Library/Fonts
 @dirrm share/GNUstep/System/Library/Fonts
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/man
+@dirrm share/GNUstep/System/Library/Documentation/man/man7
+@dirrm share/GNUstep/System/Library/Documentation/man/man1
 @dirrm share/GNUstep/System/Library/Documentation/man
 @exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/info
 @dirrm share/GNUstep/System/Library/Documentation/info
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 5ad599feccc..cfc711392dd 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2007/11/25 14:42:02 adam Exp $
+$NetBSD: distinfo,v 1.21 2008/05/25 08:16:06 adam Exp $
 
-SHA1 (gnustep-make-2.0.2.tar.gz) = 102e36485d4582832d87ea53e0963f6553aaf7d2
-RMD160 (gnustep-make-2.0.2.tar.gz) = bd5e3aefdaa98729a18954102500783e23c0a48a
-Size (gnustep-make-2.0.2.tar.gz) = 449260 bytes
+SHA1 (gnustep-make-2.0.5.tar.gz) = 3df1b261b28da12da2a7b15aa4489e294f6bc45f
+RMD160 (gnustep-make-2.0.5.tar.gz) = cc7e7f15c7a7d7ae9643649c598df0b13f52e777
+Size (gnustep-make-2.0.5.tar.gz) = 472561 bytes
 SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
-SHA1 (patch-ad) = 263c887b63a7d3d51e4626730d210d1c5c45f071
-SHA1 (patch-ae) = 882a726126ef25fb06f65eab5a3e752b9328adcb
+SHA1 (patch-ad) = 314539b19ab2646b023bc92512c4444cada84c85
+SHA1 (patch-ae) = e0a842ba61eef9d1311067292f9b30ef63cda3c8
diff --git a/devel/gnustep-make/patches/patch-ad b/devel/gnustep-make/patches/patch-ad
index b69730bff2c..8d8b8eba2d7 100644
--- a/devel/gnustep-make/patches/patch-ad
+++ b/devel/gnustep-make/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.6 2007/11/25 14:42:02 adam Exp $
+$NetBSD: patch-ad,v 1.7 2008/05/25 08:16:06 adam Exp $
 
---- configure.orig	2007-05-25 15:12:35.000000000 +0200
+--- configure.orig	2008-03-04 00:24:48.000000000 +0100
 +++ configure
-@@ -4716,7 +4716,7 @@ echo $ECHO_N "checking if the compiler s
+@@ -5827,7 +5827,7 @@ echo $ECHO_N "checking if the compiler s
  # What we want to do: set AUTO_DEPENDENCIES to yes if gcc => 3.x
  
  AUTO_DEPENDENCIES=""
 -if test ! ${GCC} = "yes" ; then
 +if test "X${GCC}" != "Xyes" ; then
-   echo "$as_me:$LINENO: result: no: it's not gcc" >&5
- echo "${ECHO_T}no: it's not gcc" >&6
+   { echo "$as_me:$LINENO: result: no: it's not gcc" >&5
+ echo "${ECHO_T}no: it's not gcc" >&6; }
  else
diff --git a/devel/gnustep-make/patches/patch-ae b/devel/gnustep-make/patches/patch-ae
index bd0d78d59d7..27071c2496b 100644
--- a/devel/gnustep-make/patches/patch-ae
+++ b/devel/gnustep-make/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.6 2007/11/25 14:42:02 adam Exp $
+$NetBSD: patch-ae,v 1.7 2008/05/25 08:16:06 adam Exp $
 
---- GNUmakefile.in.orig	2007-03-08 18:15:05.000000000 +0100
+--- GNUmakefile.in.orig	2008-01-17 03:44:27.000000000 +0100
 +++ GNUmakefile.in
-@@ -133,9 +133,9 @@ install: generated-files
- 		$(makedir)/Instance \
- 		$(makedir)/Instance/Shared \
- 		$(makedir)/Instance/Documentation)
+@@ -171,9 +171,9 @@ install: generated-files
+ 		"$(makedir)/Instance" \
+ 		"$(makedir)/Instance/Shared" \
+ 		"$(makedir)/Instance/Documentation")
 -	$(EC)(echo "Installing GNUstep configuration file in $(GNUSTEP_CONFIG_FILE)"; \
--	 $(srcdir)/mkinstalldirs "$(GNUSTEP_CONFIG_FILE_DIR)"; \
--	 $(INSTALL_DATA) GNUstep.conf "$(GNUSTEP_CONFIG_FILE)")
+-	 "$(srcdir)/mkinstalldirs" "$(GNUSTEP_CONFIG_FILE_DIR)"; \
+-	 $(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "$(GNUSTEP_CONFIG_FILE)")
 +	$(EC)(echo "Installing GNUstep configuration file"; \
-+	 $(srcdir)/mkinstalldirs "${PREFIX}/share/examples/GNUstep"; \
-+	 $(INSTALL_DATA) GNUstep.conf "${PREFIX}/share/examples/GNUstep")
++	 "$(srcdir)/mkinstalldirs" "${PREFIX}/share/examples/GNUstep"; \
++	 $(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "${PREFIX}/share/examples/GNUstep")
  	 $(EC)(echo "Installing gnustep-make support software")
  	 $(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
  		clean_cpu.sh clean_os.sh \