Add proper runtime link path

Add some missing environment variables needed by the GNUstep build system
Include GNUstep binary directories in PATH
Include some missing header files in buildlink list
Bump PKGREVISION

4 files changed, 36 insertions, 6 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 6fcf7b3dbff..d3790f12819 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/27 10:40:16 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/27 15:22:11 rh Exp $
 #
 
 DISTNAME=		gnustep-make-1.5.0
-CATEGORIES=		devel
+PKGREVISION=		1
+CATEGORIES=		devel gnustep
 MASTER_SITES=		ftp://ftp.gnustep.org/pub/gnustep/core/
 
 MAINTAINER=		rh@netbsd.org
diff --git a/devel/gnustep-make/buildlink2.mk b/devel/gnustep-make/buildlink2.mk
index 832d2ec0560..fe574b496ac 100644
--- a/devel/gnustep-make/buildlink2.mk
+++ b/devel/gnustep-make/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/27 10:40:16 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2002/09/27 15:22:11 rh Exp $
 #
 
 .if !defined(GNUSTEP_MAKE_BUILDLINK2_MK)
 GNUSTEP_MAKE_BUILDLINK2_MK=		# defined
 
 BUILDLINK_PACKAGES+=			gnustep-make
-BUILDLINK_DEPENDS.gnustep-make?=	gnustep-make>=1.5.0
+BUILDLINK_DEPENDS.gnustep-make?=	gnustep-make>1.5.0
 BUILDLINK_PKGSRCDIR.gnustep-make?=	../../devel/gnustep-make
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnustep-make=gnustep-make
@@ -22,10 +22,14 @@ GNUSTEP_HOST=		${MACHINE_GNU_PLATFORM}
 GNUSTEP_HOST_CPU=	${MACHINE_GNU_ARCH:S/i386/ix86/}
 GNUSTEP_HOST_VENDOR=	${LOWER_VENDOR}
 GNUSTEP_HOST_OS=	${LOWER_OPSYS}${APPEND_ELF}
-GNUSTEP_USER_ROOT=	${WRKDIR}
+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}
+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}"
@@ -38,6 +42,7 @@ 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+=	GUILE_LOAD_PATH="${GUILE_LOAD_PATH}"
 
 PLIST_SUBST+=	GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU}
 PLIST_SUBST+=	APPEND_ELF=${APPEND_ELF}
@@ -55,6 +60,7 @@ 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+=	GUILE_LOAD_PATH="${GUILE_LOAD_PATH}"
 .endif
 
 gnustep-make-buildlink: _BUILDLINK_USE
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 98e3489538c..38db85c776d 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/27 10:40:16 rh Exp $
+$NetBSD: distinfo,v 1.2 2002/09/27 15:22:11 rh Exp $
 
 SHA1 (gnustep-make-1.5.0.tar.gz) = 04eedb26fe34104548e5f5963cc11f5bed500709
 Size (gnustep-make-1.5.0.tar.gz) = 312944 bytes
 SHA1 (patch-aa) = 4969ea2cbd61e4bc2dab109abcbbdf5177ebdd8c
+SHA1 (patch-ab) = 09ff1a67ee88e40d7d4efa3a8417757e62f6fa4b
diff --git a/devel/gnustep-make/patches/patch-ab b/devel/gnustep-make/patches/patch-ab
new file mode 100644
index 00000000000..6eed00332a2
--- /dev/null
+++ b/devel/gnustep-make/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2002/09/27 15:22:11 rh Exp $
+
+--- common.make.orig	Fri Jun 14 02:11:52 2002
++++ common.make
+@@ -263,12 +263,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)))
++comma:= ,
+  GNUSTEP_LIBRARIES_FLAGS = \
+-   $(addprefix -L,$(foreach dir,$(GNUSTEP_LIBRARIES_DIRS),$(remove_if_empty)))
++   $(addprefix -L,$(foreach dir,$(GNUSTEP_LIBRARIES_DIRS),$(remove_if_empty))) \
++   $(addprefix -Wl$(comma)-R,$(foreach dir,$(GNUSTEP_LIBRARIES_DIRS),$(remove_if_empty)))
+ else
++comma:= ,
+  # Default case, just add -I / -L
+  GNUSTEP_HEADERS_FLAGS = $(addprefix -I,$(GNUSTEP_HEADERS_DIRS))
+  GNUSTEP_LIBRARIES_FLAGS = $(addprefix -L,$(GNUSTEP_LIBRARIES_DIRS))
++ GNUSTEP_LIBRARIES_FLAGS+= $(addprefix -Wl$(comma)-R,$(GNUSTEP_LIBRARIES_DIRS))
+ endif
+ 
+ #