Upgrade XFree86 packages to 4.4.0.

To see a full list of changes, please review:
http://xfree86.org/4.4.0/RELNOTES.html

These packages has been tested under NetBSD 1.6/-current, FreeBSD 4.x/5.x,
and GNU/Linux (i386) by Jeremy C. Reed, Michal Pasternak and myself.

2 files changed, 163 insertions, 78 deletions

diff --git a/meta-pkgs/XFree86/Makefile b/meta-pkgs/XFree86/Makefile
index 619efd53be0..35d49d88ef2 100644
--- a/meta-pkgs/XFree86/Makefile
+++ b/meta-pkgs/XFree86/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/02/22 20:42:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/28 22:06:16 xtraeme Exp $
 
 DISTNAME=	# empty
 PKGNAME=	XFree86-${XF_VER}
-PKGREVISION=	1
 CATEGORIES=	meta-pkgs x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 DISTFILES=	# empty
@@ -11,19 +10,20 @@ MAINTAINER=	xfree86@blef.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	XFree86 meta-package
 
-DEPENDS=	imake>=4.3.0:../../x11/imake
-DEPENDS+=	XFree86-libs>=4.3.0:../../x11/XFree86-libs
-DEPENDS+=	XFree86-clients>=4.3.0:../../x11/XFree86-clients
-DEPENDS+=	XFree86-server>=4.3.0:../../x11/XFree86-server
-DEPENDS+=	XFree86-docs>=4.3.0:../../misc/XFree86-docs
-DEPENDS+=	XFree86-man>=4.3.0:../../misc/XFree86-man
-DEPENDS+=	XFree86-fontsEncodings>=4.3.0:../../fonts/XFree86-fontsEncodings
-DEPENDS+=	XFree86-fontsCyrillic>=4.3.0:../../fonts/XFree86-fontsCyrillic
-DEPENDS+=	XFree86-fontsMisc>=4.3.0:../../fonts/XFree86-fontsMisc
-DEPENDS+=	XFree86-fonts100dpi>=4.3.0:../../fonts/XFree86-fonts100dpi
-DEPENDS+=	XFree86-fonts75dpi>=4.3.0:../../fonts/XFree86-fonts75dpi
-DEPENDS+=	XFree86-fontserver>=4.3.0:../../fonts/XFree86-fontserver
-DEPENDS+=	XFree86-fontsScalable>=4.3.0:../../fonts/XFree86-fontsScalable
+DEPENDS=	imake>=4.4.0:../../x11/imake
+DEPENDS+=	XFree86-dirs>=1.0:../../misc/XFree86-dirs
+DEPENDS+=	XFree86-libs>=4.4.0:../../x11/XFree86-libs
+DEPENDS+=	XFree86-clients>=4.4.0:../../x11/XFree86-clients
+DEPENDS+=	XFree86-server>=4.4.0:../../x11/XFree86-server
+DEPENDS+=	XFree86-docs>=4.4.0:../../misc/XFree86-docs
+DEPENDS+=	XFree86-man>=4.4.0:../../misc/XFree86-man
+DEPENDS+=	XFree86-fontsEncodings>=4.4.0:../../fonts/XFree86-fontsEncodings
+DEPENDS+=	XFree86-fontsCyrillic>=4.4.0:../../fonts/XFree86-fontsCyrillic
+DEPENDS+=	XFree86-fontsMisc>=4.4.0:../../fonts/XFree86-fontsMisc
+DEPENDS+=	XFree86-fonts100dpi>=4.4.0:../../fonts/XFree86-fonts100dpi
+DEPENDS+=	XFree86-fonts75dpi>=4.4.0:../../fonts/XFree86-fonts75dpi
+DEPENDS+=	XFree86-fontserver>=4.4.0:../../fonts/XFree86-fontserver
+DEPENDS+=	XFree86-fontsScalable>=4.4.0:../../fonts/XFree86-fontsScalable
 
 NO_BUILD=		# defined
 NO_BUILDLINK=		# defined
@@ -35,5 +35,5 @@ NO_CONFIGURE=		# defined
 do-install:
 	# empty
 
-.include "../../meta-pkgs/XFree86/Makefile.common"
+.include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common
index 8ea4c3cccf4..562e61dbcf9 100644
--- a/meta-pkgs/XFree86/Makefile.common
+++ b/meta-pkgs/XFree86/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2004/02/07 18:47:07 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/03/28 22:06:16 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -9,26 +9,126 @@
 # XINSTALL_MAN_DIRS is the group of directories which will have 
 #   their install.man targets run.
 
