- Update to 1.0.4

4 files changed, 13 insertions, 53 deletions

diff --git a/games/wordwarvi/Makefile b/games/wordwarvi/Makefile
index b3a738463fc3..2ebcec2970ac 100644
--- a/games/wordwarvi/Makefile
+++ b/games/wordwarvi/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wordwarvi
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
@@ -18,11 +18,12 @@ GH_ACCOUNT=	smcameron
 
 USES=		gmake gnome pkgconfig
 USE_GNOME=	gtk20
+MAKE_ENV=	SOURCE_DATE_EPOCH=0 BUILD_CC=${CC} BINDIR=${PREFIX}/bin
 
 PORTDOCS=	AAA_HOW_TO_MAKE_NEW_LEVELS.txt AUTHORS README changelog.txt
 PORTDATA=	*
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man6/${PORTNAME}.6.gz
+		share/man/man6/${PORTNAME}.6.gz
 
 OPTIONS_DEFINE=	SOUND DOCS
 OPTIONS_DEFAULT=SOUND
diff --git a/games/wordwarvi/distinfo b/games/wordwarvi/distinfo
index 408101dfe9ce..dee628e8d1dd 100644
--- a/games/wordwarvi/distinfo
+++ b/games/wordwarvi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475776055
-SHA256 (smcameron-wordwarvi-v1.0.2_GH0.tar.gz) = 361d15af6edbe6db032db24de54e8f489a05b230572a8793b9889e2b8308a7ad
-SIZE (smcameron-wordwarvi-v1.0.2_GH0.tar.gz) = 8814650
+TIMESTAMP = 1612314079
+SHA256 (smcameron-wordwarvi-v1.0.4_GH0.tar.gz) = 5500aa7f2c2b89ddf3d405a5fbf801b2a19ad60b1b83691cd894b7c12520b130
+SIZE (smcameron-wordwarvi-v1.0.4_GH0.tar.gz) = 8814850
diff --git a/games/wordwarvi/files/patch-Makefile b/games/wordwarvi/files/patch-Makefile
index 8b7dac0f8bd3..c10fff19bb05 100644
--- a/games/wordwarvi/files/patch-Makefile
+++ b/games/wordwarvi/files/patch-Makefile
@@ -1,24 +1,13 @@
---- Makefile.orig	2016-03-11 15:16:11 UTC
+--- Makefile.orig	2021-02-01 13:48:17 UTC
 +++ Makefile
-@@ -1,6 +1,6 @@
--PREFIX=/usr
-+PREFIX?=/usr
+@@ -1,5 +1,5 @@
+ PREFIX?=/usr
+-BINDIR=${PREFIX}/games
++BINDIR?=${PREFIX}/games
  DATADIR=${PREFIX}/share/wordwarvi
--MANDIR?=${PREFIX}/share/man
-+MANDIR?=${PREFIX}/man
+ MANDIR?=${PREFIX}/share/man
  MANPAGEDIR=${MANDIR}/man6
- 
- SCREENSAVERFLAG=
-@@ -45,7 +45,7 @@ OPENLASELIBDIR=
- endif
- 
- CC ?= gcc
--BUILD_CC ?= gcc
-+BUILD_CC ?= ${CC}
- 
- # DEBUG=-g
- # DEBUG=
-@@ -54,7 +54,8 @@ BUILD_CC ?= gcc
+@@ -56,7 +56,8 @@ BUILD_CC ?= gcc
  #OPTIMIZE_FLAG=
  # OPTIMIZE_FLAG=-O3
  #OPTIMIZE_FLAG=-O3 -pedantic -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
@@ -28,16 +17,3 @@
  OPTIMIZE_FLAG = ${CFLAGS} ${CPPFLAGS}
  WARNFLAG=-pedantic -W -Wall
  
-@@ -116,10 +117,10 @@ wordwarvi.6.gz:	wordwarvi.6
- 	gzip -c wordwarvi.6 > wordwarvi.6.gz
- 
- install: wordwarvi wordwarvi.6.gz
--	mkdir -p $(DESTDIR)$(PREFIX)/games
-+	mkdir -p $(DESTDIR)$(PREFIX)/bin
- 	mkdir -p $(DESTDIR)$(DATADIR)/sounds
- 	mkdir -p $(DESTDIR)$(MANPAGEDIR)
--	install -p -m 755 wordwarvi $(DESTDIR)$(PREFIX)/games
-+	install -p -m 755 wordwarvi $(DESTDIR)$(PREFIX)/bin
- 	install -p -m 644 sounds/*.ogg $(DESTDIR)$(DATADIR)/sounds
- 	install -p -m 644 wordwarvi.6.gz $(DESTDIR)$(MANPAGEDIR)
- 
diff --git a/games/wordwarvi/files/patch-wordwarvi.c b/games/wordwarvi/files/patch-wordwarvi.c
deleted file mode 100644
index 2fbcc69903f7..000000000000
--- a/games/wordwarvi/files/patch-wordwarvi.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- wordwarvi.c.orig	2016-03-11 15:16:11 UTC
-+++ wordwarvi.c
-@@ -11559,12 +11559,14 @@ void start_level()
- 	srandom(level.random_seed);
- 	generate_terrain(&terrain);
- 
-+#if 0
- 	add_buildings(&terrain);/* Some FreeBSD users report that */
- 				/*add_buildings() causes crashes. */
- 				/* Commenting this out on FreeBSD */
- 				/* may help, but, no buildings. */
- 				/* I've looked at the code, but */
- 				/* don't see anything wrong with it. */
-+#endif
- 	add_humanoids(&terrain);
- 	add_bridges(&terrain);
- 	add_socket(&terrain);