Attachment #189407 for bug #224904




PORTVERSION=	6.1.3
CATEGORIES=	x11-toolkits
MASTER_SITES=	SF
PKGNAMESUFFIX=	6

MAINTAINER=	lbartoletti@tuxfamily.org
COMMENT=	Qt Widgets for Technical Applications

USES=		gmake qmake tar:bzip2
USE_QT4=	corelib gui opengl svg xml moc_build
USE_GL=		gl
USE_LDCONFIG=	yes
DOCSDIR=	${PREFIX}/share/doc/qwt6-${FLAVOR}

PORTDOCS=	*
PLIST_SUB=	INCLUDEDIR=include/${FLAVOR}/qwt6 \
		SHLIB_VER=${PORTVERSION} \
		SHLIB_SHVER=${PORTVERSION:R} \
		QT_MKSPECDIR=lib/${FLAVOR}/mkspecs
PLIST=		${PKGDIR}/pkg-plist.${FLAVOR}

FLAVORS=	qt5 qt4
FLAVOR?=	${FLAVORS:[2]}

.if ${FLAVOR} == qt4
PKGNAMESUFFIX=	6-qt4
USE_QT4=	corelib gui opengl svg xml moc_build
.else
PKGNAMESUFFIX=	6-qt5
USE_QT5=	buildtools_build widgets gui core designer gui opengl svg xml printsupport concurrent
.endif

OPTIONS_DEFINE=	DOCS

post-patch:
	@${REINPLACE_CMD} -e '/INSTALLS.*doc/d' ${WRKSRC}/doc/doc.pro
	@${REINPLACE_CMD} -e 's/__QT_VERSION__/${FLAVOR:S/qt//}/g' ${WRKSRC}/qwtconfig.pri

post-install-DOCS-on:
	@(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})

Lines 1-4 Link Here

(-)/usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-qwt.prf (-1 / +1 lines)
1	--- qwt.prf.orig 2017-10-06 14:51:04 UTC	1	--- qwt.prf.orig 2014-10-13 16:16:53 UTC
2	+++ qwt.prf	2	+++ qwt.prf
3	@@ -34,4 +34,4 @@ else {	3	@@ -34,4 +34,4 @@ else {
4	}	4	}

Lines 9-29 Link Here

(-)/usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-qwtconfig.pri (-5 / +18 lines)
9	# QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION	9	# QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
10	}	10	}
11		11
12	@@ -29,7 +29,7 @@ win32 {	12	@@ -28,9 +28,9 @@ win32 {
		13	# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
13	}	14	}
14		15
15	QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc	16	-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
16	-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include	17	-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
17	+QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt6	18	-QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
18	QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib	19	+QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/doc/qwt6-qt__QT_VERSION__
		20	+QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qt__QT_VERSION__/qwt6
		21	+QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib/qt__QT_VERSION__
19		22
20	######################################################################	23	######################################################################
		24	# Designer plugin
		25	@@ -42,7 +42,7 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_P
		26	# runtime environment of designer/creator.
		27	######################################################################
		28
		29	-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
		30	+QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/lib/qt__QT_VERSION__/plugins/designer
		31
		32	# linux distributors often organize the Qt installation
		33	# their way and QT_INSTALL_PREFIX doesn't offer a good
21	@@ -63,7 +63,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_P	34	@@ -63,7 +63,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_P
22	# with every Qt upgrade.	35	# with every Qt upgrade.
23	######################################################################	36	######################################################################
24		37
25	-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features	38	-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
26	+QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/share/qt4/mkspecs/features	39	+QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/lib/qt__QT_VERSION__/mkspecs/features
27	# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features	40	# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
28		41
29	######################################################################	42	######################################################################

Lines 1-4 Link Here

(-)/usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-textengines_textengines.pri (-1 / +1 lines)
1	--- textengines/textengines.pri.orig 2017-10-06 14:51:21 UTC	1	--- textengines/textengines.pri.orig 2016-06-13 07:14:23 UTC
2	+++ textengines/textengines.pri	2	+++ textengines/textengines.pri
3	@@ -34,7 +34,7 @@ contains(QWT_CONFIG, QwtFramework) {	3	@@ -34,7 +34,7 @@ contains(QWT_CONFIG, QwtFramework) {
4	CONFIG += lib_bundle	4	CONFIG += lib_bundle

Return to bug 224904

Lines 4-30 Link Here

(-)/usr/local/poudriere/ports/default/x11-toolkits/qwt6/Makefile (-6 / +17 lines)
4	PORTVERSION= 6.1.3	4	PORTVERSION= 6.1.3
5	CATEGORIES= x11-toolkits	5	CATEGORIES= x11-toolkits
6	MASTER_SITES= SF	6	MASTER_SITES= SF
7	PKGNAMESUFFIX= 6
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= lbartoletti@tuxfamily.org
10	COMMENT= Qt Widgets for Technical Applications	9	COMMENT= Qt Widgets for Technical Applications
11		10
12	USES= gmake qmake tar:bzip2	11	USES= gmake qmake tar:bzip2
13	USE_QT4= corelib gui opengl svg xml moc_build
14	USE_GL= gl	12	USE_GL= gl
15	USE_LDCONFIG= yes	13	USE_LDCONFIG= yes
16	DOCSDIR= ${PREFIX}/share/doc/qwt6	14	DOCSDIR= ${PREFIX}/share/doc/qwt6-${FLAVOR}
17		15
18	PORTDOCS= *	16	PORTDOCS= *
19	PLIST_SUB= INCLUDEDIR=include/qwt6 \	17	PLIST_SUB= INCLUDEDIR=include/${FLAVOR}/qwt6 \
20	SHLIB_VER=${PORTVERSION} \	18	SHLIB_VER=${PORTVERSION} \
21	SHLIB_SHVER=${PORTVERSION:R} \	19	SHLIB_SHVER=${PORTVERSION:R} \
22	QT_MKSPECDIR=share/qt4/mkspecs	20	QT_MKSPECDIR=lib/${FLAVOR}/mkspecs
		21	PLIST= ${PKGDIR}/pkg-plist.${FLAVOR}
23		22
		23	FLAVORS= qt5 qt4
		24	FLAVOR?= ${FLAVORS:[2]}
		25
		26	.if ${FLAVOR} == qt4
		27	PKGNAMESUFFIX= 6-qt4
		28	USE_QT4= corelib gui opengl svg xml moc_build
		29	.else
		30	PKGNAMESUFFIX= 6-qt5
		31	USE_QT5= buildtools_build widgets gui core designer gui opengl svg xml printsupport concurrent
		32	.endif
		33
24	OPTIONS_DEFINE= DOCS	34	OPTIONS_DEFINE= DOCS
25		35
26	post-patch:	36	post-patch:
27	@${REINPLACE_CMD} -e '/INSTALLS.*doc/d' ${WRKSRC}/doc/doc.pro	37	@${REINPLACE_CMD} -e '/INSTALLS.*doc/d' ${WRKSRC}/doc/doc.pro
		38	@${REINPLACE_CMD} -e 's/__QT_VERSION__/${FLAVOR:S/qt//}/g' ${WRKSRC}/qwtconfig.pri
28		39
29	post-install-DOCS-on:	40	post-install-DOCS-on:
30	@(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})	41	@(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})