diff options
| author | anholt <anholt@FreeBSD.org> | 2004-12-23 09:35:49 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-12-23 09:35:49 +0800 |
| commit | 65440fcd9bcb20a1d534ae744432598de80568e0 (patch) | |
| tree | 9c8108a587ba53bd91384e5c3a89b90f40ff9344 /graphics/xfree86-dri | |
| parent | 941f91a0158ef5a224f924902fa9c60d2b342648 (diff) | |
| download | freebsd-ports-graphics-65440fcd9bcb20a1d534ae744432598de80568e0.tar.gz freebsd-ports-graphics-65440fcd9bcb20a1d534ae744432598de80568e0.tar.zst freebsd-ports-graphics-65440fcd9bcb20a1d534ae744432598de80568e0.zip | |
Update X.Org ports to 6.8.1, and the DRI port to use Mesa 6.2. Because Mesa 6.2
DRI drivers are incompatible with the old libGL in XFree86, they have been
repocopied to graphics/xfree86-dri. Also note that with this commit the html
manpages are going away, and with it the runtime dependency on perl for the
imake port.
Release notes at: http://www.x.org/X11R6.8.1/RELNOTES.txt
Props to: kris (multiple cluster runs and sorting through logs)
lesi (fixing all the issues in those logs, and more)
Diffstat (limited to 'graphics/xfree86-dri')
| -rw-r--r-- | graphics/xfree86-dri/Makefile | 37 | ||||
| -rw-r--r-- | graphics/xfree86-dri/distinfo | 10 | ||||
| -rw-r--r-- | graphics/xfree86-dri/pkg-plist | 4 |
3 files changed, 32 insertions, 19 deletions
diff --git a/graphics/xfree86-dri/Makefile b/graphics/xfree86-dri/Makefile index f2de8ba34ce..90fa5d05371 100644 --- a/graphics/xfree86-dri/Makefile +++ b/graphics/xfree86-dri/Makefile @@ -5,36 +5,47 @@ # $FreeBSD$ # -PORTNAME= dri -PORTVERSION= 5.0.2 -PORTEPOCH= 2 +PORTNAME= xfree86-dri +PORTVERSION= 4.4.0 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_XORG} -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} +DISTFILES= XFree86-4.4.0-src-1.tgz \ + XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz -MAINTAINER= anholt@FreeBSD.org -COMMENT= OpenGL hardware acceleration drivers for the DRI +MAINTAINER= x11@FreeBSD.org +COMMENT= OpenGL hardware acceleration drivers for XFree86 -EXTRA_PATCHES+= ${CF_PATCHES} +CONFLICTS= dri-[5-9].* -USE_XLIB= yes +EXTRA_PATCHES+= ${FILESDIR}/patch-GL-Imakefile ONLY_FOR_ARCHS= i386 alpha amd64 XBUILD_DIRS= lib/GL XINSTALL_DIRS= lib/GL/mesa/src/drv -.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86. For X.Org use graphics/dri port. See ports/UPDATING entry 20040723 for further information. +.endif + .if ${ARCH} == i386 PLIST_SUB+= I386="" .else PLIST_SUB+= I386="@comment " .endif +.if ${ARCH} == alpha +PLIST_SUB+= ALPHA_NA="@comment " +.else +PLIST_SUB+= ALPHA_NA="" +.endif .if ${ARCH} == amd64 -PLIST_SUB+= NO_AMD64="@comment " +PLIST_SUB+= AMD64_NA="@comment " .else -PLIST_SUB+= NO_AMD64="" +PLIST_SUB+= AMD64_NA="" .endif .include <bsd.port.post.mk> diff --git a/graphics/xfree86-dri/distinfo b/graphics/xfree86-dri/distinfo index b9025936ccb..ba2d5d81e5e 100644 --- a/graphics/xfree86-dri/distinfo +++ b/graphics/xfree86-dri/distinfo @@ -1,4 +1,6 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 +SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 +MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 +SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 +MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d +SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 diff --git a/graphics/xfree86-dri/pkg-plist b/graphics/xfree86-dri/pkg-plist index c3fcecbdcb6..fc64212b98f 100644 --- a/graphics/xfree86-dri/pkg-plist +++ b/graphics/xfree86-dri/pkg-plist @@ -1,9 +1,9 @@ lib/modules/dri/gamma_dri.so -%%I386%%lib/modules/dri/i810_dri.so +%%ALPHA_NA%%lib/modules/dri/i810_dri.so %%I386%%lib/modules/dri/i830_dri.so lib/modules/dri/mga_dri.so lib/modules/dri/r128_dri.so lib/modules/dri/r200_dri.so lib/modules/dri/radeon_dri.so %%I386%%lib/modules/dri/sis_dri.so -%%NO_AMD64%%lib/modules/dri/tdfx_dri.so +%%AMD64_NA%%lib/modules/dri/tdfx_dri.so |