- Update to 2.10.4

PR:		131837
Submitted by:	Ports Fury

games/xblast/Makefile

@@ -6,56 +6,118 @@
 #
 
 PORTNAME=	xblast
-PORTVERSION=	2.9.22
-PORTREVISION=	1
+PORTVERSION=	2.10.4
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xblast
-.ifdef (WITHOUT_SOUND)
-PKGNAMESUFFIX=	-nosound
-.endif
+MASTER_SITES=	SF
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=	image.tar.gz
-DISTFILES+=	level.tar.gz
-.ifndef (WITHOUT_SOUND)
-DISTFILES+=	sounds.tar.gz
+DISTFILES+=	${IMAGES_DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=	${LEVELS_DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=	${MODELS_DISTNAME}${EXTRACT_SUFX}
+.if !defined(WITHOUT_SOUND)
+DISTFILES+=	${MUSICS_DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=	${SOUNDS_DISTNAME}${EXTRACT_SUFX}
 .endif
 DIST_SUBDIR=	xblast
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-player real-time strategy game for X11
 
-CFLAGS+=	-DGAME_DATADIR='\"${DATADIR}\"'
-.ifndef (WITHOUT_SOUND)
-CFLAGS+=	-DXBLAST_SOUND
-.endif
-USE_IMAKE=	yes
-.ifndef (WITHOUT_SOUND)
-ALL_TARGET=	all xbsndsrv
-.endif
-MAN1=		xblast.1
-.ifndef (WITHOUT_SOUND)
-PLIST_SUB+=    WITH_SOUND=""
+WANT_SDL=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--enable-admin
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
+		AUTOMAKE="${TRUE}"
+
+MAN6=		xblast.6
+
+DATADIR=	${PREFIX}/share/XBlast-TNT
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+FONTSDIR=	${LOCALBASE}/lib/X11/fonts/bitstream-vera
+
+IMAGES_DISTNAME=images-2005-01-06
+LEVELS_DISTNAME=levels-2005-01-06
+MODELS_DISTNAME=models-2005-01-06
+MUSICS_DISTNAME=musics-2005-01-06
+SOUNDS_DISTNAME=sounds
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .else
-PLIST_SUB+=    WITH_SOUND="@comment "
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
 .endif
 
-.ifndef (WITHOUT_SOUND)
-SOUNDS=		sounds
+.if defined(WITHOUT_SDL)
+USE_XORG=	ice x11
+CONFIGURE_ARGS+=	--disable-sdl
+PLIST_SUB+=	NOSDL=""
+.else
+RUN_DEPENDS+=	${FONTSDIR}/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
+USE_SDL+=	gfx image mixer net ttf sdl
+CONFIGURE_ARGS+=	--enable-sdl
+PLIST_SUB+=	NOSDL="@comment "
 .endif
 
-post-install:
-.ifndef (WITHOUT_SOUND)
-		${INSTALL_PROGRAM} ${WRKSRC}/xbsndsrv ${PREFIX}/bin
+.if defined(WITHOUT_SOUND) && defined(WITHOUT_SDL)
+PKGNAMESUFFIX=	-nosound
+CONFIGURE_ARGS+=	--disable-sound
+PLIST_SUB+=	SOUND="@comment "
+.else
+CONFIGURE_ARGS+=	--enable-sound
+PLIST_SUB+=	SOUND=""
 .endif
-		${MKDIR} ${DATADIR}
-.for d in image level ${SOUNDS}
-		cd ${WRKDIR}; \
-		${FIND} $d -type d | (cd ${DATADIR}; ${XARGS} ${MKDIR}); \
-		${FIND} $d -type f | ${EGREP} -f ${FILESDIR}/re-${d} | \
-		while read f; do \
-			${INSTALL_DATA} $$f ${DATADIR}/$$f; \
-		done
+
+.if defined(WITH_SMPF)
+CONFIGURE_ARGS+=	--enable-SMPF
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/games/|/|g ; \
+		 /-ggdb/d' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|$$(game_datadir)/locale|$$(prefix)/share/locale|g ; \
+		 s|^xblast_LDADD =.*$$|xblast_LDADD = $$(LIBINTL)|g' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|"Vera.ttf"|"${FONTSDIR}/Vera.ttf"|g' ${WRKSRC}/sdl_text.c
+
+do-install:
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} xblast ${PREFIX}/bin/xblast
+.if defined(WITHOUT_SDL) && !defined(WITHOUT_SOUND)
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} xbsndsrv ${PREFIX}/bin/xbsndsrv
+.endif
+	cd ${WRKSRC} && ${INSTALL_MAN} xblast.man ${MAN6PREFIX}/man/man6/xblast.6
+.if !defined(WITHOUT_NLS)
+.for lang in de fr
+	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
+	cd ${WRKSRC}/po && ${INSTALL_DATA} ${lang}.gmo \
+		${PREFIX}/share/locale/${lang}/LC_MESSAGES/xblast.mo
 .endfor
+.endif
+	@${MKDIR} ${DATADIR}/image
+	@(${TAR} -C ${WRKDIR}/${IMAGES_DISTNAME} --exclude "Imakefile" \
+		-cf - . | ${TAR} -C ${DATADIR}/image --unlink -xf -)
+	@${MKDIR} ${DATADIR}/level
+	@(${TAR} -C ${WRKDIR}/${LEVELS_DISTNAME} --exclude "Imakefile" \
+		-cf - . | ${TAR} -C ${DATADIR}/level --unlink -xf -)
+	@${MKDIR} ${DATADIR}/image/sprite
+	@(${TAR} -C ${WRKDIR}/${MODELS_DISTNAME} --exclude "Imakefile" \
+		-cf - . | ${TAR} -C ${DATADIR}/image/sprite --unlink -xf -)
+.if !defined(WITHOUT_SOUND)
+	@${MKDIR} ${DATADIR}/sounds
+	@(${TAR} -C ${WRKDIR}/${MUSICS_DISTNAME} --exclude "Imakefile" \
+		-cf - . | ${TAR} -C ${DATADIR}/sounds --unlink -xf -)
+	@(${TAR} -C ${WRKDIR}/${SOUNDS_DISTNAME} --exclude "Imakefile" \
+		-cf - . | ${TAR} -C ${DATADIR}/sounds --unlink -xf -)
+.endif
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+	@${FIND} ${DATADIR} -type d -exec ${CHMOD} 755 {} \;
+	@${FIND} ${DATADIR} -type f -exec ${CHMOD} ${SHAREMODE} {} \; 
 
 .include <bsd.port.mk>

games/xblast/distinfo

@@ -1,12 +1,18 @@
-MD5 (xblast/xblast-2.9.22.tar.gz) = 658e91e053e9d7ff78979688325c806a
-SHA256 (xblast/xblast-2.9.22.tar.gz) = fc6b4ace1172a7734a72e4a64c5658654cfe1ecaee25afd7c86cc97ac3ae69ee
-SIZE (xblast/xblast-2.9.22.tar.gz) = 4969378
-MD5 (xblast/image.tar.gz) = 479c0de348c18bcfa6f3718729930400
-SHA256 (xblast/image.tar.gz) = 0b225c79dccc03ca8444df3d2e8d1336390133d178138d7243750e599f16b625
-SIZE (xblast/image.tar.gz) = 4643000
-MD5 (xblast/level.tar.gz) = 4c4a4a121dc2381534d5d3f7b5ca59f5
-SHA256 (xblast/level.tar.gz) = ea007ae28aae6371d76a0c9ab6f31960eabb32121538ebfa888c5ddb7af1337e
-SIZE (xblast/level.tar.gz) = 267681
+MD5 (xblast/xblast-2.10.4.tar.gz) = eca7620c34ab49bb62fa8ef01f73b2f3
+SHA256 (xblast/xblast-2.10.4.tar.gz) = 93cd7c47ff83e00655605fcbec6a031f75d170d7eb467b85bcbe6c1733bcc213
+SIZE (xblast/xblast-2.10.4.tar.gz) = 684965
+MD5 (xblast/images-2005-01-06.tar.gz) = f92d0965c759695e6a18310f885c6f40
+SHA256 (xblast/images-2005-01-06.tar.gz) = 24b627af1d4884fa39cbfb4ad2d953661aa5283f96ee678137ba554b67423542
+SIZE (xblast/images-2005-01-06.tar.gz) = 860830
+MD5 (xblast/levels-2005-01-06.tar.gz) = ea6277af0e97ad7eaea09370f4fe55ba
+SHA256 (xblast/levels-2005-01-06.tar.gz) = af145dcb40c94e07953f3a12adf2ab67411428b31a0446df3df7c91d5f26075a
+SIZE (xblast/levels-2005-01-06.tar.gz) = 283353
+MD5 (xblast/models-2005-01-06.tar.gz) = 887e84c9e7844823e3c8b59e63e8859b
+SHA256 (xblast/models-2005-01-06.tar.gz) = daed0d50c0371afe187159c7692d7d26d124e80e9c3208043d83a5b6ca610f77
+SIZE (xblast/models-2005-01-06.tar.gz) = 1738564
+MD5 (xblast/musics-2005-01-06.tar.gz) = e721a2e448f81ca83d9a0a772251f611
+SHA256 (xblast/musics-2005-01-06.tar.gz) = 42a45b074925755d7d2a0effb9a59e9e3874f92a7aa9e10bb90f98eeb11cbc61
+SIZE (xblast/musics-2005-01-06.tar.gz) = 5317575
 MD5 (xblast/sounds.tar.gz) = 809c27f1002ad4d7aa836e083f52a199
 SHA256 (xblast/sounds.tar.gz) = 310c89592139df617e6e981ab5bf3bfca84a7778d5191334bda8eb069c924b61
 SIZE (xblast/sounds.tar.gz) = 1612625

games/xblast/files/patch-aa

@@ -1,11 +0,0 @@
---- Imakefile.orig	Wed Jul  7 12:52:58 2004
-+++ Imakefile	Tue Dec 28 17:53:45 2004
-@@ -72,3 +72,8 @@
- 
- AllTarget(xblast)
- ComplexProgramTarget(xblast)
-+
-+SRCS2  = xbsndsrv.c
-+OBJS2  = xbsndsrv.o
-+
-+NormalProgramTarget(xbsndsrv,$(OBJS2),,,)

games/xblast/files/patch-ab

@@ -1,36 +0,0 @@
---- xbsndsrv.c.orig	Wed Jul  7 12:53:13 2004
-+++ xbsndsrv.c	Thu Dec 30 21:45:25 2004
-@@ -43,7 +43,7 @@
- #include <sys/ioctl.h>
- #include <sys/time.h>
- #ifdef __FreeBSD__
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #else
- #include <linux/soundcard.h>
- #endif
-@@ -723,16 +723,23 @@
- 	int n;
- 	struct timeval tv;
- 	fd_set rs;
-+	fd_set es;
- 
- 	while(1)
- 	  {
- 	    tv.tv_sec = tv.tv_usec = 0;
- 	    FD_ZERO(&rs);
- 	    FD_SET(0, &rs);
-+	    FD_ZERO(&es);
-+	    FD_SET(0, &es);
- 	    
--	    if (select(1, &rs, NULL, NULL, &tv) > 0 && FD_ISSET(0, &rs))
-+	    if (select(1, &rs, NULL, &es, &tv) > 0 && FD_ISSET(0, &rs))
- 	      {
- 		n = read(0, command_buff, 8);
-+		if ((n == 0) && FD_ISSET(0, &es)) {
-+		  fprintf(stderr, "Parent was killed, bailing out ...\n");
-+		  exit(0);
-+		}
- 		cmd = command_buff;
- 		/* there are commands in the pipe */
- 		while (n > 0)

games/xblast/files/patch-ac

@@ -1,17 +0,0 @@
---- xblast.c.orig	Wed Jul  7 12:53:41 2004
-+++ xblast.c	Thu Dec 30 12:42:51 2004
-@@ -84,12 +84,12 @@
-   XBPlayerHost   hostType;
-   XBBool         autoCentral;
-   XBBool   nsound;
-+
-   autoCentral = XBFalse;
-   nsound = XBFalse;
- #ifndef WMS
--  int i;
-   if(argc>1){
--    i=1;
-+    int i=1;
-     while(i<argc){
-       if(0==strcmp("-central",argv[i])) {
-       

games/xblast/files/re-image

@@ -1 +0,0 @@
-\.(epm|pbm|ppm)$

games/xblast/files/re-level

@@ -1 +0,0 @@
-\.(xal|ppm)$

games/xblast/files/re-sounds

@@ -1 +0,0 @@
-\.(raw)$