From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 18 17:30:08 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E94031065672 for ; Wed, 18 Feb 2009 17:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C126C8FC2F for ; Wed, 18 Feb 2009 17:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n1IHU7tb012809 for ; Wed, 18 Feb 2009 17:30:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n1IHU7Bi012799; Wed, 18 Feb 2009 17:30:07 GMT (envelope-from gnats) Resent-Date: Wed, 18 Feb 2009 17:30:07 GMT Resent-Message-Id: <200902181730.n1IHU7Bi012799@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB9BE106566C for ; Wed, 18 Feb 2009 17:24:24 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa104lp.auone-net.jp (msa104lp.auone-net.jp [222.3.140.167]) by mx1.freebsd.org (Postfix) with ESMTP id A57468FC1B for ; Wed, 18 Feb 2009 17:24:23 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa104lp.auone-net.jp (MSA104lp [172.27.12.182]) by msa104lp.auone-net.jp (au one net msa) with ESMTP id DF22D58C24B for ; Thu, 19 Feb 2009 02:04:15 +0900 (JST) Received: from localhost.localdomain (ZT037157.ppp.dion.ne.jp [59.128.37.157]) by msa104lp.auone-net.jp (au one net msa) with ESMTP id 92B2A2BC031 for ; Thu, 19 Feb 2009 02:03:15 +0900 (JST) Message-Id: <20090219020055.2515794d.tkato432@yahoo.com> Date: Thu, 19 Feb 2009 02:00:55 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/131837: Update port: games/xblast to 2.10.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Feb 2009 17:30:08 -0000 >Number: 131837 >Category: ports >Synopsis: Update port: games/xblast to 2.10.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 18 17:30:07 UTC 2009 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.1-RELEASE-p1 i386 >Organization: >Environment: >Description: - Update to version 2.10.4 Remove file: files/patch-aa files/patch-ab files/patch-ac files/re-image files/re-level files/re-sounds >How-To-Repeat: >Fix: diff -urN /usr/ports/games/xblast/Makefile games/xblast/Makefile --- /usr/ports/games/xblast/Makefile 2008-12-18 15:21:23.000000000 +0900 +++ games/xblast/Makefile 2009-02-09 04:40:31.000000000 +0900 @@ -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) +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 diff -urN /usr/ports/games/xblast/distinfo games/xblast/distinfo --- /usr/ports/games/xblast/distinfo 2006-01-22 22:05:03.000000000 +0900 +++ games/xblast/distinfo 2009-02-09 01:31:49.000000000 +0900 @@ -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 diff -urN /usr/ports/games/xblast/files/patch-aa games/xblast/files/patch-aa --- /usr/ports/games/xblast/files/patch-aa 2004-12-29 13:40:14.000000000 +0900 +++ games/xblast/files/patch-aa 1970-01-01 09:00:00.000000000 +0900 @@ -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),,,) diff -urN /usr/ports/games/xblast/files/patch-ab games/xblast/files/patch-ab --- /usr/ports/games/xblast/files/patch-ab 2004-12-31 19:34:50.000000000 +0900 +++ games/xblast/files/patch-ab 1970-01-01 09:00:00.000000000 +0900 @@ -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 - #include - #ifdef __FreeBSD__ --#include -+#include - #else - #include - #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) diff -urN /usr/ports/games/xblast/files/patch-ac games/xblast/files/patch-ac --- /usr/ports/games/xblast/files/patch-ac 2004-12-30 20:50:50.000000000 +0900 +++ games/xblast/files/patch-ac 1970-01-01 09:00:00.000000000 +0900 @@ -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(iRelease-Note: >Audit-Trail: >Unformatted: