games/lbreakout2: Upgrade version 2.6 => 2.6.4 and stage

PR:		191821
Submitted by:	Ports Fury

6 files changed, 110 insertions, 75 deletions

diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index ece3d46e6be6..379d23a60179 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -2,45 +2,48 @@
 # $FreeBSD$
 
 PORTNAME=	lbreakout2
-PORTVERSION=	2.6
-PORTREVISION=	5
+PORTVERSION=	2.6.4
 CATEGORIES=	games
-MASTER_SITES=	SF/lgames/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/lgames/${PORTNAME}/${PORTVERSION:R}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The polished successor to LBreakout
+COMMENT=	Breakout-style arcade game
+
+LICENSE=	GPLv2 # (or later)
 
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
-USE_SDL=	mixer net sdl
 USES=		gmake
+USE_SDL=	mixer net sdl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sdl-net \
 		--localstatedir=/var/games \
-		--disable-nls
+		--with-docdir=${PREFIX}/share/doc
+
+CPPFLAGS+=	$$(libpng-config --I_opts)
+LDFLAGS+=	$$(libpng-config --L_opts)
 
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
-LDFLAGS+=	-L${LOCALBASE}/lib
+PKGDEINSTALL=	${PKGINSTALL}
+
+OPTIONS_DEFINE=		DOCS NLS
+OPTIONS_SUB=		yes
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|== "-D|= "-D|g' ${WRKSRC}/configure
+		'/if test/s|==|=|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|/icons|/pixmaps|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
-		's|client docs|client|g' ${WRKSRC}/Makefile.in
+		'/LDADD =/s|$$| @INTLLIBS@| ; \
+		 s|: install-data-local|:|' ${WRKSRC}/client/Makefile.in
 	@${REINPLACE_CMD} -e \
