svn commit: r348886 - in head: Mk devel/qt4-corelib devel/qt4/files devel/qt5-core devel/qt5/files

[Tijl Coosemans]

Author: tijl
Date: Sun Mar 23 19:58:33 2014
New Revision: 348886
URL: http://svnweb.freebsd.org/changeset/ports/348886
QAT: https://qat.redports.org/buildarchive/r348886/

Log:
  - Make Qt4 and Qt5 respect CXXFLAGS during configure so they pick up
    -DLIBICONV_PLUG from USES=iconv and always use libc iconv when it is
    available.
  - Remove the iconv dependency from Qt5.  It uses icu instead.
  
  PR:		ports/186707
  Approved by:	kde (makc)

Added:
  head/devel/qt4/files/extrapatch-config.tests-unix-compile.test   (contents, props changed)
  head/devel/qt5/files/extrapatch-config.tests-unix-compile.test   (contents, props changed)
Modified:
  head/Mk/bsd.qt.mk
  head/devel/qt4-corelib/Makefile
  head/devel/qt5-core/Makefile

Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk	Sun Mar 23 19:50:59 2014	(r348885)
+++ head/Mk/bsd.qt.mk	Sun Mar 23 19:58:33 2014	(r348886)
@@ -166,7 +166,8 @@ CONFIGURE_ARGS+=-verbose
 . endif
 
 . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
-EXTRA_PATCHES?=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure
+EXTRA_PATCHES?=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
+		${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test
 .  if ${_QT_VERSION:M5*}
 EXTRA_PATCHES+=	${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp
 .  endif

Modified: head/devel/qt4-corelib/Makefile
==============================================================================
--- head/devel/qt4-corelib/Makefile	Sun Mar 23 19:50:59 2014	(r348885)
+++ head/devel/qt4-corelib/Makefile	Sun Mar 23 19:58:33 2014	(r348886)
@@ -3,7 +3,7 @@
 
 PORTNAME=	corelib
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 

Added: head/devel/qt4/files/extrapatch-config.tests-unix-compile.test
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/qt4/files/extrapatch-config.tests-unix-compile.test	Sun Mar 23 19:58:33 2014	(r348886)
@@ -0,0 +1,11 @@
+--- config.tests/unix/compile.test.orig
++++ config.tests/unix/compile.test
+@@ -13,7 +13,7 @@
+ shift 7
+ LFLAGS="$SYSROOT_FLAG"
+ INCLUDEPATH=""
+-CXXFLAGS="$SYSROOT_FLAG"
++CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
+ MAC_ARCH_CXXFLAGS=""
+ MAC_ARCH_LFLAGS=""
+ while [ "$#" -gt 0 ]; do

Modified: head/devel/qt5-core/Makefile
==============================================================================
--- head/devel/qt5-core/Makefile	Sun Mar 23 19:50:59 2014	(r348885)
+++ head/devel/qt5-core/Makefile	Sun Mar 23 19:58:33 2014	(r348886)
@@ -2,6 +2,7 @@
 
 PORTNAME=	core
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
@@ -14,14 +15,13 @@ LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/d
 USE_GNOME=	glib20
 USE_QT5=	qmake_build buildtools_build
 QT_DIST=	base
-USES=		iconv
 HAS_CONFIGURE=	yes
 # Disable (almost) everything to install minimal qconfig.h.
 # -no-feature-* adds QT_NO_* (for features which have no switch or
 # that need to be detected).
 CONFIGURE_ARGS=	-no-accessibility -no-gif -no-libpng -no-libjpeg \
 		-no-openssl -no-gui -no-widgets -no-cups \
-		-no-feature-iconv -no-dbus -no-xcb -no-opengl \
+		-no-iconv -no-dbus -no-xcb -no-opengl \
 		-no-feature-glib -no-feature-alsa \
 		-no-feature-concurrent -no-feature-evdev \
 		-no-fontconfig -no-freetype \
@@ -34,17 +34,11 @@ USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 BUILD_WRKSRC=	${WRKSRC}/src/corelib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-QT_DEFINES=	GLIB ICONV
+QT_DEFINES=	GLIB
 QT_CONFIG=	glib icu
 
 .include <bsd.port.pre.mk>
 
-.if ${ICONV_PREFIX} == "/usr"
-QT_CONFIG+=	sun-libiconv
-.else
-QT_CONFIG+=	gnu-libiconv
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/3rdparty/harfbuzz/src/harfbuzz*.h \
 		${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/${QT5_VERSION:C/-.*//}/QtCore/private

Added: head/devel/qt5/files/extrapatch-config.tests-unix-compile.test
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/qt5/files/extrapatch-config.tests-unix-compile.test	Sun Mar 23 19:58:33 2014	(r348886)
@@ -0,0 +1,11 @@
+--- config.tests/unix/compile.test.orig
++++ config.tests/unix/compile.test
+@@ -13,7 +13,7 @@
+ shift 7
+ LFLAGS="$SYSROOT_FLAG"
+ INCLUDEPATH=""
+-CXXFLAGS="$SYSROOT_FLAG"
++CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
+ MAC_ARCH_CXXFLAGS=""
+ MAC_ARCH_LFLAGS=""
+ while [ "$#" -gt 0 ]; do