svn commit: r439801 - in head: Mk/Uses devel/grantlee5 finance/skrooge

[Tobias C. Berner]

Author: tcberner
Date: Sun Apr 30 11:07:42 2017
New Revision: 439801
URL: https://svnweb.freebsd.org/changeset/ports/439801

Log:
  Extend grantlee.mk with another PLIST_SUB.
  
  Grantlee5 appends library names of plugins with a letter 'd' when in debug mode.
  Provide a PLIST_SUB with said suffix.
  
  Approved by:	rakuco (mentor)

Modified:
  head/Mk/Uses/grantlee.mk
  head/devel/grantlee5/Makefile
  head/devel/grantlee5/pkg-plist
  head/finance/skrooge/Makefile
  head/finance/skrooge/pkg-plist

Modified: head/Mk/Uses/grantlee.mk
==============================================================================
--- head/Mk/Uses/grantlee.mk	Sun Apr 30 11:05:46 2017	(r439800)
+++ head/Mk/Uses/grantlee.mk	Sun Apr 30 11:07:42 2017	(r439801)
@@ -19,6 +19,10 @@
 # Subs:
 #		GRANTLEE_VERSION_FULL	- full version of the chosen grantlee
 #		GRANTLEE_VERSION_SHORT	- short version of the chosen grantlee
+#		GRANTLEE_DEBUG_SUFFIX   - a suffix to the library name depending
+#					  the buildtype (WITH_DEBUG) that gets
+#					  appended to library names of plugins
+#					  for grantlee5.
 #
 # Further it will also append the proper LIB_DEPENDS line.
 #
@@ -63,4 +67,13 @@ LIB_DEPENDS+=	${GRANTLEE${_grantlee_vers
 PLIST_SUB+=	GRANTLEE_VERSION_FULL=${GRANTLEE_VERSION} \
 		GRANTLEE_VERSION_SHORT=${GRANTLEE_VERSION:R}
 
+# GrantleeMacros.cmake provides grantlee_adjust_plugin_name() which appends a
+# letter 'd' to the library name in Debug mode. Provide a PLIST_SUB which can be
+# appended in the plist.
+.  if defined(WITH_DEBUG)
+PLIST_SUB+=	GRANTLEE_DEBUG_SUFFIX=d
+.  else
+PLIST_SUB+=	GRANTLEE_DEBUG_SUFFIX=
+.  endif
+
 .endif

Modified: head/devel/grantlee5/Makefile
==============================================================================
--- head/devel/grantlee5/Makefile	Sun Apr 30 11:05:46 2017	(r439800)
+++ head/devel/grantlee5/Makefile	Sun Apr 30 11:07:42 2017	(r439801)
@@ -3,7 +3,7 @@
 
 PORTNAME=	grantlee
 PORTVERSION=	${GRANTLEE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.${PORTNAME}.org/
 PKGNAMESUFFIX=	5

Modified: head/devel/grantlee5/pkg-plist
==============================================================================
--- head/devel/grantlee5/pkg-plist	Sun Apr 30 11:05:46 2017	(r439800)
+++ head/devel/grantlee5/pkg-plist	Sun Apr 30 11:07:42 2017	(r439801)
@@ -35,10 +35,10 @@ lib/cmake/Grantlee5/Grantlee5ConfigVersi
 lib/cmake/Grantlee5/GrantleeMacros.cmake
 lib/cmake/Grantlee5/GrantleeTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Grantlee5/GrantleeTargets.cmake
-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/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_defaultfilters%%GRANTLEE_DEBUG_SUFFIX%%.so
+lib/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_defaulttags%%GRANTLEE_DEBUG_SUFFIX%%.so
+lib/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_i18ntags%%GRANTLEE_DEBUG_SUFFIX%%.so
+lib/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_loadertags%%GRANTLEE_DEBUG_SUFFIX%%.so
 lib/libGrantlee_Templates.so
 lib/libGrantlee_Templates.so.5
 lib/libGrantlee_Templates.so.%%GRANTLEE_VERSION_FULL%%

Modified: head/finance/skrooge/Makefile
==============================================================================
--- head/finance/skrooge/Makefile	Sun Apr 30 11:05:46 2017	(r439800)
+++ head/finance/skrooge/Makefile	Sun Apr 30 11:07:42 2017	(r439801)
@@ -2,6 +2,7 @@
 
 PORTNAME=	skrooge
 PORTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 DIST_SUBDIR=	KDE/${PORTNAME}

Modified: head/finance/skrooge/pkg-plist
==============================================================================
--- head/finance/skrooge/pkg-plist	Sun Apr 30 11:05:46 2017	(r439800)
+++ head/finance/skrooge/pkg-plist	Sun Apr 30 11:07:42 2017	(r439801)
@@ -12,7 +12,7 @@ lib/libskgbasemodeler.so.2
 lib/libskgbasemodeler.so.%%SHLIB_VER%%
 %%QT_PLUGINDIR%%/designer/libskgbankguidesigner.so
 %%QT_PLUGINDIR%%/designer/libskgbaseguidesigner.so
-%%QT_PLUGINDIR%%/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_skgfilters.so
+%%QT_PLUGINDIR%%/grantlee/%%GRANTLEE_VERSION_SHORT%%/grantlee_skgfilters%%GRANTLEE_DEBUG_SUFFIX%%.so
 %%QT_PLUGINDIR%%/skg_advice.so
 %%QT_PLUGINDIR%%/skg_bookmark.so
 %%QT_PLUGINDIR%%/skg_dashboard.so