From ecda38b0a51979110b18b1bcd5f03f5b6a55e13a Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Sun, 13 Oct 2013 23:15:50 +0000 Subject: Update Qt to 4.8.5 and Qt Creator to 2.8.0. Proudly brought to you by the KDE on FreeBSD team, with commits by makc@, Schaich Alonso and yours truly. Besides the tons of upstream fixes, we have mkspecs for GCC 4.9 and clang33 (from ports), staging support in the Makefiles and dependency fixes related to pkg-config. Many thanks to the people who helped test the ports using our area51 repository, and also to the people who provided patches and bug reports via GNATS! PR: ports/180615 ports/181921 ports/182049 --- textproc/qt4-clucene/Makefile | 3 +-- textproc/qt4-xml/Makefile | 3 +-- textproc/qt4-xmlpatterns-tool/Makefile | 3 +-- textproc/qt4-xmlpatterns/Makefile | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'textproc') diff --git a/textproc/qt4-clucene/Makefile b/textproc/qt4-clucene/Makefile index a460aec65ad0..d84a90810231 100644 --- a/textproc/qt4-clucene/Makefile +++ b/textproc/qt4-clucene/Makefile @@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' BUILD_WRKSRC= ${WRKSRC}/tools/assistant/lib/fulltextsearch INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure -NO_STAGE= yes pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index 4998878aa391..f19d3160a557 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure -NO_STAGE= yes pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake diff --git a/textproc/qt4-xmlpatterns-tool/Makefile b/textproc/qt4-xmlpatterns-tool/Makefile index 09b3fd4e2feb..5d848b6a505d 100644 --- a/textproc/qt4-xmlpatterns-tool/Makefile +++ b/textproc/qt4-xmlpatterns-tool/Makefile @@ -35,9 +35,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' BUILD_WRKSRC= ${WRKSRC}/tools/xmlpatterns INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure -NO_STAGE= yes pre-configure: ${MKDIR} ${WRKSRC}/mkspecs # ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=xmlpatterns|g' \ diff --git a/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile index 3c7a13e17d61..9da2e372aa43 100644 --- a/textproc/qt4-xmlpatterns/Makefile +++ b/textproc/qt4-xmlpatterns/Makefile @@ -36,9 +36,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure -NO_STAGE= yes pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake -- cgit v1.2.3