Update enigma to 1.3.0

OK op@
This commit is contained in:
rsadowski 2022-07-10 12:20:53 +00:00
parent 7178bcae4e
commit 1f578b76ea
9 changed files with 1257 additions and 4124 deletions

View File

@ -1,42 +1,47 @@
COMMENT= Oxyd/Rock'n'Roll clone COMMENT= Oxyd/Rock'n'Roll clone
V= 1.21 V= 1.30
DISTNAME= enigma-${V} PKGNAME= enigma-${V}
REVISION= 3 DISTNAME= Enigma-${V}
CATEGORIES= games x11 CATEGORIES= games x11
HOMEPAGE= https://www.nongnu.org/enigma/ HOMEPAGE= https://github.com/Enigma-Game/Enigma/
# GPLv2 # GPLv2
PERMIT_PACKAGE= Yes PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} SDL SDL_image SDL_mixer SDL_ttf WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_image SDL2_mixer SDL2_ttf
WANTLIB += c curl enet intl m png xerces-c z zipios WANTLIB += c curl enet iconv intl m png xerces-c z
COMPILER = base-clang ports-gcc base-gcc # C++14
COMPILER = base-clang ports-gcc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enigma-game/} MASTER_SITES= https://github.com/Enigma-Game/Enigma/releases/download/${V}/
EXTRACT_SUFX = -src.tar.gz
WRKDIST= ${WRKDIR}/enigma-${V} WRKDIST= ${WRKDIR}/enigma-${V}
BUILD_DEPENDS = graphics/ImageMagick BUILD_DEPENDS = graphics/ImageMagick
RUN_DEPENDS= devel/desktop-file-utils \ RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+3,-guic x11/gtk+3,-guic
LIB_DEPENDS= archivers/zipios \
devel/sdl-image \ LIB_DEPENDS= devel/gettext,-runtime \
devel/sdl-mixer \ converters/libiconv \
devel/sdl-ttf \ devel/sdl2-image \
devel/sdl2-mixer \
devel/sdl2-ttf \
graphics/png \ graphics/png \
net/curl \ net/curl \
net/enet>=1.3.3 \ net/enet \
textproc/xerces-c>=3.2.1 textproc/xerces-c
USE_GMAKE= Yes USE_GMAKE= Yes
CONFIGURE_STYLE=gnu CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-system-enet CONFIGURE_ARGS= --with-system-enet
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lintl -liconv"
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (enigma-1.21.tar.gz) = 2HLPBn2OtWDTuxyxckWBS8Vqw5U64fEuIinI62+CzgE= SHA256 (Enigma-1.30-src.tar.gz) = rmS5H7wrEJcAcdDXjtW07enuOGjeLm6VaVRvxYQ3+K8=
SIZE (enigma-1.21.tar.gz) = 56409951 SIZE (Enigma-1.30-src.tar.gz) = 43653520

View File

