4 files changed, 15 insertions, 52 deletions

diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index a09aa18bae9b..23fa621dfb06 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lbreakout2
-PORTVERSION=	2.6.4
-PORTREVISION=	3
+PORTVERSION=	2.6.5
 CATEGORIES=	games
 MASTER_SITES=	SF/lgames/${PORTNAME}/${PORTVERSION:R}
 
@@ -11,7 +10,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Breakout-style arcade game
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	gif2png:${PORTSDIR}/graphics/gif2png
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 USES=		gmake
@@ -24,8 +25,6 @@ CONFIGURE_ARGS=	--enable-sdl-net \
 CPPFLAGS+=	$$(libpng-config --I_opts)
 LDFLAGS+=	$$(libpng-config --L_opts)
 
-PKGDEINSTALL=	${PKGINSTALL}
-
 OPTIONS_DEFINE=		DOCS NLS
 OPTIONS_SUB=		yes
 
@@ -36,13 +35,19 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		'/if test/s|==|=|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
-		's|/icons|/pixmaps|' ${WRKSRC}/Makefile.in
+		'/^icondir/s|icons|pixmaps| ; \
+		 /^icon_DATA/s|48.gif|2.png| ; \
+		 /Icon=/s|$$(datadir).*.gif|lbreakout2|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		'/LDADD =/s|$$| @INTLLIBS@| ; \
 		 s|: install-data-local|:|' ${WRKSRC}/client/Makefile.in
 	@${REINPLACE_CMD} -e \
 		'/LDADD =/s|$$| @INTLLIBS@|' ${WRKSRC}/server/Makefile.in
 
+pre-build:
+	(cd ${WRKSRC} && ${CAT} lbreakout48.gif | gif2png -O -f \
+		> lbreakout2.png)
+
 post-install:
 	(cd ${WRKSRC}/client && ${INSTALL_DATA} empty.hscr \
 		${STAGEDIR}${DATADIR})
diff --git a/games/lbreakout2/distinfo b/games/lbreakout2/distinfo
index 709fe661f9e2..1ea3d3a1eb6e 100644
--- a/games/lbreakout2/distinfo
+++ b/games/lbreakout2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lbreakout2-2.6.4.tar.gz) = 0b90716d52e67c27ff41ab7aa5c09dad4f5f19a78076cc57dd4b4d7ed2c1dbd9
-SIZE (lbreakout2-2.6.4.tar.gz) = 3470380
+SHA256 (lbreakout2-2.6.5.tar.gz) = 9104d6175553da3442dc6a5fc407a669e2f5aff3eedc5d30409eb003b7a78d6f
+SIZE (lbreakout2-2.6.5.tar.gz) = 3491519
diff --git a/games/lbreakout2/pkg-install b/games/lbreakout2/pkg-install
deleted file mode 100644
index 57212cc2bd6c..000000000000
--- a/games/lbreakout2/pkg-install
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-SCOREDIR=/var/games
-SCOREFILE=lbreakout2.hscr
-
-if [ "$2" = "POST-INSTALL" -a -d "$SCOREDIR" ]; then
-   if [ ! -f "$SCOREDIR/$SCOREFILE" ]; then
-   echo "===>   Creating initial high score file $SCOREDIR/$SCOREFILE"
-   install -o root -g games -m 664 ${PKG_PREFIX}/share/lbreakout2/empty.hscr $SCOREDIR/$SCOREFILE
-   fi
-fi
-
-if [ "$2" = "DEINSTALL" -a -d "$SCOREDIR" ]; then
-   if cmp -s ${PKG_PREFIX}/share/lbreakout2/empty.hscr $SCOREDIR/$SCOREFILE; then
-      rm -f $SCOREDIR/$SCOREFILE
-   else
-      echo "To completely remove the port, please remove the following"
-      echo "file manually, if it's no longer needed:"
-      echo
-      echo "	$SCOREDIR/$SCOREFILE"
-      echo
-   fi
-fi
diff --git a/games/lbreakout2/pkg-plist b/games/lbreakout2/pkg-plist
index 5fc00148bb38..67478ae7096d 100644
--- a/games/lbreakout2/pkg-plist
+++ b/games/lbreakout2/pkg-plist
@@ -35,7 +35,7 @@ share/applications/lbreakout2.desktop
 %%PORTDOCS%%%%DOCSDIR%%/x7.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x8.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x9.jpg
-%%DATADIR%%/empty.hscr
+@sample(,games,664) %%DATADIR%%/empty.hscr /var/games/lbreakout2.hscr
 %%DATADIR%%/gfx/AbsoluteB/ABOUT
 %%DATADIR%%/gfx/AbsoluteB/README
 %%DATADIR%%/gfx/AbsoluteB/back0.png
@@ -157,10 +157,8 @@ share/applications/lbreakout2.desktop
 %%DATADIR%%/levels/Alex
 %%DATADIR%%/levels/Alexandre
 %%DATADIR%%/levels/AllNighter
