4 files changed, 30 insertions, 30 deletions

diff --git a/devel/imake-4/files/patch-amd64 b/devel/imake-4/files/patch-amd64
new file mode 100644
index 000000000000..7e786cf3d680
--- /dev/null
+++ b/devel/imake-4/files/patch-amd64
@@ -0,0 +1,22 @@
+--- imake/imakemdep.h.orig	Mon Dec 29 20:53:52 2003
++++ imake/imakemdep.h	Tue Mar  2 11:05:16 2004
+@@ -374,6 +374,9 @@
+ # ifdef __AMD64__
+ 	"-D__AMD64__",
+ # endif
++# ifdef __amd64__
++	"-D__amd64__",
++# endif
+ # ifdef __x86_64__
+ 	"-D__AMD64__",
+ # endif
+@@ -1271,6 +1274,9 @@
+ # if defined (__AMD64__) || defined (__x86_64__)
+ 	{"__AMD64__", "1"},
+ 	{"__x86_64__", "1"},
++# endif
++# if defined (__amd64__)
++	{"__amd64__", "1"},
+ # endif
+ # ifdef __i386
+ 	{"__i386", "1"},
diff --git a/devel/imake-4/files/patch-d b/devel/imake-4/files/patch-d
index 9c63e1fad9dd..693987b584d7 100644
--- a/devel/imake-4/files/patch-d
+++ b/devel/imake-4/files/patch-d
@@ -1,6 +1,6 @@
---- cf/FreeBSD.cf.orig	Tue Jan 14 21:52:12 2003
-+++ cf/FreeBSD.cf	Fri Feb  6 12:27:55 2004
-@@ -89,14 +89,14 @@
+--- cf/FreeBSD.cf.orig	Wed Jun  9 04:53:53 2004
++++ cf/FreeBSD.cf	Wed Jun  9 04:56:47 2004
+@@ -108,14 +108,14 @@
  # endif
  # define HasPosixThreads	YES
  # define ThreadedX		YES
@@ -17,23 +17,24 @@
  # else
  #  if OSRelVersion >= 500043
  #   define BuildThreadStubLibrary  NO
-@@ -106,9 +106,9 @@
+@@ -125,10 +125,10 @@
  #   define NeedUIThrStubs          YES
  #  endif
  #  if (OSRelVersion >= 500016)
 -#   define ThreadsLibraries	-lc_r
 +#   define ThreadsLibraries	%%PTHREAD_LIBS%%
+ #   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
  #  else
 -#   define ThreadsLibraries	-pthread
 +#   define ThreadsLibraries	%%PTHREAD_LIBS%%
  #  endif
  #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
- #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
-@@ -485,14 +485,14 @@
+ #  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
+@@ -442,14 +442,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)
--#define DefaultGcc2i386Opt -O2
+-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
 +#define DefaultGcc2i386Opt
  #endif
  #endif
diff --git a/devel/imake-4/files/patch-freetype b/devel/imake-4/files/patch-freetype
deleted file mode 100644
index aecdd09fd35b..000000000000
--- a/devel/imake-4/files/patch-freetype
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- FREETYPE2DEFINES = -DFREETYPE2
- #endif
- 
diff --git a/devel/imake-4/files/patch-rman.c b/devel/imake-4/files/patch-rman.c
deleted file mode 100644
index 49f96f114a45..000000000000
--- a/devel/imake-4/files/patch-rman.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../extras/rman/rman.c.orig	Tue Jul 15 23:53:53 2003
-+++ ../extras/rman/rman.c	Tue Jul 15 23:44:21 2003
-@@ -4104,6 +4104,9 @@
- 	     }
- 	   }
- 	   break;
-+	 case 0:
-+	   /* ignore */
-+	   break;
- 	 default:		/* unknown escaped character */
- 	   sputchar(*p++);
- 	 }