Index: head/graphics/libGL/Makefile =================================================================== --- head/graphics/libGL/Makefile (revision 367996) +++ head/graphics/libGL/Makefile (revision 367997) @@ -1,47 +1,47 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME= libGL PORTVERSION= ${MESAVERSION} -PORTREVISION= 1 +PORTREVISION= ${LIBGLREVISION} CATEGORIES= graphics COMMENT= OpenGL library that renders using GLX or DRI LIB_DEPENDS+= libdrm.so:${PORTSDIR}/graphics/libdrm \ libexpat.so:${PORTSDIR}/textproc/expat2 USES= pkgconfig USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both SUB_FILES= pkg-install pkg-deinstall .include .if defined(WITH_NEW_XORG) -LIBGLREVISION= 1 +LIBGLREVISION= 2 LIB_DEPENDS+= libglapi.so:${PORTSDIR}/graphics/libglapi .else -LIBGLREVISION= 4 +LIBGLREVISION= 5 .endif .include "${.CURDIR}/bsd.mesalib.mk" .if !(${ARCH} == "amd64" || ${ARCH} == "i386") CONFIGURE_ARGS+=--disable-gallium-intel .endif post-install: ${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dri.pc ${RM} -rf ${STAGEDIR}${PREFIX}/include/GL/internal .if defined(WITH_NEW_XORG) @${MKDIR} ${STAGEDIR}${PREFIX}/lib/.libGL @${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \ ${STAGEDIR}${PREFIX}/lib/.libGL/ ${RM} ${STAGEDIR}${PREFIX}/lib/libglapi* .else ${RM} ${STAGEDIR}${PREFIX}/include/GL/glu.h ${RM} ${STAGEDIR}${PREFIX}/include/GL/glu_mangle.h .endif .include Index: head/x11-drivers/xf86-input-elographics/Makefile =================================================================== --- head/x11-drivers/xf86-input-elographics/Makefile (revision 367996) +++ head/x11-drivers/xf86-input-elographics/Makefile (revision 367997) @@ -1,23 +1,23 @@ # $FreeBSD$ PORTNAME= xf86-input-elographics PORTVERSION= ${ELO_VERSION} -PORTREVISION= 1 +PORTREVISION= ${ELO_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org elographics input driver XORG_CAT= driver .include .if defined(WITH_NEW_XORG) ELO_VERSION= 1.4.1 -ELO_REVISION= 1 +ELO_REVISION= 2 .else ELO_VERSION= 1.2.4 -ELO_REVISION= 1 +ELO_REVISION= 2 .endif .include Index: head/x11-drivers/xf86-input-hyperpen/Makefile =================================================================== --- head/x11-drivers/xf86-input-hyperpen/Makefile (revision 367996) +++ head/x11-drivers/xf86-input-hyperpen/Makefile (revision 367997) @@ -1,24 +1,24 @@ # $FreeBSD$ PORTNAME= xf86-input-hyperpen PORTVERSION= ${HYPERVER} -PORTREVISION= 1 +PORTREVISION= ${HYPERREVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org hyperpen input driver XORG_CAT= driver .include .if defined(WITH_NEW_XORG) HYPERVER= 1.4.1 -HYPERREVISION= 1 +HYPERREVISION= 2 .else HYPERVER= 1.3.0 -HYPERREVISION= 7 +HYPERREVISION= 8 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c .endif .include Index: head/x11-drivers/xf86-input-joystick/Makefile =================================================================== --- head/x11-drivers/xf86-input-joystick/Makefile (revision 367996) +++ head/x11-drivers/xf86-input-joystick/Makefile (revision 367997) @@ -1,27 +1,27 @@ # $FreeBSD$ PORTNAME= xf86-input-joystick PORTVERSION= ${JOYVER} -PORTREVISION= 1 +PORTREVISION= ${JOYREVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org joystick input driver XORG_CAT= driver .include .if defined(WITH_NEW_XORG) JOYVER= 1.6.2 -JOYREVISION= 1 +JOYREVISION= 2 .else JOYVER= 1.5.0 -JOYREVISION= 2 +JOYREVISION= 3 .endif post-patch: @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile.in .include Index: head/x11-drivers/xf86-input-penmount/Makefile =================================================================== --- head/x11-drivers/xf86-input-penmount/Makefile (revision 367996) +++ head/x11-drivers/xf86-input-penmount/Makefile (revision 367997) @@ -1,23 +1,23 @@ # $FreeBSD$ PORTNAME= xf86-input-penmount PORTVERSION= ${PEN_VERSION} -PORTREVISION= 1 +PORTREVISION= ${PEN_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org penmount input driver XORG_CAT= driver .include .if defined(WITH_NEW_XORG) PEN_VERSION= 1.5.0 -PEN_REVISION= 1 +PEN_REVISION= 2 .else PEN_VERSION= 1.4.1 -PEN_REVISION= 2 +PEN_REVISION= 3 .endif .include Index: head/x11-drivers/xf86-input-synaptics/Makefile =================================================================== --- head/x11-drivers/xf86-input-synaptics/Makefile (revision 367996) +++ head/x11-drivers/xf86-input-synaptics/Makefile (revision 367997) @@ -1,30 +1,30 @@ # $FreeBSD$ PORTNAME= xf86-input-synaptics PORTVERSION= ${SYNAPTICS_VERSION} -PORTREVISION= 1 +PORTREVISION= ${SYNAPTICS_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org synaptics input driver CONFLICTS= synaptics-[0-9]* USES= pathfix USE_XORG= x11 xtst XORG_CAT= driver .include .if defined(WITH_NEW_XORG) SYNAPTICS_VERSION= 1.7.4 -SYNAPTICS_REVISION= 1 +SYNAPTICS_REVISION= 2 PLIST_SUB+= NEW="" OLD="@comment " .else SYNAPTICS_VERSION= 1.6.4 -SYNAPTICS_REVISION= 1 +SYNAPTICS_REVISION= 2 PLIST_SUB+= NEW="@comment " OLD="" EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in .endif .include Index: head/x11-drivers/xf86-input-void/Makefile =================================================================== --- head/x11-drivers/xf86-input-void/Makefile (revision 367996) +++ head/x11-drivers/xf86-input-void/Makefile (revision 367997) @@ -1,23 +1,23 @@ # $FreeBSD$ PORTNAME= xf86-input-void PORTVERSION= ${VOID_VERSION} -PORTREVISION= 1 +PORTREVISION= ${VOID_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org void input driver XORG_CAT= driver .include .if defined(WITH_NEW_XORG) VOID_VERSION= 1.4.0 -VOID_REVISION= 1 +VOID_REVISION= 2 .else VOID_VERSION= 1.3.1 -VOID_REVISION= 1 +VOID_REVISION= 2 .endif .include Index: head/x11-drivers/xf86-video-ati/Makefile =================================================================== --- head/x11-drivers/xf86-video-ati/Makefile (revision 367996) +++ head/x11-drivers/xf86-video-ati/Makefile (revision 367997) @@ -1,55 +1,55 @@ # $FreeBSD$ PORTNAME= xf86-video-ati PORTVERSION= ${ATI_VERSION} -PORTREVISION= 1 +PORTREVISION= ${ATI_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org ati display driver USE_GL= gl XORG_CAT= driver USE_XORG= xf86driproto xineramaproto xf86miscproto glproto .include .if (${OSVERSION} >= 902508 && ${OSVERSION} < 1000000) || ${OSVERSION} >= 1000051 # 902508: Radeon kernel driver imported in FreeBSD 9.x # 1000051: Radeon kernel driver imported in FreeBSD 10.x . if defined(WITH_NEW_XORG) NEW_ATI_DRIVER= yes . else NEW_ATI_DRIVER= no . endif .else # FreeBSD < 902508 doesn't have the Radeon kernel driver. No need to # check for WITH_NEW_XORG. But we do support a flag to force the usage # of the KMS-only DDX: this is used by the build cluster only. . if defined(FORCE_KMS_ONLY_DDX) NEW_ATI_DRIVER= yes . else NEW_ATI_DRIVER= no . endif .endif .if (${ARCH} != i386 && ${ARCH} != amd64) # No Radeon kernel driver on non-x86 and PC98. NEW_ATI_DRIVER= no .endif .if ${NEW_ATI_DRIVER} == no ATI_VERSION= 6.14.6 -ATI_REVISION= 3 +ATI_REVISION= 4 CONFIGURE_ARGS+=--disable-kms PLIST_SUB+= OLD="" .else ATI_VERSION= 7.2.0 -ATI_REVISION= 3 +ATI_REVISION= 4 CONFIGURE_ARGS+=--disable-udev CONFIGURE_ARGS+=--disable-glamor EXTRA_PATCHES+= ${FILESDIR}/extra-src__radeon_kms.c PLIST_SUB+= OLD="@comment " .endif .include Index: head/x11-drivers/xf86-video-intel/Makefile =================================================================== --- head/x11-drivers/xf86-video-intel/Makefile (revision 367996) +++ head/x11-drivers/xf86-video-intel/Makefile (revision 367997) @@ -1,70 +1,70 @@ # Created by: lesi@FreeBSD.org # $FreeBSD$ PORTNAME= xf86-video-intel PORTVERSION= ${INTEL_VERSION} -PORTREVISION= 1 +PORTREVISION= ${INTEL_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= Driver for Intel integrated graphics chipsets ONLY_FOR_ARCHS= amd64 i386 USE_GL= gl USE_LDCONFIG= yes XORG_CAT= driver USE_XORG= glproto \ pixman \ x11 \ xext \ xf86driproto \ xineramaproto \ xrender \ xvmc .include .if defined(WITH_NEW_XORG) INTEL_VERSION= 2.21.15 -INTEL_REVISION= 3 +INTEL_REVISION= 4 CONFIGURE_ENV+= xorg_cv_cc_flag__Wno_maybe_uninitialized=no CONFIGURE_ARGS+= --enable-sna CONFIGURE_ARGS+= --disable-glamor PLIST_SUB+= OLD="@comment " EXTRA_PATCHES+= ${PATCHDIR}/extra-src__sna__sna_threads.c \ ${PATCHDIR}/extra-src_sna_kgem.c \ ${PATCHDIR}/extra-clang \ ${PATCHDIR}/extra-i915kms LIB_DEPENDS+= libxcb-util.so:${PORTSDIR}/x11/xcb-util .else INTEL_VERSION= 2.7.1 -INTEL_REVISION= 8 +INTEL_REVISION= 9 PLIST_SUB+= OLD="" EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \ ${PATCHDIR}/extra-src_i830_render.c \ ${PATCHDIR}/extra-src_ch7xxx_ch7xxx.c \ ${PATCHDIR}/extra-src_i830_video.c \ ${PATCHDIR}/extra-src_i810_driver.c \ ${PATCHDIR}/extra-src_i915_hwmc.c \ ${PATCHDIR}/extra-src_i810_hwmc.c \ ${PATCHDIR}/extra-src_i915_render.c \ ${PATCHDIR}/extra-src_i810_video.c \ ${PATCHDIR}/extra-src_i965_render.c \ ${PATCHDIR}/extra-src_i830_dri.c \ ${PATCHDIR}/extra-src_ivch_ivch.c \ ${PATCHDIR}/extra-src_i830_driver.c \ ${PATCHDIR}/extra-src_sil164_sil164.c \ ${PATCHDIR}/extra-src_i830_dvo.c \ ${PATCHDIR}/extra-src_tfp410_tfp410.c \ ${PATCHDIR}/extra-src_i830_i2c.c \ ${PATCHDIR}/extra-uxa_uxa-priv.h .endif post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIntelXvMC.so.1 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libI810XvMC.so.1 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/drivers/intel_drv.so .include Index: head/x11-servers/xorg-server/Makefile =================================================================== --- head/x11-servers/xorg-server/Makefile (revision 367996) +++ head/x11-servers/xorg-server/Makefile (revision 367997) @@ -1,204 +1,204 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME?= xorg-server PORTVERSION= ${XORG_VERSION} -PORTREVISION?= 1 +PORTREVISION?= ${XORG_REVISION} PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG MASTER_SITE_SUBDIR= individual/xserver DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm RUN_DEPENDS= xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \ xkbcomp:${PORTSDIR}/x11/xkbcomp XORG_CAT= xserver SLAVE_PORT?= no OPTIONS_DEFINE= AIGLX SUID OPTIONS_RADIO= CONF OPTIONS_RADIO_CONF= HAL DEVD 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 DEVD_DESC= Use devd for autoconfiguration of input devices (experimental) OPTIONS_DEFAULT=AIGLX SUID HAL OPTIONS_EXCLUDE_sparc64= HAL .include .if defined(WITH_NEW_XORG) XORG_VERSION= 1.12.4 -XORG_REVISION= 8 +XORG_REVISION= 9 PLIST_SUB+= OLD="@comment " NEW="" EXTRA_PATCHES+= ${FILESDIR}/extra-clang \ ${FILESDIR}/extra-configure \ ${FILESDIR}/extra-new-bad-impl \ ${FILESDIR}/extra-new-dix_dixfonts.c .else XORG_VERSION= 1.7.7 -XORG_REVISION= 13 +XORG_REVISION= 14 PLIST_SUB+= OLD="" NEW="@comment " EXTRA_PATCHES+= ${FILESDIR}/extra-Xext-xace.c \ ${FILESDIR}/extra-Xserver-os-xprintf.c \ ${FILESDIR}/extra-include_eventstr.h \ ${FILESDIR}/extra-os-utils.c \ ${FILESDIR}/extra-dix_events.c \ ${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c \ ${FILESDIR}/extra-old-dix_dixfonts.c .endif USES= gmake libtool:keepla perl5 tar:bzip2 USE_PERL5= build USE_GL= gl USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ xmu xt xpm xext randrproto renderproto fixesproto damageproto \ dri2proto xcmiscproto xextproto xproto xtrans xf86miscproto \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ resourceproto fontsproto inputproto xf86dgaproto \ videoproto compositeproto trapproto recordproto xineramaproto \ xinerama evieproto xfont fontenc xkbui pixman pciaccess USE_OPENSSL= yes CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \ --without-xmlto --disable-docs --disable-devel-docs \ --localstatedir=/var --without-dtrace --disable-xephyr \ --enable-record=yes INSTALL_TARGET= install-strip .if ${SLAVE_PORT} == "no" SUB_FILES= pkg-install pkg-deinstall .else # for slave ports we need to overwrite PLIST, so it doesn't overwrite # PLIST_FILES, with the masterport plist. PLIST= ${.CURDIR}/pkg-plist .endif .include .if defined(WITH_OPENSSL_BASE) # The reason why I use this is cause openssl from base doesn't install a .pc file # and configure will fail trying to find it. Setting both of those variables to # a *non-empty* value by-passes the pkg-config check. CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif .if ${PORT_OPTIONS:MHAL} LIB_DEPENDS+= libhal.so:${PORTSDIR}/sysutils/hal CONFIGURE_ARGS+= --enable-config-hal=yes .else CONFIGURE_ARGS+= --enable-config-hal=no .endif .if ${PORT_OPTIONS:MDEVD} EXTRA_PATCHES+= ${FILESDIR}/extra-config_devd.c .endif .if ${PORT_OPTIONS:MAIGLX} CONFIGURE_ARGS+= --enable-aiglx=yes .else CONFIGURE_ARGS+= --enable-aiglx=no .endif # We handle Xorg setuid in the plist. This allows to build xorg-server as a user CONFIGURE_ARGS+=--enable-install-setuid=no .if ${PORT_OPTIONS:MSUID} PLIST_SUB+= SUID="" .else PLIST_SUB+= SUID="@comment " .endif .if ${ARCH} == i386 .if defined(WITH_NEW_XORG) EXTRA_PATCHES+= ${FILESDIR}/extra-new-arch-i386 .else EXTRA_PATCHES+= ${FILESDIR}/extra-old-arch-i386 .endif .endif .if ${ARCH} == ia64 PLIST_SUB+= IA64_NA="@comment " EXTRA_PATCHES+= ${.CURDIR}/files/extra-arch-ia64 .else PLIST_SUB+= IA64_NA="" .endif .if ${ARCH} == powerpc || ${ARCH} == powerpc64 PLIST_SUB+= PPC_NA="@comment " .if defined(WITH_NEW_XORG) EXTRA_PATCHES+= ${.CURDIR}/files/extra-new-arch-powerpc .else EXTRA_PATCHES+= ${.CURDIR}/files/extra-old-arch-powerpc .endif .else PLIST_SUB+= PPC_NA="" .endif .if ${ARCH} == sparc64 PLIST_SUB+= SPARC64="" PLIST_SUB+= SPARC64_NA="@comment " .if defined(WITH_NEW_XORG) EXTRA_PATCHES+= ${FILESDIR}/extra-new-arch-sparc64 .else EXTRA_PATCHES+= ${FILESDIR}/extra-old-arch-sparc64 .endif .else PLIST_SUB+= SPARC64="@comment " PLIST_SUB+= SPARC64_NA="" .endif .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == sparc64 PLIST_SUB+= AMD64_I386_SPARC64="" .else PLIST_SUB+= AMD64_I386_SPARC64="@comment " .endif .if ${PORT_OPTIONS:MSUID} pre-everything:: @${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by" @${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper" @${ECHO_MSG} "port before handling them normally. If you are concerned about the security" @${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm," @${ECHO_MSG} "which will still run the server as root), you can cancel the build and set" @${ECHO_MSG} "xorg-server_UNSET=SUID in /etc/make.conf." .endif post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure # build libglx.so but don't install it yet. which is done in pre-install. @${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =|@GLX_BOGUS@GLXMODS =|g' \ -e 's|^LTLIBRARIES = |LTLIBRARIES = libglx.la |g' \ ${WRKSRC}/hw/xfree86/dixmods/Makefile.in .if ${PORT_OPTIONS:MDEVD} @${ECHO_CMD} -e "\nint config_devd_init(void);\nvoid config_devd_fini(void);" \ >> ${WRKSRC}/config/config-backends.h .endif post-configure: .if ${PORT_OPTIONS:MDEVD} @${REINPLACE_CMD} -e 's|config\.c|config.c devd.c|g' \ -e 's|config\.lo|config.lo devd.lo|g' \ ${WRKSRC}/config/Makefile .endif .if ${SLAVE_PORT} == "no" post-install: # The .xorg dir because else the xorg-server might not load the correct # libglx module. ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg ${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \ ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/ .if defined(WITH_NEW_XORG) @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d .endif .endif # ! SLAVE_PORT .include