-# X430src-1 is the base.
-# X430src-2 contains various programs like bitmap, twm, xterm, xdm, xinit, ...
-# X430src-3 is xc/programs/Xserver/.
-# X430src-4 contains xc/fonts/{PEX,bdf/100dpi,bdf/75dpi,bdf/misc,encodings}
-# X430src-5 contains xc/fonts/scaled/{CID,Ethiopic,Meltho,Speedo,TTF,Type1}
-# X430src-6 contains the documentation source.
-# X430src-7 contains the hardcopy documentation.
+# src-1 is the base.
+# src-2 contains various programs like bitmap, twm, xterm, xdm, xinit, ...
+# src-3 is xc/programs/Xserver/.
+# src-4 contains xc/fonts/{PEX,bdf/100dpi,bdf/75dpi,bdf/misc,encodings}
+# src-5 contains xc/fonts/scaled/{CID,Ethiopic,Meltho,Speedo,TTF,Type1}
+# src-6 contains the documentation source.
+# src-7 contains the hardcopy documentation.
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Linux"
-USE_GNU_TOOLS+= make
-.endif
+#
+# Manual page handling.
+#
+.if ${OPSYS} == "FreeBSD"
+.  if ${LOWER_OPSYS_VERSUFFIX} == "4"
+XTHRSTUB_MINOR=		'@comment '
+LIBXTHRSTUB=
+.  else
+XTHRSTUB_MINOR=
+LIBXTHRSTUB=		'@comment '
+.  endif
+SHARED_LIB_MINOR=	'@comment '
+STATIC_LIB=
+XF86RUSH=		'@comment '
+I810XVMC=		'@comment '
+IMAKE_MANTOOLS=
+LIBDRI=
+MANSOURCEPATH=		man/man
+MAN_DIR=		${MANSOURCEPATH}1
+LIBMAN_DIR=		${MANSOURCEPATH}3
+KERNMAN_DIR=		${MANSOURCEPATH}4
+FILEMAN_DIR=		${MANSOURCEPATH}5
+MISCMAN_DIR=		${MANSOURCEPATH}7
+MAN_SUFFIX=		1
+LIBMAN_SUFFIX=		3
+KERNMAN_SUFFIX=		4
+FILEMAN_SUFFIX=		5
+MISCMAN_SUFFIX=		7
+
+.elif ${OPSYS} == "Linux"
+
+LIBXTHRSTUB=
+XTHRSTUB_MINOR=
+SHARED_LIB_MINOR=   
+STATIC_LIB=		'@comment '
+XF86RUSH=
+I810XVMC=
+USE_GNU_TOOLS+=		make
+IMAKE_MANTOOLS=
+LIBDRI=
+MANSOURCEPATH=		man/man
+MAN_DIR=		${MANSOURCEPATH}1
+LIBMAN_DIR=		${MANSOURCEPATH}3
+KERNMAN_DIR=		${MANSOURCEPATH}4
+FILEMAN_DIR=		${MANSOURCEPATH}5
+MISCMAN_DIR=		${MANSOURCEPATH}7
+MAN_SUFFIX=		1x
+LIBMAN_SUFFIX=		3x
+KERNMAN_SUFFIX=		4
+FILEMAN_SUFFIX=		5x
+MISCMAN_SUFFIX=		7
 
-WRKSRC?=	${WRKDIR}/xc
-USE_X11BASE=	YES
-USE_X11_LINKS=	NO
-X11ROOT=	${X11PREFIX}/X11R6
+.else
 
