- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

5 files changed, 99 insertions, 0 deletions

diff --git a/devel/imake/Makefile b/devel/imake/Makefile
new file mode 100644
index 000000000000..aab6ab2584bd
--- /dev/null
+++ b/devel/imake/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for:    imake-6
+# Date created:         18 Jun 2004
+# Whom:                 anholt
+#
+# $FreeBSD$
+#
+
+PORTNAME=	imake
+PORTVERSION=	1.0.2
+PORTREVISION=	4
+PORTEPOCH=	1
+CATEGORIES=	devel
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Imake and other utilities from X.Org
+
+RUN_DEPENDS=	gccmakedep:${PORTSDIR}/devel/gccmakedep \
+		makedepend:${PORTSDIR}/devel/makedepend \
+		${PREFIX}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files
+
+CONFLICTS=	imake-4*
+
+USE_PERL5=	yes
+
+XORG_CAT=	util
+USE_XORG=	xproto
+
+.ifdef USE_IMAKE
+.error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.endif
+
+MAN1= 		ccmakedep.1 \
+		cleanlinks.1 \
+		imake.1 \
+		makeg.1 \
+		mergelib.1 \
+		mkdirhier.1 \
+		mkhtmlindex.1 \
+		revpath.1 \
+		xmkmf.1
+
+post-patch:
+	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/mkhtmlindex.pl
+
+.include <bsd.port.mk>
diff --git a/devel/imake/distinfo b/devel/imake/distinfo
new file mode 100644
index 000000000000..e47c5053c7f1
--- /dev/null
+++ b/devel/imake/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/util/imake-1.0.2.tar.bz2) = 02fea5a02ba2857c7d81820c8e8b8e6f
+SHA256 (xorg/util/imake-1.0.2.tar.bz2) = 97cefff4ae76863ebce87496aca715371890505db4a0511d980e92bfe050ac7b
+SIZE (xorg/util/imake-1.0.2.tar.bz2) = 112959
diff --git a/devel/imake/files/patch-imake.c b/devel/imake/files/patch-imake.c
new file mode 100644
index 000000000000..ff5609748481
--- /dev/null
+++ b/devel/imake/files/patch-imake.c
@@ -0,0 +1,35 @@
+--- imake.c.orig	Tue Jan 30 14:57:37 2007
++++ imake.c	Tue Jan 30 14:55:59 2007
+@@ -1153,29 +1153,17 @@
+   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");
+ }
diff --git a/devel/imake/pkg-descr b/devel/imake/pkg-descr
new file mode 100644
index 000000000000..aa426ccf2e28
--- /dev/null
+++ b/devel/imake/pkg-descr
@@ -0,0 +1,7 @@
+This package contains X.Org's imake, imake config files, and other build-related
+tools.
+
+WWW: http://www.x.org/
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/devel/imake/pkg-plist b/devel/imake/pkg-plist
new file mode 100644
index 000000000000..4ba8d99890ea
--- /dev/null
+++ b/devel/imake/pkg-plist
@@ -0,0 +1,9 @@
+bin/ccmakedep
+bin/cleanlinks
+bin/imake
+bin/makeg
+bin/mergelib
+bin/mkdirhier
+bin/mkhtmlindex
+bin/revpath
+bin/xmkmf