CVS commit: pkgsrc/games/einstein-puzzle

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan  4 09:34:45 UTC 2023

Modified Files:
        pkgsrc/games/einstein-puzzle: Makefile distinfo
        pkgsrc/games/einstein-puzzle/patches: patch-Makefile

Log Message:
einstein-puzzle: update to 2.2.

Switch to a maintained fork: lots of code cleanups.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/einstein-puzzle/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/einstein-puzzle/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/einstein-puzzle/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/games/einstein-puzzle/Makefile
diff -u pkgsrc/games/einstein-puzzle/Makefile:1.3 pkgsrc/games/einstein-puzzle/Makefile:1.4
--- pkgsrc/games/einstein-puzzle/Makefile:1.3   Wed Jul 18 00:06:16 2018
+++ pkgsrc/games/einstein-puzzle/Makefile       Wed Jan  4 09:34:44 2023
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2018/07/18 00:06:16 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2023/01/04 09:34:44 wiz Exp $
 
-DISTNAME=      einstein-puzzle-2.1.1
-PKGREVISION=   1
+DISTNAME=      einstein-puzzle-2.2
 CATEGORIES=    games
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=lksj/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=jordan-evens/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/lksj/einstein-puzzle/
+HOMEPAGE=      https://github.com/jordan-evens/einstein-puzzle/
 COMMENT=       Computer implementation of a puzzle invented by Albert Einstein
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES= c++03
+USE_LANGUAGES= c++11
+USE_TOOLS+=    gmake
 
 MAKE_FLAGS+=           PREFIX=${PREFIX}
 

Index: pkgsrc/games/einstein-puzzle/distinfo
diff -u pkgsrc/games/einstein-puzzle/distinfo:1.5 pkgsrc/games/einstein-puzzle/distinfo:1.6
--- pkgsrc/games/einstein-puzzle/distinfo:1.5   Tue Oct 26 10:43:55 2021
+++ pkgsrc/games/einstein-puzzle/distinfo       Wed Jan  4 09:34:44 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:43:55 nia Exp $
+$NetBSD: distinfo,v 1.6 2023/01/04 09:34:44 wiz Exp $
 
-BLAKE2s (einstein-puzzle-2.1.1.tar.gz) = ad1cf52ec0b09fd972f04e40fff767f154220ea6c6e475c018cbf165006b1d4d
-SHA512 (einstein-puzzle-2.1.1.tar.gz) = e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3
-Size (einstein-puzzle-2.1.1.tar.gz) = 1317979 bytes
-SHA1 (patch-Makefile) = b6678409a268f4141d1d6146127cbc922050d5c6
+BLAKE2s (einstein-puzzle-2.2.tar.gz) = d8d714423fa74f2148700f54a92a52eef385426e139e151cd39041b7f3d78c28
+SHA512 (einstein-puzzle-2.2.tar.gz) = 0a049192794f23521c29802e8c877a7d04300b3bbebfbb3d0d11f87459992e0568e664627e4f4330d56e454496bb196a593887ab383363b9c8d5e2d2f4f5976e
+Size (einstein-puzzle-2.2.tar.gz) = 647477 bytes
+SHA1 (patch-Makefile) = f1cda1051cc0e0284f1410a38ebf95957b207f55

Index: pkgsrc/games/einstein-puzzle/patches/patch-Makefile
diff -u pkgsrc/games/einstein-puzzle/patches/patch-Makefile:1.3 pkgsrc/games/einstein-puzzle/patches/patch-Makefile:1.4
--- pkgsrc/games/einstein-puzzle/patches/patch-Makefile:1.3     Thu Jul 13 12:25:01 2017
+++ pkgsrc/games/einstein-puzzle/patches/patch-Makefile Wed Jan  4 09:34:45 2023
@@ -1,33 +1,41 @@
-$NetBSD: patch-Makefile,v 1.3 2017/07/13 12:25:01 wiz Exp $
+$NetBSD: patch-Makefile,v 1.4 2023/01/04 09:34:45 wiz Exp $
 
 - Add DESTDIR support.
 - Support install(1) that does not create directories automatically.
 - Fix linking against freetype.
 - Honor LDFLAGS.
 
