Update gnustep-make to 2.0.8. This makes GNUstep more hier(7) compliant

and requires an update of all GNUstep packages.  Changes also include
bugfixes and some cleanup.

7 files changed, 292 insertions, 372 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 987a575e521..3ad7b9a77d4 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2008/11/25 12:51:35 adam Exp $
+# $NetBSD: Makefile,v 1.44 2009/04/13 12:09:25 rh Exp $
 
-DISTNAME=	gnustep-make-2.0.6
+DISTNAME=	gnustep-make-2.0.8
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -8,25 +8,30 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	GNUstep makefile package
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-#LICENSE=		gnu-gplv3
+LICENSE=		gnu-gpl-v3
 
 USE_LANGUAGES=		objc
 USE_TOOLS+=		csh
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
 CONFIGURE_ARGS+=	--disable-importing-config-file
+CONFIGURE_ARGS+=	--with-layout=fhs
 CONFIGURE_ARGS+=	--with-config-file=${PKG_SYSCONFDIR}/GNUstep.conf
 MAKE_FILE=		GNUmakefile
 
 CONF_FILES+=		${PREFIX}/share/examples/GNUstep/GNUstep.conf \
 			${PKG_SYSCONFDIR}/GNUstep.conf
 
-REPLACE_INTERPRETER+=	csh
-REPLACE.csh.old=	/bin/csh
-REPLACE.csh.new=	${CSH}
-REPLACE_FILES.csh=	ld_lib_path.csh
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
+PTHREAD_LIBS+=          -lpth
+.endif
+
+CONFIGURE_ARGS+=	--with-thread-lib=${PTHREAD_LIBS:Q}
 
 .include "gnustep.mk"
 
@@ -40,39 +45,17 @@ PLIST_SUBST+=	GNUSTEP_ARCH=${GNUSTEP_ARCH}
 SUBST_CLASSES+=		target
 SUBST_STAGE.target=	post-patch
 SUBST_FILES.target=	target.make
-SUBST_SED.target+=	-e 's|/usr/pkg|${LOCALBASE}|g'
-
-INSTALLATION_DIRS+=	share/GNUstep/Local/Applications
-INSTALLATION_DIRS+=	share/GNUstep/Local/Library
-INSTALLATION_DIRS+=	share/GNUstep/Local/Library/Bundles
-INSTALLATION_DIRS+=	share/GNUstep/Local/Library/Frameworks
-INSTALLATION_DIRS+=	share/GNUstep/Local/Library/Headers
-INSTALLATION_DIRS+=	share/GNUstep/Local/Library/Libraries
-INSTALLATION_DIRS+=	share/GNUstep/Network
-INSTALLATION_DIRS+=	share/GNUstep/System/Applications
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/ApplicationSupport
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Bundles
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/ColorPickers
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Colors
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/DocTemplates
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Documentation/Developer
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Documentation/User
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Documentation/info
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Documentation/man
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Fonts
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Frameworks
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Headers
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Images
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/KeyBindings
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Libraries/Java
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Libraries/Resources
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Makefiles/${GNUSTEP_ARCH}
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Makefiles/Additional
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Makefiles/Auxiliary
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/PostScript
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Services
-INSTALLATION_DIRS+=	share/GNUstep/System/Library/Sounds
-INSTALLATION_DIRS+=	share/GNUstep/System/Tools/Java
-INSTALLATION_DIRS+=	share/GNUstep/System/Tools/Resources
+SUBST_SED.target+=	-e 's|/usr/pkg|${PREFIX}|g'
+
+SUBST_CLASSES+=		maninfo
+SUBST_STAGE.maninfo=	pre-configure
+SUBST_MESSAGE.maninfo=	Fixing man directory references.
+SUBST_FILES.maninfo=	${WRKSRC}/FilesystemLayouts/fhs
+SUBST_SED.maninfo=	-e 's|share/man|${PKGMANDIR}|'
+SUBST_SED.maninfo+=	-e 's|share/info|${PKGINFODIR}|'
+
+INSTALLATION_DIRS+=	share/GNUstep/Makefiles/${GNUSTEP_ARCH}
+INSTALLATION_DIRS+=	share/GNUstep/Makefiles/Additional
+INSTALLATION_DIRS+=	share/GNUstep/Makefiles/Auxiliary
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gnustep-make/PLIST b/devel/gnustep-make/PLIST
index 52142919d2b..b940302cf84 100644
--- a/devel/gnustep-make/PLIST
+++ b/devel/gnustep-make/PLIST
@@ -1,207 +1,141 @@
-@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
-share/GNUstep/System/Library/Makefiles/Instance/Documentation/autogsdoc.make
-share/GNUstep/System/Library/Makefiles/Instance/Documentation/gsdoc.make
-share/GNUstep/System/Library/Makefiles/Instance/Documentation/install_files.make
-share/GNUstep/System/Library/Makefiles/Instance/Documentation/javadoc.make
-share/GNUstep/System/Library/Makefiles/Instance/Documentation/latex.make
-share/GNUstep/System/Library/Makefiles/Instance/Documentation/texi.make
-share/GNUstep/System/Library/Makefiles/Instance/Shared/bundle.make
-share/GNUstep/System/Library/Makefiles/Instance/Shared/headers.make
-share/GNUstep/System/Library/Makefiles/Instance/Shared/java.make
-share/GNUstep/System/Library/Makefiles/Instance/Shared/stamp-string.make
-share/GNUstep/System/Library/Makefiles/Instance/Shared/strings.make
-share/GNUstep/System/Library/Makefiles/Instance/application.make
-share/GNUstep/System/Library/Makefiles/Instance/bundle.make
-share/GNUstep/System/Library/Makefiles/Instance/clibrary.make
-share/GNUstep/System/Library/Makefiles/Instance/ctool.make
-share/GNUstep/System/Library/Makefiles/Instance/documentation.make
-share/GNUstep/System/Library/Makefiles/Instance/framework.make
-share/GNUstep/System/Library/Makefiles/Instance/gswapp.make
-share/GNUstep/System/Library/Makefiles/Instance/gswbundle.make
-share/GNUstep/System/Library/Makefiles/Instance/java-tool.make
-share/GNUstep/System/Library/Makefiles/Instance/java.make
-share/GNUstep/System/Library/Makefiles/Instance/library.make
-share/GNUstep/System/Library/Makefiles/Instance/objc.make
-share/GNUstep/System/Library/Makefiles/Instance/palette.make
-share/GNUstep/System/Library/Makefiles/Instance/resource-set.make
-share/GNUstep/System/Library/Makefiles/Instance/rules.make
-share/GNUstep/System/Library/Makefiles/Instance/service.make
-share/GNUstep/System/Library/Makefiles/Instance/subproject.make
-share/GNUstep/System/Library/Makefiles/Instance/test-application.make
-share/GNUstep/System/Library/Makefiles/Instance/test-library.make
-share/GNUstep/System/Library/Makefiles/Instance/test-tool.make
-share/GNUstep/System/Library/Makefiles/Instance/tool.make
-share/GNUstep/System/Library/Makefiles/Master/aggregate.make
-share/GNUstep/System/Library/Makefiles/Master/application.make
-share/GNUstep/System/Library/Makefiles/Master/bundle.make
-share/GNUstep/System/Library/Makefiles/Master/clibrary.make
-share/GNUstep/System/Library/Makefiles/Master/ctool.make
-share/GNUstep/System/Library/Makefiles/Master/documentation.make
-share/GNUstep/System/Library/Makefiles/Master/framework.make
-share/GNUstep/System/Library/Makefiles/Master/gswapp.make
-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
-share/GNUstep/System/Library/Makefiles/Master/rpm.make
-share/GNUstep/System/Library/Makefiles/Master/rules.make
-share/GNUstep/System/Library/Makefiles/Master/service.make
-share/GNUstep/System/Library/Makefiles/Master/source-distribution.make
-share/GNUstep/System/Library/Makefiles/Master/subproject.make
-share/GNUstep/System/Library/Makefiles/Master/test-application.make
-share/GNUstep/System/Library/Makefiles/Master/test-library.make
-share/GNUstep/System/Library/Makefiles/Master/test-tool.make
-share/GNUstep/System/Library/Makefiles/Master/tool.make
-share/GNUstep/System/Library/Makefiles/aggregate.make
-share/GNUstep/System/Library/Makefiles/app-wrapper.template
-share/GNUstep/System/Library/Makefiles/application.make
-share/GNUstep/System/Library/Makefiles/bundle.make
-share/GNUstep/System/Library/Makefiles/clean_cpu.sh
-share/GNUstep/System/Library/Makefiles/clean_os.sh
-share/GNUstep/System/Library/Makefiles/clean_vendor.sh
-share/GNUstep/System/Library/Makefiles/clibrary.make
-share/GNUstep/System/Library/Makefiles/common.make
-share/GNUstep/System/Library/Makefiles/config-noarch.make
-share/GNUstep/System/Library/Makefiles/config.guess
-share/GNUstep/System/Library/Makefiles/config.make
-share/GNUstep/System/Library/Makefiles/config.sub
-share/GNUstep/System/Library/Makefiles/cpu.sh
-share/GNUstep/System/Library/Makefiles/ctool.make
-share/GNUstep/System/Library/Makefiles/documentation.make
-share/GNUstep/System/Library/Makefiles/empty.make
-share/GNUstep/System/Library/Makefiles/executable.template
-share/GNUstep/System/Library/Makefiles/filesystem.csh
-share/GNUstep/System/Library/Makefiles/filesystem.make
-share/GNUstep/System/Library/Makefiles/filesystem.sh
-share/GNUstep/System/Library/Makefiles/fixpath.sh
-share/GNUstep/System/Library/Makefiles/framework.make
-share/GNUstep/System/Library/Makefiles/gnustep-make-help
-share/GNUstep/System/Library/Makefiles/gswapp.make
-share/GNUstep/System/Library/Makefiles/gswbundle.make
-share/GNUstep/System/Library/Makefiles/install-sh
-share/GNUstep/System/Library/Makefiles/java-executable.template
-share/GNUstep/System/Library/Makefiles/java-tool.make
-share/GNUstep/System/Library/Makefiles/java.make
-share/GNUstep/System/Library/Makefiles/jni.make
-share/GNUstep/System/Library/Makefiles/ld_lib_path.csh
-share/GNUstep/System/Library/Makefiles/ld_lib_path.sh
-share/GNUstep/System/Library/Makefiles/library-combo.make
-share/GNUstep/System/Library/Makefiles/library.make
-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
-share/GNUstep/System/Library/Makefiles/print_unique_pathlist.sh
-share/GNUstep/System/Library/Makefiles/relative_path.sh
-share/GNUstep/System/Library/Makefiles/resource-set.make
-share/GNUstep/System/Library/Makefiles/rules.make
-share/GNUstep/System/Library/Makefiles/service.make
-share/GNUstep/System/Library/Makefiles/spec-rules.template
-share/GNUstep/System/Library/Makefiles/strip_makefiles.sh
-share/GNUstep/System/Library/Makefiles/subproject.make
-share/GNUstep/System/Library/Makefiles/tar-exclude-list
-share/GNUstep/System/Library/Makefiles/target.make
-share/GNUstep/System/Library/Makefiles/test-application.make
-share/GNUstep/System/Library/Makefiles/test-library.make
-share/GNUstep/System/Library/Makefiles/test-tool.make
-share/GNUstep/System/Library/Makefiles/tool.make
-share/GNUstep/System/Library/Makefiles/vendor.sh
-share/GNUstep/System/Tools/debugapp
-share/GNUstep/System/Tools/gnustep-config
-share/GNUstep/System/Tools/openapp
-share/GNUstep/System/Tools/opentool
+@comment $NetBSD: PLIST,v 1.16 2009/04/13 12:09:25 rh Exp $
+bin/debugapp
+bin/gnustep-config
+bin/openapp
+bin/opentool
+share/GNUstep/Makefiles/GNUstep-reset.sh
+share/GNUstep/Makefiles/GNUstep.csh
+share/GNUstep/Makefiles/GNUstep.sh
+share/GNUstep/Makefiles/Instance/Documentation/autogsdoc.make
+share/GNUstep/Makefiles/Instance/Documentation/gsdoc.make
+share/GNUstep/Makefiles/Instance/Documentation/install_files.make
+share/GNUstep/Makefiles/Instance/Documentation/javadoc.make
+share/GNUstep/Makefiles/Instance/Documentation/latex.make
+share/GNUstep/Makefiles/Instance/Documentation/texi.make
+share/GNUstep/Makefiles/Instance/Shared/bundle.make
+share/GNUstep/Makefiles/Instance/Shared/headers.make
+share/GNUstep/Makefiles/Instance/Shared/java.make
+share/GNUstep/Makefiles/Instance/Shared/stamp-string.make
+share/GNUstep/Makefiles/Instance/Shared/strings.make
+share/GNUstep/Makefiles/Instance/application.make
+share/GNUstep/Makefiles/Instance/bundle.make
+share/GNUstep/Makefiles/Instance/clibrary.make
+share/GNUstep/Makefiles/Instance/ctool.make
+share/GNUstep/Makefiles/Instance/documentation.make
+share/GNUstep/Makefiles/Instance/framework.make
+share/GNUstep/Makefiles/Instance/gswapp.make
+share/GNUstep/Makefiles/Instance/gswbundle.make
+share/GNUstep/Makefiles/Instance/java-tool.make
+share/GNUstep/Makefiles/Instance/java.make
+share/GNUstep/Makefiles/Instance/library.make
+share/GNUstep/Makefiles/Instance/objc.make
+share/GNUstep/Makefiles/Instance/palette.make
+share/GNUstep/Makefiles/Instance/resource-set.make
+share/GNUstep/Makefiles/Instance/rules.make
+share/GNUstep/Makefiles/Instance/service.make
+share/GNUstep/Makefiles/Instance/subproject.make
+share/GNUstep/Makefiles/Instance/test-application.make
+share/GNUstep/Makefiles/Instance/test-library.make
+share/GNUstep/Makefiles/Instance/test-tool.make
+share/GNUstep/Makefiles/Instance/tool.make
+share/GNUstep/Makefiles/Master/aggregate.make
+share/GNUstep/Makefiles/Master/application.make
+share/GNUstep/Makefiles/Master/bundle.make
+share/GNUstep/Makefiles/Master/clibrary.make
+share/GNUstep/Makefiles/Master/ctool.make
+share/GNUstep/Makefiles/Master/documentation.make
+share/GNUstep/Makefiles/Master/framework.make
+share/GNUstep/Makefiles/Master/gswapp.make
+share/GNUstep/Makefiles/Master/gswbundle.make
+share/GNUstep/Makefiles/Master/java-tool.make
+share/GNUstep/Makefiles/Master/java.make
+share/GNUstep/Makefiles/Master/library.make
+share/GNUstep/Makefiles/Master/nsis.make
+share/GNUstep/Makefiles/Master/objc.make
+share/GNUstep/Makefiles/Master/palette.make
+share/GNUstep/Makefiles/Master/resource-set.make
+share/GNUstep/Makefiles/Master/rpm.make
+share/GNUstep/Makefiles/Master/rules.make
+share/GNUstep/Makefiles/Master/service.make
+share/GNUstep/Makefiles/Master/source-distribution.make
+share/GNUstep/Makefiles/Master/subproject.make
+share/GNUstep/Makefiles/Master/test-application.make
+share/GNUstep/Makefiles/Master/test-library.make
+share/GNUstep/Makefiles/Master/test-tool.make
+share/GNUstep/Makefiles/Master/tool.make
+share/GNUstep/Makefiles/aggregate.make
+share/GNUstep/Makefiles/app-wrapper.template
+share/GNUstep/Makefiles/application.make
+share/GNUstep/Makefiles/bundle.make
+share/GNUstep/Makefiles/clean_cpu.sh
+share/GNUstep/Makefiles/clean_os.sh
+share/GNUstep/Makefiles/clean_vendor.sh
+share/GNUstep/Makefiles/clibrary.make
+share/GNUstep/Makefiles/common.make
+share/GNUstep/Makefiles/config-noarch.make
+share/GNUstep/Makefiles/config.guess
+share/GNUstep/Makefiles/config.make
+share/GNUstep/Makefiles/config.sub
+share/GNUstep/Makefiles/cpu.sh
+share/GNUstep/Makefiles/ctool.make
+share/GNUstep/Makefiles/documentation.make
+share/GNUstep/Makefiles/empty.make
+share/GNUstep/Makefiles/executable.template
+share/GNUstep/Makefiles/filesystem.csh
+share/GNUstep/Makefiles/filesystem.make
+share/GNUstep/Makefiles/filesystem.sh
+share/GNUstep/Makefiles/fixpath.sh
+share/GNUstep/Makefiles/framework.make
+share/GNUstep/Makefiles/gnustep-make-help
+share/GNUstep/Makefiles/gswapp.make
+share/GNUstep/Makefiles/gswbundle.make
+share/GNUstep/Makefiles/install-sh
+share/GNUstep/Makefiles/java-executable.template
+share/GNUstep/Makefiles/java-tool.make
+share/GNUstep/Makefiles/java.make
+share/GNUstep/Makefiles/jni.make
+share/GNUstep/Makefiles/library-combo.make
+share/GNUstep/Makefiles/library.make
+share/GNUstep/Makefiles/messages.make
+share/GNUstep/Makefiles/mkinstalldirs
+share/GNUstep/Makefiles/names.make
+share/GNUstep/Makefiles/native-library.make
+share/GNUstep/Makefiles/nsi-app.template
+share/GNUstep/Makefiles/objc.make
+share/GNUstep/Makefiles/os.sh
+share/GNUstep/Makefiles/palette.make
+share/GNUstep/Makefiles/print_unique_pathlist.sh
+share/GNUstep/Makefiles/relative_path.sh
+share/GNUstep/Makefiles/resource-set.make
+share/GNUstep/Makefiles/rules.make
+share/GNUstep/Makefiles/service.make
+share/GNUstep/Makefiles/spec-rules.template
+share/GNUstep/Makefiles/strip_makefiles.sh
+share/GNUstep/Makefiles/subproject.make
+share/GNUstep/Makefiles/tar-exclude-list
+share/GNUstep/Makefiles/target.make
+share/GNUstep/Makefiles/test-application.make
+share/GNUstep/Makefiles/test-library.make
+share/GNUstep/Makefiles/test-tool.make
+share/GNUstep/Makefiles/tool.make
+share/GNUstep/Makefiles/vendor.sh
 share/examples/GNUstep/GNUstep.conf
