Index: head/devel/imake/Makefile
===================================================================
--- head/devel/imake/Makefile	(revision 494048)
+++ head/devel/imake/Makefile	(revision 494049)
@@ -1,28 +1,31 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	imake
 PORTVERSION=	1.0.7
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Imake and other utilities from X.Org
 
+LICENSE=	MIT
+LICENSE_FILE= ${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	tradcpp:devel/tradcpp
 RUN_DEPENDS=	gccmakedep:devel/gccmakedep \
 		makedepend:devel/makedepend \
 		${LOCALBASE}/lib/X11/config/xorg.cf:x11/xorg-cf-files
 
 USES=	shebangfix perl5 pkgconfig
 USE_PERL5=	run
 
 SHEBANG_FILES=	mkhtmlindex.pl
 
 XORG_CAT=	util
 USE_XORG=	xorgproto
 
 CONFIGURE_ENV=	ac_cv_path_RAWCPP=tradcpp
 
 .include <bsd.port.mk>
Index: head/devel/imake/files/patch-imake.c
===================================================================
--- head/devel/imake/files/patch-imake.c	(revision 494048)
+++ head/devel/imake/files/patch-imake.c	(revision 494049)
@@ -1,50 +1,50 @@
---- imake.c.orig	2013-07-23 06:53:04.000000000 +0200
-+++ imake.c	2013-08-31 14:57:48.000000000 +0200
-@@ -531,6 +531,14 @@
+--- imake.c.orig	2013-08-17 10:11:50 UTC
++++ imake.c
+@@ -531,6 +531,14 @@ init(void)
  				AddCppArg(p);
  			}
  	}
 +	if ((p = getenv("IMAKECPPFLAGS"))) {
 +		AddCppArg(p);
 +		for (; *p; p++)
 +			if (*p == ' ') {
 +				*p++ = '\0';
 +				AddCppArg(p);
 +			}
 +	}
  	if ((p = getenv("IMAKECPP")))
  		cpp = p;
  	if ((p = getenv("IMAKEMAKE")))
-@@ -1142,29 +1150,17 @@
+@@ -1142,29 +1150,17 @@ get_binary_format(FILE *inFile)
    int mib[2];
    size_t len;
    int osrel = 0;
 -  FILE *objprog = NULL;
    int iself = 0;
 -  char buf[10];
 -  char cmd[PATH_MAX];
  
    mib[0] = CTL_KERN;
    mib[1] = KERN_OSRELDATE;
    len = sizeof(osrel);
    sysctl(mib, 2, &osrel, &len, NULL, 0);
 -  if (CrossCompiling) {
 -      strcpy (cmd, CrossCompileDir);
 -      strcat (cmd, "/");
 -      strcat (cmd,"objformat");
 -  } else
 -      strcpy (cmd, "objformat");
  
 -  if (osrel >= 300004 &&
 -      (objprog = popen(cmd, "r")) != NULL &&
 -      fgets(buf, sizeof(buf), objprog) != NULL &&
 -      strncmp(buf, "elf", 3) == 0)
 +  if (osrel < 300004)
 +    iself = 0;
 +  else
      iself = 1;
 -  if (objprog)
 -    pclose(objprog);
  
    fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO");
  }
Index: head/devel/imake/files/patch-imakemdep.h
===================================================================
--- head/devel/imake/files/patch-imakemdep.h	(revision 494048)
+++ head/devel/imake/files/patch-imakemdep.h	(revision 494049)
@@ -1,11 +1,11 @@
---- ./imakemdep.h.orig	2012-03-08 06:47:32.000000000 +0100
-+++ ./imakemdep.h	2013-06-12 20:22:52.058999526 +0200
-@@ -380,7 +383,7 @@
+--- imakemdep.h.orig	2013-08-17 10:11:06 UTC
++++ imakemdep.h
+@@ -365,7 +365,7 @@ const char *cpp_argv[ARGUMENTS] = {
      defined(__GNUC__) || defined(__GLIBC__)
  #    ifdef __i386__
  	"-D__i386__",
 -#     if defined(__GNUC__) && (__GNUC__ >= 3)
 +#     if defined(__GNUC__) && (__GNUC__ >= 3) && !defined(__FreeBSD__)
  	"-m32",
  #     endif
  #    endif