Changes in version `1.8.0':

   Read the NEWS file for a complete list of changes since the last
stable release. The major difference from 1.6.0 is that the locations
of certain directories have changed. Generally this will not cause a
problem unless your GNUstep directory is shared by multiple machines
running this and earlier (1.6.x) versions of the software.

6 files changed, 176 insertions, 268 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index e82cae02c27..4d4d826d856 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:30:53 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/05 09:16:33 adam Exp $
 #
 
-DISTNAME=		gnustep-make-1.6.0
-CATEGORIES=		devel gnustep
-MASTER_SITES=		ftp://ftp.gnustep.org/pub/gnustep/core/
+DISTNAME=	gnustep-make-1.8.0
+CATEGORIES=	devel gnustep
+MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
 
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.gnustep.org/
-COMMENT=		GNUstep makefile package
+MAINTAINER=	rh@NetBSD.org
+HOMEPAGE=	http://www.gnustep.org/
+COMMENT=	GNUstep makefile package
 
 USE_GMAKE=		YES
 USE_X11=		YES
@@ -15,34 +15,13 @@ MAKEFILE=		GNUmakefile
 GNU_CONFIGURE=		YES
 GNU_CONFIGURE_PREFIX=	${PREFIX}/share/GNUstep
 GNUSTEP_HOST_CPU=	${MACHINE_GNU_ARCH:S/i386/ix86/}
+CONFIGURE_ARGS+=	--enable-flattened
 CONFIGURE_ENV+=		INSTALL_PROGRAM="${INSTALL_SCRIPT}"
 
-PLIST_SUBST+=	GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU}
-PLIST_SUBST+=	APPEND_ELF=${APPEND_ELF}
-
 post-patch:
-	${CP} ${WRKSRC}/target.make ${WRKSRC}/target.make.bak && \
-		${SED} -e 's;/usr/pkg;${LOCALBASE};g'  -e 's;@object_fmt@;${LOWER_OPSYS}-${OBJECT_FMT};g' \
-			${WRKSRC}/target.make.bak > ${WRKSRC}/target.make
-
-post-install:
-.for sub in System Local
-	${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/${sub}/Headers/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-.for dir in Libraries Tools
-	${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/${sub}/${dir}/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-.endfor
-.endfor
-.for dir in Services PostScript Frameworks Colors Bundles
-	${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Library/${dir}
-.endfor
-.for dir in Resources Java
-	${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Libraries/${dir}
-.endfor
-.for dir in User Developer
-	${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Documentation/${dir}
-.endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Developer/Palettes
-	${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Applications
-	${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Tools/Java
+	${CP} ${WRKSRC}/target.make ${WRKSRC}/target.make.bak
+	${SED}  -e 's;/usr/pkg;${LOCALBASE};g' \
+		-e 's;@object_fmt@;${LOWER_OPSYS}-${OBJECT_FMT};g' \
+		${WRKSRC}/target.make.bak > ${WRKSRC}/target.make
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gnustep-make/PLIST b/devel/gnustep-make/PLIST
index 4d591c4f755..6b498fb34c1 100644
--- a/devel/gnustep-make/PLIST
+++ b/devel/gnustep-make/PLIST
@@ -1,220 +1,155 @@
-@comment $NetBSD: PLIST,v 1.4 2003/04/01 08:29:12 rh Exp $
-share/GNUstep/System/Makefiles/GNUstep-reset.sh
-share/GNUstep/System/Makefiles/GNUstep.csh
-share/GNUstep/System/Makefiles/GNUstep.sh
-share/GNUstep/System/Makefiles/Instance/Documentation/autogsdoc.make
-share/GNUstep/System/Makefiles/Instance/Documentation/gsdoc.make
-share/GNUstep/System/Makefiles/Instance/Documentation/install_files.make
-share/GNUstep/System/Makefiles/Instance/Documentation/javadoc.make
-share/GNUstep/System/Makefiles/Instance/Documentation/latex.make
-share/GNUstep/System/Makefiles/Instance/Documentation/texi.make
-share/GNUstep/System/Makefiles/Instance/Shared/bundle.make
-share/GNUstep/System/Makefiles/Instance/Shared/headers.make
-share/GNUstep/System/Makefiles/Instance/Shared/java.make
-share/GNUstep/System/Makefiles/Instance/Shared/stamp-string.make
-share/GNUstep/System/Makefiles/Instance/Shared/strings.make
-share/GNUstep/System/Makefiles/Instance/application.make
-share/GNUstep/System/Makefiles/Instance/bundle.make
-share/GNUstep/System/Makefiles/Instance/clibrary.make
-share/GNUstep/System/Makefiles/Instance/ctool.make
-share/GNUstep/System/Makefiles/Instance/documentation.make
-share/GNUstep/System/Makefiles/Instance/framework.make
-share/GNUstep/System/Makefiles/Instance/gswapp.make
-share/GNUstep/System/Makefiles/Instance/gswbundle.make
-share/GNUstep/System/Makefiles/Instance/java-tool.make
-share/GNUstep/System/Makefiles/Instance/java.make
-share/GNUstep/System/Makefiles/Instance/library.make
-share/GNUstep/System/Makefiles/Instance/objc.make
-share/GNUstep/System/Makefiles/Instance/palette.make
-share/GNUstep/System/Makefiles/Instance/resource-set.make
-share/GNUstep/System/Makefiles/Instance/rules.make
-share/GNUstep/System/Makefiles/Instance/service.make
-share/GNUstep/System/Makefiles/Instance/subproject.make
-share/GNUstep/System/Makefiles/Instance/test-application.make
-share/GNUstep/System/Makefiles/Instance/test-library.make
-share/GNUstep/System/Makefiles/Instance/test-tool.make
-share/GNUstep/System/Makefiles/Instance/tool.make
-share/GNUstep/System/Makefiles/Master/aggregate.make
-share/GNUstep/System/Makefiles/Master/application.make
-share/GNUstep/System/Makefiles/Master/bundle.make
-share/GNUstep/System/Makefiles/Master/clibrary.make
-share/GNUstep/System/Makefiles/Master/ctool.make
-share/GNUstep/System/Makefiles/Master/documentation.make
-share/GNUstep/System/Makefiles/Master/framework.make
-share/GNUstep/System/Makefiles/Master/gswapp.make
-share/GNUstep/System/Makefiles/Master/gswbundle.make
-share/GNUstep/System/Makefiles/Master/java-tool.make
-share/GNUstep/System/Makefiles/Master/java.make
-share/GNUstep/System/Makefiles/Master/library.make
-share/GNUstep/System/Makefiles/Master/objc.make
-share/GNUstep/System/Makefiles/Master/palette.make
-share/GNUstep/System/Makefiles/Master/resource-set.make
-share/GNUstep/System/Makefiles/Master/rpm.make
-share/GNUstep/System/Makefiles/Master/rules.make
-share/GNUstep/System/Makefiles/Master/service.make
-share/GNUstep/System/Makefiles/Master/source-distribution.make
-share/GNUstep/System/Makefiles/Master/subproject.make
-share/GNUstep/System/Makefiles/Master/test-application.make
-share/GNUstep/System/Makefiles/Master/test-library.make
-share/GNUstep/System/Makefiles/Master/test-tool.make
-share/GNUstep/System/Makefiles/Master/tool.make
-share/GNUstep/System/Makefiles/aggregate.make
-share/GNUstep/System/Makefiles/application.make
-share/GNUstep/System/Makefiles/bundle.make
-share/GNUstep/System/Makefiles/clean_cpu.sh
-share/GNUstep/System/Makefiles/clean_os.sh
-share/GNUstep/System/Makefiles/clean_vendor.sh
-share/GNUstep/System/Makefiles/clibrary.make
-share/GNUstep/System/Makefiles/common.make
-share/GNUstep/System/Makefiles/config.guess
-share/GNUstep/System/Makefiles/config.sub
-share/GNUstep/System/Makefiles/cpu.sh
-share/GNUstep/System/Makefiles/ctool.make
-share/GNUstep/System/Makefiles/documentation.make
-share/GNUstep/System/Makefiles/executable.template
-share/GNUstep/System/Makefiles/fixpath.sh
-share/GNUstep/System/Makefiles/framework.make
-share/GNUstep/System/Makefiles/gswapp.make
-share/GNUstep/System/Makefiles/gswbundle.make
-share/GNUstep/System/Makefiles/install-sh
-share/GNUstep/System/Makefiles/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/config.make
-share/GNUstep/System/Makefiles/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/user_home
-share/GNUstep/System/Makefiles/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/which_lib
-share/GNUstep/System/Makefiles/java-executable.template
-share/GNUstep/System/Makefiles/java-tool.make
-share/GNUstep/System/Makefiles/java.make
-share/GNUstep/System/Makefiles/jni.make
-share/GNUstep/System/Makefiles/ld_lib_path.csh
-share/GNUstep/System/Makefiles/ld_lib_path.sh
-share/GNUstep/System/Makefiles/library-combo.make
-share/GNUstep/System/Makefiles/library.make
-share/GNUstep/System/Makefiles/messages.make
-share/GNUstep/System/Makefiles/mkinstalldirs
-share/GNUstep/System/Makefiles/names.make
-share/GNUstep/System/Makefiles/objc.make
-share/GNUstep/System/Makefiles/os.sh
-share/GNUstep/System/Makefiles/palette.make
-share/GNUstep/System/Makefiles/relative_path.sh
-share/GNUstep/System/Makefiles/resource-set.make
-share/GNUstep/System/Makefiles/rules.make
-share/GNUstep/System/Makefiles/service.make
-share/GNUstep/System/Makefiles/spec-debug-alone-rules.template
-share/GNUstep/System/Makefiles/spec-debug-rules.template
-share/GNUstep/System/Makefiles/spec-rules.template
-share/GNUstep/System/Makefiles/subproject.make
-share/GNUstep/System/Makefiles/target.make
-share/GNUstep/System/Makefiles/test-application.make
-share/GNUstep/System/Makefiles/test-library.make
-share/GNUstep/System/Makefiles/test-tool.make
-share/GNUstep/System/Makefiles/tool.make
-share/GNUstep/System/Makefiles/transform_paths.sh
-share/GNUstep/System/Makefiles/vendor.sh
+@comment $NetBSD: PLIST,v 1.5 2003/12/05 09:16:33 adam Exp $
+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/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/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.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/executable.template
+share/GNUstep/System/Library/Makefiles/fixpath.sh
+share/GNUstep/System/Library/Makefiles/framework.make
+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/objc.make
+share/GNUstep/System/Library/Makefiles/os.sh
+share/GNUstep/System/Library/Makefiles/palette.make
+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-debug-alone-rules.template
+share/GNUstep/System/Library/Makefiles/spec-debug-rules.template
+share/GNUstep/System/Library/Makefiles/spec-rules.template
+share/GNUstep/System/Library/Makefiles/subproject.make
+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/transform_paths.sh
+share/GNUstep/System/Library/Makefiles/user_home
+share/GNUstep/System/Library/Makefiles/vendor.sh
+share/GNUstep/System/Library/Makefiles/which_lib
+share/GNUstep/System/Makefiles
 share/GNUstep/System/Tools/debugapp
 share/GNUstep/System/Tools/openapp
 share/GNUstep/System/Tools/opentool
 share/GNUstep/System/share/config.site
 @dirrm share/GNUstep/System/share
-@exec ${MKDIR} %D/share/GNUstep/System/Tools/Resources
 @dirrm share/GNUstep/System/Tools/Resources
-@exec ${MKDIR} %D/share/GNUstep/System/Tools/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Tools/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Tools/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Tools/${GNUSTEP_HOST_CPU}
-@exec ${MKDIR} %D/share/GNUstep/System/Tools/Java
 @dirrm share/GNUstep/System/Tools/Java
 @dirrm share/GNUstep/System/Tools
-@dirrm share/GNUstep/System/Makefiles/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Makefiles/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Makefiles/Master
-@dirrm share/GNUstep/System/Makefiles/Instance/Shared
-@dirrm share/GNUstep/System/Makefiles/Instance/Documentation
-@dirrm share/GNUstep/System/Makefiles/Instance
-@exec ${MKDIR} %D/share/GNUstep/System/Makefiles/Auxiliary
-@dirrm share/GNUstep/System/Makefiles/Auxiliary
-@exec ${MKDIR} %D/share/GNUstep/System/Makefiles/Additional
-@dirrm share/GNUstep/System/Makefiles/Additional
-@dirrm share/GNUstep/System/Makefiles
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Services
+@dirrm share/GNUstep/System/Library/Sounds
 @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/Frameworks
+@dirrm share/GNUstep/System/Library/Makefiles/ix86
+@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
+@dirrm share/GNUstep/System/Library/Makefiles/Auxiliary
+@dirrm share/GNUstep/System/Library/Makefiles/Additional
+@dirrm share/GNUstep/System/Library/Makefiles
+@dirrm share/GNUstep/System/Library/Libraries/Resources
+@dirrm share/GNUstep/System/Library/Libraries/Java
+@dirrm share/GNUstep/System/Library/Libraries
+@dirrm share/GNUstep/System/Library/KeyBindings
+@dirrm share/GNUstep/System/Library/Images
+@dirrm share/GNUstep/System/Library/Headers
 @dirrm share/GNUstep/System/Library/Frameworks
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Colors
+@dirrm share/GNUstep/System/Library/Fonts
+@dirrm share/GNUstep/System/Library/Documentation/man
+@dirrm share/GNUstep/System/Library/Documentation/info
+@dirrm share/GNUstep/System/Library/Documentation/User
+@dirrm share/GNUstep/System/Library/Documentation/Developer
+@dirrm share/GNUstep/System/Library/Documentation
+@dirrm share/GNUstep/System/Library/DocTemplates
 @dirrm share/GNUstep/System/Library/Colors
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles
+@dirrm share/GNUstep/System/Library/ColorPickers
 @dirrm share/GNUstep/System/Library/Bundles
+@dirrm share/GNUstep/System/Library/ApplicationSupport
 @dirrm share/GNUstep/System/Library
-@exec ${MKDIR} %D/share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}
-@exec ${MKDIR} %D/share/GNUstep/System/Libraries/Resources
-@dirrm share/GNUstep/System/Libraries/Resources
-@exec ${MKDIR} %D/share/GNUstep/System/Libraries/Java
-@dirrm share/GNUstep/System/Libraries/Java
-@dirrm share/GNUstep/System/Libraries
-@exec ${MKDIR} %D/share/GNUstep/System/Headers/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Headers/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Headers/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Headers
-@exec ${MKDIR} %D/share/GNUstep/System/Documentation/man
-@dirrm share/GNUstep/System/Documentation/man
-@exec ${MKDIR} %D/share/GNUstep/System/Documentation/info
-@dirrm share/GNUstep/System/Documentation/info
-@exec ${MKDIR} %D/share/GNUstep/System/Documentation/User
-@dirrm share/GNUstep/System/Documentation/User
-@exec ${MKDIR} %D/share/GNUstep/System/Documentation/Developer
-@dirrm share/GNUstep/System/Documentation/Developer
-@dirrm share/GNUstep/System/Documentation
-@exec ${MKDIR} %D/share/GNUstep/System/Developer/Palettes
-@dirrm share/GNUstep/System/Developer/Palettes
-@dirrm share/GNUstep/System/Developer
-@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/Tools/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Tools/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Tools/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/Local/Tools/${GNUSTEP_HOST_CPU}
-@exec ${MKDIR} %D/share/GNUstep/Local/Tools/Java
-@dirrm share/GNUstep/Local/Tools/Java
-@dirrm share/GNUstep/Local/Tools
-@exec ${MKDIR} %D/share/GNUstep/Local/Library/Services
-@dirrm share/GNUstep/Local/Library/Services
-@exec ${MKDIR} %D/share/GNUstep/Local/Library/PostScript
-@dirrm share/GNUstep/Local/Library/PostScript
-@exec ${MKDIR} %D/share/GNUstep/Local/Library/Frameworks
-@dirrm share/GNUstep/Local/Library/Frameworks
-@exec ${MKDIR} %D/share/GNUstep/Local/Library/Colors
-@dirrm share/GNUstep/Local/Library/Colors
-@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/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}
-@exec ${MKDIR} %D/share/GNUstep/Local/Libraries/Resources
-@dirrm share/GNUstep/Local/Libraries/Resources
-@exec ${MKDIR} %D/share/GNUstep/Local/Libraries/Java
-@dirrm share/GNUstep/Local/Libraries/Java
-@dirrm share/GNUstep/Local/Libraries
-@exec ${MKDIR} %D/share/GNUstep/Local/Headers/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/Local/Headers/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/Local/Headers/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/Local/Headers
-@exec ${MKDIR} %D/share/GNUstep/Local/Documentation/User
-@dirrm share/GNUstep/Local/Documentation/User
-@exec ${MKDIR} %D/share/GNUstep/Local/Documentation/Developer
-@dirrm share/GNUstep/Local/Documentation/Developer
-@dirrm share/GNUstep/Local/Documentation
-@exec ${MKDIR} %D/share/GNUstep/Local/Developer/Palettes
-@dirrm share/GNUstep/Local/Developer/Palettes
-@dirrm share/GNUstep/Local/Developer
-@exec ${MKDIR} %D/share/GNUstep/Local/Applications
-@dirrm share/GNUstep/Local/Applications
 @dirrm share/GNUstep/Local
 @dirrm share/GNUstep
diff --git a/devel/gnustep-make/buildlink2.mk b/devel/gnustep-make/buildlink2.mk
index 31213bc304f..51a01baed51 100644
--- a/devel/gnustep-make/buildlink2.mk
+++ b/devel/gnustep-make/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/05/06 05:39:19 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/12/05 09:16:33 adam Exp $
 #
 
 .if !defined(GNUSTEP_MAKE_BUILDLINK2_MK)
 GNUSTEP_MAKE_BUILDLINK2_MK=		# defined
 
 BUILDLINK_PACKAGES+=			gnustep-make
-BUILDLINK_DEPENDS.gnustep-make?=	gnustep-make>=1.6.0
+BUILDLINK_DEPENDS.gnustep-make?=	gnustep-make>=1.8.0
 BUILDLINK_PKGSRCDIR.gnustep-make?=	../../devel/gnustep-make
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnustep-make=gnustep-make
@@ -14,29 +14,27 @@ BUILDLINK_PREFIX.gnustep-make_DEFAULT=	${LOCALBASE}
 BUILDLINK_TARGETS+=	gnustep-make-buildlink
 
 GNUSTEP_ROOT=		${PREFIX}/share/GNUstep
-GNUSTEP_LOCAL_ROOT=	${GNUSTEP_ROOT}/Local
 GNUSTEP_SYSTEM_ROOT=	${GNUSTEP_ROOT}/System
+GNUSTEP_FLATTENED=	yes
+#LIBRARY_COMBO=		gnu-gnu-gnu
+GNUSTEP_LOCAL_ROOT=	${GNUSTEP_ROOT}/Local
 GNUSTEP_NETWORK_ROOT=	${GNUSTEP_ROOT}/Network
 GNUSTEP_MAKEFILES=	${GNUSTEP_SYSTEM_ROOT}/Makefiles
 GNUSTEP_HOST=		${MACHINE_GNU_PLATFORM}
 GNUSTEP_HOST_CPU=	${MACHINE_GNU_ARCH:S/i386/ix86/}
 GNUSTEP_HOST_VENDOR=	${LOWER_VENDOR}
-.if (${MACHINE_ARCH} == "i386")
-GNUSTEP_HOST_OS=	${LOWER_OPSYS}${APPEND_ELF}
-.else
 GNUSTEP_HOST_OS=	${LOWER_OPSYS}
-.endif
+
 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}/gnu-gnu-gnu:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_LOCAL_ROOT}/Tools:${GNUSTEP_LOCAL_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu:${GNUSTEP_LOCAL_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_NETWORK_ROOT}/Tools:${GNUSTEP_NETWORK_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu:${GNUSTEP_NETWORK_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_SYSTEM_ROOT}/Tools:${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu:${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
+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_FLATTENED=	# defined
 
 PATH:=		${GNUSTEP_PATH}:${PATH}
 
 MAKE_ENV+=	GNUSTEP_ROOT="${GNUSTEP_ROOT}"
-MAKE_ENV+=	GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}"
 MAKE_ENV+=	GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"
+MAKE_ENV+=	GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}"
 MAKE_ENV+=	GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}"
 MAKE_ENV+=	GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}"
 MAKE_ENV+=	GNUSTEP_HOST="${GNUSTEP_HOST}"
@@ -45,17 +43,13 @@ MAKE_ENV+=	GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}"
 MAKE_ENV+=	GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}"
 MAKE_ENV+=	GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}"
 MAKE_ENV+=	GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}"
-MAKE_ENV+=	GNUSTEP_FLATTENED=""
+MAKE_ENV+=	GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}"
 MAKE_ENV+=	GUILE_LOAD_PATH="${GUILE_LOAD_PATH}"
 
-PLIST_SUBST+=	GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU}
-PLIST_SUBST+=	GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS}
-PLIST_SUBST+=	APPEND_ELF=${APPEND_ELF}
-
 .if defined(GNU_CONFIGURE)
 CONFIGURE_ENV+=	GNUSTEP_ROOT="${GNUSTEP_ROOT}"
-CONFIGURE_ENV+=	GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}"
 CONFIGURE_ENV+=	GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"
+CONFIGURE_ENV+=	GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}"
 CONFIGURE_ENV+=	GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}"
 CONFIGURE_ENV+=	GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}"
 CONFIGURE_ENV+=	GNUSTEP_HOST="${GNUSTEP_HOST}"
@@ -64,7 +58,7 @@ CONFIGURE_ENV+=	GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}"
 CONFIGURE_ENV+=	GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}"
 CONFIGURE_ENV+=	GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}"
 CONFIGURE_ENV+=	GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}"
-CONFIGURE_ENV+=	GNUSTEP_FLATTENED=""
+CONFIGURE_ENV+=	GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}"
 CONFIGURE_ENV+=	GUILE_LOAD_PATH="${GUILE_LOAD_PATH}"
 .endif
 
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 733b1d068a6..3ac09296894 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2003/04/01 08:29:12 rh Exp $
+$NetBSD: distinfo,v 1.6 2003/12/05 09:16:33 adam Exp $
 
-SHA1 (gnustep-make-1.6.0.tar.gz) = 4180314f40a84699eafb57e890e511751402fe8d
-Size (gnustep-make-1.6.0.tar.gz) = 342471 bytes
+SHA1 (gnustep-make-1.8.0.tar.gz) = 7fcac2b059c269ebce2df4fa414658790bb9bb3a
+Size (gnustep-make-1.8.0.tar.gz) = 359394 bytes
 SHA1 (patch-aa) = 4969ea2cbd61e4bc2dab109abcbbdf5177ebdd8c
-SHA1 (patch-ab) = 09ff1a67ee88e40d7d4efa3a8417757e62f6fa4b
-SHA1 (patch-ac) = ef564b5997853b75e9c13958dbb4baedca270d46
+SHA1 (patch-ab) = c8ac2f268ffc046817b074e050964c528d10bb58
+SHA1 (patch-ac) = bdc80e22663848eab3b805d34264c567ad323160
diff --git a/devel/gnustep-make/patches/patch-ab b/devel/gnustep-make/patches/patch-ab
index 6eed00332a2..29eeea78076 100644
--- a/devel/gnustep-make/patches/patch-ab
+++ b/devel/gnustep-make/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2002/09/27 15:22:11 rh Exp $
+$NetBSD: patch-ab,v 1.2 2003/12/05 09:16:33 adam Exp $
 
---- common.make.orig	Fri Jun 14 02:11:52 2002
+--- common.make.orig	2003-09-16 05:43:06.000000000 +0200
 +++ common.make
-@@ -263,12 +263,16 @@ ifeq ($(REMOVE_EMPTY_DIRS),yes)
+@@ -275,12 +275,16 @@ ifeq ($(REMOVE_EMPTY_DIRS),yes)
   # default - by default we put all directories in compilation commands.
   GNUSTEP_HEADERS_FLAGS = \
     $(addprefix -I,$(foreach dir,$(GNUSTEP_HEADERS_DIRS),$(remove_if_empty)))
diff --git a/devel/gnustep-make/patches/patch-ac b/devel/gnustep-make/patches/patch-ac
index 196168aaf1d..a6732d3e224 100644
--- a/devel/gnustep-make/patches/patch-ac
+++ b/devel/gnustep-make/patches/patch-ac
@@ -1,12 +1,9 @@
-$NetBSD: patch-ac,v 1.1 2003/02/06 10:54:18 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2003/12/05 09:16:33 adam Exp $
 
-work around the fact that some systems like i386 report either
-netbsd (a.out) or netbsdelf (elf) while others like alpha report
-netbsd (elf).  This was making alpha be set incorrectly to a.out
-
---- target.make.orig	Fri Nov 15 15:14:59 2002
-+++ target.make	Thu Feb  6 05:45:23 2003
-@@ -720,7 +720,7 @@
+--- target.make.orig	2003-09-26 04:30:39.000000000 +0200
++++ target.make
+@@ -594,9 +594,9 @@ endif
+ 
  ####################################################
  #
 -# NetBSD
@@ -16,10 +13,13 @@ netbsd (elf).  This was making alpha be set incorrectly to a.out
 +ifeq (@object_fmt@,netbsd-a.out)
  # This is disabled temporarily, because I don't know exactly how
  # to link shared libs. Everything seems to link correctly now but
-@@ -754,5 +754,5 @@
+ # constructor functions in the shared lib failed to get called
+@@ -628,7 +628,7 @@ endif
+ #
  # NetBSD ELF
  #
 -ifeq ($(findstring netbsdelf, $(GNUSTEP_TARGET_OS)), netbsdelf)
 +ifeq (@object_fmt@,netbsd-ELF)
  HAVE_SHARED_LIBS    = yes
  SHARED_LD_POSTFLAGS = -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
+ SHARED_LIB_LINK_CMD = \