13 files changed, 430 insertions, 0 deletions

diff --git a/devel/imake-6/Makefile b/devel/imake-6/Makefile
new file mode 100644
index 000000000000..06e4a58eb9b7
--- /dev/null
+++ b/devel/imake-6/Makefile
@@ -0,0 +1,60 @@
+# New ports collection makefile for:    imake-6
+# Date created:         18 Jun 2004
+# Whom:                 anholt
+#
+# $FreeBSD$
+#
+
+PORTNAME=	imake
+PORTVERSION=	6.7.0
+CATEGORIES=	devel
+MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/ \
+		${MASTER_SITE_XORG} \
+MASTER_SITE_SUBDIR=	R6.7/tars
+DISTFILES=	X11R6.7.0-src1.tar.gz \
+		X11R6.7.0-src3.tar.gz
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Imake and other utilities from X.Org
+
+PREFIX?=	${X11BASE}
+USE_PERL5=	YES
+USE_REINPLACE=	yes
+
+.ifdef USE_IMAKE
+.error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.endif
+
+.include <bsd.port.pre.mk>
+
+NO_LATEST_LINK=	yes
+DIST_SUBDIR=	xorg
+WRKSRC=		${WRKDIR}/xc/config
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+MAN1=		ccmakedep.1 \
+		cleanlinks.1 \
+		gccmakedep.1 \
+		imake.1 \
+		lndir.1 \
+		makedepend.1 \
+		makeg.1 \
+		makestrs.1 \
+		mergelib.1 \
+		mkdirhier.1 \
+		mkhtmlindex.1 \
+		pswrap.1 \
+		revpath.1 \
+		rman.1 \
+		xmkmf.1
+MANCOMPRESSED=	yes
+INSTALL_TARGET=	install install.man
+
+pre-configure:
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \
+		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/cf/FreeBSD.cf
+
+post-install:
+	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
+
+.include <bsd.port.post.mk>
diff --git a/devel/imake-6/distinfo b/devel/imake-6/distinfo
new file mode 100644
index 000000000000..de8ed629db2a
--- /dev/null
+++ b/devel/imake-6/distinfo
@@ -0,0 +1,6 @@
+MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
+SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79
+SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983
+MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669
+SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793
diff --git a/devel/imake-6/files/patch-FreeBSD.cf b/devel/imake-6/files/patch-FreeBSD.cf
new file mode 100644
index 000000000000..8b0bf8f8202e
--- /dev/null
+++ b/devel/imake-6/files/patch-FreeBSD.cf
@@ -0,0 +1,68 @@
+--- 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
+ # endif
+-# if HasLibPthread
+-#  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 @@
+ #ifndef LibraryRpathLoadFlags
+ # if UseRpath
+ #  if UseElfFormat
+-#   define LibraryRpathLoadFlags	-rpath $(USRLIBDIRPATH)
++#   define LibraryRpathLoadFlags	-Wl,-rpath $(USRLIBDIRPATH)
+ #  else
+ #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
+ #  endif
+@@ -455,14 +443,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 GccAliasingArgs
++#define DefaultGcc2i386Opt
+ #endif
+ #endif
+ 
+ #ifdef i386Architecture
+ # define OptimizedCDebugFlags DefaultGcc2i386Opt
+ #else
+-# define OptimizedCDebugFlags -O
++# define OptimizedCDebugFlags
+ #endif
+ 
+ #ifndef PreIncDir
diff --git a/devel/imake-6/files/patch-Imake.rules b/devel/imake-6/files/patch-Imake.rules
new file mode 100644
index 000000000000..ec57f029eeb9
--- /dev/null
+++ b/devel/imake-6/files/patch-Imake.rules
@@ -0,0 +1,29 @@
+--- cf/Imake.rules.orig	Tue Dec 18 05:00:37 2001
++++ cf/Imake.rules	Mon Jan 21 02:34:48 2002
+@@ -1399,7 +1399,7 @@
+ dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency		@@\
+ 	RemoveFiles(dest.suffix.html dest.suffix-html)			@@\
+ 	RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \		@@\
+-	  > dest.suffix-html) && $(MV) dest.suffix-html $@		@@\
++	  > dest.suffix-html) && $(MV) dest.suffix-html dest.suffix.html	@@\
+ 									@@\
+ install.man:: dest.suffix.html						@@\
+ 	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
+@@ -1644,7 +1644,7 @@
+ 	MakeDir(Concat($(DESTDIR),npath/mdir))				@@\
+ 	@MakeFlagsToShellFlags(i,set +e); \				@@\
+ 	if [ -d Concat($(DESTDIR),opath/cdir) ]; then \			@@\
+-	  RELPATH=`echo opath/cdir | \					@@\
++	  RELPATH=`cd opath/cdir; pwd | \				@@\
+ 		sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\
+ 	  cd Concat($(DESTDIR),opath/cdir); \				@@\
+ 	  if [ -d rdir -a ! -h rdir ]; then \ 				@@\
+@@ -1691,7 +1691,7 @@
+ 	MakeDir(Concat($(DESTDIR),npath))				@@\
+ 	@MakeFlagsToShellFlags(i,set +e); \				@@\
+ 	if [ -d Concat($(DESTDIR),opath) ]; then \			@@\
+-	  RELPATH=`echo opath | \					@@\
++	  RELPATH=`cd opath; pwd | \					@@\
+ 		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
+ 	  cd Concat($(DESTDIR),opath); \				@@\
+ 	  if [ -f lfile -a ! -h lfile ]; then \ 			@@\
diff --git a/devel/imake-6/files/patch-Imake.tmpl b/devel/imake-6/files/patch-Imake.tmpl
new file mode 100644
index 000000000000..9f03d569bf20
--- /dev/null
+++ b/devel/imake-6/files/patch-Imake.tmpl
@@ -0,0 +1,20 @@
+--- cf/Imake.tmpl.orig	Fri Apr  2 13:47:10 2004
++++ cf/Imake.tmpl	Fri Jun 18 19:19:17 2004
+@@ -1776,7 +1776,7 @@
+        CXXOPTIONS = CplusplusOptions
+       CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
+        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
+-         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
++         CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+ #endif
+          COMPRESS = CompressCmd
+           GZIPCMD = GzipCmd
+@@ -2016,7 +2016,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)
+-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+          LDPRELIB = LdPreLib $(INSTALLED_LIBS)
+         LDPOSTLIB = LdPostLib
diff --git a/devel/imake-6/files/patch-Imakefile b/devel/imake-6/files/patch-Imakefile
new file mode 100644
index 000000000000..95b6f1cf2f6d
--- /dev/null
+++ b/devel/imake-6/files/patch-Imakefile
@@ -0,0 +1,12 @@
+--- ../Imakefile	Wed Mar 24 19:16:46 2004
++++ ../Imakefile	Wed Mar 24 19:17:07 2004
+@@ -30,8 +30,7 @@
+ #endif
+ #endif
+ 
+-        SUBDIRS = include config lib $(NLSSUBDIR) \
+-                  programs $(FONTSDIR) $(DOCSDIR)
++        SUBDIRS = include config
+   LNINSTALLDIRS = lib
+ 
+ #if HasParallelMake
diff --git a/devel/imake-6/files/patch-Library.tmpl b/devel/imake-6/files/patch-Library.tmpl
new file mode 100644
index 000000000000..e21cf3c0df0a
--- /dev/null
+++ b/devel/imake-6/files/patch-Library.tmpl
@@ -0,0 +1,11 @@
+--- cf/Library.tmpl.orig	Thu Jan 18 01:22:30 2001
++++ cf/Library.tmpl	Mon Jun  4 19:30:34 2001
+@@ -67,7 +67,7 @@
+ STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
+ CDEBUGFLAGS = LibraryCDebugFlags
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+-     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++     CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+    PICFLAGS = LargePositionIndependentCFlags
+ # endif
diff --git a/devel/imake-6/files/patch-cf-Imakefile b/devel/imake-6/files/patch-cf-Imakefile
new file mode 100644
index 000000000000..67a6bbb2e345
--- /dev/null
+++ b/devel/imake-6/files/patch-cf-Imakefile
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..f8117c91e000
--- /dev/null
+++ b/devel/imake-6/files/patch-imake.c
@@ -0,0 +1,22 @@
+--- 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
diff --git a/devel/imake-6/files/patch-mkhtmlindex.pl b/devel/imake-6/files/patch-mkhtmlindex.pl
new file mode 100644
index 000000000000..593a2e19d49a
--- /dev/null
+++ b/devel/imake-6/files/patch-mkhtmlindex.pl
@@ -0,0 +1,13 @@
+Index: util/mkhtmlindex.pl
+===================================================================
+RCS file: /home/ncvs/xfree/xc/config/util/mkhtmlindex.pl,v
+retrieving revision 1.3
+diff -u -r1.3 mkhtmlindex.pl
+--- util/mkhtmlindex.pl	18 Mar 2001 14:49:01 -0000	1.3
++++ util/mkhtmlindex.pl	12 Dec 2003 22:19:08 -0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ #
+ # $XFree86: xc/config/util/mkhtmlindex.pl,v 1.2 2001/03/15 19:02:31 dawes Exp $
+ #
diff --git a/devel/imake-6/pkg-descr b/devel/imake-6/pkg-descr
new file mode 100644
index 000000000000..aa426ccf2e28
--- /dev/null
+++ b/devel/imake-6/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-6/pkg-plist b/devel/imake-6/pkg-plist
new file mode 100644
index 000000000000..adf8e6fe6d06
--- /dev/null
+++ b/devel/imake-6/pkg-plist
@@ -0,0 +1,139 @@
+bin/ccmakedep
+bin/cleanlinks
+bin/gccmakedep
+bin/imake
+bin/lndir
+bin/makedepend
+bin/makeg
+bin/makestrs
+bin/mergelib
+bin/mkdirhier
+bin/mkhtmlindex
+bin/pswrap
+bin/revpath
+bin/rman
+bin/xmkmf
+lib/X11/config/Amoeba.cf
+lib/X11/config/DGUX.cf
+lib/X11/config/FreeBSD.cf
+lib/X11/config/Imake.cf
+lib/X11/config/Imake.rules
+lib/X11/config/Imake.tmpl
+lib/X11/config/Library.tmpl
+lib/X11/config/Mips.cf
+lib/X11/config/Motif.rules
+lib/X11/config/Motif.tmpl
+lib/X11/config/NetBSD.cf
+lib/X11/config/Oki.cf
+lib/X11/config/OpenBSD.cf
+lib/X11/config/QNX4.cf
+lib/X11/config/QNX4.rules
+lib/X11/config/Server.tmpl
+lib/X11/config/ServerLib.tmpl
+lib/X11/config/Threads.tmpl
+lib/X11/config/Win32.cf
+lib/X11/config/Win32.rules
+lib/X11/config/WinLib.tmpl
+lib/X11/config/X11.rules
+lib/X11/config/X11.tmpl
+lib/X11/config/apollo.cf
+lib/X11/config/bsd.cf
+lib/X11/config/bsdLib.rules
+lib/X11/config/bsdLib.tmpl
+lib/X11/config/bsdi.cf
+lib/X11/config/cde.rules
+lib/X11/config/cde.tmpl
+lib/X11/config/convex.cf
+lib/X11/config/cray.cf
+lib/X11/config/cygwin.cf
+lib/X11/config/cygwin.rules
+lib/X11/config/cygwin.tmpl
+lib/X11/config/darwin.cf
+lib/X11/config/darwinLib.rules
+lib/X11/config/darwinLib.tmpl
+lib/X11/config/date.def
+lib/X11/config/fujitsu.cf
+lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
+lib/X11/config/host.def
+lib/X11/config/hp.cf
+lib/X11/config/hpLib.rules
+lib/X11/config/hpLib.tmpl
+lib/X11/config/ibm.cf
+lib/X11/config/ibmLib.rules
+lib/X11/config/ibmLib.tmpl
+lib/X11/config/isc.cf
+lib/X11/config/linux.cf
+lib/X11/config/lnxLib.rules
+lib/X11/config/lnxLib.tmpl
+lib/X11/config/lnxdoc.rules
+lib/X11/config/lnxdoc.tmpl
+lib/X11/config/luna.cf
+lib/X11/config/lynx.cf
+lib/X11/config/macII.cf
+lib/X11/config/mach.cf
+lib/X11/config/minix.cf
+lib/X11/config/moto.cf
+lib/X11/config/ncr.cf
+lib/X11/config/nec.cf
+lib/X11/config/necLib.rules
+lib/X11/config/necLib.tmpl
+lib/X11/config/noop.rules
+lib/X11/config/nto.cf
+lib/X11/config/nto.rules
+lib/X11/config/oldlib.rules
+lib/X11/config/os2.cf
+lib/X11/config/os2.rules
+lib/X11/config/os2Lib.rules
+lib/X11/config/os2Lib.tmpl
+lib/X11/config/osf1.cf
+lib/X11/config/osfLib.rules
+lib/X11/config/osfLib.tmpl
+lib/X11/config/pegasus.cf
+lib/X11/config/sco.cf
+lib/X11/config/sco5.cf
+lib/X11/config/scoLib.rules
+lib/X11/config/sequent.cf
+lib/X11/config/sgi.cf
+lib/X11/config/sgiLib.rules
+lib/X11/config/sgiLib.tmpl
+lib/X11/config/site.def
+lib/X11/config/sony.cf
+lib/X11/config/sun.cf
+lib/X11/config/sunLib.rules
+lib/X11/config/sunLib.tmpl
+lib/X11/config/sv3Lib.rules
+lib/X11/config/sv3Lib.tmpl
+lib/X11/config/sv4Lib.rules
+lib/X11/config/sv4Lib.tmpl
+lib/X11/config/svr3.cf
+lib/X11/config/svr4.cf
+lib/X11/config/ultrix.cf
+lib/X11/config/usl.cf
+lib/X11/config/version.def
+lib/X11/config/x386.cf
+lib/X11/config/xf86.rules
+lib/X11/config/xf86.tmpl
+lib/X11/config/xf86site.def
+lib/X11/config/xfree86.cf
+lib/X11/config/xorg.cf
+lib/X11/config/xorg.tmpl
+lib/X11/config/xorgsite.def
+lib/X11/config/xttMod.tmpl
+lib/X11/doc/html/ccmakedep.1.html
+lib/X11/doc/html/cleanlinks.1.html
+lib/X11/doc/html/gccmakedep.1.html
+lib/X11/doc/html/imake.1.html
+lib/X11/doc/html/lndir.1.html
+lib/X11/doc/html/makedepend.1.html
+lib/X11/doc/html/makeg.1.html
+lib/X11/doc/html/makestrs.1.html
+lib/X11/doc/html/mergelib.1.html
+lib/X11/doc/html/mkdirhier.1.html
+lib/X11/doc/html/mkhtmlindex.1.html
+lib/X11/doc/html/pswrap.1.html
+lib/X11/doc/html/revpath.1.html
+lib/X11/doc/html/rman.1.html
+lib/X11/doc/html/xmkmf.1.html
diff --git a/devel/imake-6/scripts/configure b/devel/imake-6/scripts/configure
new file mode 100644
index 000000000000..5a3db675d2c7
--- /dev/null
+++ b/devel/imake-6/scripts/configure
@@ -0,0 +1,31 @@
+#!/bin/sh
+# configuration script for imake
+
+F=$WRKDIR/.config
+
+rm -f $F
+
+echo "/*" >> $F
+echo " * The following was generated by FreeBSD imake-6 port." >> $F
+echo " */" >> $F
+echo "#define HasXdmAuth YES"			>> $F
+echo "#define BuildXF86Setup NO"		>> $F
+echo "#define HasFreetype2 YES"			>> $F
+echo "#define Freetype2Dir ${LOCALBASE}"	>> $F
+echo "#define HasExpat YES"			>> $F
+echo "#define ExpatDir ${LOCALBASE}"		>> $F
+echo "#define HasFontconfig YES"		>> $F
+echo "#define FontconfigDir ${PREFIX}"		>> $F
+echo "#define HasLibpng YES"			>> $F
+echo "#define LibpngDir ${LOCALBASE}"		>> $F
+echo "#define NothingOutsideProjectRoot YES"	>> $F
+
+cat $F >> ${WRKDIR}/xc/config/cf/xf86site.def
+
+echo "#define ProjectRoot ${PREFIX}" > ${WRKDIR}/xc/config/cf/host.def
+
+cd ${WRKDIR}/xc
+touch config/cf/version.def
+touch config/cf/date.def
+make Makefile.boot
+make -f xmakefile VerifyOS version.def Makefiles includes