diff options
author | lofi <lofi@FreeBSD.org> | 2007-02-10 20:02:18 +0800 |
---|---|---|
committer | lofi <lofi@FreeBSD.org> | 2007-02-10 20:02:18 +0800 |
commit | dba9a3fef80092f2b1da7e86e80d1f2f70879270 (patch) | |
tree | 88790b2cba5eb5871231a3d1c32e35b5c4ebe448 /x11 | |
parent | bb2c01c742fc17de48915cf32106e588ac5c741e (diff) | |
download | freebsd-ports-gnome-dba9a3fef80092f2b1da7e86e80d1f2f70879270.tar.gz freebsd-ports-gnome-dba9a3fef80092f2b1da7e86e80d1f2f70879270.tar.zst freebsd-ports-gnome-dba9a3fef80092f2b1da7e86e80d1f2f70879270.zip |
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')
-rw-r--r-- | x11/kde4-baseapps/Makefile | 3 | ||||
-rw-r--r-- | x11/kde4-baseapps/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp (renamed from x11/kde4-baseapps/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp) | 0 | ||||
-rw-r--r-- | x11/kde4-runtime/Makefile | 3 | ||||
-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 | ||||
-rw-r--r-- | x11/kde4-workspace/Makefile | 3 | ||||
-rw-r--r-- | x11/kde4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp (renamed from x11/kde4-workspace/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp) | 0 | ||||
-rw-r--r-- | x11/kdebase3/Makefile | 3 | ||||
-rw-r--r-- | x11/kdebase3/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp (renamed from x11/kdebase3/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp) | 0 | ||||
-rw-r--r-- | x11/kdebase4-runtime/Makefile | 3 | ||||
-rw-r--r-- | x11/kdebase4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp (renamed from x11/kdebase4-runtime/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp) | 0 | ||||
-rw-r--r-- | x11/kdebase4-workspace/Makefile | 3 | ||||
-rw-r--r-- | x11/kdebase4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp (renamed from x11/kdebase4-workspace/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp) | 0 | ||||
-rw-r--r-- | x11/kdebase4/Makefile | 3 | ||||
-rw-r--r-- | x11/kdebase4/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp (renamed from x11/kdebase4/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp) | 0 |
14 files changed, 14 insertions, 7 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 993cd069c13b..53cec9a18b5f 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/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-baseapps/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..508019a14f3c 100644 --- a/x11/kde4-baseapps/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp 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 diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 993cd069c13b..53cec9a18b5f 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/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-workspace/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kde4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..508019a14f3c 100644 --- a/x11/kde4-workspace/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kde4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 993cd069c13b..53cec9a18b5f 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/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/kdebase3/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kdebase3/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..508019a14f3c 100644 --- a/x11/kdebase3/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kdebase3/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 993cd069c13b..53cec9a18b5f 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-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/kdebase4-runtime/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..508019a14f3c 100644 --- a/x11/kdebase4-runtime/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 993cd069c13b..53cec9a18b5f 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/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/kdebase4-workspace/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..508019a14f3c 100644 --- a/x11/kdebase4-workspace/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 993cd069c13b..53cec9a18b5f 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/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/kdebase4/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kdebase4/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..508019a14f3c 100644 --- a/x11/kdebase4/files/patch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kdebase4/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp |