6 files changed, 86 insertions, 53 deletions

diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile
index 4dae451a7391..c4199058f525 100644
--- a/devel/grantlee/Makefile
+++ b/devel/grantlee/Makefile
@@ -1,16 +1,9 @@
 # Created by: Dima Panov <fluffy@FreeBSD.org>
 # $FreeBSD$
 
-# Some ports install files into versioned grantlee directory (GRANTLEE_VER)
-# they must be fixed whenever grantlee gets version bump
-# Known ports:
-# deskutils/kdepim4
-# devel/kdevplatform
-# finance/skrooge
-#
-
 PORTNAME=	grantlee
-DISTVERSION=	0.5.1
+DISTVERSION=	${GRANTLEE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.${PORTNAME}.org/ \
 		http://www.loegria.net/${PORTNAME}/
@@ -22,11 +15,8 @@ LICENSE=	LGPL21
 
 USE_QT4=	corelib gui qtestlib_build script \
 		qmake_build moc_build rcc_build uic_build
-USES=		cmake:outsource
+USES=		cmake:outsource grantlee:4,selfbuild
 CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=FALSE
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	SHLIB_VER=${PORTVERSION} \
-		GRANTLEE_VER=${PORTVERSION:R}
-
 .include <bsd.port.mk>
diff --git a/devel/grantlee/distinfo b/devel/grantlee/distinfo
index f406f1511c25..7256e098384e 100644
--- a/devel/grantlee/distinfo
+++ b/devel/grantlee/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1471275288
 SHA256 (grantlee-0.5.1.tar.gz) = 191809bf4c9b7ef877af0fd29345061c2372edfb4506aa7d5df5c71a570fa0ac
 SIZE (grantlee-0.5.1.tar.gz) = 1172769
diff --git a/devel/grantlee/files/patch-CMakeLists.txt b/devel/grantlee/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..2e8adb558485
--- /dev/null
+++ b/devel/grantlee/files/patch-CMakeLists.txt
@@ -0,0 +1,14 @@
+Install headers prefixed, as to not cause a possible conflict with
+different versions.
+
+--- CMakeLists.txt.orig	2016-08-10 16:05:25 UTC
++++ CMakeLists.txt
+@@ -96,7 +96,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define
+ set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
+ set( PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/grantlee/${Grantlee_MAJOR_MINOR_VERSION_STRING} )
+ set( BIN_INSTALL_DIR bin )
+-set( INCLUDE_INSTALL_DIR include )
++set( INCLUDE_INSTALL_DIR include/grantlee4 )
+ set( DATA_INSTALL_DIR share/apps )
+
+ # set up RPATH/install_name_dir
diff --git a/devel/grantlee/files/patch-templates_lib_CMakeLists.txt b/devel/grantlee/files/patch-templates_lib_CMakeLists.txt
new file mode 100644
index 000000000000..8a75d97f7d32
--- /dev/null
+++ b/devel/grantlee/files/patch-templates_lib_CMakeLists.txt
@@ -0,0 +1,14 @@
+Install headers prefixed, as to not cause a possible conflict with
+different versions.
+
+--- templates/lib/CMakeLists.txt.orig	2016-08-10 16:06:08 UTC
++++ templates/lib/CMakeLists.txt
+@@ -119,7 +119,7 @@ install(TARGETS grantlee_core EXPORT gra
+          RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT Templates
+          LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
+          ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
+-         INCLUDES DESTINATION include
++         INCLUDES DESTINATION include/grantlee4
+ )
+
+ install(FILES
diff --git a/devel/grantlee/files/patch-textdocument_lib_CMakeLists.txt b/devel/grantlee/files/patch-textdocument_lib_CMakeLists.txt
new file mode 100644
index 000000000000..281965e48c09
--- /dev/null
+++ b/devel/grantlee/files/patch-textdocument_lib_CMakeLists.txt
@@ -0,0 +1,14 @@
+Install headers prefixed, as to not cause a possible conflict with
+different versions.
+
+--- textdocument/lib/CMakeLists.txt.orig	2016-08-10 16:06:47 UTC
++++ textdocument/lib/CMakeLists.txt
+@@ -44,7 +44,7 @@ install(TARGETS grantlee_gui EXPORT gran
+          RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT TextDocument
+          LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
+          ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
+-         INCLUDES DESTINATION include
++         INCLUDES DESTINATION include/grantlee4
+ )
+
+ install(FILES
diff --git a/devel/grantlee/pkg-plist b/devel/grantlee/pkg-plist
index 8713f40b8c5f..5bc54019344c 100644
--- a/devel/grantlee/pkg-plist
+++ b/devel/grantlee/pkg-plist
@@ -1,49 +1,49 @@
-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
+include/grantlee4/grantlee/abstractlocalizer.h
+include/grantlee4/grantlee/abstractmarkupbuilder.h
+include/grantlee4/grantlee/bbcodebuilder.h
+include/grantlee4/grantlee/cachingloaderdecorator.h
+include/grantlee4/grantlee/containeraccessor.h
+include/grantlee4/grantlee/context.h
+include/grantlee4/grantlee/engine.h
+include/grantlee4/grantlee/exception.h
+include/grantlee4/grantlee/filter.h
+include/grantlee4/grantlee/filterexpression.h
+include/grantlee4/grantlee/grantlee_core_export.h
+include/grantlee4/grantlee/grantlee_gui_export.h
+include/grantlee4/grantlee/grantlee_version.h
+include/grantlee4/grantlee/markupdirector.h
+include/grantlee4/grantlee/mediawikimarkupbuilder.h
+include/grantlee4/grantlee/metatype.h
+include/grantlee4/grantlee/node.h
+include/grantlee4/grantlee/outputstream.h
+include/grantlee4/grantlee/parser.h
+include/grantlee4/grantlee/plaintextmarkupbuilder.h
+include/grantlee4/grantlee/qtlocalizer.h
+include/grantlee4/grantlee/rendercontext.h
+include/grantlee4/grantlee/safestring.h
+include/grantlee4/grantlee/taglibraryinterface.h
+include/grantlee4/grantlee/template.h
+include/grantlee4/grantlee/templateloader.h
+include/grantlee4/grantlee/texthtmlbuilder.h
+include/grantlee4/grantlee/token.h
+include/grantlee4/grantlee/typeaccessor.h
+include/grantlee4/grantlee/util.h
+include/grantlee4/grantlee/variable.h
+include/grantlee4/grantlee_core.h
+include/grantlee4/grantlee_templates.h
+include/grantlee4/grantlee_textdocument.h
 lib/cmake/grantlee/GrantleeConfig.cmake
 lib/cmake/grantlee/GrantleeConfigVersion.cmake
 lib/cmake/grantlee/GrantleeTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/grantlee/GrantleeTargets.cmake
 lib/cmake/grantlee/GrantleeUse.cmake
-lib/grantlee/%%GRANTLEE_VER%%/grantlee_defaultfilters.so
-lib/grantlee/%%GRANTLEE_VER%%/grantlee_defaulttags.so
-lib/grantlee/%%GRANTLEE_VER%%/grantlee_i18ntags.so
-lib/grantlee/%%GRANTLEE_VER%%/grantlee_loadertags.so
+lib/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_defaultfilters.so
+lib/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_defaulttags.so
+lib/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_i18ntags.so
+lib/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_loadertags.so
 lib/libgrantlee_core.so
 lib/libgrantlee_core.so.0
-lib/libgrantlee_core.so.%%SHLIB_VER%%
+lib/libgrantlee_core.so.%%GRANTLEE_VERSION_FULL%%
 lib/libgrantlee_gui.so
 lib/libgrantlee_gui.so.0
-lib/libgrantlee_gui.so.%%SHLIB_VER%%
+lib/libgrantlee_gui.so.%%GRANTLEE_VERSION_FULL%%