[Midnightbsd-cvs] mports: Makefile: Upgraded xorg to 7.3.

[ctriv at midnightbsd.org]

Log Message:
-----------
Upgraded xorg to 7.3.

Modified Files:
--------------
    mports/x11/xorg:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/xorg/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lx11/xorg/Makefile -Lx11/xorg/Makefile -u -r1.2 -r1.3
--- x11/xorg/Makefile
+++ x11/xorg/Makefile
@@ -2,53 +2,47 @@
 # Date created:		18 Jun 2004
 # Whom:			anholt
 #
+# $FreeBSD: ports/x11/xorg/Makefile,v 1.19 2007/09/16 12:42:25 flz Exp $
 # $MidnightBSD$
-# $FreeBSD: ports/x11/xorg/Makefile,v 1.15 2006/01/21 18:55:03 lesi Exp $
 #
 
 PORTNAME=	xorg
-PORTVERSION=	6.9.0
+PORTVERSION=	7.3
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	X.Org distribution metaport
+COMMENT=	X.Org complete distribution metaport
+LICENSE=	agg
 
-LIB_DEPENDS=	X11.6:${PORTSDIR}/x11/xorg-libraries
-RUN_DEPENDS=	xvinfo:${PORTSDIR}/x11/xorg-clients \
-		${X11BASE}/share/doc/X11/ddx.txt:${PORTSDIR}/x11/xorg-documents \
-		${X11BASE}/man/man1/Xserver.1.gz:${PORTSDIR}/x11/xorg-manpages \
-		${FONT100DPI}:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
-		${FONT75DPI}:${PORTSDIR}/x11-fonts/xorg-fonts-75dpi \
-		${FONTCYR}:${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic \
-		${FONTDEFAULT}:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
-		${FONTTT}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
-		${FONTT1}:${PORTSDIR}/x11-fonts/xorg-fonts-type1 \
-		${X11BASE}/bin/xfs:${PORTSDIR}/x11-servers/xorg-fontserver \
-		${X11BASE}/bin/Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
-		${X11BASE}/bin/Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
-		${X11BASE}/bin/Xprt:${PORTSDIR}/x11-servers/xorg-printserver
-
-.include <bsd.port.pre.mk>
+NO_BUILD=	yes
 
-.if ${ARCH} != ia64
-RUN_DEPENDS+=	${X11BASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
-.endif
+RUN_DEPENDS+=	${LOCALBASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri
 
-.if ${ARCH} == i386 || ${ARCH} == alpha || ${ARCH} == amd64
-RUN_DEPENDS+=	${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri
+# data
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
+		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
+
+# doc
+RUN_DEPENDS+=	${LOCALBASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs
+
+# app, lib, font, driver, proto
+RUN_DEPENDS+=	${LOCALBASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \
+		${LOCALBASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \
+		${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \
+		${LOCALBASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \
+		${LOCALBASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos \
+		${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
+
+.if defined(XORG_COMPLETE)
+RUN_DEPENDS+=	Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
+		Xdmx:${PORTSDIR}/x11-servers/xorg-dmx \
+		Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
 .endif
 
-FONT100DPI=	${X11BASE}/lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
-FONT75DPI=	${X11BASE}/lib/X11/fonts/75dpi/UTBI__10-ISO8859-1.pcf.gz
-FONTCYR=	${X11BASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz
-FONTDEFAULT=	${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz
-FONTTT=		${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTT1=		${X11BASE}/lib/X11/fonts/Type1/UTBI____.afm
-
-NO_BUILD=	yes
+do-install:	# empty
 
 pre-everything::
 	@${ECHO_MSG} "This is a meta-port, meaning that it just depends on its subparts of the port."
@@ -57,17 +51,18 @@
 	@${ECHO_MSG} "upgrade X.Org.  If you simply type 'make install' it may use over 2GB to build"
 	@${ECHO_MSG} "all of the subports.  You can install the ports singly if you are low on space."
 
+.include <bsd.port.pre.mk>
+
 .if make(package)
 .if !defined(DEPENDS_TARGET:Mpackage) || empty(DEPENDS_TARGET:Mpackage)
 DEPENDS_TARGET="package"
 .endif
 .endif
 
-do-install:	# empty
-
 .if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
+IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
+
 .include <bsd.port.post.mk>