git: 295016f09df4 - main - games/enigma: update to 1.30

Dmitry Marakasov amdmi3 at FreeBSD.org
Thu Sep 9 19:19:59 UTC 2021 

The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=295016f09df4b77252991dc72e80adeafde9e83d

commit 295016f09df4b77252991dc72e80adeafde9e83d
Author:     Dmitry Marakasov <amdmi3 at FreeBSD.org>
AuthorDate: 2021-09-05 17:51:25 +0000
Commit:     Dmitry Marakasov <amdmi3 at FreeBSD.org>
CommitDate: 2021-09-09 19:13:43 +0000

    games/enigma: update to 1.30
---
 games/enigma/Makefile                            | 24 ++++++++++++++++--------
 games/enigma/distinfo                            |  5 +++--
 games/enigma/files/patch-src_Value.cc            | 15 ---------------
 games/enigma/files/patch-src_gui_OptionsMenu.cc  | 11 +++++++++++
 games/enigma/files/patch-src_items_Meditation.cc | 11 -----------
 games/enigma/files/patch-src_lev_Proxy.cc        | 11 -----------
 games/enigma/pkg-plist                           | 19 -------------------
 7 files changed, 30 insertions(+), 66 deletions(-)

diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 9a065d54fcaa..26758c47be45 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -1,9 +1,8 @@
 # Created by: Edwin Groothuis
 
 PORTNAME=	enigma
-PORTVERSION=	1.21
+PORTVERSION=	1.30
 CATEGORIES=	games
-MASTER_SITES=	SF/enigma-game/Release%20${PORTVERSION}
 
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	Reimplementation of Oxyd, a puzzle game
@@ -17,10 +16,15 @@ LIB_DEPENDS=	libxerces-c.so.3:textproc/xerces-c3 \
 		libcurl.so:ftp/curl
 BUILD_DEPENDS=	convert:graphics/ImageMagick6
 
-USES=		gmake localbase pkgconfig sdl
-USE_SDL=	image mixer sdl ttf
+USE_GITHUB=	yes
+GH_ACCOUNT=	Enigma-Game
+GH_PROJECT=	Enigma
+
+USES=		autoreconf:build gettext gmake iconv localbase pkgconfig sdl
 GNU_CONFIGURE=	yes
+USE_SDL=	sdl2 image2 mixer2 ttf2
 CONFIGURE_ARGS=	--with-system-enet
+LDFLAGS+=	-lintl
 
 SUB_FILES=	pkg-message
 
@@ -30,14 +34,18 @@ PORTDATA=	*
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=	gettext
+DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
+
 NLS_CONFIGURE_ENABLE=nls
 
+pre-configure:
+	@cd ${CONFIGURE_WRKSRC} && ${SH} autogen.sh
+
+post-patch-DOCS-off:
+	@${REINPLACE_CMD} -e '/SUBDIRS =/d' ${WRKSRC}/doc/Makefile.am
+
 post-patch:
 	@${REINPLACE_CMD} -e '/Exec=/s,enigma,${PREFIX}/bin/enigma,g' \
 		${WRKSRC}/etc/enigma.desktop
 
-post-install:
-	@${RM} ${STAGEDIR}${DOCSDIR}/COPYING
-
 .include <bsd.port.mk>
diff --git a/games/enigma/distinfo b/games/enigma/distinfo
index 5bb3f91361fe..5a5f4529ad3e 100644
--- a/games/enigma/distinfo
+++ b/games/enigma/distinfo
@@ -1,2 +1,3 @@
-SHA256 (enigma-1.21.tar.gz) = d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01
-SIZE (enigma-1.21.tar.gz) = 56409951
+TIMESTAMP = 1630327026
+SHA256 (Enigma-Game-Enigma-1.30_GH0.tar.gz) = 99af962feec553dd7e794827494a6a23428a69f83d6915fcaa25f00531357cac
+SIZE (Enigma-Game-Enigma-1.30_GH0.tar.gz) = 78948320
diff --git a/games/enigma/files/patch-src_Value.cc b/games/enigma/files/patch-src_Value.cc
deleted file mode 100644
index 885c8f0c78fc..000000000000
--- a/games/enigma/files/patch-src_Value.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/Value.cc.orig	2017-09-03 15:39:37 UTC
-+++ src/Value.cc
-@@ -146,10 +146,10 @@ namespace enigma {
-                 val.str[0] = 0;
-                 break;
-             case BOOL :
--                val.dval[0] = false;
-+                val.dval[0] = 0;
-                 break;
-             case OBJECT :
--                val.dval[0] = (double) NULL;
-+                val.dval[0] = 0;
-                 break;
-             case NAMEDOBJECT:
-                 ASSERT(false, XLevelRuntime, "Value: illegal type usage");
diff --git a/games/enigma/files/patch-src_gui_OptionsMenu.cc b/games/enigma/files/patch-src_gui_OptionsMenu.cc
new file mode 100644
index 000000000000..8cc55174d179
--- /dev/null
+++ b/games/enigma/files/patch-src_gui_OptionsMenu.cc
@@ -0,0 +1,11 @@
+--- src/gui/OptionsMenu.cc.orig	2021-08-31 07:45:36 UTC
++++ src/gui/OptionsMenu.cc
+@@ -18,6 +18,8 @@
+ 
+ #include "gui/OptionsMenu.hh"
+ 
++#include <libintl.h>
++
+ #include <cassert>
+ #include <sstream>
+ 
diff --git a/games/enigma/files/patch-src_items_Meditation.cc b/games/enigma/files/patch-src_items_Meditation.cc
deleted file mode 100644
index 71d2f240ae07..000000000000
--- a/games/enigma/files/patch-src_items_Meditation.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/items/Meditation.cc.orig	2014-12-19 21:24:33 UTC
-+++ src/items/Meditation.cc
-@@ -27,7 +27,7 @@ namespace enigma {
- 
-     Meditation::Meditation(int initState) {
-         state = initState;
--        //whiteball = NULL;
-+        whiteball = NULL;
-     }
- 
-     std::string Meditation::getClass() const {
diff --git a/games/enigma/files/patch-src_lev_Proxy.cc b/games/enigma/files/patch-src_lev_Proxy.cc
deleted file mode 100644
index 4ba1676e9f75..000000000000
--- a/games/enigma/files/patch-src_lev_Proxy.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lev/Proxy.cc.orig	2017-09-03 15:54:50 UTC
-+++ src/lev/Proxy.cc
-@@ -933,7 +933,7 @@ namespace enigma { namespace lev {
-                     } else if (haveLocalCopy) {
-                         // plain file
-                         basic_ifstream<char> ifs(absExtPath.c_str(), ios::binary | ios::in);
--                        if (ifs != NULL)
-+                        if (ifs)
-                             Readfile(ifs, extCode);
-                         else
-                             haveLocalCopy = false;
diff --git a/games/enigma/pkg-plist b/games/enigma/pkg-plist
index 82abc41d8cdc..cccf8f660e96 100644
--- a/games/enigma/pkg-plist
+++ b/games/enigma/pkg-plist
@@ -3,23 +3,4 @@ man/man6/enigma.6.gz
 share/appdata/enigma.appdata.xml
 share/applications/enigma.desktop
 share/icons/hicolor/48x48/apps/enigma.png
-%%NLS%%share/locale/be/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/da/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/de/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/el/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/es/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/gd/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/it/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/enigma.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/enigma.mo
 share/pixmaps/enigma.png

More information about the dev-commits-ports-all mailing list