4 files changed, 95 insertions, 99 deletions

diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile
index ee9af76751a9..80b0715fe5c9 100644
--- a/games/lmarbles/Makefile
+++ b/games/lmarbles/Makefile
@@ -6,40 +6,35 @@
 #
 
 PORTNAME=	marbles
-PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTVERSION=	1.0.7
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgames
+DISTNAME=	lmarbles-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A challenging puzzle game similar to Atomix
 
-USE_SDL=	sdl
+USE_SDL=	sdl mixer
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-profile-path=/var/games
+CONFIGURE_ARGS=	--localstatedir=/var/games
 USE_REINPLACE=	yes
 
-MAN6=	marbles.6
+MAN6=		lmarbles.6
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/SDL\///' ${WRKSRC}/src/*.[ch]
-	@${REINPLACE_CMD} -e 's/^#include "sys\/timeb.h"//' \
-		${WRKSRC}/src/timer.c
-	@${REINPLACE_CMD} -e 's/games\/marbles/marbles/g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's/if .*marbles.prfs/if false/' \
-		${WRKSRC}/src/Makefile.in
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/src/empty.prfs ${DATADIR}
-	@${CHOWN} root:games ${PREFIX}/bin/marbles
-	@${CHMOD} g+s ${PREFIX}/bin/marbles
+	${INSTALL_DATA} ${WRKSRC}/src/empty.prfs ${PREFIX}/share/lmarbles
+	@${CHOWN} root:games ${PREFIX}/bin/lmarbles
+	@${CHMOD} g+s ${PREFIX}/bin/lmarbles
 	@${SETENV} "PKG_PREFIX=${PREFIX}" \
 		${SH} pkg-install ${PKGNAME} POST-INSTALL
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/manual/* ${DOCSDIR}
+	${MKDIR} ${PREFIX}/share/doc/lmarbles
+	${INSTALL_DATA} ${WRKSRC}/src/manual/* ${PREFIX}/share/doc/lmarbles
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/lmarbles/distinfo b/games/lmarbles/distinfo
index 5bf2b45b0577..d00ee9b8a97b 100644
--- a/games/lmarbles/distinfo
+++ b/games/lmarbles/distinfo
@@ -1,2 +1,2 @@
-MD5 (marbles-1.0.2.tar.gz) = 3542b462b212403832d34dccbcc73d5a
-SIZE (marbles-1.0.2.tar.gz) = 798715
+MD5 (lmarbles-1.0.7.tar.gz) = b29156bc5021877d080e5e268012f4ec
+SIZE (lmarbles-1.0.7.tar.gz) = 829635
diff --git a/games/lmarbles/pkg-install b/games/lmarbles/pkg-install
index 562b593513f0..425f21d8df17 100644
--- a/games/lmarbles/pkg-install
+++ b/games/lmarbles/pkg-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-FILE=/var/games/marbles.prfs
+FILE=/var/games/lmarbles.prfs
 [ "$2" != "POST-INSTALL" -o -f "$FILE" ] && exit 0
 
 echo "===>   Creating initial profile $FILE"
-install -o root -g games -m 664 ${PKG_PREFIX}/share/marbles/empty.prfs $FILE
+install -o root -g games -m 664 ${PKG_PREFIX}/share/lmarbles/empty.prfs $FILE
diff --git a/games/lmarbles/pkg-plist b/games/lmarbles/pkg-plist
index 349240dc5fec..35b8710651be 100644
--- a/games/lmarbles/pkg-plist
+++ b/games/lmarbles/pkg-plist
@@ -1,80 +1,81 @@
-bin/marbles
-share/marbles/empty.prfs
-share/marbles/gfx/board.bmp
-share/marbles/gfx/f_red.bmp
-share/marbles/gfx/f_small.bmp
-share/marbles/gfx/f_white.bmp
-share/marbles/gfx/f_yellow.bmp
-share/marbles/gfx/figure.bmp
-share/marbles/gfx/lights.bmp
-share/marbles/gfx/logo.bmp
-share/marbles/gfx/m_frame.bmp
-share/marbles/gfx/m_sframe.bmp
-share/marbles/gfx/marbles.bmp
-share/marbles/gfx/metal/arrow_d.bmp
-share/marbles/gfx/metal/arrow_l.bmp
-share/marbles/gfx/metal/arrow_r.bmp
-share/marbles/gfx/metal/arrow_u.bmp
-share/marbles/gfx/metal/background.bmp
-share/marbles/gfx/metal/barrier_lr.bmp
-share/marbles/gfx/metal/barrier_ud.bmp
-share/marbles/gfx/metal/floor.bmp
-share/marbles/gfx/metal/teleport0.bmp
-share/marbles/gfx/metal/teleport1.bmp
-share/marbles/gfx/metal/teleport2.bmp
-share/marbles/gfx/metal/teleport3.bmp
-share/marbles/gfx/metal/wall.bmp
-share/marbles/gfx/metal/wall_crumble.bmp
-share/marbles/gfx/stone/arrow_d.bmp
-share/marbles/gfx/stone/arrow_l.bmp
-share/marbles/gfx/stone/arrow_r.bmp
-share/marbles/gfx/stone/arrow_u.bmp
-share/marbles/gfx/stone/background.bmp
-share/marbles/gfx/stone/barrier_lr.bmp
-share/marbles/gfx/stone/barrier_ud.bmp
-share/marbles/gfx/stone/floor.bmp
-share/marbles/gfx/stone/teleport0.bmp
-share/marbles/gfx/stone/teleport1.bmp
-share/marbles/gfx/stone/teleport2.bmp
-share/marbles/gfx/stone/teleport3.bmp
-share/marbles/gfx/stone/wall.bmp
-share/marbles/gfx/stone/wall_crumble.bmp
-share/marbles/gfx/tiny.sdlfnt
-share/marbles/gfx/title.bmp
-share/marbles/gfx/wood/arrow_d.bmp
-share/marbles/gfx/wood/arrow_l.bmp
-share/marbles/gfx/wood/arrow_r.bmp
-share/marbles/gfx/wood/arrow_u.bmp
-share/marbles/gfx/wood/background.bmp
-share/marbles/gfx/wood/barrier_lr.bmp
-share/marbles/gfx/wood/barrier_ud.bmp
-share/marbles/gfx/wood/floor.bmp
-share/marbles/gfx/wood/teleport0.bmp
-share/marbles/gfx/wood/teleport1.bmp
-share/marbles/gfx/wood/teleport2.bmp
-share/marbles/gfx/wood/teleport3.bmp
-share/marbles/gfx/wood/wall.bmp
-share/marbles/gfx/wood/wall_crumble.bmp
-share/marbles/levels/Original
-share/marbles/sound/alarm.wav
-share/marbles/sound/arrow.wav
-share/marbles/sound/click.wav
-share/marbles/sound/explode.wav
-share/marbles/sound/score.wav
-share/marbles/sound/select.wav
-share/marbles/sound/stop.wav
-share/marbles/sound/teleport.wav
-%%PORTDOCS%%share/doc/marbles/arrow.jpg
-%%PORTDOCS%%share/doc/marbles/arrow2.jpg
-%%PORTDOCS%%share/doc/marbles/crumble.jpg
-%%PORTDOCS%%share/doc/marbles/manual.html
-%%PORTDOCS%%share/doc/marbles/marbles.jpg
-%%PORTDOCS%%share/doc/marbles/teleport.jpg
-%%PORTDOCS%%@dirrm share/doc/marbles
-@dirrm share/marbles/gfx/metal
-@dirrm share/marbles/gfx/stone
-@dirrm share/marbles/gfx/wood
-@dirrm share/marbles/gfx
-@dirrm share/marbles/levels
-@dirrm share/marbles/sound
-@dirrm share/marbles
+bin/lmarbles
+share/lmarbles/empty.prfs
+share/lmarbles/gfx/board.bmp
+share/lmarbles/gfx/f_red.bmp
+share/lmarbles/gfx/f_small.bmp
+share/lmarbles/gfx/f_white.bmp
+share/lmarbles/gfx/f_yellow.bmp
+share/lmarbles/gfx/figure.bmp
+share/lmarbles/gfx/lights.bmp
+share/lmarbles/gfx/logo.bmp
+share/lmarbles/gfx/m_frame.bmp
+share/lmarbles/gfx/m_sframe.bmp
+share/lmarbles/gfx/marbles.bmp
+share/lmarbles/gfx/metal/arrow_d.bmp
+share/lmarbles/gfx/metal/arrow_l.bmp
+share/lmarbles/gfx/metal/arrow_r.bmp
+share/lmarbles/gfx/metal/arrow_u.bmp
+share/lmarbles/gfx/metal/background.bmp
+share/lmarbles/gfx/metal/barrier_lr.bmp
+share/lmarbles/gfx/metal/barrier_ud.bmp
+share/lmarbles/gfx/metal/floor.bmp
+share/lmarbles/gfx/metal/teleport0.bmp
+share/lmarbles/gfx/metal/teleport1.bmp
+share/lmarbles/gfx/metal/teleport2.bmp
+share/lmarbles/gfx/metal/teleport3.bmp
+share/lmarbles/gfx/metal/wall.bmp
+share/lmarbles/gfx/metal/wall_crumble.bmp
+share/lmarbles/gfx/stone/arrow_d.bmp
+share/lmarbles/gfx/stone/arrow_l.bmp
+share/lmarbles/gfx/stone/arrow_r.bmp
+share/lmarbles/gfx/stone/arrow_u.bmp
+share/lmarbles/gfx/stone/background.bmp
+share/lmarbles/gfx/stone/barrier_lr.bmp
+share/lmarbles/gfx/stone/barrier_ud.bmp
+share/lmarbles/gfx/stone/floor.bmp
+share/lmarbles/gfx/stone/teleport0.bmp
+share/lmarbles/gfx/stone/teleport1.bmp
+share/lmarbles/gfx/stone/teleport2.bmp
+share/lmarbles/gfx/stone/teleport3.bmp
+share/lmarbles/gfx/stone/wall.bmp
+share/lmarbles/gfx/stone/wall_crumble.bmp
+share/lmarbles/gfx/tiny.sdlfnt
+share/lmarbles/gfx/title.bmp
+share/lmarbles/gfx/win_icon.bmp
+share/lmarbles/gfx/wood/arrow_d.bmp
+share/lmarbles/gfx/wood/arrow_l.bmp
+share/lmarbles/gfx/wood/arrow_r.bmp
+share/lmarbles/gfx/wood/arrow_u.bmp
+share/lmarbles/gfx/wood/background.bmp
+share/lmarbles/gfx/wood/barrier_lr.bmp
+share/lmarbles/gfx/wood/barrier_ud.bmp
+share/lmarbles/gfx/wood/floor.bmp
+share/lmarbles/gfx/wood/teleport0.bmp
+share/lmarbles/gfx/wood/teleport1.bmp
+share/lmarbles/gfx/wood/teleport2.bmp
+share/lmarbles/gfx/wood/teleport3.bmp
+share/lmarbles/gfx/wood/wall.bmp
+share/lmarbles/gfx/wood/wall_crumble.bmp
+share/lmarbles/levels/Original
+share/lmarbles/sounds/alarm.wav
+share/lmarbles/sounds/arrow.wav
+share/lmarbles/sounds/click.wav
+share/lmarbles/sounds/explode.wav
+share/lmarbles/sounds/score.wav
+share/lmarbles/sounds/select.wav
+share/lmarbles/sounds/stop.wav
+share/lmarbles/sounds/teleport.wav
+%%PORTDOCS%%share/doc/lmarbles/arrow.jpg
+%%PORTDOCS%%share/doc/lmarbles/arrow2.jpg
+%%PORTDOCS%%share/doc/lmarbles/crumble.jpg
+%%PORTDOCS%%share/doc/lmarbles/manual.html
+%%PORTDOCS%%share/doc/lmarbles/marbles.jpg
+%%PORTDOCS%%share/doc/lmarbles/teleport.jpg
+%%PORTDOCS%%@dirrm share/doc/lmarbles
+@dirrm share/lmarbles/gfx/metal
+@dirrm share/lmarbles/gfx/stone
+@dirrm share/lmarbles/gfx/wood
+@dirrm share/lmarbles/gfx
+@dirrm share/lmarbles/levels
+@dirrm share/lmarbles/sounds
+@dirrm share/lmarbles