4 files changed, 32 insertions, 83 deletions
diff --git a/devel/imake-6/files/patch-FreeBSD.cf b/devel/imake-6/files/patch-FreeBSD.cf
index 8b0bf8f8202e..520a175ed6dd 100644
--- a/devel/imake-6/files/patch-FreeBSD.cf
+++ b/devel/imake-6/files/patch-FreeBSD.cf
@@ -1,46 +1,31 @@
---- cf/FreeBSD.cf.orig	Fri Apr  2 13:47:10 2004
-+++ cf/FreeBSD.cf	Fri Jun 18 19:26:35 2004
-@@ -109,32 +109,20 @@
- # endif
- # define HasPosixThreads	YES
- # define ThreadedX		YES
--# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
--/*
-- * FreeBSD has tread-safe api but no getpwnam_r yet.
-- */
-+# define SystemMTDefines	%%PTHREAD_CFLAGS%%
- # define HasThreadSafeAPI	YES
- # if OSRelVersion < 501000
- #  define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
- # else
- #  define MTSafeAPIDefines	-DXUSE_MTSAFE_API
+--- cf/FreeBSD.cf.orig	Sat Aug 14 17:03:36 2004
++++ cf/FreeBSD.cf	Fri Sep 10 19:52:31 2004
+@@ -78,6 +78,7 @@
+ #define HasIssetugid		YES
+ #define HasPoll			YES
+ #endif
++#define BuildHtmlManPages	NO
+ 
+ #if OSMajorVersion >= 4
+ #define HasGetIfAddrs		YES
+@@ -117,14 +118,8 @@
+ # if (OSRelVersion < 500043)
+ #  define NeedUIThrStubs	YES
  # endif
--# if HasLibPthread
+-# if (OSRelVersion >= 502102)
 -#  define ThreadsLibraries	-lpthread
-+# define ThreadsLibraries	%%PTHREAD_LIBS%%
-+# if OSRelVersion >= 500043
-+#  define BuildThreadStubLibrary  NO
-+#  define NeedUIThrStubs          NO
- # else
--#  if OSRelVersion >= 500043
--#   define BuildThreadStubLibrary  NO
--#   define NeedUIThrStubs          NO
--#  else
--#   define BuildThreadStubLibrary  YES
--#   define NeedUIThrStubs          YES
--#  endif
--#  if (OSRelVersion >= 500016)
--#   define ThreadsLibraries	-lc_r
--#   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
--#  else
--#   define ThreadsLibraries	-pthread
--#  endif
-+#  define BuildThreadStubLibrary  YES
-+#  define NeedUIThrStubs          YES
- #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
- #  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
- # endif
-@@ -359,7 +347,7 @@
+-# elif (OSRelVersion >= 500016)
+-#  define ThreadsLibraries	-lc_r
+-# else
+-#  define ThreadsLibraries	-pthread
+-# endif
+-# define SystemMTDefines	-D_THREAD_SAFE
++# define ThreadsLibraries	-lpthread
++# define SystemMTDefines	
+ #endif
+ 
+ /* This fixes linking C programs against libGLU on FreeBSD 3.x */
+@@ -338,7 +333,7 @@
  #ifndef LibraryRpathLoadFlags
  # if UseRpath
  #  if UseElfFormat
@@ -49,7 +34,7 @@
  #  else
  #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
  #  endif
-@@ -455,14 +443,14 @@
+@@ -466,14 +461,14 @@
  /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
  #ifndef DefaultGcc2i386Opt
  #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
diff --git a/devel/imake-6/files/patch-Imake.tmpl b/devel/imake-6/files/patch-Imake.tmpl
index 93412ae23182..04114110a2b9 100644
--- a/devel/imake-6/files/patch-Imake.tmpl
+++ b/devel/imake-6/files/patch-Imake.tmpl
@@ -1,6 +1,6 @@
---- cf/Imake.tmpl.orig	Fri Apr  2 13:47:10 2004
-+++ cf/Imake.tmpl	Thu Jul 22 22:51:21 2004
-@@ -1776,7 +1776,7 @@
+--- cf/Imake.tmpl.orig	Tue Jul 27 20:24:29 2004
++++ cf/Imake.tmpl	Fri Sep 10 18:45:12 2004
+@@ -1798,7 +1798,7 @@
         CXXOPTIONS = CplusplusOptions
        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
         CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
@@ -9,13 +9,11 @@
  #endif
           COMPRESS = CompressCmd
            GZIPCMD = GzipCmd
-@@ -2015,8 +2015,8 @@
-  * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
+@@ -2038,7 +2038,7 @@
   */
        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
--       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) $(VENDOR_DEFINES)
+        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
 -           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
 +           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
          LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
           LDPRELIB = LdPreLib $(INSTALLED_LIBS)
diff --git a/devel/imake-6/files/patch-cf-Imakefile b/devel/imake-6/files/patch-cf-Imakefile
deleted file mode 100644
index 67a6bbb2e345..000000000000
--- a/devel/imake-6/files/patch-cf-Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- cf/Imakefile.orig	Sun Jun  6 19:06:47 2004
-+++ cf/Imakefile	Sun Jun  6 19:07:11 2004
-@@ -79,7 +79,8 @@
- sv3Lib.tmpl \
- sv4Lib.tmpl \
- xf86.tmpl \
--xorg.tmpl
-+xorg.tmpl \
-+xttMod.tmpl
- 
- CFFILES = \
- Imake.cf \
diff --git a/devel/imake-6/files/patch-imake.c b/devel/imake-6/files/patch-imake.c
deleted file mode 100644
index f8117c91e000..000000000000
--- a/devel/imake-6/files/patch-imake.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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