pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openhexagon: clean up submodules

Module Name:	pkgsrc-wip
Committed By:	Iain Hibbert <plunky%netbsd.org@localhost>
Pushed By:	plunky
Date:		Fri May 1 11:54:24 2020 +0100
Changeset:	61370d0f69edff06ae04d2420c8354269a83b25e

Modified Files:
	SSVEntitySystem/Makefile
	SSVEntitySystem/PLIST
	SSVEntitySystem/buildlink3.mk
	SSVEntitySystem/distinfo
	SSVEntitySystem/patches/patch-CMakeLists.txt
	SSVJsonCpp/Makefile
	SSVJsonCpp/PLIST
	SSVJsonCpp/buildlink3.mk
	SSVLuaWrapper/Makefile
	SSVLuaWrapper/PLIST
	SSVLuaWrapper/buildlink3.mk
	SSVMenuSystem/Makefile
	SSVMenuSystem/PLIST
	SSVMenuSystem/buildlink3.mk
	SSVStart/Makefile
	SSVStart/PLIST
	SSVStart/buildlink3.mk
	SSVStart/distinfo
	SSVStart/patches/patch-CMakeLists.txt
	SSVUtils/Makefile
	SSVUtils/PLIST
	SSVUtils/buildlink3.mk
	SSVUtilsJson/Makefile
	SSVUtilsJson/PLIST
	SSVUtilsJson/buildlink3.mk
	SSVUtilsJson/distinfo
	SSVUtilsJson/patches/patch-CMakeLists.txt
	openhexagon/Makefile
	openhexagon/distinfo
	openhexagon/patches/patch-CMakeLists.txt

Log Message:
openhexagon: clean up submodules

the way the submodules work in pkgsrc is a bit clunky, clean this
up so it works with less effort

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=61370d0f69edff06ae04d2420c8354269a83b25e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 SSVEntitySystem/Makefile                     | 10 ++++------
 SSVEntitySystem/PLIST                        |  2 +-
 SSVEntitySystem/buildlink3.mk                |  2 +-
 SSVEntitySystem/distinfo                     |  2 +-
 SSVEntitySystem/patches/patch-CMakeLists.txt |  2 +-
 SSVJsonCpp/Makefile                          |  6 +++---
 SSVJsonCpp/PLIST                             |  2 +-
 SSVJsonCpp/buildlink3.mk                     |  2 +-
 SSVLuaWrapper/Makefile                       |  6 +++---
 SSVLuaWrapper/PLIST                          |  2 +-
 SSVLuaWrapper/buildlink3.mk                  |  2 +-
 SSVMenuSystem/Makefile                       |  6 +++---
 SSVMenuSystem/PLIST                          |  2 +-
 SSVMenuSystem/buildlink3.mk                  |  2 +-
 SSVStart/Makefile                            | 10 ++++------
 SSVStart/PLIST                               |  2 +-
 SSVStart/buildlink3.mk                       |  2 +-
 SSVStart/distinfo                            |  2 +-
 SSVStart/patches/patch-CMakeLists.txt        |  2 +-
 SSVUtils/Makefile                            |  6 +++---
 SSVUtils/PLIST                               |  2 +-
 SSVUtils/buildlink3.mk                       |  2 +-
 SSVUtilsJson/Makefile                        | 10 ++++------
 SSVUtilsJson/PLIST                           |  2 +-
 SSVUtilsJson/buildlink3.mk                   |  4 +---
 SSVUtilsJson/distinfo                        |  2 +-
 SSVUtilsJson/patches/patch-CMakeLists.txt    |  2 +-
 openhexagon/Makefile                         | 10 +---------
 openhexagon/distinfo                         |  2 +-
 openhexagon/patches/patch-CMakeLists.txt     |  2 +-
 30 files changed, 47 insertions(+), 63 deletions(-)

diffs:
diff --git a/SSVEntitySystem/Makefile b/SSVEntitySystem/Makefile
index 6c90e71c0d..a079c4012f 100644
--- a/SSVEntitySystem/Makefile
+++ b/SSVEntitySystem/Makefile
@@ -17,16 +17,14 @@ LICENSE=	afl-3.0
 USE_LANGUAGES=	c c++14
 USE_CMAKE=	yes
 
-MODULES=	${SSVUTILS_MODULE}
-
 CMAKE_ARGS+=	-DBUILD_SHARED_LIB:BOOL=OFF
-CMAKE_ARGS+=	-DMODULES=${MODULES:ts;:Q}
+CMAKE_ARGS+=	-DMODULE_PATH=${PREFIX}/lib/cmake
 
-INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake/${PKGBASE}
+INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake
 
 post-install:
-	${INSTALL_LIB} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
-		${DESTDIR}${PREFIX}/lib/cmake/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
+		${DESTDIR}${PREFIX}/lib/cmake/
 
 .include "../../wip/SSVUtils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/SSVEntitySystem/PLIST b/SSVEntitySystem/PLIST
index 8315890443..f6acc38aeb 100644
--- a/SSVEntitySystem/PLIST
+++ b/SSVEntitySystem/PLIST
@@ -4,5 +4,5 @@ include/SSVEntitySystem/Core/Entity.h
 include/SSVEntitySystem/Core/Manager.h
 include/SSVEntitySystem/Global/Typedefs.h
 include/SSVEntitySystem/SSVEntitySystem.h
-lib/cmake/SSVEntitySystem/FindSSVEntitySystem.cmake
+lib/cmake/FindSSVEntitySystem.cmake
 lib/libSSVEntitySystem-s.a
diff --git a/SSVEntitySystem/buildlink3.mk b/SSVEntitySystem/buildlink3.mk
index 3172b54e0d..aac4d86743 100644
--- a/SSVEntitySystem/buildlink3.mk
+++ b/SSVEntitySystem/buildlink3.mk
@@ -8,7 +8,7 @@ SSVENTITYSYSTEM_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.SSVEntitySystem+=	SSVEntitySystem>=20130704
 BUILDLINK_PKGSRCDIR.SSVEntitySystem?=	../../wip/SSVEntitySystem
 
-SSVENTITYSYSTEM_MODULE=	${PREFIX}/lib/cmake/SSVEntitySystem
+BUILDLINK_FILES.SSVEntitySystem+=	lib/cmake/FindSSVEntitySystem.cmake
 
 .endif	# SSVENTITYSYSTEM_BUILDLINK3_MK
 
diff --git a/SSVEntitySystem/distinfo b/SSVEntitySystem/distinfo
index 2c06bb1ede..feeb05c482 100644
--- a/SSVEntitySystem/distinfo
+++ b/SSVEntitySystem/distinfo
@@ -4,4 +4,4 @@ SHA1 (SSVEntitySystem-8123beabe3bc8ffe91cb94e6ba061254f3bba18b.tar.gz) = e950b4d
 RMD160 (SSVEntitySystem-8123beabe3bc8ffe91cb94e6ba061254f3bba18b.tar.gz) = 9c149e64d7e44c552afd24ee2766c70d5460e7d9
 SHA512 (SSVEntitySystem-8123beabe3bc8ffe91cb94e6ba061254f3bba18b.tar.gz) = e1baa7cb26bc2215baf569b1aa1a4240b17310b2e1717a23f9e9978cf8bc4f72df64573aa474b17bbfe6896793c48a9facd0ed80e4d0f792631297dd548aaf81
 Size (SSVEntitySystem-8123beabe3bc8ffe91cb94e6ba061254f3bba18b.tar.gz) = 8727 bytes