@ -1,20 +0,0 @@
Index: configure
--- configure.orig
+++ configure
@@ -798,8 +798,6 @@ PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
LIBENET_CFLAGS
LIBENET_LIBS'
-ac_subdirs_all='lib-src/enet
-lib-src/zipios++'
# Initialize some variables set by options.
ac_init_help=
@@ -11123,7 +11121,6 @@ fi
-subdirs="$subdirs lib-src/zipios++"
ac_config_files="$ac_config_files Makefile m4/Makefile intl/Makefile data/Makefile data/gfx/Makefile data/gfx/flags25x15/Makefile data/gfx16/Makefile data/gfx32/Makefile data/gfx40/Makefile data/gfx48/Makefile data/gfx64/Makefile data/levels/Makefile data/levels/enigma_tutorial/Makefile data/levels/enigma_i/Makefile data/levels/enigma_ii/Makefile data/levels/enigma_iii/Makefile data/levels/enigma_iv/Makefile data/levels/enigma_v/Makefile data/levels/enigma_vi/Makefile data/levels/enigma_vii/Makefile data/levels/enigma_viii/Makefile data/levels/enigma_ix/Makefile data/levels/enigma_x/Makefile data/levels/enigma_cross/Makefile data/levels/enigma_esprit/Makefile data/levels/enigma_oxyd/Makefile data/levels/enigma_peroxyd/Makefile data/levels/enigma_oxydmagnum/Makefile data/levels/enigma_oxydextra/Makefile data/levels/enigma_experimental/Makefile data/levels/enigma_demolevels/Makefile data/levels/enigma_advent_10/Makefile data/levels/pentomino_i/Makefile data/levels/soko/Makefile data/levels/soko/skinner_microban01/Makefile data/levels/soko/skinner_microban02/Makefile data/levels/soko/skinner_microban03/Makefile data/levels/soko/skinner_microban04/Makefile data/levels/soko/skinner_microban05/Makefile data/levels/soko/skinner_sasquatch01/Makefile data/levels/soko/skinner_sasquatch02/Makefile data/levels/soko/skinner_sasquatch03/Makefile data/levels/soko/skinner_sasquatch04/Makefile data/levels/soko/skinner_sasquatch05/Makefile data/levels/soko/skinner_sasquatch06/Makefile data/levels/soko/skinner_sasquatch07/Makefile data/levels/soko/skinner_sasquatch08/Makefile data/levels/soko/skinner_sasquatch09/Makefile data/levels/soko/skinner_sasquatch10/Makefile data/levels/soko/skinner_sasquatch11/Makefile data/levels/soko/skinner_sasquatch12/Makefile data/levels/lib/Makefile data/levels/patches/Makefile data/fonts/Makefile data/music/Makefile data/music/game/Makefile data/music/menu/Makefile data/soundsets/Makefile data/soundsets/enigma/Makefile data/schemas/Makefile doc/Makefile doc/images/Makefile doc/images/flags25x15/Makefile doc/manual/Makefile doc/manual/images/Makefile doc/reference/Makefile doc/reference/images/Makefile etc/Makefile lib-src/Makefile lib-src/oxydlib/Makefile lib-src/lua/Makefile lib-src/enigma-core/Makefile src/Makefile tools/Makefile etc/enigma.spec etc/enigma.nsi etc/Info.plist po/Makefile.in"

View File

@ -1,12 +0,0 @@
Index: lib-src/Makefile.in
--- lib-src/Makefile.in.orig
+++ lib-src/Makefile.in
@@ -249,7 +249,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = oxydlib lua zipios++ enigma-core $(am__append_1)
+SUBDIRS = oxydlib lua enigma-core $(am__append_1)
all: all-recursive
.SUFFIXES:

View File

@ -1,20 +0,0 @@
Index: src/Makefile.in
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -155,7 +155,6 @@ am__DEPENDENCIES_1 =
enigma_DEPENDENCIES = $(top_builddir)/lib-src/enigma-core/libecl.a \
$(top_builddir)/lib-src/lua/liblua.a $(am__DEPENDENCIES_2) \
$(am__append_4) $(top_builddir)/lib-src/oxydlib/liboxyd.a \
- $(top_builddir)/lib-src/zipios++/src/libzipios.a \
$(am__DEPENDENCIES_3)
enigma_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(enigma_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -742,7 +741,7 @@ enigma_SOURCES = \
enigma_LDADD = @LIBINTL@ $(top_builddir)/lib-src/enigma-core/libecl.a \
$(top_builddir)/lib-src/lua/liblua.a $(am__append_3) \
$(am__append_4) $(top_builddir)/lib-src/oxydlib/liboxyd.a \
- $(top_builddir)/lib-src/zipios++/src/libzipios.a -lz \
+ -lzipios -lz \
$(mingw_ldadd) @SDL_LIBS@
#------------------ Packaging rules for Mac OSX ------------------------

View File

@ -1,12 +0,0 @@
Index: src/Value.cc
--- src/Value.cc.orig
+++ src/Value.cc
@@ -149,7 +149,7 @@ namespace enigma {
val.dval[0] = false;
break;
case OBJECT :
- val.dval[0] = (double) NULL;
+ val.dval[0] = 0;
break;
case NAMEDOBJECT:
ASSERT(false, XLevelRuntime, "Value: illegal type usage");

View File

@ -1,12 +0,0 @@
Index: src/lev/Proxy.cc
--- src/lev/Proxy.cc.orig
+++ 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;

View File

@ -1,2 +1,2 @@
Enigma is an addictive puzzle game reminiscent of Oxyd (on Atari) or Enigma is an addictive puzzle game reminiscent of Oxyd (on Atari) or
Rock'n'Roll (on Amiga). Rock'n'Roll (on Amiga).

File diff suppressed because it is too large Load Diff