-		's|: install-data-local|:|g' ${WRKSRC}/client/Makefile.in
+		'/LDADD =/s|$$| @INTLLIBS@|' ${WRKSRC}/server/Makefile.in
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/client/empty.hscr ${DATADIR}
-	@${CHOWN} root:games ${PREFIX}/bin/lbreakout2
-	@${CHMOD} g+s ${PREFIX}/bin/lbreakout2
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR}
-.endif
-	@${SETENV} "PKG_PREFIX=${PREFIX}" \
-		${SH} ${.CURDIR}/pkg-install ${PKGNAME} POST-INSTALL
+	(cd ${WRKSRC}/client && ${INSTALL_DATA} empty.hscr \
+		${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/games/lbreakout2/distinfo b/games/lbreakout2/distinfo
index ff96cde1384f..709fe661f9e2 100644
--- a/games/lbreakout2/distinfo
+++ b/games/lbreakout2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lbreakout2-2.6.tar.gz) = 4f5d35a99b543cef1d8940823ab08c637a99b8142ad6c6b53926431868289f55
-SIZE (lbreakout2-2.6.tar.gz) = 3355988
+SHA256 (lbreakout2-2.6.4.tar.gz) = 0b90716d52e67c27ff41ab7aa5c09dad4f5f19a78076cc57dd4b4d7ed2c1dbd9
+SIZE (lbreakout2-2.6.4.tar.gz) = 3470380
diff --git a/games/lbreakout2/files/patch-stk.c b/games/lbreakout2/files/patch-stk.c
index c3dace58d2c9..6893b30d6c7c 100644
--- a/games/lbreakout2/files/patch-stk.c
+++ b/games/lbreakout2/files/patch-stk.c
@@ -1,6 +1,5 @@
 --- gui/stk.c.orig	2005-03-28 19:18:42.000000000 +0200
 +++ gui/stk.c	2012-05-03 07:07:35.000000000 +0200
-@@ -19,6 +19,7 @@
  #include <stdarg.h>
  #include <stdlib.h>
  #include <png.h>
@@ -17,14 +16,7 @@
  {
  	SDL_RWops *src;
  
-@@ -105,13 +106,13 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if ( setjmp(png_ptr->jmpbuf) ) {
-+	if ( setjmp(png_jmpbuf(png_ptr)) ) {
- 		IMG_SetError("Error reading the PNG file.");
- 		goto done;
+@@ -111,7 +112,7 @@
  	}
  
  	/* Set up the input control */
diff --git a/games/lbreakout2/pkg-descr b/games/lbreakout2/pkg-descr
index 5c45a9618da7..a0b741ade715 100644
--- a/games/lbreakout2/pkg-descr
+++ b/games/lbreakout2/pkg-descr
@@ -1,10 +1,10 @@
-The polished successor to LBreakout offers you a new challenge in more than 50
-levels with loads of new bonuses (goldshower, joker, explosive balls, bonus
-magnet ...), maluses (chaos, darkness, weak balls, malus magnet ...) and special
-bricks (growing bricks, explosive bricks, regenerative bricks, indestructible
-bricks, chaotic bricks).
+The polished successor to LBreakout offers you a new challenge in more
+than 50 levels with loads of new bonuses (goldshower, joker, explosive
+balls, bonus magnet ...), maluses (chaos, darkness, weak balls, malus
+magnet ...) and special bricks (growing bricks, explosive bricks,
+regenerative bricks, indestructible bricks, chaotic bricks).
 
-And if you're through with all the levels you can create complete new levelsets
-with the integrated easy-to-use level editor!
+And if you're through with all the levels you can create complete new
+levelsets with the integrated easy-to-use level editor!
 
 WWW: http://lgames.sourceforge.net/index.php?project=LBreakout2
diff --git a/games/lbreakout2/pkg-install b/games/lbreakout2/pkg-install
index 03b2139cede2..57212cc2bd6c 100644
--- a/games/lbreakout2/pkg-install
+++ b/games/lbreakout2/pkg-install
@@ -1,7 +1,23 @@
 #!/bin/sh
 
-FILE=/var/games/lbreakout2.hscr
-[ "$2" != "POST-INSTALL" -o -f "$FILE" ] && exit 0
+SCOREDIR=/var/games
+SCOREFILE=lbreakout2.hscr
 
-echo "===>   Creating initial high score file $FILE"
-install -o root -g games -m 664 ${PKG_PREFIX}/share/lbreakout2/empty.hscr $FILE
+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 570881966143..d1751df84f68 100644
--- a/games/lbreakout2/pkg-plist
+++ b/games/lbreakout2/pkg-plist
@@ -1,5 +1,6 @@
 bin/lbreakout2
 bin/lbreakout2server
+share/applications/lbreakout2.desktop
 %%PORTDOCS%%%%DOCSDIR%%/b0.jpg
 %%PORTDOCS%%%%DOCSDIR%%/b1.jpg
 %%PORTDOCS%%%%DOCSDIR%%/b2.jpg
@@ -34,7 +35,6 @@ bin/lbreakout2server
 %%PORTDOCS%%%%DOCSDIR%%/x7.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x8.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x9.jpg
-@unexec if cmp -s %D/%%DATADIR%%/empty.hscr /var/games/lbreakout2.hscr; then rm -f /var/games/lbreakout2.hscr; else true; fi
 %%DATADIR%%/empty.hscr
 %%DATADIR%%/gfx/AbsoluteB/ABOUT
 %%DATADIR%%/gfx/AbsoluteB/README
@@ -155,29 +155,43 @@ bin/lbreakout2server
 %%DATADIR%%/levels/Abc
 %%DATADIR%%/levels/Afl
 %%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
 %%DATADIR%%/levels/Biolab428
 %%DATADIR%%/levels/Blues
 %%DATADIR%%/levels/Bombs
 %%DATADIR%%/levels/CalendarFun
+%%DATADIR%%/levels/Celine
 %%DATADIR%%/levels/Chaos
 %%DATADIR%%/levels/Choices
+%%DATADIR%%/levels/Circle
+%%DATADIR%%/levels/Classique
 %%DATADIR%%/levels/Color
 %%DATADIR%%/levels/Composers
-%%DATADIR%%/levels/Circle
+%%DATADIR%%/levels/Cool
+%%DATADIR%%/levels/Crossing
 %%DATADIR%%/levels/D2K
 %%DATADIR%%/levels/Daves
 %%DATADIR%%/levels/Demons
+%%DATADIR%%/levels/EastAsia
+%%DATADIR%%/levels/EastEurope
 %%DATADIR%%/levels/Family
 %%DATADIR%%/levels/Fantaisie
 %%DATADIR%%/levels/FatalDoomsday
+%%DATADIR%%/levels/FatalDoomsday2
 %%DATADIR%%/levels/Flower
 %%DATADIR%%/levels/Fly
 %%DATADIR%%/levels/Freek
 %%DATADIR%%/levels/FunCity
 %%DATADIR%%/levels/Gatinha
+%%DATADIR%%/levels/GreenBricks
 %%DATADIR%%/levels/GreenWall
 %%DATADIR%%/levels/GreenWall2
 %%DATADIR%%/levels/GreenWall3
@@ -188,34 +202,55 @@ bin/lbreakout2server
 %%DATADIR%%/levels/HighBall
 %%DATADIR%%/levels/Holidays
 %%DATADIR%%/levels/Hommage
+%%DATADIR%%/levels/Horror
 %%DATADIR%%/levels/Impossibility
+%%DATADIR%%/levels/Invisible
 %%DATADIR%%/levels/IoriYagami
 %%DATADIR%%/levels/Iris
 %%DATADIR%%/levels/IrrenhausAh
 %%DATADIR%%/levels/Izusiowe
+%%DATADIR%%/levels/JediAdventure
 %%DATADIR%%/levels/Kazan-1
 %%DATADIR%%/levels/Kevin
+%%DATADIR%%/levels/KungFu
 %%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/Negundoid
-%%DATADIR%%/levels/NewOERG1
+%%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
 %%DATADIR%%/levels/Ph33r
 %%DATADIR%%/levels/PlayAgain
 %%DATADIR%%/levels/Popcorn
 %%DATADIR%%/levels/R-World
+%%DATADIR%%/levels/RichQuick
 %%DATADIR%%/levels/Runes
 %%DATADIR%%/levels/Sadistic
 %%DATADIR%%/levels/Shimitar
@@ -223,44 +258,32 @@ bin/lbreakout2server
 %%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
 %%DATADIR%%/levels/T.C.S.
+%%DATADIR%%/levels/TheEnd
 %%DATADIR%%/levels/TheGauntlet
 %%DATADIR%%/levels/TimeWaster
+%%DATADIR%%/levels/TrickShot
 %%DATADIR%%/levels/Tricky
 %%DATADIR%%/levels/Twilight
+%%DATADIR%%/levels/Vader
 %%DATADIR%%/levels/WTF
+%%DATADIR%%/levels/Weirdness
+%%DATADIR%%/levels/WestAsia
+%%DATADIR%%/levels/WestEurope
+%%DATADIR%%/levels/Wizi
 %%DATADIR%%/levels/Wolvie
 %%DATADIR%%/levels/WonderWalls
 %%DATADIR%%/levels/X
 %%DATADIR%%/levels/Yexter
-%%DATADIR%%/levels/Zigies
-%%DATADIR%%/levels/Zufallswelt
-%%DATADIR%%/levels/FatalDoomsday2
-%%DATADIR%%/levels/RichQuick
-%%DATADIR%%/levels/MontyHall
-%%DATADIR%%/levels/BigBang
-%%DATADIR%%/levels/P.I.T.A.
-%%DATADIR%%/levels/Alexandre
-%%DATADIR%%/levels/Bertrand
-%%DATADIR%%/levels/Celine
-%%DATADIR%%/levels/Classique
-%%DATADIR%%/levels/Invisible
-%%DATADIR%%/levels/Nations
-%%DATADIR%%/levels/ObiWan
-%%DATADIR%%/levels/StarWars
-%%DATADIR%%/levels/Vader
 %%DATADIR%%/levels/Yoda
-%%DATADIR%%/levels/Crossing
-%%DATADIR%%/levels/TrickShot
-%%DATADIR%%/levels/Weirdness
-%%DATADIR%%/levels/TheEnd
-%%DATADIR%%/levels/AllNighter
-%%DATADIR%%/levels/Patience
-%%DATADIR%%/levels/JediAdventure
-%%DATADIR%%/levels/KungFu
+%%DATADIR%%/levels/Zigies
 %%DATADIR%%/levels/Zooligan
+%%DATADIR%%/levels/Zufallswelt
 %%DATADIR%%/sounds/attach.wav
 %%DATADIR%%/sounds/bonus_magnet.wav
 %%DATADIR%%/sounds/chaos.wav
@@ -297,9 +320,10 @@ bin/lbreakout2server
 %%DATADIR%%/sounds/wall.wav
 %%DATADIR%%/sounds/weak_ball.wav
 %%DATADIR%%/sounds/wontgiveup.wav
-share/applications/lbreakout2.desktop
-share/icons/lbreakout48.gif
-@dirrmtry share/icons
+%%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
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/levels
 @dirrm %%DATADIR%%/gui_theme