Index: head/games/enygma/Makefile =================================================================== --- head/games/enygma/Makefile (revision 457133) +++ head/games/enygma/Makefile (revision 457134) @@ -1,22 +1,22 @@ # Created by: Wouter Reckman # $FreeBSD$ PORTNAME= enygma PORTVERSION= 1.04 CATEGORIES= games MASTER_SITES= http://www.chiark.greenend.org.uk/~sgtatham/enigma/ DISTNAME= enigma-${DISTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Text-based puzzle game LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE -USES= ncurses +USES= localbase ncurses GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var/games -CPPFLAGS+= -I${NCURSESINC} -I${LOCALBASE}/include +CPPFLAGS+= -I${NCURSESINC} .include Index: head/games/enygma/files/patch-Makefile.in =================================================================== --- head/games/enygma/files/patch-Makefile.in (revision 457133) +++ head/games/enygma/files/patch-Makefile.in (revision 457134) @@ -1,38 +1,38 @@ ---- ./Makefile.in.orig 2004-02-29 09:42:32.000000000 -0500 -+++ ./Makefile.in 2014-08-02 10:45:11.000000000 -0400 -@@ -9,10 +9,12 @@ +--- Makefile.in.orig 2004-02-29 14:42:32 UTC ++++ Makefile.in +@@ -9,10 +9,12 @@ mandir = @mandir@ datadir = @datadir@ localstatedir = @localstatedir@ +PACKAGE_NAME = enygma + CC = @CC@ CFLAGS = @CFLAGS@ @GCCFLAGS@ -I$(srcdir) -I. \ - -DLEVELDIR=\"@datadir@/enigma/\" \ - -DSAVEDIR=\"@localstatedir@/enigma/\" \ + -DLEVELDIR=\"@datadir@/$(PACKAGE_NAME)/\" \ + -DSAVEDIR=\"@localstatedir@/$(PACKAGE_NAME)/\" \ @CURSES@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -@@ -32,15 +34,13 @@ +@@ -32,15 +34,13 @@ enigma: $(ENIGMA) $(CC) $(LDFLAGS) -o enigma $(ENIGMA) $(LIBS) install: enigma - $(INSTALL_PROGRAM) enigma $(bindir)/enigma - -chown root.games $(bindir)/enigma && chmod 2755 $(bindir)/enigma - #$(INSTALL_DATA) $(srcdir)/enigma.1 $(mandir)/man1/enigma.1 - mkdir -p $(datadir)/enigma + $(INSTALL_PROGRAM) enigma $(DESTDIR)$(bindir)/$(PACKAGE_NAME) + #$(INSTALL_DATA) $(srcdir)/enigma.1 $(DESTDIR)$(mandir)/man1/$(PACKAGE_NAME).1 + mkdir -p $(DESTDIR)$(datadir)/$(PACKAGE_NAME) for i in $(srcdir)/levels/*.set $(srcdir)/levels/*.level; do \ - $(INSTALL_DATA) $$i $(datadir)/enigma; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/$(PACKAGE_NAME); \ done - mkdir -p $(localstatedir)/enigma - -chown root.games $(localstatedir)/enigma && chmod 2770 $(localstatedir)/enigma + mkdir -p $(DESTDIR)$(localstatedir)/$(PACKAGE_NAME) clean: rm -f *.o enigma Index: head/games/enygma/files/patch-engine.c =================================================================== --- head/games/enygma/files/patch-engine.c (revision 457133) +++ head/games/enygma/files/patch-engine.c (revision 457134) @@ -1,11 +1,11 @@ ---- engine.c.orig Sun Sep 14 23:23:42 2008 -+++ engine.c Sun Sep 14 22:06:32 2008 -@@ -181,7 +181,7 @@ +--- engine.c.orig 2004-02-29 14:39:00 UTC ++++ engine.c +@@ -181,7 +181,7 @@ gamestate *make_move (gamestate *state, * process teleporters */ if (i == '#') { - int x, y; + int x, y = 0; /* * First find the other teleporter. Index: head/games/enygma/files/patch-main.c =================================================================== --- head/games/enygma/files/patch-main.c (revision 457133) +++ head/games/enygma/files/patch-main.c (revision 457134) @@ -1,19 +1,19 @@ ---- main.c.orig Sun Sep 14 23:23:51 2008 -+++ main.c Sun Sep 14 22:13:48 2008 +--- main.c.orig 2004-02-28 10:01:16 UTC ++++ main.c @@ -11,6 +11,7 @@ #include #include +#include #include "enigma.h" -@@ -131,7 +132,7 @@ +@@ -131,7 +132,7 @@ int main(int argc, char **argv) { char *fname; char *sequence; gamestate **movie; - int nframes; + int nframes = 0; int frame; char msg[80]; int km; Index: head/games/enygma/files/patch-memory.c =================================================================== --- head/games/enygma/files/patch-memory.c (revision 457133) +++ head/games/enygma/files/patch-memory.c (revision 457134) @@ -1,10 +1,10 @@ ---- memory.c.orig Sun Sep 14 23:24:09 2008 -+++ memory.c Sun Sep 14 21:58:40 2008 +--- memory.c.orig 2004-02-28 10:01:16 UTC ++++ memory.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "enigma.h" Index: head/games/enygma/files/patch-screen.c =================================================================== --- head/games/enygma/files/patch-screen.c (revision 457133) +++ head/games/enygma/files/patch-screen.c (revision 457134) @@ -1,10 +1,10 @@ ---- screen.c.orig Sun Sep 14 23:24:17 2008 -+++ screen.c Sun Sep 14 22:01:21 2008 +--- screen.c.orig 2004-02-28 10:01:16 UTC ++++ screen.c @@ -13,6 +13,7 @@ */ #include +#include #ifdef CURSES_HDR # include CURSES_HDR #else Index: head/games/enygma/pkg-descr =================================================================== --- head/games/enygma/pkg-descr (revision 457133) +++ head/games/enygma/pkg-descr (revision 457134) @@ -1,7 +1,7 @@ Enigma is a puzzle game involving falling blocks, exploding bombs, and pushing stuff around. It has elements of Boulderdash and elements of Sokoban, and anybody old enough to remember XOR on the Spectrum will see large elements of that in it. The port and executable have been named 'enygma' to avoid a name collision. -WWW: http://www.chiark.greenend.org.uk/~sgtatham/enigma/ +WWW: https://www.chiark.greenend.org.uk/~sgtatham/enigma/