Update libXmu to 1.1.1

Update libXt to 1.1.2
Update xorg-macros 1.16.2
Update imake to 1.0.5 also look in LOCALBASE for RUN_DEPENDS not PREFIX.
Update makedepend to 1.0.4.
Update libXft to 2.3.0.
Update libXxf86dga to 1.1.3.
Update libxcb to 1.8.1.
Update libXres to 1.0.6.
Update bitmap to 1.0.6.
Update libXinerama to 1.1.2.
Update libXpm to 3.5.10.
Update libXcursor to 1.1.13.
Update libxkbfile to 1.0.8.
Update libXxf86vm to 1.1.2.
Update libXext 1.3.1.
Update libXau to 1.0.7.
Update libXdmcp to 1.1.1.
Update libXvMC to 1.0.7.
Update libXi to 1.6.0.
Update libdmx to 1.1.2.
Update libXv to 1.0.7.
Update libXXcrnSaver to 1.2.2.
Update libXtst to 1.2.1.
Update libXrender to 0.9.7.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@450 058c260c-8361-11dd-a0ac-aa2bafec7d09

6 files changed, 131 insertions, 0 deletions

diff --git a/devel/imake/Makefile b/devel/imake/Makefile
new file mode 100644
index 0000000..bd5470d
--- /dev/null
+++ b/devel/imake/Makefile
@@ -0,0 +1,55 @@
+# New ports collection makefile for:    imake-6
+# Date created:         18 Jun 2004
+# Whom:                 anholt
+#
+# $FreeBSD$
+#
+
+PORTNAME=	imake
+PORTVERSION=	1.0.5
+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 \
+		${LOCALBASE}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files
+
+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.pre.mk>
+
+# clang's cpp destroys whitespace, particularly hard tabs in makefiles,
+# which is fatal for imake.
+.if defined(CC) && ${CC} == "clang"
+BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
+RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
+CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
+
+post-build:
+	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/imake/distinfo b/devel/imake/distinfo
new file mode 100644
index 0000000..cfd49ab
--- /dev/null
+++ b/devel/imake/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
+SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
diff --git a/devel/imake/files/patch-imake.c b/devel/imake/files/patch-imake.c
new file mode 100644
index 0000000..ff56097
--- /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/files/patch-xmkmf.cpp b/devel/imake/files/patch-xmkmf.cpp
new file mode 100644
index 0000000..a08866e
--- /dev/null
+++ b/devel/imake/files/patch-xmkmf.cpp
@@ -0,0 +1,26 @@
+--- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
++++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
+@@ -53,6 +53,10 @@
+     args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
+ fi
+ 
++if [ -n "$CPP" -a -z "$IMAKECPP" ];then
++    export IMAKECPP=$CPP
++fi
++
+ echo imake $imake_defines $args
+ case "$do_all" in
+ yes)
+@@ -68,3 +72,12 @@
+     imake $imake_defines $args
+     ;;
+ esac
++
++if [ -f "Makefile" ];then
++    if [ -n "$CC" ];then
++        sed -i "" -e "s| CC = cc| CC = $CC|" Makefile
++    fi
++    if [ -n "$CXX" ];then
++        sed -i "" -e "s| CXX = c++| CXX = $CXX|" Makefile
++    fi
++fi
diff --git a/devel/imake/pkg-descr b/devel/imake/pkg-descr
new file mode 100644
index 0000000..18425ed
--- /dev/null
+++ b/devel/imake/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org's imake, imake config files, and other build-related
+tools.
+
+WWW: http://www.x.org/
diff --git a/devel/imake/pkg-plist b/devel/imake/pkg-plist
new file mode 100644
index 0000000..4ba8d99
--- /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