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.

1 files changed, 32 insertions, 51 deletions

diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index 88a8a0af42c..090309a30d0 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,75 +1,56 @@
-# $NetBSD: Makefile,v 1.5 2004/02/04 23:56:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/28 22:06:16 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-server-${XF_VER}
-PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
-DISTFILES=		X430src-1.tgz X430src-2.tgz \
-			X430src-3.tgz X430src-4.tgz
+DISTFILES=		XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \
+			XFree86-4.4.0-src-3.tgz
 
 MAINTAINER=		xfree86@blef.org
 HOMEPAGE=		http://www.xfree86.org/
 COMMENT=		XFree86 X server and related programs
 
-USE_IMAKE=		yes
-USE_BUILDLINK2=		yes
-DISTINFO_FILE=		${.CURDIR}/../XFree86-libs/distinfo
-PATCHDIR=		${.CURDIR}/../XFree86-libs/patches
+USE_X11=		yes
+USE_BUILDLINK3=		yes
+DISTINFO_FILE=		${.CURDIR}/../../x11/XFree86-libs/distinfo
+PATCHDIR=		${.CURDIR}/../../x11/XFree86-libs/patches
 
 XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau \
 			programs/Xserver
-XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
-XINSTALL_DIRS=		lib/font programs/Xserver
+XINCLUDE_DIRS=		lib/xkbfile lib/xtrans 
+XINSTALL_DIRS=		lib/font/FreeType lib/font/X-TrueType \
+			lib/font/Speedo lib/font/Type1 \
+			lib/font/bitmap programs/Xserver
 XINSTALL_MAN_DIRS=	programs/Xserver
 
-.include "../../mk/bsd.prefs.mk"
+REPLACE_PERL=		exports/lib/modules/getconfig*
 
-.if ${OPSYS} == "NetBSD"
-PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_MANNEWSUFFIX}
-PLIST_SUBST+=		MANPAGE_LIB_SUFFIX=${IMAKE_MANNEWSUFFIX}
-.else
-PLIST_SUBST+=		MANPAGE_LIB_SUFFIX=${IMAKE_FILEMAN_SUFFIX}
-PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
-.endif
+SUBST_CLASSES=		parser
+SUBST_STAGE.parser=	pre-install
+SUBST_FILES.parser=	programs/Xserver/hw/xfree86/parser/Makefile
+SUBST_SED.parser=	-e '/$$(INSTALL).*lib$$(LIBNAME).a/ d'
+SUBST_SED.parser+=	-e '/$$(RANLIB).*lib$$(LIBNAME).a/ d'
+SUBST_SED.parser+=	-e 's|$$(INSTALL) $$(INSTALLFLAGS) $$(INSTINCFLAGS)|echo|'
+SUBST_MESSAGE.parser=	"Fixing parser Makefile."
 
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
-PLIST_SUBST+=		DRIMODULES=
-USE_PERL5=		yes # Still we need perl (at least for now)
-.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha"
-XBUILD_DIRS+=		lib/XThrStub lib/X11 lib/Xext lib/GL
-XINSTALL_DIRS+=		lib/GL/mesa/src/drv
-.  endif
-.else
-PLIST_SUBST+=		LIBDRI="@comment "
-PLIST_SUBST+=		DRIMODULES="@comment "
-.endif
+SUBST_CLASSES+=		stubs
+SUBST_STAGE.stubs=	pre-install
+SUBST_FILES.stubs=	lib/font/stubs/Makefile
+SUBST_SED.stubs=	-e '/$$(INSTALL).*libfntstubs.a/ d'
+SUBST_SED.stubs+=	-e '/$$(RANLIB).*libfntstubs.a/ d'
+SUBST_MESSAGE.stubs=	"Fixing stubs Makefile."
 
-.if ${OPSYS} == "Linux"
-PLIST_SUBST+=		KBDMODE="@comment "
-.else
-PLIST_SUBST+=		KBDMODE=
-.endif
+.include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "FreeBSD"
-PLIST_SUBST+=		LIBDRI=
+.if ${OPSYS} != "NetBSD"
+USE_PERL5=	build # Yeah, we need this :-)
 .endif
 
-pre-install:
-	@cd ${WRKSRC}/programs/Xserver/hw/xfree86/parser && \
-		${CP} Makefile Makefile.orig && \
-		${SED} -e '/$$(INSTALL).*lib$$(LIBNAME).a/ d' \
-		-e '/$$(RANLIB).*lib$$(LIBNAME).a/ d' \
-		-e 's|$$(INSTALL) $$(INSTALLFLAGS) $$(INSTINCFLAGS)|echo|' \
-		Makefile.orig > Makefile
-	@cd ${WRKSRC}/lib/font/stubs && \
-		${CP} Makefile Makefile.orig && \
-		${SED} -e '/$$(INSTALL).*libfntstubs.a/ d' \
-			-e '/$$(RANLIB).*libfntstubs.a/ d' Makefile.orig \
-			> Makefile
+post-install:
+	${CHMOD} a+r ${X11ROOT}/bin/XFree86
 
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../meta-pkgs/XFree86/Makefile.common"
-.include "../../x11/XFree86-libs/buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"