From 9c2f65e3958e906d7f49ce94318d22defb3fffb2 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Wed, 6 Jun 2012 06:44:37 +0000 Subject: - Convert USE_QT_VER=4 and QT_COMPONETS to USE_QT4 Review by: bapt, David Naylor (kde team) --- textproc/beediff/Makefile | 3 +-- textproc/dikt/Makefile | 3 +-- textproc/dixit/Makefile | 3 +-- textproc/goldendict/Makefile | 3 +-- textproc/ibus-qt/Makefile | 3 +-- textproc/kdiff3/Makefile | 3 +-- textproc/py-qt4-xml/Makefile | 3 +-- textproc/py-qt4-xmlpatterns/Makefile | 3 +-- textproc/qstardict/Makefile | 3 +-- textproc/qt4-clucene/Makefile | 3 +-- textproc/qt4-xml/Makefile | 3 +-- textproc/qt4-xmlpatterns-tool/Makefile | 3 +-- textproc/qt4-xmlpatterns/Makefile | 3 +-- textproc/scim-bridge-qt4/Makefile | 3 +-- textproc/sigil/Makefile | 3 +-- textproc/soprano/Makefile | 3 +-- textproc/uim-kde4/Makefile | 3 +-- textproc/uim-qt4/Makefile | 3 +-- 18 files changed, 18 insertions(+), 36 deletions(-) (limited to 'textproc') diff --git a/textproc/beediff/Makefile b/textproc/beediff/Makefile index f84092c5e730..b6521d6b2726 100644 --- a/textproc/beediff/Makefile +++ b/textproc/beediff/Makefile @@ -15,8 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}_src MAINTAINER= makc@FreeBSD.org COMMENT= QT4 based diff frontend -USE_QT_VER= 4 -QT_COMPONENTS= gui moc_build rcc_build qmake_build +USE_QT4= gui moc_build rcc_build qmake_build HAS_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/textproc/dikt/Makefile b/textproc/dikt/Makefile index ec237a1f1ab3..e3942fa05e86 100644 --- a/textproc/dikt/Makefile +++ b/textproc/dikt/Makefile @@ -17,8 +17,7 @@ COMMENT= Dictionary for KDE4 USE_XZ= yes USE_KDE4= kdelibs kdeprefix kdehier automoc4 -USE_QT_VER= 4 -QT_COMPONENTS= corelib gui network svg xml \ +USE_QT4= corelib gui network svg xml \ qmake_build moc_build rcc_build uic_build USE_CMAKE= yes diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile index 442708a7b3ce..5a8498ef0b39 100644 --- a/textproc/dixit/Makefile +++ b/textproc/dixit/Makefile @@ -37,8 +37,7 @@ _DB= ${DB_DIR}/${_DB_F} HAS_CONFIGURE= yes QT_VER=4 -USE_QT_VER= 4 -QT_COMPONENTS= corelib gui network moc_build qmake_build rcc_build +USE_QT4= corelib gui network moc_build qmake_build rcc_build #USE_GMAKE= yes #MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} QTDIR="${QT_PREFIX}" diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile index b9a107d5b87f..cc5f0891d55b 100644 --- a/textproc/goldendict/Makefile +++ b/textproc/goldendict/Makefile @@ -24,8 +24,7 @@ USE_BZIP2= yes HAS_CONFIGURE= yes USE_GNOME= pkgconfig USE_XORG= xtst -USE_QT_VER= 4 -QT_COMPONENTS= corelib gui webkit phonon \ +USE_QT4= corelib gui webkit phonon \ qmake_build linguist_build moc_build rcc_build script_build uic_build WRKSRC= ${WRKDIR} diff --git a/textproc/ibus-qt/Makefile b/textproc/ibus-qt/Makefile index b62c8b746927..e395e98bc010 100644 --- a/textproc/ibus-qt/Makefile +++ b/textproc/ibus-qt/Makefile @@ -22,8 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ibus-1.0.pc:${PORTSDIR}/textproc/ibu ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus \ ${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu -USE_QT_VER= 4 -QT_COMPONENTS= gui dbus moc_build qmake_build moc_build uic_build rcc_build +USE_QT4= gui dbus moc_build qmake_build moc_build uic_build rcc_build USE_CMAKE= yes CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX=${PREFIX} -DDOCDIR=${PREFIX}/share/doc/ibus-qt USE_LDCONFIG= yes diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index 7ca061809f87..6fcf2c7fc8f8 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -16,8 +16,7 @@ COMMENT= A KDE4 graphical frontend for diff USE_KDE4= kdebase kdeprefix kdehier automoc4 USE_CMAKE= 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 USE_GETTEXT= yes MAKE_JOBS_SAFE= yes diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile index 32ade50ba54e..ccf894bd59ab 100644 --- a/textproc/py-qt4-xml/Makefile +++ b/textproc/py-qt4-xml/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= xml qmake_build moc_build +USE_QT4= xml qmake_build moc_build OPTIONS= API "Install QtXml API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile index 7abc54971d7e..0b61dbe05670 100644 --- a/textproc/py-qt4-xmlpatterns/Makefile +++ b/textproc/py-qt4-xmlpatterns/Makefile @@ -21,8 +21,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-x DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT_VER= 4 -QT_COMPONENTS= xmlpatterns qmake_build +USE_QT4= xmlpatterns qmake_build OPTIONS= API "Install QtXml API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile index 1b2efa1ee1ee..c1c1900da979 100644 --- a/textproc/qstardict/Makefile +++ b/textproc/qstardict/Makefile @@ -15,8 +15,7 @@ MAINTAINER= makc@FreeBSD.org COMMENT= A StarDict clone written with using Qt4 USE_BZIP2= yes -USE_QT_VER= 4 -QT_COMPONENTS= gui network xml qmake_build uic_build moc_build rcc_build +USE_QT4= gui network xml qmake_build uic_build moc_build rcc_build QMAKE_ARGS+= -recursive USE_DOS2UNIX= qstardict.pri diff --git a/textproc/qt4-clucene/Makefile b/textproc/qt4-clucene/Makefile index 4fb0a49da433..f0caa2039849 100644 --- a/textproc/qt4-clucene/Makefile +++ b/textproc/qt4-clucene/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= QtCLucene full text search library wrapper -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build corelib +USE_QT4= qmake_build corelib QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index d3f41557a1c7..c6d70b92438b 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt XML 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/textproc/qt4-xmlpatterns-tool/Makefile b/textproc/qt4-xmlpatterns-tool/Makefile index 664f445eb0c4..74be22fe94e4 100644 --- a/textproc/qt4-xmlpatterns-tool/Makefile +++ b/textproc/qt4-xmlpatterns-tool/Makefile @@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 command line utility for running XQueries -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build xmlpatterns +USE_QT4= qmake_build xmlpatterns QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile index fee501494434..cb5d58616741 100644 --- a/textproc/qt4-xmlpatterns/Makefile +++ b/textproc/qt4-xmlpatterns/Makefile @@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= XQuery 1.0 and XPath 2.0 support for Qt4 -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build corelib network +USE_QT4= qmake_build moc_build rcc_build corelib network QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes diff --git a/textproc/scim-bridge-qt4/Makefile b/textproc/scim-bridge-qt4/Makefile index 65db67ad0cfd..1c5c697e1b06 100644 --- a/textproc/scim-bridge-qt4/Makefile +++ b/textproc/scim-bridge-qt4/Makefile @@ -17,8 +17,7 @@ COMMENT= Qt4 client for Scim-bridge RUN_DEPENDS= scim-bridge:${PORTSDIR}/textproc/scim-bridge -USE_QT_VER= 4 -QT_COMPONENTS= corelib gui moc_build +USE_QT4= corelib gui moc_build QT_NONSTANDARD= yes USE_GMAKE= yes USE_GETTEXT= yes diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile index e1ccc4e66a70..509e83dcc8ab 100644 --- a/textproc/sigil/Makefile +++ b/textproc/sigil/Makefile @@ -23,9 +23,8 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ USE_ZIP= yes USE_CMAKE= yes USE_DOS2UNIX= CMakeLists.txt DirEnumerator.cpp ZipFile_stl.cpp ZipPlatform_lnx.cpp -USE_QT_VER= 4 NO_WRKSUBDIR= yes -QT_COMPONENTS= qmake gui svg webkit xml moc uic rcc imageformats linguist +USE_QT4= qmake gui svg webkit xml moc uic rcc imageformats linguist DESKTOP_ENTRIES="Sigil Editor" \ "${COMMENT}" \ diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile index 30b22f94fc82..fd4d18415992 100644 --- a/textproc/soprano/Makefile +++ b/textproc/soprano/Makefile @@ -17,8 +17,7 @@ LIB_DEPENDS= raptor2.0:${PORTSDIR}/textproc/raptor2 \ iodbc.3:${PORTSDIR}/databases/libiodbc USE_BZIP2= yes -USE_QT_VER= 4 -QT_COMPONENTS= corelib dbus qtestlib network \ +USE_QT4= corelib dbus qtestlib network \ qmake_build moc_build uic_build rcc_build USE_GNOME= pkgconfig USE_LDCONFIG= yes diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile index 8c56fab16539..47f5aa84c602 100644 --- a/textproc/uim-kde4/Makefile +++ b/textproc/uim-kde4/Makefile @@ -15,8 +15,7 @@ RUN_DEPENDS= uim-pref-qt4:${PORTSDIR}/textproc/uim-qt4 USE_GCC= 4.2+ USE_KDE4= kdehier kdeprefix kdelibs automoc4 -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build qt3support uic rcc +USE_QT4= qmake_build moc_build qt3support uic rcc USE_AUTOTOOLS= libtool MASTERDIR= ${.CURDIR}/../../textproc/uim diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile index dac05fa60292..d0ae1c606a49 100644 --- a/textproc/uim-qt4/Makefile +++ b/textproc/uim-qt4/Makefile @@ -11,8 +11,7 @@ COMMENT= Qt4 modules of uim input method LIB_DEPENDS= uim.8:${PORTSDIR}/textproc/uim -USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build qt3support uic +USE_QT4= qmake_build moc_build qt3support uic USE_AUTOTOOLS= libtool USE_ICONV= yes -- cgit v1.2.3