1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

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>
This commit is contained in:
Gerald Pfeifer 2014-09-12 00:01:23 +00:00
parent d082bac3c2
commit 0abc164359
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=367997
10 changed files with 30 additions and 30 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= libGL
PORTVERSION= ${MESAVERSION}
PORTREVISION= 1
PORTREVISION= ${LIBGLREVISION}
CATEGORIES= graphics
COMMENT= OpenGL library that renders using GLX or DRI
@ -19,10 +19,10 @@ SUB_FILES= pkg-install pkg-deinstall
.include <bsd.port.options.mk>
.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"

View File

@ -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>

View File

@ -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

View File

@ -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:

View File

@ -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>

View File

@ -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

View File

@ -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>

View File

@ -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

View File

@ -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 \

View File

@ -3,7 +3,7 @@
PORTNAME?= xorg-server
PORTVERSION= ${XORG_VERSION}
PORTREVISION?= 1
PORTREVISION?= ${XORG_REVISION}
PORTEPOCH?= 1
CATEGORIES= x11-servers
MASTER_SITES= XORG
@ -35,7 +35,7 @@ OPTIONS_EXCLUDE_sparc64= HAL
.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 \
@ -43,7 +43,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-clang \
${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 \