From fe56a1ec1d2d16417c473f9973b7e43724445b11 Mon Sep 17 00:00:00 2001
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Fri, 29 Mar 2019 10:14:47 +0000
Subject: [PATCH] finance/alkimia: Further simplify after Qt 4 removal

- Remove PKGNAMESUFFIX since there is just one version now
- Remove unnecessary pkg-plist subsitutions
---
 finance/alkimia/Makefile  | 12 ++++--------
 finance/alkimia/pkg-plist | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/finance/alkimia/Makefile b/finance/alkimia/Makefile
index 81b43a30e13e..92b398451670 100644
--- a/finance/alkimia/Makefile
+++ b/finance/alkimia/Makefile
@@ -2,10 +2,9 @@
 
 PORTNAME=	alkimia
 PORTVERSION=	7.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
-PKGNAMESUFFIX?=	-qt5
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	KDE financial data handling library
@@ -20,13 +19,10 @@ USES=		cmake compiler:c++11-lang pathfix qt:5 tar:xz
 USE_LDCONFIG=	yes
 USE_QT=		core dbus \
 		buildtools_build qmake_build
-CMAKE_ON=	KDE_INSTALL_USE_QT_SYS_PATHS
-INCLUDE_SUBDIR=	Qt5
-QTVER_SUFFIX=	5
 
-PLIST_SUB=	INCLUDE_SUBDIR=${INCLUDE_SUBDIR} \
-		QTVER_SUFFIX=${QTVER_SUFFIX} \
-		VER=${PORTVERSION:R}
+CMAKE_ON=	KDE_INSTALL_USE_QT_SYS_PATHS
+
+PLIST_SUB=	VER=${PORTVERSION:R}
 
 OPTIONS_SINGLE=		MPLIB
 OPTIONS_SINGLE_MPLIB=	GMP MPIR
diff --git a/finance/alkimia/pkg-plist b/finance/alkimia/pkg-plist
index 1d78ccd03204..13c5b5b9c844 100644
--- a/finance/alkimia/pkg-plist
+++ b/finance/alkimia/pkg-plist
@@ -1,14 +1,14 @@
-include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alk_export.h
-include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alkcompany.h
-include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alkquoteitem.h
-include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alkvalue.h
-%%GMP%%lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/FindGMP.cmake
-%%MPIR%%lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/FindMPIR.cmake
-lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%Config.cmake
-lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%ConfigVersion.cmake
-lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%Targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%Targets.cmake
-lib/libalkimia%%QTVER_SUFFIX%%.so
-lib/libalkimia%%QTVER_SUFFIX%%.so.7
-lib/libalkimia%%QTVER_SUFFIX%%.so.7.0.2
-libdata/pkgconfig/libalkimia%%QTVER_SUFFIX%%.pc
+include/alkimia/Qt5/alkimia/alk_export.h
+include/alkimia/Qt5/alkimia/alkcompany.h
+include/alkimia/Qt5/alkimia/alkquoteitem.h
+include/alkimia/Qt5/alkimia/alkvalue.h
+%%GMP%%lib/cmake/LibAlkimia5-%%VER%%/FindGMP.cmake
+%%MPIR%%lib/cmake/LibAlkimia5-%%VER%%/FindMPIR.cmake
+lib/cmake/LibAlkimia5-%%VER%%/LibAlkimia5Config.cmake
+lib/cmake/LibAlkimia5-%%VER%%/LibAlkimia5ConfigVersion.cmake
+lib/cmake/LibAlkimia5-%%VER%%/LibAlkimia5Targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/LibAlkimia5-%%VER%%/LibAlkimia5Targets.cmake
+lib/libalkimia5.so
+lib/libalkimia5.so.7
+lib/libalkimia5.so.7.0.2
+libdata/pkgconfig/libalkimia5.pc