Fix the PORTREVISION bump for the lang/gcc update that went badly for

ports (x11-drivers plus graphics/libGL plus x11-servers/xorg-server)
that handle PORTREVISION in a creative manner hardly lending itself
to any form of automated bumping.

PR:		192025
Reported by:	Scott Allendorf <scott-allendorf@uiowa.edu>

8 files changed, 24 insertions, 24 deletions

diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index 12d10b63c7ba..2da350f435f6 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-elographics
 PORTVERSION=	${ELO_VERSION}
-PORTREVISION=	1
+PORTREVISION=	${ELO_REVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,10 +14,10 @@ XORG_CAT=	driver
 
 .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 <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index f63b98d57921..3e329eca89db 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-hyperpen
 PORTVERSION=	${HYPERVER}
-PORTREVISION=	1
+PORTREVISION=	${HYPERREVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,10 +14,10 @@ XORG_CAT=	driver
 
 .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
 
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 392371060f6f..d68cde4a70d0 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-joystick
 PORTVERSION=	${JOYVER}
-PORTREVISION=	1
+PORTREVISION=	${JOYREVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,10 +14,10 @@ XORG_CAT=	driver
 
 .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:
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index 673e51d0908a..c29c1d501019 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-penmount
 PORTVERSION=	${PEN_VERSION}
-PORTREVISION=	1
+PORTREVISION=	${PEN_REVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,10 +14,10 @@ XORG_CAT=	driver
 
 .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 <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index c4da52990262..cd070ccbee43 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-synaptics
 PORTVERSION=	${SYNAPTICS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	${SYNAPTICS_REVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -18,11 +18,11 @@ XORG_CAT=	driver
 
 .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
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index b9884c118018..233f11427bab 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-void
 PORTVERSION=	${VOID_VERSION}
-PORTREVISION=	1
+PORTREVISION=	${VOID_REVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,10 +14,10 @@ XORG_CAT=	driver
 
 .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 <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index ec1654b3ae28..f63209decb27 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-ati
 PORTVERSION=	${ATI_VERSION}
-PORTREVISION=	1
+PORTREVISION=	${ATI_REVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -40,12 +40,12 @@ NEW_ATI_DRIVER=	no
 
 .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
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index f66096744383..e8b1a4627963 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-intel
 PORTVERSION=	${INTEL_VERSION}
-PORTREVISION=	1
+PORTREVISION=	${INTEL_REVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -27,7 +27,7 @@ USE_XORG=	glproto \
 
 .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
@@ -39,7 +39,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-src__sna__sna_threads.c \
 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 \