-SHA1 (patch-CMakeLists.txt) = d4659ae4005801a1caebd1ff3651f41d9974f056
+SHA1 (patch-CMakeLists.txt) = 71e0510c0a344fa799f3b09e65656eaacccab2fb
diff --git a/SSVEntitySystem/patches/patch-CMakeLists.txt b/SSVEntitySystem/patches/patch-CMakeLists.txt
index ee11da1219..43e64baf14 100644
--- a/SSVEntitySystem/patches/patch-CMakeLists.txt
+++ b/SSVEntitySystem/patches/patch-CMakeLists.txt
@@ -10,7 +10,7 @@ allow pkgsrc to point to dependencies
  set(CMAKE_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -g3 -gdwarf-2 -O0" CACHE STRING "" FORCE)
 -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/;${CMAKE_MODULE_PATH}")
 -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/extlibs/SSVUtils/cmake/modules/;${CMAKE_MODULE_PATH}")
-+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/;${MODULES}")
++set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/;${MODULE_PATH}")
  
  set(BUILD_SHARED_LIB TRUE CACHE BOOL "Build shared libraries.")
  if(BUILD_SHARED_LIB)
diff --git a/SSVJsonCpp/Makefile b/SSVJsonCpp/Makefile
index d312050b0f..6a72e7bdeb 100644
--- a/SSVJsonCpp/Makefile
+++ b/SSVJsonCpp/Makefile
@@ -19,10 +19,10 @@ USE_CMAKE=	yes
 
 CMAKE_ARGS+=	-DBUILD_SHARED_LIB:BOOL=OFF
 
-INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake/${PKGBASE}
+INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake
 
 post-install:
-	${INSTALL_LIB} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
-		${DESTDIR}${PREFIX}/lib/cmake/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
+		${DESTDIR}${PREFIX}/lib/cmake/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/SSVJsonCpp/PLIST b/SSVJsonCpp/PLIST
index 619458f3c3..3af4a404de 100644
--- a/SSVJsonCpp/PLIST
+++ b/SSVJsonCpp/PLIST
@@ -2,5 +2,5 @@
 include/SSVJsonCpp/SSVJsonCpp.h
 include/SSVJsonCpp/json/json-forwards.h
 include/SSVJsonCpp/json/json.h
-lib/cmake/SSVJsonCpp/FindSSVJsonCpp.cmake
+lib/cmake/FindSSVJsonCpp.cmake
 lib/libSSVJsonCpp-s.a
diff --git a/SSVJsonCpp/buildlink3.mk b/SSVJsonCpp/buildlink3.mk
index 81bf2ae421..bd3c28098e 100644
--- a/SSVJsonCpp/buildlink3.mk
+++ b/SSVJsonCpp/buildlink3.mk
@@ -8,7 +8,7 @@ SSVJSONCPP_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.SSVJsonCpp+=	SSVJsonCpp>=20130708
 BUILDLINK_PKGSRCDIR.SSVJsonCpp?=	../../wip/SSVJsonCpp
 
-SSVJSONCPP_MODULE=	${PREFIX}/lib/cmake/SSVJsonCpp
+BUILDLINK_FILES.SSVJsonCpp+=		lib/cmake/FindSSVJsonCpp.cmake
 
 .endif	# SSVJSONCPP_BUILDLINK3_MK
 
diff --git a/SSVLuaWrapper/Makefile b/SSVLuaWrapper/Makefile
index dccf53b9ee..f4506d1fe1 100644
--- a/SSVLuaWrapper/Makefile
+++ b/SSVLuaWrapper/Makefile
@@ -29,11 +29,11 @@ SUBST_MESSAGE.include=	Fixing hardcoded path
 SUBST_FILES.include=	include/SSVLuaWrapper/LuaContext/LuaContext.h
 SUBST_SED.include=	-e 's,lua5.1,lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR},'
 
-INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake/${PKGBASE}
+INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake
 
 post-install:
-	${INSTALL_LIB} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
-		${DESTDIR}${PREFIX}/lib/cmake/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
+		${DESTDIR}${PREFIX}/lib/cmake
 
 .include "../../lang/lua/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/SSVLuaWrapper/PLIST b/SSVLuaWrapper/PLIST
index 2d41f75879..c7f15a8bb4 100644
--- a/SSVLuaWrapper/PLIST
+++ b/SSVLuaWrapper/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD$
 include/SSVLuaWrapper/LuaContext/LuaContext.h
 include/SSVLuaWrapper/SSVLuaWrapper.h
-lib/cmake/SSVLuaWrapper/FindSSVLuaWrapper.cmake
+lib/cmake/FindSSVLuaWrapper.cmake
 lib/libSSVLuaWrapper-s.a
diff --git a/SSVLuaWrapper/buildlink3.mk b/SSVLuaWrapper/buildlink3.mk
index f7a3d452ef..dc747c073a 100644
--- a/SSVLuaWrapper/buildlink3.mk
+++ b/SSVLuaWrapper/buildlink3.mk
@@ -8,7 +8,7 @@ SSVLUAWRAPPER_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.SSVLuaWrapper+=	SSVLuaWrapper>=20130708
 BUILDLINK_PKGSRCDIR.SSVLuaWrapper?=	../../wip/SSVLuaWrapper
 
-SSVLUAWRAPPER_MODULE=	${PREFIX}/lib/cmake/SSVLuaWrapper
+BUILDLINK_FILES.SSVLuaWrapper+=		lib/cmake/FindSSVLuaWrapper.cmake
 
 LUA_VERSIONS_ACCEPTED=	51
 .include <../../lang/lua/buildlink3.mk>
diff --git a/SSVMenuSystem/Makefile b/SSVMenuSystem/Makefile
index fe05947013..9a4f622356 100644
--- a/SSVMenuSystem/Makefile
+++ b/SSVMenuSystem/Makefile
@@ -19,10 +19,10 @@ USE_CMAKE=	yes
 
 CMAKE_ARGS+=	-DBUILD_SHARED_LIB:BOOL=OFF
 
-INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake/${PKGBASE}
+INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake
 
 post-install:
-	${INSTALL_LIB} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
-		${DESTDIR}${PREFIX}/lib/cmake/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
+		${DESTDIR}${PREFIX}/lib/cmake/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/SSVMenuSystem/PLIST b/SSVMenuSystem/PLIST
index 3948e04a4b..bc4a99ceae 100644
--- a/SSVMenuSystem/PLIST
+++ b/SSVMenuSystem/PLIST
@@ -7,5 +7,5 @@ include/SSVMenuSystem/Menu/Category.h
 include/SSVMenuSystem/Menu/ItemBase.h
 include/SSVMenuSystem/Menu/Menu.h
 include/SSVMenuSystem/SSVMenuSystem.h
-lib/cmake/SSVMenuSystem/FindSSVMenuSystem.cmake
+lib/cmake/FindSSVMenuSystem.cmake
 lib/libSSVMenuSystem-s.a
diff --git a/SSVMenuSystem/buildlink3.mk b/SSVMenuSystem/buildlink3.mk
index 613dedb1ee..03a9b60c05 100644
--- a/SSVMenuSystem/buildlink3.mk
+++ b/SSVMenuSystem/buildlink3.mk
@@ -8,7 +8,7 @@ SSVMENUSYSTEM_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.SSVMenuSystem+=	SSVMenuSystem>=20130713
 BUILDLINK_PKGSRCDIR.SSVMenuSystem?=	../../wip/SSVMenuSystem
 
-SSVMENUSYSTEM_MODULE=	${PREFIX}/lib/cmake/SSVMenuSystem
+BUILDLINK_FILES.SSVMenuSystem+=		lib/cmake/FindSSVMenuSystem.cmake
 
 .endif	# SSVMENUSYSTEM_BUILDLINK3_MK
 
diff --git a/SSVStart/Makefile b/SSVStart/Makefile
index c18f4d5128..44f14da4bc 100644
--- a/SSVStart/Makefile
+++ b/SSVStart/Makefile
@@ -17,16 +17,14 @@ LICENSE=	afl-3.0
 USE_LANGUAGES=	c c++14
 USE_CMAKE=	yes
 
-MODULES=	${SSVJSONCPP_MODULE} ${SSVUTILS_MODULE} ${SSVUTILSJSON_MODULE}
-
 CMAKE_ARGS+=	-DBUILD_SHARED_LIB:BOOL=OFF
-CMAKE_ARGS+=	-DMODULES=${MODULES:ts;:Q}
+CMAKE_ARGS+=	-DMODULE_PATH=${PREFIX}/lib/cmake
 
-INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake/${PKGBASE}
+INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake
 
 post-install:
-	${INSTALL_LIB} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
-		${DESTDIR}${PREFIX}/lib/cmake/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
+		${DESTDIR}${PREFIX}/lib/cmake/
 
 .include "../../wip/sfml+/buildlink3.mk"
 .include "../../wip/SSVJsonCpp/buildlink3.mk"
diff --git a/SSVStart/PLIST b/SSVStart/PLIST
index 0fa5a12337..79f062895a 100644
--- a/SSVStart/PLIST
+++ b/SSVStart/PLIST
@@ -27,5 +27,5 @@ include/SSVStart/Tileset/Tileset.h
 include/SSVStart/Utils/ThreadWrapper.h
 include/SSVStart/Utils/Utils.h
 include/SSVStart/Utils/UtilsInput.h
-lib/cmake/SSVStart/FindSSVStart.cmake
+lib/cmake/FindSSVStart.cmake
 lib/libSSVStart-s.a
diff --git a/SSVStart/buildlink3.mk b/SSVStart/buildlink3.mk
index 0d68f7436b..5cc1087628 100644
--- a/SSVStart/buildlink3.mk
+++ b/SSVStart/buildlink3.mk
@@ -8,7 +8,7 @@ SSVSTART_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.SSVStart+=	SSVStart>=20130714
 BUILDLINK_PKGSRCDIR.SSVStart?=		../../wip/SSVStart
 
-SSVSTART_MODULE=	${PREFIX}/lib/cmake/SSVStart
+BUILDLINK_FILES.SSVStart+=		lib/cmake/FindSSVStart.cmake
 
 .endif	# SSVSTART_BUILDLINK3_MK
 
diff --git a/SSVStart/distinfo b/SSVStart/distinfo
index b06031d601..de1a0403c1 100644
--- a/SSVStart/distinfo
+++ b/SSVStart/distinfo
@@ -4,4 +4,4 @@ SHA1 (SSVStart-112229f184f5e4cf88c71fe67b4588806d290f71.tar.gz) = cbf1fa5b8acad2
 RMD160 (SSVStart-112229f184f5e4cf88c71fe67b4588806d290f71.tar.gz) = 0049b678079b0d0126d57e3014318b1b8f16d26e
 SHA512 (SSVStart-112229f184f5e4cf88c71fe67b4588806d290f71.tar.gz) = 3e2a1114274bb86cee4ec303a7b2be6f7fa24a3cbd74cf4bd9b5f24056fda40188892b11f955e078877fbfe92f4ea1a95e8350438d5921646e74fb1f1de98817
 Size (SSVStart-112229f184f5e4cf88c71fe67b4588806d290f71.tar.gz) = 23834 bytes
-SHA1 (patch-CMakeLists.txt) = e6c5f5fef35a63bb15068aa82437fad170f1aca4
+SHA1 (patch-CMakeLists.txt) = 714b2f2b5939f4e2ac3c0e41ff061e2180a1480d
diff --git a/SSVStart/patches/patch-CMakeLists.txt b/SSVStart/patches/patch-CMakeLists.txt
index 655200280a..ad6af09aee 100644
--- a/SSVStart/patches/patch-CMakeLists.txt
+++ b/SSVStart/patches/patch-CMakeLists.txt
@@ -10,7 +10,7 @@ allow pkgsrc to point to dependencies
  set(CMAKE_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -g3 -gdwarf-2 -O0" CACHE STRING "" FORCE)
 -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/;${CMAKE_MODULE_PATH}")
 -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/extlibs/SSVUtils/cmake/modules/;${CMAKE_MODULE_PATH}")
-+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/;${MODULES}")
++set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/;${MODULE_PATH}")
  
  set(SSVSTART_USE_JSON TRUE CACHE BOOL "Use JSON tools/utilities (Requires SSVJsonCpp and SSVUtilsJson).")
 -if(SSVSTART_USE_JSON)
diff --git a/SSVUtils/Makefile b/SSVUtils/Makefile
index 3845a5d537..5b29c25aa1 100644
--- a/SSVUtils/Makefile
+++ b/SSVUtils/Makefile
@@ -19,10 +19,10 @@ USE_CMAKE=	yes
 
 CMAKE_ARGS+=	-DBUILD_SHARED_LIB:BOOL=OFF
 
-INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake/${PKGBASE}
+INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake
 
 post-install:
-	${INSTALL_LIB} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
-		${DESTDIR}${PREFIX}/lib/cmake/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
+		${DESTDIR}${PREFIX}/lib/cmake/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/SSVUtils/PLIST b/SSVUtils/PLIST
index ad4cdf24f3..593dbfb4b5 100644
--- a/SSVUtils/PLIST
+++ b/SSVUtils/PLIST
@@ -30,5 +30,5 @@ include/SSVUtils/Utils/Utils.h
 include/SSVUtils/Utils/UtilsContainers.h
 include/SSVUtils/Utils/UtilsMakeUnique.h
 include/SSVUtils/Utils/UtilsMath.h
-lib/cmake/SSVUtils/FindSSVUtils.cmake
+lib/cmake/FindSSVUtils.cmake
 lib/libSSVUtils-s.a
diff --git a/SSVUtils/buildlink3.mk b/SSVUtils/buildlink3.mk
index 09939bad8c..bd6baed0be 100644
--- a/SSVUtils/buildlink3.mk
+++ b/SSVUtils/buildlink3.mk
@@ -8,7 +8,7 @@ SSVUTILS_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.SSVUtils+=	SSVUtils>=20130714
 BUILDLINK_PKGSRCDIR.SSVUtils?=		../../wip/SSVUtils
 
-SSVUTILS_MODULE=	${PREFIX}/lib/cmake/SSVUtils
+BUILDLINK_FILES.SSVUtils+=		lib/cmake/FindSSVUtils.cmake
 
 .endif	# SSVUTILS_BUILDLINK3_MK
 
diff --git a/SSVUtilsJson/Makefile b/SSVUtilsJson/Makefile
index 33ecc175fb..afd68b527c 100644
--- a/SSVUtilsJson/Makefile
+++ b/SSVUtilsJson/Makefile
@@ -17,16 +17,14 @@ LICENSE=	afl-3.0
 USE_LANGUAGES=	c c++14
 USE_CMAKE=	yes
 
-MODULES=	${SSVJSONCPP_MODULE} ${SSVUTILS_MODULE}
-
 CMAKE_ARGS+=	-DBUILD_SHARED_LIB:BOOL=OFF
-CMAKE_ARGS+=	-DMODULES=${MODULES:ts;:Q}
+CMAKE_ARGS+=	-DMODULE_PATH=${PREFIX}/lib/cmake
 
-INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake/${PKGBASE}
+INSTALLATION_DIRS+=	include/${PKGBASE} lib/cmake
 
 post-install:
-	${INSTALL_LIB} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
-		${DESTDIR}${PREFIX}/lib/cmake/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/cmake/modules/Find${PKGBASE}.cmake \
+		${DESTDIR}${PREFIX}/lib/cmake/
 
 .include "../../wip/SSVJsonCpp/buildlink3.mk"
 .include "../../wip/SSVUtils/buildlink3.mk"
diff --git a/SSVUtilsJson/PLIST b/SSVUtilsJson/PLIST
index 1d0fc520ab..5e1f3dd522 100644
--- a/SSVUtilsJson/PLIST
+++ b/SSVUtilsJson/PLIST
@@ -4,4 +4,4 @@ include/SSVUtilsJson/SSVUtilsJson.h
 include/SSVUtilsJson/Utils/Internal/Helper.h
 include/SSVUtilsJson/Utils/Internal/Typedefs.h
 include/SSVUtilsJson/Utils/UtilsJson.h
-lib/cmake/SSVUtilsJson/FindSSVUtilsJson.cmake
+lib/cmake/FindSSVUtilsJson.cmake
diff --git a/SSVUtilsJson/buildlink3.mk b/SSVUtilsJson/buildlink3.mk
index 2f1de3b4fe..74b03a9d08 100644
--- a/SSVUtilsJson/buildlink3.mk
+++ b/SSVUtilsJson/buildlink3.mk
@@ -8,9 +8,7 @@ SSVUTILSJSON_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.SSVUtilsJson+=	SSVUtilsJson>=20130714
 BUILDLINK_PKGSRCDIR.SSVUtilsJson?=	../../wip/SSVUtilsJson
 
-SSVUTILSJSON_MODULE=	${PREFIX}/lib/cmake/SSVUtilsJson
-
-.include "../../wip/SSVJsonCpp/buildlink3.mk"
+BUILDLINK_FILES.SSVUtilsJson+=		lib/cmake/FindSSVUtilsJson.cmake
 
 .endif	# SSVUTILSJSON_BUILDLINK3_MK
 
diff --git a/SSVUtilsJson/distinfo b/SSVUtilsJson/distinfo
index 6eb9a5abc3..1b1a237b73 100644
--- a/SSVUtilsJson/distinfo
+++ b/SSVUtilsJson/distinfo
@@ -4,4 +4,4 @@ SHA1 (SSVUtilsJson-95836250e3a9b65883f22991190e652a455121c1.tar.gz) = 31338e8e2f
 RMD160 (SSVUtilsJson-95836250e3a9b65883f22991190e652a455121c1.tar.gz) = 2c38b263bfd125772dd4c2799a5579a41e941b3f
 SHA512 (SSVUtilsJson-95836250e3a9b65883f22991190e652a455121c1.tar.gz) = bcc01f6dc70353100ca3cf184d16c65ebac0cc0b256aa31c0c9c8925b96eb6cd3dc79c685d4d250f83ca3656498d927da796c5fdd813518db3d15cf096a11f97
 Size (SSVUtilsJson-95836250e3a9b65883f22991190e652a455121c1.tar.gz) = 8298 bytes
-SHA1 (patch-CMakeLists.txt) = 38b7b553dc65b303b7d2441066694f4784b66da4
+SHA1 (patch-CMakeLists.txt) = ad9c05a4959b78785ba9b8cc63e3bc7bdac862e4
diff --git a/SSVUtilsJson/patches/patch-CMakeLists.txt b/SSVUtilsJson/patches/patch-CMakeLists.txt
index 5f3dd22270..a581df48e1 100644
--- a/SSVUtilsJson/patches/patch-CMakeLists.txt
+++ b/SSVUtilsJson/patches/patch-CMakeLists.txt
@@ -11,7 +11,7 @@ allow pkgsrc to point to dependencies
 -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/;${CMAKE_MODULE_PATH}")
 -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/extlibs/SSVJsonCpp/cmake/modules/;${CMAKE_MODULE_PATH}")
 -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/extlibs/SSVUtils/cmake/modules/;${CMAKE_MODULE_PATH}")
-+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/;${MODULES}")
++set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/;${MODULE_PATH}")
  
  find_package(SSVJsonCpp REQUIRED)
  find_package(SSVUtils REQUIRED)
diff --git a/openhexagon/Makefile b/openhexagon/Makefile
index 4511425894..99edd37d9d 100644
--- a/openhexagon/Makefile
+++ b/openhexagon/Makefile
@@ -21,17 +21,9 @@ SUBST_MESSAGE.wrap=	Adjusting wrapper
 SUBST_FILES.wrap=	${PKGBASE}
 SUBST_VARS.wrap=	PREFIX PKGBASE GITHUB_PROJECT
 
-MODULES+=	${SSVJSONCPP_MODULE}
-MODULES+=	${SSVUTILS_MODULE}
-MODULES+=	${SSVSTART_MODULE}
-MODULES+=	${SSVENTITYSYSTEM_MODULE}
-MODULES+=	${SSVLUAWRAPPER_MODULE}
-MODULES+=	${SSVMENUSYSTEM_MODULE}
-MODULES+=	${SSVUTILSJSON_MODULE}
-
 CMAKE_ARGS+=	-DLUA_LIBRARY=${PREFIX}/lib/liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.so
 CMAKE_ARGS+=	-DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
-CMAKE_ARGS+=	-DMODULES=${MODULES:ts;:Q}
+CMAKE_ARGS+=	-DMODULE_PATH=${PREFIX}/lib/cmake
 CMAKE_ARGS+=	-DPKGBASE=${PKGBASE}
 
 INSTALLATION_DIRS+=	games lib/${PKGBASE}
diff --git a/openhexagon/distinfo b/openhexagon/distinfo
index 428e0ef008..76c72e0c3f 100644
--- a/openhexagon/distinfo
+++ b/openhexagon/distinfo
@@ -4,4 +4,4 @@ SHA1 (openhexagon-2.0.tar.gz) = 6bb86de3a194e816957d8cdd55fc423259c2c000
 RMD160 (openhexagon-2.0.tar.gz) = 7feefde13a795d687dbe09b96062e149851f5d5c
 SHA512 (openhexagon-2.0.tar.gz) = 0836b6b477227ee768ce43f411b065b1b25fff6ba16401d5ebde1443cde3f03e36d9bb1d11043e958a3f4a38e9af2f0b801aecd39b4edb31007c45c9ce074fdb
 Size (openhexagon-2.0.tar.gz) = 317548 bytes
-SHA1 (patch-CMakeLists.txt) = 07a5cf6436652fd023741f655c4a7c11fe4c6eb0
+SHA1 (patch-CMakeLists.txt) = be352f48dd9285853e2cacf89e81df9baed6fca9
diff --git a/openhexagon/patches/patch-CMakeLists.txt b/openhexagon/patches/patch-CMakeLists.txt
index dfe61faad8..c307ab3abc 100644
--- a/openhexagon/patches/patch-CMakeLists.txt
+++ b/openhexagon/patches/patch-CMakeLists.txt
@@ -16,7 +16,7 @@ find dependencies and install in relation to pkgsrc
 -set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/extlibs/SSVLuaWrapper/cmake/modules/")
 -set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/extlibs/SSVEntitySystem/cmake/modules/")
 -set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/extlibs/SSVStart/cmake/modules/")
-+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/;${MODULES}")
++set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/;${MODULE_PATH}")
  
  set(SFML_STATIC_LIBRARIES FALSE CACHE BOOL "Look for static SFML libraries.")
  find_package(SFML 2 COMPONENTS audio graphics window system network)
Home | Main Index | Thread Index | Old Index