9 files changed, 81 insertions, 210 deletions

diff --git a/MOVED b/MOVED
index daaad2e72e39..fe241a33ccff 100644
--- a/MOVED
+++ b/MOVED
@@ -1641,3 +1641,4 @@ x11-themes/fluxbox-fluxmod||2005-10-07|Project has gone
 sysutils/rdiff-backup-devel|sysutils/rdiff-backup|2005-10-08|obsolete
 games/py-balazar|games/balazar|2005-10-09|renamed to reflect right name
 multimedia/gpac-libm4systems|multimedia/gpac-libgpac|2005-10-09|Library renamed
+games/marbles|games/lmarbles|2005-10-10|renamed to reflect right name
diff --git a/games/Makefile b/games/Makefile
index 72d0a519f7dc..97b1c73f2481 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -327,6 +327,7 @@
     SUBDIR += linux-virtual-jay-peak
     SUBDIR += liquidwar
     SUBDIR += lm-solve
+    SUBDIR += lmarbles
     SUBDIR += ltris
     SUBDIR += lucidlife
     SUBDIR += macopix
@@ -338,7 +339,6 @@
     SUBDIR += mangband
     SUBDIR += marathon-evil
     SUBDIR += marathon2-data
-    SUBDIR += marbles
     SUBDIR += meqcc
     SUBDIR += merlin
     SUBDIR += mindfocus
diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile
index a76c077d4ff0..3027d1d152b4 100644
--- a/games/lmarbles/Makefile
+++ b/games/lmarbles/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	marbles
+PORTNAME=	lmarbles
 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
@@ -23,6 +22,8 @@ USE_REINPLACE=	yes
 
 MAN6=		lmarbles.6
 
+PORTDOCS=	*
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/SDL\///' ${WRKSRC}/src/*.[ch]
 
