Date: Tue, 18 Jun 2013 21:00:57 +0200 From: Niclas Zeising <zeising@freebsd.org> To: ports@freebsd.org, x11@freebsd.org Subject: [HEADS UP] switch default xorg version in 9.1 and later Message-ID: <51C0AE69.6090505@freebsd.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------040604060406000805070101 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi! It is time to switch the default version of xorg on FreeBSD 9.1 and later, including CURRENT. In general this means better support for modern hardware, especially intel hardware, at the cost of support for some legacy hardware. The old version will still be around, and be the default for FreeBSD releases prior to 9.1, it is also possible to get the old version by setting WITHOUT_NEW_XORG= in /etc/make.conf. The attached patch will make the switch, and I intend to commit it ASAP unless something major shows up. The patch is also available at http://people.freebsd.org/~zeising/xorg-switch.diff Regards! -- Niclas Zeising FreeBSD x11 team PS. Please respect reply-to, to avoid too much cross posting. --------------040604060406000805070101 Content-Type: text/x-patch; name="xorg-switch.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xorg-switch.diff" Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk (revision 321210) +++ Mk/bsd.port.mk (working copy) @@ -1214,6 +1214,15 @@ .endif .endif +# Enable new xorg for FreeBSD 9.1 and later unless WITHOUT_NEW_XORG is set. +.if ${OSVERSION} >= 901000 +.if !defined(WITHOUT_NEW_XORG) +WITH_NEW_XORG?= yes +.else +.undef WITH_NEW_XORG +.endif +.endif + # Only define tools here (for transition period with between pkg tools) .include "${PORTSDIR}/Mk/bsd.commands.mk" Index: emulators/virtualbox-ose-additions/Makefile =================================================================== --- emulators/virtualbox-ose-additions/Makefile (revision 321210) +++ emulators/virtualbox-ose-additions/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.2.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators kld MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Index: graphics/dri/Makefile =================================================================== --- graphics/dri/Makefile (revision 321210) +++ graphics/dri/Makefile (working copy) @@ -15,59 +15,44 @@ USES= pkgconfig USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto +.include <bsd.port.options.mk> + +.if ${ARCH} == "ia64" +BROKEN= does not install on ia64 +.endif + ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST -.if ! defined(WITH_NEW_XORG) +.if !defined(WITH_NEW_XORG) ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME .endif .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" -OPTIONS_DEFINE_i386= ${ALL_DRI_DRIVERS} -OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} +.if ${ARCH} == "amd64" || ${ARCH} == "i386" +DRI_DRIVERS= ${ALL_DRI_DRIVERS} +.endif .if defined(WITH_NEW_XORG) -OPTIONS_DEFINE_powerpc= RADEON SWRAST -OPTIONS_DEFINE_sparc64= RADEON SWRAST -.else -OPTIONS_DEFINE_powerpc= MACH64 RADEON SWRAST TDFX -OPTIONS_DEFINE_sparc64= MACH64 RADEON SWRAST +.if ${ARCH} == "powerpc" || ${ARCH} == "sparc64" +DRI_DRIVERS= RADEON SWRAST .endif +.else # !defined(WITH_NEW_XORG) +.if ${ARCH} == "powerpc" +DRI_DRIVERS= MACH64 RADEON SWRAST TDFX +.elif ${ARCH} == "sparc64" +DRI_DRIVERS= MACH64 RADEON SWRAST +.endif +.endif # defined(WITH_NEW_XORG) -OPTIONS_DEFAULT=${OPTIONS_DEFINE} - -I810_DESC= Include DRI support for Intel i810 -I915_DESC= Include DRI support for Intel i915 -I965_DESC= Include DRI support for Intel i965 -MACH64_DESC= Include DRI support for AMD/ATI Mach64 -MGA_DESC= Include DRI support for Matrox -R128_DESC= Include DRI support for AMD/ATI R128 -R200_DESC= Include DRI support for AMD/ATI R200 -R300_DESC= Include DRI support for AMD/ATI R300 -R600_DESC= Include DRI support for AMD/ATI R600 -RADEON_DESC= Include DRI support for AMD/ATI RADEON -SAVAGE_DESC= Include DRI support for S3/Via Savage -SIS_DESC= Include DRI support for SiS 300 and 6326 -SWRAST_DESC= Include generic software DRI support -TDFX_DESC= Include DRI support for 3dfx Voodoo -UNICHROME_DESC= Include DRI support for S3/Via Unichrome - -.include <bsd.port.options.mk> - -DRI_DRIVERS= .for _d in ${ALL_DRI_DRIVERS} -.if ${PORT_OPTIONS:M${_d}} -DRI_DRIVERS+= ${_d} +.if ${DRI_DRIVERS:M${_d}} PLIST_SUB+= ${_d}_DRIVER="" .else PLIST_SUB+= ${_d}_DRIVER="@comment " .endif .endfor -.if ${ARCH} == "ia64" -BROKEN= does not install on ia64 -.endif - .if !(${ARCH} == "amd64" || ${ARCH} == "i386") CONFIGURE_ARGS+=--disable-gallium-intel .endif Index: graphics/libGL/Makefile =================================================================== --- graphics/libGL/Makefile (revision 321210) +++ graphics/libGL/Makefile (working copy) @@ -23,12 +23,12 @@ post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.include <bsd.port.options.mk> + .include "${.CURDIR}/bsd.mesalib.mk" -.include <bsd.port.pre.mk> - .if !(${ARCH} == "amd64" || ${ARCH} == "i386") CONFIGURE_ARGS+=--disable-gallium-intel .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Index: graphics/libGLU/Makefile =================================================================== --- graphics/libGLU/Makefile (revision 321210) +++ graphics/libGLU/Makefile (working copy) @@ -2,21 +2,19 @@ # $FreeBSD$ PORTNAME= libGLU -PORTVERSION= ${MESAVERSION} -PORTREVISION= 2 +PORTVERSION= 9.0.0 CATEGORIES= graphics +MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/glu/ +DISTNAME= glu-${PORTVERSION} +MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL utility library +USE_BZIP2= yes +USES= pathfix USE_GL= gl -USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static +USE_LDCONFIG= yes -INSTALL_WRKSRC= ${WRKSRC}/src/glu -BUILD_WRKSRC= ${WRKSRC}/src/glu - -pre-install: - @${MKDIR} ${PREFIX}/include/GL/ - ${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/ - -.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include <bsd.port.mk> Index: graphics/libGLU/pkg-plist =================================================================== --- graphics/libGLU/pkg-plist (revision 321210) +++ graphics/libGLU/pkg-plist (working copy) @@ -1,5 +1,6 @@ include/GL/glu.h include/GL/glu_mangle.h +lib/libGLU.la lib/libGLU.so lib/libGLU.so.1 libdata/pkgconfig/glu.pc Index: graphics/libdrm/Makefile =================================================================== --- graphics/libdrm/Makefile (revision 321210) +++ graphics/libdrm/Makefile (working copy) @@ -19,27 +19,20 @@ MAKE_JOBS_SAFE= yes -.if defined(WITH_NEW_XORG) +OPTIONS_DEFINE= MANPAGES -USE_GMAKE= yes - -OPTIONS_DEFINE= KMS MANPAGES -OPTIONS_DEFAULT=KMS -KMS_DESC= Enable KMS support - .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= MANPAGES .endif .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MKMS} +.if defined(WITH_NEW_XORG) + +USE_GMAKE= yes + CONFIGURE_ARGS+=--enable-libkms EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drmMode.c -PLIST_SUB+= KMS="" -.else -PLIST_SUB+= KMS="@comment " -.endif .if ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ @@ -57,7 +50,7 @@ CONFIGURE_ARGS+=--disable-manpages .endif -LIBDRM_VERSION= 2.4.44 +LIBDRM_VERSION= 2.4.45 LIBDRM_REVISION=0 PLIST_SUB+= OLD="@comment " NEW="" EXTRA_PATCHES+= ${FILESDIR}/extra-configure \ @@ -72,8 +65,6 @@ PLIST_SUB+= OLD="" NEW="@comment " .endif -.include <bsd.port.pre.mk> - .if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64" || ${ARCH} == "powerpc" PLIST_SUB+= INTEL_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" @@ -87,4 +78,4 @@ s,i?86|x86_64),i?86|amd64|x86_64),g' \ ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> Index: graphics/libdrm/distinfo =================================================================== --- graphics/libdrm/distinfo (revision 321210) +++ graphics/libdrm/distinfo (working copy) @@ -1,4 +1,4 @@ SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a SIZE (libdrm-2.4.17.tar.bz2) = 408882 -SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2 -SIZE (libdrm-2.4.44.tar.bz2) = 538416 +SHA256 (libdrm-2.4.45.tar.bz2) = 3ef0a70c16080fb90c50e807b660b7353d82509c03647f6ecc00bbfa1caee208 +SIZE (libdrm-2.4.45.tar.bz2) = 551900 Index: graphics/libdrm/pkg-plist =================================================================== --- graphics/libdrm/pkg-plist (revision 321210) +++ graphics/libdrm/pkg-plist (working copy) @@ -24,6 +24,7 @@ %%NEW%%include/libdrm/mga_drm.h %%NEW%%include/libdrm/nouveau.h %%NEW%%include/libdrm/nouveau_drm.h +%%NEW%%include/libdrm/qxl_drm.h %%NEW%%include/libdrm/r128_drm.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h @@ -37,7 +38,7 @@ %%NEW%%include/libdrm/savage_drm.h %%NEW%%include/libdrm/sis_drm.h %%NEW%%include/libdrm/via_drm.h -%%NEW%%%%KMS%%include/libkms/libkms.h +%%NEW%%include/libkms/libkms.h %%OLD%%include/nouveau/nouveau_bo.h %%OLD%%include/nouveau/nouveau_channel.h %%OLD%%include/nouveau/nouveau_class.h @@ -61,15 +62,15 @@ %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 -%%NEW%%%%KMS%%lib/libkms.la -%%NEW%%%%KMS%%lib/libkms.so -%%NEW%%%%KMS%%lib/libkms.so.1 +%%NEW%%lib/libkms.la +%%NEW%%lib/libkms.so +%%NEW%%lib/libkms.so.1 libdata/pkgconfig/libdrm.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc libdata/pkgconfig/libdrm_nouveau.pc %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc -%%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc +%%NEW%%libdata/pkgconfig/libkms.pc %%OLD%%@dirrm include/nouveau -%%NEW%%%%KMS%%@dirrm include/libkms +%%NEW%%@dirrm include/libkms %%NEW%%@dirrm include/libdrm %%OLD%%@dirrm include/drm Index: net/tigervnc/Makefile =================================================================== --- net/tigervnc/Makefile (revision 321210) +++ net/tigervnc/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= tigervnc PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net x11-servers MASTER_SITES= SF:tigervnc MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc Index: x11/pixman/Makefile =================================================================== --- x11/pixman/Makefile (revision 321210) +++ x11/pixman/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pixman -PORTVERSION= 0.28.2 +PORTVERSION= 0.30.0 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org Index: x11/pixman/distinfo =================================================================== --- x11/pixman/distinfo (revision 321210) +++ x11/pixman/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51 -SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655 +SHA256 (xorg/lib/pixman-0.30.0.tar.bz2) = 77e756dc7fafdf17f39a4f23bdc8be59f9f6a65c08704f5cac1d8aa87cfaf517 +SIZE (xorg/lib/pixman-0.30.0.tar.bz2) = 681343 Index: x11-drivers/input-wacom/Makefile =================================================================== --- x11-drivers/input-wacom/Makefile (revision 321210) +++ x11-drivers/input-wacom/Makefile (working copy) @@ -1,13 +1,9 @@ -# New ports collection makefile for: input-wacom -# Date Created: 24 Oct 2008 -# Whom: Dominic Fandrey <kamikaze@bsdforen.de> -# +# Created by: Dominic Fandrey <kamikaze@bsdforen.de> # $FreeBSD$ -# PORTNAME= input-wacom PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers kld MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \ SF/linuxwacom/xf86-input-wacom/:linuxwacom Index: x11-drivers/xf86-input-acecad/Makefile =================================================================== --- x11-drivers/xf86-input-acecad/Makefile (revision 321210) +++ x11-drivers/xf86-input-acecad/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-acecad PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-input-egalax/Makefile =================================================================== --- x11-drivers/xf86-input-egalax/Makefile (revision 321210) +++ x11-drivers/xf86-input-egalax/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf86-input-egalax -# Date Created: 2 June 2010 -# Whom: Gleb Smirnoff <glebius@FreeBSD.org> -# +# Created by: Gleb Smirnoff <glebius@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xf86-input-egalax PORTVERSION= 0.2 Index: x11-drivers/xf86-input-elographics/Makefile =================================================================== --- x11-drivers/xf86-input-elographics/Makefile (revision 321210) +++ x11-drivers/xf86-input-elographics/Makefile (working copy) @@ -11,6 +11,8 @@ XORG_CAT= driver MAN4= elographics.4x +.include <bsd.port.options.mk> + .if defined(WITH_NEW_XORG) ELO_VERSION= 1.3.0 ELO_REVISION= 0 Index: x11-drivers/xf86-input-fpit/Makefile =================================================================== --- x11-drivers/xf86-input-fpit/Makefile (revision 321210) +++ x11-drivers/xf86-input-fpit/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-fpit PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -12,6 +13,8 @@ MAN4= fpit.4x +.include <bsd.port.options.mk> + .if !defined(WITH_NEW_XORG) IGNORE= does not build with X server 1.7.7 .endif Index: x11-drivers/xf86-input-hyperpen/Makefile =================================================================== --- x11-drivers/xf86-input-hyperpen/Makefile (revision 321210) +++ x11-drivers/xf86-input-hyperpen/Makefile (working copy) @@ -10,6 +10,8 @@ XORG_CAT= driver +.include <bsd.port.options.mk> + .if defined(WITH_NEW_XORG) HYPERVER= 1.4.1 HYPERREVISION= 0 Index: x11-drivers/xf86-input-joystick/Makefile =================================================================== --- x11-drivers/xf86-input-joystick/Makefile (revision 321210) +++ x11-drivers/xf86-input-joystick/Makefile (working copy) @@ -11,6 +11,8 @@ XORG_CAT= driver MAN4= joystick.4x +.include <bsd.port.options.mk> + .if defined(WITH_NEW_XORG) JOYVER= 1.6.2 JOYREVISION= 0 Index: x11-drivers/xf86-input-keyboard/Makefile =================================================================== --- x11-drivers/xf86-input-keyboard/Makefile (revision 321210) +++ x11-drivers/xf86-input-keyboard/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-keyboard PORTVERSION= 1.7.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-input-magictouch/Makefile =================================================================== --- x11-drivers/xf86-input-magictouch/Makefile (revision 321210) +++ x11-drivers/xf86-input-magictouch/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-magictouch PORTVERSION= 1.0.0.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-input-mouse/Makefile =================================================================== --- x11-drivers/xf86-input-mouse/Makefile (revision 321210) +++ x11-drivers/xf86-input-mouse/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-mouse PORTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-input-mutouch/Makefile =================================================================== --- x11-drivers/xf86-input-mutouch/Makefile (revision 321210) +++ x11-drivers/xf86-input-mutouch/Makefile (working copy) @@ -10,6 +10,8 @@ XORG_CAT= driver MAN4= mutouch.4x +.include <bsd.port.options.mk> + .if !defined(WITH_NEW_XORG) IGNORE= does not build with xorg-server 1.7.7 .else Index: x11-drivers/xf86-input-penmount/Makefile =================================================================== --- x11-drivers/xf86-input-penmount/Makefile (revision 321210) +++ x11-drivers/xf86-input-penmount/Makefile (working copy) @@ -11,6 +11,8 @@ XORG_CAT= driver MAN4= penmount.4x +.include <bsd.port.options.mk> + .if defined(WITH_NEW_XORG) PEN_VERSION= 1.5.0 PEN_REVISION= 0 Index: x11-drivers/xf86-input-vmmouse/Makefile =================================================================== --- x11-drivers/xf86-input-vmmouse/Makefile (revision 321210) +++ x11-drivers/xf86-input-vmmouse/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= xf86-input-vmmouse PORTVERSION= 13.0.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -20,6 +21,8 @@ ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= The vmmouse protocol is only supported on x86-compatible architectures. +.include <bsd.port.options.mk> + .if defined(WITH_NEW_XORG) PLIST_SUB+= NEW="" .else Index: x11-drivers/xf86-input-void/Makefile =================================================================== --- x11-drivers/xf86-input-void/Makefile (revision 321210) +++ x11-drivers/xf86-input-void/Makefile (working copy) @@ -11,6 +11,8 @@ XORG_CAT= driver MAN4= void.4x +.include <bsd.port.options.mk> + .if defined(WITH_NEW_XORG) VOID_VERSION= 1.4.0 VOID_REVISION= 0 Index: x11-drivers/xf86-video-apm/Makefile =================================================================== --- x11-drivers/xf86-video-apm/Makefile (revision 321210) +++ x11-drivers/xf86-video-apm/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-apm PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-ark/Makefile =================================================================== --- x11-drivers/xf86-video-ark/Makefile (revision 321210) +++ x11-drivers/xf86-video-ark/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-ark PORTVERSION= 0.7.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-ati/Makefile =================================================================== --- x11-drivers/xf86-video-ati/Makefile (revision 321210) +++ x11-drivers/xf86-video-ati/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-ati PORTVERSION= 6.14.6 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-chips/Makefile =================================================================== --- x11-drivers/xf86-video-chips/Makefile (revision 321210) +++ x11-drivers/xf86-video-chips/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-chips PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-cirrus/Makefile =================================================================== --- x11-drivers/xf86-video-cirrus/Makefile (revision 321210) +++ x11-drivers/xf86-video-cirrus/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-cirrus PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-cyrix/Makefile =================================================================== --- x11-drivers/xf86-video-cyrix/Makefile (revision 321210) +++ x11-drivers/xf86-video-cyrix/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-cyrix PORTVERSION= 1.1.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-dummy/Makefile =================================================================== --- x11-drivers/xf86-video-dummy/Makefile (revision 321210) +++ x11-drivers/xf86-video-dummy/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-dummy PORTVERSION= 0.3.6 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-fbdev/Makefile =================================================================== --- x11-drivers/xf86-video-fbdev/Makefile (revision 321210) +++ x11-drivers/xf86-video-fbdev/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-fbdev PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-glint/Makefile =================================================================== --- x11-drivers/xf86-video-glint/Makefile (revision 321210) +++ x11-drivers/xf86-video-glint/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-glint PORTVERSION= 1.2.8 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-i128/Makefile =================================================================== --- x11-drivers/xf86-video-i128/Makefile (revision 321210) +++ x11-drivers/xf86-video-i128/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-i128 PORTVERSION= 1.3.6 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-i740/Makefile =================================================================== --- x11-drivers/xf86-video-i740/Makefile (revision 321210) +++ x11-drivers/xf86-video-i740/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-i740 PORTVERSION= 1.3.4 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-imstt/Makefile =================================================================== --- x11-drivers/xf86-video-imstt/Makefile (revision 321210) +++ x11-drivers/xf86-video-imstt/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-imstt PORTVERSION= 1.1.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-intel/Makefile =================================================================== --- x11-drivers/xf86-video-intel/Makefile (revision 321210) +++ x11-drivers/xf86-video-intel/Makefile (working copy) @@ -25,8 +25,10 @@ MAN4= intel.4x +.include <bsd.port.options.mk> + .if defined(WITH_NEW_XORG) -INTEL_VERSION= 2.21.8 +INTEL_VERSION= 2.21.9 INTEL_REVISION= 0 CONFIGURE_ARGS+= --enable-sna MAKE_JOBS_UNSAFE=yes Index: x11-drivers/xf86-video-intel/distinfo =================================================================== --- x11-drivers/xf86-video-intel/distinfo (revision 321210) +++ x11-drivers/xf86-video-intel/distinfo (working copy) @@ -1,4 +1,4 @@ SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625 -SHA256 (xorg/driver/xf86-video-intel-2.21.8.tar.bz2) = 4d850c0515012ca370a72469dfbfa6161aa9ee5bb39779fab5f496f2d94acf8f -SIZE (xorg/driver/xf86-video-intel-2.21.8.tar.bz2) = 1730966 +SHA256 (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) = 1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189 +SIZE (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) = 1735037 Index: x11-drivers/xf86-video-mach64/Makefile =================================================================== --- x11-drivers/xf86-video-mach64/Makefile (revision 321210) +++ x11-drivers/xf86-video-mach64/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-mach64 PORTVERSION= 6.9.3 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-mga/Makefile =================================================================== --- x11-drivers/xf86-video-mga/Makefile (revision 321210) +++ x11-drivers/xf86-video-mga/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-mga PORTVERSION= 1.6.1 -PORTEPOCH= 3 +PORTEPOCH= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-neomagic/Makefile =================================================================== --- x11-drivers/xf86-video-neomagic/Makefile (revision 321210) +++ x11-drivers/xf86-video-neomagic/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-neomagic PORTVERSION= 1.2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-newport/Makefile =================================================================== --- x11-drivers/xf86-video-newport/Makefile (revision 321210) +++ x11-drivers/xf86-video-newport/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-newport PORTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-nouveau/Makefile =================================================================== --- x11-drivers/xf86-video-nouveau/Makefile (revision 321210) +++ x11-drivers/xf86-video-nouveau/Makefile (working copy) @@ -4,7 +4,7 @@ PORTNAME= xf86-video-nouveau PORTVERSION= 0.0.10.${SNAPDATE} DISTVERSIONSUFFIX=.${SNAPREV} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/ Index: x11-drivers/xf86-video-nv/Makefile =================================================================== --- x11-drivers/xf86-video-nv/Makefile (revision 321210) +++ x11-drivers/xf86-video-nv/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-nv PORTVERSION= 2.1.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-openchrome/Makefile =================================================================== --- x11-drivers/xf86-video-openchrome/Makefile (revision 321210) +++ x11-drivers/xf86-video-openchrome/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-openchrome PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-r128/Makefile =================================================================== --- x11-drivers/xf86-video-r128/Makefile (revision 321210) +++ x11-drivers/xf86-video-r128/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-r128 PORTVERSION= 6.8.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-radeonhd/Makefile =================================================================== --- x11-drivers/xf86-video-radeonhd/Makefile (revision 321210) +++ x11-drivers/xf86-video-radeonhd/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= xf86-video-radeonhd PORTVERSION= 1.3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-rdc/Makefile =================================================================== --- x11-drivers/xf86-video-rdc/Makefile (revision 321210) +++ x11-drivers/xf86-video-rdc/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= xf86-video-rdc PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= x11-drivers MASTER_SITES= http://www.SpringDaemons.com/stas/ @@ -13,6 +14,8 @@ XORG_CAT= driver USE_XORG= xvmc xf86driproto xextproto x11 glproto +.include <bsd.port.options.mk> + .if defined(WITH_NEW_XORG) IGNORE= does not build with X server 1.12 .endif Index: x11-drivers/xf86-video-rendition/Makefile =================================================================== --- x11-drivers/xf86-video-rendition/Makefile (revision 321210) +++ x11-drivers/xf86-video-rendition/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-rendition PORTVERSION= 4.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-s3/Makefile =================================================================== --- x11-drivers/xf86-video-s3/Makefile (revision 321210) +++ x11-drivers/xf86-video-s3/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-s3 PORTVERSION= 0.6.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-s3virge/Makefile =================================================================== --- x11-drivers/xf86-video-s3virge/Makefile (revision 321210) +++ x11-drivers/xf86-video-s3virge/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-s3virge PORTVERSION= 1.10.6 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-savage/Makefile =================================================================== --- x11-drivers/xf86-video-savage/Makefile (revision 321210) +++ x11-drivers/xf86-video-savage/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-savage PORTVERSION= 2.3.6 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-siliconmotion/Makefile =================================================================== --- x11-drivers/xf86-video-siliconmotion/Makefile (revision 321210) +++ x11-drivers/xf86-video-siliconmotion/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-siliconmotion PORTVERSION= 1.7.7 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-sis/Makefile =================================================================== --- x11-drivers/xf86-video-sis/Makefile (revision 321210) +++ x11-drivers/xf86-video-sis/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-sis PORTVERSION= 0.10.7 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-sis-intel/Makefile =================================================================== --- x11-drivers/xf86-video-sis-intel/Makefile (revision 321210) +++ x11-drivers/xf86-video-sis-intel/Makefile (working copy) @@ -1,14 +1,9 @@ -# New ports collection makefile for: xf86-video-sis-intel -# Date Created: 30 May 2008 -# Whom: Alexey Illarionov <littlesavage@orionet.ru> -# Based on: x11-drivers/xf86-video-sis by flz@FreeBSD.org -# +# Created by: Alexey Illarionov <littlesavage@orionet.ru> # $FreeBSD$ -# PORTNAME= xf86-video-sis-intel PORTVERSION= 300407 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MASTER_SITES= http://downloadmirror.intel.com/15443/eng/ DISTNAME= sis_drv_src_300407 Index: x11-drivers/xf86-video-sunffb/Makefile =================================================================== --- x11-drivers/xf86-video-sunffb/Makefile (revision 321210) +++ x11-drivers/xf86-video-sunffb/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-sunffb PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-tdfx/Makefile =================================================================== --- x11-drivers/xf86-video-tdfx/Makefile (revision 321210) +++ x11-drivers/xf86-video-tdfx/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-tdfx PORTVERSION= 1.4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-tga/Makefile =================================================================== --- x11-drivers/xf86-video-tga/Makefile (revision 321210) +++ x11-drivers/xf86-video-tga/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-tga PORTVERSION= 1.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-trident/Makefile =================================================================== --- x11-drivers/xf86-video-trident/Makefile (revision 321210) +++ x11-drivers/xf86-video-trident/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-trident PORTVERSION= 1.3.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-tseng/Makefile =================================================================== --- x11-drivers/xf86-video-tseng/Makefile (revision 321210) +++ x11-drivers/xf86-video-tseng/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-tseng PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-vesa/Makefile =================================================================== --- x11-drivers/xf86-video-vesa/Makefile (revision 321210) +++ x11-drivers/xf86-video-vesa/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-vesa PORTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-via/Makefile =================================================================== --- x11-drivers/xf86-video-via/Makefile (revision 321210) +++ x11-drivers/xf86-video-via/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-via PORTVERSION= 0.2.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-vmware/Makefile =================================================================== --- x11-drivers/xf86-video-vmware/Makefile (revision 321210) +++ x11-drivers/xf86-video-vmware/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= xf86-video-vmware PORTVERSION= 13.0.1 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-drivers/xf86-video-voodoo/Makefile =================================================================== --- x11-drivers/xf86-video-voodoo/Makefile (revision 321210) +++ x11-drivers/xf86-video-voodoo/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-voodoo PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Index: x11-servers/xorg-nestserver/Makefile =================================================================== --- x11-servers/xorg-nestserver/Makefile (revision 321210) +++ x11-servers/xorg-nestserver/Makefile (working copy) @@ -23,6 +23,8 @@ PLIST_FILES= bin/Xnest MAN1= Xnest.1 +.include <bsd.port.options.mk> + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/ .if defined(WITH_NEW_XORG) Index: x11-servers/xorg-server/Makefile =================================================================== --- x11-servers/xorg-server/Makefile (revision 321210) +++ x11-servers/xorg-server/Makefile (working copy) @@ -20,6 +20,16 @@ XORG_CAT= xserver SLAVE_PORT?= no +OPTIONS_DEFINE= AIGLX SUID HAL +AIGLX_DESC= Compile with Accelerated Indirect GLX support +SUID_DESC= Install the Xorg server with setuid bit set +HAL_DESC= Compile with HAL config support +OPTIONS_DEFAULT=AIGLX SUID HAL + +OPTIONS_EXCLUDE_sparc64= HAL + +.include <bsd.port.options.mk> + .if defined(WITH_NEW_XORG) XORG_VERSION= 1.12.4 XORG_REVISION= 0 @@ -75,14 +85,6 @@ PLIST= ${.CURDIR}/pkg-plist .endif -OPTIONS_DEFINE= AIGLX SUID HAL -AIGLX_DESC= Compile with Accelerated Indirect GLX support -SUID_DESC= Install the Xorg server with setuid bit set -HAL_DESC= Compile with HAL config support -OPTIONS_DEFAULT= AIGLX SUID HAL - -OPTIONS_EXCLUDE_sparc64= HAL - .include <bsd.port.pre.mk> .if defined(WITH_OPENSSL_BASE) --------------040604060406000805070101--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?51C0AE69.6090505>