Install includes so they don't conflict with qt5 versions.

2 files changed, 43 insertions, 37 deletions

diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile
index 97b4b18b04d..99e1e9dc40d 100644
--- a/devel/grantlee/Makefile
+++ b/devel/grantlee/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2016/03/05 11:27:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2016/05/08 11:13:09 markd Exp $
 #
 
 DISTNAME=	grantlee-0.5.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.grantlee.org/
 
@@ -14,6 +14,12 @@ LICENSE=	gnu-lgpl-v3
 USE_LANGUAGES=  c c++
 USE_CMAKE=      yes
 
+SUBST_CLASSES+=		fix-inc
+SUBST_STAGE.fix-inc=	post-patch
+SUBST_MESSAGE.fix-inc=	Fixing install dir for includes
+SUBST_FILES.fix-inc+=	CMakeLists.txt
+SUBST_SED.fix-inc+=	-e 's,INCLUDE_INSTALL_DIR include,INCLUDE_INSTALL_DIR include/grantlee-qt4,'
+
 pre-configure:
 	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
diff --git a/devel/grantlee/PLIST b/devel/grantlee/PLIST
index 5e5b31144d5..b5e2b096e02 100644
--- a/devel/grantlee/PLIST
+++ b/devel/grantlee/PLIST
@@ -1,38 +1,38 @@
-@comment $NetBSD: PLIST,v 1.2 2014/11/13 08:58:04 markd Exp $
-include/grantlee/abstractlocalizer.h
-include/grantlee/abstractmarkupbuilder.h
-include/grantlee/bbcodebuilder.h
-include/grantlee/cachingloaderdecorator.h
-include/grantlee/containeraccessor.h
-include/grantlee/context.h
-include/grantlee/engine.h
-include/grantlee/exception.h
-include/grantlee/filter.h
-include/grantlee/filterexpression.h
-include/grantlee/grantlee_core_export.h
-include/grantlee/grantlee_gui_export.h
-include/grantlee/grantlee_version.h
-include/grantlee/markupdirector.h
-include/grantlee/mediawikimarkupbuilder.h
-include/grantlee/metatype.h
-include/grantlee/node.h
-include/grantlee/outputstream.h
-include/grantlee/parser.h
-include/grantlee/plaintextmarkupbuilder.h
-include/grantlee/qtlocalizer.h
-include/grantlee/rendercontext.h
-include/grantlee/safestring.h
-include/grantlee/taglibraryinterface.h
-include/grantlee/template.h
-include/grantlee/templateloader.h
-include/grantlee/texthtmlbuilder.h
-include/grantlee/token.h
-include/grantlee/typeaccessor.h
-include/grantlee/util.h
-include/grantlee/variable.h
-include/grantlee_core.h
-include/grantlee_templates.h
-include/grantlee_textdocument.h
+@comment $NetBSD: PLIST,v 1.3 2016/05/08 11:13:09 markd Exp $
+include/grantlee-qt4/grantlee/abstractlocalizer.h
+include/grantlee-qt4/grantlee/abstractmarkupbuilder.h
+include/grantlee-qt4/grantlee/bbcodebuilder.h
+include/grantlee-qt4/grantlee/cachingloaderdecorator.h
+include/grantlee-qt4/grantlee/containeraccessor.h
+include/grantlee-qt4/grantlee/context.h
+include/grantlee-qt4/grantlee/engine.h
+include/grantlee-qt4/grantlee/exception.h
+include/grantlee-qt4/grantlee/filter.h
+include/grantlee-qt4/grantlee/filterexpression.h
+include/grantlee-qt4/grantlee/grantlee_core_export.h
+include/grantlee-qt4/grantlee/grantlee_gui_export.h
+include/grantlee-qt4/grantlee/grantlee_version.h
+include/grantlee-qt4/grantlee/markupdirector.h
+include/grantlee-qt4/grantlee/mediawikimarkupbuilder.h
+include/grantlee-qt4/grantlee/metatype.h
+include/grantlee-qt4/grantlee/node.h
+include/grantlee-qt4/grantlee/outputstream.h
+include/grantlee-qt4/grantlee/parser.h
+include/grantlee-qt4/grantlee/plaintextmarkupbuilder.h
+include/grantlee-qt4/grantlee/qtlocalizer.h
+include/grantlee-qt4/grantlee/rendercontext.h
+include/grantlee-qt4/grantlee/safestring.h
+include/grantlee-qt4/grantlee/taglibraryinterface.h
+include/grantlee-qt4/grantlee/template.h
+include/grantlee-qt4/grantlee/templateloader.h
+include/grantlee-qt4/grantlee/texthtmlbuilder.h
+include/grantlee-qt4/grantlee/token.h
+include/grantlee-qt4/grantlee/typeaccessor.h
+include/grantlee-qt4/grantlee/util.h
+include/grantlee-qt4/grantlee/variable.h
+include/grantlee-qt4/grantlee_core.h
+include/grantlee-qt4/grantlee_templates.h
+include/grantlee-qt4/grantlee_textdocument.h
 lib/cmake/grantlee/GrantleeConfig.cmake
 lib/cmake/grantlee/GrantleeConfigVersion.cmake
 lib/cmake/grantlee/GrantleeTargets-noconfig.cmake