- Update to 9.4g

5 files changed, 100 insertions, 34 deletions

diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index ad9561adb26a..bd88000aa93d 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	hyperrogue
-PORTVERSION=	8.3j
-PORTREVISION=	1
+PORTVERSION=	9.4g
+DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -41,8 +41,6 @@ OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/hr-icon.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico
-	@${MV} ${STAGEDIR}${DATADIR}/music/* ${STAGEDIR}${DATADIR}
-	@${RMDIR} ${STAGEDIR}${DATADIR}/music
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo
index 88cbd49d0466..611d820ab036 100644
--- a/games/hyperrogue/distinfo
+++ b/games/hyperrogue/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488028592
-SHA256 (zenorogue-hyperrogue-8.3j_GH0.tar.gz) = f6cf02cd22eeb59af96952ab5d63c6a67815e318b4906ddde54c37696b36f2d0
-SIZE (zenorogue-hyperrogue-8.3j_GH0.tar.gz) = 47350032
+TIMESTAMP = 1498498940
+SHA256 (zenorogue-hyperrogue-v9.4g_GH0.tar.gz) = 62b611185afc045f83c837e592ceadc28b27ef6ffb09ca1adc11cc79c22008cc
+SIZE (zenorogue-hyperrogue-v9.4g_GH0.tar.gz) = 57345565
diff --git a/games/hyperrogue/files/patch-Makefile.am b/games/hyperrogue/files/patch-Makefile.am
index 1738059c9b46..7b0e1677a4a5 100644
--- a/games/hyperrogue/files/patch-Makefile.am
+++ b/games/hyperrogue/files/patch-Makefile.am
@@ -1,20 +1,11 @@
---- Makefile.am.orig	2016-08-26 16:36:03 UTC
+--- Makefile.am.orig	2017-04-15 02:52:00 UTC
 +++ Makefile.am
-@@ -6,15 +6,14 @@ dist_doc_DATA = README.md
+@@ -6,7 +6,7 @@ dist_doc_DATA = README.md
  hyperrogue_SOURCES = hyper.cpp savepng.c
  
  # Some definitions used in graph.cpp
--hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\" -DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\" -O2
-+hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\" -DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\"
+-hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\" -DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\" -DSOUNDDESTDIR=\"$(pkgdatadir)/sounds/\" -O2
++hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\" -DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\" -DSOUNDDESTDIR=\"$(pkgdatadir)/sounds/\"
  
  # Musicdir
  musicdir=$(datadir)/hyperrogue/music
- dist_music_DATA = music/hr3-caves.ogg music/hr3-desert.ogg music/hr3-hell.ogg music/hr3-jungle.ogg music/hr3-mirror.ogg music/hr3-rlyeh.ogg music/hr3-crossroads.ogg music/hr3-graveyard.ogg music/hr3-icyland.ogg music/hr3-laboratory.ogg music/hr3-motion.ogg
- 
- music/hyperrogue-music.txt: hyperrogue
--	cp hyperrogue-music.txt music/hyperrogue-music.txt
--	sed -i 's+music+$(pkgdatadir)/music+g' music/hyperrogue-music.txt
-+	sed 's+music+$(pkgdatadir)/music+g' <hyperrogue-music.txt >music/hyperrogue-music.txt
- 
- # Langen binary rules
- noinst_PROGRAMS = langen
diff --git a/games/hyperrogue/files/patch-graph.cpp b/games/hyperrogue/files/patch-sound.cpp
index d5049e1401b0..5e9487db26ca 100644
--- a/games/hyperrogue/files/patch-graph.cpp
+++ b/games/hyperrogue/files/patch-sound.cpp
@@ -1,6 +1,6 @@
---- graph.cpp.orig	2016-08-26 16:36:03 UTC
-+++ graph.cpp
-@@ -5595,7 +5595,7 @@ bool loadMusicInfo(string dir) {
+--- sound.cpp.orig	2017-04-15 02:52:00 UTC
++++ sound.cpp
+@@ -122,7 +122,7 @@ bool loadMusicInfo(string dir) {
      for(int i=0; i<size(dir); i++) if(dir[i] == '/' || dir[i] == '\\')
        dir2 = dir.substr(0, i+1);
      char buf[1000];
diff --git a/games/hyperrogue/pkg-plist b/games/hyperrogue/pkg-plist
index 0a67c5f12ab0..1fe5de9ea51e 100644
--- a/games/hyperrogue/pkg-plist
+++ b/games/hyperrogue/pkg-plist
@@ -1,15 +1,92 @@
 bin/hyperrogue
 %%DATADIR%%/DejaVuSans-Bold.ttf
-%%DATADIR%%/hr3-caves.ogg
-%%DATADIR%%/hr3-crossroads.ogg
-%%DATADIR%%/hr3-desert.ogg
-%%DATADIR%%/hr3-graveyard.ogg
-%%DATADIR%%/hr3-hell.ogg
-%%DATADIR%%/hr3-icyland.ogg
-%%DATADIR%%/hr3-jungle.ogg
-%%DATADIR%%/hr3-laboratory.ogg
-%%DATADIR%%/hr3-mirror.ogg
-%%DATADIR%%/hr3-motion.ogg
-%%DATADIR%%/hr3-rlyeh.ogg
 %%DATADIR%%/hyperrogue-music.txt
+%%DATADIR%%/music/hr3-caves.ogg
+%%DATADIR%%/music/hr3-crossroads.ogg
+%%DATADIR%%/music/hr3-desert.ogg
+%%DATADIR%%/music/hr3-graveyard.ogg
+%%DATADIR%%/music/hr3-hell.ogg
+%%DATADIR%%/music/hr3-icyland.ogg
+%%DATADIR%%/music/hr3-jungle.ogg
+%%DATADIR%%/music/hr3-laboratory.ogg
+%%DATADIR%%/music/hr3-mirror.ogg
+%%DATADIR%%/music/hr3-motion.ogg
+%%DATADIR%%/music/hr3-rlyeh.ogg
+%%DATADIR%%/sounds/bull.ogg
+%%DATADIR%%/sounds/click.ogg
+%%DATADIR%%/sounds/closegate.ogg
+%%DATADIR%%/sounds/credits.txt
+%%DATADIR%%/sounds/die-bomberbird.ogg
+%%DATADIR%%/sounds/die-fairy.ogg
+%%DATADIR%%/sounds/die-prince.ogg
+%%DATADIR%%/sounds/die-princess.ogg
+%%DATADIR%%/sounds/die-troll.ogg
+%%DATADIR%%/sounds/die-vinebeast.ogg
+%%DATADIR%%/sounds/die-vinespirit.ogg
+%%DATADIR%%/sounds/dzia-prince.ogg
+%%DATADIR%%/sounds/dzia-princess.ogg
+%%DATADIR%%/sounds/explosion.ogg
+%%DATADIR%%/sounds/fire.ogg
+%%DATADIR%%/sounds/heal-prince.ogg
+%%DATADIR%%/sounds/heal-princess.ogg
+%%DATADIR%%/sounds/hit-axe1.ogg
+%%DATADIR%%/sounds/hit-axe2.ogg
+%%DATADIR%%/sounds/hit-axe3.ogg
+%%DATADIR%%/sounds/hit-crush1.ogg
+%%DATADIR%%/sounds/hit-crush2.ogg
+%%DATADIR%%/sounds/hit-crush3.ogg
+%%DATADIR%%/sounds/hit-orbsword.ogg
+%%DATADIR%%/sounds/hit-prince.ogg
+%%DATADIR%%/sounds/hit-princess.ogg
+%%DATADIR%%/sounds/hit-rose.ogg
+%%DATADIR%%/sounds/hit-sword1.ogg
+%%DATADIR%%/sounds/hit-sword2.ogg
+%%DATADIR%%/sounds/hit-sword3.ogg
+%%DATADIR%%/sounds/message-roar.ogg
+%%DATADIR%%/sounds/message-troll.ogg
+%%DATADIR%%/sounds/mousesqueak.ogg
+%%DATADIR%%/sounds/necromancy.ogg
+%%DATADIR%%/sounds/nervous.ogg
+%%DATADIR%%/sounds/opengate.ogg
+%%DATADIR%%/sounds/orb-frog.ogg
+%%DATADIR%%/sounds/orb-mind.ogg
+%%DATADIR%%/sounds/orb-ranged.ogg
+%%DATADIR%%/sounds/orb-teleport.ogg
+%%DATADIR%%/sounds/pickup-gem.ogg
+%%DATADIR%%/sounds/pickup-gold.ogg
+%%DATADIR%%/sounds/pickup-key.ogg
+%%DATADIR%%/sounds/pickup-mirror.ogg
+%%DATADIR%%/sounds/pickup-orb.ogg
+%%DATADIR%%/sounds/pickup-potion.ogg
+%%DATADIR%%/sounds/pickup-scroll.ogg
+%%DATADIR%%/sounds/pickup-speed.ogg
+%%DATADIR%%/sounds/pickup-winter.ogg
+%%DATADIR%%/sounds/pickup-yendor.ogg
+%%DATADIR%%/sounds/seen-air.ogg
+%%DATADIR%%/sounds/seen-cultist.ogg
+%%DATADIR%%/sounds/seen-cultistfire.ogg
+%%DATADIR%%/sounds/seen-cultistleader.ogg
+%%DATADIR%%/sounds/seen-dragon.ogg
+%%DATADIR%%/sounds/seen-eagle.ogg
+%%DATADIR%%/sounds/seen-earth.ogg
+%%DATADIR%%/sounds/seen-fairy.ogg
+%%DATADIR%%/sounds/seen-gardener.ogg
+%%DATADIR%%/sounds/seen-ghost.ogg
+%%DATADIR%%/sounds/seen-kraken.ogg
+%%DATADIR%%/sounds/seen-necromancer.ogg
+%%DATADIR%%/sounds/seen-rosebeauty.ogg
+%%DATADIR%%/sounds/seen-sandworm.ogg
+%%DATADIR%%/sounds/seen-skeleton.ogg
+%%DATADIR%%/sounds/seen-snake.ogg
+%%DATADIR%%/sounds/seen-troll.ogg
+%%DATADIR%%/sounds/seen-vizier.ogg
+%%DATADIR%%/sounds/seen-water.ogg
+%%DATADIR%%/sounds/seen-woof.ogg
+%%DATADIR%%/sounds/speak-prince.ogg
+%%DATADIR%%/sounds/speak-princess.ogg
+%%DATADIR%%/sounds/splash1.ogg
+%%DATADIR%%/sounds/splash2.ogg
+%%DATADIR%%/sounds/storm.ogg
+%%DATADIR%%/sounds/tada.ogg
+%%DATADIR%%/sounds/trapdoor.ogg
 share/pixmaps/hyperrogue.ico