diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2010-05-22 16:20:31 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2010-05-22 16:20:31 +0000 |
| commit | 65bc39508f7f53022a90d8b514fed092d39fa506 (patch) | |
| tree | dd9d77b116f3fc6302740829ad97551172255cf2 /deskutils | |
| parent | 3729defbd9161a2b687e62bf1c26086ee56289a5 (diff) | |
| download | ports-65bc39508f7f53022a90d8b514fed092d39fa506.tar.gz ports-65bc39508f7f53022a90d8b514fed092d39fa506.zip | |
Point pimlibs dependent ports directly to kde4 libraries,
so they don't link with kdepim3.
Reported by: Jan Henrik Sylvester <me at janh.de> via kde@freebsd maillist.
Notes
Notes:
svn path=/head/; revision=254848
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/kdepimlibs4/Makefile | 6 | ||||
| -rw-r--r-- | deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile index 09b69a3bc73e..375fa0ef46e5 100644 --- a/deskutils/kdepimlibs4/Makefile +++ b/deskutils/kdepimlibs4/Makefile @@ -6,7 +6,7 @@ PORTNAME= kdepimlibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -40,10 +40,12 @@ PLIST_SUB+= WITH_PTH='' PLIST_SUB+= WITH_PTH='@comment ' .endif -post-extract: +post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/cmake/modules/*.cmake ${REINPLACE_CMD} -e '/find_package/s,PATHS,PATHS ${KDE4_PREFIX}/lib/cmake/Akonadi,' \ ${PATCH_WRKSRC}/cmake/modules/FindAkonadi.cmake + ${REINPLACE_CMD} -e 's|%%KDE4_PREFIX%%|${KDE4_PREFIX}|g' \ + ${PATCH_WRKSRC}/cmake/modules/FindQGpgme.cmake .include <bsd.port.post.mk> diff --git a/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake b/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake new file mode 100644 index 000000000000..699a90253521 --- /dev/null +++ b/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake @@ -0,0 +1,16 @@ +--- ./cmake/modules/FindQGpgme.cmake.orig 2009-05-06 14:13:19.000000000 +0400 ++++ ./cmake/modules/FindQGpgme.cmake 2010-05-21 23:58:20.499901479 +0400 +@@ -17,11 +17,11 @@ + HINTS ${GPGME_LIBRARY_DIR}) + else ( WIN32 ) + find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread +- HINTS ${GPGME_LIBRARY_DIR}) ++ HINTS ${GPGME_LIBRARY_DIR} %%KDE4_PREFIX%%/lib) + endif ( WIN32 ) + + find_library(QGPGME_LIBRARY qgpgme +- HINTS ${GPGME_LIBRARY_DIR}) ++ HINTS ${GPGME_LIBRARY_DIR} %%KDE4_PREFIX%%/lib) + + if (QGPGME_LIBRARY) + # get the libdirectory and then go one up |