summaryrefslogtreecommitdiff
path: root/x11/kde4-runtime
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2007-02-10 12:02:18 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2007-02-10 12:02:18 +0000
commitb8dd42418c1480c7335eab0870a0604bfbb45045 (patch)
tree59dc4e737dbe06150a84a3de0ff64b5c934ed741 /x11/kde4-runtime
parent- Update to 2.0.4 (diff)
Apparently there *are* users that prefer to leave HAL turned off. Avoid
letting them run into a patch error. Noticed by: Grzes <gregorek@gmail.com>
Diffstat (limited to 'x11/kde4-runtime')
-rw-r--r--x11/kde4-runtime/Makefile3
-rw-r--r--x11/kde4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp (renamed from x11/kde4-runtime/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp)0
2 files changed, 2 insertions, 1 deletions
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 993cd069c13b..53cec9a18b5f 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -72,7 +72,8 @@ RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig
.if defined(WITH_HAL) && ${OSVERSION} > 500035
EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \
- ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h
+ ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h \
+ ${FILESDIR}/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp
LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \
hal.1:${PORTSDIR}/sysutils/hal
PLIST_SUB+= MEDIA=""
diff --git a/x11/kde4-runtime/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kde4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp
index 508019a14f3c..508019a14f3c 100644
--- a/x11/kde4-runtime/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp
+++ b/x11/kde4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp