diff options
author | makc <makc@FreeBSD.org> | 2014-01-07 00:16:52 +0800 |
---|---|---|
committer | makc <makc@FreeBSD.org> | 2014-01-07 00:16:52 +0800 |
commit | 8fb80a5f23ee7dd03872809dbd790ea4f90c6ff5 (patch) | |
tree | e9ca925ce8537078366a02e4f615c5847746c0b5 /chinese | |
parent | 5b251e589961b796d7eafa23de894f129f92bf6d (diff) | |
download | freebsd-ports-gnome-8fb80a5f23ee7dd03872809dbd790ea4f90c6ff5.tar.gz freebsd-ports-gnome-8fb80a5f23ee7dd03872809dbd790ea4f90c6ff5.tar.zst freebsd-ports-gnome-8fb80a5f23ee7dd03872809dbd790ea4f90c6ff5.zip |
In preparation for Qt 5 ports:
Mk/Uses/qmake.mk:
- Add support for out-of-source builds
- Add support for Qt 5 ports
- Respect WITH_DEBUG
Mk/bsd.qt.mk:
- Massive rework for Qt 5 ports
- Remove '-phonon' from global configure args, thus allow qt4-designer and
qt4-qtconfig to be built without Phonon support [1]
devel/qmake4:
- Improve mkspecs for gcc (mainly sync with linux version) and clang
devel/qt4-corelib:
- Convert to USES=iconv
- Remove ancient patch
devel/qt4-designer:
- Remove reference to WRKSRC from installed pkgconfig files [2]
- Don't build Qt Designer plugin for Phonon from outdated Qt sources.
Separate port for plugin will be committed later
devel/qt4-assistant-adp, devel/qt4-libqtassistantclient:
- Convert to USES=qmake
Clean up Qt4 ports:
- Update comments
- Update description; use common description
- Consistently use QT_INCDIR, QT_LIBDIR, etc.
- Use options helpers
- Convert to new LIB_DEPENDS syntax
- Update DESKTOP_ENTRIES to avoid conflicts with Qt 5 ports
- Rename/move several ports for unification with Qt 5 ports
PR: ports/184620 [1]
Reported by: Kevin Zheng <kevinz5000@gmail.com>
PR: ports/181141 [2]
Reported by: thierry
PR: ports/185101
Exp-run by: bdrewery
This is mostly solely avilla's work in area51, kudos to him! And a couple
commits from myself, so you know who's collecting pointyhats :)
Diffstat (limited to 'chinese')
-rw-r--r-- | chinese/qt4-codecs-cn/Makefile | 7 | ||||
-rw-r--r-- | chinese/qt4-codecs-cn/pkg-descr | 12 | ||||
-rw-r--r-- | chinese/qt4-codecs-tw/Makefile | 7 | ||||
-rw-r--r-- | chinese/qt4-codecs-tw/pkg-descr | 12 |
4 files changed, 4 insertions, 34 deletions
diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile index 71d49081107c..29090a40b3ba 100644 --- a/chinese/qt4-codecs-cn/Makefile +++ b/chinese/qt4-codecs-cn/Makefile @@ -3,7 +3,7 @@ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} -CATEGORIES?= chinese +CATEGORIES= chinese PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -cn @@ -11,7 +11,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt GB 18030 codec plugin USE_QT4= qmake_build corelib -QT_NONSTANDARD= yes QT_DIST= yes HAS_CONFIGURE= yes @@ -36,11 +35,9 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/cn INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure - pre-configure: ${MKDIR} ${WRKSRC}/mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake + ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake post-configure: ${REINPLACE_CMD} -e 's|(test -z.*||g' ${BUILD_WRKSRC}/Makefile diff --git a/chinese/qt4-codecs-cn/pkg-descr b/chinese/qt4-codecs-cn/pkg-descr deleted file mode 100644 index 36bc69717e98..000000000000 --- a/chinese/qt4-codecs-cn/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Qt is a C++ toolkit for application development. It lets application -developers target all major operating systems with a single application -source code. - -Qt provides a platform-independent API to all central platform functionality: -GUI, database access, networking, file handling, etc. The Qt library -encapsulates the different APIs of different operating systems, providing -the application programmer with a single, common API for all operating systems. -The native C APIs are encapsulated in a set of well-designed, fully -object-oriented C++ classes. - -WWW: http://qt.nokia.com/products/qt/index.html diff --git a/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile index 40bab460fa6f..5c8e6e6c09ed 100644 --- a/chinese/qt4-codecs-tw/Makefile +++ b/chinese/qt4-codecs-tw/Makefile @@ -3,7 +3,7 @@ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} -CATEGORIES?= chinese +CATEGORIES= chinese PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -tw @@ -11,7 +11,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt Big-5 codec plugin USE_QT4= qmake_build corelib -QT_NONSTANDARD= yes QT_DIST= yes HAS_CONFIGURE= yes @@ -36,11 +35,9 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/tw INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure - pre-configure: ${MKDIR} ${WRKSRC}/mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake + ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake post-configure: ${REINPLACE_CMD} -e 's|(test -z.*||g' ${BUILD_WRKSRC}/Makefile diff --git a/chinese/qt4-codecs-tw/pkg-descr b/chinese/qt4-codecs-tw/pkg-descr deleted file mode 100644 index 36bc69717e98..000000000000 --- a/chinese/qt4-codecs-tw/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Qt is a C++ toolkit for application development. It lets application -developers target all major operating systems with a single application -source code. - -Qt provides a platform-independent API to all central platform functionality: -GUI, database access, networking, file handling, etc. The Qt library -encapsulates the different APIs of different operating systems, providing -the application programmer with a single, common API for all operating systems. -The native C APIs are encapsulated in a set of well-designed, fully -object-oriented C++ classes. - -WWW: http://qt.nokia.com/products/qt/index.html |