From owner-svn-ports-head@FreeBSD.ORG Fri Mar 22 14:18:18 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 64226A4F; Fri, 22 Mar 2013 14:18:18 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 54988E95; Fri, 22 Mar 2013 14:18:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2MEIIQf071680; Fri, 22 Mar 2013 14:18:18 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2MEI2P9071569; Fri, 22 Mar 2013 14:18:02 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201303221418.r2MEI2P9071569@svn.freebsd.org> From: Max Brazhnikov Date: Fri, 22 Mar 2013 14:18:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314933 - in head: Mk accessibility/jovie accessibility/kaccessible accessibility/kmag accessibility/kmousetool accessibility/kmouth archivers/ark astro/kstars astro/marble audio/juk au... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Mar 2013 14:18:18 -0000 Author: makc Date: Fri Mar 22 14:18:02 2013 New Revision: 314933 URL: http://svnweb.freebsd.org/changeset/ports/314933 Log: Mk/bsd.kde4.mk: - Don't set CMAKE_BUILD_TYPE for debug builds (cmake.mk already handles it) - Don't set WITH_DEBUG for unstable branch (KDE4_BRANCH) - Remove now useless KDE4_BUILDENV KDE SC ports: - Chase KDE4_BUILDENV removal: replace 'KDE4_BUILDENV= yes' with 'USES= cmake:outsource' and add USE_LDCONFIG if needed Modified: head/Mk/bsd.kde4.mk head/accessibility/jovie/Makefile head/accessibility/kaccessible/Makefile head/accessibility/kmag/Makefile head/accessibility/kmousetool/Makefile head/accessibility/kmouth/Makefile head/archivers/ark/Makefile head/astro/kstars/Makefile head/astro/marble/Makefile head/audio/juk/Makefile head/audio/kio-audiocd/Makefile head/audio/kmix/Makefile head/audio/kscd/Makefile head/audio/libkcddb/Makefile head/audio/libkcompactdisc/Makefile head/comms/kremotecontrol/Makefile head/deskutils/kcharselect/Makefile head/deskutils/kdepim4-runtime/Makefile head/deskutils/kdepim4/Makefile head/deskutils/kdepim44-runtime/Makefile head/deskutils/kdepim44/Makefile head/deskutils/kdepimlibs4/Makefile head/deskutils/kdeplasma-addons/Makefile head/deskutils/kruler/Makefile head/deskutils/superkaramba/Makefile head/devel/kdesdk4/Makefile head/devel/p5-perlkde/Makefile head/devel/p5-perlqt/Makefile head/devel/py-krosspython/Makefile head/devel/py-pykde4/Makefile head/devel/py-pykdeuic4/Makefile head/devel/ruby-korundum/Makefile head/devel/ruby-krossruby/Makefile head/devel/ruby-qtruby/Makefile head/devel/smokegen/Makefile head/devel/smokekde/Makefile head/devel/smokeqt/Makefile head/editors/kate/Makefile head/games/blinken/Makefile head/games/kajongg/Makefile head/games/kanagram/Makefile head/games/kdegames4/Makefile head/games/khangman/Makefile head/games/pairs/Makefile head/graphics/gwenview-kde4/Makefile head/graphics/kamera-kde4/Makefile head/graphics/kcolorchooser/Makefile head/graphics/kdegraphics4-mobipocket/Makefile head/graphics/kdegraphics4-strigi-analyzer/Makefile head/graphics/kdegraphics4-svgpart/Makefile head/graphics/kdegraphics4-thumbnailers/Makefile head/graphics/kolourpaint/Makefile head/graphics/ksaneplugin/Makefile head/graphics/ksnapshot/Makefile head/graphics/libkdcraw-kde4/Makefile head/graphics/libkexiv2-kde4/Makefile head/graphics/libkipi-kde4/Makefile head/graphics/libksane/Makefile head/graphics/okular/Makefile head/japanese/kiten/Makefile head/lang/kturtle/Makefile head/math/analitza/Makefile head/math/cantor/Makefile head/math/kalgebra/Makefile head/math/kbruch/Makefile head/math/kcalc/Makefile head/math/kig/Makefile head/math/kmplot/Makefile head/math/rocs/Makefile head/misc/kgeography/Makefile head/misc/klettres/Makefile head/misc/ktouch/Makefile head/misc/kwordquiz/Makefile head/misc/libkdeedu/Makefile head/misc/parley/Makefile head/multimedia/dragon/Makefile head/multimedia/kdemultimedia4-ffmpegthumbs/Makefile head/multimedia/kdemultimedia4-mplayerthumbs/Makefile head/net-im/kopete-kde4/Makefile head/net/kdenetwork4/Makefile head/net/krdc/Makefile head/net/krfb/Makefile head/print/kdeutils4-printer-applet/Makefile head/print/system-config-printer-kde/Makefile head/science/kalzium/Makefile head/science/step/Makefile head/security/kgpg-kde4/Makefile head/security/kwallet/Makefile head/sysutils/filelight-kde4/Makefile head/sysutils/kdeadmin4/Makefile head/sysutils/kdf/Makefile head/sysutils/kfloppy/Makefile head/sysutils/ksysguardd/Makefile head/sysutils/nepomuk-core/Makefile head/sysutils/sweeper/Makefile head/www/kdewebdev4/Makefile head/x11-clocks/kdetoys4/Makefile head/x11-clocks/ktimer/Makefile head/x11-themes/kde4-base-artwork/Makefile head/x11-themes/kde4-icons-oxygen/Makefile head/x11-themes/kde4-wallpapers/Makefile head/x11-themes/kdeartwork4/Makefile head/x11/kactivities/Makefile head/x11/kde4-baseapps/Makefile head/x11/kde4-runtime/Makefile head/x11/kde4-workspace/Makefile head/x11/kdelibs4/Makefile head/x11/kgamma/Makefile head/x11/konsole/Makefile head/x11/libkonq/Makefile head/x11/plasma-scriptengine-python/Makefile head/x11/plasma-scriptengine-ruby/Makefile Modified: head/Mk/bsd.kde4.mk ============================================================================== --- head/Mk/bsd.kde4.mk Fri Mar 22 13:41:53 2013 (r314932) +++ head/Mk/bsd.kde4.mk Fri Mar 22 14:18:02 2013 (r314933) @@ -102,7 +102,8 @@ NO_MTREE= yes . endif .endif -PLIST_SUB+= KDE4_PREFIX="${KDE4_PREFIX}" +PLIST_SUB+= KDE4_PREFIX="${KDE4_PREFIX}" \ + KDE4_VERSION="${KDE4_VERSION}" # Keep in sync with cmake/modules/PythonMacros.cmake _PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//} @@ -116,34 +117,6 @@ PLIST_SUB+= PYCACHE="" \ PYO_SUFFIX=pyo .endif -# The following definitions are not intended for usage in KDE4-dependent ports. -.if defined(KDE4_BUILDENV) - -USE_CMAKE= yes -CMAKE_SOURCE_PATH= ${WRKSRC} -USE_LDCONFIG= yes - -. if ${KDE4_BRANCH} == "unstable" -WITH_DEBUG= yes -. endif - -. if defined(WITH_DEBUG) -CMAKE_BUILD_TYPE= DebugFull -. endif - -PLIST_SUB+= KDE4_VERSION="${KDE4_VERSION}" - -CONFIGURE_WRKSRC= ${CMAKE_SOURCE_PATH}/build -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC?= ${BUILD_WRKSRC} - -post-extract: kde4-create-builddir - -kde4-create-builddir: - ${MKDIR} ${BUILD_WRKSRC} - -.endif # defined(KDE4_BUILDENV) - .endif # !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include) .if defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include) Modified: head/accessibility/jovie/Makefile ============================================================================== --- head/accessibility/jovie/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/accessibility/jovie/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -15,7 +15,7 @@ LIB_DEPENDS= speechd.5:${PORTSDIR}/acces CONFLICTS= ktts-4.[4-6].* USE_XZ= yes -USE_CMAKE= yes +USES= cmake USE_KDE4= kdehier kdeprefix kdelibs automoc4 USE_QT4= xml qmake_build moc_build uic_build rcc_build MAKE_JOBS_SAFE= yes Modified: head/accessibility/kaccessible/Makefile ============================================================================== --- head/accessibility/kaccessible/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/accessibility/kaccessible/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -16,7 +16,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0 USE_XZ= yes USE_KDE4= kdelibs kdeprefix kdehier automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes Modified: head/accessibility/kmag/Makefile ============================================================================== --- head/accessibility/kmag/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/accessibility/kmag/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -14,7 +14,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0 USE_XZ= yes USE_KDE4= kdelibs kdeprefix kdehier automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes Modified: head/accessibility/kmousetool/Makefile ============================================================================== --- head/accessibility/kmousetool/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/accessibility/kmousetool/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -14,7 +14,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0 USE_XZ= yes USE_KDE4= kdelibs kdeprefix kdehier automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= qmake_build moc_build rcc_build uic_build USE_XORG= xtst MAKE_JOBS_SAFE= yes Modified: head/accessibility/kmouth/Makefile ============================================================================== --- head/accessibility/kmouth/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/accessibility/kmouth/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -14,7 +14,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0 USE_XZ= yes USE_KDE4= kdelibs kdeprefix kdehier automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes Modified: head/archivers/ark/Makefile ============================================================================== --- head/archivers/ark/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/archivers/ark/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,8 +17,9 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].* USE_XZ= yes USE_KDE4= kdeprefix kdehier automoc4 kdelibs libkonq -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= qmake_build moc_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes MAN1= ark.1 Modified: head/astro/kstars/Makefile ============================================================================== --- head/astro/kstars/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/astro/kstars/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -20,7 +20,7 @@ RUN_DEPENDS= xplanet:${PORTSDIR}/astro/x CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= opengl qmake_build moc_build rcc_build uic_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/astro/marble/Makefile ============================================================================== --- head/astro/marble/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/astro/marble/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,12 +13,13 @@ COMMENT= Virtual globe and world atlas f CONFLICTS= kdeedu-4.4.[0-4] USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus declarative gui network \ phonon script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build USE_XZ= yes USE_GMAKE= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes CMAKE_ARGS= -DMOBILE:BOOL=FALSE Modified: head/audio/juk/Makefile ============================================================================== --- head/audio/juk/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/audio/juk/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -19,7 +19,7 @@ CONFLICTS_INSTALL= kdemultimedia-4.[1-8] CMAKE_ARGS= -DWITH_TunePimp:BOOL=OFF MAKE_JOBS_SAFE= yes -KDE4_BUILDENV= yes +USES= cmake:outsource USE_KDE4= automoc4 kdehier kdelibs kdeprefix USE_QT4= dbus qt3support svg \ moc_build qmake_build rcc_build uic_build Modified: head/audio/kio-audiocd/Makefile ============================================================================== --- head/audio/kio-audiocd/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/audio/kio-audiocd/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -21,8 +21,9 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/ CONFLICTS_INSTALL= kdemultimedia-4.[1-8].* +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -KDE4_BUILDENV= yes +USES= cmake:outsource USE_KDE4= kdehier kdelibs kdeprefix libkcddb libkcompactdisc \ automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build Modified: head/audio/kmix/Makefile ============================================================================== --- head/audio/kmix/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/audio/kmix/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -16,7 +16,7 @@ LICENSE= GPLv2 CONFLICTS_INSTALL= kdemultimedia-4.[1-8].* MAKE_JOBS_SAFE= yes -KDE4_BUILDENV= yes +USES= cmake:outsource USE_KDE4= automoc4 kdehier kdelibs kdeprefix USE_QT4= dbus phonon xml \ moc_build qmake_build rcc_build uic_build Modified: head/audio/kscd/Makefile ============================================================================== --- head/audio/kscd/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/audio/kscd/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -18,7 +18,7 @@ LIB_DEPENDS= musicbrainz3.6:${PORTSDIR} CONFLICTS_INSTALL= kdemultimedia-4.[1-8].* MAKE_JOBS_SAFE= yes -KDE4_BUILDENV= yes +USES= cmake:outsource USE_KDE4= kdehier kdelibs kdeprefix libkcddb libkcompactdisc \ automoc4 USE_QT4= phonon moc_build qmake_build rcc_build uic_build Modified: head/audio/libkcddb/Makefile ============================================================================== --- head/audio/libkcddb/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/audio/libkcddb/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -15,8 +15,9 @@ LIB_DEPENDS= musicbrainz5:${PORTSDIR}/a CONFLICTS_INSTALL= kdemultimedia-4.[1-8].* +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -KDE4_BUILDENV= yes +USES= cmake:outsource USE_KDE4= automoc4 kdehier kdelibs kdeprefix USE_QT4= moc_build qmake_build rcc_build uic_build USE_XZ= yes Modified: head/audio/libkcompactdisc/Makefile ============================================================================== --- head/audio/libkcompactdisc/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/audio/libkcompactdisc/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,8 +13,9 @@ COMMENT= KDE library for interfacing wi CONFLICTS_INSTALL= kdemultimedia-4.[1-8].* +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -KDE4_BUILDENV= yes +USES= cmake:outsource USE_KDE4= automoc4 kdehier kdelibs kdeprefix USE_QT4= dbus phonon moc_build qmake_build rcc_build uic_build USE_XZ= yes Modified: head/comms/kremotecontrol/Makefile ============================================================================== --- head/comms/kremotecontrol/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/comms/kremotecontrol/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,8 +17,9 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].* USE_XZ= yes USE_KDE4= kdeprefix kdehier automoc4 kdelibs -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= qmake_build moc_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/deskutils/kcharselect/Makefile ============================================================================== --- head/deskutils/kcharselect/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/deskutils/kcharselect/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -15,7 +15,7 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].* USE_XZ= yes USE_KDE4= kdeprefix kdehier automoc4 kdelibs -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes Modified: head/deskutils/kdepim4-runtime/Makefile ============================================================================== --- head/deskutils/kdepim4-runtime/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/deskutils/kdepim4-runtime/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -23,9 +23,10 @@ USE_XZ= yes USE_GNOME= libxml2 USE_KDE4= kdehier kdelibs kdeprefix pimlibs \ akonadi automoc4 ontologies sharedmime soprano strigi -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus designer gui network xml xmlpatterns \ qmake_build moc_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes CMAKE_ARGS= -DKDEPIM_MOBILE_UI:BOOL=OFF Modified: head/deskutils/kdepim4/Makefile ============================================================================== --- head/deskutils/kdepim4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/deskutils/kdepim4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -28,7 +28,7 @@ USE_GNOME= libxml2 USE_ICONV= yes USE_KDE4= kdehier kdelibs kdeprefix pimlibs \ akonadi automoc4 ontologies soprano strigi -KDE4_BUILDENV= yes +USES= cmake:outsource USE_OPENLDAP= yes USE_QT4= dbus designer gui network \ qt3support script sql webkit xml \ @@ -36,6 +36,7 @@ USE_QT4= dbus designer gui network \ USE_XORG= x11 xscrnsaver CMAKE_ARGS+= -DKDEPIM_BUILD_MOBILE:BOOL=FALSE USE_GMAKE= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes MAN1= kabcclient.1 Modified: head/deskutils/kdepim44-runtime/Makefile ============================================================================== --- head/deskutils/kdepim44-runtime/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/deskutils/kdepim44-runtime/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -18,9 +18,10 @@ CONFLICTS_INSTALL= kdepim-runtime-4.[89] LATEST_LINK= ${PORTNAME}44 USE_KDE4= pimlibs kdeprefix kdehier sharedmime automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_BZIP2= yes USE_QT4= qmake_build moc_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes post-patch: Modified: head/deskutils/kdepim44/Makefile ============================================================================== --- head/deskutils/kdepim44/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/deskutils/kdepim44/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -23,10 +23,11 @@ CONFLICTS_INSTALL= kdepim-4.[89].* USE_KDE4= kdelibs pimlibs \ akonadi kdeprefix kdehier automoc4 oxygen -KDE4_BUILDENV= yes +USES= cmake:outsource USE_BZIP2= yes USE_QT4= qmake_build moc_build rcc_build uic_build USE_OPENLDAP= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes MAN1= kabcclient.1 Modified: head/deskutils/kdepimlibs4/Makefile ============================================================================== --- head/deskutils/kdepimlibs4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/deskutils/kdepimlibs4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -23,10 +23,11 @@ BUILD_DEPENDS= xsltproc:${PORTSDIR}/text USE_XZ= yes USE_KDE4= kdelibs akonadi kdeprefix kdehier \ automoc4 ontologies sharedmime soprano -KDE4_BUILDENV= yes +USES= cmake:outsource USE_OPENLDAP= yes USE_QT4= dbus designer gui network sql xml \ qmake_build moc_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes post-patch: Modified: head/deskutils/kdeplasma-addons/Makefile ============================================================================== --- head/deskutils/kdeplasma-addons/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/deskutils/kdeplasma-addons/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -23,10 +23,11 @@ CONFLICTS_INSTALL= plasma-applet-icontas USE_XZ= yes USE_KDE4= kdehier kdelibs kdeprefix libkexiv2 pimlibs workspace \ akonadi attica automoc4 qimageblitz sharedmime soprano -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus gui network opengl script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 xrender xtst +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes OPTIONS_DEFINE= MARBLE IBUS SCIM Modified: head/deskutils/kruler/Makefile ============================================================================== --- head/deskutils/kruler/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/deskutils/kruler/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= KDE 4 screen ruler CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= corelib qmake_build moc_build uic_build rcc_build USE_XORG= x11 USE_XZ= yes Modified: head/deskutils/superkaramba/Makefile ============================================================================== --- head/deskutils/superkaramba/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/deskutils/superkaramba/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -15,8 +15,9 @@ CONFLICTS= kdeutils-4.[0-7].* USE_XZ= yes USE_PYTHON= 2.5+ USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= qmake_build moc_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/devel/kdesdk4/Makefile ============================================================================== --- head/devel/kdesdk4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/kdesdk4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -26,12 +26,13 @@ USE_XZ= yes USE_GNOME= libxml2 libxslt USE_KDE4= kdehier kdelibs kdeprefix libkonq pimlibs sharedmime \ akonadi automoc4 qimageblitz_build strigi -KDE4_BUILDENV= yes +USES= cmake:outsource USE_PERL5= yes USE_QT4= dbus designer gui qt3support \ script scripttools sql svg xml \ qmake_build moc_build rcc_build uic_build uic3_build USE_GMAKE= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" Modified: head/devel/p5-perlkde/Makefile ============================================================================== --- head/devel/p5-perlkde/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/p5-perlkde/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,10 +17,9 @@ USE_PERL5= yes USE_GCC= 4.6+ USE_KDE4= kdehier kdeprefix perlqt smokekde automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build -USE_CMAKE= yes +USES= cmake MAKE_JOBS_SAFE= yes -USE_LDCONFIG= yes # Respect PREFIX CMAKE_ARGS+= -DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} Modified: head/devel/p5-perlqt/Makefile ============================================================================== --- head/devel/p5-perlqt/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/p5-perlqt/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -18,10 +18,9 @@ USE_XZ= yes USE_PERL5= yes USE_KDE4= kdehier kdeprefix smokeqt qimageblitz USE_QT4= qmake_build moc_build uic_build rcc_build -USE_CMAKE= yes +USES= cmake MAKE_JOBS_SAFE= yes -USE_LDCONFIG= yes # Respect PREFIX CMAKE_ARGS+= -DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} Modified: head/devel/py-krosspython/Makefile ============================================================================== --- head/devel/py-krosspython/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/py-krosspython/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -16,7 +16,7 @@ USE_KDE4= kdehier kdelibs kdeprefix auto USE_PYTHON= 2.5+ USE_QT4= gui qmake_build moc_build uic_build rcc_build USE_XZ= yes -USE_CMAKE= yes +USES= cmake CMAKE_ARGS+= -DBUILD_falcon:BOOL=FALSE \ -DBUILD_ruby:BOOL=FALSE \ -DBUILD_java:BOOL=FALSE Modified: head/devel/py-pykde4/Makefile ============================================================================== --- head/devel/py-pykde4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/py-pykde4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -31,7 +31,7 @@ USE_KDE4= kdehier kdelibs kdeprefix okul USE_PYTHON= 2.5+ USE_QT4= corelib qmake_build moc_build uic_build rcc_build USE_XZ= yes -USE_CMAKE= yes +USES= cmake CMAKE_ARGS+= -DWITH_PolkitQt:BOOL=FALSE MAKE_JOBS_SAFE= yes Modified: head/devel/py-pykdeuic4/Makefile ============================================================================== --- head/devel/py-pykdeuic4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/py-pykdeuic4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,7 +17,7 @@ USE_PYTHON= 2.5+ USE_QT4= corelib qmake_build moc_build uic_build rcc_build USE_XZ= yes DISTINFO_FILE= ${PORTSDIR}/devel/py-pykde4/distinfo -USE_CMAKE= yes +USES= cmake MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} Modified: head/devel/ruby-korundum/Makefile ============================================================================== --- head/devel/ruby-korundum/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/ruby-korundum/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -20,7 +20,7 @@ USE_QT4= dbus network opengl sql svg xml qmake_build moc_build uic_build rcc_build USE_RUBY= yes USE_XZ= yes -USE_CMAKE= yes +USES= cmake MAKE_JOBS_SAFE= yes .include Modified: head/devel/ruby-krossruby/Makefile ============================================================================== --- head/devel/ruby-krossruby/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/ruby-krossruby/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -21,7 +21,7 @@ USE_KDE4= kdehier kdelibs kdeprefix piml USE_QT4= gui qmake_build moc_build uic_build rcc_build USE_RUBY= yes USE_XZ= yes -USE_CMAKE= yes +USES= cmake CMAKE_ARGS+= -DBUILD_python:BOOL=FALSE \ -DBUILD_falcon:BOOL=FALSE \ -DBUILD_java:BOOL=FALSE Modified: head/devel/ruby-qtruby/Makefile ============================================================================== --- head/devel/ruby-qtruby/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/ruby-qtruby/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -23,7 +23,7 @@ USE_QT4= dbus declarative designer gui n qmake_build moc_build uic_build rcc_build USE_RUBY= yes USE_XZ= yes -USE_CMAKE= yes +USES= cmake MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes Modified: head/devel/smokegen/Makefile ============================================================================== --- head/devel/smokegen/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/smokegen/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -15,7 +15,7 @@ CONFLICTS= kdebindings-smoke-4.[0-6].* USE_KDE4= kdehier kdeprefix USE_QT4= xml qmake_build moc_build uic_build rcc_build USE_XZ= yes -USE_CMAKE= yes +USES= cmake CMAKE_ARGS+= -DSMOKE_CMAKE_MODULE_DIR:PATH=${PREFIX}/lib/cmake/smoke MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes Modified: head/devel/smokekde/Makefile ============================================================================== --- head/devel/smokekde/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/smokekde/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,7 +17,7 @@ USE_KDE4= kate kdehier kdelibs kdeprefix USE_QT4= dbus designer gui network opengl qt3support sql svg xml \ qmake_build moc_build uic_build rcc_build USE_XZ= yes -USE_CMAKE= yes +USES= cmake MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes Modified: head/devel/smokeqt/Makefile ============================================================================== --- head/devel/smokeqt/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/devel/smokeqt/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -21,7 +21,7 @@ USE_QT4= dbus declarative designer gui h script sql svg xml xmlpatterns webkit \ qmake_build moc_build uic_build rcc_build USE_XZ= yes -USE_CMAKE= yes +USES= cmake MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes Modified: head/editors/kate/Makefile ============================================================================== --- head/editors/kate/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/editors/kate/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -16,10 +16,11 @@ CONFLICTS= kdebase-4.[0-6].* kdelibs-4.[ USE_XZ= yes USE_GETTEXT= yes USE_KDE4= kdelibs kdeprefix kdehier automoc4 sharedmime -KDE4_BUILDENV= yes +USES= cmake:outsource USE_PERL5_BUILD= yes USE_QT4= dbus gui qt3support script sql xml \ moc_build qmake_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes MAN1= kate.1 Modified: head/games/blinken/Makefile ============================================================================== --- head/games/blinken/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/games/blinken/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= Memory enhancement game for KDE CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= corelib moc_build qmake_build rcc_build uic_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/games/kajongg/Makefile ============================================================================== --- head/games/kajongg/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/games/kajongg/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/ CONFLICTS= kdegames-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix pykde4 automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_PYTHON= yes USE_QT4= moc_build qmake_build rcc_build uic_build USE_SQLITE= 3 Modified: head/games/kanagram/Makefile ============================================================================== --- head/games/kanagram/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/games/kanagram/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,9 +13,10 @@ COMMENT= Letter order game for KDE 4 CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= xml moc_build qmake_build rcc_build uic_build USE_XZ= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/games/kdegames4/Makefile ============================================================================== --- head/games/kdegames4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/games/kdegames4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -20,12 +20,13 @@ LATEST_LINK= ${PORTNAME}4 USE_GL= glu USE_KDE4= kdehier kdelibs kdeprefix sharedmime automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_OPENAL= al USE_QT4= dbus gui network opengl qt3support script svg xml \ moc_build qmake_build rcc_build uic_build USE_XZ= yes CMAKE_ARGS+= -DBUILD_kajongg:BOOL=FALSE +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes OPTIONS_DEFINE= KAJONGG Modified: head/games/khangman/Makefile ============================================================================== --- head/games/khangman/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/games/khangman/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,9 +13,10 @@ COMMENT= Hangman game for KDE 4 CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= moc_build qmake_build rcc_build uic_build USE_XZ= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes MAN6= khangman.6 Modified: head/games/pairs/Makefile ============================================================================== --- head/games/pairs/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/games/pairs/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= Memory and pairs game for KDE LICENSE= GPLv2 -KDE4_BUILDENV= yes +USES= cmake:outsource MAKE_JOBS_SAFE= yes USE_KDE4= kdehier kdelibs kdeprefix automoc4 USE_QT4= declarative opengl phonon xmlpatterns \ Modified: head/graphics/gwenview-kde4/Makefile ============================================================================== --- head/graphics/gwenview-kde4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/gwenview-kde4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -19,9 +19,10 @@ CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix libkipi libkonq \ automoc4 soprano -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus qmake_build moc_build uic_build rcc_build USE_XZ= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/graphics/kamera-kde4/Makefile ============================================================================== --- head/graphics/kamera-kde4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/kamera-kde4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,7 +17,7 @@ LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graph CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus qt3support qmake_build moc_build uic_build rcc_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/graphics/kcolorchooser/Makefile ============================================================================== --- head/graphics/kcolorchooser/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/kcolorchooser/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= KDE 4 application to select col CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus qmake_build moc_build uic_build rcc_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/graphics/kdegraphics4-mobipocket/Makefile ============================================================================== --- head/graphics/kdegraphics4-mobipocket/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/kdegraphics4-mobipocket/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= Mobipocket plugins for Strigi i CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix okular automoc4 strigi -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= gui qmake_build moc_build uic_build rcc_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/graphics/kdegraphics4-strigi-analyzer/Makefile ============================================================================== --- head/graphics/kdegraphics4-strigi-analyzer/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/kdegraphics4-strigi-analyzer/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -15,7 +15,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 strigi -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= corelib qmake_build moc_build uic_build rcc_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/graphics/kdegraphics4-svgpart/Makefile ============================================================================== --- head/graphics/kdegraphics4-svgpart/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/kdegraphics4-svgpart/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -14,7 +14,7 @@ COMMENT= SVG KPart CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus qmake_build moc_build uic_build rcc_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/graphics/kdegraphics4-thumbnailers/Makefile ============================================================================== --- head/graphics/kdegraphics4-thumbnailers/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/kdegraphics4-thumbnailers/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= Thumbnailers for various graphi CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix libkdcraw libkexiv2 automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= gui qmake_build moc_build uic_build rcc_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/graphics/kolourpaint/Makefile ============================================================================== --- head/graphics/kolourpaint/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/kolourpaint/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,9 +13,10 @@ COMMENT= KDE 4 paint program CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= corelib qmake_build moc_build uic_build rcc_build USE_XZ= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/graphics/ksaneplugin/Makefile ============================================================================== --- head/graphics/ksaneplugin/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/ksaneplugin/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= KDE 4 plugin for scanning throu CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix libksane automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus qmake_build moc_build uic_build rcc_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/graphics/ksnapshot/Makefile ============================================================================== --- head/graphics/ksnapshot/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/ksnapshot/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= KDE 4 screen capture program CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix libkipi automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus qmake_build moc_build uic_build rcc_build USE_XORG= x11 xext xfixes USE_XZ= yes Modified: head/graphics/libkdcraw-kde4/Makefile ============================================================================== --- head/graphics/libkdcraw-kde4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/libkdcraw-kde4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -19,9 +19,10 @@ CONFLICTS= kdegraphics-4.[0-6].* USE_XZ= yes USE_KDE4= automoc4 kdehier kdeprefix kdelibs -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus gui xml \ moc_build qmake_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes pre-configure: Modified: head/graphics/libkexiv2-kde4/Makefile ============================================================================== --- head/graphics/libkexiv2-kde4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/libkexiv2-kde4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -18,9 +18,10 @@ CONFLICTS= kdegraphics-4.[0-6].* USE_XZ= yes USE_KDE4= automoc4 kdehier kdeprefix kdelibs -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus gui xml \ moc_build qmake_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes pre-configure: Modified: head/graphics/libkipi-kde4/Makefile ============================================================================== --- head/graphics/libkipi-kde4/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/libkipi-kde4/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,9 +17,10 @@ CONFLICTS= kdegraphics-4.[0-6].* USE_XZ= yes USE_KDE4= automoc4 kdehier kdeprefix kdelibs -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus gui xml \ moc_build qmake_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes pre-configure: Modified: head/graphics/libksane/Makefile ============================================================================== --- head/graphics/libksane/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/libksane/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -15,9 +15,10 @@ LIB_DEPENDS= sane.1:${PORTSDIR}/graphics CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= corelib moc_build qmake_build rcc_build uic_build USE_XZ= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes pre-configure: Modified: head/graphics/okular/Makefile ============================================================================== --- head/graphics/okular/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/graphics/okular/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -24,9 +24,10 @@ LIB_DEPENDS= djvulibre:${PORTSDIR}/graph CONFLICTS= kdegraphics-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= gui xml qmake_build moc_build uic_build rcc_build USE_XZ= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes OPTIONS_DEFINE= DVI Modified: head/japanese/kiten/Makefile ============================================================================== --- head/japanese/kiten/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/japanese/kiten/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,9 +13,10 @@ COMMENT= Japanese reference/study tool f CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= corelib moc_build qmake_build rcc_build uic_build USE_XZ= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/lang/kturtle/Makefile ============================================================================== --- head/lang/kturtle/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/lang/kturtle/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= Educational programming environ CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= gui xml moc_build qmake_build rcc_build uic_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/math/analitza/Makefile ============================================================================== --- head/math/analitza/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/math/analitza/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -14,8 +14,9 @@ CONFLICTS_INSTALL= kalgebra-4.7.* kdeedu USE_XZ= yes USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= moc_build qmake_build rcc_build uic_build +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/math/cantor/Makefile ============================================================================== --- head/math/cantor/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/math/cantor/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,10 +17,11 @@ LIB_DEPENDS= spectre.1:${PORTSDIR}/print CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= qtestlib_build xmlpatterns \ moc_build qmake_build rcc_build uic_build USE_XZ= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes OPTIONS_DEFINE= MAXIMA OCTAVE R Modified: head/math/kalgebra/Makefile ============================================================================== --- head/math/kalgebra/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/math/kalgebra/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,7 +17,7 @@ CONFLICTS= kdeedu-4.[0-6].* CMAKE_ARGS= -DBUILD_mobile:BOOL=FALSE USE_GL= glu USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= gui opengl script scripttools xml \ moc_build qmake_build rcc_build uic_build USE_XZ= yes Modified: head/math/kbruch/Makefile ============================================================================== --- head/math/kbruch/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/math/kbruch/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= KDE 4 application to exercise f CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= corelib moc_build qmake_build rcc_build uic_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/math/kcalc/Makefile ============================================================================== --- head/math/kcalc/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/math/kcalc/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -17,7 +17,7 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].* USE_XZ= yes USE_KDE4= kdeprefix kdehier automoc4 kdelibs -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes Modified: head/math/kig/Makefile ============================================================================== --- head/math/kig/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/math/kig/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= KDE 4 interactive geometry appl CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= dbus moc_build qmake_build rcc_build uic_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/math/kmplot/Makefile ============================================================================== --- head/math/kmplot/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/math/kmplot/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= Mathematical function plotter f CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= xml moc_build qmake_build rcc_build uic_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/math/rocs/Makefile ============================================================================== --- head/math/rocs/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/math/rocs/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -15,10 +15,11 @@ LIB_DEPENDS= boost_thread:${PORTSDIR}/de CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= script scripttools \ moc_build qmake_build rcc_build uic_build USE_XZ= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/misc/kgeography/Makefile ============================================================================== --- head/misc/kgeography/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/misc/kgeography/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= KDE 4 geography trainer CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= xml moc_build qmake_build rcc_build uic_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/misc/klettres/Makefile ============================================================================== --- head/misc/klettres/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/misc/klettres/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= Alphabet learning tool for KDE CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= xml moc_build qmake_build rcc_build uic_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/misc/ktouch/Makefile ============================================================================== --- head/misc/ktouch/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/misc/ktouch/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= Touch typing tutor for KDE 4 CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= phonon moc_build qmake_build rcc_build uic_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/misc/kwordquiz/Makefile ============================================================================== --- head/misc/kwordquiz/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/misc/kwordquiz/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,7 +13,7 @@ COMMENT= Flash card trainer for KDE 4 CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= moc_build qmake_build rcc_build uic_build USE_XZ= yes MAKE_JOBS_SAFE= yes Modified: head/misc/libkdeedu/Makefile ============================================================================== --- head/misc/libkdeedu/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/misc/libkdeedu/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -13,9 +13,10 @@ COMMENT= Libraries used by KDE education CONFLICTS= kdeedu-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= gui xml moc_build qmake_build rcc_build uic_build USE_XZ= yes +USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/misc/parley/Makefile ============================================================================== --- head/misc/parley/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/misc/parley/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -14,7 +14,7 @@ CONFLICTS= kdeedu-4.[0-6].* USE_GNOME= libxml2 libxslt USE_KDE4= kdehier kdelibs kdeprefix libkdeedu attica automoc4 -KDE4_BUILDENV= yes +USES= cmake:outsource USE_QT4= corelib moc_build qmake_build rcc_build uic_build USE_XORG= x11 xrender USE_XZ= yes Modified: head/multimedia/dragon/Makefile ============================================================================== --- head/multimedia/dragon/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/multimedia/dragon/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -18,7 +18,7 @@ LATEST_LINK= kdemultimedia-dragon CONFLICTS_INSTALL= kdemultimedia-4.[1-8].* MAKE_JOBS_SAFE= yes -KDE4_BUILDENV= yes +USES= cmake:outsource USE_KDE4= automoc4 kdehier kdelibs kdeprefix USE_QT4= dbus phonon \ moc_build qmake_build rcc_build uic_build Modified: head/multimedia/kdemultimedia4-ffmpegthumbs/Makefile ============================================================================== --- head/multimedia/kdemultimedia4-ffmpegthumbs/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/multimedia/kdemultimedia4-ffmpegthumbs/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -19,7 +19,7 @@ LIB_DEPENDS= swscale.1:${PORTSDIR}/mult CONFLICTS_INSTALL= kdemultimedia-4.[1-8].* MAKE_JOBS_SAFE= yes -KDE4_BUILDENV= yes +USES= cmake:outsource USE_KDE4= automoc4 kdehier kdelibs kdeprefix USE_QT4= moc_build qmake_build rcc_build uic_build USE_XZ= yes Modified: head/multimedia/kdemultimedia4-mplayerthumbs/Makefile ============================================================================== --- head/multimedia/kdemultimedia4-mplayerthumbs/Makefile Fri Mar 22 13:41:53 2013 (r314932) +++ head/multimedia/kdemultimedia4-mplayerthumbs/Makefile Fri Mar 22 14:18:02 2013 (r314933) @@ -19,7 +19,7 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multim CONFLICTS_INSTALL= kdemultimedia-4.[1-8].* MAKE_JOBS_SAFE= yes -KDE4_BUILDENV= yes +USES= cmake:outsource *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***