aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2015-02-19 08:25:57 +0800
committerjkim <jkim@FreeBSD.org>2015-02-19 08:25:57 +0800
commit3719fb863be60d384dd1cc4d2970e3d0cd62c564 (patch)
treeb2d94c894d1be1d3d9fa735e81ec3998fbc4a174 /emulators
parentd2268ebd15d95eee1a9758ed6f6f2d530531f2e7 (diff)
downloadfreebsd-ports-gnome-3719fb863be60d384dd1cc4d2970e3d0cd62c564.tar.gz
freebsd-ports-gnome-3719fb863be60d384dd1cc4d2970e3d0cd62c564.tar.zst
freebsd-ports-gnome-3719fb863be60d384dd1cc4d2970e3d0cd62c564.zip
Make the previous patch conditional as we always did.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/virtualbox-ose-additions/Makefile3
-rw-r--r--emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h (renamed from emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h)0
2 files changed, 2 insertions, 1 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index f910bdf7424c..6f6eaeb0d22e 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -106,7 +106,8 @@ KMK_ARCH= freebsd.${ARCH}
.if ${COMPILER_TYPE} == clang
EXTRA_PATCHES= ${PATCHDIR}/extrapatch-Config.kmk \
- ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
+ ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk \
+ ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
.if ${COMPILER_FEATURES:Mlibc++}
EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
.endif
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
index 90db3b3cfeda..90db3b3cfeda 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
+++ b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h