+man/man1/debugapp.1
+man/man1/gnustep-config.1
+man/man1/openapp.1
+man/man1/opentool.1
+man/man7/GNUstep.7
+man/man7/library-combo.7
 @dirrm share/examples/GNUstep
-@exec ${MKDIR} %D/share/GNUstep/System/Tools/Resources
-@dirrm share/GNUstep/System/Tools/Resources
-@exec ${MKDIR} %D/share/GNUstep/System/Tools/Java
-@dirrm share/GNUstep/System/Tools/Java
-@dirrm share/GNUstep/System/Tools
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Sounds
-@dirrm share/GNUstep/System/Library/Sounds
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Services
-@dirrm share/GNUstep/System/Library/Services
-@exec ${MKDIR} %D/share/GNUstep/System/Library/PostScript
-@dirrm share/GNUstep/System/Library/PostScript
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Makefiles/${GNUSTEP_ARCH}
-@dirrm share/GNUstep/System/Library/Makefiles/${GNUSTEP_ARCH}
-@dirrm share/GNUstep/System/Library/Makefiles/Master
-@dirrm share/GNUstep/System/Library/Makefiles/Instance/Shared
-@dirrm share/GNUstep/System/Library/Makefiles/Instance/Documentation
-@dirrm share/GNUstep/System/Library/Makefiles/Instance
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Makefiles/Auxiliary
-@dirrm share/GNUstep/System/Library/Makefiles/Auxiliary
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Makefiles/Additional
-@dirrm share/GNUstep/System/Library/Makefiles/Additional
-@dirrm share/GNUstep/System/Library/Makefiles
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Libraries/Resources
-@dirrm share/GNUstep/System/Library/Libraries/Resources
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Libraries/Java
-@dirrm share/GNUstep/System/Library/Libraries/Java
-@dirrm share/GNUstep/System/Library/Libraries
-@exec ${MKDIR} %D/share/GNUstep/System/Library/KeyBindings
-@dirrm share/GNUstep/System/Library/KeyBindings
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Images
-@dirrm share/GNUstep/System/Library/Images
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Headers
-@dirrm share/GNUstep/System/Library/Headers
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Frameworks
-@dirrm share/GNUstep/System/Library/Frameworks
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Fonts
-@dirrm share/GNUstep/System/Library/Fonts
-@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
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/User
-@dirrm share/GNUstep/System/Library/Documentation/User
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/Developer
-@dirrm share/GNUstep/System/Library/Documentation/Developer
-@dirrm share/GNUstep/System/Library/Documentation
-@exec ${MKDIR} %D/share/GNUstep/System/Library/DocTemplates
-@dirrm share/GNUstep/System/Library/DocTemplates
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Colors
-@dirrm share/GNUstep/System/Library/Colors
-@exec ${MKDIR} %D/share/GNUstep/System/Library/ColorPickers
-@dirrm share/GNUstep/System/Library/ColorPickers
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles
-@dirrm share/GNUstep/System/Library/Bundles
-@exec ${MKDIR} %D/share/GNUstep/System/Library/ApplicationSupport
-@dirrm share/GNUstep/System/Library/ApplicationSupport
-@dirrm share/GNUstep/System/Library
-@exec ${MKDIR} %D/share/GNUstep/System/Applications
-@dirrm share/GNUstep/System/Applications
-@dirrm share/GNUstep/System
-@exec ${MKDIR} %D/share/GNUstep/Network
-@dirrm share/GNUstep/Network
-@exec ${MKDIR} %D/share/GNUstep/Local/Library/Libraries
-@dirrm share/GNUstep/Local/Library/Libraries
-@exec ${MKDIR} %D/share/GNUstep/Local/Library/Headers
-@dirrm share/GNUstep/Local/Library/Headers
-@exec ${MKDIR} %D/share/GNUstep/Local/Library/Frameworks
-@dirrm share/GNUstep/Local/Library/Frameworks
-@exec ${MKDIR} %D/share/GNUstep/Local/Library/Bundles
-@dirrm share/GNUstep/Local/Library/Bundles
-@dirrm share/GNUstep/Local/Library
-@exec ${MKDIR} %D/share/GNUstep/Local/Applications
-@dirrm share/GNUstep/Local/Applications
-@dirrm share/GNUstep/Local
+@exec ${MKDIR} %D/share/GNUstep/Makefiles/${GNUSTEP_ARCH}
+@dirrm share/GNUstep/Makefiles/${GNUSTEP_ARCH}
+@dirrm share/GNUstep/Makefiles/Master
+@dirrm share/GNUstep/Makefiles/Instance/Shared
+@dirrm share/GNUstep/Makefiles/Instance/Documentation
+@dirrm share/GNUstep/Makefiles/Instance
+@exec ${MKDIR} %D/share/GNUstep/Makefiles/Auxiliary
+@dirrm share/GNUstep/Makefiles/Auxiliary
+@exec ${MKDIR} %D/share/GNUstep/Makefiles/Additional
+@dirrm share/GNUstep/Makefiles/Additional
+@dirrm share/GNUstep/Makefiles
 @unexec ${RMDIR} %D/share/GNUstep 2>/dev/null || ${TRUE}
diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk
index e36d2d05d2b..5de1083829f 100644
--- a/devel/gnustep-make/buildlink3.mk
+++ b/devel/gnustep-make/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/04/13 12:09:25 rh Exp $
 
 BUILDLINK_TREE+=	gnustep-make
 
 .if !defined(GNUSTEP_MAKE_BUILDLINK3_MK)
 GNUSTEP_MAKE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=2.0.2
-BUILDLINK_ABI_DEPENDS.gnustep-make?=	gnustep-make>=2.0.2
+BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=2.0.8
+BUILDLINK_ABI_DEPENDS.gnustep-make?=	gnustep-make>=2.0.8
 BUILDLINK_PKGSRCDIR.gnustep-make?=	../../devel/gnustep-make
 
 .include "../../devel/gnustep-make/gnustep.mk"
@@ -15,93 +15,26 @@ BUILDLINK_LIBDIRS.gnustep-make=	lib ${GNUSTEP_BLDIRS}
 BUILDLINK_INCDIRS.gnustep-make=	include ${GNUSTEP_BIDIRS}
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Local$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Local\/Applications$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Local\/Library$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Local\/Library\/Bundles$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Local\/Library\/Frameworks$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Local\/Library\/Headers$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Local\/Library\/Libraries$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Network$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Applications$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/ApplicationSupport$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Bundles$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/ColorPickers$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Colors$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/DocTemplates$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Documentation$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Documentation\/Developer$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Documentation\/User$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Documentation\/info$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Documentation\/man$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Fonts$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Frameworks$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Headers$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Images$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/KeyBindings$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Libraries$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Libraries\/Java$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Libraries\/Resources$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Makefiles$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Makefiles\/Additional$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Makefiles\/Auxiliary$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Makefiles\/Instance$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Makefiles\/Instance\/Documentation$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Makefiles\/Instance\/Shared$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Makefiles\/Master$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/PostScript$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Services$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Sounds$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Tools$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Tools\/Java$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Tools\/Resources$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/share$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/${GNUSTEP_ARCH}$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/Additional$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/Auxiliary$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/Instance$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/Instance\/Documentation$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/Instance\/Shared$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/Master$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/examples\/GNUstep$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Local$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Local\/Applications$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Local\/Library$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Local\/Library\/Bundles$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Local\/Library\/Frameworks$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Local\/Library\/Headers$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Local\/Library\/Libraries$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Network$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Applications$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/ApplicationSupport$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Bundles$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/ColorPickers$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Colors$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/DocTemplates$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Documentation$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Documentation\/Developer$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Documentation\/User$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Documentation\/info$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Documentation\/man$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Fonts$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Frameworks$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Headers$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Images$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/KeyBindings$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Libraries$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Libraries\/Java$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Libraries\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Makefiles$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Makefiles\/Additional$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Makefiles\/Auxiliary$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Makefiles\/Instance$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Makefiles\/Instance\/Documentation$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Makefiles\/Instance\/Shared$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Makefiles\/Master$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/PostScript$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Services$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Sounds$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Tools$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Tools\/Java$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Tools\/Resources$$/ { next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/share$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/${GNUSTEP_ARCH}$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Additional$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Auxiliary$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance\/Documentation$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance\/Shared$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Master$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/examples\/GNUstep$$/ { next; }
+
 .endif # GNUSTEP_MAKE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnustep-make
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 1503ed72358..999c569074f 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2008/11/25 12:51:35 adam Exp $
+$NetBSD: distinfo,v 1.23 2009/04/13 12:09:25 rh Exp $
 
-SHA1 (gnustep-make-2.0.6.tar.gz) = cc571e596d0490ee9c7e8c24b12f3e37c118e9a4
-RMD160 (gnustep-make-2.0.6.tar.gz) = be2fc9c074349e14987d79842affdd3aec9cb597
-Size (gnustep-make-2.0.6.tar.gz) = 477219 bytes
+SHA1 (gnustep-make-2.0.8.tar.gz) = b84cf87747e7f97470b882279a564726151a2fd8
+RMD160 (gnustep-make-2.0.8.tar.gz) = c6b3dc6b1d94f20ea521964e5b5380eef6311e55
+Size (gnustep-make-2.0.8.tar.gz) = 484117 bytes
 SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
-SHA1 (patch-ad) = 24c7db3e6a61dd7f9d8a3bdc85d7baaa23c8eedb
-SHA1 (patch-ae) = e0a842ba61eef9d1311067292f9b30ef63cda3c8
+SHA1 (patch-ad) = 38851511848356dbe591f76f599aae643cfa1c6e
+SHA1 (patch-ae) = 96948468119a93e557f79d12b522ebd0ad4647a4
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 0112eb4b613..9ff8e70aa8c 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: gnustep.mk,v 1.8 2007/11/25 14:42:02 adam Exp $
+#	$NetBSD: gnustep.mk,v 1.9 2009/04/13 12:09:25 rh Exp $
 
 .if !defined(GNUSTEP_MK)
 GNUSTEP_MK=		#defined
@@ -6,32 +6,33 @@ GNUSTEP_MK=		#defined
 .include "../../mk/bsd.prefs.mk"
 
 GNUSTEP_SUBDIR=		share/GNUstep
-GNUSTEP_ROOT=		${PREFIX}/${GNUSTEP_SUBDIR}
+GNUSTEP_ROOT=		${PREFIX}
 GNUSTEP_SYSTEM_ROOT=	${GNUSTEP_ROOT}/System
 GNUSTEP_LOCAL_ROOT=	${GNUSTEP_ROOT}/Local
 GNUSTEP_NETWORK_ROOT=	${GNUSTEP_ROOT}/Network
-GNUSTEP_MAKEFILES=	${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles
+GNUSTEP_MAKEFILES=	${GNUSTEP_ROOT}/${GNUSTEP_SUBDIR}/Makefiles
 GNUSTEP_HOST=		${MACHINE_GNU_PLATFORM}
 GNUSTEP_HOST_CPU=	${MACHINE_GNU_ARCH:S/i386/ix86/}
 GNUSTEP_HOST_VENDOR=	${LOWER_VENDOR}
 GNUSTEP_HOST_OS=	${LOWER_OPSYS}
 
 GNUSTEP_FLATTENED=	yes
+GNUSTEP_IS_FLATTENED=	yes
 
 GNUSTEP_USER_ROOT=	${BUILDLINK_DIR}/share/GNUstep
-GNUSTEP_PATHLIST=	${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_NETWORK_ROOT}:${GNUSTEP_SYSTEM_ROOT}
-GNUSTEP_PATH=		${GNUSTEP_USER_ROOT}/Tools:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_LOCAL_ROOT}/Tools:${GNUSTEP_LOCAL_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_NETWORK_ROOT}/Tools:${GNUSTEP_NETWORK_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_SYSTEM_ROOT}/Tools:${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-GUILE_LOAD_PATH=	${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Libraries/Guile
-GNUSTEP_LDIR=	Library/Libraries
-GNUSTEP_IDIR=	Library/Headers
-GNUSTEP_LFLAGS=	${GNUSTEP_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${GNUSTEP_LOCAL_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${GNUSTEP_NETWORK_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${GNUSTEP_SYSTEM_ROOT:S/^/-L/}/${GNUSTEP_LDIR}
-GNUSTEP_IFLAGS=	${GNUSTEP_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${GNUSTEP_LOCAL_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${GNUSTEP_NETWORK_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${GNUSTEP_SYSTEM_ROOT:S/^/-I/}/${GNUSTEP_IDIR}
-GNUSTEP_LDIRS=	${GNUSTEP_LFLAGS:S/-L//g}
-GNUSTEP_IDIRS=	${GNUSTEP_IFLAGS:S/-I//g}
-GNUSTEP_BLDIRS=	${GNUSTEP_LDIRS:S/${PREFIX}\///g}
-GNUSTEP_BIDIRS=	${GNUSTEP_IDIRS:S/${PREFIX}\///g}
+GNUSTEP_PATHLIST=	${GNUSTEP_USER_ROOT}
+GNUSTEP_PATH=		${GNUSTEP_USER_ROOT}/Tools:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
+GUILE_LOAD_PATH=	${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_USER_ROOT}/lib
+GNUSTEP_LDIR=		lib
+GNUSTEP_IDIR=		include
+GNUSTEP_LFLAGS=		${GNUSTEP_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${GNUSTEP_USER_ROOT:S/^/-L/}/${GNUSTEP_LDIR}
+GNUSTEP_IFLAGS=		${GNUSTEP_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${GNUSTEP_USER_ROOT:S/^/-I/}/${GNUSTEP_IDIR}
+GNUSTEP_LDIRS=		${GNUSTEP_LFLAGS:S/-L//g}
+GNUSTEP_IDIRS=		${GNUSTEP_IFLAGS:S/-I//g}
+GNUSTEP_BLDIRS=		${GNUSTEP_LDIRS:S/${PREFIX}\///g}
+GNUSTEP_BIDIRS=		${GNUSTEP_IDIRS:S/${PREFIX}\///g}
 .if !empty(_USE_RPATH:M[yY][eE][sS])
-GNUSTEP_RFLAGS=	${GNUSTEP_LFLAGS:S/-L/${COMPILER_RPATH_FLAG}/g}
+GNUSTEP_RFLAGS=		${GNUSTEP_LFLAGS:S/-L/${COMPILER_RPATH_FLAG}/g}
 .else
 GNUSTEP_RFLAGS?=
 .endif
@@ -57,34 +58,42 @@ GNU_CONFIGURE=	yes
 .  endif
 
 MAKE_ENV+=	GNUSTEP_ROOT=${GNUSTEP_ROOT:Q}
-MAKE_ENV+=	GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q}
-MAKE_ENV+=	GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q}
-MAKE_ENV+=	GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q}
 MAKE_ENV+=	GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q}
 MAKE_ENV+=	GNUSTEP_HOST=${GNUSTEP_HOST:Q}
 MAKE_ENV+=	GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q}
 MAKE_ENV+=	GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q}
 MAKE_ENV+=	GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q}
-MAKE_ENV+=	GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
 MAKE_ENV+=	GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
 MAKE_ENV+=	GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
+MAKE_ENV+=	GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q}
+MAKE_ENV+=	GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
+
+.  if defined(GNUSTEP_OBSOLETE_ENV)
+MAKE_ENV+=	GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q}
+MAKE_ENV+=	GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q}
+MAKE_ENV+=	GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q}
 MAKE_ENV+=	GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q}
+.  endif	# GNUSTEP_OBSOLETE_ENV
 
 .  if defined(GNU_CONFIGURE) || defined(HAS_CONFIGURE)
 GNU_CONFIGURE_PREFIX?=	${GNUSTEP_ROOT}
 CONFIGURE_ENV+=	GNUSTEP_ROOT=${GNUSTEP_ROOT:Q}
-CONFIGURE_ENV+=	GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q}
-CONFIGURE_ENV+=	GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q}
-CONFIGURE_ENV+=	GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q}
 CONFIGURE_ENV+=	GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q}
 CONFIGURE_ENV+=	GNUSTEP_HOST=${GNUSTEP_HOST:Q}
 CONFIGURE_ENV+=	GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q}
 CONFIGURE_ENV+=	GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q}
 CONFIGURE_ENV+=	GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q}
