4 files changed, 171 insertions, 176 deletions

diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index 176c5ed618fe..47620fd43478 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	trackballs
-PORTVERSION=	0.9.2
-PORTREVISION=	3
+PORTVERSION=	1.0.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,25 +15,25 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SDL-based Marble Madness clone
 
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_X_PREFIX=	yes
-USE_GETOPT_LONG=yes
-USE_SDL=	mixer image ttf sdl
-GNU_CONFIGURE=	yes
+USE_SDL=	image mixer sdl ttf
+USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnometarget
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
+MAN6=		${PORTNAME}.6
+
 CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 
-MAN6=		${PORTNAME}.6
-
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.h' -o -name '*.cc' | ${XARGS} \
-		${REINPLACE_CMD} -e "/^#include/s|SDL/SDL|SDL11/SDL|; \
+		${REINPLACE_CMD} -e "/^#include/s|SDL/SDL|SDL|; \
 			/stdint.h/d"
 	@${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" \
 		${WRKSRC}/share/icons/installIcons
diff --git a/games/trackballs/distinfo b/games/trackballs/distinfo
index 8346a049de09..9ddc7597c820 100644
--- a/games/trackballs/distinfo
+++ b/games/trackballs/distinfo
@@ -1,2 +1,2 @@
-MD5 (trackballs-0.9.2.tar.gz) = b51fb581a966fec1ff0bdee66871723f
-SIZE (trackballs-0.9.2.tar.gz) = 4828477
+MD5 (trackballs-1.0.0.tar.gz) = 0d3ce4903aa60fba18c0e8c02b3cd563
+SIZE (trackballs-1.0.0.tar.gz) = 4826294
diff --git a/games/trackballs/files/patch-Makefile.in b/games/trackballs/files/patch-Makefile.in
deleted file mode 100644
index 6e575cf975b4..000000000000
--- a/games/trackballs/files/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in.orig	Fri Nov 21 15:09:54 2003
-+++ Makefile.in	Thu Jan 29 23:06:44 2004
-@@ -66,6 +66,7 @@
- AMTAR = @AMTAR@
- AWK = @AWK@
- CC = @CC@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- DEPDIR = @DEPDIR@
- GUILE = @GUILE@
-@@ -75,6 +76,7 @@
- GUILE_SITE = @GUILE_SITE@
- GUILE_TOOLS = @GUILE_TOOLS@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LDFLAGS = @LDFLAGS@
- LN_S = @LN_S@
- PACKAGE = @PACKAGE@
- SDL_CFLAGS = @SDL_CFLAGS@
diff --git a/games/trackballs/pkg-plist b/games/trackballs/pkg-plist
index e0e3e9c46893..90ea7b817287 100644
--- a/games/trackballs/pkg-plist
+++ b/games/trackballs/pkg-plist
@@ -1,147 +1,161 @@
 bin/trackballs
-share/trackballs/fonts/menuFont.ttf
-share/trackballs/highScores
-share/trackballs/images/acid.png
-share/trackballs/images/difficulty0.png
-share/trackballs/images/difficulty0High.png
-share/trackballs/images/difficulty1.png
-share/trackballs/images/difficulty1High.png
-share/trackballs/images/difficulty2.png
-share/trackballs/images/difficulty2High.png
-share/trackballs/images/displayHighscoreBackground.jpg
-share/trackballs/images/enterHighscoreBackground.jpg
-share/trackballs/images/font.rgb
-share/trackballs/images/gamesettings.png
-share/trackballs/images/glitter.png
-share/trackballs/images/header.png
-share/trackballs/images/help0_1024.png
-share/trackballs/images/help0_640.png
-share/trackballs/images/help1_1024.png
-share/trackballs/images/help1_640.png
-share/trackballs/images/helpBackground.jpg
-share/trackballs/images/ice.png
-share/trackballs/images/left_panel.png
-share/trackballs/images/levelsetup.png
-share/trackballs/images/life.png
-share/trackballs/images/menu0.png
-share/trackballs/images/menu1.png
-share/trackballs/images/menu2.png
-share/trackballs/images/menu3.png
-share/trackballs/images/menu4.png
-share/trackballs/images/menuHigh0.png
-share/trackballs/images/menuHigh1.png
-share/trackballs/images/menuHigh2.png
-share/trackballs/images/menuHigh3.png
-share/trackballs/images/menuHigh4.png
-share/trackballs/images/moreHelp.png
-share/trackballs/images/moreHelpHigh.png
-share/trackballs/images/mousePointer.png
-share/trackballs/images/nolife.png
-share/trackballs/images/playersetup.png
-share/trackballs/images/return2menu.png
-share/trackballs/images/return2menuHigh.png
-share/trackballs/images/sand.png
-share/trackballs/images/settings1.png
-share/trackballs/images/settings2.png
-share/trackballs/images/settings3.png
-share/trackballs/images/settings4.png
-share/trackballs/images/settings5.png
-share/trackballs/images/settings6.png
-share/trackballs/images/settings7.png
-share/trackballs/images/settings8.png
-share/trackballs/images/setup1.png
-share/trackballs/images/setup2.png
-share/trackballs/images/setup3.png
-share/trackballs/images/setup4.png
-share/trackballs/images/setupBackground.jpg
-share/trackballs/images/setupTitle.png
-share/trackballs/images/splashScreen.jpg
-share/trackballs/images/start.png
-share/trackballs/images/startHigh.png
-share/trackballs/images/texture.png
-share/trackballs/images/texture2.png
-share/trackballs/images/texture3.png
-share/trackballs/images/texture4.png
-share/trackballs/images/track.png
-share/trackballs/images/trackballs32x32.png
-share/trackballs/images/trackballs48x48.png
-share/trackballs/images/wings.png
-share/trackballs/levels/bonus.map
-share/trackballs/levels/bonus.scm
-share/trackballs/levels/boot.scm
-share/trackballs/levels/con1.map
-share/trackballs/levels/con1.scm
-share/trackballs/levels/con2.map
-share/trackballs/levels/con2.scm
-share/trackballs/levels/con3.map
-share/trackballs/levels/con3.scm
-share/trackballs/levels/con4.map
-share/trackballs/levels/con4.scm
-share/trackballs/levels/con5.map
-share/trackballs/levels/con5.scm
-share/trackballs/levels/contrib.set
-share/trackballs/levels/elite.set
-share/trackballs/levels/elite1.map
-share/trackballs/levels/elite1.scm
-share/trackballs/levels/hxtst.map
-share/trackballs/levels/hxtst.scm
-share/trackballs/levels/jump.set
-share/trackballs/levels/jump1.map
-share/trackballs/levels/jump1.scm
-share/trackballs/levels/jump2.map
-share/trackballs/levels/jump2.scm
-share/trackballs/levels/jump3.map
-share/trackballs/levels/jump3.scm
-share/trackballs/levels/jump4.map
-share/trackballs/levels/jump4.scm
-share/trackballs/levels/jump5.map
-share/trackballs/levels/jump5.scm
-share/trackballs/levels/ki.set
-share/trackballs/levels/ki1.map
-share/trackballs/levels/ki1.scm
-share/trackballs/levels/ki2.map
-share/trackballs/levels/ki2.scm
-share/trackballs/levels/ki3.map
-share/trackballs/levels/ki3.scm
-share/trackballs/levels/ki4.map
-share/trackballs/levels/ki4.scm
-share/trackballs/levels/lv.set
-share/trackballs/levels/lv1.map
-share/trackballs/levels/lv1.scm
-share/trackballs/levels/lv2.map
-share/trackballs/levels/lv2.scm
-share/trackballs/levels/lv3.map
-share/trackballs/levels/lv3.scm
-share/trackballs/levels/lv4.map
-share/trackballs/levels/lv4.scm
-share/trackballs/levels/lv5.map
-share/trackballs/levels/lv5.scm
-share/trackballs/levels/lv6.map
-share/trackballs/levels/lv6.scm
-share/trackballs/levels/lv7.map
-share/trackballs/levels/lv7.scm
-share/trackballs/levels/lv8.map
-share/trackballs/levels/lv8.scm
-share/trackballs/levels/lv9.map
-share/trackballs/levels/lv9.scm
-share/trackballs/levels/tmp.map
-share/trackballs/levels/tmp.scm
-share/trackballs/sfx/badpill.wav
-share/trackballs/sfx/blackDie.wav
-share/trackballs/sfx/die.wav
-share/trackballs/sfx/ff_death.wav
-share/trackballs/sfx/flag.wav
-share/trackballs/sfx/goodpill.wav
-share/trackballs/sfx/levelComplete.wav
-share/trackballs/sfx/sandcrash.wav
-share/trackballs/sfx/savepoint.wav
-share/trackballs/sfx/start.wav
-share/trackballs/sfx/switch.wav
-share/trackballs/sfx/time_warning.wav
-share/trackballs/sfx/timeout.wav
-@dirrm share/trackballs/sfx
-@dirrm share/trackballs/music
-@dirrm share/trackballs/levels
-@dirrm share/trackballs/images
-@dirrm share/trackballs/fonts
-@dirrm share/trackballs
+%%DATADIR%%/fonts/menuFont.ttf
+%%DATADIR%%/highScores
+%%DATADIR%%/images/acid.png
+%%DATADIR%%/images/difficulty0.png
+%%DATADIR%%/images/difficulty0High.png
+%%DATADIR%%/images/difficulty1.png
+%%DATADIR%%/images/difficulty1High.png
+%%DATADIR%%/images/difficulty2.png
+%%DATADIR%%/images/difficulty2High.png
+%%DATADIR%%/images/displayHighscoreBackground.jpg
+%%DATADIR%%/images/enterHighscoreBackground.jpg
+%%DATADIR%%/images/font.rgb
+%%DATADIR%%/images/gamesettings.png
+%%DATADIR%%/images/glitter.png
+%%DATADIR%%/images/header.png
+%%DATADIR%%/images/help0_1024.png
+%%DATADIR%%/images/help0_640.png
+%%DATADIR%%/images/help1_1024.png
+%%DATADIR%%/images/help1_640.png
+%%DATADIR%%/images/helpBackground.jpg
+%%DATADIR%%/images/ice.png
+%%DATADIR%%/images/left_panel.png
+%%DATADIR%%/images/levelsetup.png
+%%DATADIR%%/images/life.png
+%%DATADIR%%/images/menu0.png
+%%DATADIR%%/images/menu1.png
+%%DATADIR%%/images/menu2.png
+%%DATADIR%%/images/menu3.png
+%%DATADIR%%/images/menu4.png
+%%DATADIR%%/images/menuHigh0.png
+%%DATADIR%%/images/menuHigh1.png
+%%DATADIR%%/images/menuHigh2.png
+%%DATADIR%%/images/menuHigh3.png
+%%DATADIR%%/images/menuHigh4.png
+%%DATADIR%%/images/moreHelp.png
+%%DATADIR%%/images/moreHelpHigh.png
+%%DATADIR%%/images/mousePointer.png
+%%DATADIR%%/images/nolife.png
+%%DATADIR%%/images/playersetup.png
+%%DATADIR%%/images/return2menu.png
+%%DATADIR%%/images/return2menuHigh.png
+%%DATADIR%%/images/sand.png
+%%DATADIR%%/images/setup1.png
+%%DATADIR%%/images/setup2.png
+%%DATADIR%%/images/setup3.png
+%%DATADIR%%/images/setup4.png
+%%DATADIR%%/images/setupBackground.jpg
+%%DATADIR%%/images/setupTitle.png
+%%DATADIR%%/images/splashScreen.jpg
+%%DATADIR%%/images/start.png
+%%DATADIR%%/images/startHigh.png
+%%DATADIR%%/images/texture.png
+%%DATADIR%%/images/texture2.png
+%%DATADIR%%/images/texture3.png
+%%DATADIR%%/images/texture4.png
+%%DATADIR%%/images/track.png
+%%DATADIR%%/images/trackballs32x32.png
+%%DATADIR%%/images/trackballs48x48.png
+%%DATADIR%%/images/wings.png
+%%DATADIR%%/levels/bonus.map
+%%DATADIR%%/levels/bonus.scm
+%%DATADIR%%/levels/boot.scm
+%%DATADIR%%/levels/con1.map
+%%DATADIR%%/levels/con1.scm
+%%DATADIR%%/levels/con2.map
+%%DATADIR%%/levels/con2.scm
+%%DATADIR%%/levels/con3.map
+%%DATADIR%%/levels/con3.scm
+%%DATADIR%%/levels/con4.map
+%%DATADIR%%/levels/con4.scm
+%%DATADIR%%/levels/con5.map
+%%DATADIR%%/levels/con5.scm
+%%DATADIR%%/levels/contrib.set
+%%DATADIR%%/levels/dn.set
+%%DATADIR%%/levels/dn1.map
+%%DATADIR%%/levels/dn1.scm
+%%DATADIR%%/levels/dn2.map
+%%DATADIR%%/levels/dn2.scm
+%%DATADIR%%/levels/dn3.map
+%%DATADIR%%/levels/dn3.scm
+%%DATADIR%%/levels/dn4.map
+%%DATADIR%%/levels/dn4.scm
+%%DATADIR%%/levels/dn5.map
+%%DATADIR%%/levels/dn5.scm
+%%DATADIR%%/levels/dn6.map
+%%DATADIR%%/levels/dn6.scm
+%%DATADIR%%/levels/elite.set
+%%DATADIR%%/levels/elite1.map
+%%DATADIR%%/levels/elite1.scm
+%%DATADIR%%/levels/fourSeasons.set
+%%DATADIR%%/levels/fourSeasons_1.map
+%%DATADIR%%/levels/fourSeasons_1.scm
+%%DATADIR%%/levels/fourSeasons_2.map
+%%DATADIR%%/levels/fourSeasons_2.scm
+%%DATADIR%%/levels/fourSeasons_3.map
+%%DATADIR%%/levels/fourSeasons_3.scm
+%%DATADIR%%/levels/fourSeasons_4.map
+%%DATADIR%%/levels/fourSeasons_4.scm
+%%DATADIR%%/levels/hxtst.map
+%%DATADIR%%/levels/hxtst.scm
+%%DATADIR%%/levels/jump.set
+%%DATADIR%%/levels/jump1.map
+%%DATADIR%%/levels/jump1.scm
+%%DATADIR%%/levels/jump2.map
+%%DATADIR%%/levels/jump2.scm
+%%DATADIR%%/levels/jump3.map
+%%DATADIR%%/levels/jump3.scm
+%%DATADIR%%/levels/jump4.map
+%%DATADIR%%/levels/jump4.scm
+%%DATADIR%%/levels/jump5.map
+%%DATADIR%%/levels/jump5.scm
+%%DATADIR%%/levels/ki.set
+%%DATADIR%%/levels/ki1.map
+%%DATADIR%%/levels/ki1.scm
+%%DATADIR%%/levels/ki2.map
+%%DATADIR%%/levels/ki2.scm
+%%DATADIR%%/levels/ki3.map
+%%DATADIR%%/levels/ki3.scm
+%%DATADIR%%/levels/ki4.map
+%%DATADIR%%/levels/ki4.scm
+%%DATADIR%%/levels/lv.set
+%%DATADIR%%/levels/lv1.map
+%%DATADIR%%/levels/lv1.scm
+%%DATADIR%%/levels/lv2.map
+%%DATADIR%%/levels/lv2.scm
+%%DATADIR%%/levels/lv3.map
+%%DATADIR%%/levels/lv3.scm
+%%DATADIR%%/levels/lv4.map
+%%DATADIR%%/levels/lv4.scm
+%%DATADIR%%/levels/lv5.map
+%%DATADIR%%/levels/lv5.scm
+%%DATADIR%%/levels/lv6.map
+%%DATADIR%%/levels/lv6.scm
+%%DATADIR%%/levels/lv7.map
+%%DATADIR%%/levels/lv7.scm
+%%DATADIR%%/levels/lv8.map
+%%DATADIR%%/levels/lv8.scm
+%%DATADIR%%/levels/lv9.map
+%%DATADIR%%/levels/lv9.scm
+%%DATADIR%%/levels/tmp.map
+%%DATADIR%%/levels/tmp.scm
+%%DATADIR%%/sfx/badpill.wav
+%%DATADIR%%/sfx/blackDie.wav
+%%DATADIR%%/sfx/die.wav
+%%DATADIR%%/sfx/ff_death.wav
+%%DATADIR%%/sfx/flag.wav
+%%DATADIR%%/sfx/goodpill.wav
+%%DATADIR%%/sfx/levelComplete.wav
+%%DATADIR%%/sfx/sandcrash.wav
+%%DATADIR%%/sfx/savepoint.wav
+%%DATADIR%%/sfx/start.wav
+%%DATADIR%%/sfx/switch.wav
+%%DATADIR%%/sfx/time_warning.wav
+%%DATADIR%%/sfx/timeout.wav
+@dirrm %%DATADIR%%/sfx
+@dirrm %%DATADIR%%/music
+@dirrm %%DATADIR%%/levels
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%