5 files changed, 233 insertions, 200 deletions

diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 9e6be8507465..298c512b836b 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -6,28 +6,59 @@
 #
 
 PORTNAME=	heroes
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		${DATADISTNAME}${EXTRACT_SUFX} \
+		${SOUNDISTNAME}${EXTRACT_SUFX} \
+		${MUSICDISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	SDL-1.1.2:${PORTSDIR}/devel/sdl-devel \
-		mikmod.2:${PORTSDIR}/audio/libmikmod \
+LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
+DATAVERSION=	1.0
+SOUNDVERSION=	1.0
+MUSICVERSION=	1.0
+DATADISTNAME=	${PORTNAME}-data-${DATAVERSION}
+SOUNDISTNAME=	${PORTNAME}-sound-effects-${SOUNDVERSION}
+MUSICDISTNAME=	${PORTNAME}-sound-tracks-${MUSICVERSION}
+DATASRC=	${WRKDIR}/${DATADISTNAME}
+SOUNDSRC=	${WRKDIR}/${SOUNDISTNAME}
+MUSICSRC=	${WRKDIR}/${MUSICDISTNAME}
+INSTPREFIX=	${PREFIX}/share/heroes
+
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-sdl_mixer=${LOCALBASE}
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib -lgnugetopt"
+		LIBS="-L${LOCALBASE}/lib -lgnugetopt -pthread -lsmpeg -lgcc_r"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN6=		heroes.6
 
+pre-patch:
+	@for dir in ${DATASRC} ${SOUNDSRC} ${MUSICSRC}; do \
+		find $${dir} -name "Makefile*" | xargs ${RM}; \
+	done
+	@${RM} -f ${WRKSRC}/lib/getopt.h
+	@${LN} -sf ${LOCALBASE}/include/getopt.h ${WRKSRC}/lib/getopt.h
+
 post-install:
+.for dir in levels pics tilesets
+	${MKDIR} ${INSTPREFIX}/${dir}
+	${INSTALL_DATA} ${DATASRC}/${dir}/* ${INSTPREFIX}/${dir}
+.endfor
+	${MKDIR} ${INSTPREFIX}/sfx
+	${INSTALL_DATA} ${SOUNDSRC}/*.wav ${SOUNDSRC}/sfx.conf ${INSTPREFIX}/sfx
+	${MKDIR} ${INSTPREFIX}/mod
+	${INSTALL_DATA} ${MUSICSRC}/*.xm ${MUSICSRC}/sound.conf ${INSTPREFIX}/mod
 	@install-info --section="X11 Games" \
 		--entry="* heroes: (heroes).           Game of yore similar to the "Tron" and "Nibbles"" \
 		${PREFIX}/info/heroes.info ${PREFIX}/info/dir
diff --git a/games/heroes/distinfo b/games/heroes/distinfo
index f1e4ad2ae3c1..22115f0027a7 100644
--- a/games/heroes/distinfo
+++ b/games/heroes/distinfo
@@ -1 +1,4 @@
-MD5 (heroes-0.5.tar.gz) = fb9964a683d8df8129cd1ef7e5ee738b
+MD5 (heroes-0.6.tar.gz) = 83251d6253df55b27ae4b7e72579faec
+MD5 (heroes-data-1.0.tar.gz) = b8efaf361c6258713fc8778039b3b3ae
+MD5 (heroes-sound-effects-1.0.tar.gz) = f4defb80baf765fceac034a408f7ad2e
+MD5 (heroes-sound-tracks-1.0.tar.gz) = bcde6137a4b21b7395fd3d84b42b7888
diff --git a/games/heroes/files/patch-aa b/games/heroes/files/patch-aa
index bc4a81bb6383..5985845e3439 100644
--- a/games/heroes/files/patch-aa
+++ b/games/heroes/files/patch-aa
@@ -1,11 +1,18 @@
---- configure	2000/08/15 10:44:11	1.1
-+++ configure	2000/08/15 10:44:29
-@@ -2323,7 +2323,7 @@
+--- configure	2000/09/28 13:06:54	1.1
++++ configure	2000/09/28 13:07:43
+@@ -894,10 +894,11 @@
  
+ # The aliases save the names the user supplied, while $host etc.
+ # will get canonicalized.
+-test -n "$target_alias" &&
+-  test "$program_prefix$program_suffix$program_transform_name" = \
+-    NONENONEs,x,x, &&
+-  program_prefix=${target_alias}-
++# I  H A T E  A U T O C R A P!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
++#test -n "$target_alias" &&
++#  test "$program_prefix$program_suffix$program_transform_name" = \
++#    NONENONEs,x,x, &&
++#  program_prefix=${target_alias}-
  
- 
--if test ${musicdir}x = x; then
-+if test "${musicdir}"x = x; then
-   NOSOUND_TRUE=
-   NOSOUND_FALSE='#'
- else
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
diff --git a/games/heroes/files/patch-ae b/games/heroes/files/patch-ae
new file mode 100644
index 000000000000..412aac8d1495
--- /dev/null
+++ b/games/heroes/files/patch-ae
@@ -0,0 +1,20 @@
+--- lib/Makefile.in	2000/09/28 12:23:33	1.1
++++ lib/Makefile.in	2000/09/28 12:24:16
+@@ -109,7 +109,7 @@
+ INCLUDES = -I../src
+ 
+ # These files are always compiled
+-libheroes_a_SOURCES =  getopt.c getopt1.c getshline.c
++libheroes_a_SOURCES =  getshline.c
+ 
+ 
+ # Additional files to compile, when functions are missing.
+@@ -125,7 +125,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libheroes_a_OBJECTS =  getopt.o getopt1.o getshline.o
++libheroes_a_OBJECTS =  getshline.o
+ AR = ar
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/games/heroes/pkg-plist b/games/heroes/pkg-plist
index 4a22ac86779b..de6fe6003358 100644
--- a/games/heroes/pkg-plist
+++ b/games/heroes/pkg-plist
@@ -3,142 +3,102 @@ bin/heroes
 info/heroes.info
 @exec install-info --section="X11 Games" --entry="* heroes: (heroes).           Game of yore similar to the "Tron" and "Nibbles"" %D/info/heroes.info %D/info/dir
 share/heroes/etc/heroesrc
-share/heroes/extralvl/!bug!.lvl
-share/heroes/extralvl/butchery.lvl
-share/heroes/extralvl/dede.lvl
-share/heroes/extralvl/doomed.lvl
-share/heroes/extralvl/edges.lvl
-share/heroes/extralvl/eidola.lvl
-share/heroes/extralvl/eraser.lvl
-share/heroes/extralvl/gateway.lvl
-share/heroes/extralvl/hellfire.lvl
-share/heroes/extralvl/illusion.lvl
-share/heroes/extralvl/maze.lvl
-share/heroes/extralvl/meteor.lvl
-share/heroes/extralvl/nivo32.lvl
-share/heroes/extralvl/nivo63.lvl
-share/heroes/extralvl/nivo82.lvl
-share/heroes/extralvl/nivo83.lvl
-share/heroes/extralvl/nivo84.lvl
-share/heroes/extralvl/orchard.lvl
-share/heroes/extralvl/outline.lvl
-share/heroes/extralvl/passage.lvl
-share/heroes/extralvl/repeater.lvl
-share/heroes/extralvl/sandman.lvl
-share/heroes/extralvl/tension.lvl
-share/heroes/extralvl/tmp.lvl
-share/heroes/hedit/edit.pcx
-share/heroes/hedit/editp01.pcx
-share/heroes/hedit/editp02.pcx
-share/heroes/hedit/editp03.pcx
-share/heroes/hedit/editp04.pcx
-share/heroes/hedit/editp05.pcx
-share/heroes/hedit/editp06.pcx
-share/heroes/hedit/editp07.pcx
-share/heroes/hedit/editp08.pcx
-share/heroes/hedit/editp09.pcx
-share/heroes/hedit/editp10.pcx
-share/heroes/hedit/newlevel.pcx
-share/heroes/intro/erase.pcx
-share/heroes/intro/heroes.pcx
-share/heroes/intro/intro.pcx
-share/heroes/intro/olympus.pcx
-share/heroes/intro/start.pcx
-share/heroes/level/level.lst
-share/heroes/level/niv010.lvl
-share/heroes/level/niv011.lvl
-share/heroes/level/niv012.lvl
-share/heroes/level/niv013.lvl
-share/heroes/level/niv014.lvl
-share/heroes/level/niv015.lvl
-share/heroes/level/niv016.lvl
-share/heroes/level/niv017.lvl
-share/heroes/level/niv018.lvl
-share/heroes/level/niv019.lvl
-share/heroes/level/niv020.lvl
-share/heroes/level/niv021.lvl
-share/heroes/level/niv022.lvl
-share/heroes/level/niv023.lvl
-share/heroes/level/niv024.lvl
-share/heroes/level/niv025.lvl
-share/heroes/level/niv026.lvl
-share/heroes/level/niv027.lvl
-share/heroes/level/niv028.lvl
-share/heroes/level/niv029.lvl
-share/heroes/level/niv030.lvl
-share/heroes/level/niv031.lvl
-share/heroes/level/niv032.lvl
-share/heroes/level/niv033.lvl
-share/heroes/level/niv034.lvl
-share/heroes/level/niv035.lvl
-share/heroes/level/niv036.lvl
-share/heroes/level/niv037.lvl
-share/heroes/level/niv038.lvl
-share/heroes/level/niv039.lvl
-share/heroes/level/niv040.lvl
-share/heroes/level/niv041.lvl
-share/heroes/level/niv042.lvl
-share/heroes/level/niv043.lvl
-share/heroes/level/niv044.lvl
-share/heroes/level/niv045.lvl
-share/heroes/level/niv046.lvl
-share/heroes/level/niv047.lvl
-share/heroes/level/niv048.lvl
-share/heroes/level/niv049.lvl
-share/heroes/level/niv050.lvl
-share/heroes/level/niv051.lvl
-share/heroes/level/niv052.lvl
-share/heroes/level/niv053.lvl
-share/heroes/level/niv054.lvl
-share/heroes/level/niv055.lvl
-share/heroes/level/niv056.lvl
-share/heroes/level/niv057.lvl
-share/heroes/level/niv058.lvl
-share/heroes/level/niv059.lvl
-share/heroes/level/niv060.lvl
-share/heroes/level/niv061.lvl
-share/heroes/level/niv062.lvl
-share/heroes/level/niv063.lvl
-share/heroes/level/niv064.lvl
-share/heroes/level/niv065.lvl
-share/heroes/level/niv066.lvl
-share/heroes/level/niv067.lvl
-share/heroes/level/niv068.lvl
-share/heroes/level/niv070.lvl
-share/heroes/level/niv071.lvl
-share/heroes/level/niv072.lvl
-share/heroes/level/niv073.lvl
-share/heroes/level/niv074.lvl
-share/heroes/level/niv075.lvl
-share/heroes/level/niv076.lvl
-share/heroes/level/niv077.lvl
-share/heroes/level/niv078.lvl
-share/heroes/level/niv080.lvl
-share/heroes/level/niv081.lvl
-share/heroes/level/niv082.lvl
-share/heroes/level/niv083.lvl
-share/heroes/level/niv084.lvl
-share/heroes/level/niv085.lvl
-share/heroes/level/niv086.lvl
-share/heroes/level/niv087.lvl
-share/heroes/level/niv088.lvl
-share/heroes/level/niv090.lvl
-share/heroes/level/niv091.lvl
-share/heroes/level/niv092.lvl
-share/heroes/level/niv093.lvl
-share/heroes/level/niv094.lvl
-share/heroes/level/niv095.lvl
-share/heroes/level/niv096.lvl
-share/heroes/level/niv097.lvl
-share/heroes/level/niv100.lvl
-share/heroes/level/niv101.lvl
-share/heroes/level/niv102.lvl
-share/heroes/level/niv103.lvl
-share/heroes/level/niv104.lvl
-share/heroes/level/niv105.lvl
-share/heroes/level/niv106.lvl
-share/heroes/level/niv107.lvl
-share/heroes/level/niv108.lvl
+share/heroes/levels/level.lst
+share/heroes/levels/niv010.lvl
+share/heroes/levels/niv011.lvl
+share/heroes/levels/niv012.lvl
+share/heroes/levels/niv013.lvl
+share/heroes/levels/niv014.lvl
+share/heroes/levels/niv015.lvl
+share/heroes/levels/niv016.lvl
+share/heroes/levels/niv017.lvl
+share/heroes/levels/niv018.lvl
+share/heroes/levels/niv019.lvl
+share/heroes/levels/niv020.lvl
+share/heroes/levels/niv021.lvl
+share/heroes/levels/niv022.lvl
+share/heroes/levels/niv023.lvl
+share/heroes/levels/niv024.lvl
+share/heroes/levels/niv025.lvl
+share/heroes/levels/niv026.lvl
+share/heroes/levels/niv027.lvl
+share/heroes/levels/niv028.lvl
+share/heroes/levels/niv029.lvl
+share/heroes/levels/niv030.lvl
+share/heroes/levels/niv031.lvl
+share/heroes/levels/niv032.lvl
+share/heroes/levels/niv033.lvl
+share/heroes/levels/niv034.lvl
+share/heroes/levels/niv035.lvl
+share/heroes/levels/niv036.lvl
+share/heroes/levels/niv037.lvl
+share/heroes/levels/niv038.lvl
+share/heroes/levels/niv039.lvl
+share/heroes/levels/niv040.lvl
+share/heroes/levels/niv041.lvl
+share/heroes/levels/niv042.lvl
+share/heroes/levels/niv043.lvl
+share/heroes/levels/niv044.lvl
+share/heroes/levels/niv045.lvl
+share/heroes/levels/niv046.lvl
+share/heroes/levels/niv047.lvl
+share/heroes/levels/niv048.lvl
+share/heroes/levels/niv049.lvl
+share/heroes/levels/niv050.lvl
+share/heroes/levels/niv051.lvl
+share/heroes/levels/niv052.lvl
+share/heroes/levels/niv053.lvl
+share/heroes/levels/niv054.lvl
+share/heroes/levels/niv055.lvl
+share/heroes/levels/niv056.lvl
+share/heroes/levels/niv057.lvl
+share/heroes/levels/niv058.lvl
+share/heroes/levels/niv059.lvl
+share/heroes/levels/niv060.lvl
+share/heroes/levels/niv061.lvl
+share/heroes/levels/niv062.lvl
+share/heroes/levels/niv063.lvl
+share/heroes/levels/niv064.lvl
+share/heroes/levels/niv065.lvl
+share/heroes/levels/niv066.lvl
+share/heroes/levels/niv067.lvl
+share/heroes/levels/niv068.lvl
+share/heroes/levels/niv070.lvl
+share/heroes/levels/niv071.lvl
+share/heroes/levels/niv072.lvl
+share/heroes/levels/niv073.lvl
+share/heroes/levels/niv074.lvl
+share/heroes/levels/niv075.lvl
+share/heroes/levels/niv076.lvl
+share/heroes/levels/niv077.lvl
+share/heroes/levels/niv078.lvl
+share/heroes/levels/niv080.lvl
+share/heroes/levels/niv081.lvl
+share/heroes/levels/niv082.lvl
+share/heroes/levels/niv083.lvl
+share/heroes/levels/niv084.lvl
+share/heroes/levels/niv085.lvl
+share/heroes/levels/niv086.lvl
+share/heroes/levels/niv087.lvl
+share/heroes/levels/niv088.lvl
+share/heroes/levels/niv090.lvl
+share/heroes/levels/niv091.lvl
+share/heroes/levels/niv092.lvl
+share/heroes/levels/niv093.lvl
+share/heroes/levels/niv094.lvl
+share/heroes/levels/niv095.lvl
+share/heroes/levels/niv096.lvl
+share/heroes/levels/niv097.lvl
+share/heroes/levels/niv100.lvl
+share/heroes/levels/niv101.lvl
+share/heroes/levels/niv102.lvl
+share/heroes/levels/niv103.lvl
+share/heroes/levels/niv104.lvl
+share/heroes/levels/niv105.lvl
+share/heroes/levels/niv106.lvl
+share/heroes/levels/niv107.lvl
+share/heroes/levels/niv108.lvl
+share/heroes/mod/endscroll.xm
 share/heroes/mod/heroes01.xm
 share/heroes/mod/heroes02.xm
 share/heroes/mod/heroes03.xm
@@ -151,38 +111,35 @@ share/heroes/mod/heroes09.xm
 share/heroes/mod/heroes10.xm
 share/heroes/mod/intro.xm
 share/heroes/mod/menu.xm
-share/heroes/mod/sdf.xm
 share/heroes/mod/sound.conf
-share/heroes/rsc/level01.glz
-share/heroes/rsc/level01.pcx
-share/heroes/rsc/level01.pie
-share/heroes/rsc/level02.glz
-share/heroes/rsc/level02.pcx
-share/heroes/rsc/level02.pie
-share/heroes/rsc/level03.glz
-share/heroes/rsc/level03.pcx
-share/heroes/rsc/level03.pie
-share/heroes/rsc/level04.glz
-share/heroes/rsc/level04.pcx
-share/heroes/rsc/level04.pie
-share/heroes/rsc/level05.glz
-share/heroes/rsc/level05.pcx
-share/heroes/rsc/level05.pie
-share/heroes/rsc/level06.glz
-share/heroes/rsc/level06.pcx
-share/heroes/rsc/level06.pie
-share/heroes/rsc/level07.glz
-share/heroes/rsc/level07.pcx
-share/heroes/rsc/level07.pie
-share/heroes/rsc/level08.glz
-share/heroes/rsc/level08.pcx
-share/heroes/rsc/level08.pie
-share/heroes/rsc/level09.glz
-share/heroes/rsc/level09.pcx
-share/heroes/rsc/level09.pie
-share/heroes/rsc/level10.glz
-share/heroes/rsc/level10.pcx
-share/heroes/rsc/level10.pie
+share/heroes/pics/background.pcx
+share/heroes/pics/bonusa.pcx
+share/heroes/pics/bonusb.pcx
+share/heroes/pics/edit.pcx
+share/heroes/pics/editp01.pcx
+share/heroes/pics/editp02.pcx
+share/heroes/pics/editp03.pcx
+share/heroes/pics/editp04.pcx
+share/heroes/pics/editp05.pcx
+share/heroes/pics/editp06.pcx
+share/heroes/pics/editp07.pcx
+share/heroes/pics/editp08.pcx
+share/heroes/pics/editp09.pcx
+share/heroes/pics/editp10.pcx
+share/heroes/pics/erase.pcx
+share/heroes/pics/fontdeck.pcx
+share/heroes/pics/fontem.pcx
+share/heroes/pics/fontem2.pcx
+share/heroes/pics/fontread.pcx
+share/heroes/pics/helpics.pcx
+share/heroes/pics/heroes.pcx
+share/heroes/pics/intro.pcx
+share/heroes/pics/jukebox.pcx
+share/heroes/pics/newlevel.pcx
+share/heroes/pics/olympus.pcx
+share/heroes/pics/trail.pcx
+share/heroes/pics/typonus.pcx
+share/heroes/pics/vehic.pcx
 share/heroes/sfx/alien.wav
 share/heroes/sfx/argent01.wav
 share/heroes/sfx/bonus.wav
@@ -212,34 +169,49 @@ share/heroes/sfx/mort_b4.wav
 share/heroes/sfx/no.wav
 share/heroes/sfx/oh.wav
 share/heroes/sfx/power_up.wav
-share/heroes/sfx/sfx.cfg
+share/heroes/sfx/sfx.conf
 share/heroes/sfx/sleep.wav
 share/heroes/sfx/speedown.wav
 share/heroes/sfx/speedup.wav
 share/heroes/sfx/stop.wav
-share/heroes/sprites/bonusa.pcx
-share/heroes/sprites/bonusb.pcx
-share/heroes/sprites/fontdeck.pcx
-share/heroes/sprites/fontem.pcx
-share/heroes/sprites/fontem2.pcx
-share/heroes/sprites/fontread.pcx
-share/heroes/sprites/helpics.pcx
-share/heroes/sprites/jukebox.pcx
-share/heroes/sprites/jukecd.pcx
-share/heroes/sprites/trail.pcx
-share/heroes/sprites/typonus.pcx
-share/heroes/sprites/vehic.pcx
+share/heroes/tilesets/level01.glz
+share/heroes/tilesets/level01.pcx
+share/heroes/tilesets/level01.pie
+share/heroes/tilesets/level02.glz
+share/heroes/tilesets/level02.pcx
+share/heroes/tilesets/level02.pie
+share/heroes/tilesets/level03.glz
+share/heroes/tilesets/level03.pcx
+share/heroes/tilesets/level03.pie
+share/heroes/tilesets/level04.glz
+share/heroes/tilesets/level04.pcx
+share/heroes/tilesets/level04.pie
+share/heroes/tilesets/level05.glz
+share/heroes/tilesets/level05.pcx
+share/heroes/tilesets/level05.pie
+share/heroes/tilesets/level06.glz
+share/heroes/tilesets/level06.pcx
+share/heroes/tilesets/level06.pie
+share/heroes/tilesets/level07.glz
+share/heroes/tilesets/level07.pcx
+share/heroes/tilesets/level07.pie
+share/heroes/tilesets/level08.glz
+share/heroes/tilesets/level08.pcx
+share/heroes/tilesets/level08.pie
+share/heroes/tilesets/level09.glz
+share/heroes/tilesets/level09.pcx
+share/heroes/tilesets/level09.pie
+share/heroes/tilesets/level10.glz
+share/heroes/tilesets/level10.pcx
+share/heroes/tilesets/level10.pie
 share/heroes/txt_cfg/heroes.hlp
 share/heroes/txt_cfg/heroes.sdf
 share/heroes/txt_cfg/txti.cfg
 @dirrm share/heroes/txt_cfg
-@dirrm share/heroes/sprites
+@dirrm share/heroes/tilesets
 @dirrm share/heroes/sfx
-@dirrm share/heroes/rsc
+@dirrm share/heroes/pics
 @dirrm share/heroes/mod
-@dirrm share/heroes/level
-@dirrm share/heroes/intro
-@dirrm share/heroes/hedit
-@dirrm share/heroes/extralvl
+@dirrm share/heroes/levels
 @dirrm share/heroes/etc
 @dirrm share/heroes