Sun May 8 11:13:09 2016 UTC ()
Install includes so they don't conflict with qt5 versions.


(markd)
diff -r1.5 -r1.6 pkgsrc/devel/grantlee/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/grantlee/PLIST
cvs diff -r1.5 -r1.6 pkgsrc/devel/grantlee/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/grantlee/Makefile 2016/03/05 11:27:44 1.5
+++ pkgsrc/devel/grantlee/Makefile 2016/05/08 11:13:09 1.6
@@ -1,23 +1,29 @@ @@ -1,23 +1,29 @@
1# $NetBSD: Makefile,v 1.5 2016/03/05 11:27:44 jperkin Exp $ 1# $NetBSD: Makefile,v 1.6 2016/05/08 11:13:09 markd Exp $
2# 2#
3 3
4DISTNAME= grantlee-0.5.1 4DISTNAME= grantlee-0.5.1
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://downloads.grantlee.org/ 7MASTER_SITES= http://downloads.grantlee.org/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gitorious.org/grantlee/pages/Home 10HOMEPAGE= http://www.gitorious.org/grantlee/pages/Home
11COMMENT= String template engine in QT based on Django template system 11COMMENT= String template engine in QT based on Django template system
12LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_CMAKE= yes 15USE_CMAKE= yes
16 16
 17SUBST_CLASSES+= fix-inc
 18SUBST_STAGE.fix-inc= post-patch
 19SUBST_MESSAGE.fix-inc= Fixing install dir for includes
 20SUBST_FILES.fix-inc+= CMakeLists.txt
 21SUBST_SED.fix-inc+= -e 's,INCLUDE_INSTALL_DIR include,INCLUDE_INSTALL_DIR include/grantlee-qt4,'
 22
17pre-configure: 23pre-configure:
18 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ 24 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
19 25
20.include "../../x11/qt4-libs/buildlink3.mk" 26.include "../../x11/qt4-libs/buildlink3.mk"
21.include "../../x11/qt4-tools/buildlink3.mk" 27.include "../../x11/qt4-tools/buildlink3.mk"
22 28
23.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/grantlee/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/grantlee/PLIST 2014/11/13 08:58:04 1.2
+++ pkgsrc/devel/grantlee/PLIST 2016/05/08 11:13:09 1.3
@@ -1,48 +1,48 @@ @@ -1,48 +1,48 @@
1@comment $NetBSD: PLIST,v 1.2 2014/11/13 08:58:04 markd Exp $ 1@comment $NetBSD: PLIST,v 1.3 2016/05/08 11:13:09 markd Exp $
2include/grantlee/abstractlocalizer.h 2include/grantlee-qt4/grantlee/abstractlocalizer.h
3include/grantlee/abstractmarkupbuilder.h 3include/grantlee-qt4/grantlee/abstractmarkupbuilder.h
4include/grantlee/bbcodebuilder.h 4include/grantlee-qt4/grantlee/bbcodebuilder.h
5include/grantlee/cachingloaderdecorator.h 5include/grantlee-qt4/grantlee/cachingloaderdecorator.h
6include/grantlee/containeraccessor.h 6include/grantlee-qt4/grantlee/containeraccessor.h
7include/grantlee/context.h 7include/grantlee-qt4/grantlee/context.h
8include/grantlee/engine.h 8include/grantlee-qt4/grantlee/engine.h
9include/grantlee/exception.h 9include/grantlee-qt4/grantlee/exception.h
10include/grantlee/filter.h 10include/grantlee-qt4/grantlee/filter.h
11include/grantlee/filterexpression.h 11include/grantlee-qt4/grantlee/filterexpression.h
12include/grantlee/grantlee_core_export.h 12include/grantlee-qt4/grantlee/grantlee_core_export.h
13include/grantlee/grantlee_gui_export.h 13include/grantlee-qt4/grantlee/grantlee_gui_export.h
14include/grantlee/grantlee_version.h 14include/grantlee-qt4/grantlee/grantlee_version.h
15include/grantlee/markupdirector.h 15include/grantlee-qt4/grantlee/markupdirector.h
16include/grantlee/mediawikimarkupbuilder.h 16include/grantlee-qt4/grantlee/mediawikimarkupbuilder.h
17include/grantlee/metatype.h 17include/grantlee-qt4/grantlee/metatype.h
18include/grantlee/node.h 18include/grantlee-qt4/grantlee/node.h
19include/grantlee/outputstream.h 19include/grantlee-qt4/grantlee/outputstream.h
20include/grantlee/parser.h 20include/grantlee-qt4/grantlee/parser.h
21include/grantlee/plaintextmarkupbuilder.h 21include/grantlee-qt4/grantlee/plaintextmarkupbuilder.h
22include/grantlee/qtlocalizer.h 22include/grantlee-qt4/grantlee/qtlocalizer.h
23include/grantlee/rendercontext.h 23include/grantlee-qt4/grantlee/rendercontext.h
24include/grantlee/safestring.h 24include/grantlee-qt4/grantlee/safestring.h
25include/grantlee/taglibraryinterface.h 25include/grantlee-qt4/grantlee/taglibraryinterface.h
26include/grantlee/template.h 26include/grantlee-qt4/grantlee/template.h
27include/grantlee/templateloader.h 27include/grantlee-qt4/grantlee/templateloader.h
28include/grantlee/texthtmlbuilder.h 28include/grantlee-qt4/grantlee/texthtmlbuilder.h
29include/grantlee/token.h 29include/grantlee-qt4/grantlee/token.h
30include/grantlee/typeaccessor.h 30include/grantlee-qt4/grantlee/typeaccessor.h
31include/grantlee/util.h 31include/grantlee-qt4/grantlee/util.h
32include/grantlee/variable.h 32include/grantlee-qt4/grantlee/variable.h
33include/grantlee_core.h 33include/grantlee-qt4/grantlee_core.h
34include/grantlee_templates.h 34include/grantlee-qt4/grantlee_templates.h
35include/grantlee_textdocument.h 35include/grantlee-qt4/grantlee_textdocument.h
36lib/cmake/grantlee/GrantleeConfig.cmake 36lib/cmake/grantlee/GrantleeConfig.cmake
37lib/cmake/grantlee/GrantleeConfigVersion.cmake 37lib/cmake/grantlee/GrantleeConfigVersion.cmake
38lib/cmake/grantlee/GrantleeTargets-noconfig.cmake 38lib/cmake/grantlee/GrantleeTargets-noconfig.cmake
39lib/cmake/grantlee/GrantleeTargets.cmake 39lib/cmake/grantlee/GrantleeTargets.cmake
40lib/cmake/grantlee/GrantleeUse.cmake 40lib/cmake/grantlee/GrantleeUse.cmake
41lib/grantlee/0.5/grantlee_defaultfilters.so 41lib/grantlee/0.5/grantlee_defaultfilters.so
42lib/grantlee/0.5/grantlee_defaulttags.so 42lib/grantlee/0.5/grantlee_defaulttags.so
43lib/grantlee/0.5/grantlee_i18ntags.so 43lib/grantlee/0.5/grantlee_i18ntags.so
44lib/grantlee/0.5/grantlee_loadertags.so 44lib/grantlee/0.5/grantlee_loadertags.so
45lib/libgrantlee_core.so 45lib/libgrantlee_core.so
46lib/libgrantlee_core.so.0 46lib/libgrantlee_core.so.0
47lib/libgrantlee_core.so.${PKGVERSION} 47lib/libgrantlee_core.so.${PKGVERSION}
48lib/libgrantlee_gui.so 48lib/libgrantlee_gui.so