Index: head/x11/kdelibs4/Makefile =================================================================== --- head/x11/kdelibs4/Makefile (revision 312297) +++ head/x11/kdelibs4/Makefile (revision 312298) @@ -1,144 +1,145 @@ # Created by: arved@FreeBSD.org # $FreeBSD$ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ aspell:${PORTSDIR}/textproc/aspell \ jasper:${PORTSDIR}/graphics/jasper \ pcre:${PORTSDIR}/devel/pcre \ avahi-core:${PORTSDIR}/net/avahi-app \ enchant:${PORTSDIR}/textproc/enchant \ gif:${PORTSDIR}/graphics/giflib \ png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ hal:${PORTSDIR}/sysutils/hal \ qca:${PORTSDIR}/devel/qca \ HUpnp:${PORTSDIR}/net/hupnp \ polkit-qt-core-1:${PORTSDIR}/sysutils/polkit-qt \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ dbusmenu-qt:${PORTSDIR}/devel/libdbusmenu-qt BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell \ ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ xauth:${PORTSDIR}/x11/xauth \ ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ ${LOCALBASE}/share/aspell/en.multi:${PORTSDIR}/textproc/en-aspell CONFLICTS= kdebase-runtime-4.5.[0-5] LATEST_LINK= ${PORTNAME}4 USE_XZ= yes USE_FAM= yes USE_GETTEXT= yes USE_GNOME= libxml2 libxslt USE_KDE4= kdehier kdeprefix oxygen \ attica automoc4 ontologies sharedmime soprano strigi KDE4_BUILDENV= yes USE_OPENSSL= yes USE_PERL5= yes USE_QT4= dbus declarative designer gui imageformats_run \ network opengl phonon qdbusviewer_run qt3support \ qtestlib script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build USE_XORG= sm x11 xcursor xext xfixes xrender xtst MAKE_JOBS_SAFE= yes CMAKE_ARGS+= -DWITH_ACL:BOOL=Off \ -DWITH_FAM:BOOL=On \ -DHUPNP_INCLUDE_PATH:PATH="${LOCALBASE}/include" \ -DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \ -DKDE_DEFAULT_HOME:STRING=".kde4" MAN1= checkXML.1 \ kconfig_compiler.1 \ kde4-config.1 \ kdecmake.1 \ kjs.1 \ kjscmd.1 \ kross.1 \ makekdewidgets.1 \ preparetips.1 MAN7= kdeoptions.7 \ qtoptions.7 MAN8= kbuildsycoca4.8 \ kcookiejar4.8 \ kded4.8 \ kdeinit4.8 \ meinproc4.8 .include .if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz .endif .if ${OSVERSION} < 900004 LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter EXTRA_PATCHES= ${FILESDIR}/extra-patch-ConfigureChecks.cmake .endif .if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h) || defined(WITH_LIBDNS) LIB_DEPENDS+= avahi-qt4.1:${PORTSDIR}/net/avahi-qt4 \ dns_sd:${PORTSDIR}/net/avahi-libdns .else LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder .endif post-patch: ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${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 # Fix rgb named colors database path. ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/kdeui/colors/kcolordialog.cpp # Ports fails to locate pimlibs and workspace when PREFIX!=KDE4_PREFIX. # More search paths resolve the problem. .for module in KdepimLibs KDE4Workspace ${REINPLACE_CMD} -e '/find_package/s,PATHS,PATHS ${KDE4_PREFIX}/lib/cmake/${module},' \ ${PATCH_WRKSRC}/cmake/modules/Find${module}.cmake .endfor pre-configure: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/cmake/modules/*.cmake \ ${PATCH_WRKSRC}/ConfigureChecks.cmake \ ${PATCH_WRKSRC}/doc/api/doxygen.sh ${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \ ${PATCH_WRKSRC}/cmake/modules/FindDNSSD.cmake ${REINPLACE_CMD} -e 's|soprano/cmake|cmake/Modules|g' \ ${PATCH_WRKSRC}/cmake/modules/FindSoprano.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 # When XSync (xext) is found, xscreensaver is just used as a fallback, # then we can disable it. ${REINPLACE_CMD} -e '/macro_bool_to_01/ s|^.*X11_Xscreensaver.*$$|set(HAVE_XSCREENSAVER 0)|' \ ${PATCH_WRKSRC}/CMakeLists.txt post-install: @-update-mime-database ${PREFIX}/share/mime .include Index: head/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake =================================================================== --- head/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake (revision 312297) +++ head/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake (revision 312298) @@ -1,13 +1,22 @@ ---- cmake/modules/FindKDE4Internal.cmake.orig 2010-06-02 02:55:14.000000000 -0400 -+++ cmake/modules/FindKDE4Internal.cmake 2010-06-02 02:57:53.000000000 -0400 -@@ -855,8 +855,8 @@ +--- ./cmake/modules/FindKDE4Internal.cmake.orig 2012-11-30 07:17:39.000000000 +0000 ++++ ./cmake/modules/FindKDE4Internal.cmake 2013-02-15 15:45:41.732493091 +0000 +@@ -893,8 +893,8 @@ _set_fancy(XDG_MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mime/packages" "The install dir for the xdg mimetypes") _set_fancy(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "The sysconfig install dir (default ${CMAKE_INSTALL_PREFIX}/etc)") - _set_fancy(MAN_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/man" "The man install dir (default ${SHARE_INSTALL_PREFIX}/man/)") - _set_fancy(INFO_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/info" "The info install dir (default ${SHARE_INSTALL_PREFIX}/info)") + _set_fancy(MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man" "The man install dir (default ${SHARE_INSTALL_PREFIX}/man/)") + _set_fancy(INFO_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/info" "The info install dir (default ${SHARE_INSTALL_PREFIX}/info)") _set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" "The dbus interfaces install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)") _set_fancy(DBUS_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/services" "The dbus services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/services)") _set_fancy(DBUS_SYSTEM_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/system-services" "The dbus system services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/system-services)") +@@ -1204,7 +1204,7 @@ + set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") + +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") + # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") + Property changes on: head/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property