-CONFIGURE_ENV+=	GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
 CONFIGURE_ENV+=	GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
 CONFIGURE_ENV+=	GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
+CONFIGURE_ENV+=	GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q}
+CONFIGURE_ENV+=	GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
+
+.    if defined(GNUSTEP_OBSOLETE_ENV)
+CONFIGURE_ENV+=	GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q}
+CONFIGURE_ENV+=	GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q}
+CONFIGURE_ENV+=	GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q}
 CONFIGURE_ENV+=	GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q}
+.    endif	# GNUSTEP_OBSOLETE_ENV
 .  endif	# GNU_CONFIGURE
 .endif	# !NO_GNUSTEP_ENV
 
diff --git a/devel/gnustep-make/patches/patch-ad b/devel/gnustep-make/patches/patch-ad
index 3536de611a1..75a83c44447 100644
--- a/devel/gnustep-make/patches/patch-ad
+++ b/devel/gnustep-make/patches/patch-ad
@@ -1,13 +1,74 @@
-$NetBSD: patch-ad,v 1.8 2008/11/25 12:51:35 adam Exp $
+$NetBSD: patch-ad,v 1.9 2009/04/13 12:09:26 rh Exp $
 
---- configure.orig	2008-05-25 13:16:03.000000000 +0200
+--- configure.orig	2008-12-19 22:48:59.000000000 +1000
 +++ configure
