diff options
Diffstat (limited to 'devel')
83 files changed, 92 insertions, 174 deletions
diff --git a/devel/ace/Makefile b/devel/ace/Makefile index e62d564f4e42..696d8f45d988 100644 --- a/devel/ace/Makefile +++ b/devel/ace/Makefile @@ -81,8 +81,7 @@ PLIST_SUB+= TK="@comment " .endif .if ${PORT_OPTIONS:MQT4} -USE_QT_VER= 4 -QT_COMPONENTS= corelib gui moc_build +USE_QT4= corelib gui moc_build MAKE_ENV+= qt=1 qt4=1 QTDIR="${QT_PREFIX}" CPPFLAGS+= -I${QT_INCDIR} LDFLAGS+= -L${QT_LIBDIR} diff --git a/devel/alabastra/Makefile b/devel/alabastra/Makefile index 04a6dbc97d68..8c1f1a799a8e 100644 --- a/devel/alabastra/Makefile +++ b/devel/alabastra/Makefile @@ -15,8 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= C++ Editor writen with QT4 -USE_QT_VER= 4 -QT_COMPONENTS= gui xml qmake_build moc_build uic_build rcc_build \ +USE_QT4= gui xml qmake_build moc_build uic_build rcc_build \ iconengines USE_GMAKE= yes ALL_TARGET= Alabastra diff --git a/devel/apiextractor/Makefile b/devel/apiextractor/Makefile index 07881c25ca28..77c5ed2aaf53 100644 --- a/devel/apiextractor/Makefile +++ b/devel/apiextractor/Makefile @@ -22,12 +22,11 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ PLIST_SUB= PORTVERSION=${PORTVERSION} -QT_COMPONENTS= gui moc_build qmake_build qtestlib_build \ +USE_QT4= gui moc_build qmake_build qtestlib_build \ rcc_build uic_build xml xmlpatterns USE_BZIP2= yes USE_CMAKE= yes USE_LDCONFIG= yes -USE_QT_VER= 4 .include <bsd.port.mk> diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile index 227f3ac68a7e..4c854216ca89 100644 --- a/devel/cmake-gui/Makefile +++ b/devel/cmake-gui/Makefile @@ -17,8 +17,7 @@ COMMENT= Qt4 GUI for cmake RUN_DEPENDS= ${CMAKE_BIN}:${CMAKE_PORT} -USE_QT_VER= 4 -QT_COMPONENTS= gui qmake_build moc_build uic_build rcc_build +USE_QT4= gui qmake_build moc_build uic_build rcc_build USE_CMAKE= yes CMAKE_ARGS= -DBUILD_QtDialog:bool=on \ -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \ diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index 491848e454d8..87ba33f84f46 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -16,8 +16,7 @@ COMMENT= Qt4 bindings for the D-BUS messaging system LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build corelib xml +USE_QT4= qmake_build moc_build rcc_build corelib xml QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_UNSAFE= yes diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 1bb422c35b67..93c1ed32bcb0 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -64,8 +64,7 @@ MAKE_ARGS+= HAVE_LATEX=yes .endif # !defined(NOPORTDOCS) .if !defined(WITHOUT_DOXYWIZARD) -USE_QT_VER= 4 -QT_COMPONENTS= corelib gui xml qmake_build moc_build rcc_build +USE_QT4= corelib gui xml qmake_build moc_build rcc_build # Need this in env for build QTDIR?= ${QT_PREFIX} diff --git a/devel/fuel/Makefile b/devel/fuel/Makefile index 0af8385b9905..52531773cb37 100644 --- a/devel/fuel/Makefile +++ b/devel/fuel/Makefile @@ -17,8 +17,7 @@ LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/bin/fossil:${PORTSDIR}/devel/fossil -USE_QT_VER= 4 -QT_COMPONENTS= corelib gui \ +USE_QT4= corelib gui \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes diff --git a/devel/gecode/Makefile b/devel/gecode/Makefile index 93dcfbd86ff8..8ba2cbad8f68 100644 --- a/devel/gecode/Makefile +++ b/devel/gecode/Makefile @@ -39,8 +39,7 @@ MAKE_JOBS_UNSAFE=yes .include <bsd.port.options.mk> .if defined(WITH_GIST) -USE_QT_VER= 4 -QT_COMPONENTS= corelib gui moc_build qmake_build +USE_QT4= corelib gui moc_build qmake_build CONFIGURE_ARGS+=--enable-gist --enable-qt PLIST_SUB+= GIST="" .else diff --git a/devel/generatorrunner/Makefile b/devel/generatorrunner/Makefile index 56f5acde3ddc..06f7b5152ef3 100644 --- a/devel/generatorrunner/Makefile +++ b/devel/generatorrunner/Makefile @@ -27,11 +27,10 @@ CMAKE_ARGS= -DNO_INSTALL_MANPAGES:BOOL=ON PLIST_SUB= PORTVERSION=${PORTVERSION} -QT_COMPONENTS= gui qmake_build qtestlib moc_build rcc_build uic_build xml +USE_QT4= gui qmake_build qtestlib moc_build rcc_build uic_build xml USE_BZIP2= yes USE_CMAKE= yes USE_LDCONFIG= yes -USE_QT_VER= 4 .include <bsd.port.mk> diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile index 28a05c437e40..ab118964f71e 100644 --- a/devel/grantlee/Makefile +++ b/devel/grantlee/Makefile @@ -18,9 +18,8 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LIB USE_CMAKE= yes -USE_QT_VER= 4 USE_LDCONFIG= yes -QT_COMPONENTS= corelib gui script \ +USE_QT4= corelib gui script \ qmake_build moc_build rcc_build uic_build qtestlib_build CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE CMAKE_OUTSOURCE= yes diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile index 9ddf841476bf..0f2d8f162983 100644 --- a/devel/kcachegrind/Makefile +++ b/devel/kcachegrind/Makefile @@ -21,8 +21,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_CMAKE= yes USE_KDE4= automoc4 kdehier kdelibs -USE_QT_VER= 4 -QT_COMPONENTS= moc_build qmake_build rcc_build uic_build +USE_QT4= moc_build qmake_build rcc_build uic_build INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/devel/kdebindings4-perl-perlkde/Makefile b/devel/kdebindings4-perl-perlkde/Makefile index 4e3a4f97e195..b6e40e6490c6 100644 --- a/devel/kdebindings4-perl-perlkde/Makefile +++ b/devel/kdebindings4-perl-perlkde/Makefile @@ -21,8 +21,7 @@ USE_PERL5= yes # Build fails with system gcc USE_GCC= 4.6+ USE_KDE4= kdehier kdeprefix perlqt smokekde automoc4 -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build uic_build rcc_build +USE_QT4= qmake_build moc_build uic_build rcc_build USE_CMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/devel/kdebindings4-perl-perlqt/Makefile b/devel/kdebindings4-perl-perlqt/Makefile index 78e7b6ff4d34..31bc57a93b9a 100644 --- a/devel/kdebindings4-perl-perlqt/Makefile +++ b/devel/kdebindings4-perl-perlqt/Makefile @@ -24,8 +24,7 @@ USE_PERL5= yes # Build fails with system gcc USE_GCC= 4.6+ USE_KDE4= kdehier kdeprefix smokeqt qimageblitz -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build uic_build rcc_build +USE_QT4= qmake_build moc_build uic_build rcc_build USE_CMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/devel/kdebindings4-python-krosspython/Makefile b/devel/kdebindings4-python-krosspython/Makefile index 0a0300448ce5..b68c4734bc44 100644 --- a/devel/kdebindings4-python-krosspython/Makefile +++ b/devel/kdebindings4-python-krosspython/Makefile @@ -20,8 +20,7 @@ COMMENT= Kross Python scripting library USE_KDE4= kdehier kdelibs kdeprefix automoc4 USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= gui qmake_build moc_build uic_build rcc_build +USE_QT4= gui qmake_build moc_build uic_build rcc_build USE_XZ= yes USE_CMAKE= yes CMAKE_ARGS+= -DBUILD_falcon:BOOL=FALSE \ diff --git a/devel/kdebindings4-python-pykde4/Makefile b/devel/kdebindings4-python-pykde4/Makefile index 7525a6078184..d79320278df4 100644 --- a/devel/kdebindings4-python-pykde4/Makefile +++ b/devel/kdebindings4-python-pykde4/Makefile @@ -36,8 +36,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ USE_KDE4= kdehier kdelibs kdeprefix okular pimlibs \ akonadi automoc4 soprano USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build +USE_QT4= corelib qmake_build moc_build uic_build rcc_build USE_XZ= yes USE_CMAKE= yes CMAKE_ARGS+= -DWITH_PolkitQt:BOOL=FALSE diff --git a/devel/kdebindings4-python-pykdeuic4/Makefile b/devel/kdebindings4-python-pykdeuic4/Makefile index 45bf9aa3f87d..c1449106c8b1 100644 --- a/devel/kdebindings4-python-pykdeuic4/Makefile +++ b/devel/kdebindings4-python-pykdeuic4/Makefile @@ -20,8 +20,7 @@ COMMENT= An enhanced version of pyuic4 USE_KDE4= kdelibs automoc4 pykde4 USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build +USE_QT4= corelib qmake_build moc_build uic_build rcc_build USE_XZ= yes DISTINFO_FILE= ${PORTSDIR}/devel/kdebindings4-python-pykde4/distinfo USE_CMAKE= yes diff --git a/devel/kdebindings4-ruby-korundum/Makefile b/devel/kdebindings4-ruby-korundum/Makefile index 6b53e5a02059..942b780e1804 100644 --- a/devel/kdebindings4-ruby-korundum/Makefile +++ b/devel/kdebindings4-ruby-korundum/Makefile @@ -22,8 +22,7 @@ CONFLICTS= ruby1[89]-kdebindings-4.[0-6].* USE_KDE4= kate kdehier kdelibs kdeprefix okular pimlibs \ qtruby smokegen smokekde smokeqt \ akonadi automoc4 soprano -USE_QT_VER= 4 -QT_COMPONENTS= dbus network opengl sql svg xml \ +USE_QT4= dbus network opengl sql svg xml \ qmake_build moc_build uic_build rcc_build USE_RUBY= yes USE_XZ= yes diff --git a/devel/kdebindings4-ruby-krossruby/Makefile b/devel/kdebindings4-ruby-krossruby/Makefile index 04c6da89afe2..85e11e9c1b28 100644 --- a/devel/kdebindings4-ruby-krossruby/Makefile +++ b/devel/kdebindings4-ruby-krossruby/Makefile @@ -20,8 +20,7 @@ COMMENT= Ruby bindings for Qt/KDE CONFLICTS= ruby1[89]-kdebindings-4.[0-6].* USE_KDE4= kdehier kdelibs kdeprefix pimlibs automoc4 -USE_QT_VER= 4 -QT_COMPONENTS= gui qmake_build moc_build uic_build rcc_build +USE_QT4= gui qmake_build moc_build uic_build rcc_build USE_RUBY= yes USE_XZ= yes USE_CMAKE= yes diff --git a/devel/kdebindings4-ruby-qtruby/Makefile b/devel/kdebindings4-ruby-qtruby/Makefile index 41902d652606..0442320a27bc 100644 --- a/devel/kdebindings4-ruby-qtruby/Makefile +++ b/devel/kdebindings4-ruby-qtruby/Makefile @@ -24,8 +24,7 @@ CONFLICTS_INSTALL= ruby1[89]-kdebindings-4.[0-6].* \ ruby1[89]-kdebindings-korundum-4.7.* USE_KDE4= kdehier kdeprefix smokeqt -USE_QT_VER= 4 -QT_COMPONENTS= dbus declarative designer gui network \ +USE_QT4= dbus declarative designer gui network \ phonon qtestlib script webkit xml \ qmake_build moc_build uic_build rcc_build USE_RUBY= yes diff --git a/devel/kdebindings4-smoke-smokegen/Makefile b/devel/kdebindings4-smoke-smokegen/Makefile index b3ed662032e0..ed32f5d638bf 100644 --- a/devel/kdebindings4-smoke-smokegen/Makefile +++ b/devel/kdebindings4-smoke-smokegen/Makefile @@ -19,8 +19,7 @@ COMMENT= SMOKE bindings for KDE CONFLICTS= kdebindings-smoke-4.[0-6].* USE_KDE4= kdehier kdeprefix -USE_QT_VER= 4 -QT_COMPONENTS= xml qmake_build moc_build uic_build rcc_build +USE_QT4= xml qmake_build moc_build uic_build rcc_build USE_XZ= yes USE_CMAKE= yes CMAKE_ARGS+= -DSMOKE_CMAKE_MODULE_DIR:PATH=${PREFIX}/lib/cmake/smoke diff --git a/devel/kdebindings4-smoke-smokekde/Makefile b/devel/kdebindings4-smoke-smokekde/Makefile index c6ebe333b718..ff6cfb8da2ca 100644 --- a/devel/kdebindings4-smoke-smokekde/Makefile +++ b/devel/kdebindings4-smoke-smokekde/Makefile @@ -21,8 +21,7 @@ CONFLICTS= kdebindings-smoke-4.[0-6].* USE_KDE4= kate kdehier kdelibs kdeprefix okular pimlibs \ smokegen smokeqt akonadi automoc4 soprano -USE_QT_VER= 4 -QT_COMPONENTS= dbus designer gui network opengl qt3support sql svg xml \ +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 diff --git a/devel/kdebindings4-smoke-smokeqt/Makefile b/devel/kdebindings4-smoke-smokeqt/Makefile index a6ad69f64d8f..abd7a45c1503 100644 --- a/devel/kdebindings4-smoke-smokeqt/Makefile +++ b/devel/kdebindings4-smoke-smokeqt/Makefile @@ -23,8 +23,7 @@ LIB_DEPENDS= qscintilla2:${PORTSDIR}/devel/qscintilla2 \ CONFLICTS= kdebindings-smoke-4.[0-6].* USE_KDE4= kdehier kdeprefix smokegen qimageblitz -USE_QT_VER= 4 -QT_COMPONENTS= dbus declarative designer gui help multimedia \ +USE_QT4= dbus declarative designer gui help multimedia \ network opengl phonon qt3support qtestlib \ script sql svg xml xmlpatterns webkit \ qmake_build moc_build uic_build rcc_build diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index f587826a2bc0..e1ef2d33d41c 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -32,8 +32,7 @@ USE_KDE4= kdehier kdelibs kdeprefix libkonq pimlibs sharedmime \ akonadi automoc4 qimageblitz_build strigi KDE4_BUILDENV= yes USE_PERL5= yes -USE_QT_VER= 4 -QT_COMPONENTS= dbus designer gui qt3support \ +USE_QT4= dbus designer gui qt3support \ script scripttools sql svg xml \ qmake_build moc_build rcc_build uic_build uic3_build USE_GMAKE= yes diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile index ba2d11e4f90c..8b1079dde176 100644 --- a/devel/kdesvn-kde4/Makefile +++ b/devel/kdesvn-kde4/Makefile @@ -25,8 +25,7 @@ CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 USE_GETTEXT= yes USE_KDE4= kdelibs kdeprefix automoc4 USE_LDCONFIG= yes -USE_QT_VER= 4 -QT_COMPONENTS= corelib gui xml network dbus svg qt3support sql \ +USE_QT4= corelib gui xml network dbus svg qt3support sql \ qmake_build moc_build rcc_build uic_build linguist_build MAKE_JOBS_SAFE= yes diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile index 5541caaf6e07..f9863e7f8103 100644 --- a/devel/kdevelop-kde4/Makefile +++ b/devel/kdevelop-kde4/Makefile @@ -21,8 +21,7 @@ USE_BZIP2= yes USE_CMAKE= yes USE_GMAKE= yes USE_KDE4= automoc4 kdehier kdelibs kdeprefix workspace -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build uic_build rcc_build +USE_QT4= qmake_build moc_build uic_build rcc_build MAKE_JOBS_SAFE= yes OPTIONS= OKTETA "Install Okteta plugin" on \ diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile index 40afb9fd65f5..b19d5dd5299e 100644 --- a/devel/kdevelop-pg-qt/Makefile +++ b/devel/kdevelop-pg-qt/Makefile @@ -24,8 +24,7 @@ USE_BZIP2= yes USE_BISON= build USE_KDE4= automoc4 kdehier kdelibs kdeprefix KDE4_BUILDENV= yes -USE_QT_VER= 4 -QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build +USE_QT4= corelib qmake_build moc_build uic_build rcc_build MAKE_JOBS_SAFE= yes .include <bsd.port.mk> diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile index e307da2420a4..20c6c1b70fb4 100644 --- a/devel/kdevelop-php-docs/Makefile +++ b/devel/kdevelop-php-docs/Makefile @@ -22,8 +22,7 @@ LIB_DEPENDS= kdevplatforminterfaces.5:${PORTSDIR}/devel/kdevplatform USE_BZIP2= yes USE_KDE4= automoc4 kdehier kdelibs kdeprefix KDE4_BUILDENV= yes -USE_QT_VER= 4 -QT_COMPONENTS= moc_build qmake_build rcc_build uic_build +USE_QT4= moc_build qmake_build rcc_build uic_build MAKE_JOBS_SAFE= yes .include <bsd.port.mk> diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile index 0a9d42000845..6d6d07330810 100644 --- a/devel/kdevelop-php/Makefile +++ b/devel/kdevelop-php/Makefile @@ -24,8 +24,7 @@ USE_BZIP2= yes USE_CMAKE= yes USE_GMAKE= yes USE_KDE4= automoc4 kdehier kdelibs kdeprefix -USE_QT_VER= 4 -QT_COMPONENTS= moc_build qmake_build rcc_build uic_build +USE_QT4= moc_build qmake_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes OPTIONS= DOCS "Integrate with PHP.net online documentation" on diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile index ba4c5ca809b2..062c98a2772e 100644 --- a/devel/kdevplatform/Makefile +++ b/devel/kdevplatform/Makefile @@ -22,8 +22,7 @@ LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion \ USE_BZIP2= yes USE_KDE4= kate_run kdehier kdelibs kdeprefix automoc4 KDE4_BUILDENV= yes -USE_QT_VER= 4 -QT_COMPONENTS= corelib dbus gui network qtestlib \ +USE_QT4= corelib dbus gui network qtestlib \ qmake_build moc_build uic_build rcc_build MAKE_JOBS_SAFE= yes diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile index 77c572293ea3..d8e8e1e0b0ee 100644 --- a/devel/libdbusmenu-qt/Makefile +++ b/devel/libdbusmenu-qt/Makefile @@ -20,8 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING FETCH_ARGS= -Fpr USE_BZIP2= yes USE_CMAKE= yes -USE_QT_VER= 4 -QT_COMPONENTS= dbus gui xml \ +USE_QT4= dbus gui xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile index 526ca35b1013..2577059d0698 100644 --- a/devel/py-qt4-assistant/Makefile +++ b/devel/py-qt4-assistant/Makefile @@ -23,8 +23,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= assistantclient qmake_build +USE_QT4= assistantclient qmake_build OPTIONS= API "Install QtAssistant API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile index 4b3a9f9ad75c..8782575aa153 100644 --- a/devel/py-qt4-core/Makefile +++ b/devel/py-qt4-core/Makefile @@ -22,8 +22,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= corelib qmake_build moc_build +USE_QT4= corelib qmake_build moc_build OPTIONS= API "Install QtCore API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile index 903f201b5d16..c0a910c96ae9 100644 --- a/devel/py-qt4-dbus/Makefile +++ b/devel/py-qt4-dbus/Makefile @@ -24,8 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \ DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= corelib qmake_build moc_build +USE_QT4= corelib qmake_build moc_build USE_XORG= x11 xext BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile index 22528e2a7ce2..07ea553e2bdb 100644 --- a/devel/py-qt4-declarative/Makefile +++ b/devel/py-qt4-declarative/Makefile @@ -22,8 +22,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= declarative qmake_build moc_build +USE_QT4= declarative qmake_build moc_build OPTIONS= API "Install QtDeclarative API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile index ea70f113978e..ee84212b0714 100644 --- a/devel/py-qt4-designer/Makefile +++ b/devel/py-qt4-designer/Makefile @@ -24,8 +24,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= gui xml designer moc_build qmake_build +USE_QT4= gui xml designer moc_build qmake_build OPTIONS= API "Install QtDesigner API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile index 9762978ea480..25ebf6e162c2 100644 --- a/devel/py-qt4-designerplugin/Makefile +++ b/devel/py-qt4-designerplugin/Makefile @@ -25,8 +25,7 @@ INSTALL_WRKSRC= ${WRKSRC}/designer DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= gui xml designer moc_build qmake_build +USE_QT4= gui xml designer moc_build qmake_build OPTIONS= DEBUG "Enable debugging in generated code" off \ TRACING "Enable tracing in generated code" off diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile index b39c96abd2a2..092672f9c963 100644 --- a/devel/py-qt4-help/Makefile +++ b/devel/py-qt4-help/Makefile @@ -22,8 +22,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= help qmake_build +USE_QT4= help qmake_build OPTIONS= API "Install QtHelp API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile index affb39234cd0..bf35824eab6e 100644 --- a/devel/py-qt4-qscintilla2/Makefile +++ b/devel/py-qt4-qscintilla2/Makefile @@ -25,8 +25,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} DISTINFO_FILE= ${QSCI2_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= gui +USE_QT4= gui OPTIONS= API "Install binding API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile index 2d11aabcc733..0e09ad9c125b 100644 --- a/devel/py-qt4-script/Makefile +++ b/devel/py-qt4-script/Makefile @@ -22,8 +22,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= script qmake_build +USE_QT4= script qmake_build OPTIONS= API "Install QtScript API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile index 8eef71f22a2d..4e0aea903dab 100644 --- a/devel/py-qt4-scripttools/Makefile +++ b/devel/py-qt4-scripttools/Makefile @@ -23,8 +23,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= scripttools qmake_build +USE_QT4= scripttools qmake_build OPTIONS= API "Install QtScript API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile index 218c42998212..ff3c61b4519b 100644 --- a/devel/py-qt4-test/Makefile +++ b/devel/py-qt4-test/Makefile @@ -22,8 +22,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= qtestlib qmake_build +USE_QT4= qtestlib qmake_build OPTIONS= API "Install QtTest API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/devel/pyside-tools/Makefile b/devel/pyside-tools/Makefile index 2fc69ae59759..e37b3df3d98a 100644 --- a/devel/pyside-tools/Makefile +++ b/devel/pyside-tools/Makefile @@ -31,7 +31,7 @@ MAN1= pyside-lupdate.1 \ CMAKE_ARGS= -DNO_INSTALL_MANPAGES:BOOL=ON .endif -QT_COMPONENTS= moc_build qmake_build rcc_build uic_build +USE_QT4= moc_build qmake_build rcc_build uic_build REINPLACE_ARGS= -i.bak -e 's+/usr/bin/env python+&${PYTHON_VER}+' \ ${WRKSRC}/pyside-uic ${WRKSRC}/pysideuic/icon_cache.py @@ -39,7 +39,6 @@ REINPLACE_ARGS= -i.bak -e 's+/usr/bin/env python+&${PYTHON_VER}+' \ USE_BZIP2= yes USE_CMAKE= yes USE_PYTHON= 2.5-2.7 -USE_QT_VER= 4 post-patch: ${REINPLACE_CMD} diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile index f6c742fb00a2..4afa67248730 100644 --- a/devel/pyside/Makefile +++ b/devel/pyside/Makefile @@ -25,7 +25,7 @@ CMAKE_ARGS= -DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \ -DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include" # QT4_OPTIONS=QGTKSTYLE in /etc/make.conf removes some warnings -QT_COMPONENTS= declarative designer gui help qmake_build \ +USE_QT4= declarative designer gui help qmake_build \ moc_build multimedia network opengl \ phonon rcc_build script scripttools \ svg uic_build webkit @@ -37,7 +37,6 @@ USE_BZIP2= yes USE_CMAKE= yes USE_LDCONFIG= yes USE_PYTHON= 2.5-2.7 -USE_QT_VER= 4 # API documentation requires graphics/graphviz and Qt4 src to build diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile index 39d16ef6aff4..b723ca658a98 100644 --- a/devel/qbzr/Makefile +++ b/devel/qbzr/Makefile @@ -26,7 +26,7 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bazaar-ng WRKSRC= ${WRKDIR}/${PORTNAME} USE_PYTHON= yes -USE_QT_VER= 4 +USE_QT4= yes USE_PYDISTUTILS= yes USE_GETTEXT= yes INSTALLS_ICONS= yes diff --git a/devel/qca/Makefile b/devel/qca/Makefile index 59579832e74a..00ccb0b551ce 100644 --- a/devel/qca/Makefile +++ b/devel/qca/Makefile @@ -15,8 +15,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform crypto API for QT USE_BZIP2= yes -USE_QT_VER= 4 -QT_COMPONENTS= corelib qmake_build moc_build +USE_QT4= corelib qmake_build moc_build HAS_CONFIGURE= yes QT_NONSTANDARD= yes CONFIGURE_ARGS+=--prefix=${PREFIX} @@ -31,7 +30,7 @@ CONFIGURE_ENV+= QC_VERBOSE=Y .endif .if defined(MAINTAINER_MODE) -QT_COMPONENTS+= qtestlib +USE_QT4+= qtestlib .else CONFIGURE_ARGS+=--disable-tests .endif diff --git a/devel/qconf/Makefile b/devel/qconf/Makefile index 8e057ef4c527..de7cc4e47e9c 100644 --- a/devel/qconf/Makefile +++ b/devel/qconf/Makefile @@ -14,8 +14,7 @@ MAINTAINER= andreevmaxim@gmail.com COMMENT= Tool to create configure script for qmake-based project USE_BZIP2= yes -USE_QT_VER= 4 -QT_COMPONENTS= corelib xml moc_build qmake_build +USE_QT4= corelib xml moc_build qmake_build HAS_CONFIGURE= yes QT_NONSTANDARD= yes diff --git a/devel/qdevelop/Makefile b/devel/qdevelop/Makefile index 893240eebb46..e1e72fefc397 100644 --- a/devel/qdevelop/Makefile +++ b/devel/qdevelop/Makefile @@ -18,8 +18,7 @@ COMMENT= A development environment entirely dedicated to Qt4 RUN_DEPENDS= exctags:${PORTSDIR}/devel/ctags \ qt4-sqlite-plugin>=0:${PORTSDIR}/databases/qt4-sqlite3-plugin -USE_QT_VER= 4 -QT_COMPONENTS= gui sql network xml designer \ +USE_QT4= gui sql network xml designer \ qmake_build moc_build uic_build rcc_build MAKE_JOBS_SAFE= yes @@ -40,14 +39,14 @@ OPTIONS= TOOLS "Install Qt4 dev. tools (qmake, moc, etc.)" on .include <bsd.port.pre.mk> .if !defined(WITHOUT_NLS) -QT_COMPONENTS+= linguist_build +USE_QT4+= linguist_build PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " .endif .if !defined(WITHOUT_TOOLS) -QT_COMPONENTS+= assistant_run linguist_run \ +USE_QT4+= assistant_run linguist_run \ qmake_run moc_run uic_run rcc_run .endif diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile index 1279d3edca88..1e3e771828ee 100644 --- a/devel/qgit/Makefile +++ b/devel/qgit/Makefile @@ -15,8 +15,7 @@ MAINTAINER= itetcu@FreeBSD.org COMMENT= A graphical interface to git repositories USE_BZIP2= yes -USE_QT_VER= 4 -QT_COMPONENTS= corelib gui moc_build qmake_build rcc_build uic_build +USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile index 219d057cff90..7f734beb89ba 100644 --- a/devel/qjson/Makefile +++ b/devel/qjson/Makefile @@ -17,8 +17,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING USE_BZIP2= yes -USE_QT_VER= 4 -QT_COMPONENTS= corelib moc_build qmake_build rcc_build uic_build +USE_QT4= corelib moc_build qmake_build rcc_build uic_build MAKE_JOBS_SAFE= yes USE_CMAKE= yes USE_LDCONFIG= yes diff --git a/devel/qprog/Makefile b/devel/qprog/Makefile index 13e8643c5473..2fb906daa7e2 100644 --- a/devel/qprog/Makefile +++ b/devel/qprog/Makefile @@ -15,8 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= bfoz@bfoz.net COMMENT= Cross-platform software for the DIY line of PIC programmers -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build gui network +USE_QT4= qmake_build moc_build gui network WRKSRC= ${WRKDIR}/QProg diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile index 75b7223ffd82..dc43d1f126bf 100644 --- a/devel/qscintilla2-designerplugin/Makefile +++ b/devel/qscintilla2-designerplugin/Makefile @@ -19,8 +19,7 @@ COMMENT= Qt Designer plugin for QScintilla2 (Qt4) LIB_DEPENDS= qscintilla2.8:${PORTSDIR}/devel/qscintilla2 DISTINFO_FILE= ${QSCI2_DISTINFO_FILE} -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build gui xml designer +USE_QT4= qmake_build moc_build gui xml designer HAS_CONFIGURE= yes QMAKE_ARGS= -unix PREFIX=${PREFIX} diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile index 0ba22163c2e5..0948431fcfed 100644 --- a/devel/qscintilla2/Makefile +++ b/devel/qscintilla2/Makefile @@ -15,8 +15,7 @@ DISTNAME= ${QSCI2_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 port of the Scintilla C++ editor class -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build gui xml designer +USE_QT4= qmake_build moc_build gui xml designer HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qsvn/Makefile b/devel/qsvn/Makefile index 31b4aedec9e2..dad13dec9662 100644 --- a/devel/qsvn/Makefile +++ b/devel/qsvn/Makefile @@ -17,8 +17,7 @@ COMMENT= Qt based GUI frontend for Subversion LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion -USE_QT_VER= 4 -QT_COMPONENTS= gui sql moc_build uic_build rcc_build qmake_build +USE_QT4= gui sql moc_build uic_build rcc_build qmake_build USE_LDCONFIG= yes USE_CMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile index e9d62351998b..c4a6acf22f40 100644 --- a/devel/qt4-assistant-adp/Makefile +++ b/devel/qt4-assistant-adp/Makefile @@ -18,8 +18,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser, adp compat version -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib \ +USE_QT4= qmake_build moc_build rcc_build uic_build corelib \ gui network xml doc dbus MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index fc56b40af9bb..d0c8b07a937f 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build qt3support corelib \ +USE_QT4= qmake_build moc_build rcc_build uic_build qt3support corelib \ gui network sql xml doc help webkit QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index b6dfd3482808..7935aac8d64e 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -16,8 +16,7 @@ COMMENT= Qt core library LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build +USE_QT4= qmake_build moc_build QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-declarative/Makefile b/devel/qt4-declarative/Makefile index 2b5f2205468a..51d200dac641 100644 --- a/devel/qt4-declarative/Makefile +++ b/devel/qt4-declarative/Makefile @@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 framework for building highly dynamic user interfaces -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui network \ +USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network \ opengl script sql svg xml xmlpatterns QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index 1144032e10ee..2801797fd0c7 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt ui editor -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build assistant_run \ +USE_QT4= qmake_build moc_build rcc_build uic_build assistant_run \ qt3support corelib declarative gui network script sql xml \ webkit phonon QT_NONSTANDARD= yes diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile index ad29da63574e..629406b80f77 100644 --- a/devel/qt4-help-tools/Makefile +++ b/devel/qt4-help-tools/Makefile @@ -15,8 +15,7 @@ PKGNAMESUFFIX= -tools MAINTAINER= kde@FreeBSD.org COMMENT= QtHelp tools to generate and convert documentation -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib \ +USE_QT4= qmake_build moc_build rcc_build uic_build corelib \ gui sql xml doc help QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile index 65d6825c532d..372be7a2a0dc 100644 --- a/devel/qt4-help/Makefile +++ b/devel/qt4-help/Makefile @@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= QtHelp module provides QHelpEngine API and is used by Assistant -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build corelib clucene \ +USE_QT4= qmake_build moc_build rcc_build corelib clucene \ gui sql sql-sqlite3_run xml network QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile index e14df9fd3267..15c12a77958f 100644 --- a/devel/qt4-libqtassistantclient/Makefile +++ b/devel/qt4-libqtassistantclient/Makefile @@ -18,8 +18,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser integration library -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui network +USE_QT4= qmake_build moc_build rcc_build corelib gui network MAKE_JOBS_SAFE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index b0a37da1ad5d..beffcc50be77 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt localisation tool -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build designer_build moc_build rcc_build uic_build \ +USE_QT4= qmake_build designer_build moc_build rcc_build uic_build \ assistant_run gui network xml QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile index 5bbabf40bf7e..bc30b7f75ded 100644 --- a/devel/qt4-makeqpf/Makefile +++ b/devel/qt4-makeqpf/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt qtopia font creator -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui +USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index 25086b301f24..0cd7c464a805 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt meta object compiler -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build +USE_QT4= qmake_build QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index 5b95bfc88e76..02bd2f016b25 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt utility to assist with porting Qt3 applications to Qt4 -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build corelib xml +USE_QT4= qmake_build moc_build rcc_build corelib xml QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile index d62636ea063a..e535d00bf778 100644 --- a/devel/qt4-qdbusviewer/Makefile +++ b/devel/qt4-qdbusviewer/Makefile @@ -16,8 +16,7 @@ COMMENT= Qt4 D-BUS viewer LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build corelib dbus gui xml \ +USE_QT4= qmake_build moc_build rcc_build corelib dbus gui xml \ clucene QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile index 0ebbdde8792b..c10baab523eb 100644 --- a/devel/qt4-qdoc3/Makefile +++ b/devel/qt4-qdoc3/Makefile @@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build corelib gui xml +USE_QT4= qmake_build corelib gui xml QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index 0eabf96da490..739afd344ee9 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt3 compatibility library -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build corelib gui network sql xml +USE_QT4= qmake_build moc_build corelib gui network sql xml QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index d77e50e25fb7..63ca2bc17d77 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt unit testing library -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build corelib +USE_QT4= qmake_build moc_build corelib QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-qtsolutions-singleapplication/Makefile b/devel/qt4-qtsolutions-singleapplication/Makefile index d4dd8376ce94..8ff5cd476206 100644 --- a/devel/qt4-qtsolutions-singleapplication/Makefile +++ b/devel/qt4-qtsolutions-singleapplication/Makefile @@ -16,8 +16,7 @@ DISTNAME= qt4-qtsolutions-singleinstance-${PORTVERSION} MAINTAINER= yurkis@gmail.com COMMENT= QT4 Solutions Single Application Framework -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build gui network +USE_QT4= qmake_build moc_build rcc_build uic_build gui network HAS_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index b8fc3bd5e262..70f12feb4235 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt virtual framebuffer utility -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui opengl +USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui opengl QT_NONSTANDARD= yes QT_DIST= yes USE_XORG= xtst diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index a0048bc97311..7615cf9cb4eb 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt resource compiler -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build +USE_QT4= qmake_build QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index 943207d93485..e7cf3735657c 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt script -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build corelib +USE_QT4= qmake_build moc_build corelib QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile index 4b76c5b2967a..e5d205e783e1 100644 --- a/devel/qt4-scripttools/Makefile +++ b/devel/qt4-scripttools/Makefile @@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt script -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build gui script +USE_QT4= qmake_build moc_build rcc_build gui script QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index 66f8b5656abe..231bad5105d4 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt user interface compiler -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build +USE_QT4= qmake_build QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index de05ab3c6a3f..0524fbc69a1f 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt backwards-compatible user interface compiler -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build qt3support corelib gui network sql xml +USE_QT4= qmake_build qt3support corelib gui network sql xml QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index e865376025e3..b2707eae40e8 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -20,8 +20,7 @@ OPTIONS= CODECS "Enable support for CN, JP, KR, TW" off \ TOOLS "Install Qt tools (qmake, moc, etc.)" off \ DEMO "Install demonstration and example programs" off -USE_QT_VER= 4 -QT_COMPONENTS= accessible assistant clucene corelib \ +USE_QT4= accessible assistant clucene corelib \ dbus declarative designer doc \ graphicssystems-opengl gui help \ iconengines imageformats inputmethods \ @@ -35,24 +34,24 @@ NO_BUILD= yes .include <bsd.port.options.mk> .if !defined(WITHOUT_NLS) -QT_COMPONENTS+= l10n +USE_QT4+= l10n .endif .if defined(WITH_TOOLS) -QT_COMPONENTS+= help-tools linguist makeqpf moc pixeltool \ +USE_QT4+= help-tools linguist makeqpf moc pixeltool \ porting qmake rcc uic uic3 qdoc3 .endif .if defined(WITH_CODECS) -QT_COMPONENTS+= codecs-cn codecs-jp codecs-kr codecs-tw +USE_QT4+= codecs-cn codecs-jp codecs-kr codecs-tw .endif .if defined(WITH_SQL_PLUGINS) -QT_COMPONENTS+= sql-mysql sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3 +USE_QT4+= sql-mysql sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3 .endif .if defined(WITH_DEMO) -QT_COMPONENTS+= demo +USE_QT4+= demo .endif do-patch: #empty diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 61879a182b4b..0f50e3b896d9 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= Imath.6:${PORTSDIR}/graphics/ilmbase \ jasper.4:${PORTSDIR}/graphics/jasper \ jpeg.11:${PORTSDIR}/graphics/jpeg -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build \ +USE_QT4= qmake_build moc_build rcc_build uic_build \ linguist_build assistant_run qt3support \ dbus designer gui help-tools_build network script \ sql svg xml webkit qdoc3_build diff --git a/devel/qtscriptgenerator/Makefile b/devel/qtscriptgenerator/Makefile index b3a94a8b4f21..f4d86275725e 100644 --- a/devel/qtscriptgenerator/Makefile +++ b/devel/qtscriptgenerator/Makefile @@ -16,8 +16,7 @@ COMMENT= Tool that generates Qt bindings for Qt Script OPTIONS= PHONON "Build Phonon support" on -USE_QT_VER= 4 -QT_COMPONENTS= corelib declarative designer doc help help-tools gui \ +USE_QT4= corelib declarative designer doc help help-tools gui \ iconengines imageformats inputmethods linguist network \ opengl pixeltool porting qdbusviewer \ qt3support qtestlib qvfb script scripttools \ @@ -30,7 +29,7 @@ USE_LDCONFIG= yes .include <bsd.port.options.mk> .if !defined(WITHOUT_PHONON) -QT_COMPONENTS+= phonon +USE_QT4+= phonon PLIST_SUB+= PHONON="" .else EXTRA_PATCHES= ${FILESDIR}/extra-patch-no_phonon diff --git a/devel/shiboken/Makefile b/devel/shiboken/Makefile index 50ca454b435e..551873afdc6d 100644 --- a/devel/shiboken/Makefile +++ b/devel/shiboken/Makefile @@ -24,13 +24,12 @@ LIB_DEPENDS= apiextractor.0:${PORTSDIR}/devel/apiextractor \ PLIST_SUB= PORTVERSION=${PORTVERSION} \ PYTHON_VERSION=${PYTHON_VERSION} -QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build +USE_QT4= corelib qmake_build moc_build uic_build rcc_build USE_BZIP2= yes USE_CMAKE= yes USE_LDCONFIG= yes USE_PYTHON= yes -USE_QT_VER= 4 .if !defined(NO_INSTALL_MANPAGES) MAN1= shiboken.1 diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile index c10f83d9a2ec..7b54dbbc15f5 100644 --- a/devel/subcommander2/Makefile +++ b/devel/subcommander2/Makefile @@ -29,8 +29,7 @@ USE_DOS2UNIX= *.cpp *.h GNU_CONFIGURE= yes USE_GMAKE= yes USE_OPENSSL= yes -USE_QT_VER= 4 -QT_COMPONENTS= qt3support gui network corelib moc_build uic_build rcc_build +USE_QT4= qt3support gui network corelib moc_build uic_build rcc_build CONFIGURE_ARGS+= --with-boost=${LOCALBASE}/include --with-neon=${LOCALBASE} \ --with-subversion=${LOCALBASE} --with-qt=${LOCALBASE} \ --with-apr=${LOCALBASE}/bin/apr-1-config \ diff --git a/devel/svn2git/Makefile b/devel/svn2git/Makefile index 4a17ce0e516c..daf9f3ac8f6f 100644 --- a/devel/svn2git/Makefile +++ b/devel/svn2git/Makefile @@ -20,8 +20,7 @@ RUN_DEPENDS+= git:${PORTSDIR}/devel/git \ LICENSES= GPLv1 GPLv2 GPLv3 USE_XZ= yes -USE_QT_VER= 4 -QT_COMPONENTS= corelib qmake_build +USE_QT4= corelib qmake_build MAKE_JOBS_SAFE= yes PLIST_FILES= bin/svn2git diff --git a/devel/universalindentgui/Makefile b/devel/universalindentgui/Makefile index 66ad037db7a1..1284940ae37b 100644 --- a/devel/universalindentgui/Makefile +++ b/devel/universalindentgui/Makefile @@ -16,8 +16,7 @@ COMMENT= Graphical UI for multiple source code indent/format/beautify tools LIB_DEPENDS= qscintilla2:${PORTSDIR}/devel/qscintilla2 -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build uic_build rcc_build \ +USE_QT4= qmake_build moc_build uic_build rcc_build \ linguist network script gui HAS_CONFIGURE= yes |