-ONLY_FOR_PLATFORM=	FreeBSD-*-i386 Linux-*-i386
+LIBXTHRSTUB=
+XTHRSTUB_MINOR=
+SHARED_LIB_MINOR=
+STATIC_LIB=
+XF86RUSH=		'@comment '
+I810XVMC=		'@comment '
+IMAKE_MANTOOLS=		'@comment '
+LIBDRI=			'@comment '
+MANSOURCEPATH=		man/cat
+MAN_DIR=		${MANSOURCEPATH}1
+LIBMAN_DIR=		${MANSOURCEPATH}3
+KERNMAN_DIR=		${MANSOURCEPATH}4
+FILEMAN_DIR=		${MANSOURCEPATH}5
+MISCMAN_DIR=		${MANSOURCEPATH}7
+MAN_SUFFIX=		0
+LIBMAN_SUFFIX=		${MAN_SUFFIX}
+KERNMAN_SUFFIX=		${MAN_SUFFIX}
+FILEMAN_SUFFIX=		${MAN_SUFFIX}
+MISCMAN_SUFFIX=		${MAN_SUFFIX}
+
+.endif # NetBSD
+
+PLIST_SUBST+=	XTHRSTUB_MINOR=${XTHRSTUB_MINOR}
+PLIST_SUBST+=	LIBXTHRSTUB=${LIBXTHRSTUB}
+PLIST_SUBST+=	SHARED_LIB_MINOR=${SHARED_LIB_MINOR}
+PLIST_SUBST+=	STATIC_LIB=${STATIC_LIB}
+PLIST_SUBST+=	XF86RUSH=${XF86RUSH}
+PLIST_SUBST+=	I810XVMC=${I810XVMC}
+PLIST_SUBST+=	IMAKE_MANTOOLS=${IMAKE_MANTOOLS}
+PLIST_SUBST+=	LIBDRI=${LIBDRI}
+PLIST_SUBST+=	MAN_DIR=${MAN_DIR}
+PLIST_SUBST+=	LIBMAN_DIR=${LIBMAN_DIR}
+PLIST_SUBST+=	MAN_SUFFIX=${MAN_SUFFIX}
+PLIST_SUBST+=	LIBMAN_SUFFIX=${LIBMAN_SUFFIX}
+PLIST_SUBST+=	KERNMAN_DIR=${KERNMAN_DIR}
+PLIST_SUBST+=	KERNMAN_SUFFIX=${KERNMAN_SUFFIX}
+PLIST_SUBST+=	FILEMAN_DIR=${FILEMAN_DIR}
+PLIST_SUBST+=	FILEMAN_SUFFIX=${FILEMAN_SUFFIX}
+PLIST_SUBST+=	MISCMAN_DIR=${MISCMAN_DIR}
+PLIST_SUBST+=	MISCMAN_SUFFIX=${MISCMAN_SUFFIX}
+
+NO_MTREE=		# defined
+
+X11ROOT_PREFIX?=	X11R6
+WRKSRC?=		${WRKDIR}/xc
+X11ROOT?=		${PREFIX}/${X11ROOT_PREFIX}
+X11BASE=		${X11ROOT}
+PREPEND_PATH=		${X11ROOT}/bin # Make sure we have this in PATH :)
+
+PLIST_SUBST+=		X11ROOT_PREFIX=${X11ROOT_PREFIX}
+MESSAGE_SUBST+=		X11ROOT=${X11ROOT}
+
+#
+# Any volunteer to test any platform not listed here? :)
+#
+ONLY_FOR_PLATFORM=	FreeBSD-*-i386 Linux-*-i386 NetBSD-*-i386 SunOS-*-*
 
 MASTER_SITE_XFREE+=	\
 	ftp://archive.progeny.com/XFree86/${XF_VER}/source/ \
@@ -37,20 +137,27 @@ MASTER_SITE_XFREE+=	\
 	ftp://ftp.gwdg.de/pub/xfree86/XFree86/${XF_VER}/source/ \
 	ftp://ftp.free.fr/pub/XFree86/${XF_VER}/source/
 
-XF_VER=	4.3.0
+XF_VER=		4.4.0
 
 IMAKE=		${X11ROOT}/bin/imake
 
 XINSTALL_DIRS?=	${XBUILD_DIRS}
 _XINCLUDE_DIRS=	include ${XBUILD_DIRS} ${XINCLUDE_DIRS}
 
-# Operating Systems to pass our compiler options (CC, CXX, CPP, CFLAGS)
-
+#
+# Operating Systems to pass our compiler options (CC, CXX, CPP, CFLAGS).
+#
 SYSTEMS=	FreeBSD NetBSD linux
 
 .if !defined(NO_XFREE86_TARGETS)
 
