Attachment #140193 for bug #186707

Lines 166-172 CONFIGURE_ARGS+=-verbose Link Here

(-)Mk/bsd.qt.mk (-1 / +2 lines)
166	. endif	166	. endif
167		167
168	. if ${QT_DIST} == "base" \|\| ${_QT_VERSION:M4*}	168	. if ${QT_DIST} == "base" \|\| ${_QT_VERSION:M4*}
169	EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure	169	EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
		170	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test
170	. if ${_QT_VERSION:M5*}	171	. if ${_QT_VERSION:M5*}
171	EXTRA_PATCHES+= ${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp	172	EXTRA_PATCHES+= ${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp
172	. endif	173	. endif

Line 0 Link Here

(-)devel/qt4/files/extrapatch-config.tests-unix-compile.test (+11 lines)
	1	--- config.tests/unix/compile.test.orig
	2	+++ config.tests/unix/compile.test
	3	@@ -13,7 +13,7 @@
	4	shift 7
	5	LFLAGS="$SYSROOT_FLAG"
	6	INCLUDEPATH=""
	7	-CXXFLAGS="$SYSROOT_FLAG"
	8	+CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
	9	MAC_ARCH_CXXFLAGS=""
	10	MAC_ARCH_LFLAGS=""
	11	while [ "$#" -gt 0 ]; do

Line 0 Link Here

(-)devel/qt5/files/extrapatch-config.tests-unix-compile.test (+11 lines)
	1	--- config.tests/unix/compile.test.orig
	2	+++ config.tests/unix/compile.test
	3	@@ -13,7 +13,7 @@
	4	shift 7
	5	LFLAGS="$SYSROOT_FLAG"
	6	INCLUDEPATH=""
	7	-CXXFLAGS="$SYSROOT_FLAG"
	8	+CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
	9	MAC_ARCH_CXXFLAGS=""
	10	MAC_ARCH_LFLAGS=""
	11	while [ "$#" -gt 0 ]; do

Lines 3-9 Link Here

(-)devel/qt4-corelib/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= corelib	4	PORTNAME= corelib
5	DISTVERSION= ${QT4_VERSION}	5	DISTVERSION= ${QT4_VERSION}
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= devel	7	CATEGORIES= devel
8	PKGNAMEPREFIX= qt4-	8	PKGNAMEPREFIX= qt4-
9		9





PORTNAME=	core
DISTVERSION=	${QT5_VERSION}
PORTREVISION=	1
CATEGORIES=	devel
PKGNAMEPREFIX=	qt5-


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

BUILD_WRKSRC=	${WRKSRC}/src/corelib
INSTALL_WRKSRC=	${BUILD_WRKSRC}

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

Return to bug 186707

Lines 2-7 Link Here

(-)devel/qt5-core/Makefile (-8 / +2 lines)
2		2
3	PORTNAME= core	3	PORTNAME= core
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
		5	PORTREVISION= 1
5	CATEGORIES= devel	6	CATEGORIES= devel
6	PKGNAMEPREFIX= qt5-	7	PKGNAMEPREFIX= qt5-
7		8
Lines 14-20 LIB_DEPENDS= libicui18n.so:${PORTSDIR}/d Link Here
14	USE_GNOME= glib20	15	USE_GNOME= glib20
15	USE_QT5= qmake_build buildtools_build	16	USE_QT5= qmake_build buildtools_build
16	QT_DIST= base	17	QT_DIST= base
17	USES= iconv
18	HAS_CONFIGURE= yes	18	HAS_CONFIGURE= yes
19	# Disable (almost) everything to install minimal qconfig.h.	19	# Disable (almost) everything to install minimal qconfig.h.
20	# -no-feature-* adds QT_NO_* (for features which have no switch or	20	# -no-feature-* adds QT_NO_* (for features which have no switch or
Lines 34-50 USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} Link Here
34	BUILD_WRKSRC= ${WRKSRC}/src/corelib	34	BUILD_WRKSRC= ${WRKSRC}/src/corelib
35	INSTALL_WRKSRC= ${BUILD_WRKSRC}	35	INSTALL_WRKSRC= ${BUILD_WRKSRC}
36		36
37	QT_DEFINES= GLIB ICONV	37	QT_DEFINES= GLIB
38	QT_CONFIG= glib icu	38	QT_CONFIG= glib icu
39		39
40	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
41		41
42	.if ${ICONV_PREFIX} == "/usr"
43	QT_CONFIG+= sun-libiconv
44	.else
45	QT_CONFIG+= gnu-libiconv
46	.endif
47
48	post-install:	42	post-install:
49	${INSTALL_DATA} ${WRKSRC}/src/3rdparty/harfbuzz/src/harfbuzz*.h \	43	${INSTALL_DATA} ${WRKSRC}/src/3rdparty/harfbuzz/src/harfbuzz*.h \
50	${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/${QT5_VERSION:C/-.*//}/QtCore/private	44	${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/${QT5_VERSION:C/-.*//}/QtCore/private