diff options
61 files changed, 63 insertions, 72 deletions
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index a8a977831901..1a28a9c90f92 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -144,8 +144,6 @@ _USE_KDE4_ALL+= akonadi attica automoc4 ontologies qimageblitz soprano \ strigi # Meta components _USE_KDE4_ALL+= kdeprefix -# Deprecated -_USE_KDE4_ALL+= kdehier baloo_PORT= sysutils/baloo baloo_PATH= ${KDE4_PREFIX}/lib/libbaloocore.so diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index cbf23fe9ab6b..3881553e5ace 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -72,10 +72,6 @@ DEV_WARNING+= "USE_GNOME=gnomehack is deprecated, please use USES=pathfix" DEV_WARNING+= "USE_GNOME=desktopfileutils is deprecated, please use USES=desktop-file-utils" .endif -.if defined(USE_KDE4) && ${USE_KDE4:Mkdehier} -DEV_WARNING+= "USE_KDE4=kdehier is deprecated, please use USE_KDE4=kdeprefix" -.endif - .if defined(LIB_DEPENDS) && ${LIB_DEPENDS:Nlib*} DEV_ERROR+= "Please use the new format for LIB_DEPENDS, see handbook for details" .endif diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile index 562b47ff0fec..0860f5ad0758 100644 --- a/audio/amarok-kde4/Makefile +++ b/audio/amarok-kde4/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${POR LATEST_LINK= ${PORTNAME}-kde4 -USE_KDE4= kdehier kdelibs kdeprefix libkcddb libkcompactdisc \ +USE_KDE4= kdelibs kdeprefix libkcddb libkcompactdisc \ nepomuk-core runtime automoc4 strigi USE_MYSQL= embedded USE_QT4= corelib dbus designer gui network opengl \ diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile index 8b58ba8c4be8..c7ab38a469c5 100644 --- a/audio/kaudiocreator/Makefile +++ b/audio/kaudiocreator/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame USES= cmake tar:bzip2 USE_QT4= moc_build qmake_build rcc_build uic_build -USE_KDE4= automoc4 kdehier kdeprefix libkcddb libkcompactdisc +USE_KDE4= automoc4 kdeprefix libkcddb libkcompactdisc WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/audio/kstreamripper/Makefile b/audio/kstreamripper/Makefile index e501fd626d90..255be4313ed8 100644 --- a/audio/kstreamripper/Makefile +++ b/audio/kstreamripper/Makefile @@ -13,7 +13,7 @@ COMMENT= Program for recording streams for KDE4 RUN_DEPENDS= ${LOCALBASE}/bin/streamripper:${PORTSDIR}/audio/streamripper USES= cmake gettext-tools tar:bzip2 -USE_KDE4= kdelibs kdehier kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build CMAKE_ARGS+= -DWITHOUT_LIBPROXY=YES # requires libproxy >= 0.3.1 diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile index 132ae9261b92..0f45a15a3594 100644 --- a/audio/pacpl/Makefile +++ b/audio/pacpl/Makefile @@ -37,7 +37,6 @@ FAAC_RUN_DEPENDS= faac:${PORTSDIR}/audio/faac FAAD_RUN_DEPENDS= faad:${PORTSDIR}/audio/faad FFMPEG_RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg KDE4_DESC= Konqueror/Dolphin integration -KDE4_USE= KDE4=kdehier LAME_RUN_DEPENDS= lame:${PORTSDIR}/audio/lame LAUDIO_DESC= Laudio support LAUDIO_RUN_DEPENDS= laudio:${PORTSDIR}/audio/linux-laudio diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile index f3c32f425036..bea3b916adc4 100644 --- a/audio/soundkonverter/Makefile +++ b/audio/soundkonverter/Makefile @@ -20,7 +20,7 @@ GH_COMMIT= 405363b USES= cmake compiler:c++11-lang USE_GITHUB= yes USE_QT4= moc_build qmake_build rcc_build uic_build -USE_KDE4= automoc4 kdehier kdeprefix kdelibs libkcddb +USE_KDE4= automoc4 kdeprefix kdelibs libkcddb INSTALLS_ICONS= yes WRKSRC_SUBDIR= src diff --git a/audio/waheela/Makefile b/audio/waheela/Makefile index a87102f3702d..8bf5e78a84c5 100644 --- a/audio/waheela/Makefile +++ b/audio/waheela/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 RUN_DEPENDS= amarok>=2:${PORTSDIR}/audio/amarok-kde4 USES= cmake -USE_KDE4= automoc4 kdeprefix kdehier kdelibs +USE_KDE4= automoc4 kdeprefix kdelibs USE_QT4= gui dbus network svg xml \ qmake_build moc_build rcc_build uic_build diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile index a1ac55116b4b..9d2b7cd2109e 100644 --- a/deskutils/charmtimetracker/Makefile +++ b/deskutils/charmtimetracker/Makefile @@ -4,7 +4,7 @@ PORTNAME= charmtimetracker PORTVERSION= 1.6.0 PORTREVISION= 2 -CATEGORIES= deskutils kde +CATEGORIES= deskutils MAINTAINER= avg@icyb.net.ua COMMENT= Time tracker @@ -18,7 +18,6 @@ GH_COMMIT= 3151d25 USES= cmake CMAKE_ARGS+= -DCharm_VERSION:STRING=${PORTVERSION} -USE_KDE4= kdehier kdeprefix USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network \ qtestlib sql sql-sqlite3 xml USE_XORG= ice x11 xext xscrnsaver diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile index 0756087bae39..b16960d58861 100644 --- a/deskutils/semantik/Makefile +++ b/deskutils/semantik/Makefile @@ -11,7 +11,7 @@ COMMENT= KDE mind mapping tool LICENSE= GPLv3 -USE_KDE4= kdehier kdelibs kdeprefix +USE_KDE4= kdelibs kdeprefix USE_OCAML= yes NO_OCAML_RUNDEPENDS= yes USE_QT4= corelib gui linguist_build svg webkit xml \ diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile index a929e5057cf3..b6698aa3155b 100644 --- a/deskutils/silence/Makefile +++ b/deskutils/silence/Makefile @@ -14,7 +14,7 @@ COMMENT= Information management tool RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate USES= cmake -USE_KDE4= kdelibs kdehier kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile index d7d1593e36e8..319e097cc8e1 100644 --- a/devel/piklab/Makefile +++ b/devel/piklab/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFAULT= KDE4 OPTIONS_SUB= yes KDE4_USES= shared-mime-info -KDE4_USE= KDE4=automoc4,kdehier,kdelibs,kdeprefix +KDE4_USE= KDE4=automoc4,kdelibs,kdeprefix KDE4_CMAKE_OFF= -DQT_ONLY:BOOL=ON \ -DLOCALE_INSTALL_DIR:STRING="${PREFIX}/share/locale" diff --git a/editors/calligra-l10n/files/bsd.l10n.mk b/editors/calligra-l10n/files/bsd.l10n.mk index e40704895540..c65cd75d431b 100644 --- a/editors/calligra-l10n/files/bsd.l10n.mk +++ b/editors/calligra-l10n/files/bsd.l10n.mk @@ -7,7 +7,7 @@ DIST_SUBDIR= KDE/calligra-l10n CONFLICTS= ${PKGNAMEPREFIX}koffice-l10n-2.* -USE_KDE4= kdehier kdelibs kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= corelib xml moc_build qmake_build rcc_build uic_build USES+= cmake gettext tar:xz NO_ARCH= yes diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index d7483066a965..b260a4e0b2a7 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -38,7 +38,7 @@ CONFLICTS_BUILD=qt-3.* USE_GL= glew USE_GNOME= glib20 libxml2 libxslt -USE_KDE4= kactivities kdehier kdelibs kdeprefix libkdcraw nepomuk-core \ +USE_KDE4= kactivities kdelibs kdeprefix libkdcraw nepomuk-core \ okular pimlibs attica automoc4 soprano USE_QT4= corelib dbus designer_build gui opengl phonon porting_build \ qt3support qtestlib_build script sql svg webkit xml xmlpatterns \ diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile index 86c476a9051a..a83ee5de09a6 100644 --- a/finance/kmymoney-kde4/Makefile +++ b/finance/kmymoney-kde4/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libboost_graph.so:${PORTSDIR}/devel/boost-libs \ USES= cmake pkgconfig shared-mime-info shebangfix tar:xz USE_QT4= gui dbus network phonon sql svg xml \ qmake_build moc_build rcc_build uic_build -USE_KDE4= kdehier kdeprefix automoc4 kdelibs pimlibs +USE_KDE4= kdeprefix automoc4 kdelibs pimlibs USE_LDCONFIG= yes SHEBANG_FILES= kmymoney/misc/financequote.pl diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile index eff56885c82d..451e121eb98b 100644 --- a/games/knights-kde4/Makefile +++ b/games/knights-kde4/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess LICENSE= GPLv2 USES= cmake:outsource tar:bzip2 -USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace libkdegames +USE_KDE4= kdelibs kdeprefix automoc4 workspace libkdegames USE_QT4= qmake_build moc_build rcc_build uic_build OPTIONS_DEFINE= DOCS NLS diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 0e7d1a9cb36d..6498460234cf 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -107,9 +107,8 @@ CONFIGURE_ARGS+= --disable-npapi .endif .if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MPLUGIN} -PLIST_SUB+= KPARTS4="" -USE_LDCONFIG+= ${KDE4_PREFIX}/lib/kde4 -CONFIGURE_ARGS+= --with-kde4_prefix=${PREFIX}/kde4 +PLIST_SUB+= KPARTS4="${KDE4_PREFIX}" +CONFIGURE_ARGS+= --with-kde4_prefix=${KDE4_PREFIX} .else PLIST_SUB+= KPARTS4="@comment " CONFIGURE_ARGS+= --disable-kparts4 @@ -129,7 +128,7 @@ GNASH_GUIS+= gtk GNASH_GUIS+= kde4 USE_QT4= moc_build QT_NONSTANDARD= yes -USE_KDE4= kdehier kdelibs +USE_KDE4= kdelibs CONFIGURE_ENV+= KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config" .endif diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist index 13e1788ead4a..2b376aab0848 100644 --- a/graphics/gnash/pkg-plist +++ b/graphics/gnash/pkg-plist @@ -190,10 +190,10 @@ include/gnash/vm/SafeStack.h include/gnash/vm/VM.h include/gnash/vm/fn_call.h include/gnash/zlib_adapter.h -%%KPARTS4%%kde4/share/apps/klash/pluginsinfo -%%KPARTS4%%kde4/share/apps/klash/klashpartui.rc -%%KPARTS4%%kde4/share/kde4/services/klash_part.desktop -%%KPARTS4%%kde4/lib/kde4/libklashpart.so +%%KPARTS4%%/share/apps/klash/pluginsinfo +%%KPARTS4%%/share/apps/klash/klashpartui.rc +%%KPARTS4%%/share/kde4/services/klash_part.desktop +%%KPARTS4%%/lib/kde4/libklashpart.so %%CYGNAL%%lib/cygnal/plugins/echo.so %%CYGNAL%%lib/cygnal/plugins/oflaDemo.so %%CYGNAL%%lib/gnash/libgnashamf-%%GNASHVER%%.so diff --git a/graphics/kcoloredit/Makefile b/graphics/kcoloredit/Makefile index 97a46054a0e0..6d86be3da67b 100644 --- a/graphics/kcoloredit/Makefile +++ b/graphics/kcoloredit/Makefile @@ -11,7 +11,7 @@ DIST_SUBDIR= KDE/extragear MAINTAINER= kde@FreeBSD.org COMMENT= Palette files editor for KDE -USE_KDE4= kdelibs kdeprefix kdehier automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= corelib qmake_build moc_build rcc_build uic_build USES= cmake gettext tar:bzip2 diff --git a/graphics/kiconedit/Makefile b/graphics/kiconedit/Makefile index 454fbd04653f..83443c48cb5d 100644 --- a/graphics/kiconedit/Makefile +++ b/graphics/kiconedit/Makefile @@ -10,7 +10,7 @@ DIST_SUBDIR= KDE/extragear MAINTAINER= kde@FreeBSD.org COMMENT= KDE icon editor -USE_KDE4= kdelibs kdeprefix kdehier automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= corelib qmake_build moc_build rcc_build uic_build USES= cmake gettext tar:bzip2 diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile index a49e64c091a6..0fa7366ce1e9 100644 --- a/graphics/kphotoalbum-kde4/Makefile +++ b/graphics/kphotoalbum-kde4/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ USES= cmake:outsource pkgconfig shebangfix tar:bzip2 SHEBANG_FILES= script/open-raw.pl script/kpa-backup.sh -USE_KDE4= kdehier kdelibs kdeprefix libkdcraw libkipi automoc4 +USE_KDE4= kdelibs kdeprefix libkdcraw libkipi automoc4 USE_QT4= phonon sql \ qmake_build moc_build rcc_build uic_build diff --git a/graphics/kpovmodeler/Makefile b/graphics/kpovmodeler/Makefile index 478cc7805a27..f733e48d415a 100644 --- a/graphics/kpovmodeler/Makefile +++ b/graphics/kpovmodeler/Makefile @@ -14,7 +14,7 @@ COMMENT= KDE editor/frontend for Povray RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta USE_GL= glu -USE_KDE4= kdelibs kdeprefix kdehier automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= corelib opengl qmake_build moc_build rcc_build uic_build USES= cmake gettext tar:bzip2 diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile index b227577143b8..b1f4ce704cc6 100644 --- a/graphics/kuickshow-kde4/Makefile +++ b/graphics/kuickshow-kde4/Makefile @@ -15,7 +15,7 @@ COMMENT= KDE image viewer BROKEN= depends on imlib USE_GNOME= imlib -USE_KDE4= kdelibs kdeprefix kdehier automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= corelib opengl qmake_build moc_build rcc_build uic_build USES= cmake gettext pkgconfig tar:bzip2 diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile index 712a9f2f73ad..b66f725615ec 100644 --- a/graphics/skanlite/Makefile +++ b/graphics/skanlite/Makefile @@ -12,7 +12,7 @@ COMMENT= Simple image scanning application for KDE LIB_DEPENDS= libksane.so:${PORTSDIR}/graphics/libksane -USE_KDE4= kdelibs kdeprefix kdehier automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build USES= cmake:outsource gettext tar:xz diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile index 26f7409e007b..6be184bacc3e 100644 --- a/mail/kbiff/Makefile +++ b/mail/kbiff/Makefile @@ -12,7 +12,7 @@ COMMENT= Mail notification utility for KDE with nice features LICENSE= GPLv2 -USE_KDE4= automoc4 kdehier kdeprefix kdelibs +USE_KDE4= automoc4 kdeprefix kdelibs USE_QT4= corelib dbus gui network svg xml \ qmake_build uic_build rcc_build USE_PERL5= build diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile index f708d36ef121..4672b55a8c0f 100644 --- a/mail/kshowmail/Makefile +++ b/mail/kshowmail/Makefile @@ -12,7 +12,7 @@ COMMENT= POP3 mail checker for KDE LICENSE= GPLv2 -USE_KDE4= automoc4 kdehier kdeprefix kdelibs pimlibs +USE_KDE4= automoc4 kdeprefix kdelibs pimlibs USE_QT4= corelib dbus gui network svg xml \ qmake_build uic_build rcc_build USE_PERL5= build diff --git a/math/abakus/Makefile b/math/abakus/Makefile index 73a3bb816e4f..eb017ad789c4 100644 --- a/math/abakus/Makefile +++ b/math/abakus/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex LIB_DEPENDS= libmpfr.so:${PORTSDIR}/math/mpfr -USE_KDE4= automoc4 kdehier kdelibs kdeprefix +USE_KDE4= automoc4 kdelibs kdeprefix USE_QT4= moc_build qmake_build rcc_build uic_build USES= bison cmake tar:bzip2 CMAKE_ARGS= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" \ diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index b1904e386d23..60e6784b3155 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \ LATEST_LINK= ${PORTNAME}-kde4 -USE_KDE4= kdehier kdelibs kdeprefix libksane pimlibs \ +USE_KDE4= kdelibs kdeprefix libksane pimlibs \ automoc4 qimageblitz libkcddb USE_QT4= qmake_build moc_build uic_build rcc_build USES= cmake gettext shared-mime-info tar:bzip2 diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index 86d0c9b7254d..719dca1e0a65 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USE_KDE4= kdehier kdeprefix automoc4 kdelibs +USE_KDE4= kdeprefix automoc4 kdelibs USE_QT4= corelib gui phonon svg network dbus xml sql \ qmake_build moc_build rcc_build uic_build USES= cmake gettext gmake diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile index e32a344dc4c6..ac6e66cd66bc 100644 --- a/multimedia/kdenlive/Makefile +++ b/multimedia/kdenlive/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libmlt.so:${PORTSDIR}/multimedia/mlt \ libqjson.so:${PORTSDIR}/devel/qjson RUN_DEPENDS= ffmpeg${FFMPEG_SUFX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFX} -USE_KDE4= automoc4 kdehier kdelibs kdeprefix nepomuk-core +USE_KDE4= automoc4 kdelibs kdeprefix nepomuk-core USE_QT4= corelib dbus gui opengl script svg xml \ moc_build qmake_build rcc_build uic_build USE_XORG= x11 diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile index 7eda5aa74659..ea300caa250c 100644 --- a/multimedia/kplayer-kde4/Makefile +++ b/multimedia/kplayer-kde4/Makefile @@ -16,7 +16,7 @@ LATEST_LINK= ${PORTNAME}-kde4 USES= cmake gettext tar:bzip2 USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 LDFLAGS+= -L${LOCALBASE}/lib -lX11 -L${LOCALBASE}/kde4/lib -lsolid post-patch: diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile index 014f3d70b5c5..b5a16ca5a221 100644 --- a/multimedia/phonon-xine/Makefile +++ b/multimedia/phonon-xine/Makefile @@ -16,7 +16,7 @@ COMMENT= The xine backend for Phonon LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine USES= cmake pkgconfig tar:bzip2 -USE_KDE4= kdehier automoc4 kdeprefix +USE_KDE4= automoc4 kdeprefix USE_QT4= corelib dbus gui phonon \ qmake_build moc_build rcc_build uic_build USE_XORG= xcb diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile index 6c8165d2bff0..b02bf57b76db 100644 --- a/net-im/ekiga/Makefile +++ b/net-im/ekiga/Makefile @@ -51,7 +51,7 @@ LOUDMOUTH_DESC= XMPP (jabber) support PLIST_SUB+= VERSION=${PORTVERSION} .if ${PORT_OPTIONS:MKDE} || ${PORT_OPTIONS:MKAB} -USE_KDE4= kdehier kdelibs +USE_KDE4= kdelibs USE_QT4= corelib CONFIGURE_ARGS+=--enable-kde #CONFIGURE_ENV+=KDE_CFLAGS="-I${KDE4_PREFIX}/include -I${QT_INCDIR} \ diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile index 01e69b49bafe..3970c0e8558b 100644 --- a/net-im/kmess-kde4/Makefile +++ b/net-im/kmess-kde4/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca LATEST_LINK= ${PORTNAME}-kde4 USE_GNOME= libxml2 libxslt -USE_KDE4= kdehier kdeprefix kdelibs libkonq automoc4 +USE_KDE4= kdeprefix kdelibs libkonq automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build USES= cmake gettext tar:bzip2 diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile index bc4f45be5d04..0d372e7b1f90 100644 --- a/net-p2p/ktorrent/Makefile +++ b/net-p2p/ktorrent/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \ libgmp.so:${PORTSDIR}/math/gmp \ libktorrent.so:${PORTSDIR}/net-p2p/libktorrent -USE_KDE4= kdelibs kdehier kdeprefix automoc4 pimlibs workspace +USE_KDE4= kdelibs kdeprefix automoc4 pimlibs workspace USE_QT4= corelib gui network qt3support qtestlib webkit \ qmake_build moc_build rcc_build uic_build USES= cmake:outsource gettext tar:bzip2 diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile index d30bc89dd267..4dd7072736d8 100644 --- a/net-p2p/libktorrent/Makefile +++ b/net-p2p/libktorrent/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgmp.so:${PORTSDIR}/math/gmp \ libqca.so:${PORTSDIR}/devel/qca -USE_KDE4= kdelibs kdehier kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= qtestlib_build qmake_build moc_build rcc_build uic_build USES= cmake:outsource gettext tar:bzip2 USE_LDCONFIG= yes diff --git a/net/kio-upnp-ms/Makefile b/net/kio-upnp-ms/Makefile index f8c870983da9..85ba0843f3eb 100644 --- a/net/kio-upnp-ms/Makefile +++ b/net/kio-upnp-ms/Makefile @@ -16,7 +16,7 @@ COMMENT= KIO slave to access UPnP MediaServers LIB_DEPENDS= libHUpnp.so:${PORTSDIR}/net/hupnp USES= cmake tar:bzip2 -USE_KDE4= automoc4 kdehier kdeprefix kdelibs +USE_KDE4= automoc4 kdeprefix kdelibs USE_QT4= corelib network xml dbus gui \ qmake_build moc_build rcc_build uic_build diff --git a/net/kwooty/Makefile b/net/kwooty/Makefile index 49f984ab660c..b7755139e711 100644 --- a/net/kwooty/Makefile +++ b/net/kwooty/Makefile @@ -14,7 +14,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \ ${LOCALBASE}/bin/par2:${PORTSDIR}/archivers/par2cmdline \ ${LOCALBASE}/bin/7z:${PORTSDIR}/archivers/p7zip -USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace +USE_KDE4= kdelibs kdeprefix automoc4 workspace USE_QT4= qmake_build moc_build rcc_build uic_build USES= cmake gettext USE_LDCONFIG= yes diff --git a/net/libkfbapi/Makefile b/net/libkfbapi/Makefile index 250a3a1adbe4..c850a657ef57 100644 --- a/net/libkfbapi/Makefile +++ b/net/libkfbapi/Makefile @@ -16,7 +16,7 @@ LICENSE= LGPL20 LIB_DEPENDS= libqjson.so:${PORTSDIR}/devel/qjson USES= cmake:outsource gettext tar:bzip2 -USE_KDE4= automoc4 kdelibs kdeprefix kdehier pimlibs +USE_KDE4= automoc4 kdelibs kdeprefix pimlibs USE_LDCONFIG= yes USE_QT4= gui webkit \ qmake_build moc_build rcc_build uic_build diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile index a47aa7a18790..9d2d7a502536 100644 --- a/net/smb4k-kde4/Makefile +++ b/net/smb4k-kde4/Makefile @@ -19,7 +19,7 @@ SAMBA_PORT?= net/samba36 USES= cmake gettext tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde4 -USE_KDE4= kdehier kdeprefix kdelibs automoc4 runtime +USE_KDE4= kdeprefix kdelibs automoc4 runtime USE_QT4= corelib gui network opengl script svg webkit \ qmake_build moc_build rcc_build uic_build phonon DOCSDIR= ${PREFIX}/share/doc/HTML/en/smb4k diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile index 5923a1ba51f4..85c964d93555 100644 --- a/polish/qnapi/Makefile +++ b/polish/qnapi/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip USES= qmake USE_QT4= corelib gui network xml moc_build uic_build rcc_build -USE_KDE4= kdehier +USE_KDE4= # dummy PLIST_SUB= KDE4=${KDE4_PREFIX:S|${LOCALBASE}/||} QMAKE_ARGS= KDE4_PREFIX=${KDE4_PREFIX} INSTALLS_ICONS= yes diff --git a/ports-mgmt/kpackagekit/Makefile b/ports-mgmt/kpackagekit/Makefile index 6fef2af836ce..e8899383a4df 100644 --- a/ports-mgmt/kpackagekit/Makefile +++ b/ports-mgmt/kpackagekit/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpackagekit-qt.so:${PORTSDIR}/ports-mgmt/packagekit-qt4 -USE_KDE4= automoc4 kdehier kdelibs kdeprefix +USE_KDE4= automoc4 kdelibs kdeprefix USE_QT4= moc_build qmake_build rcc_build uic_build USES= cmake gettext pkgconfig tar:bzip2 LDFLAGS+= -L${LOCALBASE}/lib diff --git a/print/kover/Makefile b/print/kover/Makefile index 241d1dae88ce..a38c6d88bbc4 100644 --- a/print/kover/Makefile +++ b/print/kover/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcddb.so:${PORTSDIR}/audio/libcddb \ libcdio.so:${PORTSDIR}/sysutils/libcdio -USE_KDE4= automoc4 kdehier kdeprefix kdelibs +USE_KDE4= automoc4 kdeprefix kdelibs USE_QT4= corelib dbus gui network svg xml \ qmake_build uic_build rcc_build USE_PERL5= build diff --git a/sysutils/kcm-polkit-kde/Makefile b/sysutils/kcm-polkit-kde/Makefile index 3230dc187ba2..e1152d45deb8 100644 --- a/sysutils/kcm-polkit-kde/Makefile +++ b/sysutils/kcm-polkit-kde/Makefile @@ -14,7 +14,7 @@ COMMENT= Polkit-KDE configuration module LIB_DEPENDS= libpolkit-qt-agent-1.so:${PORTSDIR}/sysutils/polkit-qt RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde -USE_KDE4= kdehier kdelibs kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= dbus xml moc_build qmake_build rcc_build uic_build USES= cmake gmake pkgconfig tar:bzip2 USE_LDCONFIG= yes diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile index 650891355b48..0bd8f20c5aae 100644 --- a/sysutils/knutclient-kde4/Makefile +++ b/sysutils/knutclient-kde4/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libqimageblitz.so:${PORTSDIR}/x11/qimageblitz CONFLICTS= knutclient-0.* USES= cmake gettext -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build LATEST_LINK= knutclient-kde4 diff --git a/sysutils/polkit-kde/Makefile b/sysutils/polkit-kde/Makefile index 2e4c83f5dfd3..e0576b375ef3 100644 --- a/sysutils/polkit-kde/Makefile +++ b/sysutils/polkit-kde/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libpolkit-qt-agent-1.so:${PORTSDIR}/sysutils/polkit-qt -USE_KDE4= kdehier kdelibs kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build USES= cmake tar:bzip2 diff --git a/textproc/dikt/Makefile b/textproc/dikt/Makefile index 258f24bf9e05..b8eb64270986 100644 --- a/textproc/dikt/Makefile +++ b/textproc/dikt/Makefile @@ -12,7 +12,7 @@ MAINTAINER= goran.tal@gmail.com COMMENT= Dictionary for KDE4 -USE_KDE4= kdelibs kdeprefix kdehier automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= corelib gui network svg xml \ qmake_build moc_build rcc_build uic_build USES= cmake tar:xz diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile index 6dd1d115abb5..ed33f95e5166 100644 --- a/textproc/uim-kde4/Makefile +++ b/textproc/uim-kde4/Makefile @@ -10,7 +10,7 @@ LIB_DEPENDS= libuim.so:${PORTSDIR}/textproc/uim RUN_DEPENDS= uim-pref-qt4:${PORTSDIR}/textproc/uim-qt4 USE_GCC= any -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= qmake_build moc_build qt3support uic rcc MASTERDIR= ${.CURDIR}/../../textproc/uim diff --git a/www/kpartsplugin/Makefile b/www/kpartsplugin/Makefile index 9be19ebee3d6..edea37eeca23 100644 --- a/www/kpartsplugin/Makefile +++ b/www/kpartsplugin/Makefile @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTDATE} MAINTAINER= avilla@FreeBSD.org COMMENT= Browser file viewer using KDE technology -USE_KDE4= kdehier kdelibs kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build USES= cmake webplugin:native tar:bzip2 CMAKE_ARGS= -DNSPLUGIN_INSTALL_DIR:PATH="${WEBPLUGIN_DIR}" diff --git a/www/kwebkitpart/Makefile b/www/kwebkitpart/Makefile index dfbdf703d01d..c9bd366e9b9f 100644 --- a/www/kwebkitpart/Makefile +++ b/www/kwebkitpart/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= LOCAL/makc MAINTAINER= kde@FreeBSD.org COMMENT= Web browser component for KDE SC based on QtWebKit -USE_KDE4= kdehier kdelibs kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= designer gui webkit \ moc_build qmake_build rcc_build uic_build USES= cmake cpe tar:xz diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile index 2f5b45c08ee4..bea6cc7afb96 100644 --- a/www/rekonq/Makefile +++ b/www/rekonq/Makefile @@ -10,7 +10,7 @@ MAINTAINER= makc@FreeBSD.org COMMENT= Lightweight KDE browser based on WebKit USES= cmake:outsource gettext tar:xz -USE_KDE4= kdehier kdelibs kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= script webkit \ moc_build qmake_build rcc_build uic_build diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile index 1a73b354f3fd..33b026c38e0d 100644 --- a/x11-fm/krusader2/Makefile +++ b/x11-fm/krusader2/Makefile @@ -11,7 +11,7 @@ MAINTAINER= fluffy@FreeBSD.org COMMENT= Twin panel file manager for KDE, like midnight or norton commander USES= cmake:outsource gettext tar:bzip2 -USE_KDE4= kdelibs kdeprefix kdehier automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/x11-themes/kde4-style-bespin/Makefile b/x11-themes/kde4-style-bespin/Makefile index fbe50edfe94f..03b91b0763d2 100644 --- a/x11-themes/kde4-style-bespin/Makefile +++ b/x11-themes/kde4-style-bespin/Makefile @@ -15,7 +15,7 @@ COMMENT= Configurable KDE4 style LICENSE= LGPL21 WRKSRC= ${WRKDIR}/cloudcity -USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace +USE_KDE4= kdelibs kdeprefix automoc4 workspace USE_QT4= corelib qmake_build moc_build rcc_build uic_build USES= cmake diff --git a/x11-themes/kde4-style-nitrogen/Makefile b/x11-themes/kde4-style-nitrogen/Makefile index af34d7d58331..b149cbc6d207 100644 --- a/x11-themes/kde4-style-nitrogen/Makefile +++ b/x11-themes/kde4-style-nitrogen/Makefile @@ -15,7 +15,7 @@ COMMENT= KDE style with animations LICENSE= GPLv2 WRKSRC= ${WRKDIR}/kde4-kstyle-nitrogen-${PORTVERSION}-Source -USE_KDE4= kdelibs kdehier kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= corelib qmake_build moc_build rcc_build uic_build USES= cmake diff --git a/x11-themes/kde4-style-oxygen-transparent/Makefile b/x11-themes/kde4-style-oxygen-transparent/Makefile index 47dd8793de9a..a203168dea00 100644 --- a/x11-themes/kde4-style-oxygen-transparent/Makefile +++ b/x11-themes/kde4-style-oxygen-transparent/Makefile @@ -13,7 +13,7 @@ COMMENT= KDE oxygen style with transparency LICENSE= GPLv2 -USE_KDE4= kdelibs kdehier kdeprefix workspace automoc4 +USE_KDE4= kdelibs kdeprefix workspace automoc4 USE_QT4= corelib qmake_build moc_build rcc_build uic_build USES= cmake tar:xz diff --git a/x11-themes/kde4-style-polyester/Makefile b/x11-themes/kde4-style-polyester/Makefile index c3a551bacbe8..599fc71770ce 100644 --- a/x11-themes/kde4-style-polyester/Makefile +++ b/x11-themes/kde4-style-polyester/Makefile @@ -11,7 +11,7 @@ PKGNAMEPREFIX= kde4-style- MAINTAINER= makc@FreeBSD.org COMMENT= KDE style and window decoration -USE_KDE4= kdelibs kdehier kdeprefix automoc4 +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build USES= cmake gettext tar:bzip2 diff --git a/x11-themes/kde4-style-skulpture/Makefile b/x11-themes/kde4-style-skulpture/Makefile index 7608228f51ac..86410320f68b 100644 --- a/x11-themes/kde4-style-skulpture/Makefile +++ b/x11-themes/kde4-style-skulpture/Makefile @@ -14,7 +14,7 @@ COMMENT= KDE style featuring 3D artwork and enhanced the visual experience LICENSE= GPLv3 -USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace +USE_KDE4= kdelibs kdeprefix automoc4 workspace USE_QT4= corelib qmake_build moc_build rcc_build uic_build USES= cmake tar:bzip2 diff --git a/x11-themes/kde4-windeco-crystal/Makefile b/x11-themes/kde4-windeco-crystal/Makefile index b28aa7be35c3..785262ad24d7 100644 --- a/x11-themes/kde4-windeco-crystal/Makefile +++ b/x11-themes/kde4-windeco-crystal/Makefile @@ -14,7 +14,7 @@ COMMENT= Transparent KDE window decoration LICENSE= GPLv2 -USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace +USE_KDE4= kdelibs kdeprefix automoc4 workspace USE_QT4= qmake_build moc_build rcc_build uic_build \ corelib gui qt3support USES= cmake:outsource tar:bzip2 diff --git a/x11-themes/kde4-windeco-dekorator/Makefile b/x11-themes/kde4-windeco-dekorator/Makefile index 80168f9966d2..9e34dc2c54d0 100644 --- a/x11-themes/kde4-windeco-dekorator/Makefile +++ b/x11-themes/kde4-windeco-dekorator/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libqimageblitz.so:${PORTSDIR}/x11/qimageblitz -USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace +USE_KDE4= kdelibs kdeprefix automoc4 workspace USE_QT4= corelib qmake_build moc_build rcc_build uic_build USES= cmake tar:bzip2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/x11-themes/qtcurve-kde4/Makefile b/x11-themes/qtcurve-kde4/Makefile index 7994069093fc..1c90c60bf877 100644 --- a/x11-themes/qtcurve-kde4/Makefile +++ b/x11-themes/qtcurve-kde4/Makefile @@ -13,6 +13,6 @@ COMMENT= QtCurve KDE4 widget style USES= cmake gettext-tools tar:bzip2 USE_QT4= qmake_build uic_build moc_build rcc_build -USE_KDE4= kdelibs workspace kdehier kdeprefix automoc4 +USE_KDE4= kdelibs workspace kdeprefix automoc4 .include <bsd.port.mk> diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile index 5ac10c630836..561c86a71865 100644 --- a/x11/rsibreak-kde4/Makefile +++ b/x11/rsibreak-kde4/Makefile @@ -15,7 +15,7 @@ LATEST_LINK= ${PORTNAME}-kde4 USES= cmake gettext tar:bzip2 USE_QT4= qmake_build moc_build rcc_build uic_build -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 INSTALLS_ICONS= yes .include <bsd.port.mk> |