-.if !target(post-extract)
+USE_LANGUAGES=		c c++
+
+.  if !target(post-extract)
+
+GLOBAL_LDFLAGS=	-L${LOCALBASE}/lib -L${X11ROOT}/lib \
+		${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib \
+		${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib
 
 post-extract:
 	@${SED} \
@@ -65,65 +172,43 @@ post-extract:
 		-e "s|@REVPATH@|${X11ROOT}/bin/revpath|g" \
 		-e "s|@PREFIX@|${X11ROOT}|g" \
 		-e "s|@LOCALBASE@|${LOCALBASE}|g" \
-		-e "s|@LDFLAGS@|${LDFLAGS}|g" \
+		-e "s|@LDFLAGS@|${GLOBAL_LDFLAGS}|g" \
+		-e "s|@WRKSRC@|${WRKSRC}|g" \
 		${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def
 	@${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util
 	@${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util
 	@${LN} -sf ${X11ROOT}/bin/pswrap ${WRKSRC}/config/pswrap
 	@${LN} -sf ${X11ROOT}/lib/X11/config/version.def ${WRKSRC}/config/cf
 	@${LN} -sf ${X11ROOT}/lib/X11/config/date.def ${WRKSRC}/config/cf
-.if exists(${FILESDIR}/ucs2any.c)
-	@${CP} ${FILESDIR}/ucs2any.c ${WRKSRC}/fonts/util
-.endif
-.if exists(${FILESDIR}/Wraphelp.c)
+.  if exists(${FILESDIR}/Wraphelp.c)
 	@${CP} ${FILESDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp
-.endif
+.  endif
 
-.for F in ${SYSTEMS}
+.  for F in ${SYSTEMS}
 	@${MV} ${WRKSRC}/config/cf/${F}.cf \
 		${WRKSRC}/config/cf/${F}.cf.in
-.endfor
-.undef F
+.  endfor
+.  undef F
 
-.endif
-
-.if !target(pre-configure)
+.  endif
 
+.  if !target(pre-configure)
 pre-configure:
-
-.for F in ${SYSTEMS}
+.  for F in ${SYSTEMS}
 	@${SED} -e "s|@@PKGSRC_CC@@|${CC}|g" \
 		-e "s|@@PKGSRC_CXX@@|${CXX}|g" \
 		-e "s|@@PKGSRC_CPP@@|${CPP}|g" \
-		-e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \
+		-e "s|@@PKGSRC_CFLAGS@@|${CFLAGS:C/-I.*//}|g" \
 		-e "s|-I${LOCALBASE}/include||" \
 		-e "s|-I${X11BASE}/include||" \
 		${WRKSRC}/config/cf/${F}.cf.in > \
 		${WRKSRC}/config/cf/${F}.cf
-.endfor
-.undef F
+.  endfor
+.  undef F
 
-# Check if we have a native threads implementation 
+.  endif
 
-.if ${OPSYS} == "NetBSD" && !exists(/usr/include/pthread.h)
-	${ECHO} "#define TheadedX NO" >> ${WRKSRC}/config/cf/NetBSD.cf
-.else
-	@( \
-	cd ${WRKSRC}/config/cf && \
-	${ECHO} "#define HasPosixThreads YES" >> NetBSD.cf; \
-	${ECHO} "#define ThreadedX YES" >> NetBSD.cf; \
-	${ECHO} "#define HasThreadSafeAPI YES" >> NetBSD.cf; \
-	${ECHO} "#define ThreadsLibraries -lpthread" >> NetBSD.cf; \
-	${ECHO} "#define LibraryMTDefines -DUSE_NBSD_THREADLIB" >> NetBSD.cf; \
-	${ECHO} "#define SystemMTDefines -D_REENTRANT" >> NetBSD.cf; \
-	${ECHO} "#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI" \
-		>> NetBSD.cf \
-	)
-
-.endif
-.endif
-
-.if !target(do-configure)
+.  if !target(do-configure)
 do-configure:
 	@for dir in ${_XINCLUDE_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${IMAKE} \
@@ -139,16 +224,16 @@ do-configure:
 	@for dir in include ${XBUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${MAKE} depend; \
 	done
-.endif
+.  endif
 
-.if !target(do-build)
+.  if !target(do-build)
 do-build:
 	@for dir in ${XBUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${MAKE} all; \
 	done
-.endif
+.  endif
 
-.if !target(do-install)
+.  if !target(do-install)
 do-install:
 	@for dir in ${XINSTALL_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${MAKE} install; \
@@ -156,6 +241,6 @@ do-install:
 	@for dir in ${XINSTALL_MAN_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${MAKE} install.man; \
 	done
-.endif
+.  endif
 
 .endif # NO_XFREE86_TARGETS