- Update to 1.3.2

- Convert USE_GMAKE to USES
- Support staging
- Use new OPTIONS features
- Fix build on 10.x

4 files changed, 35 insertions, 99 deletions

diff --git a/games/luola/Makefile b/games/luola/Makefile
index e9aebc432077..cf4e501a6c13 100644
--- a/games/luola/Makefile
+++ b/games/luola/Makefile
@@ -2,54 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	luola
-PORTVERSION=	1.3.0
-PORTREVISION=	12
+PORTVERSION=	1.3.2
 CATEGORIES=	games
-MASTER_SITES=	http://www.luolamies.org/software/luola/ \
-		http://mirror.amdmi3.ru/distfiles/
+MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ # master site gone
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		stdlevels-5.2${EXTRACT_SUFX} \
-		nostalgia-1.1${EXTRACT_SUFX}
+		stdlevels-6.0${EXTRACT_SUFX} \
+		nostalgia-1.2${EXTRACT_SUFX}
 DIST_SUBDIR=	luola
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	Multiplayer Cave-flying game
+COMMENT=	2D multiplayer cave-flying game
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_SDL=	sdl image ttf
-
 CONFIGURE_ARGS=	--program-prefix=''
 
-OPTIONS_DEFINE=	SDL_GFX SOUND
-SDL_GFX_DESC=	Nicer graphics
-
-OPTIONS_DEFAULT=	SDL_GFX SOUND
+PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=	*
+PORTDATA=	*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSDL_GFX}
-USE_SDL+=	gfx
-.else
-CONFIGURE_ARGS+=	--disable-sdl-gfx
-.endif
+OPTIONS_DEFINE=	SDL_GFX SOUND DOCS
+OPTIONS_DEFAULT=SDL_GFX SOUND
+SDL_GFX_DESC=	Nicer graphics
 
-.if ${PORT_OPTIONS:MSOUND}
-CONFIGURE_ARGS+=	--enable-sound
-USE_SDL+=	mixer
-.endif
+SDL_GFX_USE=		SDL=gfx
+SDL_GFX_CONFIGURE_ENABLE=sdl-gfx
+SOUND_USE=		SDL=mixer
+SOUND_CONFIGURE_ENABLE=	sound
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBS=.*-lSDL_/ s|\(SDL_[a-z]*\)|\1 `sdl-config --libs`|' ${WRKSRC}/configure
 
 post-install:
-	@${INSTALL_DATA} ${WRKDIR}/*.lev ${WRKDIR}/*.png ${DATADIR}/levels
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for f in README FAQ
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_DATA} ${WRKDIR}/*.lev ${WRKDIR}/*.png ${STAGEDIR}${DATADIR}/levels/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/FAQ ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/luola/distinfo b/games/luola/distinfo
index 1a2c15535eb2..dd950ed41033 100644
--- a/games/luola/distinfo
+++ b/games/luola/distinfo
@@ -1,6 +1,6 @@
-SHA256 (luola/luola-1.3.0.tar.gz) = e705da2def63ca5004763deca764ee31d9ee5f9d60a2c7b659a79a2a445dc9f5
-SIZE (luola/luola-1.3.0.tar.gz) = 1779907
-SHA256 (luola/stdlevels-5.2.tar.gz) = 5e4d30d022d9bdc86272c66c6390b7a4c9a1611c151a79f714789bbdc271888d
-SIZE (luola/stdlevels-5.2.tar.gz) = 1523656
-SHA256 (luola/nostalgia-1.1.tar.gz) = bf06583fb59d219b544b205a91fbe99e1cab05d52c6d74c12b302374f6d924cd
-SIZE (luola/nostalgia-1.1.tar.gz) = 662150
+SHA256 (luola/luola-1.3.2.tar.gz) = 3d0af35f379f9e058a0178f341100c1f9d28ced21d6c623a458661ca44cda337
+SIZE (luola/luola-1.3.2.tar.gz) = 1774711
+SHA256 (luola/stdlevels-6.0.tar.gz) = 70882a078de3e81793c31d1cfea11981dae4c1475c6f8a68c514e2461a64338b
+SIZE (luola/stdlevels-6.0.tar.gz) = 1850148
+SHA256 (luola/nostalgia-1.2.tar.gz) = 675b51423cae1fcf2c4b0cb774e2130c8ce761b6cd91c1db59a6fca0ba18f202
+SIZE (luola/nostalgia-1.2.tar.gz) = 1475672
diff --git a/games/luola/files/patch-src__fs.h b/games/luola/files/patch-src__fs.h
new file mode 100644
index 000000000000..79e1cb2c23c5
--- /dev/null
+++ b/games/luola/files/patch-src__fs.h
@@ -0,0 +1,10 @@
+--- ./src/fs.h.orig	2012-12-23 14:40:06.000000000 -0600
++++ ./src/fs.h	2012-12-23 14:40:14.000000000 -0600
+@@ -25,6 +25,7 @@
+ #define FILESYSTEM_H
+ 
+ #include <stdio.h>
++#include <sys/syslimits.h>
+ #include "SDL.h"
+ 
+ #include "ldat.h"
diff --git a/games/luola/pkg-plist b/games/luola/pkg-plist
deleted file mode 100644
index ff1e2ee50f02..000000000000
--- a/games/luola/pkg-plist
+++ /dev/null
@@ -1,61 +0,0 @@
-bin/luola
-%%DATADIR%%/font/font1.png
-%%DATADIR%%/font/font2.png
-%%DATADIR%%/font/fonts.cfg
-%%DATADIR%%/font/freesans.ttf
-%%DATADIR%%/gfx/critter.ldat
-%%DATADIR%%/gfx/explosion.ldat
-%%DATADIR%%/gfx/misc.ldat
-%%DATADIR%%/gfx/player.ldat
-%%DATADIR%%/gfx/special.ldat
-%%DATADIR%%/gfx/xmit.ldat
-%%DATADIR%%/levels/LEVELS
-%%DATADIR%%/levels/citadel.compact.lev
-%%DATADIR%%/levels/cottages.lev
-%%DATADIR%%/levels/cottages.png
-%%DATADIR%%/levels/cottages.thumb.png
-%%DATADIR%%/levels/cottagesc.png
-%%DATADIR%%/levels/outpost.lev
-%%DATADIR%%/levels/outpost.png
-%%DATADIR%%/levels/outpost.thumb.png
-%%DATADIR%%/levels/outpostc.png
-%%DATADIR%%/levels/twilight.compact.lev
-%%DATADIR%%/levels/twincities.compact.lev
-%%DATADIR%%/levels/urban.lev
-%%DATADIR%%/levels/urban.png
-%%DATADIR%%/levels/urban.thumb.png
-%%DATADIR%%/levels/urbanc.png
-%%DATADIR%%/levels/valley.lev
-%%DATADIR%%/levels/valley.png
-%%DATADIR%%/levels/valley.thumb.png
-%%DATADIR%%/levels/valleyc.png
-%%DATADIR%%/levels/winter.lev
-%%DATADIR%%/levels/winter.png
-%%DATADIR%%/levels/winter.thumb.png
-%%DATADIR%%/levels/winterc.png
-%%DATADIR%%/sounds/bird.wav
-%%DATADIR%%/sounds/blip.wav
-%%DATADIR%%/sounds/blip2.wav
-%%DATADIR%%/sounds/burn.wav
-%%DATADIR%%/sounds/cow.wav
-%%DATADIR%%/sounds/crash.wav
-%%DATADIR%%/sounds/dart.wav
-%%DATADIR%%/sounds/explosion.wav
-%%DATADIR%%/sounds/fire.wav
-%%DATADIR%%/sounds/fire2.wav
-%%DATADIR%%/sounds/jump.wav
-%%DATADIR%%/sounds/largexpl.wav
-%%DATADIR%%/sounds/laser.wav
-%%DATADIR%%/sounds/missile.wav
-%%DATADIR%%/sounds/snowball.wav
-%%DATADIR%%/sounds/steam.wav
-%%DATADIR%%/sounds/swoosh.wav
-%%DATADIR%%/sounds/zap.wav
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-@dirrm %%DATADIR%%/font
-@dirrm %%DATADIR%%/gfx
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/levels
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%