- Update to 0.8.5

PR:		ports/102992
Submitted by:	Dmitry Marakasov <amdmi3 at mail.ru> (maintainer)

3 files changed, 61 insertions, 23 deletions

diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile
index 2e6f32984b1b..a4d425203792 100644
--- a/games/volleyball/Makefile
+++ b/games/volleyball/Makefile
@@ -6,29 +6,41 @@
 #
 
 PORTNAME=	volleyball
-PORTVERSION=	0.8
+PORTVERSION=	0.8.5
 CATEGORIES=	games
 MASTER_SITES=	http://www.losersjuegos.com.ar/juegos/volleyball/descargas/
-DISTNAME=	${PORTNAME}20051004
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-data-${DATAVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	amdmi3@mail.ru
 COMMENT=	A game similar to GNU Arcade Volleyball
 
-USE_SDL=	sdl
+USE_SDL=	sdl image
 USE_GMAKE=	yes
-MAKE_ARGS=	CC="${CC}" CFLAGS="`${SDL_CONFIG} --cflags` ${CFLAGS}" \
-		LDFLAGS="`${SDL_CONFIG} --libs`"
-ALL_TARGET=	volleyball
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ARGS=	--disable-nls # strangeness in nls support
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GCC=	3.4+
 
-WRKSRC=	${WRKDIR}/${PORTNAME}/paso_8
+PORTDOCS=	README
+MAN6=		volleyball.6
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|ima/|${DATADIR}/|' ${WRKSRC}/*.c
-	@${REINPLACE_CMD} -e 's|^\([LDC]*FLAGS\)|#\1|' ${WRKSRC}/Makefile
+DATAVERSION=	0.8.4
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/volleyball ${PREFIX}/bin/
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/ima/* ${DATADIR}/
+post-configure:
+	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
+		${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+
+post-install:
+	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
+	
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/volleyball/distinfo b/games/volleyball/distinfo
index bf92350cd1e6..31ab20b99e4c 100644
--- a/games/volleyball/distinfo
+++ b/games/volleyball/distinfo
@@ -1,3 +1,6 @@
-MD5 (volleyball20051004.tar.gz) = ecb73928e6102d8a6788a98b7c631495
-SHA256 (volleyball20051004.tar.gz) = 1110f850c4bad4def56447d0f1b4870ef421b1f63a5b80f2cd31daa17358b21b
-SIZE (volleyball20051004.tar.gz) = 366477
+MD5 (volleyball-0.8.5.tar.gz) = 1d4f675091a25b8cdf3bc239c84dd260
+SHA256 (volleyball-0.8.5.tar.gz) = 0631f6c65b06fa5f9cf5c1506c56a52fecdfbadabdd56152de50444253cb497b
+SIZE (volleyball-0.8.5.tar.gz) = 319782
+MD5 (volleyball-data-0.8.4.tar.gz) = 5268b3c3ad7a28940c72080d4807b8ae
+SHA256 (volleyball-data-0.8.4.tar.gz) = 503330b2231feaa3f7d9644cef9a0d76ce29823d6d29d4e27fa365946df454cc
+SIZE (volleyball-data-0.8.4.tar.gz) = 782058
diff --git a/games/volleyball/pkg-plist b/games/volleyball/pkg-plist
index 5ea96c83b797..e2923384cab3 100644
--- a/games/volleyball/pkg-plist
+++ b/games/volleyball/pkg-plist
@@ -1,8 +1,31 @@
 bin/volleyball
-%%DATADIR%%/LICENSE-KIND.FILES
-%%DATADIR%%/fondo.bmp
-%%DATADIR%%/fuente.bmp
-%%DATADIR%%/pelota.bmp
-%%DATADIR%%/personaje_1.bmp
-%%DATADIR%%/personaje_2.bmp
+%%DATADIR%%/about.png
+%%DATADIR%%/ball.png
+%%DATADIR%%/ball_collision.png
+%%DATADIR%%/characters/colo/info.txt
+%%DATADIR%%/characters/colo/preview.png
+%%DATADIR%%/characters/colo/sprites.png
+%%DATADIR%%/characters/matar/info.txt
+%%DATADIR%%/characters/matar/preview.png
+%%DATADIR%%/characters/matar/sprites.png
+%%DATADIR%%/characters/pingu/info.txt
+%%DATADIR%%/characters/pingu/preview.png
+%%DATADIR%%/characters/pingu/sprites.png
+%%DATADIR%%/characters/turtle/info.txt
+%%DATADIR%%/characters/turtle/preview.png
+%%DATADIR%%/characters/turtle/sprites.png
+%%DATADIR%%/cursor.png
+%%DATADIR%%/font.png
+%%DATADIR%%/font_disabled.png
+%%DATADIR%%/font_selected.png
+%%DATADIR%%/main_menu.png
+%%DATADIR%%/pointer.png
+%%DATADIR%%/select.png
+%%DATADIR%%/stage1.png
+%%DATADIR%%/title.png
+@dirrm %%DATADIR%%/characters/turtle
+@dirrm %%DATADIR%%/characters/pingu
+@dirrm %%DATADIR%%/characters/matar
+@dirrm %%DATADIR%%/characters/colo
+@dirrm %%DATADIR%%/characters
 @dirrm %%DATADIR%%