-@@ -5880,7 +5880,7 @@ echo $ECHO_N "checking if the compiler s
+@@ -2125,13 +2125,13 @@ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
++  if test "X${GCC}" = "Xyes" ; then
+     CFLAGS="-g -O2"
+   else
+     CFLAGS="-g"
+   fi
+ else
+-  if test "$GCC" = yes; then
++  if test "X${GCC}" = "Xyes" ; then
+     CFLAGS="-O2"
+   else
+     CFLAGS=
+@@ -5030,7 +5030,7 @@ rm -f core *.core gmon.out bb.out confte
+ fi
+   fi
+   if test x"$objc_threaded" = x""; then
+-    LIBS="-lobjc $saved_LIBS -lthread "
++    LIBS="-lobjc $saved_LIBS ${OBJC_THREAD} "
+     if test "$cross_compiling" = yes; then
+   objc_threaded=""
+ else
+@@ -5100,7 +5100,7 @@ echo $ECHO_N "checking whether we should
+ if test x"$USE_OBJC_EXCEPTIONS" = x"yes"; then
+   # What we want to do: set USE_OBJC_EXCEPTIONS to yes if we can compile
+   # something with @try/@catch/@finally in it.
+-  if test ! ${GCC} = "yes" ; then
++  if test "X${GCC}" != "Xyes" ; then
+     USE_OBJC_EXCEPTIONS=no
+     echo "$as_me:$LINENO: result: no: compiler isn't gcc" >&5
+ echo "${ECHO_T}no: compiler isn't gcc" >&6
+@@ -5190,7 +5190,7 @@ fi
+ 
+ echo "$as_me:$LINENO: checking for the GCC version" >&5
+ echo $ECHO_N "checking for the GCC version... $ECHO_C" >&6
+-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
+ else
+@@ -5229,7 +5229,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
+@@ -5272,7 +5272,7 @@ GCC_WITH_PRECOMPILED_HEADERS="no"
+ 
+ # First, a preliminary test.  If this is not gcc, precompiled headers
+ # are not supported.
+-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
+ else
+@@ -5314,7 +5314,7 @@ echo $ECHO_N "checking if the compiler r
+ # set SOLARIS_SHARED to yes if gcc => 4.x
+ 
+ SOLARIS_SHARED=""
+-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
  else
diff --git a/devel/gnustep-make/patches/patch-ae b/devel/gnustep-make/patches/patch-ae
index 27071c2496b..9e79de46811 100644
--- a/devel/gnustep-make/patches/patch-ae
+++ b/devel/gnustep-make/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.7 2008/05/25 08:16:06 adam Exp $
+$NetBSD: patch-ae,v 1.8 2009/04/13 12:09:26 rh Exp $
 
---- GNUmakefile.in.orig	2008-01-17 03:44:27.000000000 +0100
+--- GNUmakefile.in.orig	2008-10-22 00:45:48.000000000 +1000
 +++ GNUmakefile.in
 @@ -171,9 +171,9 @@ install: generated-files
  		"$(makedir)/Instance" \
@@ -10,8 +10,8 @@ $NetBSD: patch-ae,v 1.7 2008/05/25 08:16:06 adam Exp $
 -	 "$(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_DOT_CONF_FILE) "${PREFIX}/share/examples/GNUstep")
++	 "$(srcdir)/mkinstalldirs" "${DESTDIR}${PREFIX}/share/examples/GNUstep"; \
++	 $(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "${DESTDIR}${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 \