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 | |
| parent | 0f3e4afecbce328fa8a996731b691e68dbaef539 (diff) | |
| download | freebsd-ports-graphics-535fdd55d1e1a1c33b3cf476095fc0ca55a2fa2a.tar.gz freebsd-ports-graphics-535fdd55d1e1a1c33b3cf476095fc0ca55a2fa2a.tar.zst freebsd-ports-graphics-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
113 files changed, 418 insertions, 540 deletions
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index d71360a67e0..c30e3f5e9e6 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -131,14 +131,15 @@ PLIST_SUB+= KDE4_VERSION="${KDE4_VERSION}" \ USE_LDCONFIG= yes USE_CMAKE= yes -# TODO: bsd.cmake.mk should be fixed first -# CMAKE_SOURCE_PATH= ${WRKSRC} -# CONFIGURE_WRKSRC?= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/build -# BUILD_WRKSRC?= ${CONFIGURE_WRKSRC} -# INSTALL_WRKSRC?= ${CONFIGURE_WRKSRC} - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/build -CMAKE_SOURCE_PATH= .. +CMAKE_SOURCE_PATH= ${WRKSRC} +CONFIGURE_WRKSRC?= ${BUILD_WRKSRC} +BUILD_WRKSRC?= ${WRKSRC}/build +INSTALL_WRKSRC?= ${BUILD_WRKSRC} + +post-extract: kde-create-builddir + +kde-create-builddir: + ${MKDIR} ${BUILD_WRKSRC} .endif # KDE4_BUILDENV diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile index 5875308d23d..f4994e39772 100644 --- a/accessibility/kaccessible/Makefile +++ b/accessibility/kaccessible/Makefile @@ -30,7 +30,4 @@ MAN1= kmag.1 \ kmousetool.1 \ kmouth.1 -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.mk> diff --git a/accessibility/kdeaccessibility4/Makefile b/accessibility/kdeaccessibility4/Makefile index 5875308d23d..f4994e39772 100644 --- a/accessibility/kdeaccessibility4/Makefile +++ b/accessibility/kdeaccessibility4/Makefile @@ -30,7 +30,4 @@ MAN1= kmag.1 \ kmousetool.1 \ kmouth.1 -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.mk> diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile index 5875308d23d..f4994e39772 100644 --- a/accessibility/kmag/Makefile +++ b/accessibility/kmag/Makefile @@ -30,7 +30,4 @@ MAN1= kmag.1 \ kmousetool.1 \ kmouth.1 -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.mk> diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile index 5875308d23d..f4994e39772 100644 --- a/accessibility/kmousetool/Makefile +++ b/accessibility/kmousetool/Makefile @@ -30,7 +30,4 @@ MAN1= kmag.1 \ kmousetool.1 \ kmouth.1 -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.mk> diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile index 5875308d23d..f4994e39772 100644 --- a/accessibility/kmouth/Makefile +++ b/accessibility/kmouth/Makefile @@ -30,7 +30,4 @@ MAN1= kmag.1 \ kmousetool.1 \ kmouth.1 -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.mk> diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index 4f3ef3b2ecf..f0b770f809a 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,8 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ zip.1:${PORTSDIR}/archivers/libzip \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 @@ -26,36 +28,24 @@ USE_BZIP2= yes USE_QT_VER= 4 USE_PYTHON= 2.5+ KDE4_BUILDENV= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp +USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase QT_COMPONENTS= network gui porting xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes MAN1= ark.1 -OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \ - KONQUI "Konqueror UI integration" off +OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.pre.mk> -.if defined(WITH_KONQUI) -USE_KDE4+= kdebase -PLIST_SUB+= KONQUI="" -.else -PLIST_SUB+= KONQUI="@comment " - -.endif - .if defined(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: #disable printer-applet, it comes with print/kdeutils4-printer-applet ${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/archivers/ark/pkg-plist b/archivers/ark/pkg-plist index 7bf4309ec70..c364e562931 100644 --- a/archivers/ark/pkg-plist +++ b/archivers/ark/pkg-plist @@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so lib/kde4/libarkpart.so -%%KONQUI%%lib/kde4/libextracthere.so +lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so lib/kde4/liboktetapart.so lib/kde4/plasma_package_superkaramba.so @@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/floppy_format.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop -%%KONQUI%%share/kde4/services/ark_dndextract.desktop +share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop share/kde4/services/kbytearrayedit.desktop share/kde4/services/kcm_lirc.desktop diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile index 4f3ef3b2ecf..f0b770f809a 100644 --- a/comms/kremotecontrol/Makefile +++ b/comms/kremotecontrol/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,8 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ zip.1:${PORTSDIR}/archivers/libzip \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 @@ -26,36 +28,24 @@ USE_BZIP2= yes USE_QT_VER= 4 USE_PYTHON= 2.5+ KDE4_BUILDENV= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp +USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase QT_COMPONENTS= network gui porting xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes MAN1= ark.1 -OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \ - KONQUI "Konqueror UI integration" off +OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.pre.mk> -.if defined(WITH_KONQUI) -USE_KDE4+= kdebase -PLIST_SUB+= KONQUI="" -.else -PLIST_SUB+= KONQUI="@comment " - -.endif - .if defined(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: #disable printer-applet, it comes with print/kdeutils4-printer-applet ${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/comms/kremotecontrol/pkg-plist b/comms/kremotecontrol/pkg-plist index 7bf4309ec70..c364e562931 100644 --- a/comms/kremotecontrol/pkg-plist +++ b/comms/kremotecontrol/pkg-plist @@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so lib/kde4/libarkpart.so -%%KONQUI%%lib/kde4/libextracthere.so +lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so lib/kde4/liboktetapart.so lib/kde4/plasma_package_superkaramba.so @@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/floppy_format.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop -%%KONQUI%%share/kde4/services/ark_dndextract.desktop +share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop share/kde4/services/kbytearrayedit.desktop share/kde4/services/kcm_lirc.desktop diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index 47168db3212..b3ac1703952 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -6,6 +6,7 @@ PORTNAME= akonadi PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= databases kde ipv6 MASTER_SITES= http://download.akonadi-project.org/ DIST_SUBDIR= KDE @@ -13,7 +14,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Storage server for kdepim -LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python-libs \ +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ soprano.4:${PORTSDIR}/textproc/soprano BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/bin/mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server @@ -26,10 +27,6 @@ QT_COMPONENTS= corelib network qtestlib dbus sql \ USE_MYSQL= server USE_KDE4= kdeprefix kdehier automoc4 sharedmime KDE4_BUILDENV= yes -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -post-extract: - ${MKDIR} ${WRKSRC} post-patch: ${REINPLACE_CMD} -e '/akonadi.pc/s|pkgconfig|../libdata/pkgconfig|' \ diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index 4f3ef3b2ecf..f0b770f809a 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,8 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ zip.1:${PORTSDIR}/archivers/libzip \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 @@ -26,36 +28,24 @@ USE_BZIP2= yes USE_QT_VER= 4 USE_PYTHON= 2.5+ KDE4_BUILDENV= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp +USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase QT_COMPONENTS= network gui porting xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes MAN1= ark.1 -OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \ - KONQUI "Konqueror UI integration" off +OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.pre.mk> -.if defined(WITH_KONQUI) -USE_KDE4+= kdebase -PLIST_SUB+= KONQUI="" -.else -PLIST_SUB+= KONQUI="@comment " - -.endif - .if defined(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: #disable printer-applet, it comes with print/kdeutils4-printer-applet ${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist index 7bf4309ec70..c364e562931 100644 --- a/deskutils/kcharselect/pkg-plist +++ b/deskutils/kcharselect/pkg-plist @@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so lib/kde4/libarkpart.so -%%KONQUI%%lib/kde4/libextracthere.so +lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so lib/kde4/liboktetapart.so lib/kde4/plasma_package_superkaramba.so @@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/floppy_format.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop -%%KONQUI%%share/kde4/services/ark_dndextract.desktop +share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop share/kde4/services/kbytearrayedit.desktop share/kde4/services/kcm_lirc.desktop diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile index 830f2b1b0a3..408c2dc079d 100644 --- a/deskutils/kdepim4-runtime/Makefile +++ b/deskutils/kdepim4-runtime/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdepim-runtime PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -14,38 +15,25 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Libraries for KDE-PIM applications -BUILD_DEPENDS= libassuan>=1.0.4:${PORTSDIR}/security/libassuan -LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ - sasl2:${PORTSDIR}/security/cyrus-sasl2 \ - boost_python:${PORTSDIR}/devel/boost-python-libs \ - qca.2:${PORTSDIR}/devel/qca +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs LATEST_LINK= ${PORTNAME}4 -USE_KDE4= kdelibs kdeexp pimlibs runtime akonadi kdeprefix kdehier automoc4 +USE_KDE4= pimlibs kdeexp kdeprefix kdehier sharedmime automoc4 KDE4_BUILDENV= yes USE_BZIP2= yes USE_QT_VER= 4 QT_COMPONENTS= corelib opengl dbus qt3support designer network svg qtestlib \ xml gui qmake_build moc_build rcc_build uic_build -USE_OPENLDAP= yes MAKE_JOBS_SAFE= yes -#fix build when kdepim3 is here -CMAKE_ARGS+= -DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib" - -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: - ${GREP} -H -r "#include <q" ${WRKSRC}/.. | ${CUT} -d: -f1 | uniq | \ + ${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \ ${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt pre-configure: #respect prefix - ${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \ + ${FIND} ${WRKSRC} -type f -name CMakeLists.txt | ${XARGS} \ ${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g' - @${REINPLACE_CMD} -e 's|add_subdirectory( kolabproxy )||' \ - ${WRKSRC}/../resources/CMakeLists.txt .include <bsd.port.mk> diff --git a/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..4caa4a75c3f --- /dev/null +++ b/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- ./CMakeLists.txt.orig 2009-08-10 19:43:44.000000000 +1100 ++++ ./CMakeLists.txt 2009-08-10 19:58:07.000000000 +1100 +@@ -47,7 +47,7 @@ + + ############### Needed commands before building anything ############### + +-include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS}) ++include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") + + diff --git a/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt new file mode 100644 index 00000000000..aded1f763a2 --- /dev/null +++ b/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt @@ -0,0 +1,14 @@ +--- ./resources/kolabproxy/CMakeLists.txt.orig 2009-08-04 09:09:41.000000000 +1100 ++++ ./resources/kolabproxy/CMakeLists.txt 2009-08-10 19:40:23.000000000 +1100 +@@ -1,8 +1,10 @@ + project(kolabproxy) + + include_directories( +- ${kdepim-runtime_SOURCE_DIR} ++ ${QT_QTCORE_INCLUDE_DIR} ++ ${QT_QTGUI_INCLUDE_DIR} + ${QT_QTDBUS_INCLUDE_DIR} ++ ${kdepim-runtime_SOURCE_DIR} + ${Boost_INCLUDE_DIR} + ) + diff --git a/deskutils/kdepim4-runtime/files/patch-resources__maildir__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-resources__maildir__CMakeLists.txt new file mode 100644 index 00000000000..d4ffc0a929d --- /dev/null +++ b/deskutils/kdepim4-runtime/files/patch-resources__maildir__CMakeLists.txt @@ -0,0 +1,8 @@ +--- ./resources/maildir/CMakeLists.txt.orig 2009-08-09 08:40:35.000000000 +0000 ++++ ./resources/maildir/CMakeLists.txt 2009-08-09 08:47:15.000000000 +0000 +@@ -36,4 +36,4 @@ + + install(TARGETS akonadi_maildir_resource ${INSTALL_TARGETS_DEFAULT_ARGS}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml +- DESTINATION ${KDE4_DBUS_INTERFACES_DIR}) ++ DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}) diff --git a/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt index deb1a277bab..a2f61f9b2ad 100644 --- a/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt +++ b/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../xml/CMakeLists.txt.orig 2009-06-03 22:54:34.000000000 +1100 -+++ ../xml/CMakeLists.txt 2009-07-05 22:39:32.000000000 +1100 +--- ./xml/CMakeLists.txt.orig 2009-06-03 22:54:34.000000000 +1100 ++++ ./xml/CMakeLists.txt 2009-07-05 22:39:32.000000000 +1100 @@ -1,21 +1,24 @@ project (akonadixml) diff --git a/deskutils/kdepim4-runtime/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist index 9ae4d750069..bf84c52462a 100644 --- a/deskutils/kdepim4-runtime/pkg-plist +++ b/deskutils/kdepim4-runtime/pkg-plist @@ -6,6 +6,7 @@ bin/akonadi_imap_resource bin/akonadi_kabc_resource bin/akonadi_kcal_resource bin/akonadi_knut_resource +bin/akonadi_kolabproxy_resource bin/akonadi_localbookmarks_resource bin/akonadi_maildir_resource bin/akonadi_microblog_resource @@ -61,6 +62,7 @@ share/akonadi/agents/imapresource.desktop share/akonadi/agents/kabcresource.desktop share/akonadi/agents/kcalresource.desktop share/akonadi/agents/knutresource.desktop +share/akonadi/agents/kolabproxyresource.desktop share/akonadi/agents/localbookmarksresource.desktop share/akonadi/agents/maildirresource.desktop share/akonadi/agents/microblog.desktop @@ -87,14 +89,15 @@ share/apps/akonadi_knut_resource/knut-template.xml share/apps/akonadiconsole/akonadiconsoleui.rc share/config/kres-migratorrc share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml +share/icons/hicolor/64x64/apps/kolab.png share/kde4/services/akonadi.protocol share/kde4/services/kcm_akonadi.desktop share/kde4/services/kcm_akonadi_resources.desktop share/kde4/services/kcm_akonadi_server.desktop share/kde4/services/kresources/kabc/akonadi.desktop share/kde4/services/kresources/kcal/akonadi.desktop -share/mime/packages/kdepim-mime.xml share/mime/application/x-vnd.kde.notes.xml +share/mime/packages/kdepim-mime.xml @dirrm share/apps/akonadiconsole @dirrm share/apps/akonadi_knut_resource @dirrm share/apps/akonadi/plugins/serializer @@ -104,3 +107,6 @@ share/mime/application/x-vnd.kde.notes.xml @dirrm share/akonadi/agents @dirrm share/akonadi @dirrm include/akonadi/xml +@dirrmtry include/akonadi +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index fe107376eda..90e12a11314 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdepim PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,14 +18,15 @@ COMMENT= Libraries for KDE-PIM applications BUILD_DEPENDS= libassuan>=1.0.4:${PORTSDIR}/security/libassuan LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ sasl2:${PORTSDIR}/security/cyrus-sasl2 \ - boost_python:${PORTSDIR}/devel/boost-python-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ mal.1:${PORTSDIR}/palm/libmal \ pisock.9:${PORTSDIR}/palm/pilot-link \ qca.2:${PORTSDIR}/devel/qca LATEST_LINK= ${PORTNAME}4 -USE_KDE4= kdelibs kdeexp pimlibs pimruntime runtime workspace akonadi kdeprefix kdehier automoc4 +USE_KDE4= kdelibs kdeexp pimlibs pimruntime \ + akonadi kdeprefix kdehier automoc4 oxygen KDE4_BUILDENV= yes USE_BZIP2= yes USE_QT_VER= 4 @@ -58,12 +60,9 @@ PLIST_SUB+= GNOKII="@comment " # PLIST_SUB+= KITCHENSYNC="@comment " # .endif -post-extract: - ${MKDIR} ${WRKSRC} - pre-configure: - #respect prefix - ${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \ - ${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g' +# respect prefix + ${FIND} ${PATCH_WRKSRC} -type f -name CMakeLists.txt | ${XARGS} \ + ${REINPLACE_CMD} -e '/DESTINATION/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g' .include <bsd.port.post.mk> diff --git a/deskutils/kdepim44-runtime/Makefile b/deskutils/kdepim44-runtime/Makefile index 830f2b1b0a3..408c2dc079d 100644 --- a/deskutils/kdepim44-runtime/Makefile +++ b/deskutils/kdepim44-runtime/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdepim-runtime PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -14,38 +15,25 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Libraries for KDE-PIM applications -BUILD_DEPENDS= libassuan>=1.0.4:${PORTSDIR}/security/libassuan -LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ - sasl2:${PORTSDIR}/security/cyrus-sasl2 \ - boost_python:${PORTSDIR}/devel/boost-python-libs \ - qca.2:${PORTSDIR}/devel/qca +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs LATEST_LINK= ${PORTNAME}4 -USE_KDE4= kdelibs kdeexp pimlibs runtime akonadi kdeprefix kdehier automoc4 +USE_KDE4= pimlibs kdeexp kdeprefix kdehier sharedmime automoc4 KDE4_BUILDENV= yes USE_BZIP2= yes USE_QT_VER= 4 QT_COMPONENTS= corelib opengl dbus qt3support designer network svg qtestlib \ xml gui qmake_build moc_build rcc_build uic_build -USE_OPENLDAP= yes MAKE_JOBS_SAFE= yes -#fix build when kdepim3 is here -CMAKE_ARGS+= -DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib" - -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: - ${GREP} -H -r "#include <q" ${WRKSRC}/.. | ${CUT} -d: -f1 | uniq | \ + ${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \ ${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt pre-configure: #respect prefix - ${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \ + ${FIND} ${WRKSRC} -type f -name CMakeLists.txt | ${XARGS} \ ${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g' - @${REINPLACE_CMD} -e 's|add_subdirectory( kolabproxy )||' \ - ${WRKSRC}/../resources/CMakeLists.txt .include <bsd.port.mk> diff --git a/deskutils/kdepim44-runtime/files/patch-CMakeLists.txt b/deskutils/kdepim44-runtime/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..4caa4a75c3f --- /dev/null +++ b/deskutils/kdepim44-runtime/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- ./CMakeLists.txt.orig 2009-08-10 19:43:44.000000000 +1100 ++++ ./CMakeLists.txt 2009-08-10 19:58:07.000000000 +1100 +@@ -47,7 +47,7 @@ + + ############### Needed commands before building anything ############### + +-include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS}) ++include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") + + diff --git a/deskutils/kdepim44-runtime/files/patch-resources__kolabproxy__CMakeLists.txt b/deskutils/kdepim44-runtime/files/patch-resources__kolabproxy__CMakeLists.txt new file mode 100644 index 00000000000..aded1f763a2 --- /dev/null +++ b/deskutils/kdepim44-runtime/files/patch-resources__kolabproxy__CMakeLists.txt @@ -0,0 +1,14 @@ +--- ./resources/kolabproxy/CMakeLists.txt.orig 2009-08-04 09:09:41.000000000 +1100 ++++ ./resources/kolabproxy/CMakeLists.txt 2009-08-10 19:40:23.000000000 +1100 +@@ -1,8 +1,10 @@ + project(kolabproxy) + + include_directories( +- ${kdepim-runtime_SOURCE_DIR} ++ ${QT_QTCORE_INCLUDE_DIR} ++ ${QT_QTGUI_INCLUDE_DIR} + ${QT_QTDBUS_INCLUDE_DIR} ++ ${kdepim-runtime_SOURCE_DIR} + ${Boost_INCLUDE_DIR} + ) + diff --git a/deskutils/kdepim44-runtime/files/patch-resources__maildir__CMakeLists.txt b/deskutils/kdepim44-runtime/files/patch-resources__maildir__CMakeLists.txt new file mode 100644 index 00000000000..d4ffc0a929d --- /dev/null +++ b/deskutils/kdepim44-runtime/files/patch-resources__maildir__CMakeLists.txt @@ -0,0 +1,8 @@ +--- ./resources/maildir/CMakeLists.txt.orig 2009-08-09 08:40:35.000000000 +0000 ++++ ./resources/maildir/CMakeLists.txt 2009-08-09 08:47:15.000000000 +0000 +@@ -36,4 +36,4 @@ + + install(TARGETS akonadi_maildir_resource ${INSTALL_TARGETS_DEFAULT_ARGS}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml +- DESTINATION ${KDE4_DBUS_INTERFACES_DIR}) ++ DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}) diff --git a/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt b/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt index deb1a277bab..a2f61f9b2ad 100644 --- a/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt +++ b/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../xml/CMakeLists.txt.orig 2009-06-03 22:54:34.000000000 +1100 -+++ ../xml/CMakeLists.txt 2009-07-05 22:39:32.000000000 +1100 +--- ./xml/CMakeLists.txt.orig 2009-06-03 22:54:34.000000000 +1100 ++++ ./xml/CMakeLists.txt 2009-07-05 22:39:32.000000000 +1100 @@ -1,21 +1,24 @@ project (akonadixml) diff --git a/deskutils/kdepim44-runtime/pkg-plist b/deskutils/kdepim44-runtime/pkg-plist index 9ae4d750069..bf84c52462a 100644 --- a/deskutils/kdepim44-runtime/pkg-plist +++ b/deskutils/kdepim44-runtime/pkg-plist @@ -6,6 +6,7 @@ bin/akonadi_imap_resource bin/akonadi_kabc_resource bin/akonadi_kcal_resource bin/akonadi_knut_resource +bin/akonadi_kolabproxy_resource bin/akonadi_localbookmarks_resource bin/akonadi_maildir_resource bin/akonadi_microblog_resource @@ -61,6 +62,7 @@ share/akonadi/agents/imapresource.desktop share/akonadi/agents/kabcresource.desktop share/akonadi/agents/kcalresource.desktop share/akonadi/agents/knutresource.desktop +share/akonadi/agents/kolabproxyresource.desktop share/akonadi/agents/localbookmarksresource.desktop share/akonadi/agents/maildirresource.desktop share/akonadi/agents/microblog.desktop @@ -87,14 +89,15 @@ share/apps/akonadi_knut_resource/knut-template.xml share/apps/akonadiconsole/akonadiconsoleui.rc share/config/kres-migratorrc share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml +share/icons/hicolor/64x64/apps/kolab.png share/kde4/services/akonadi.protocol share/kde4/services/kcm_akonadi.desktop share/kde4/services/kcm_akonadi_resources.desktop share/kde4/services/kcm_akonadi_server.desktop share/kde4/services/kresources/kabc/akonadi.desktop share/kde4/services/kresources/kcal/akonadi.desktop -share/mime/packages/kdepim-mime.xml share/mime/application/x-vnd.kde.notes.xml +share/mime/packages/kdepim-mime.xml @dirrm share/apps/akonadiconsole @dirrm share/apps/akonadi_knut_resource @dirrm share/apps/akonadi/plugins/serializer @@ -104,3 +107,6 @@ share/mime/application/x-vnd.kde.notes.xml @dirrm share/akonadi/agents @dirrm share/akonadi @dirrm include/akonadi/xml +@dirrmtry include/akonadi +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index fe107376eda..90e12a11314 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdepim PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,14 +18,15 @@ COMMENT= Libraries for KDE-PIM applications BUILD_DEPENDS= libassuan>=1.0.4:${PORTSDIR}/security/libassuan LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ sasl2:${PORTSDIR}/security/cyrus-sasl2 \ - boost_python:${PORTSDIR}/devel/boost-python-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ mal.1:${PORTSDIR}/palm/libmal \ pisock.9:${PORTSDIR}/palm/pilot-link \ qca.2:${PORTSDIR}/devel/qca LATEST_LINK= ${PORTNAME}4 -USE_KDE4= kdelibs kdeexp pimlibs pimruntime runtime workspace akonadi kdeprefix kdehier automoc4 +USE_KDE4= kdelibs kdeexp pimlibs pimruntime \ + akonadi kdeprefix kdehier automoc4 oxygen KDE4_BUILDENV= yes USE_BZIP2= yes USE_QT_VER= 4 @@ -58,12 +60,9 @@ PLIST_SUB+= GNOKII="@comment " # PLIST_SUB+= KITCHENSYNC="@comment " # .endif -post-extract: - ${MKDIR} ${WRKSRC} - pre-configure: - #respect prefix - ${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \ - ${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g' +# respect prefix + ${FIND} ${PATCH_WRKSRC} -type f -name CMakeLists.txt | ${XARGS} \ + ${REINPLACE_CMD} -e '/DESTINATION/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g' .include <bsd.port.post.mk> diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile index 02d1ddde336..617f302e919 100644 --- a/deskutils/kdepimlibs4/Makefile +++ b/deskutils/kdepimlibs4/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdepimlibs PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -16,7 +17,7 @@ COMMENT= Libraries for KDE-PIM applications LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ sasl2:${PORTSDIR}/security/cyrus-sasl2 \ - boost_python:${PORTSDIR}/devel/boost-python-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ ical.43:${PORTSDIR}/devel/libical USE_KDE4= kdelibs kdeexp akonadi kdeprefix kdehier automoc4 @@ -38,8 +39,7 @@ PLIST_SUB+= WITH_PTH='@comment ' .endif post-extract: - ${MKDIR} ${WRKSRC} ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/../cmake/modules/*.cmake + ${PATCH_WRKSRC}/cmake/modules/*.cmake .include <bsd.port.post.mk> diff --git a/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake index efbbb272599..989288c8810 100644 --- a/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake +++ b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake @@ -1,5 +1,5 @@ ---- ../cmake/modules/FindLibical.cmake.orgi 2009-02-27 17:59:51.000000000 +0100 -+++ ../cmake/modules/FindLibical.cmake 2009-02-27 18:00:20.000000000 +0100 +--- ./cmake/modules/FindLibical.cmake.orgi 2009-02-27 17:59:51.000000000 +0100 ++++ ./cmake/modules/FindLibical.cmake 2009-02-27 18:00:20.000000000 +0100 @@ -52,7 +52,7 @@ if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES) diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile index 691e35f724f..452013c02f2 100644 --- a/deskutils/kdeplasma-addons/Makefile +++ b/deskutils/kdeplasma-addons/Makefile @@ -29,18 +29,15 @@ QT_COMPONENTS= corelib opengl dbus qt3support webkit \ MAKE_JOBS_SAFE= yes -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: - ${GREP} -H -r "#include <q" ${WRKSRC}/.. | ${CUT} -d: -f1 | uniq | \ + ${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \ ${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt pre-configure: #respect prefix, don't update mime when installing ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \ -e '/^set/s,DBUS_INTERFACES_INSTALL_DIR,KDE4_DBUS_INTERFACES_DIR,g' \ - ${WRKSRC}/../applets/lancelot/app/src/CMakeLists.txt + ${WRKSRC}/applets/lancelot/app/src/CMakeLists.txt post-install: @-update-mime-database ${PREFIX}/share/mime diff --git a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt index 01c63002bcf..82a7ae93bac 100644 --- a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt +++ b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../CMakeLists.txt.orig 2009-04-06 07:00:39.000000000 +1100 -+++ ../CMakeLists.txt 2009-06-26 11:00:58.000000000 +1100 +--- ./CMakeLists.txt.orig 2009-04-06 07:00:39.000000000 +1100 ++++ ./CMakeLists.txt 2009-06-26 11:00:58.000000000 +1100 @@ -26,16 +26,20 @@ endif (DEPEND_PACKAGE_Marble) macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.") diff --git a/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt index 9f680c78f7f..32ede91bbbe 100644 --- a/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt +++ b/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../applets/frame/CMakeLists.txt.orig 2009-05-15 04:26:59.000000000 +1100 -+++ ../applets/frame/CMakeLists.txt 2009-06-26 10:37:04.000000000 +1100 +--- ./applets/frame/CMakeLists.txt.orig 2009-05-15 04:26:59.000000000 +1100 ++++ ./applets/frame/CMakeLists.txt 2009-06-26 10:37:04.000000000 +1100 @@ -1,7 +1,20 @@ project(plasma-frame) include (MacroLogFeature) diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index 25266d72d35..06baa4ddb99 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -57,7 +57,4 @@ MAN1= adddebug.1 \ xml2pot.1 \ zonetab2pot.py.1 -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.mk> diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index b31fc1cfe1a..c631c45958e 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -32,10 +32,7 @@ OPTIONS= FREEBSD "Install FreeBSD card desk" off .include <bsd.port.pre.mk> .if defined(WITH_FREEBSD) -RUN_DEPENDS= kde4-freebsd-carddeck>=1.0:${PORTSDIR}/games/freebsd-carddeck-kde4 +RUN_DEPENDS+= kde4-freebsd-carddeck>=1.0:${PORTSDIR}/games/freebsd-carddeck-kde4 .endif -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.post.mk> diff --git a/games/kdegames4/files/patch-ksirk__ksirk__iris__src__jdns__jdns_sys.c b/games/kdegames4/files/patch-ksirk__ksirk__iris__src__jdns__jdns_sys.c index 68f7b38811e..5275708e839 100644 --- a/games/kdegames4/files/patch-ksirk__ksirk__iris__src__jdns__jdns_sys.c +++ b/games/kdegames4/files/patch-ksirk__ksirk__iris__src__jdns__jdns_sys.c @@ -1,5 +1,5 @@ ---- ../ksirk/ksirk/iris/src/jdns/jdns_sys.c.orig 2008-12-26 22:45:54.000000000 +0000 -+++ ../ksirk/ksirk/iris/src/jdns/jdns_sys.c 2008-12-26 22:45:45.000000000 +0000 +--- ./ksirk/ksirk/iris/src/jdns/jdns_sys.c.orig 2008-12-26 22:45:54.000000000 +0000 ++++ ./ksirk/ksirk/iris/src/jdns/jdns_sys.c 2008-12-26 22:45:45.000000000 +0000 @@ -701,7 +701,7 @@ } #endif diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 9d9bc563c1d..ff03344679d 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -44,11 +44,8 @@ QT_COMPONENTS= opengl gui svg iconengines pixeltool \ moc_build rcc_build uic_build qmake_build MAKE_JOBS_SAFE= yes -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: - ${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \ + ${FIND} ${PATCH_WRKSRC} -type f -name CMakeLists.txt | ${XARGS} \ ${REINPLACE_CMD} -e 's|pkgconfig|../libdata/pkgconfig|' .include <bsd.port.mk> diff --git a/graphics/kdegraphics4/files/patch-libs__libkdcraw__CMakeLists.txt b/graphics/kdegraphics4/files/patch-libs__libkdcraw__CMakeLists.txt index 5d3df95751b..46a5c62ffd1 100644 --- a/graphics/kdegraphics4/files/patch-libs__libkdcraw__CMakeLists.txt +++ b/graphics/kdegraphics4/files/patch-libs__libkdcraw__CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../libs/libkdcraw/CMakeLists.txt.orig 2009-05-06 12:13:22.000000000 +0200 -+++ ../libs/libkdcraw/CMakeLists.txt 2009-06-07 01:15:33.000000000 +0200 +--- ./libs/libkdcraw/CMakeLists.txt.orig 2009-05-06 12:13:22.000000000 +0200 ++++ ./libs/libkdcraw/CMakeLists.txt 2009-06-07 01:15:33.000000000 +0200 @@ -114,9 +114,9 @@ # ======================================================= diff --git a/graphics/kdegraphics4/files/patch-libs__libkexiv2__CMakeLists.txt b/graphics/kdegraphics4/files/patch-libs__libkexiv2__CMakeLists.txt index fd4dd54dd86..0372a8fae51 100644 --- a/graphics/kdegraphics4/files/patch-libs__libkexiv2__CMakeLists.txt +++ b/graphics/kdegraphics4/files/patch-libs__libkexiv2__CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../libs/libkexiv2/CMakeLists.txt.orig 2008-06-03 17:48:03.000000000 +0400 -+++ ../libs/libkexiv2/CMakeLists.txt 2008-08-18 20:07:28.000000000 +0400 +--- ./libs/libkexiv2/CMakeLists.txt.orig 2008-06-03 17:48:03.000000000 +0400 ++++ ./libs/libkexiv2/CMakeLists.txt 2008-08-18 20:07:28.000000000 +0400 @@ -52,8 +52,8 @@ SUBDIRS(libkexiv2) diff --git a/graphics/kdegraphics4/files/patch-libs__libkipi__CMakeLists.txt b/graphics/kdegraphics4/files/patch-libs__libkipi__CMakeLists.txt index 59c5f850849..6ea38105eb3 100644 --- a/graphics/kdegraphics4/files/patch-libs__libkipi__CMakeLists.txt +++ b/graphics/kdegraphics4/files/patch-libs__libkipi__CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../libs/libkipi/CMakeLists.txt.orig 2008-06-03 17:48:04.000000000 +0400 -+++ ../libs/libkipi/CMakeLists.txt 2008-08-18 20:07:58.000000000 +0400 +--- ./libs/libkipi/CMakeLists.txt.orig 2008-06-03 17:48:04.000000000 +0400 ++++ ./libs/libkipi/CMakeLists.txt 2008-08-18 20:07:58.000000000 +0400 @@ -51,8 +51,8 @@ SUBDIRS(libkipi) diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index 4f3ef3b2ecf..f0b770f809a 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,8 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ zip.1:${PORTSDIR}/archivers/libzip \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 @@ -26,36 +28,24 @@ USE_BZIP2= yes USE_QT_VER= 4 USE_PYTHON= 2.5+ KDE4_BUILDENV= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp +USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase QT_COMPONENTS= network gui porting xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes MAN1= ark.1 -OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \ - KONQUI "Konqueror UI integration" off +OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.pre.mk> -.if defined(WITH_KONQUI) -USE_KDE4+= kdebase -PLIST_SUB+= KONQUI="" -.else -PLIST_SUB+= KONQUI="@comment " - -.endif - .if defined(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: #disable printer-applet, it comes with print/kdeutils4-printer-applet ${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/math/kcalc/pkg-plist b/math/kcalc/pkg-plist index 7bf4309ec70..c364e562931 100644 --- a/math/kcalc/pkg-plist +++ b/math/kcalc/pkg-plist @@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so lib/kde4/libarkpart.so -%%KONQUI%%lib/kde4/libextracthere.so +lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so lib/kde4/liboktetapart.so lib/kde4/plasma_package_superkaramba.so @@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/floppy_format.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop -%%KONQUI%%share/kde4/services/ark_dndextract.desktop +share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop share/kde4/services/kbytearrayedit.desktop share/kde4/services/kcm_lirc.desktop diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile index 94f58aef2bd..61639d2d337 100644 --- a/misc/kdeedu4/Makefile +++ b/misc/kdeedu4/Makefile @@ -6,7 +6,7 @@ PORTNAME= kdeedu PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,13 +17,15 @@ COMMENT= Collection of entertaining, educational programs for KDE BUILD_DEPENDS= ${LOCALBASE}/lib/ocaml/facile/facile.a:${PORTSDIR}/math/facile \ eigen>=2.0.b3:${PORTSDIR}/math/eigen2 \ - gmm++>=3.0.4:${PORTSDIR}/math/gmm++ + gmm++>=3.0.4:${PORTSDIR}/math/gmm++ \ + xplanet:${PORTSDIR}/astro/xplanet LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python-libs \ nova:${PORTSDIR}/astro/libnova \ openbabel.3:${PORTSDIR}/science/openbabel \ cfitsio.0:${PORTSDIR}/astro/cfitsio \ qalculate.4:${PORTSDIR}/math/libqalculate \ gsl.13:${PORTSDIR}/math/gsl +RUN_DEPENDS= xplanet:${PORTSDIR}/astro/xplanet LATEST_LINK= ${PORTNAME}4 @@ -49,7 +51,4 @@ CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" \ -DBOOST_PYTHON_INCLUDES="${LOCALBASE}/include;${PYTHON_INCLUDEDIR}" \ -DBOOST_PYTHON_LIBS="-L${LOCALBASE}/lib -lboost_python -l${PYTHON_VERSION}" -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.mk> diff --git a/misc/kdeedu4/files/patch-cmake__modules__FindCFitsio.cmake b/misc/kdeedu4/files/patch-cmake__modules__FindCFitsio.cmake index 820f49eb159..66fd2616249 100644 --- a/misc/kdeedu4/files/patch-cmake__modules__FindCFitsio.cmake +++ b/misc/kdeedu4/files/patch-cmake__modules__FindCFitsio.cmake @@ -1,5 +1,5 @@ ---- ../cmake/modules/FindCFitsio.cmake.orig 2008-12-21 20:20:00.000000000 +0000 -+++ ../cmake/modules/FindCFitsio.cmake 2009-01-30 22:25:02.000000000 +0000 +--- ./cmake/modules/FindCFitsio.cmake.orig 2008-12-21 20:20:00.000000000 +0000 ++++ ./cmake/modules/FindCFitsio.cmake 2009-01-30 22:25:02.000000000 +0000 @@ -23,19 +23,19 @@ IF (NOT WIN32) find_package(PkgConfig) diff --git a/misc/kdeedu4/files/patch-kalzium__src__CMakeLists.txt b/misc/kdeedu4/files/patch-kalzium__src__CMakeLists.txt index b8597576c2c..cda98d9bb4c 100644 --- a/misc/kdeedu4/files/patch-kalzium__src__CMakeLists.txt +++ b/misc/kdeedu4/files/patch-kalzium__src__CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../kalzium/src/CMakeLists.txt.orig 2008-08-20 19:53:43.000000000 +0000 -+++ ../kalzium/src/CMakeLists.txt 2008-12-30 20:34:27.000000000 +0000 +--- ./kalzium/src/CMakeLists.txt.orig 2008-08-20 19:53:43.000000000 +0000 ++++ ./kalzium/src/CMakeLists.txt 2008-12-30 20:34:27.000000000 +0000 @@ -138,7 +138,7 @@ set(kalzium_EXTRA_LIBS ${kalzium_EXTRA_LIBS} ${OCAML_NUMS_LIBRARY}) endif (OCAML_NUMS_LIBRARY) diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index 4f3ef3b2ecf..f0b770f809a 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,8 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ zip.1:${PORTSDIR}/archivers/libzip \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 @@ -26,36 +28,24 @@ USE_BZIP2= yes USE_QT_VER= 4 USE_PYTHON= 2.5+ KDE4_BUILDENV= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp +USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase QT_COMPONENTS= network gui porting xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes MAN1= ark.1 -OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \ - KONQUI "Konqueror UI integration" off +OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.pre.mk> -.if defined(WITH_KONQUI) -USE_KDE4+= kdebase -PLIST_SUB+= KONQUI="" -.else -PLIST_SUB+= KONQUI="@comment " - -.endif - .if defined(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: #disable printer-applet, it comes with print/kdeutils4-printer-applet ${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/misc/kdeutils4/pkg-plist b/misc/kdeutils4/pkg-plist index 7bf4309ec70..c364e562931 100644 --- a/misc/kdeutils4/pkg-plist +++ b/misc/kdeutils4/pkg-plist @@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so lib/kde4/libarkpart.so -%%KONQUI%%lib/kde4/libextracthere.so +lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so lib/kde4/liboktetapart.so lib/kde4/plasma_package_superkaramba.so @@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/floppy_format.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop -%%KONQUI%%share/kde4/services/ark_dndextract.desktop +share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop share/kde4/services/kbytearrayedit.desktop share/kde4/services/kcm_lirc.desktop diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 8c8f9bb3db5..ebb7d96f8ef 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -38,7 +38,15 @@ QT_COMPONENTS= corelib opengl dbus qt3support designer network svg qtestlib \ USE_OPENLDAP= yes MAKE_JOBS_SAFE= yes -post-extract: - ${MKDIR} ${WRKSRC} +OPTIONS= PULSEAUDIO "KMix control for PulseAudio" off + +.include <bsd.port.options.mk> + +.if defined(WITH_PULSEAUDIO) +CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=ON +LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +.else +CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF +.endif .include <bsd.port.mk> diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index dd68a718472..ba16128eae1 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -60,7 +60,4 @@ LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms CMAKE_ARGS+= -DWITH_Xmms:BOOL=OFF .endif -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.post.mk> diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile index 4f3ef3b2ecf..f0b770f809a 100644 --- a/security/kgpg-kde4/Makefile +++ b/security/kgpg-kde4/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,8 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ zip.1:${PORTSDIR}/archivers/libzip \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 @@ -26,36 +28,24 @@ USE_BZIP2= yes USE_QT_VER= 4 USE_PYTHON= 2.5+ KDE4_BUILDENV= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp +USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase QT_COMPONENTS= network gui porting xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes MAN1= ark.1 -OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \ - KONQUI "Konqueror UI integration" off +OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.pre.mk> -.if defined(WITH_KONQUI) -USE_KDE4+= kdebase -PLIST_SUB+= KONQUI="" -.else -PLIST_SUB+= KONQUI="@comment " - -.endif - .if defined(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: #disable printer-applet, it comes with print/kdeutils4-printer-applet ${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist index 7bf4309ec70..c364e562931 100644 --- a/security/kgpg-kde4/pkg-plist +++ b/security/kgpg-kde4/pkg-plist @@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so lib/kde4/libarkpart.so -%%KONQUI%%lib/kde4/libextracthere.so +lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so lib/kde4/liboktetapart.so lib/kde4/plasma_package_superkaramba.so @@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/floppy_format.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop -%%KONQUI%%share/kde4/services/ark_dndextract.desktop +share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop share/kde4/services/kbytearrayedit.desktop share/kde4/services/kcm_lirc.desktop diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile index 4f3ef3b2ecf..f0b770f809a 100644 --- a/security/kwallet/Makefile +++ b/security/kwallet/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,8 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ zip.1:${PORTSDIR}/archivers/libzip \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 @@ -26,36 +28,24 @@ USE_BZIP2= yes USE_QT_VER= 4 USE_PYTHON= 2.5+ KDE4_BUILDENV= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp +USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase QT_COMPONENTS= network gui porting xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes MAN1= ark.1 -OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \ - KONQUI "Konqueror UI integration" off +OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.pre.mk> -.if defined(WITH_KONQUI) -USE_KDE4+= kdebase -PLIST_SUB+= KONQUI="" -.else -PLIST_SUB+= KONQUI="@comment " - -.endif - .if defined(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: #disable printer-applet, it comes with print/kdeutils4-printer-applet ${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist index 7bf4309ec70..c364e562931 100644 --- a/security/kwallet/pkg-plist +++ b/security/kwallet/pkg-plist @@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so lib/kde4/libarkpart.so -%%KONQUI%%lib/kde4/libextracthere.so +lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so lib/kde4/liboktetapart.so lib/kde4/plasma_package_superkaramba.so @@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/floppy_format.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop -%%KONQUI%%share/kde4/services/ark_dndextract.desktop +share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop share/kde4/services/kbytearrayedit.desktop share/kde4/services/kcm_lirc.desktop diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile index 3360fb2e3b1..b372927688f 100644 --- a/sysutils/kdeadmin4/Makefile +++ b/sysutils/kdeadmin4/Makefile @@ -26,8 +26,6 @@ QT_COMPONENTS= corelib opengl dbus qt3support designer network svg qtestlib \ uic_build uic3_build MAKE_JOBS_SAFE= yes -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - CMAKE_ARGS+= -DBUILD_kpackage:BOOL=Off \ -DBUILD_lilo-config:BOOL=Off @@ -39,9 +37,6 @@ OPTIONS= PRINTER_CONFIG "Install printer configuration utility" off RUN_DEPENDS+= ${KDE4_PREFIX}/share/apps/system-config-printer-kde/system-config-printer-kde.py:${PORTSDIR}/print/system-config-printer-kde .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: ${REINPLACE_CMD} -e \ 's,$${LIB_INSTALL_DIR}/pkgconfig,libdata/pkgconfig,' \ @@ -51,6 +46,6 @@ post-patch: ${PATCH_WRKSRC}/doc/CMakeLists.txt #disable system-config-printer-kde, it comes with print/kdeadmin4-system-config-printer-kde ${REINPLACE_CMD} -e '/add_subdirectory.*system-config-printer-kde/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 4f3ef3b2ecf..f0b770f809a 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,8 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ zip.1:${PORTSDIR}/archivers/libzip \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 @@ -26,36 +28,24 @@ USE_BZIP2= yes USE_QT_VER= 4 USE_PYTHON= 2.5+ KDE4_BUILDENV= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp +USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase QT_COMPONENTS= network gui porting xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes MAN1= ark.1 -OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \ - KONQUI "Konqueror UI integration" off +OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.pre.mk> -.if defined(WITH_KONQUI) -USE_KDE4+= kdebase -PLIST_SUB+= KONQUI="" -.else -PLIST_SUB+= KONQUI="@comment " - -.endif - .if defined(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: #disable printer-applet, it comes with print/kdeutils4-printer-applet ${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist index 7bf4309ec70..c364e562931 100644 --- a/sysutils/kdf/pkg-plist +++ b/sysutils/kdf/pkg-plist @@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so lib/kde4/libarkpart.so -%%KONQUI%%lib/kde4/libextracthere.so +lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so lib/kde4/liboktetapart.so lib/kde4/plasma_package_superkaramba.so @@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/floppy_format.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop -%%KONQUI%%share/kde4/services/ark_dndextract.desktop +share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop share/kde4/services/kbytearrayedit.desktop share/kde4/services/kcm_lirc.desktop diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index 4f3ef3b2ecf..f0b770f809a 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,8 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ zip.1:${PORTSDIR}/archivers/libzip \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 @@ -26,36 +28,24 @@ USE_BZIP2= yes USE_QT_VER= 4 USE_PYTHON= 2.5+ KDE4_BUILDENV= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp +USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase QT_COMPONENTS= network gui porting xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes MAN1= ark.1 -OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \ - KONQUI "Konqueror UI integration" off +OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.pre.mk> -.if defined(WITH_KONQUI) -USE_KDE4+= kdebase -PLIST_SUB+= KONQUI="" -.else -PLIST_SUB+= KONQUI="@comment " - -.endif - .if defined(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: #disable printer-applet, it comes with print/kdeutils4-printer-applet ${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist index 7bf4309ec70..c364e562931 100644 --- a/sysutils/kfloppy/pkg-plist +++ b/sysutils/kfloppy/pkg-plist @@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so lib/kde4/libarkpart.so -%%KONQUI%%lib/kde4/libextracthere.so +lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so lib/kde4/liboktetapart.so lib/kde4/plasma_package_superkaramba.so @@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/floppy_format.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop -%%KONQUI%%share/kde4/services/ark_dndextract.desktop +share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop share/kde4/services/kbytearrayedit.desktop share/kde4/services/kcm_lirc.desktop diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index 4f3ef3b2ecf..f0b770f809a 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +18,8 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \ zip.1:${PORTSDIR}/archivers/libzip \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 @@ -26,36 +28,24 @@ USE_BZIP2= yes USE_QT_VER= 4 USE_PYTHON= 2.5+ KDE4_BUILDENV= yes -USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp +USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase QT_COMPONENTS= network gui porting xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes MAN1= ark.1 -OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \ - KONQUI "Konqueror UI integration" off +OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.pre.mk> -.if defined(WITH_KONQUI) -USE_KDE4+= kdebase -PLIST_SUB+= KONQUI="" -.else -PLIST_SUB+= KONQUI="@comment " - -.endif - .if defined(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: #disable printer-applet, it comes with print/kdeutils4-printer-applet ${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist index 7bf4309ec70..c364e562931 100644 --- a/sysutils/sweeper/pkg-plist +++ b/sysutils/sweeper/pkg-plist @@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so lib/kde4/libarkpart.so -%%KONQUI%%lib/kde4/libextracthere.so +lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so lib/kde4/liboktetapart.so lib/kde4/plasma_package_superkaramba.so @@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/floppy_format.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop -%%KONQUI%%share/kde4/services/ark_dndextract.desktop +share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop share/kde4/services/kbytearrayedit.desktop share/kde4/services/kcm_lirc.desktop diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index 42fae0efdc4..06612c171f9 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -28,7 +28,4 @@ MAKE_JOBS_SAFE= yes MAN1= xsldbg.1 -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.mk> diff --git a/www/kdewebdev4/files/patch-klinkstatus__src__plugins__scripting__scripts__CMakeLists.txt b/www/kdewebdev4/files/patch-klinkstatus__src__plugins__scripting__scripts__CMakeLists.txt index 35c04174687..4d53625a330 100644 --- a/www/kdewebdev4/files/patch-klinkstatus__src__plugins__scripting__scripts__CMakeLists.txt +++ b/www/kdewebdev4/files/patch-klinkstatus__src__plugins__scripting__scripts__CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../klinkstatus/src/plugins/scripting/scripts/CMakeLists.txt.orig 2008-12-21 20:20:00.000000000 +0000 -+++ ../klinkstatus/src/plugins/scripting/scripts/CMakeLists.txt 2009-01-27 22:15:16.000000000 +0000 +--- ./klinkstatus/src/plugins/scripting/scripts/CMakeLists.txt.orig 2008-12-21 20:20:00.000000000 +0000 ++++ ./klinkstatus/src/plugins/scripting/scripts/CMakeLists.txt 2009-01-27 22:15:16.000000000 +0000 @@ -5,7 +5,7 @@ macro_optional_find_package(RUBY) macro_log_feature(RUBY_FOUND "Ruby" "An Interpreted object-oriented scripting language" "http://www.ruby-lang.org" FALSE "" "For KLinkStatus example ruby scripts") diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index 96d172203c9..86e7cc0983f 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -25,7 +25,4 @@ MAKE_JOBS_SAFE= yes MAN6= amor.6 -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.mk> diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile index 4ca83bc358a..f915eefb9b7 100644 --- a/x11-themes/kdeartwork4/Makefile +++ b/x11-themes/kdeartwork4/Makefile @@ -26,8 +26,6 @@ QT_COMPONENTS= opengl gui svg qt3support \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - OPTIONS= GNOME "Use Gnome screensavers" off .include <bsd.port.pre.mk> @@ -72,7 +70,4 @@ post-patch: ${PATCH_WRKSRC}/${item} .endfor -post-extract: - ${MKDIR} ${WRKSRC} - .include <bsd.port.post.mk> diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index b33378a5a14..99dd3ec510b 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -30,7 +31,7 @@ QT_COMPONENTS= corelib opengl dbus qt3support \ qmake_build moc_build rcc_build uic_build USE_GETTEXT= yes -USE_KDE4= kdelibs runtime workspace kdeprefix kdehier automoc4 +USE_KDE4= kdelibs workspace kdeprefix kdehier automoc4 KDE4_BUILDENV= yes MAKE_JOBS_SAFE= yes @@ -47,16 +48,13 @@ MAN1= kappfinder.1 \ LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: .if ${OSVERSION} > 800090 @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-libusb20 .endif .if ${OSVERSION} >= 800100 @${REINPLACE_CMD} -e 's,usb_revision.h,usbdi.h,g' \ - ${WRKSRC}/../apps/kinfocenter/usbview/usbdevices.h + ${PATCH_WRKSRC}/apps/kinfocenter/usbview/usbdevices.h .endif .include <bsd.port.post.mk> diff --git a/x11/kde4-baseapps/files/extra-patch-libusb20 b/x11/kde4-baseapps/files/extra-patch-libusb20 index 9557a658893..18f4782c450 100644 --- a/x11/kde4-baseapps/files/extra-patch-libusb20 +++ b/x11/kde4-baseapps/files/extra-patch-libusb20 @@ -1,6 +1,6 @@ -diff -u -r ../apps/kinfocenter/usbview/CMakeLists.txt ../apps/kinfocenter/usbview/CMakeLists.txt ---- ../apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:54:55.000000000 +0200 -+++ ../apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:55:58.000000000 +0200 +diff -u -r ./apps/kinfocenter/usbview/CMakeLists.txt ./apps/kinfocenter/usbview/CMakeLists.txt +--- ./apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:54:55.000000000 +0200 ++++ ./apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:55:58.000000000 +0200 @@ -9,7 +9,7 @@ kde4_add_plugin(kcm_usb ${kcm_usb_PART_SRCS}) @@ -10,9 +10,9 @@ diff -u -r ../apps/kinfocenter/usbview/CMakeLists.txt ../apps/kinfocenter/usbvie install(TARGETS kcm_usb DESTINATION ${PLUGIN_INSTALL_DIR} ) -diff -u -r ../apps/kinfocenter/usbview/usbdevices.cpp ../apps/kinfocenter/usbview/usbdevices.cpp ---- ../apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:54:55.000000000 +0200 -+++ ../apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:55:58.000000000 +0200 +diff -u -r ./apps/kinfocenter/usbview/usbdevices.cpp ./apps/kinfocenter/usbview/usbdevices.cpp +--- ./apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:54:55.000000000 +0200 ++++ ./apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:55:58.000000000 +0200 @@ -294,17 +294,25 @@ /* @@ -154,9 +154,9 @@ diff -u -r ../apps/kinfocenter/usbview/usbdevices.cpp ../apps/kinfocenter/usbvie return true; } #endif -diff -u -r ../apps/kinfocenter/usbview/usbdevices.h ../apps/kinfocenter/usbview/usbdevices.h ---- ../apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:54:55.000000000 +0200 -+++ ../apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:59:11.000000000 +0200 +diff -u -r ./apps/kinfocenter/usbview/usbdevices.h ./apps/kinfocenter/usbview/usbdevices.h +--- ./apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:54:55.000000000 +0200 ++++ ./apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:59:11.000000000 +0200 @@ -14,18 +14,11 @@ #include <QList> #include <QString> diff --git a/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake b/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake index 37de8dc3f35..1cd6d43a3e3 100644 --- a/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake +++ b/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake @@ -1,5 +1,5 @@ ---- ../apps/cmake/modules/FindPCIUTILS.cmake.orig 2008-08-07 15:20:57.000000000 +0000 -+++ ../apps/cmake/modules/FindPCIUTILS.cmake 2008-12-27 11:49:04.000000000 +0000 +--- ./apps/cmake/modules/FindPCIUTILS.cmake.orig 2008-08-07 15:20:57.000000000 +0000 ++++ ./apps/cmake/modules/FindPCIUTILS.cmake 2008-12-27 11:49:04.000000000 +0000 @@ -14,7 +14,11 @@ FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pci) if(PCIUTILS_LIBRARY) diff --git a/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h b/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h index 05f6d8d8981..57c5437c6ff 100644 --- a/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h +++ b/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h @@ -1,5 +1,5 @@ ---- ../apps/kinfocenter/usbview/usbdevices.h.orig 2008-10-17 03:00:14.000000000 -0800 -+++ ../apps/kinfocenter/usbview/usbdevices.h 2009-03-01 21:01:18.000000000 -0900 +--- ./apps/kinfocenter/usbview/usbdevices.h.orig 2008-10-17 03:00:14.000000000 -0800 ++++ ./apps/kinfocenter/usbview/usbdevices.h 2009-03-01 21:01:18.000000000 -0900 @@ -18,7 +18,12 @@ #include <bus/usb/usb.h> #include <QStringList> diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 9706e61b9eb..4f60533ca2b 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system -LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ +LIB_DEPENDS= lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ xine.1:${PORTSDIR}/multimedia/libxine \ slp.1:${PORTSDIR}/net/openslp @@ -32,7 +32,7 @@ MAKE_JOBS_SAFE= yes MAN1= kdesu.1 MAN8= nepomukserver.8 nepomukservicestub.8 -OPTIONS= PULSEAUDIO "Enable playback via PulseAudio soundserver" off +OPTIONS= PULSEAUDIO "Enable playback via PulseAudio soundserver" off .include <bsd.port.pre.mk> @@ -43,18 +43,11 @@ LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF .endif -CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" -CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" -CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" - -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - ${WRKSRC}/../khelpcenter/infotree.cpp \ - ${WRKSRC}/../kioslave/info/kde-info2html.conf \ - ${WRKSRC}/../kioslave/man/kio_man.cpp \ - ${WRKSRC}/../kioslave/man/man2html.cpp + ${PATCH_WRKSRC}/khelpcenter/infotree.cpp \ + ${PATCH_WRKSRC}/kioslave/info/kde-info2html.conf \ + ${PATCH_WRKSRC}/kioslave/man/kio_man.cpp \ + ${PATCH_WRKSRC}/kioslave/man/man2html.cpp .include <bsd.port.post.mk> diff --git a/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl index 34c61416467..c52c60e287b 100644 --- a/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl +++ b/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl @@ -1,5 +1,5 @@ ---- ../khelpcenter/searchhandlers/khc_mansearch.pl.orig 2008-08-02 17:06:48.000000000 +0200 -+++ ../khelpcenter/searchhandlers/khc_mansearch.pl 2008-08-02 17:07:03.000000000 +0200 +--- ./khelpcenter/searchhandlers/khc_mansearch.pl.orig 2008-08-02 17:06:48.000000000 +0200 ++++ ./khelpcenter/searchhandlers/khc_mansearch.pl 2008-08-02 17:07:03.000000000 +0200 @@ -55,7 +55,7 @@ while( <MAN> ) { # print "RAW:$_"; diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 0f2e48931d2..337edf9ce63 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 25851f03769..b0a9a4744f7 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 78ebf36725c..15eec2aa583 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 d7654a8cbd5..45f403dd292 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 a6bdc04d66b..b08046ff901 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 efe4fd885e9..1b7b451570d 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 a112710f60f..951988f978b 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 978857c88f1..e2aa9fc7591 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 df52f95fab3..87896f1d25e 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 cbcfad414d0..946eb9395aa 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 1de4d0ae85d..d9b0efedd65 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 770d2cf432c..de32b4591cd 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 ) diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 9706e61b9eb..4f60533ca2b 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system -LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ +LIB_DEPENDS= lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ xine.1:${PORTSDIR}/multimedia/libxine \ slp.1:${PORTSDIR}/net/openslp @@ -32,7 +32,7 @@ MAKE_JOBS_SAFE= yes MAN1= kdesu.1 MAN8= nepomukserver.8 nepomukservicestub.8 -OPTIONS= PULSEAUDIO "Enable playback via PulseAudio soundserver" off +OPTIONS= PULSEAUDIO "Enable playback via PulseAudio soundserver" off .include <bsd.port.pre.mk> @@ -43,18 +43,11 @@ LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF .endif -CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" -CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" -CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" - -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - ${WRKSRC}/../khelpcenter/infotree.cpp \ - ${WRKSRC}/../kioslave/info/kde-info2html.conf \ - ${WRKSRC}/../kioslave/man/kio_man.cpp \ - ${WRKSRC}/../kioslave/man/man2html.cpp + ${PATCH_WRKSRC}/khelpcenter/infotree.cpp \ + ${PATCH_WRKSRC}/kioslave/info/kde-info2html.conf \ + ${PATCH_WRKSRC}/kioslave/man/kio_man.cpp \ + ${PATCH_WRKSRC}/kioslave/man/man2html.cpp .include <bsd.port.post.mk> diff --git a/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl index 34c61416467..c52c60e287b 100644 --- a/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl +++ b/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl @@ -1,5 +1,5 @@ ---- ../khelpcenter/searchhandlers/khc_mansearch.pl.orig 2008-08-02 17:06:48.000000000 +0200 -+++ ../khelpcenter/searchhandlers/khc_mansearch.pl 2008-08-02 17:07:03.000000000 +0200 +--- ./khelpcenter/searchhandlers/khc_mansearch.pl.orig 2008-08-02 17:06:48.000000000 +0200 ++++ ./khelpcenter/searchhandlers/khc_mansearch.pl 2008-08-02 17:07:03.000000000 +0200 @@ -55,7 +55,7 @@ while( <MAN> ) { # print "RAW:$_"; diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 0f2e48931d2..337edf9ce63 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-CMakeLists.txt b/x11/kdebase4-workspace/files/patch-CMakeLists.txt index 25851f03769..b0a9a4744f7 100644 --- a/x11/kdebase4-workspace/files/patch-CMakeLists.txt +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp b/x11/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp index 78ebf36725c..15eec2aa583 100644 --- a/x11/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt index d7654a8cbd5..45f403dd292 100644 --- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-ksmserver_fadeeffect.cpp b/x11/kdebase4-workspace/files/patch-ksmserver_fadeeffect.cpp index a6bdc04d66b..b08046ff901 100644 --- a/x11/kdebase4-workspace/files/patch-ksmserver_fadeeffect.cpp +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd b/x11/kdebase4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd index efe4fd885e9..1b7b451570d 100644 --- a/x11/kdebase4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc b/x11/kdebase4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc index a112710f60f..951988f978b 100644 --- a/x11/kdebase4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c index 978857c88f1..e2aa9fc7591 100644 --- a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h index df52f95fab3..87896f1d25e 100644 --- a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp b/x11/kdebase4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp index cbcfad414d0..946eb9395aa 100644 --- a/x11/kdebase4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt b/x11/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt index 1de4d0ae85d..d9b0efedd65 100644 --- a/x11/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt b/x11/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt index 770d2cf432c..de32b4591cd 100644 --- a/x11/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt +++ b/x11/kdebase4-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 ) diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index b33378a5a14..99dd3ec510b 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -30,7 +31,7 @@ QT_COMPONENTS= corelib opengl dbus qt3support \ qmake_build moc_build rcc_build uic_build USE_GETTEXT= yes -USE_KDE4= kdelibs runtime workspace kdeprefix kdehier automoc4 +USE_KDE4= kdelibs workspace kdeprefix kdehier automoc4 KDE4_BUILDENV= yes MAKE_JOBS_SAFE= yes @@ -47,16 +48,13 @@ MAN1= kappfinder.1 \ LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: .if ${OSVERSION} > 800090 @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-libusb20 .endif .if ${OSVERSION} >= 800100 @${REINPLACE_CMD} -e 's,usb_revision.h,usbdi.h,g' \ - ${WRKSRC}/../apps/kinfocenter/usbview/usbdevices.h + ${PATCH_WRKSRC}/apps/kinfocenter/usbview/usbdevices.h .endif .include <bsd.port.post.mk> diff --git a/x11/kdebase4/files/extra-patch-libusb20 b/x11/kdebase4/files/extra-patch-libusb20 index 9557a658893..18f4782c450 100644 --- a/x11/kdebase4/files/extra-patch-libusb20 +++ b/x11/kdebase4/files/extra-patch-libusb20 @@ -1,6 +1,6 @@ -diff -u -r ../apps/kinfocenter/usbview/CMakeLists.txt ../apps/kinfocenter/usbview/CMakeLists.txt ---- ../apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:54:55.000000000 +0200 -+++ ../apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:55:58.000000000 +0200 +diff -u -r ./apps/kinfocenter/usbview/CMakeLists.txt ./apps/kinfocenter/usbview/CMakeLists.txt +--- ./apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:54:55.000000000 +0200 ++++ ./apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:55:58.000000000 +0200 @@ -9,7 +9,7 @@ kde4_add_plugin(kcm_usb ${kcm_usb_PART_SRCS}) @@ -10,9 +10,9 @@ diff -u -r ../apps/kinfocenter/usbview/CMakeLists.txt ../apps/kinfocenter/usbvie install(TARGETS kcm_usb DESTINATION ${PLUGIN_INSTALL_DIR} ) -diff -u -r ../apps/kinfocenter/usbview/usbdevices.cpp ../apps/kinfocenter/usbview/usbdevices.cpp ---- ../apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:54:55.000000000 +0200 -+++ ../apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:55:58.000000000 +0200 +diff -u -r ./apps/kinfocenter/usbview/usbdevices.cpp ./apps/kinfocenter/usbview/usbdevices.cpp +--- ./apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:54:55.000000000 +0200 ++++ ./apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:55:58.000000000 +0200 @@ -294,17 +294,25 @@ /* @@ -154,9 +154,9 @@ diff -u -r ../apps/kinfocenter/usbview/usbdevices.cpp ../apps/kinfocenter/usbvie return true; } #endif -diff -u -r ../apps/kinfocenter/usbview/usbdevices.h ../apps/kinfocenter/usbview/usbdevices.h ---- ../apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:54:55.000000000 +0200 -+++ ../apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:59:11.000000000 +0200 +diff -u -r ./apps/kinfocenter/usbview/usbdevices.h ./apps/kinfocenter/usbview/usbdevices.h +--- ./apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:54:55.000000000 +0200 ++++ ./apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:59:11.000000000 +0200 @@ -14,18 +14,11 @@ #include <QList> #include <QString> diff --git a/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake b/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake index 37de8dc3f35..1cd6d43a3e3 100644 --- a/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake +++ b/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake @@ -1,5 +1,5 @@ ---- ../apps/cmake/modules/FindPCIUTILS.cmake.orig 2008-08-07 15:20:57.000000000 +0000 -+++ ../apps/cmake/modules/FindPCIUTILS.cmake 2008-12-27 11:49:04.000000000 +0000 +--- ./apps/cmake/modules/FindPCIUTILS.cmake.orig 2008-08-07 15:20:57.000000000 +0000 ++++ ./apps/cmake/modules/FindPCIUTILS.cmake 2008-12-27 11:49:04.000000000 +0000 @@ -14,7 +14,11 @@ FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pci) if(PCIUTILS_LIBRARY) diff --git a/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h b/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h index 05f6d8d8981..57c5437c6ff 100644 --- a/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h +++ b/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h @@ -1,5 +1,5 @@ ---- ../apps/kinfocenter/usbview/usbdevices.h.orig 2008-10-17 03:00:14.000000000 -0800 -+++ ../apps/kinfocenter/usbview/usbdevices.h 2009-03-01 21:01:18.000000000 -0900 +--- ./apps/kinfocenter/usbview/usbdevices.h.orig 2008-10-17 03:00:14.000000000 -0800 ++++ ./apps/kinfocenter/usbview/usbdevices.h 2009-03-01 21:01:18.000000000 -0900 @@ -18,7 +18,12 @@ #include <bus/usb/usb.h> #include <QStringList> diff --git a/x11/kdelibs4-experimental/Makefile b/x11/kdelibs4-experimental/Makefile index cacc344b34c..ee2d9c41634 100644 --- a/x11/kdelibs4-experimental/Makefile +++ b/x11/kdelibs4-experimental/Makefile @@ -8,18 +8,19 @@ PORTNAME= kdelibs-experimental PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src PKGNAMESUFFIX?= # empty DIST_SUBDIR= KDE -MAINTAINER= kde at FreeBSD.org +MAINTAINER= kde@FreeBSD.org COMMENT= Experimantal set of libraries needed by KDE programs LATEST_LINK= ${PORTNAME}4 -USE_KDE4= kdelibs kdeprefix kdehier automoc4 sharedmime +USE_KDE4= kdelibs kdeprefix kdehier automoc4 KDE4_BUILDENV= yes USE_BZIP2= yes USE_GETTEXT= yes @@ -28,13 +29,4 @@ QT_COMPONENTS= corelib opengl dbus phonon \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes -.include <bsd.port.pre.mk> - -post-extract: - ${MKDIR} ${WRKSRC} - -pre-configure: - -post-install: - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 1b9429a0d43..ee85a29b0a1 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,8 +18,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs -BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell \ - update-mime-database:${PORTSDIR}/misc/shared-mime-info +BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \ soprano.4:${PORTSDIR}/textproc/soprano \ IlmImf:${PORTSDIR}/graphics/OpenEXR \ @@ -36,7 +36,6 @@ LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ smbclient.0:${PORTSDIR}/net/samba-libsmbclient RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ - update-mime-database:${PORTSDIR}/misc/shared-mime-info \ iceauth:${PORTSDIR}/x11/iceauth \ xauth:${PORTSDIR}/x11/xauth @@ -50,7 +49,6 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_BISON= build USE_OPENSSL= yes -USE_BDB= 40+ USE_QT_VER= 4 QT_COMPONENTS= corelib dbus gui network opengl qt3support \ qtestlib script sql svg xml designer phonon \ @@ -61,13 +59,7 @@ MAKE_JOBS_SAFE= yes CMAKE_ARGS+= -DWITH_FAM:BOOL=Off \ -DWITH_ACL:BOOL=Off \ - -DKDE4_PREFIX:String=${KDE4_PREFIX} \ - -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \ - -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" -CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" -CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" -CMAKE_ARGS+= -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" + -DKDE4_PREFIX:String=${KDE4_PREFIX} MAN1= checkXML.1 \ kde4-config.1 \ @@ -93,35 +85,32 @@ LIB_DEPENDS+= avahi-qt4:${PORTSDIR}/net/avahi-qt4 \ LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder .endif -post-extract: - ${MKDIR} ${WRKSRC} - post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - ${WRKSRC}/../kde3support/kdeui/k3sconfig.cpp \ - ${WRKSRC}/../kdecore/network/k3socks.cpp \ - ${WRKSRC}/../kdecore/kernel/kstandarddirs.cpp \ - ${WRKSRC}/../kdeui/dialogs/kcupsoptionswidget_p.cpp \ - ${WRKSRC}/../kdeui/kernel/start-session-bus.sh \ - ${WRKSRC}/../kio/kssl/kopenssl.cpp \ - ${WRKSRC}/../kio/kio/ksambashare.cpp \ - ${WRKSRC}/../kjsembed/qtonly/FindQJSInternal.cmake + ${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \ + ${PATCH_WRKSRC}/kdecore/network/k3socks.cpp \ + ${PATCH_WRKSRC}/kdecore/kernel/kstandarddirs.cpp \ + ${PATCH_WRKSRC}/kdeui/dialogs/kcupsoptionswidget_p.cpp \ + ${PATCH_WRKSRC}/kdeui/kernel/start-session-bus.sh \ + ${PATCH_WRKSRC}/kio/kssl/kopenssl.cpp \ + ${PATCH_WRKSRC}/kio/kio/ksambashare.cpp \ + ${PATCH_WRKSRC}/kjsembed/qtonly/FindQJSInternal.cmake pre-configure: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/../cmake/modules/*.cmake - ${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \ - -e 's|NAMES db|NAMES ${BDB_LIB_NAME} ${LOCALBASE}/lib|' \ - ${WRKSRC}/../cmake/modules/FindBerkeleyDB.cmake - ${REINPLACE_CMD} -e 's|addToUtmp ""|addToUtmp "${LOCALBASE}/lib"|' \ - -e 's|utempter.h|${LOCALBASE}/include/utempter.h|' \ - ${WRKSRC}/../ConfigureChecks.cmake - #prevent updating mime during build + ${PATCH_WRKSRC}/cmake/modules/*.cmake \ + ${PATCH_WRKSRC}/ConfigureChecks.cmake +# FindBerkeleyDB.cmake should be rewritten to support multiple version +# provided by ports, instead of hardcoding one of them +# ${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \ +# -e 's|NAMES db|NAMES ${BDB_LIB_NAME} ${LOCALBASE}/lib|' \ +# ${PATCH_WRKSRC}/cmake/modules/FindBerkeleyDB.cmake +# prevent updating mime during build # ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \ -# ${WRKSRC}/../mimetypes/CMakeLists.txt - #default KDEHOME dir +# ${PATCH_WRKSRC}/mimetypes/CMakeLists.txt +# default KDEHOME dir ${REINPLACE_CMD} -e '/KDE_DEFAULT_HOME/s|.kde|.kde4|' \ - ${WRKSRC}/../CMakeLists.txt + ${PATCH_WRKSRC}/CMakeLists.txt post-install: @-update-mime-database ${PREFIX}/share/mime diff --git a/x11/kdelibs4/files/patch-ConfigureChecks.cmake b/x11/kdelibs4/files/patch-ConfigureChecks.cmake new file mode 100644 index 00000000000..a4eb9582098 --- /dev/null +++ b/x11/kdelibs4/files/patch-ConfigureChecks.cmake @@ -0,0 +1,17 @@ +--- ./ConfigureChecks.cmake.orig 2009-06-09 20:09:30.000000000 +0400 ++++ ./ConfigureChecks.cmake 2009-08-06 13:42:18.000000000 +0400 +@@ -144,11 +144,11 @@ + + set(UTIL_LIBRARY) + +- check_library_exists(utempter addToUtmp "" HAVE_ADDTOUTEMP) +- check_include_files(utempter.h HAVE_UTEMPTER_H) ++ check_library_exists(utempter addToUtmp "/usr/local/lib" HAVE_ADDTOUTEMP) ++ check_include_files(/usr/local/include/utempter.h HAVE_UTEMPTER_H) + if (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H) + set(HAVE_UTEMPTER 1) +- set(UTEMPTER_LIBRARY utempter) ++ set(UTEMPTER_LIBRARY /usr/local/lib/libutempter.so) + else (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H) + check_function_exists(login login_in_libc) + if (NOT login_in_libc) diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake index 1a407b728bc..060db0ae57b 100644 --- a/x11/kdelibs4/files/patch-KDE4Defaults.cmake +++ b/x11/kdelibs4/files/patch-KDE4Defaults.cmake @@ -1,5 +1,5 @@ ---- ../cmake/modules/KDE4Defaults.cmake.orgi 2009-05-10 10:28:06.000000000 +0200 -+++ ../cmake/modules/KDE4Defaults.cmake 2009-05-10 10:29:00.000000000 +0200 +--- ./cmake/modules/KDE4Defaults.cmake.orgi 2009-05-10 10:28:06.000000000 +0200 ++++ ./cmake/modules/KDE4Defaults.cmake 2009-05-10 10:29:00.000000000 +0200 @@ -24,12 +24,12 @@ # define the generic version of the libraries here # this makes it easy to advance it when the next KDE release comes diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake index 5a4f9757769..176b4f1bc9c 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake @@ -1,5 +1,5 @@ ---- ../cmake/modules/FindKDE4Internal.cmake.orig 2009-02-26 17:18:26.000000000 +0300 -+++ ../cmake/modules/FindKDE4Internal.cmake 2009-03-22 14:42:53.000000000 +0300 +--- ./cmake/modules/FindKDE4Internal.cmake.orig 2009-02-26 17:18:26.000000000 +0300 ++++ ./cmake/modules/FindKDE4Internal.cmake 2009-03-22 14:42:53.000000000 +0300 @@ -550,7 +550,7 @@ # whether to install a CMake FooConfig.cmake into lib/foo/cmake/ or /lib/cmake/foo/ # (with 2.6.3 and above also lib/cmake/foo/ is supported): diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake index 2e5639bbadc..9e9c2e2e5ed 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindKdcraw.cmake @@ -1,5 +1,5 @@ ---- ../cmake/modules/FindKdcraw.cmake.orig 2009-01-06 17:27:37.000000000 +0000 -+++ ../cmake/modules/FindKdcraw.cmake 2009-01-25 08:34:44.000000000 +0000 +--- ./cmake/modules/FindKdcraw.cmake.orig 2009-01-06 17:27:37.000000000 +0000 ++++ ./cmake/modules/FindKdcraw.cmake 2009-01-25 08:34:44.000000000 +0000 @@ -51,7 +51,7 @@ # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake index 8844a6ab8e2..5b977de2d13 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindKexiv2.cmake @@ -1,5 +1,5 @@ ---- ../cmake/modules/FindKexiv2.cmake.orig 2009-01-06 17:27:37.000000000 +0000 -+++ ../cmake/modules/FindKexiv2.cmake 2009-01-25 08:34:53.000000000 +0000 +--- ./cmake/modules/FindKexiv2.cmake.orig 2009-01-06 17:27:37.000000000 +0000 ++++ ./cmake/modules/FindKexiv2.cmake 2009-01-25 08:34:53.000000000 +0000 @@ -49,7 +49,7 @@ # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake index 18a427d0d0d..9ba135be825 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindKipi.cmake @@ -1,5 +1,5 @@ ---- ../cmake/modules/FindKipi.cmake.orig 2009-01-06 17:27:37.000000000 +0000 -+++ ../cmake/modules/FindKipi.cmake 2009-01-25 08:35:05.000000000 +0000 +--- ./cmake/modules/FindKipi.cmake.orig 2009-01-06 17:27:37.000000000 +0000 ++++ ./cmake/modules/FindKipi.cmake 2009-01-25 08:35:05.000000000 +0000 @@ -50,7 +50,7 @@ # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake index fc29aa49695..7356bd884fa 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake @@ -1,5 +1,5 @@ ---- ../cmake/modules/FindLibKonq.cmake.orig 2009-05-27 21:54:40.000000000 +0200 -+++ ../cmake/modules/FindLibKonq.cmake 2009-06-06 01:53:49.000000000 +0200 +--- ./cmake/modules/FindLibKonq.cmake.orig 2009-05-27 21:54:40.000000000 +0200 ++++ ./cmake/modules/FindLibKonq.cmake 2009-06-06 01:53:49.000000000 +0200 @@ -14,7 +14,7 @@ find_path(LIBKONQ_INCLUDE_DIR konq_popupmenuplugin.h ) diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindPhonon.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindPhonon.cmake index 2ba8f352bf4..59618579d54 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindPhonon.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindPhonon.cmake @@ -1,5 +1,5 @@ ---- ../cmake/modules/FindPhonon.cmake.orig 2008-12-04 11:35:54.000000000 +0300 -+++ ../cmake/modules/FindPhonon.cmake 2008-12-15 23:16:39.000000000 +0300 +--- ./cmake/modules/FindPhonon.cmake.orig 2008-12-04 11:35:54.000000000 +0300 ++++ ./cmake/modules/FindPhonon.cmake 2008-12-15 23:16:39.000000000 +0300 @@ -27,11 +27,11 @@ endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake index cfdac69ba1f..94c8f88c9ef 100644 --- a/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake +++ b/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake @@ -1,5 +1,5 @@ ---- ../cmake/modules/FindQt4.cmake.orig 2008-10-17 15:01:33.000000000 +0400 -+++ ../cmake/modules/FindQt4.cmake 2008-12-16 00:40:06.000000000 +0300 +--- ./cmake/modules/FindQt4.cmake.orig 2008-10-17 15:01:33.000000000 +0400 ++++ ./cmake/modules/FindQt4.cmake 2008-12-16 00:40:06.000000000 +0300 @@ -1096,13 +1096,13 @@ ) diff --git a/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp b/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp index 964be83b064..964c065c99a 100644 --- a/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp +++ b/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp @@ -1,5 +1,5 @@ ---- ../kio/kio/kdirwatch.cpp.orgi 2009-01-27 18:07:49.000000000 +0100 -+++ ../kio/kio/kdirwatch.cpp 2009-01-27 18:15:04.000000000 +0100 +--- ./kio/kio/kdirwatch.cpp.orgi 2009-01-27 18:07:49.000000000 +0100 ++++ ./kio/kio/kdirwatch.cpp 2009-01-27 18:15:04.000000000 +0100 @@ -89,6 +89,9 @@ } else if (method == "QFSWatch") { return KDirWatchPrivate::QFSWatch; diff --git a/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp b/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp index a09820ab85d..004f25901f9 100644 --- a/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp +++ b/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp @@ -1,5 +1,5 @@ ---- ../kio/kfile/kpropertiesdialog.cpp.orig 2009-05-06 14:14:38.000000000 +0400 -+++ ../kio/kfile/kpropertiesdialog.cpp 2009-05-30 00:46:08.000000000 +0400 +--- ./kio/kfile/kpropertiesdialog.cpp.orig 2009-05-06 14:14:38.000000000 +0400 ++++ ./kio/kfile/kpropertiesdialog.cpp 2009-05-30 00:46:08.000000000 +0400 @@ -1804,7 +1804,15 @@ #else QVarLengthArray<gid_t> groups; diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile index f0e39a186de..8644a9e4621 100644 --- a/x11/qimageblitz/Makefile +++ b/x11/qimageblitz/Makefile @@ -7,23 +7,20 @@ PORTNAME= qimageblitz PORTVERSION= 0.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= SF MAINTAINER= kde@FreeBSD.org -COMMENT= KDE 4 integrated X11 desktop +COMMENT= Graphical effects and filters library for KDE4 USE_BZIP2= yes -GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_QT_VER= 4 QT_COMPONENTS= gui qmake_build moc_build uic_build rcc_build USE_CMAKE= yes -CMAKE_VERBOSE= yes post-patch: - ${MKDIR} ${WRKSRC} ${REINPLACE_CMD} -e \ 's,$${LIB_INSTALL_DIR}/pkgconfig,libdata/pkgconfig,' \ ${WRKSRC}/blitz/CMakeLists.txt |