pkgsrc-WIP-changes archive

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

lugaru: Update to 1.2; still doesn't install correctly, but it builds and runs



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <dressupgeekout%gmail.com@localhost>
Pushed By:	cfkoch
Date:		Thu Sep 20 23:12:01 2018 -0700
Changeset:	e0456aebadd91fc79273daf2153c5d8e69217ad5

Modified Files:
	lugaru/Makefile
	lugaru/TODO
	lugaru/distinfo
Removed Files:
	lugaru/patches/patch-CMakeLists.txt
	lugaru/patches/patch-Source_OpenGL_Windows.cpp

Log Message:
lugaru: Update to 1.2; still doesn't install correctly, but it builds and runs

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

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

diffstat:
 lugaru/Makefile                                | 11 ++++-------
 lugaru/TODO                                    |  1 -
 lugaru/distinfo                                | 10 ++++------
 lugaru/patches/patch-CMakeLists.txt            | 20 --------------------
 lugaru/patches/patch-Source_OpenGL_Windows.cpp | 11 -----------
 5 files changed, 8 insertions(+), 45 deletions(-)

diffs:
diff --git a/lugaru/Makefile b/lugaru/Makefile
index 60c7f726f4..0ddab347c8 100644
--- a/lugaru/Makefile
+++ b/lugaru/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD$
 
-DISTNAME=	lugaru-rev${PKGVERSION_NOREV}-src
-PKGNAME=	lugaru-${VERSION}
-VERSION=	269
+DISTNAME=	lugaru-${VERSION}
+VERSION=	1.2
 CATEGORIES=	games
 MASTER_SITES=	https://bitbucket.org/osslugaru/lugaru/downloads/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
 COMMENT=	Open source release of the game from Wolfire
@@ -15,11 +14,9 @@ LICENSE=	gnu-gpl-v2
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 
-CMAKE_ARGS+=	-DLUGARU_INSTALL_PREFIX:PATH=${PREFIX} 
-
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/lugaru/TODO b/lugaru/TODO
index 76812cb1fb..be0555ac8f 100644
--- a/lugaru/TODO
+++ b/lugaru/TODO
@@ -1,2 +1 @@
 - Make this thing installable!
-- Unbreak the OS X build
diff --git a/lugaru/distinfo b/lugaru/distinfo
index 7d56617b75..5bd87c6b25 100644
--- a/lugaru/distinfo
+++ b/lugaru/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-SHA1 (lugaru-rev269-src.tar.bz2) = 3788915dd3a792be45250c819a9411bf3d98d0c1
-RMD160 (lugaru-rev269-src.tar.bz2) = 3a1c4a2e1461aa948162b3686744fe30680a8742
-SHA512 (lugaru-rev269-src.tar.bz2) = ac7c04e53d1db6ba012a98e07cd5593d9a385a9b720031dc6c3a382cc45faa7345489ecaf1b9a42ab3f8ec553f20516dea6c6dad78f20c82d01c3b96d1820699
-Size (lugaru-rev269-src.tar.bz2) = 39250302 bytes
-SHA1 (patch-CMakeLists.txt) = 954bfa0fd1bf074ee7b65a4be0b5089880e0e468
-SHA1 (patch-Source_OpenGL_Windows.cpp) = 6bfdd0493f8445cf2649a7159174dae1123fe399
+SHA1 (lugaru-1.2.tar.xz) = 460d615e7465e85c092ecad8a4baa5d05ecc417f
+RMD160 (lugaru-1.2.tar.xz) = 68df569dc665ae7362e5751eda9930cc286351ad
+SHA512 (lugaru-1.2.tar.xz) = ca5b82d92d7167ddd51bed51d4511f9b36e5809f67b3f90a336bad690dd839bd66b25139f4a8b5ae5a24370146a6f9b7857d0418004cae275e0939e3292866d2
+Size (lugaru-1.2.tar.xz) = 34519308 bytes
diff --git a/lugaru/patches/patch-CMakeLists.txt b/lugaru/patches/patch-CMakeLists.txt
deleted file mode 100644
index c6dcaae560..0000000000
--- a/lugaru/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
---- ./CMakeLists.txt.orig	2016-02-02 22:31:43.000000000 -0800
-+++ CMakeLists.txt	2016-02-02 22:34:40.000000000 -0800
-@@ -532,14 +532,14 @@
- 		install(FILES ${SRCDIR}/mac-res/lugaru.icns DESTINATION ${APPS_DATA})
- 		install(FILES ${SRCDIR}/mac-res/Info.plist DESTINATION ${APPS_ROOT}/Contents)
- 	endif(APPLE)
--	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru DESTINATION ${CMAKE_INSTALL_PREFIX})
-+	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- 	if(APPLE AND LUGARU_HAS_INTERNAL_SDL)
- 		install(FILES ${SDLDIR}/lib/macosx/libSDL-1.2.0.dylib DESTINATION ${CMAKE_INSTALL_PREFIX})
- 	endif(APPLE AND LUGARU_HAS_INTERNAL_SDL)
- endif(WIN32)
- 
- if(NOT APPLE)
--install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${CMAKE_INSTALL_PREFIX})
-+install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/lugaru)
- endif(NOT APPLE)
- 
- if(APPLE)
diff --git a/lugaru/patches/patch-Source_OpenGL_Windows.cpp b/lugaru/patches/patch-Source_OpenGL_Windows.cpp
deleted file mode 100644
index 3e577e3356..0000000000
--- a/lugaru/patches/patch-Source_OpenGL_Windows.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
---- ./Source/OpenGL_Windows.cpp.orig	2017-02-26 14:58:52.433154283 -0800
-+++ ./Source/OpenGL_Windows.cpp	2017-02-26 14:59:06.089987208 -0800
-@@ -112,6 +112,7 @@
- #include <math.h>
- #include <stdio.h>
- #include <string.h>
-+#include <unistd.h>
- #include <fstream>
- #include <iostream>
- #include "gamegl.h"


Home | Main Index | Thread Index | Old Index