Upgrade to version 4.0.3

- patch-0 replaced by 'MAKE_ARGS=' in Makefile
- XF86Setup is no more supported in XFree-4, so patch-8 is removed as well
  as corresponding stuff in scripts/configure
- patch-config_cf_Server_tmpl replaced by the setting of InstallXserverSetUID
  in scripts/configure
other removed patches are no more necessary.

Note that freetype2 is now part of the base 4.0.3 distribution. The
freetype2 include and libs files are always installed.

8 files changed, 174 insertions, 124 deletions

diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 362632b7f13f..170e97ac0087 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	XFree86
-PORTVERSION=	4.0.2
-PORTREVISION=	6
+PORTVERSION=	4.0.3
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTFILES=	X402src-1.tgz X402src-2.tgz
+PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
+PATCHFILES=	4.0.2-4.0.3.diff.gz
 EXTRACT_ONLY=	X402src-1.tgz X402src-2.tgz
-
 MAINTAINER=	jmz@FreeBSD.org
 
-LIB_DEPENDS=	freetype.6:${PORTSDIR}/print/freetype2
-
 WRKSRC=		${WRKDIR}/${DIST_SUBDIR}
 .if (${MACHINE} != "alpha")
 #NO_PACKAGE=	package available from XFree86
@@ -31,6 +30,7 @@ MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 .ifdef DISTRIB
 DESTDIR=	${WRKDIR}/distrib
 MAKE_ENV+=	DESTDIR=${DESTDIR}
+MAKE_ARGS=	WORLDOPTS=
 NO_PKG_REGISTER=yes
 SCRIPTS_ENV+=	NO_INPUT=yes
 .endif
diff --git a/x11/XFree86-4/distinfo b/x11/XFree86-4/distinfo
index e0b578bf3f6c..51462e033b65 100644
--- a/x11/XFree86-4/distinfo
+++ b/x11/XFree86-4/distinfo
@@ -1,4 +1,5 @@
 MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
 MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae
-MD5 (xc/Wraphelp.c) = IGNORE
 MD5 (xc/mga-1_01_05beta.tgz) = b3ac9ff7490ef9160578e0264e4f04fd
+MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
+MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86-4/files/patch-d b/x11/XFree86-4/files/patch-d
index ae6defbaa0f1..aa9b40fe1c97 100644
--- a/x11/XFree86-4/files/patch-d
+++ b/x11/XFree86-4/files/patch-d
@@ -1,16 +1,5 @@
 --- config/cf/FreeBSD.cf.orig	Tue Dec  5 01:45:27 2000
 +++ config/cf/FreeBSD.cf	Tue Dec 19 23:08:57 2000
-@@ -210,8 +210,10 @@
- 
- /* PAM appeared in FreeBSD 3.1 */
- #if (OSMajorVersion > 3) || (OSMajorVersion == 3 && OSMinorVersion >=1 )
-+#ifndef HasPam
- #define HasPam		YES
- #endif
-+#endif
- 
- /*
-  * For FreeBSD 2.2.5 and later don't make any assumptions about the version
 @@ -371,14 +373,14 @@
  /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
  #ifndef DefaultGcc2i386Opt
diff --git a/x11/XFree86-4/files/patch-xthreads b/x11/XFree86-4/files/patch-xthreads
index 08307456518e..2238775a095b 100644
--- a/x11/XFree86-4/files/patch-xthreads
+++ b/x11/XFree86-4/files/patch-xthreads
@@ -1,21 +1,15 @@
---- include/Xos_r.h.orig	Mon Aug 28 20:45:38 2000
-+++ include/Xos_r.h	Wed Dec 20 02:54:24 2000
-@@ -243,9 +243,12 @@
-   size_t len;
- } _Xgetpwparams;
+--- include/Xos_r.h.orig	Sun Mar 18 00:12:23 2001
++++ include/Xos_r.h	Sun Mar 18 00:26:45 2001
+@@ -245,7 +245,7 @@
  
--/* NetBSD, at least, is missing several of the unixware passwd fields. */
-+/*
-+ * NetBSD and FreeBSD, at least, are missing several of the unixware passwd
-+ * fields.
-+ */
+ /* NetBSD, at least, is missing several of the unixware passwd fields. */
     
