4 files changed, 29 insertions, 46 deletions

diff --git a/devel/imake-4/files/patch-freetype b/devel/imake-4/files/patch-freetype
index 6bb066df1760..aecdd09fd35b 100644
--- a/devel/imake-4/files/patch-freetype
+++ b/devel/imake-4/files/patch-freetype
@@ -1,11 +1,11 @@
---- cf/X11.tmpl.orig	Sat Jun  2 07:21:30 2001
-+++ cf/X11.tmpl	Fri Jun  8 00:44:19 2001
-@@ -2453,7 +2453,7 @@
- FREETYPE2DIR = Freetype2Dir
- FREETYPE2LIBDIR = Freetype2LibDir
- FREETYPE2INCDIR = Freetype2IncDir
+--- cf/X11.tmpl.orig	Tue Feb 25 13:57:52 2003
++++ cf/X11.tmpl	Sun Mar  2 21:07:54 2003
+@@ -3029,7 +3029,7 @@
+ #endif /* else BuildFreetype2Library */
+ 
+ #if BuildFreetype2Library || HasFreetype2
 -FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
 +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
- FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
  FREETYPE2DEFINES = -DFREETYPE2
  #endif
+ 
diff --git a/devel/imake-4/files/patch-imake.c b/devel/imake-4/files/patch-imake.c
new file mode 100644
index 000000000000..f8117c91e000
--- /dev/null
+++ b/devel/imake-4/files/patch-imake.c
@@ -0,0 +1,22 @@
+--- imake/imake.c.orig	Tue Dec 17 04:21:38 2002
++++ imake/imake.c	Sat Jan  4 15:57:23 2003
+@@ -1384,6 +1384,19 @@
+ 	  name = &uts_name;
+       }
+ #endif
++# ifdef __FreeBSD__
++       /* Hack for FreeBSD ports "Cross Version" compiling system. */
++       {
++	 char *e;
++	 if ((e = getenv("OSREL")) != NULL && 
++	     strlen(name->sysname) + strlen(e) + 1 < SYS_NMLN) {
++	  strcpy(name->release, e);
++	  strcpy(name->version, name->sysname);
++	  strcat(name->version, " ");
++	  strcat(name->version, e);
++	 }
++       }
++# endif
+ 
+ #  if defined DEFAULT_OS_NAME
+ #   if defined CROSSCOMPILE
diff --git a/devel/imake-4/files/patch-imake::imake.c b/devel/imake-4/files/patch-imake::imake.c
deleted file mode 100644
index c44270e175c0..000000000000
--- a/devel/imake-4/files/patch-imake::imake.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- imake/imake.c	2002/05/10 23:41:31	1.1
-+++ imake/imake.c	2002/05/10 23:42:02
-@@ -1161,7 +1161,7 @@
- get_gcc_incdir(FILE *inFile)
- {
-   static char* gcc_path[] = {
--#if defined(linux) || defined(__OpenBSD__) || defined (__GNU__)
-+#if defined(linux) || defined(__OpenBSD__) || defined (__GNU__) || defined(__FreeBSD__)
-     "/usr/bin/cc",	/* for Linux PostIncDir */
- #endif
-     "/usr/local/bin/gcc",
diff --git a/devel/imake-4/files/patch-xthreads b/devel/imake-4/files/patch-xthreads
deleted file mode 100644
index f4bb8d98b3b9..000000000000
--- a/devel/imake-4/files/patch-xthreads
+++ /dev/null
@@ -1,25 +0,0 @@
---- cf/FreeBSD.cf.orig	Thu Jun  7 16:25:47 2001
-+++ cf/FreeBSD.cf	Thu Jun  7 16:28:30 2001
-@@ -80,7 +80,6 @@
- /*
-  * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-  */
--# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
- /*
-  * FreeBSD has tread-safe api but no getpwnam_r yet.
-  */
-@@ -91,8 +90,12 @@
- # else
- #  define BuildThreadStubLibrary  YES 
- #  define NeedUIThrStubs          YES 
--#  define ThreadsCompileFlags	-pthread
--#  define ThreadsLibraries 	-pthread
-+#  if (OSRelVersion >= 500016)
-+#   define ThreadsLibraries 	-lc_r
-+#  else
-+#   define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
-+#   define ThreadsLibraries 	-pthread
-+#  endif
- #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
- #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
- # endif