Attachment 189407 Details for Bug 224904 – qwt6-flavors

[patch] qwt6-flavors

qwt6-flavors (text/plain), 4.79 KB, created by Loïc Bartoletti on 2018-01-04 17:28:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2018-01-04 17:28:53 UTC

Size: 4.79 KB

patch

obsolete

>Index: /usr/local/poudriere/ports/default/x11-toolkits/qwt6/Makefile
>===================================================================
>--- /usr/local/poudriere/ports/default/x11-toolkits/qwt6/Makefile	(rÃ©vision 456315)
>+++ /usr/local/poudriere/ports/default/x11-toolkits/qwt6/Makefile	(copie de travail)
>@@ -4,27 +4,38 @@
> PORTVERSION=	6.1.3
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	SF
>-PKGNAMESUFFIX=	6
> 
>-MAINTAINER=	ports@FreeBSD.org
>+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
>+DOCSDIR=	${PREFIX}/share/doc/qwt6-${FLAVOR}
> 
> PORTDOCS=	*
>-PLIST_SUB=	INCLUDEDIR=include/qwt6 \
>+PLIST_SUB=	INCLUDEDIR=include/${FLAVOR}/qwt6 \
> 		SHLIB_VER=${PORTVERSION} \
> 		SHLIB_SHVER=${PORTVERSION:R} \
>-		QT_MKSPECDIR=share/qt4/mkspecs
>+		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})
>Index: /usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-qwt.prf
>===================================================================
>--- /usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-qwt.prf	(rÃ©vision 456315)
>+++ /usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-qwt.prf	(copie de travail)
>@@ -1,4 +1,4 @@
>---- qwt.prf.orig	2017-10-06 14:51:04 UTC
>+--- qwt.prf.orig	2014-10-13 16:16:53 UTC
> +++ qwt.prf
> @@ -34,4 +34,4 @@ else {
>  }   
>Index: /usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-qwtconfig.pri
>===================================================================
>--- /usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-qwtconfig.pri	(rÃ©vision 456315)
>+++ /usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-qwtconfig.pri	(copie de travail)
>@@ -9,21 +9,34 @@
>      # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
>  }
>  
>-@@ -29,7 +29,7 @@ win32 {
>+@@ -28,9 +28,9 @@ win32 {
>+     # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
>  }
>  
>- QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
>+-QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
> -QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
>-+QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include/qwt6
>- QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
>+-QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
>++QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/share/doc/qwt6-qt__QT_VERSION__
>++QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include/qt__QT_VERSION__/qwt6
>++QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib/qt__QT_VERSION__
>  
>  ######################################################################
>+ # Designer plugin
>+@@ -42,7 +42,7 @@ QWT_INSTALL_LIBS      = $${QWT_INSTALL_P
>+ # runtime environment of designer/creator.
>+ ######################################################################
>+ 
>+-QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
>++QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/lib/qt__QT_VERSION__/plugins/designer
>+ 
>+ # linux distributors often organize the Qt installation
>+ # their way and QT_INSTALL_PREFIX doesn't offer a good
> @@ -63,7 +63,7 @@ QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_P
>  # with every Qt upgrade. 
>  ######################################################################
>  
> -QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
>-+QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/share/qt4/mkspecs/features
>++QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/lib/qt__QT_VERSION__/mkspecs/features
>  # QWT_INSTALL_FEATURES  = $$[QT_INSTALL_PREFIX]/features
>  
>  ######################################################################
>Index: /usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-textengines_textengines.pri
>===================================================================
>--- /usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-textengines_textengines.pri	(rÃ©vision 456315)
>+++ /usr/local/poudriere/ports/default/x11-toolkits/qwt6/files/patch-textengines_textengines.pri	(copie de travail)
>@@ -1,4 +1,4 @@
>---- textengines/textengines.pri.orig	2017-10-06 14:51:21 UTC
>+--- textengines/textengines.pri.orig	2016-06-13 07:14:23 UTC
> +++ textengines/textengines.pri
> @@ -34,7 +34,7 @@ contains(QWT_CONFIG, QwtFramework) {
>      CONFIG += lib_bundle

Flags:

lbartoletti: maintainer-approval+

Actions: View | Diff

Attachments on bug 224904: 189407 | 189408 | 189409 | 189410 | 189608 | 189609