---- Makefile.orig      2015-12-03 16:45:59.000000000 +0000
+--- Makefile.orig      2021-06-27 13:07:44.000000000 +0000
 +++ Makefile
 @@ -6,6 +6,7 @@
+ # Modified 2009-02-09 by Tupone Alfredo <tupone%gentoo.org@localhost>
+ # Modified 2018-02-19 by Jordan Evens <jordan.evens%gmail.com@localhost>
  
- # installation prefix
- PREFIX=/usr/local
 +DESTDIR?=
+ # Einstein Puzzle is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+@@ -35,15 +36,9 @@ else
+       PREFIX=/usr/local
+       PROFILER=#-pg
+       LIBS=
+-      ifeq ($(UNAME_S),Linux)
+-              CXXFLAGS=-pipe -Wall $(OPTIMIZE) $(DEBUG) `sdl-config --cflags` -DPREFIX=L\"$(PREFIX)\" $(PROFILER)
+-              LNFLAGS=-pipe `sdl-config --libs` -lz -lSDL_mixer -lSDL_ttf -lfreetype $(PROFILER)
+-              INSTALL=install
+-      endif
+-      ifeq ($(UNAME_S),Darwin)
+-              CXXFLAGS=-pipe -Wall $(OPTIMIZE) $(DEBUG) -I/Library/Frameworks/SDL.framework/Headers/ -I/Library/Frameworks/SDL_ttf.framework/Headers/ 
-I/Library/Frameworks/SDL_mixer.framework/Headers/ -DPREFIX=L\"$(PREFIX)\" $(PROFILER)
+-              LNFLAGS=-pipe -framework Cocoa -framework SDL_ttf -framework SDL -framework SDL_mixer -lSDLmain -lz  $(PROFILER)
+-      endif
++      CXXFLAGS+=-pipe -Wall $(OPTIMIZE) $(DEBUG) `sdl-config --cflags` -DPREFIX=L\"$(PREFIX)\" $(PROFILER)
++      LNFLAGS=$(LDFLAGS) -pipe `sdl-config --libs` -lz -lSDL_mixer -lSDL_ttf -lfreetype $(PROFILER)
++      INSTALL=install
+ endif
  
- ########################################
- #
-@@ -16,8 +17,8 @@ PREFIX=/usr/local
- OPTIMIZE=#-O6 -march=pentium4 -mfpmath=sse -fomit-frame-pointer -funroll-loops
- PROFILER=#-pg
- DEBUG=#-ggdb
--CXXFLAGS=-pipe -Wall $(OPTIMIZE) $(DEBUG) `sdl-config --cflags` -DPREFIX=L\"$(PREFIX)\" $(PROFILER)
--LNFLAGS=-pipe -lSDL_ttf -lfreetype `sdl-config --libs` -lz -lSDL_mixer $(PROFILER)
-+CXXFLAGS+=-pipe -Wall $(OPTIMIZE) $(DEBUG) `sdl-config --cflags` -DPREFIX=L\"$(PREFIX)\" $(PROFILER)
-+LNFLAGS= $(LDFLAGS) ${COMPILER_RPATH_FLAG}${X11BASE}/lib -lSDL_ttf -lfreetype `sdl-config --libs` -lz -lSDL_mixer $(PROFILER)
- INSTALL=install
- 
- TARGET=einstein
-@@ -61,8 +62,10 @@ run: $(TARGET)
-       ./$(TARGET)
+ MKRES=mkres$(EXE)
+@@ -104,8 +99,10 @@ run: einstein
+       ./einstein
  
  install: $(TARGET)
 -      $(INSTALL) -s -D $(TARGET) $(PREFIX)/bin/$(TARGET)
@@ -36,6 +44,6 @@ $NetBSD: patch-Makefile,v 1.3 2017/07/13
 +      $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/einstein/res
 +      $(INSTALL) -s $(TARGET) $(DESTDIR)$(PREFIX)/bin/$(TARGET)
 +      $(INSTALL) einstein.res $(DESTDIR)$(PREFIX)/share/einstein/res/einstein.res
-       
- # DO NOT DELETE THIS LINE -- make depend depends on it.
  
+ $(DEPDIR)/%.d: ;
+ .PRECIOUS: $(DEPDIR)/%.d