--#if defined(__NetBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__)
+-#if defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
  __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
  {
     memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
-@@ -412,7 +415,7 @@
+@@ -412,7 +412,7 @@
  /* UnixWare 2.0, or other systems with thread support but no _r API. */
  /* WARNING:  The h_addr_list and s_aliases values are *not* copied! */
  
diff --git a/x11/XFree86-4/pkg-plist b/x11/XFree86-4/pkg-plist
index b51a0f14d2b5..a27ddf7bcd41 100644
--- a/x11/XFree86-4/pkg-plist
+++ b/x11/XFree86-4/pkg-plist
@@ -503,6 +503,55 @@ include/X11/pixmaps/keyboard.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
 include/X11/xpm.h
+include/freetype2/freetype/cache/ftcchunk.h
+include/freetype2/freetype/cache/ftcglyph.h
+include/freetype2/freetype/cache/ftcimage.h
+include/freetype2/freetype/cache/ftcmanag.h
+include/freetype2/freetype/cache/ftcsbits.h
+include/freetype2/freetype/cache/ftlru.h
+include/freetype2/freetype/config/ftbuild.h
+include/freetype2/freetype/config/ftconfig.h
+include/freetype2/freetype/config/ftmodule.h
+include/freetype2/freetype/config/ftoption.h
+include/freetype2/freetype/freetype.h
+include/freetype2/freetype/ftbbox.h
+include/freetype2/freetype/ftcache.h
+include/freetype2/freetype/fterrors.h
+include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftimage.h
+include/freetype2/freetype/ftlist.h
+include/freetype2/freetype/ftmac.h
+include/freetype2/freetype/ftmm.h
+include/freetype2/freetype/ftmodule.h
+include/freetype2/freetype/ftnames.h
+include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftrender.h
+include/freetype2/freetype/ftsynth.h
+include/freetype2/freetype/ftsystem.h
+include/freetype2/freetype/fttypes.h
+include/freetype2/freetype/internal/autohint.h
+include/freetype2/freetype/internal/fnttypes.h
+include/freetype2/freetype/internal/ftcalc.h
+include/freetype2/freetype/internal/ftdebug.h
+include/freetype2/freetype/internal/ftdriver.h
+include/freetype2/freetype/internal/ftextend.h
+include/freetype2/freetype/internal/ftmemory.h
+include/freetype2/freetype/internal/ftobjs.h
+include/freetype2/freetype/internal/ftstream.h
+include/freetype2/freetype/internal/internal.h
+include/freetype2/freetype/internal/psaux.h
+include/freetype2/freetype/internal/psnames.h
+include/freetype2/freetype/internal/sfnt.h
+include/freetype2/freetype/internal/t1errors.h
+include/freetype2/freetype/internal/t1types.h
+include/freetype2/freetype/internal/t2errors.h
+include/freetype2/freetype/internal/t2types.h
+include/freetype2/freetype/internal/tterrors.h
+include/freetype2/freetype/internal/tttypes.h
+include/freetype2/freetype/t1tables.h
+include/freetype2/freetype/ttnameid.h
+include/freetype2/freetype/tttables.h
+include/freetype2/freetype/tttags.h
 include/xf86Optrec.h
 include/xf86Parser.h
 lib/X11/Cards
@@ -639,6 +688,7 @@ lib/X11/doc/README.s3virge
 lib/X11/doc/RELNOTES
 lib/X11/doc/ServersOnly
 lib/X11/doc/Status
+lib/X11/doc/Versions
 lib/X11/doc/VideoBoard98
 lib/X11/doc/html/AllPlanes.3.html
 lib/X11/doc/html/BitmapBitOrder.3.html
@@ -3254,6 +3304,9 @@ lib/libdpstk.a
 lib/libdpstk.so
 lib/libdpstk.so.1
 lib/libfntstubs.a
+lib/libfreetype.a
+lib/libfreetype.so
+lib/libfreetype.so.6
 lib/liboldX.a
 lib/liboldX.so
 lib/liboldX.so.6
diff --git a/x11/XFree86-4/pkg-plist.alpha b/x11/XFree86-4/pkg-plist.alpha
index f191ae8335a5..14a38df492b1 100644
--- a/x11/XFree86-4/pkg-plist.alpha
+++ b/x11/XFree86-4/pkg-plist.alpha
@@ -502,6 +502,55 @@ include/X11/pixmaps/keyboard.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
 include/X11/xpm.h
+include/freetype2/freetype/cache/ftcchunk.h
+include/freetype2/freetype/cache/ftcglyph.h
+include/freetype2/freetype/cache/ftcimage.h
+include/freetype2/freetype/cache/ftcmanag.h
+include/freetype2/freetype/cache/ftcsbits.h
+include/freetype2/freetype/cache/ftlru.h
+include/freetype2/freetype/config/ftbuild.h
+include/freetype2/freetype/config/ftconfig.h
+include/freetype2/freetype/config/ftmodule.h
+include/freetype2/freetype/config/ftoption.h
+include/freetype2/freetype/freetype.h
+include/freetype2/freetype/ftbbox.h
+include/freetype2/freetype/ftcache.h
+include/freetype2/freetype/fterrors.h
+include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftimage.h
+include/freetype2/freetype/ftlist.h
+include/freetype2/freetype/ftmac.h
+include/freetype2/freetype/ftmm.h
+include/freetype2/freetype/ftmodule.h
+include/freetype2/freetype/ftnames.h
+include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftrender.h
+include/freetype2/freetype/ftsynth.h
+include/freetype2/freetype/ftsystem.h
+include/freetype2/freetype/fttypes.h
+include/freetype2/freetype/internal/autohint.h
+include/freetype2/freetype/internal/fnttypes.h
+include/freetype2/freetype/internal/ftcalc.h
+include/freetype2/freetype/internal/ftdebug.h
+include/freetype2/freetype/internal/ftdriver.h
+include/freetype2/freetype/internal/ftextend.h
+include/freetype2/freetype/internal/ftmemory.h
+include/freetype2/freetype/internal/ftobjs.h
+include/freetype2/freetype/internal/ftstream.h
+include/freetype2/freetype/internal/internal.h
+include/freetype2/freetype/internal/psaux.h
+include/freetype2/freetype/internal/psnames.h
+include/freetype2/freetype/internal/sfnt.h
+include/freetype2/freetype/internal/t1errors.h
+include/freetype2/freetype/internal/t1types.h
+include/freetype2/freetype/internal/t2errors.h
+include/freetype2/freetype/internal/t2types.h
+include/freetype2/freetype/internal/tterrors.h
+include/freetype2/freetype/internal/tttypes.h
+include/freetype2/freetype/t1tables.h
+include/freetype2/freetype/ttnameid.h
+include/freetype2/freetype/tttables.h
+include/freetype2/freetype/tttags.h
 include/xf86Optrec.h
 include/xf86Parser.h
 lib/X11/Cards
@@ -637,6 +686,7 @@ lib/X11/doc/README.s3virge
 lib/X11/doc/RELNOTES
 lib/X11/doc/ServersOnly
 lib/X11/doc/Status
+lib/X11/doc/Versions
 lib/X11/doc/VideoBoard98
 lib/X11/doc/html/AllPlanes.3.html
 lib/X11/doc/html/BitmapBitOrder.3.html
@@ -3250,6 +3300,9 @@ lib/libdpstk.a
 lib/libdpstk.so
 lib/libdpstk.so.1
 lib/libfntstubs.a
+lib/libfreetype.a
+lib/libfreetype.so
+lib/libfreetype.so.6
 lib/liboldX.a
 lib/liboldX.so
 lib/liboldX.so.6
diff --git a/x11/XFree86-4/pkg-plist.pc98 b/x11/XFree86-4/pkg-plist.pc98
index b51a0f14d2b5..a27ddf7bcd41 100644
--- a/x11/XFree86-4/pkg-plist.pc98
+++ b/x11/XFree86-4/pkg-plist.pc98
@@ -503,6 +503,55 @@ include/X11/pixmaps/keyboard.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
 include/X11/xpm.h
+include/freetype2/freetype/cache/ftcchunk.h
+include/freetype2/freetype/cache/ftcglyph.h
+include/freetype2/freetype/cache/ftcimage.h
+include/freetype2/freetype/cache/ftcmanag.h
+include/freetype2/freetype/cache/ftcsbits.h
+include/freetype2/freetype/cache/ftlru.h
+include/freetype2/freetype/config/ftbuild.h
+include/freetype2/freetype/config/ftconfig.h
+include/freetype2/freetype/config/ftmodule.h
+include/freetype2/freetype/config/ftoption.h
+include/freetype2/freetype/freetype.h
+include/freetype2/freetype/ftbbox.h
+include/freetype2/freetype/ftcache.h
+include/freetype2/freetype/fterrors.h
+include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftimage.h
+include/freetype2/freetype/ftlist.h
+include/freetype2/freetype/ftmac.h
+include/freetype2/freetype/ftmm.h
+include/freetype2/freetype/ftmodule.h
+include/freetype2/freetype/ftnames.h
+include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftrender.h
+include/freetype2/freetype/ftsynth.h
+include/freetype2/freetype/ftsystem.h
+include/freetype2/freetype/fttypes.h
+include/freetype2/freetype/internal/autohint.h
+include/freetype2/freetype/internal/fnttypes.h
+include/freetype2/freetype/internal/ftcalc.h
+include/freetype2/freetype/internal/ftdebug.h
+include/freetype2/freetype/internal/ftdriver.h
+include/freetype2/freetype/internal/ftextend.h
+include/freetype2/freetype/internal/ftmemory.h
+include/freetype2/freetype/internal/ftobjs.h
+include/freetype2/freetype/internal/ftstream.h
+include/freetype2/freetype/internal/internal.h
+include/freetype2/freetype/internal/psaux.h
+include/freetype2/freetype/internal/psnames.h
+include/freetype2/freetype/internal/sfnt.h
+include/freetype2/freetype/internal/t1errors.h
+include/freetype2/freetype/internal/t1types.h
+include/freetype2/freetype/internal/t2errors.h
+include/freetype2/freetype/internal/t2types.h
+include/freetype2/freetype/internal/tterrors.h
+include/freetype2/freetype/internal/tttypes.h
+include/freetype2/freetype/t1tables.h
+include/freetype2/freetype/ttnameid.h
+include/freetype2/freetype/tttables.h
+include/freetype2/freetype/tttags.h
 include/xf86Optrec.h
 include/xf86Parser.h
 lib/X11/Cards
@@ -639,6 +688,7 @@ lib/X11/doc/README.s3virge
 lib/X11/doc/RELNOTES
 lib/X11/doc/ServersOnly
 lib/X11/doc/Status
+lib/X11/doc/Versions
 lib/X11/doc/VideoBoard98
 lib/X11/doc/html/AllPlanes.3.html
 lib/X11/doc/html/BitmapBitOrder.3.html
@@ -3254,6 +3304,9 @@ lib/libdpstk.a
 lib/libdpstk.so
 lib/libdpstk.so.1
 lib/libfntstubs.a
+lib/libfreetype.a
+lib/libfreetype.so
+lib/libfreetype.so.6
 lib/liboldX.a
 lib/liboldX.so
 lib/liboldX.so.6
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 38d2b0f22bf1..2643ebd8f20b 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -31,99 +31,6 @@ rm -f $F
 # set ProjectRoot to be ${PREFIX}
 echo "#define ProjectRoot ${PREFIX}" >>$F
 
-# XXX the build of XF86Setup us broken in 4.0.2 (undefined reference to xf86OpenConfigFile)
-if false; then
-
-# Tk detection
-tkversion=
-for v in 42 80 81 82 83 42jp 80jp; do
-  if [ -f /usr/local/lib/libtk$v.a ]; then
-    tkversion=$v
-    case $tkversion in
-      42)
-        tclversion=76
-        tclLversion=7.6
-        tkLversion=4.2
-        ;;
-      80)
-        tclversion=80
-        tclLversion=8.0
-        tkLversion=8.0
-        ;;
-      42jp)
-        tclversion=76jp
-        tclLversion=7.6jp
-        tkLversion=4.2jp
-        ;;
-      80jp)
-        tclversion=80jp
-        tclLversion=8.0jp
-        tkLversion=8.0jp
-        ;;
-      81)
-        tclversion=81
-        tclLversion=8.1
-        tkLversion=8.1
-        ;;
-      82)
-        tclversion=82
-        tclLversion=8.2
-        tkLversion=8.2
-        ;;
-      83)
-        tclversion=83
-        tclLversion=8.3
-        tkLversion=8.3
-        ;;
-    esac
-  fi
-done
-if [ X$tkversion != X ]; then
-  case $tkversion in
-  *jp)
-    echo "Using Japanized tk-$tkLversion"
-    if [ X"${MACHINE}" = X"pc98" ]; then
-	echo "#define HasJpTk		YES" >>$F
-	echo "#define JpTkLibDir	/usr/local/lib" >>$F
-	echo "#define JpTkIncDir	/usr/local/include/tk$tkLversion" >>$F
-	echo "#define JpTkLibName	tk$tkversion" >>$F
-	echo "#define HasJpTcl		YES" >>$F
-	echo "#define JpTclLibDir	/usr/local/lib" >>$F
-	echo "#define JpTclIncDir	/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define JpTclLibName	tcl$tclversion" >>$F
-    else
-	echo "#define HasTk		YES" >>$F
-	echo "#define TkLibDir		/usr/local/lib" >>$F
-	echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
-	echo "#define TkLibName		tk$tkversion" >>$F
-	echo "#define HasTcl		YES" >>$F
-	echo "#define TclLibDir		/usr/local/lib" >>$F
-	echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define TclLibName	tcl$tclversion" >>$F
-    fi
-    ;;
-  *)
-    echo "Using tk-$tkLversion"
-    echo "#define HasTk			YES" >>$F
-    echo "#define TkLibDir		/usr/local/lib" >>$F
-    echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
-    echo "#define TkLibName		tk$tkversion" >>$F
-    echo "#define HasTcl		YES" >>$F
-    echo "#define TclLibDir		/usr/local/lib" >>$F
-    echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-    echo "#define TclLibName		tcl$tclversion" >>$F
-    ;;
-  esac
-  echo "#define BuildXF86Setup        YES" >>$F
-else
-cat <<EOF
-*** I don't see the static library for tk version $tkversion in /usr/local/lib.
-*** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2 or 8.x first.
-
-EOF
-fi
-fi # false
 cat >> $F <<END
 #ifdef i386Architecture
 #define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
@@ -308,7 +215,7 @@ echo
 yesno YES "Do you want to compile with PAM support?"
 echo "#define	HasPam			$answ"	>> $F
 
-echo "#define Freetype2Dir $LOCALBASE" >> $F
+echo "#define InstallXserverSetUID NO "	>> $F
 }
 
 configure