pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lgogdownloader-git: upstream switched to building with cmake, adapt.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Jan 17 20:55:13 2016 +0100
Changeset:	ace3c90695b064bd6b037528c7af7bd42ffeaac0

Modified Files:
	lgogdownloader-git/Makefile
Added Files:
	lgogdownloader-git/distinfo
	lgogdownloader-git/patches/patch-cmake_FindJsoncpp.cmake
	lgogdownloader-git/patches/patch-cmake_FindTinyxml.cmake

Log Message:
lgogdownloader-git: upstream switched to building with cmake, adapt.

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

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

diffstat:
 lgogdownloader-git/Makefile                              | 15 +++++++++------
 lgogdownloader-git/distinfo                              |  4 ++++
 lgogdownloader-git/patches/patch-cmake_FindJsoncpp.cmake | 14 ++++++++++++++
 lgogdownloader-git/patches/patch-cmake_FindTinyxml.cmake | 14 ++++++++++++++
 4 files changed, 41 insertions(+), 6 deletions(-)

diffs:
diff --git a/lgogdownloader-git/Makefile b/lgogdownloader-git/Makefile
index 66047dc..48d15c9 100644
--- a/lgogdownloader-git/Makefile
+++ b/lgogdownloader-git/Makefile
@@ -16,12 +16,15 @@ GIT_REPO.lgogdownloader=	git://github.com/Sude-/lgogdownloader.git
 
 WRKSRC=		${WRKDIR}/lgogdownloader
 USE_LANGUAGES=	c++
-USE_TOOLS+=	gmake gunzip
-
-BUILD_TARGET=	release
-MAKE_FLAGS+=	PREFIX=${PREFIX}
-MAKE_FLAGS+=	MANPREFIX=${PREFIX}
-MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
+USE_CMAKE=	yes
+USE_TOOLS+=	pkg-config
+CMAKE_ARGS+=	-DPC_JSONCPP_FOUND:BOOL=1
+CMAKE_ARGS+=	-DPC_JSONCPP_INCLUDEDIRS:PATH=${BUILDLINK_PREFIX.jsoncpp}/include/json
+CMAKE_ARGS+=	-DPC_JSONCPP_LIBRARY_DIRS:PATH=${BUILDLINK_PREFIX.jsoncpp}/lib
+CMAKE_ARGS+=	-DPC_TINYXML_FOUND:BOOL=1
+CMAKE_ARGS+=	-DPC_TINYXML_LIBRARY_DIRS:PATH=${BUILDLINK_PREFIX.tinyxml}/lib
+# for man page
+CMAKE_ARGS+=	-DINSTALL_SHARE_DIR:PATH=${PREFIX}
 
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../security/liboauth/buildlink3.mk"
diff --git a/lgogdownloader-git/distinfo b/lgogdownloader-git/distinfo
new file mode 100644
index 0000000..ac2d955
--- /dev/null
+++ b/lgogdownloader-git/distinfo
@@ -0,0 +1,4 @@
+$NetBSD$
+
+SHA1 (patch-cmake_FindJsoncpp.cmake) = 0ab831e8d26625a748cf9c4ab270cd7a39a4472e
+SHA1 (patch-cmake_FindTinyxml.cmake) = 66dabf0fff90893c46fcf0aecdab24a7e4c530c8
diff --git a/lgogdownloader-git/patches/patch-cmake_FindJsoncpp.cmake b/lgogdownloader-git/patches/patch-cmake_FindJsoncpp.cmake
new file mode 100644
index 0000000..036fe2d
--- /dev/null
+++ b/lgogdownloader-git/patches/patch-cmake_FindJsoncpp.cmake
@@ -0,0 +1,14 @@
+$NetBSD$
+
+jsoncpp does not provide a pkg-config file, don't insist on one.
+
+--- cmake/FindJsoncpp.cmake.orig	2016-01-17 17:41:13.000000000 +0000
++++ cmake/FindJsoncpp.cmake
+@@ -6,7 +6,6 @@
+ #  Jsoncpp_LIBRARIES - link these to use Jsoncpp
+ 
+ find_package(PkgConfig)
+-pkg_check_modules(PC_JSONCPP REQUIRED jsoncpp)
+ 
+ find_path(JSONCPP_INCLUDE_DIR
+   NAMES
diff --git a/lgogdownloader-git/patches/patch-cmake_FindTinyxml.cmake b/lgogdownloader-git/patches/patch-cmake_FindTinyxml.cmake
new file mode 100644
index 0000000..da06fa4
--- /dev/null
+++ b/lgogdownloader-git/patches/patch-cmake_FindTinyxml.cmake
@@ -0,0 +1,14 @@
+$NetBSD$
+
+tinyxml does not provide a pkg-config file, don't insist on one.
+
+--- cmake/FindTinyxml.cmake.orig	2016-01-17 17:41:13.000000000 +0000
++++ cmake/FindTinyxml.cmake
+@@ -6,7 +6,6 @@
+ #  Tinyxml_LIBRARIES - The libraries needed to use tinyxml
+ 
+ find_package(PkgConfig)
+-pkg_check_modules(PC_TINYXML REQUIRED tinyxml)
+ 
+ find_path(TINYXML_INCLUDE_DIR tinyxml.h
+   HINTS


Home | Main Index | Thread Index | Old Index