@@ -30,8 +31,8 @@ post-install:
 	@${CHOWN} root:games ${PREFIX}/bin/lmarbles
 	@${CHMOD} g+s ${PREFIX}/bin/lmarbles
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/lmarbles
-	${INSTALL_DATA} ${WRKSRC}/src/manual/* ${PREFIX}/share/doc/lmarbles
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/manual/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/lmarbles/pkg-descr b/games/lmarbles/pkg-descr
index 0feca9815c7d..9f655e1d2e66 100644
--- a/games/lmarbles/pkg-descr
+++ b/games/lmarbles/pkg-descr
@@ -1,5 +1,5 @@
-Marbles is a game similar to Atomix and was heavily inspired by it.
+LMarbles is a game similar to Atomix and was heavily inspired by it.
 The goal is to arrange a figure out of single marbles within a time
 limit to reach the next level.
 
-WWW: http://lgames.sourceforge.net/index.php?project=Marbles
+WWW: http://lgames.sourceforge.net/index.php?project=LMarbles
diff --git a/games/lmarbles/pkg-plist b/games/lmarbles/pkg-plist
index 56d1e37af87d..4c7cabad8425 100644
--- a/games/lmarbles/pkg-plist
+++ b/games/lmarbles/pkg-plist
@@ -1,80 +1,73 @@
 bin/lmarbles
-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
+%%DATADIR%%/gfx/board.bmp
+%%DATADIR%%/gfx/f_red.bmp
+%%DATADIR%%/gfx/f_small.bmp
+%%DATADIR%%/gfx/f_white.bmp
+%%DATADIR%%/gfx/f_yellow.bmp
+%%DATADIR%%/gfx/figure.bmp
+%%DATADIR%%/gfx/lights.bmp
+%%DATADIR%%/gfx/logo.bmp
+%%DATADIR%%/gfx/m_frame.bmp
+%%DATADIR%%/gfx/m_sframe.bmp
+%%DATADIR%%/gfx/marbles.bmp
+%%DATADIR%%/gfx/metal/arrow_d.bmp
+%%DATADIR%%/gfx/metal/arrow_l.bmp
+%%DATADIR%%/gfx/metal/arrow_r.bmp
+%%DATADIR%%/gfx/metal/arrow_u.bmp
+%%DATADIR%%/gfx/metal/background.bmp
+%%DATADIR%%/gfx/metal/barrier_lr.bmp
+%%DATADIR%%/gfx/metal/barrier_ud.bmp
+%%DATADIR%%/gfx/metal/floor.bmp
+%%DATADIR%%/gfx/metal/teleport0.bmp
+%%DATADIR%%/gfx/metal/teleport1.bmp
+%%DATADIR%%/gfx/metal/teleport2.bmp
+%%DATADIR%%/gfx/metal/teleport3.bmp
+%%DATADIR%%/gfx/metal/wall.bmp
+%%DATADIR%%/gfx/metal/wall_crumble.bmp
+%%DATADIR%%/gfx/stone/arrow_d.bmp
+%%DATADIR%%/gfx/stone/arrow_l.bmp
+%%DATADIR%%/gfx/stone/arrow_r.bmp
+%%DATADIR%%/gfx/stone/arrow_u.bmp
+%%DATADIR%%/gfx/stone/background.bmp
+%%DATADIR%%/gfx/stone/barrier_lr.bmp
+%%DATADIR%%/gfx/stone/barrier_ud.bmp
+%%DATADIR%%/gfx/stone/floor.bmp
+%%DATADIR%%/gfx/stone/teleport0.bmp
+%%DATADIR%%/gfx/stone/teleport1.bmp
+%%DATADIR%%/gfx/stone/teleport2.bmp
+%%DATADIR%%/gfx/stone/teleport3.bmp
+%%DATADIR%%/gfx/stone/wall.bmp
+%%DATADIR%%/gfx/stone/wall_crumble.bmp
+%%DATADIR%%/gfx/tiny.sdlfnt
+%%DATADIR%%/gfx/title.bmp
+%%DATADIR%%/gfx/win_icon.bmp
+%%DATADIR%%/gfx/wood/arrow_d.bmp
+%%DATADIR%%/gfx/wood/arrow_l.bmp
+%%DATADIR%%/gfx/wood/arrow_r.bmp
+%%DATADIR%%/gfx/wood/arrow_u.bmp
+%%DATADIR%%/gfx/wood/background.bmp
+%%DATADIR%%/gfx/wood/barrier_lr.bmp
+%%DATADIR%%/gfx/wood/barrier_ud.bmp
+%%DATADIR%%/gfx/wood/floor.bmp
+%%DATADIR%%/gfx/wood/teleport0.bmp
+%%DATADIR%%/gfx/wood/teleport1.bmp
+%%DATADIR%%/gfx/wood/teleport2.bmp
+%%DATADIR%%/gfx/wood/teleport3.bmp
+%%DATADIR%%/gfx/wood/wall.bmp
+%%DATADIR%%/gfx/wood/wall_crumble.bmp
+%%DATADIR%%/levels/Original
+%%DATADIR%%/sounds/alarm.wav
+%%DATADIR%%/sounds/arrow.wav
+%%DATADIR%%/sounds/click.wav
+%%DATADIR%%/sounds/explode.wav
+%%DATADIR%%/sounds/score.wav
+%%DATADIR%%/sounds/select.wav
+%%DATADIR%%/sounds/stop.wav
+%%DATADIR%%/sounds/teleport.wav
+@dirrm %%DATADIR%%/gfx/metal
+@dirrm %%DATADIR%%/gfx/stone
+@dirrm %%DATADIR%%/gfx/wood
+@dirrm %%DATADIR%%/gfx
+@dirrm %%DATADIR%%/levels
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%
diff --git a/games/marbles/Makefile b/games/marbles/Makefile
deleted file mode 100644
index a76c077d4ff0..000000000000
--- a/games/marbles/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	marbles
-# Date created:		12 June 2002
-# Whom:			verm@drunkmonk.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=	marbles
-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 mixer
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var/games
-USE_REINPLACE=	yes
-
-MAN6=		lmarbles.6
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/SDL\///' ${WRKSRC}/src/*.[ch]
-
-post-install:
-	@${CHOWN} root:games ${PREFIX}/bin/lmarbles
-	@${CHMOD} g+s ${PREFIX}/bin/lmarbles
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/lmarbles
-	${INSTALL_DATA} ${WRKSRC}/src/manual/* ${PREFIX}/share/doc/lmarbles
-.endif
-
-.include <bsd.port.mk>
diff --git a/games/marbles/distinfo b/games/marbles/distinfo
deleted file mode 100644
index d00ee9b8a97b..000000000000
--- a/games/marbles/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (lmarbles-1.0.7.tar.gz) = b29156bc5021877d080e5e268012f4ec
-SIZE (lmarbles-1.0.7.tar.gz) = 829635
diff --git a/games/marbles/pkg-descr b/games/marbles/pkg-descr
deleted file mode 100644
index 0feca9815c7d..000000000000
--- a/games/marbles/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Marbles is a game similar to Atomix and was heavily inspired by it.
-The goal is to arrange a figure out of single marbles within a time
-limit to reach the next level.
-
-WWW: http://lgames.sourceforge.net/index.php?project=Marbles
diff --git a/games/marbles/pkg-plist b/games/marbles/pkg-plist
deleted file mode 100644
index 56d1e37af87d..000000000000
--- a/games/marbles/pkg-plist
+++ /dev/null
@@ -1,80 +0,0 @@
-bin/lmarbles
-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