diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2010-05-16 05:47:19 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2010-05-16 05:47:19 +0000 |
| commit | 0f6ef1ad1ce7dc81bfcc9420dbfa50610d590f5c (patch) | |
| tree | be1dceb88c9081be2fc4b179f07cafaab33889f1 /net/kdenetwork4 | |
| parent | 9f4e9f3ef0016c362322dac42ffab52ad9866eb1 (diff) | |
- Allow kppp to be built on FreeBSD < 800074
Noticed by: QAT
Notes
Notes:
svn path=/head/; revision=254393
Diffstat (limited to 'net/kdenetwork4')
| -rw-r--r-- | net/kdenetwork4/Makefile | 5 | ||||
| -rw-r--r-- | net/kdenetwork4/files/extra-patch-CMakeLists.txt | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index b74e775771e3..2ecdb96c2642 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -6,7 +6,7 @@ PORTNAME= kdenetwork PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -46,7 +46,7 @@ MAKE_JOBS_SAFE= yes # Explicitly disable alsa, see for details: # http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html -CMAKE_ARGS+= -DWITH_Alsa:BOOL=OFF +#CMAKE_ARGS+= -DWITH_Alsa:BOOL=OFF # Embedded btcore support already disconnected from the build and outdated CMAKE_ARGS+= -DENABLE_EMBEDDED_TORRENT_SUPPORT=FALSE @@ -67,6 +67,7 @@ OPTIONS= BTCORE "Enable Bittorrent support in KGet" off \ CMAKE_ARGS+= -DBUILD_kppp:BOOL=OFF PLIST_SUB+= KPPP="@comment " .else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-CMakeLists.txt CMAKE_ARGS+= -DBUILD_kppp:BOOL=ON PLIST_SUB+= KPPP="" .endif diff --git a/net/kdenetwork4/files/extra-patch-CMakeLists.txt b/net/kdenetwork4/files/extra-patch-CMakeLists.txt new file mode 100644 index 000000000000..cf3878a68ac2 --- /dev/null +++ b/net/kdenetwork4/files/extra-patch-CMakeLists.txt @@ -0,0 +1,12 @@ +--- ./CMakeLists.txt.orig 2010-03-27 03:29:39.000000000 +1000 ++++ ./CMakeLists.txt 2010-05-16 16:29:43.300835439 +1100 +@@ -78,9 +78,7 @@ + + # kppp is broken on FreeBSD >= 8.0 + # disabling until a fix appears +- if(NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD AND NOT APPLE) + macro_optional_add_subdirectory(kppp) +- endif(NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD AND NOT APPLE) + + if(LIBVNCSERVER_FOUND) + macro_optional_add_subdirectory(krfb) |