- Support USE_GETOPT_LONG propelry

- Utilize USE_SDL/DATADIR/INFO

PR:		55622
Submitted by:	Ports Fury

2 files changed, 231 insertions, 239 deletions

diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 632d7cc514b0..ef1c7dad9b82 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	heroes
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -33,41 +33,38 @@ 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_GETOPT_LONG=yes
 USE_X_PREFIX=	yes
+USE_SDL=	yes
+USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-sdl_mixer=${LOCALBASE}
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lsmpeg
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		SDL_CONFIG="${SDL_CONFIG}"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+		MAKEINFO="makeinfo --no-split"
+CONFIGURE_ARGS=	--with-sdl_mixer=${LOCALBASE} --without-gii
 
 MAN6=		heroes.6 heroeslvl.6
+INFO=		heroes
+
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -lsmpeg ${PTHREAD_LIBS}
 
-pre-patch:
+post-patch:
 	@for dir in ${DATASRC} ${SOUNDSRC} ${MUSICSRC}; do \
-		find $${dir} -name "Makefile*" | xargs ${RM}; \
+		${FIND} $${dir} -name "Makefile*" | ${XARGS} ${RM}; \
 	done
 	@${RM} -f ${WRKSRC}/lib/getopt.h
-	@${LN} -sf ${LOCALBASE}/include/getopt.h ${WRKSRC}/lib/getopt.h
+	@${RM} -f ${WRKSRC}/doc/*.info*
 
 post-install:
 .for dir in levels pics tilesets
-	${MKDIR} ${INSTPREFIX}/${dir}
-	${INSTALL_DATA} ${DATASRC}/${dir}/* ${INSTPREFIX}/${dir}
+	${MKDIR} ${DATADIR}/${dir}
+	${INSTALL_DATA} ${DATASRC}/${dir}/* ${DATADIR}/${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
+	${MKDIR} ${DATADIR}/sfx
+	${INSTALL_DATA} ${SOUNDSRC}/*.wav ${SOUNDSRC}/sfx.conf ${DATADIR}/sfx
+	${MKDIR} ${DATADIR}/mod
+	${INSTALL_DATA} ${MUSICSRC}/*.xm ${MUSICSRC}/sound.conf ${DATADIR}/mod
 
 .include <bsd.port.mk>
diff --git a/games/heroes/pkg-plist b/games/heroes/pkg-plist
index db340be18dbd..4bd9576d5365 100644
--- a/games/heroes/pkg-plist
+++ b/games/heroes/pkg-plist
@@ -1,224 +1,219 @@
-@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
-@unexec install-info --delete %D/info/heroes.info %D/info/dir
 bin/heroes
 bin/heroeslvl
-info/heroes.info
-info/heroes.info-1
-info/heroes.info-2
-share/heroes/etc/heroesrc
-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
-share/heroes/mod/heroes04.xm
-share/heroes/mod/heroes05.xm
-share/heroes/mod/heroes06.xm
-share/heroes/mod/heroes07.xm
-share/heroes/mod/heroes08.xm
-share/heroes/mod/heroes09.xm
-share/heroes/mod/heroes10.xm
-share/heroes/mod/intro.xm
-share/heroes/mod/menu.xm
-share/heroes/mod/sound.conf
-share/heroes/pics/arrow.fig
-share/heroes/pics/arrow.pcx
-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/fontbig.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
-share/heroes/sfx/claxon.wav
-share/heroes/sfx/clock01.wav
-share/heroes/sfx/clock02.wav
-share/heroes/sfx/coins.wav
-share/heroes/sfx/dream.wav
-share/heroes/sfx/ecrase02.wav
-share/heroes/sfx/explo01.wav
-share/heroes/sfx/finlevel.wav
-share/heroes/sfx/foule1.wav
-share/heroes/sfx/foule2.wav
-share/heroes/sfx/go.wav
-share/heroes/sfx/ho_yeh.wav
-share/heroes/sfx/invinc.wav
-share/heroes/sfx/life.wav
-share/heroes/sfx/lmoins.wav
-share/heroes/sfx/lplus.wav
-share/heroes/sfx/menu01.wav
-share/heroes/sfx/menu02.wav
-share/heroes/sfx/menu03.wav
-share/heroes/sfx/mort_b1.wav
-share/heroes/sfx/mort_b2.wav
-share/heroes/sfx/mort_b3.wav
-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.conf
-share/heroes/sfx/sleep.wav
-share/heroes/sfx/speedown.wav
-share/heroes/sfx/speedup.wav
-share/heroes/sfx/stop.wav
-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
+%%DATADIR%%/etc/heroesrc
+%%DATADIR%%/levels/level.lst
+%%DATADIR%%/levels/niv010.lvl
+%%DATADIR%%/levels/niv011.lvl
+%%DATADIR%%/levels/niv012.lvl
+%%DATADIR%%/levels/niv013.lvl
+%%DATADIR%%/levels/niv014.lvl
+%%DATADIR%%/levels/niv015.lvl
+%%DATADIR%%/levels/niv016.lvl
+%%DATADIR%%/levels/niv017.lvl
+%%DATADIR%%/levels/niv018.lvl
+%%DATADIR%%/levels/niv019.lvl
+%%DATADIR%%/levels/niv020.lvl
+%%DATADIR%%/levels/niv021.lvl
+%%DATADIR%%/levels/niv022.lvl
+%%DATADIR%%/levels/niv023.lvl
+%%DATADIR%%/levels/niv024.lvl
+%%DATADIR%%/levels/niv025.lvl
+%%DATADIR%%/levels/niv026.lvl
+%%DATADIR%%/levels/niv027.lvl
+%%DATADIR%%/levels/niv028.lvl
+%%DATADIR%%/levels/niv029.lvl
+%%DATADIR%%/levels/niv030.lvl
+%%DATADIR%%/levels/niv031.lvl
+%%DATADIR%%/levels/niv032.lvl
+%%DATADIR%%/levels/niv033.lvl
+%%DATADIR%%/levels/niv034.lvl
+%%DATADIR%%/levels/niv035.lvl
+%%DATADIR%%/levels/niv036.lvl
+%%DATADIR%%/levels/niv037.lvl
+%%DATADIR%%/levels/niv038.lvl
+%%DATADIR%%/levels/niv039.lvl
+%%DATADIR%%/levels/niv040.lvl
+%%DATADIR%%/levels/niv041.lvl
+%%DATADIR%%/levels/niv042.lvl
+%%DATADIR%%/levels/niv043.lvl
+%%DATADIR%%/levels/niv044.lvl
+%%DATADIR%%/levels/niv045.lvl
+%%DATADIR%%/levels/niv046.lvl
+%%DATADIR%%/levels/niv047.lvl
+%%DATADIR%%/levels/niv048.lvl
+%%DATADIR%%/levels/niv049.lvl
+%%DATADIR%%/levels/niv050.lvl
+%%DATADIR%%/levels/niv051.lvl
+%%DATADIR%%/levels/niv052.lvl
+%%DATADIR%%/levels/niv053.lvl
+%%DATADIR%%/levels/niv054.lvl
+%%DATADIR%%/levels/niv055.lvl
+%%DATADIR%%/levels/niv056.lvl
+%%DATADIR%%/levels/niv057.lvl
+%%DATADIR%%/levels/niv058.lvl
+%%DATADIR%%/levels/niv059.lvl
+%%DATADIR%%/levels/niv060.lvl
+%%DATADIR%%/levels/niv061.lvl
+%%DATADIR%%/levels/niv062.lvl
+%%DATADIR%%/levels/niv063.lvl
+%%DATADIR%%/levels/niv064.lvl
+%%DATADIR%%/levels/niv065.lvl
+%%DATADIR%%/levels/niv066.lvl
+%%DATADIR%%/levels/niv067.lvl
+%%DATADIR%%/levels/niv068.lvl
+%%DATADIR%%/levels/niv070.lvl
+%%DATADIR%%/levels/niv071.lvl
+%%DATADIR%%/levels/niv072.lvl
+%%DATADIR%%/levels/niv073.lvl
+%%DATADIR%%/levels/niv074.lvl
+%%DATADIR%%/levels/niv075.lvl
+%%DATADIR%%/levels/niv076.lvl
+%%DATADIR%%/levels/niv077.lvl
+%%DATADIR%%/levels/niv078.lvl
+%%DATADIR%%/levels/niv080.lvl
+%%DATADIR%%/levels/niv081.lvl
+%%DATADIR%%/levels/niv082.lvl
+%%DATADIR%%/levels/niv083.lvl
+%%DATADIR%%/levels/niv084.lvl
+%%DATADIR%%/levels/niv085.lvl
+%%DATADIR%%/levels/niv086.lvl
+%%DATADIR%%/levels/niv087.lvl
+%%DATADIR%%/levels/niv088.lvl
+%%DATADIR%%/levels/niv090.lvl
+%%DATADIR%%/levels/niv091.lvl
+%%DATADIR%%/levels/niv092.lvl
+%%DATADIR%%/levels/niv093.lvl
+%%DATADIR%%/levels/niv094.lvl
+%%DATADIR%%/levels/niv095.lvl
+%%DATADIR%%/levels/niv096.lvl
+%%DATADIR%%/levels/niv097.lvl
+%%DATADIR%%/levels/niv100.lvl
+%%DATADIR%%/levels/niv101.lvl
+%%DATADIR%%/levels/niv102.lvl
+%%DATADIR%%/levels/niv103.lvl
+%%DATADIR%%/levels/niv104.lvl
+%%DATADIR%%/levels/niv105.lvl
+%%DATADIR%%/levels/niv106.lvl
+%%DATADIR%%/levels/niv107.lvl
+%%DATADIR%%/levels/niv108.lvl
+%%DATADIR%%/mod/endscroll.xm
+%%DATADIR%%/mod/heroes01.xm
+%%DATADIR%%/mod/heroes02.xm
+%%DATADIR%%/mod/heroes03.xm
+%%DATADIR%%/mod/heroes04.xm
+%%DATADIR%%/mod/heroes05.xm
+%%DATADIR%%/mod/heroes06.xm
+%%DATADIR%%/mod/heroes07.xm
+%%DATADIR%%/mod/heroes08.xm
+%%DATADIR%%/mod/heroes09.xm
+%%DATADIR%%/mod/heroes10.xm
+%%DATADIR%%/mod/intro.xm
+%%DATADIR%%/mod/menu.xm
+%%DATADIR%%/mod/sound.conf
+%%DATADIR%%/pics/arrow.fig
+%%DATADIR%%/pics/arrow.pcx
+%%DATADIR%%/pics/background.pcx
+%%DATADIR%%/pics/bonusa.pcx
+%%DATADIR%%/pics/bonusb.pcx
+%%DATADIR%%/pics/edit.pcx
+%%DATADIR%%/pics/editp01.pcx
+%%DATADIR%%/pics/editp02.pcx
+%%DATADIR%%/pics/editp03.pcx
+%%DATADIR%%/pics/editp04.pcx
+%%DATADIR%%/pics/editp05.pcx
+%%DATADIR%%/pics/editp06.pcx
+%%DATADIR%%/pics/editp07.pcx
+%%DATADIR%%/pics/editp08.pcx
+%%DATADIR%%/pics/editp09.pcx
+%%DATADIR%%/pics/editp10.pcx
+%%DATADIR%%/pics/erase.pcx
+%%DATADIR%%/pics/fontbig.pcx
+%%DATADIR%%/pics/fontdeck.pcx
+%%DATADIR%%/pics/fontem.pcx
+%%DATADIR%%/pics/fontem2.pcx
+%%DATADIR%%/pics/fontread.pcx
+%%DATADIR%%/pics/helpics.pcx
+%%DATADIR%%/pics/heroes.pcx
+%%DATADIR%%/pics/intro.pcx
+%%DATADIR%%/pics/jukebox.pcx
+%%DATADIR%%/pics/newlevel.pcx
+%%DATADIR%%/pics/olympus.pcx
+%%DATADIR%%/pics/trail.pcx
+%%DATADIR%%/pics/typonus.pcx
+%%DATADIR%%/pics/vehic.pcx
+%%DATADIR%%/sfx/alien.wav
+%%DATADIR%%/sfx/argent01.wav
+%%DATADIR%%/sfx/bonus.wav
+%%DATADIR%%/sfx/claxon.wav
+%%DATADIR%%/sfx/clock01.wav
+%%DATADIR%%/sfx/clock02.wav
+%%DATADIR%%/sfx/coins.wav
+%%DATADIR%%/sfx/dream.wav
+%%DATADIR%%/sfx/ecrase02.wav
+%%DATADIR%%/sfx/explo01.wav
+%%DATADIR%%/sfx/finlevel.wav
+%%DATADIR%%/sfx/foule1.wav
+%%DATADIR%%/sfx/foule2.wav
+%%DATADIR%%/sfx/go.wav
+%%DATADIR%%/sfx/ho_yeh.wav
+%%DATADIR%%/sfx/invinc.wav
+%%DATADIR%%/sfx/life.wav
+%%DATADIR%%/sfx/lmoins.wav
+%%DATADIR%%/sfx/lplus.wav
+%%DATADIR%%/sfx/menu01.wav
+%%DATADIR%%/sfx/menu02.wav
+%%DATADIR%%/sfx/menu03.wav
+%%DATADIR%%/sfx/mort_b1.wav
+%%DATADIR%%/sfx/mort_b2.wav
+%%DATADIR%%/sfx/mort_b3.wav
+%%DATADIR%%/sfx/mort_b4.wav
+%%DATADIR%%/sfx/no.wav
+%%DATADIR%%/sfx/oh.wav
+%%DATADIR%%/sfx/power_up.wav
+%%DATADIR%%/sfx/sfx.conf
+%%DATADIR%%/sfx/sleep.wav
+%%DATADIR%%/sfx/speedown.wav
+%%DATADIR%%/sfx/speedup.wav
+%%DATADIR%%/sfx/stop.wav
+%%DATADIR%%/tilesets/level01.glz
+%%DATADIR%%/tilesets/level01.pcx
+%%DATADIR%%/tilesets/level01.pie
+%%DATADIR%%/tilesets/level02.glz
+%%DATADIR%%/tilesets/level02.pcx
+%%DATADIR%%/tilesets/level02.pie
+%%DATADIR%%/tilesets/level03.glz
+%%DATADIR%%/tilesets/level03.pcx
+%%DATADIR%%/tilesets/level03.pie
+%%DATADIR%%/tilesets/level04.glz
+%%DATADIR%%/tilesets/level04.pcx
+%%DATADIR%%/tilesets/level04.pie
+%%DATADIR%%/tilesets/level05.glz
+%%DATADIR%%/tilesets/level05.pcx
+%%DATADIR%%/tilesets/level05.pie
+%%DATADIR%%/tilesets/level06.glz
+%%DATADIR%%/tilesets/level06.pcx
+%%DATADIR%%/tilesets/level06.pie
+%%DATADIR%%/tilesets/level07.glz
+%%DATADIR%%/tilesets/level07.pcx
+%%DATADIR%%/tilesets/level07.pie
+%%DATADIR%%/tilesets/level08.glz
+%%DATADIR%%/tilesets/level08.pcx
+%%DATADIR%%/tilesets/level08.pie
+%%DATADIR%%/tilesets/level09.glz
+%%DATADIR%%/tilesets/level09.pcx
+%%DATADIR%%/tilesets/level09.pie
+%%DATADIR%%/tilesets/level10.glz
+%%DATADIR%%/tilesets/level10.pcx
+%%DATADIR%%/tilesets/level10.pie
 share/locale/de/LC_MESSAGES/heroes.mo
 share/locale/fr/LC_MESSAGES/heroes.mo
 share/locale/it/LC_MESSAGES/heroes.mo
 share/locale/nl/LC_MESSAGES/heroes.mo
 share/locale/pt_BR/LC_MESSAGES/heroes.mo
-@dirrm share/heroes/tilesets
-@dirrm share/heroes/sfx
-@dirrm share/heroes/pics
-@dirrm share/heroes/mod
-@dirrm share/heroes/levels
-@dirrm share/heroes/etc
-@dirrm share/heroes
+@dirrm %%DATADIR%%/tilesets
+@dirrm %%DATADIR%%/sfx
+@dirrm %%DATADIR%%/pics
+@dirrm %%DATADIR%%/mod
+@dirrm %%DATADIR%%/levels
+@dirrm %%DATADIR%%/etc
+@dirrm %%DATADIR%%