-%%DATADIR%%/levels/AllWorld
 %%DATADIR%%/levels/Arcade
 %%DATADIR%%/levels/Arkanoid
-%%DATADIR%%/levels/Asteroids
 %%DATADIR%%/levels/BeOS-4ever
 %%DATADIR%%/levels/Bertrand
 %%DATADIR%%/levels/BigBang
@@ -180,8 +178,6 @@ share/applications/lbreakout2.desktop
 %%DATADIR%%/levels/D2K
 %%DATADIR%%/levels/Daves
 %%DATADIR%%/levels/Demons
-%%DATADIR%%/levels/EastAsia
-%%DATADIR%%/levels/EastEurope
 %%DATADIR%%/levels/Family
 %%DATADIR%%/levels/Fantaisie
 %%DATADIR%%/levels/FatalDoomsday
@@ -191,7 +187,6 @@ share/applications/lbreakout2.desktop
 %%DATADIR%%/levels/Freek
 %%DATADIR%%/levels/FunCity
 %%DATADIR%%/levels/Gatinha
-%%DATADIR%%/levels/GreenBricks
 %%DATADIR%%/levels/GreenWall
 %%DATADIR%%/levels/GreenWall2
 %%DATADIR%%/levels/GreenWall3
@@ -202,7 +197,6 @@ share/applications/lbreakout2.desktop
 %%DATADIR%%/levels/HighBall
 %%DATADIR%%/levels/Holidays
 %%DATADIR%%/levels/Hommage
-%%DATADIR%%/levels/Horror
 %%DATADIR%%/levels/Impossibility
 %%DATADIR%%/levels/Invisible
 %%DATADIR%%/levels/IoriYagami
@@ -216,33 +210,23 @@ share/applications/lbreakout2.desktop
 %%DATADIR%%/levels/LBreakout1
 %%DATADIR%%/levels/LBreakout2
 %%DATADIR%%/levels/Lapis
-%%DATADIR%%/levels/Lattices
 %%DATADIR%%/levels/Lattsville
 %%DATADIR%%/levels/LinuxFun
 %%DATADIR%%/levels/Lord
-%%DATADIR%%/levels/Madness
 %%DATADIR%%/levels/Maze
 %%DATADIR%%/levels/MegaMan2
 %%DATADIR%%/levels/Megadoomer
-%%DATADIR%%/levels/Memory
-%%DATADIR%%/levels/MiddleAfrica
 %%DATADIR%%/levels/MontyHall
 %%DATADIR%%/levels/NES
 %%DATADIR%%/levels/N_Arenas
 %%DATADIR%%/levels/N_Snapshots
 %%DATADIR%%/levels/Nations
 %%DATADIR%%/levels/Negundoid
-%%DATADIR%%/levels/NewBricks
 %%DATADIR%%/levels/NewOERG1
-%%DATADIR%%/levels/NorthAfrica
-%%DATADIR%%/levels/NorthAmerica
 %%DATADIR%%/levels/ObiWan
-%%DATADIR%%/levels/Oceania
-%%DATADIR%%/levels/OldGames
 %%DATADIR%%/levels/OpenSource
 %%DATADIR%%/levels/OurWorld
 %%DATADIR%%/levels/P.I.T.A.
-%%DATADIR%%/levels/PCGames
 %%DATADIR%%/levels/Pabelo
 %%DATADIR%%/levels/Patience
 %%DATADIR%%/levels/Pawset
@@ -258,8 +242,6 @@ share/applications/lbreakout2.desktop
 %%DATADIR%%/levels/SkillShot
 %%DATADIR%%/levels/Smilies
 %%DATADIR%%/levels/SnyMaxx
-%%DATADIR%%/levels/SouthAfrica
-%%DATADIR%%/levels/SouthAmerica
 %%DATADIR%%/levels/StarWars
 %%DATADIR%%/levels/Symmetry
 %%DATADIR%%/levels/Symmetry-MKII
@@ -273,8 +255,6 @@ share/applications/lbreakout2.desktop
 %%DATADIR%%/levels/Vader
 %%DATADIR%%/levels/WTF
 %%DATADIR%%/levels/Weirdness
-%%DATADIR%%/levels/WestAsia
-%%DATADIR%%/levels/WestEurope
 %%DATADIR%%/levels/Wizi
 %%DATADIR%%/levels/Wolvie
 %%DATADIR%%/levels/WonderWalls
@@ -320,7 +300,8 @@ share/applications/lbreakout2.desktop
 %%DATADIR%%/sounds/wall.wav
 %%DATADIR%%/sounds/weak_ball.wav
 %%DATADIR%%/sounds/wontgiveup.wav
+%%NLS%%share/locale/da/LC_MESSAGES/lbreakout2.mo
 %%NLS%%share/locale/de/LC_MESSAGES/lbreakout2.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/lbreakout2.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/lbreakout2.mo
-share/pixmaps/lbreakout48.gif
+share/pixmaps/lbreakout2.png