diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2013-06-27 18:38:27 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2013-06-27 18:38:27 +0000 |
| commit | 927cfacb14557f2e333ccdc083c9e4604f547eb3 (patch) | |
| tree | e43f568b930ad5bbc0f35bb020c2ac39217c4cfd /x11-servers | |
| parent | fe33b412f0e166ec865d79ca976ea9e3d6967395 (diff) | |
Notes
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 5 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c (renamed from x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c) | 0 |
2 files changed, 3 insertions, 2 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 6315d00f6da4..692d1d3cbca2 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -22,7 +22,7 @@ SLAVE_PORT?= no .if defined(WITH_NEW_XORG) XORG_VERSION= 1.12.4 -XORG_REVISION= 0 +XORG_REVISION= 1 PLIST_SUB+= OLD="@comment " NEW="" EXTRA_PATCHES+= ${FILESDIR}/extra-clang .else @@ -35,7 +35,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-Xext-xace.c \ ${FILESDIR}/extra-include_eventstr.h \ ${FILESDIR}/extra-os-utils.c \ ${FILESDIR}/extra-servermd.h \ - ${FILESDIR}/extra-dix_events.c + ${FILESDIR}/extra-dix_events.c \ + ${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c .endif USE_BZIP2= yes diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c index 59aad379ae11..59aad379ae11 100644 --- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c +++ b/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c |