Take over maintainership of XFree86-4 ports. Add patches to fix libGLU on

-current, fix the DRI with Wine, update the config files for the X ports, and
fix many of them to allow continuing of the X build after interruption (it
used to clean and rebuild).

Approved by:	will, des (mentor)

8 files changed, 219 insertions, 24 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index c05a3bc8781..07f8c7d1a11 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -20,7 +20,7 @@ DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz \
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
 IGNOREFILES=	Wraphelp.c
 
-MAINTAINER=	taguchi@tohoku.iij.ad.jp
+MAINTAINER=	anholt@freebsd.org
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
@@ -74,6 +74,7 @@ post-patch:
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
 
 .include <bsd.port.pre.mk>
 .include "${FILESDIR}/manpages"
diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index 86667fce008..711cd580cef 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	XFree86-
 DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz X${PORTVERSION:S/.//g}src-2.tgz X${PORTVERSION:S/.//g}src-3.tgz
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-2.tgz X${PORTVERSION:S/.//g}src-3.tgz
 
-MAINTAINER=	taguchi@tohoku.iij.ad.jp
+MAINTAINER=	anholt@freebsd.org
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 16d29d94f57..b74044242e1 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libraries
 PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE} \
 		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
@@ -25,7 +25,7 @@ PATCHFILES=		4.2.0-xlib-i18n-module.patch \
 			4.2.0-libGLU-bad-extern.patch
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	taguchi@tohoku.iij.ad.jp
+MAINTAINER=	anholt@freebsd.org
 
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
@@ -97,6 +97,7 @@ post-patch:
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
 
 post-install:
 	@${MKHTMLINDEX} ${X11BASE}/lib/X11/doc/html
diff --git a/x11/XFree86-4-libraries/files/patch-bsdLib.rules b/x11/XFree86-4-libraries/files/patch-bsdLib.rules
new file mode 100644
index 00000000000..6feea2583ea
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-bsdLib.rules
@@ -0,0 +1,37 @@
+--- config/cf/bsdLib.rules.orig	Wed Jul 10 17:25:29 2002
++++ config/cf/bsdLib.rules	Wed Jul 10 17:25:32 2002
+@@ -306,6 +306,34 @@
+ 
+ #endif /* SharedDepLibraryTarget */
+ 
++/*
++ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
++ */
++#ifndef SharedDepCplusplusLibraryTarget
++#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
++AllTarget(Concat(lib,libname.so.rev))					@@\
++									@@\
++Concat(lib,libname.so.rev):  deplist					@@\
++	$(RM) $@~							@@\
++	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
++		(cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
++		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
++		LinkBuildSonameLibrary($$SONAME)			@@\
++	$(RM) $@							@@\
++	$(MV) $@~ $@							@@\
++	$(RM) Concat(lib,libname.so)					@@\
++	$(LN) $@ Concat(lib,libname.so)					@@\
++	LinkBuildLibrary($@)						@@\
++	LinkBuildLibrary(Concat(lib,libname.so))			@@\
++									@@\
++clean::									@@\
++	@SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\
++	set -x; $(RM) $$SONAME						@@\
++	$(RM) Concat(lib,libname.so)					@@\
++	$(RM) Concat(lib,libname.so.rev)
++
++#endif /* SharedDepLibraryTarget */
++
+ #ifndef SharedDepModuleTarget
+ #define SharedDepModuleTarget(name,deps,solist)				@@\
+ AllTarget(name)								@@\
diff --git a/x11/XFree86-4-libraries/files/patch-drilx11 b/x11/XFree86-4-libraries/files/patch-drilx11
new file mode 100644
index 00000000000..1635cedc07e
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-drilx11
@@ -0,0 +1,99 @@
+--- lib/GL/mesa/src/drv/ffb/Imakefile.orig	Sat Jun  8 16:02:28 2002
++++ lib/GL/mesa/src/drv/ffb/Imakefile	Sat Jun  8 16:02:29 2002
+@@ -38,7 +38,7 @@
+ 	 SRCS = $(FFBSRCS)
+ 	 OBJS = $(FFBOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS)
+ 
+-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+ 
+ #include <Library.tmpl>
+ 
+--- lib/GL/mesa/src/drv/gamma/Imakefile.orig	Sat Jun  8 16:01:51 2002
++++ lib/GL/mesa/src/drv/gamma/Imakefile	Sat Jun  8 16:01:53 2002
+@@ -46,7 +46,7 @@
+          OBJS = $(LOWOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
+ 		$(MESA_ASM_OBJS) $(GAMMAOBJS) $(HIOBJS)
+ 
+-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+ 
+ #include <Library.tmpl>
+ 
+--- lib/GL/mesa/src/drv/i810/Imakefile.orig	Sat Jun  8 16:00:38 2002
++++ lib/GL/mesa/src/drv/i810/Imakefile	Sat Jun  8 16:01:32 2002
+@@ -46,7 +46,7 @@
+          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
+ 		$(MESA_ASM_OBJS) $(COMMONOBJS) $(I810OBJS) $(HIOBJS)
+ 
+-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+ 
+ #include <Library.tmpl>
+ 
+--- lib/GL/mesa/src/drv/i830/Imakefile.orig	Sat Jun  8 16:00:43 2002
++++ lib/GL/mesa/src/drv/i830/Imakefile	Sat Jun  8 16:01:31 2002
+@@ -46,7 +46,7 @@
+          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
+ 		$(MESA_ASM_OBJS) $(COMMONOBJS) $(I830OBJS) $(HIOBJS)
+ 
+-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+ 
+ #include <Library.tmpl>
+ 
+--- lib/GL/mesa/src/drv/mga/Imakefile.orig	Sat Jun  8 16:00:31 2002
++++ lib/GL/mesa/src/drv/mga/Imakefile	Sat Jun  8 16:01:29 2002
+@@ -47,7 +47,7 @@
+          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
+ 		$(MESA_ASM_OBJS) $(COMMONOBJS) $(MGAOBJS) $(HIOBJS)
+ 
+-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+ 
+ #include <Library.tmpl>
+ 
+--- lib/GL/mesa/src/drv/r128/Imakefile.orig	Sat Jun  8 16:00:24 2002
++++ lib/GL/mesa/src/drv/r128/Imakefile	Sat Jun  8 16:01:34 2002
+@@ -47,7 +47,7 @@
+          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
+ 		$(MESA_ASM_OBJS) $(COMMONOBJS) $(R128OBJS) $(HIOBJS)
+ 
+-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+ 
+ #include <Library.tmpl>
+ 
+--- lib/GL/mesa/src/drv/radeon/Imakefile.orig	Sat Jun  8 15:59:52 2002
++++ lib/GL/mesa/src/drv/radeon/Imakefile	Sat Jun  8 15:59:54 2002
+@@ -47,7 +47,7 @@
+          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
+ 		$(MESA_ASM_OBJS) $(COMMONOBJS) $(RADEONOBJS) $(HIOBJS)
+ 
+-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+ 
+ #include <Library.tmpl>
+ 
+--- lib/GL/mesa/src/drv/sis/Imakefile.orig	Sat Jun  8 16:02:40 2002
++++ lib/GL/mesa/src/drv/sis/Imakefile	Sat Jun  8 16:02:45 2002
+@@ -53,7 +53,7 @@
+          OBJS = $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
+ 		$(MESA_ASM_OBJS) $(SISOBJS) $(HIOBJS)
+ 
+-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+ 
+ #include <Library.tmpl>
+ 
+--- lib/GL/mesa/src/drv/tdfx/Imakefile.orig	Sat Jun  8 16:00:17 2002
++++ lib/GL/mesa/src/drv/tdfx/Imakefile	Sat Jun  8 16:01:12 2002
+@@ -47,7 +47,7 @@
+          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
+ 		$(MESA_ASM_OBJS) $(TDFXOBJS) $(HIOBJS)
+ 
+-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+ 
+ #include <Library.tmpl>
+ 
diff --git a/x11/XFree86-4-libraries/files/patch-xthreads b/x11/XFree86-4-libraries/files/patch-xthreads
index ea2e2e15f62..8ebc062fd87 100644
--- a/x11/XFree86-4-libraries/files/patch-xthreads
+++ b/x11/XFree86-4-libraries/files/patch-xthreads
@@ -1,25 +1,77 @@
---- config/cf/FreeBSD.cf.orig	Thu Jun  7 16:33:37 2001
-+++ config/cf/FreeBSD.cf	Thu Jun  7 16:34:43 2001
-@@ -80,7 +80,6 @@
+--- config/cf/FreeBSD.cf.orig	Wed Jul 10 16:27:39 2002
++++ config/cf/FreeBSD.cf	Wed Jul 10 17:14:39 2002
+@@ -43,11 +43,15 @@
+ #define GccUsesGas		YES
+ #define UseGas			YES
+ #define GnuCpp			YES
++#define HasPoll			YES
+ #define HasNdbm			YES
+ #define HasPutenv		YES
+ #define HasSnprintf		YES
+ #define HasBSD44Sockets 	YES
+ #define HasDlopen		YES
++#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) || (OSRelVersion >= 500012)
++#define HasSetProcTitle		YES
++#endif
+ #ifndef HasLibCrypt
+ # define HasLibCrypt		YES
+ #endif
+@@ -78,10 +82,6 @@
+ # define HasPosixThreads	YES
+ # define ThreadedX		YES
  /*
-  * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-  */
+- * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+- */
 -# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
- /*
+-/*
   * FreeBSD has tread-safe api but no getpwnam_r yet.
   */
-@@ -91,8 +90,12 @@
+ # define HasThreadSafeAPI	YES
+@@ -91,8 +91,15 @@
  # else
  #  define BuildThreadStubLibrary  YES 
  #  define NeedUIThrStubs          YES 
 -#  define ThreadsCompileFlags	-pthread
 -#  define ThreadsLibraries 	-pthread
 +#  if (OSRelVersion >= 500016)
-+#   define ThreadsLibraries 	-lc_r
++#   define ThreadsLibraries	-lc_r
 +#  else
++    /*
++     * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
++     */
 +#   define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
-+#   define ThreadsLibraries 	-pthread
++#   define ThreadsLibraries	-pthread
 +#  endif
  #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
  #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
  # endif
+@@ -216,6 +223,20 @@
+ #endif
+ #endif
+ 
++/* Katmai (SSE) and 3DNow will be autodetected, so binutils is the only 
++ * requirement for enabling this.  By 4.2 they were all supported.
++ */
++#ifdef i386Architecture &&  \
++	(OSMajorVersion >= 5) || (OSMajorVersion == 4 && OSMinorVersion >= 2))
++# define HasMMXSupport		YES
++# define Has3DNowSupport	YES
++# define HasKatmaiSupport	YES
++#else
++# define HasMMXSupport		NO
++# define Has3DNowSupport	NO
++# define HasKatmaiSupport	NO
++#endif
++
+ /* 
+  * This doesn't work the way it does on every other system. On FreeBSD it's
+  * only a "hint, not a demand", whatever that means. Note that this is not 
+@@ -540,7 +561,7 @@
+ /*
+  * A hack to work around an optimization problem with gcc 2.95.2
+  */
+-#if OSMajorVersion >= 4
++#if OSMajorVersion == 4
+ #define GccOptBug295
+ #endif
+ 
diff --git a/x11/XFree86-4-libraries/files/patch-z01 b/x11/XFree86-4-libraries/files/patch-z01
index 1c36957378b..9c0273ae6f8 100644
--- a/x11/XFree86-4-libraries/files/patch-z01
+++ b/x11/XFree86-4-libraries/files/patch-z01
@@ -1,6 +1,6 @@
---- Makefile.orig	Wed Mar 22 21:23:30 2000
-+++ Makefile	Mon Mar 19 20:08:33 2001
-@@ -24,6 +24,12 @@
+--- Makefile.orig	Wed Dec 19 13:37:26 2001
++++ Makefile	Wed Jul 10 17:37:14 2002
+@@ -27,6 +27,12 @@
  MAKE_CMD = $(MAKE) $(MAKE_OPTS)
  FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)"
  
@@ -13,7 +13,7 @@
  all:
  	@$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial
  	@$(MAKE_CMD) $@
-@@ -181,7 +187,7 @@
+@@ -198,7 +204,7 @@
  install.ln:
  	    $(MAKE_CMD) $@
  install.man:
@@ -22,26 +22,31 @@
  install:
  	    $(MAKE_CMD) $@
  Makefiles:
-@@ -192,3 +198,43 @@
+@@ -209,3 +215,48 @@
  	    $(MAKE_CMD) $@
  VerifyOS:
  	    $(MAKE_CMD) $@
 +
 +#####
-+FreeBSDPortsBuild:
++FreeBSDPortsConfigure:
 +	@echo ""
-+	@echo Building $(RELEASE) of the X Window System: $(PKGNAMEPREFIX)$(PORTNAME)-$(PORTVERSION)
++	@echo Configuring $(RELEASE) of the X Window System: $(PKGNAMEPREFIX)$(PORTNAME)-$(PORTVERSION)
 +	@echo ""
 +	@date
 +	@echo ""
-+	cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
 +	$(MAKE) $(MFLAGS) Makefile.boot
 +	$(MAKE_CMD) $(MFLAGS) VerifyOS
 +	$(MAKE_CMD) $(MFLAGS) Makefiles
-+	$(MAKE_CMD) $(MFLAGS) clean BOOTSTRAPSUBDIRS=
 +	$(MAKE_CMD) $(MFLAGS) includes
 +	$(MAKE_CMD) $(MFLAGS) depend
-+	$(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) $@
++
++FreeBSDPortsBuild:
++	@echo ""
++	@echo Building $(RELEASE) of the X Window System: $(PKGNAMEPREFIX)$(PORTNAME)-$(PORTVERSION)
++	@echo ""
++	@date
++	@echo ""
++	$(MAKE_CMD) $(MFLAGS) $@
 +	@echo ""
 +	@date
 +	@echo ""
diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index 62cc02b45e2..53c9fae9ff8 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
 DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
 
-MAINTAINER=	taguchi@tohoku.iij.ad.jp
+MAINTAINER=	anholt@freebsd.org
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES