diff options
| author | makc <makc@FreeBSD.org> | 2009-08-10 19:47:36 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2009-08-10 19:47:36 +0800 |
| commit | 535fdd55d1e1a1c33b3cf476095fc0ca55a2fa2a (patch) | |
| tree | acc82b024802c87837dd90521b3991bd7c3b2ce5 /x11/kde4-workspace | |
| parent | 0f3e4afecbce328fa8a996731b691e68dbaef539 (diff) | |
| download | freebsd-ports-gnome-535fdd55d1e1a1c33b3cf476095fc0ca55a2fa2a.tar.gz freebsd-ports-gnome-535fdd55d1e1a1c33b3cf476095fc0ca55a2fa2a.tar.zst freebsd-ports-gnome-535fdd55d1e1a1c33b3cf476095fc0ca55a2fa2a.zip | |
Mk/bsd.kde4.mk:
- rework KDE4_BUILDENV
All ports:
- remove needless post-extract target
- make patches relative to ${PATCH_WRKSRC}
- clean up
- bump PORTREVISION when required
databases/akonadi:
- replace dependency on boost-python-libs with boost-libs
(finally, boost-pyhton does not conflict with boost \o/)
deskutils/kdepim*:
- replace boost-python-libs with boost-libs
- reduce dependencies
- respect PREFIX
- fix build with qt3 installed
misc/kdeedu4:
- add dependency on astro/xplanet (for KStars)
misc/kdeutils4:
- add dependency on devel/qca (for okteta)
- make dependency on kdebase non-optional
multimedia/kdemultimedia4:
- add optional support for PulseAudio
x11/kdebase4:
- remove needless dependency on kdebase4-runtime
x11/kdebase4-runtime, x11/kdebase4-workspace
- remove extra CMAKE_ARGS to fix build for qt3/kde3 users
x11/kdelibs4
- remove needless dependencies
- remove extra CMAKE_ARGS to fix build for qt3/kde3 users
Diffstat (limited to 'x11/kde4-workspace')
12 files changed, 32 insertions, 37 deletions
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 0f2e48931d26..337edf9ce630 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -46,12 +46,10 @@ QT_COMPONENTS= assistant corelib dbus designer gui network opengl \ USE_GETTEXT= yes USE_ICONV= yes MAKE_JOBS_SAFE= yes -MAN1= plasmaengineexplorer.1 + +MAN1= plasmaengineexplorer.1 CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ - -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \ - -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DWITH_BlueZ:BOOL=OFF \ -DWITH_Sensors:BOOL=OFF \ -DWITH_NetworkManager:BOOL=OFF \ @@ -68,28 +66,25 @@ CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - ${WRKSRC}/../startkde.cmake \ - ${WRKSRC}/../kcontrol/kfontinst/lib/KfiConstants.h \ - ${WRKSRC}/../kcontrol/kfontinst/kio/KioFonts.cpp \ - ${WRKSRC}/../kcontrol/kxkb/x11helper.cpp \ - ${WRKSRC}/../kdm/kfrontend/genkdmconf.c + ${PATCH_WRKSRC}/startkde.cmake \ + ${PATCH_WRKSRC}/kcontrol/kfontinst/lib/KfiConstants.h \ + ${PATCH_WRKSRC}/kcontrol/kfontinst/kio/KioFonts.cpp \ + ${PATCH_WRKSRC}/kcontrol/kxkb/x11helper.cpp \ + ${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c pre-configure: ${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|'\ - ${WRKSRC}/../kwin/effects/thumbnailaside/thumbnailaside.h + ${PATCH_WRKSRC}/kwin/effects/thumbnailaside/thumbnailaside.h .for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp\ laptop/laptopclient.cpp modernsystem/modernsys.cpp\ redmond/redmond.cpp ${REINPLACE_CMD} -e 's|<qdrawutil.h>|<QtGui/qdrawutil.h>|'\ - ${WRKSRC}/../kwin/clients/${item} + ${PATCH_WRKSRC}/kwin/clients/${item} ${REINPLACE_CMD} -e 's|addToUtmp ""|addToUtmp "${LOCALBASE}/lib"|' \ -e 's|(utempter.h|(${LOCALBASE}/include/utempter.h|' \ - ${WRKSRC}/../kwrited/CMakeLists.txt + ${PATCH_WRKSRC}/kwrited/CMakeLists.txt .endfor post-install: diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt index 25851f037692..b0a9a4744f7e 100644 --- a/x11/kde4-workspace/files/patch-CMakeLists.txt +++ b/x11/kde4-workspace/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../CMakeLists.txt.orig 2009-01-01 19:26:09.000000000 +0300 -+++ ../CMakeLists.txt 2009-03-07 10:02:36.000000000 +0300 +--- ./CMakeLists.txt.orig 2009-01-01 19:26:09.000000000 +0300 ++++ ./CMakeLists.txt 2009-03-07 10:02:36.000000000 +0300 @@ -220,7 +220,7 @@ macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH}) diff --git a/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp b/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp index 78ebf36725c6..15eec2aa583d 100644 --- a/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp +++ b/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp @@ -1,5 +1,5 @@ ---- ../kcontrol/keyboard/kcmmisc.cpp.orig 2008-04-02 08:18:22.000000000 -0400 -+++ ../kcontrol/keyboard/kcmmisc.cpp 2008-07-07 14:02:16.000000000 -0400 +--- ./kcontrol/keyboard/kcmmisc.cpp.orig 2008-04-02 08:18:22.000000000 -0400 ++++ ./kcontrol/keyboard/kcmmisc.cpp 2008-07-07 14:02:16.000000000 -0400 @@ -505,8 +505,10 @@ diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt b/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt index d7654a8cbd5c..45f403dd292c 100644 --- a/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt +++ b/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../kdm/kfrontend/CMakeLists.txt.orig 2008-07-30 17:02:54.000000000 +0300 -+++ ../kdm/kfrontend/CMakeLists.txt 2008-07-30 17:03:26.000000000 +0300 +--- ./kdm/kfrontend/CMakeLists.txt.orig 2008-07-30 17:02:54.000000000 +0300 ++++ ./kdm/kfrontend/CMakeLists.txt 2008-07-30 17:03:26.000000000 +0300 @@ -108,6 +108,6 @@ build_confci() diff --git a/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp b/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp index a6bdc04d66b8..b08046ff9014 100644 --- a/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp +++ b/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp @@ -1,5 +1,5 @@ ---- ../ksmserver/fadeeffect.cpp.ori 2008-07-22 00:15:47.000000000 +0200 -+++ ../ksmserver/fadeeffect.cpp 2008-07-22 00:16:13.000000000 +0200 +--- ./ksmserver/fadeeffect.cpp.ori 2008-07-22 00:15:47.000000000 +0200 ++++ ./ksmserver/fadeeffect.cpp 2008-07-22 00:16:13.000000000 +0200 @@ -58,7 +58,7 @@ #include "fadeeffect.moc" diff --git a/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd b/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd index efe4fd885e93..1b7b451570db 100644 --- a/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd +++ b/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd @@ -1,5 +1,5 @@ ---- ../ksysguard/gui/SystemLoad2.sgrd.orig 2009-06-09 18:07:55.000000000 +0200 -+++ ../ksysguard/gui/SystemLoad2.sgrd 2009-07-03 09:35:29.000000000 +0200 +--- ./ksysguard/gui/SystemLoad2.sgrd.orig 2009-06-09 18:07:55.000000000 +0200 ++++ ./ksysguard/gui/SystemLoad2.sgrd 2009-07-03 09:35:29.000000000 +0200 @@ -3,7 +3,7 @@ <WorkSheet title="System Load" interval="0.5" locked="1" rows="3" columns="1" > <host port="-1" command="ksysguardd" shell="" name="localhost" /> diff --git a/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc b/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc index a112710f60ff..951988f978b5 100644 --- a/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc +++ b/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc @@ -1,5 +1,5 @@ ---- ../ksysguard/gui/ksgrd/SensorManager.cc.orgi 2009-01-22 23:54:35.000000000 +0100 -+++ ../ksysguard/gui/ksgrd/SensorManager.cc 2009-01-22 23:54:52.000000000 +0100 +--- ./ksysguard/gui/ksgrd/SensorManager.cc.orgi 2009-01-22 23:54:35.000000000 +0100 ++++ ./ksysguard/gui/ksgrd/SensorManager.cc 2009-01-22 23:54:52.000000000 +0100 @@ -61,6 +61,7 @@ mDict.insert( QLatin1String( "nice" ), i18n( "Nice Load" ) ); mDict.insert( QLatin1String( "user" ), i18n( "User Load" ) ); diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c index 978857c88f17..e2aa9fc7591d 100644 --- a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c +++ b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c @@ -1,5 +1,5 @@ ---- ../ksysguard/ksysguardd/FreeBSD/CPU.c.orig 2008-01-05 00:55:46.000000000 +0100 -+++ ../ksysguard/ksysguardd/FreeBSD/CPU.c 2009-02-03 20:54:08.000000000 +0100 +--- ./ksysguard/ksysguardd/FreeBSD/CPU.c.orig 2008-01-05 00:55:46.000000000 +0100 ++++ ./ksysguard/ksysguardd/FreeBSD/CPU.c 2009-02-03 20:54:08.000000000 +0100 @@ -49,11 +49,12 @@ struct kinfo_cputime *); static struct kinfo_cputime cp_time, cp_old; diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h index df52f95fab38..87896f1d25eb 100644 --- a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h +++ b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h @@ -1,5 +1,5 @@ ---- ../ksysguard/ksysguardd/FreeBSD/CPU.h.orig 2008-01-05 00:55:46.000000000 +0100 -+++ ../ksysguard/ksysguardd/FreeBSD/CPU.h 2009-02-03 16:26:12.000000000 +0100 +--- ./ksysguard/ksysguardd/FreeBSD/CPU.h.orig 2008-01-05 00:55:46.000000000 +0100 ++++ ./ksysguard/ksysguardd/FreeBSD/CPU.h 2009-02-03 16:26:12.000000000 +0100 @@ -35,6 +35,10 @@ void printCPUNiceInfo(const char* cmd); void printCPUSys(const char* cmd); diff --git a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp index cbcfad414d0e..946eb9395aae 100644 --- a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp +++ b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp @@ -1,5 +1,5 @@ ---- ../kwin/kcmkwin/kwinrules/ruleswidget.cpp.orgi 2008-01-30 00:38:06.000000000 +0100 -+++ ../kwin/kcmkwin/kwinrules/ruleswidget.cpp 2008-01-30 00:38:38.000000000 +0100 +--- ./kwin/kcmkwin/kwinrules/ruleswidget.cpp.orgi 2008-01-30 00:38:06.000000000 +0100 ++++ ./kwin/kcmkwin/kwinrules/ruleswidget.cpp 2008-01-30 00:38:38.000000000 +0100 @@ -30,6 +30,7 @@ #include <assert.h> diff --git a/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt b/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt index 1de4d0ae85d0..d9b0efedd656 100644 --- a/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt +++ b/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../libs/ksysguard/processui/CMakeLists.txt.orig 2008-06-18 16:41:37.000000000 +0400 -+++ ../libs/ksysguard/processui/CMakeLists.txt 2008-06-28 13:56:54.000000000 +0400 +--- ./libs/ksysguard/processui/CMakeLists.txt.orig 2008-06-18 16:41:37.000000000 +0400 ++++ ./libs/ksysguard/processui/CMakeLists.txt 2008-06-28 13:56:54.000000000 +0400 @@ -1,7 +1,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../ ../processcore/) diff --git a/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt b/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt index 770d2cf432ce..de32b4591cdf 100644 --- a/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt +++ b/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../libs/ksysguard/CMakeLists.txt.orig 2008-04-10 13:30:14.000000000 +0400 -+++ ../libs/ksysguard/CMakeLists.txt 2008-06-28 14:04:29.000000000 +0400 +--- ./libs/ksysguard/CMakeLists.txt.orig 2008-04-10 13:30:14.000000000 +0400 ++++ ./libs/ksysguard/CMakeLists.txt 2008-06-28 14:04:29.000000000 +0400 @@ -5,7 +5,7 @@ add_subdirectory( processui ) add_subdirectory( tests ) |