Index: head/deskutils/kdepimlibs4/Makefile =================================================================== --- head/deskutils/kdepimlibs4/Makefile (revision 254847) +++ head/deskutils/kdepimlibs4/Makefile (revision 254848) @@ -1,49 +1,51 @@ # New ports collection Makefile for: kdepimplibs # Date created: 2008-01-20 # Whom: arved # # $FreeBSD$ 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 DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Libraries for KDE-PIM applications LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ sasl2:${PORTSDIR}/security/cyrus-sasl2 \ boost_python:${PORTSDIR}/devel/boost-python-libs \ ical.44:${PORTSDIR}/devel/libical CONFLICTS= kdepim-runtime-4.3.[1-4] USE_KDE4= kdelibs akonadi kdeprefix kdehier automoc4 KDE4_BUILDENV= yes USE_BZIP2= yes USE_QT_VER= 4 QT_COMPONENTS= corelib opengl dbus qt3support \ designer network svg qtestlib help \ qmake_build moc_build rcc_build uic_build USE_OPENLDAP= yes MAKE_JOBS_SAFE= yes .include .if exists(${LOCALBASE}/lib/libgpgme-pth.so) PLIST_SUB+= WITH_PTH='' .else 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 Property changes on: head/deskutils/kdepimlibs4/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.26 \ No newline at end of property +1.27 \ No newline at end of property Index: head/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake =================================================================== --- head/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake (nonexistent) +++ head/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake (revision 254848) @@ -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 Property changes on: head/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property