From 52bfdf64d4177dffb7af055191921c60f18afc43 Mon Sep 17 00:00:00 2001
From: Thomas Gellekum <tg@FreeBSD.org>
Date: Tue, 26 Jun 2001 11:56:42 +0000
Subject: Upgrade to 1.0.1

---
 devel/gnustep-make/files/GNUstep.sh        | 31 ------------------------------
 devel/gnustep-make/files/gdomap_if         |  1 -
 devel/gnustep-make/files/patch-aa          | 11 -----------
 devel/gnustep-make/files/patch-ab          | 11 -----------
 devel/gnustep-make/files/patch-target.make | 13 +++++++++++++
 5 files changed, 13 insertions(+), 54 deletions(-)
 delete mode 100644 devel/gnustep-make/files/GNUstep.sh
 delete mode 100644 devel/gnustep-make/files/gdomap_if
 delete mode 100644 devel/gnustep-make/files/patch-aa
 delete mode 100644 devel/gnustep-make/files/patch-ab
 create mode 100644 devel/gnustep-make/files/patch-target.make

(limited to 'devel/gnustep-make/files')

diff --git a/devel/gnustep-make/files/GNUstep.sh b/devel/gnustep-make/files/GNUstep.sh
deleted file mode 100644
index 0c53c376a68e..000000000000
--- a/devel/gnustep-make/files/GNUstep.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-IFFILE=${PREFIX}/etc/gdomap_if
-PIDFILE=/var/run/gdomap.pid
-GNUSTEP_SYSTEM_ROOT=${PREFIX}/GNUstep/System
-
-case "$1" in
-start)
-	if [ -e ${GNUSTEP_SYSTEM_ROOT}/Makefiles/GNUstep.sh ]; then
-		. ${GNUSTEP_SYSTEM_ROOT}/Makefiles/GNUstep.sh
-		if [ -x ${GNUSTEP_SYSTEM_ROOT}/Tools/gdomap ]; then
-			rm -f ${PIDFILE}
-			${GNUSTEP_SYSTEM_ROOT}/Tools/gdomap -a ${IFFILE} -I ${PIDFILE}
-			echo -n ' GNUstep'
-		fi
-	fi
-	;;
-stop)
-	[ -r ${PIDFILE} ] && kill $(cat ${PIDFILE}) && echo -n ' GNUstep'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/devel/gnustep-make/files/gdomap_if b/devel/gnustep-make/files/gdomap_if
deleted file mode 100644
index dcb650b9b376..000000000000
--- a/devel/gnustep-make/files/gdomap_if
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1 255.255.255.0
diff --git a/devel/gnustep-make/files/patch-aa b/devel/gnustep-make/files/patch-aa
deleted file mode 100644
index a9df450b0777..000000000000
--- a/devel/gnustep-make/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/Source/GNUmakefile.preamble.orig	Sun Oct 15 21:47:59 2000
-+++ gui/Source/GNUmakefile.preamble	Sun Oct 15 21:48:16 2000
-@@ -63,7 +63,7 @@
- ADDITIONAL_CFLAGS =
- 
- # Additional include directories the compiler should search
--ADDITIONAL_INCLUDE_DIRS = -I../Headers
-+ADDITIONAL_INCLUDE_DIRS = -I../Headers -I${LOCALBASE}/include
- 
- # Additional LDFLAGS to pass to the linker
- ADDITIONAL_LDFLAGS = 
diff --git a/devel/gnustep-make/files/patch-ab b/devel/gnustep-make/files/patch-ab
deleted file mode 100644
index 49015f9c1d9f..000000000000
--- a/devel/gnustep-make/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- xgps/Source/GNUmakefile.preamble.orig	Sun Oct 15 22:12:02 2000
-+++ xgps/Source/GNUmakefile.preamble	Sun Oct 15 22:12:26 2000
-@@ -55,7 +55,7 @@
- ADDITIONAL_CFLAGS = 
- 
- # Additional include directories the compiler should search
--ADDITIONAL_INCLUDE_DIRS = -I../Headers \
-+ADDITIONAL_INCLUDE_DIRS = -I../Headers -I${LOCALBASE}/include \
- 	-I$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) \
- 	-I./SharedX
- 
diff --git a/devel/gnustep-make/files/patch-target.make b/devel/gnustep-make/files/patch-target.make
new file mode 100644
index 000000000000..3cb68f66f430
--- /dev/null
+++ b/devel/gnustep-make/files/patch-target.make
@@ -0,0 +1,13 @@
+--- target.make.orig	Thu May 10 22:07:23 2001
++++ target.make	Tue Jun  5 09:26:45 2001
+@@ -79,8 +79,8 @@
+   ifeq ("$(objc_threaded)","")
+     TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
+   else
+-    INTERNAL_CFLAGS = -D_REENTRANT
+-    INTERNAL_OBJCFLAGS = -D_REENTRANT
++    INTERNAL_CFLAGS = -D_REENTRANT -D_THREAD_SAFE
++    INTERNAL_OBJCFLAGS = -D_REENTRANT -D_THREAD_SAFE
+     TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lm
+   endif
+ endif
-- 
cgit v1.2.3