From owner-svn-ports-all@FreeBSD.ORG Sat Mar 29 20:39:00 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CBF21DF5; Sat, 29 Mar 2014 20:39:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B79DAA1F; Sat, 29 Mar 2014 20:39:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2TKd0EJ071307; Sat, 29 Mar 2014 20:39:00 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2TKcvKT071276; Sat, 29 Mar 2014 20:38:57 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201403292038.s2TKcvKT071276@svn.freebsd.org> From: Rusmir Dusko Date: Sat, 29 Mar 2014 20:38:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349590 - in head/games/xbattle: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Mar 2014 20:39:00 -0000 Author: nemysis Date: Sat Mar 29 20:38:57 2014 New Revision: 349590 URL: http://svnweb.freebsd.org/changeset/ports/349590 QAT: https://qat.redports.org/buildarchive/r349590/ Log: - Bump PORTREVISION for dependency and pkg-plist change - Change master sites, add icons - Take maintainership - Remove DEPRECATED, EXPIRATION_DATE - Add dependency for x11/xdialog - Add USE_CSTD=gnu89 - Support STAGEDIR - Remove tutorial* from DOCS, SH scripts which are used to learn how to use XBattle - Add Desktop entry file - Simplify installation handling - Fix MAN to install in man6 - Recreate patch with make makepatch, fix MAN to install in man6 - Add patches, use some Debian patches, fix bad C code and video (Pseudo Color), - Add files/xbattle-menu.in for Desktop with Xdialog - Change pkg-descr, add WWW - Change pkg-plist, remove DOCS Added: head/games/xbattle/files/patch-Imakefile (contents, props changed) head/games/xbattle/files/patch-command.c (contents, props changed) head/games/xbattle/files/patch-draw.c (contents, props changed) head/games/xbattle/files/patch-edit.c (contents, props changed) head/games/xbattle/files/patch-error.c (contents, props changed) head/games/xbattle/files/patch-init.c (contents, props changed) head/games/xbattle/files/patch-main.c (contents, props changed) head/games/xbattle/files/patch-parse.c (contents, props changed) head/games/xbattle/files/patch-replay.c (contents, props changed) head/games/xbattle/files/patch-shape.c (contents, props changed) head/games/xbattle/files/patch-shape_octagon.c (contents, props changed) head/games/xbattle/files/patch-utils.c (contents, props changed) head/games/xbattle/files/patch-window.c (contents, props changed) head/games/xbattle/files/patch-xbattle.man (contents, props changed) head/games/xbattle/files/xbattle-menu.in (contents, props changed) Deleted: head/games/xbattle/files/patch-aa Modified: head/games/xbattle/Makefile head/games/xbattle/distinfo head/games/xbattle/pkg-descr head/games/xbattle/pkg-plist Modified: head/games/xbattle/Makefile ============================================================================== --- head/games/xbattle/Makefile Sat Mar 29 20:35:48 2014 (r349589) +++ head/games/xbattle/Makefile Sat Mar 29 20:38:57 2014 (r349590) @@ -3,44 +3,55 @@ PORTNAME= xbattle PORTVERSION= 5.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_GENTOO} -MASTER_SITE_SUBDIR= distfiles +MASTER_SITES= GENTOO/distfiles \ + SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:icons +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}_icons${EXTRACT_SUFX}:icons -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nemysis@FreeBSD.org COMMENT= Concurrent multi-player battle strategy game -DEPRECATED= Unmaintained since 2001 -EXPIRATION_DATE= 2014-04-12 +RUN_DEPENDS= xdialog>0:${PORTSDIR}/x11/xdialog + USES= imake USE_XORG= x11 xext -MAN1= xbattle.1 - +USE_CSTD= gnu89 CFLAGS+= -Wno-return-type -NO_STAGE= yes - +PORTDOCS= README OPTIONS_DEFINE= DOCS -.include +INSTALLS_ICONS= yes +ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 128x128 + +SUB_FILES= ${PORTNAME}-menu + +DESKTOP_ENTRIES="XBattle" "" "${PORTNAME}" \ + "${PORTNAME}-menu" "Game;ArcadeGame;" "" post-install: - $(MKDIR) $(PREFIX)/share/xbattle - $(CP) -R $(WRKSRC)/xbos $(PREFIX)/share/xbattle/ - $(CP) -R $(WRKSRC)/xbts $(PREFIX)/share/xbattle/ - $(CP) -R $(WRKSRC)/xbas $(PREFIX)/share/xbattle/ - @${CHMOD} 755 ${PREFIX}/share/xbattle - @${CHMOD} 755 ${PREFIX}/share/xbattle/xbas - @${CHMOD} 644 ${PREFIX}/share/xbattle/xbas/* - @${CHMOD} 755 ${PREFIX}/share/xbattle/xbos - @${CHMOD} 644 ${PREFIX}/share/xbattle/xbos/* - @${CHMOD} 755 ${PREFIX}/share/xbattle/xbts - @${CHMOD} 644 ${PREFIX}/share/xbattle/xbts/* -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/tutorial* ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-menu ${STAGEDIR}${PREFIX}/bin/ +.for d in xbas xbos xbts + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) + @${CHMOD} 755 ${STAGEDIR}${DATADIR}/${d} + @${CHMOD} 644 ${STAGEDIR}${DATADIR}/${d}/* +.endfor + @${CHMOD} 755 ${STAGEDIR}${DATADIR} +.for f in tutorial1 tutorial2 + ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${f} +.endfor + +.for s in ${ICON_SIZES} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/ + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png +.endfor + ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/games/xbattle/distinfo ============================================================================== --- head/games/xbattle/distinfo Sat Mar 29 20:35:48 2014 (r349589) +++ head/games/xbattle/distinfo Sat Mar 29 20:38:57 2014 (r349590) @@ -1,2 +1,4 @@ SHA256 (xbattle-5.4.1.tar.gz) = 9de38df361c87d0fdc65e13cf2fa3bb28dc22a8d04cc94f2f08e6cd9457ee180 SIZE (xbattle-5.4.1.tar.gz) = 128982 +SHA256 (xbattle_icons.tar.gz) = f3e8fca5a6eeaebcecec0019894fa2d80402d20a9eabd20c32bb58a1acadbf4f +SIZE (xbattle_icons.tar.gz) = 22326 Added: head/games/xbattle/files/patch-Imakefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-Imakefile Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,17 @@ +--- ./Imakefile.orig 1995-10-17 15:14:37.000000000 +0100 ++++ ./Imakefile 2014-03-29 18:29:01.369960166 +0100 +@@ -6,10 +6,11 @@ + CCOPTIONS = -Wf,-XNl4096 + #endif + #endif ++MANSUFFIX =6 + +- DEFINES = -DDEFAULT_XBO_DIR=\"/export/home/lesher/xbos\" \ +- -DDEFAULT_XBT_DIR=\"/export/home/lesher/xbts\" \ +- -DDEFAULT_XBA_DIR=\"/export/home/lesher/xbas\" ++ DEFINES = -DDEFAULT_XBO_DIR=\"$(PREFIX)/share/xbattle/xbos\" \ ++ -DDEFAULT_XBT_DIR=\"$(PREFIX)/share/xbattle/xbts\" \ ++ -DDEFAULT_XBA_DIR=\"$(PREFIX)/share/xbattle/xbas\" + LOCAL_LIBRARIES = $(XLIB) + SYS_LIBRARIES = -lm + SRCS = command.c \ Added: head/games/xbattle/files/patch-command.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-command.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,8 @@ +--- ./command.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./command.c 2014-03-29 18:28:41.989953350 +0100 +@@ -1,4 +1,5 @@ + #include ++#include + + #include "constant.h" + Added: head/games/xbattle/files/patch-draw.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-draw.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,17 @@ +--- ./draw.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./draw.c 2014-03-29 18:28:41.989953350 +0100 +@@ -1,4 +1,5 @@ + #include ++#include + + #include "constant.h" + +@@ -1267,7 +1268,7 @@ + ******************************************************************************/ + + draw_timer (running_time, player) +- unsigned long running_time; ++ unsigned int running_time; + int player; + { + char line[MAX_LINE]; Added: head/games/xbattle/files/patch-edit.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-edit.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,8 @@ +--- ./edit.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./edit.c 2014-03-29 18:28:41.989953350 +0100 +@@ -1,4 +1,5 @@ + #include ++#include + + #include "constant.h" + Added: head/games/xbattle/files/patch-error.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-error.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,8 @@ +--- ./error.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./error.c 2014-03-29 18:28:41.999944284 +0100 +@@ -1,4 +1,5 @@ + #include ++#include + + #include "constant.h" + Added: head/games/xbattle/files/patch-init.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-init.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,9 @@ +--- ./init.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./init.c 2014-03-29 18:28:41.999944284 +0100 +@@ -1,5 +1,6 @@ + #include + #include ++#include + + #include "constant.h" + Added: head/games/xbattle/files/patch-main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-main.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,9 @@ +--- ./main.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./main.c 2014-03-29 18:28:41.999944284 +0100 +@@ -1,4 +1,6 @@ + #include ++#include ++#include + + /**** x include files ****/ + #include Added: head/games/xbattle/files/patch-parse.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-parse.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,12 @@ +--- ./parse.c.orig 1995-12-19 23:26:39.000000000 +0100 ++++ ./parse.c 2014-03-29 18:28:41.999944284 +0100 +@@ -1486,8 +1486,7 @@ + *filename; + { + int i; +- char *suffix, +- *strstr(); ++ char *suffix; + FILE *fp; + + strcpy (filename, &option[1]); Added: head/games/xbattle/files/patch-replay.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-replay.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,9 @@ +--- ./replay.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./replay.c 2014-03-29 18:28:41.999944284 +0100 +@@ -1,4 +1,6 @@ + #include ++#include ++#include + + #include "constant.h" + Added: head/games/xbattle/files/patch-shape.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-shape.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,8 @@ +--- ./shape.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./shape.c 2014-03-29 18:28:41.999944284 +0100 +@@ -1,4 +1,5 @@ + #include ++#include + + #include "constant.h" + Added: head/games/xbattle/files/patch-shape_octagon.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-shape_octagon.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,11 @@ +--- ./shape_octagon.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./shape_octagon.c 2014-03-29 18:28:42.009953797 +0100 +@@ -91,7 +91,7 @@ + + shape->direction_count = 8; + shape->direction_factor = 24/shape->direction_count; +- shape->angle_offset = 67.5; ++ shape->angle_offset = 67; + shape->use_secondary = FALSE; + + /** Define polygon points **/ Added: head/games/xbattle/files/patch-utils.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-utils.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,8 @@ +--- ./utils.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./utils.c 2014-03-29 18:28:42.009953797 +0100 +@@ -1,4 +1,5 @@ + #include ++#include + + #include "constant.h" + Added: head/games/xbattle/files/patch-window.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-window.c Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,77 @@ +--- ./window.c.orig 1995-12-19 23:21:51.000000000 +0100 ++++ ./window.c 2014-03-29 18:28:42.009953797 +0100 +@@ -1,4 +1,6 @@ + #include ++#include ++#include + + #include "constant.h" + +@@ -708,8 +710,7 @@ + unsigned long valuemask; + XSetWindowAttributes attrib; + XVisualInfo vinfo; +- long event_mask, +- full_depth; ++ long event_mask; + Atom wm_delete_window; + + /** Open display and screen **/ +@@ -742,36 +743,11 @@ + /** Set bitplane depth to default **/ + + xwindow->depth = DefaultDepth (xwindow->display, xwindow->screen); +- full_depth = xwindow->depth; + + /** Get a visual **/ + + visual = DefaultVisual (xwindow->display, xwindow->screen); + +- /** Try to force the display to 8 planes **/ +- +- if (xwindow->depth != 8) +- { +- if (XMatchVisualInfo +- (xwindow->display, xwindow->screen, 8, PseudoColor, &vinfo)) +- { +- visual = vinfo.visual; +- xwindow->depth = 8; +- } +- } +- +- /** If couldn't find an 8 bit visual, try a 16 bit visual **/ +- +- if (xwindow->depth != 8) +- { +- if (XMatchVisualInfo +- (xwindow->display, xwindow->screen, 16, PseudoColor, &vinfo)) +- { +- visual = vinfo.visual; +- xwindow->depth = 16; +- } +- } +- + /** If have less than 8 planes, just use a single plane **/ + + if (xwindow->depth < 8) +@@ -790,19 +766,8 @@ + #else + /** Allocate existing colormap **/ + +- if (full_depth > 8) ++ if (xwindow->depth > 8) + { +- /** XBattle won't work for 24 bit displays with no optional **/ +- /** visuals with 8 or 16 bits. This may be the case on some PCs. **/ +- /** In these cases, it may be possible to reconfigure the display **/ +- /** to 8 or 16 bits. **/ +- +- if (xwindow->depth > 16) +- { +- throw_warning ("No PseudoColor visual available\n%s", +- " Try changing display to <= 16 bits"); +- throw_error ("Unable to continue without colormap", NULL); +- } + + /** If display is 24 bit, have to create a dedicated colormap **/ + Added: head/games/xbattle/files/patch-xbattle.man ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xbattle/files/patch-xbattle.man Sat Mar 29 20:38:57 2014 (r349590) @@ -0,0 +1,1070 @@ +--- ./xbattle.man.orig 1995-12-19 23:58:48.000000000 +0100 ++++ ./xbattle.man 2014-03-29 18:28:42.009953797 +0100 +@@ -2,12 +2,12 @@ + .SH NAME + xbattle \- a multi-user battle strategy game + .SH SYNOPSIS +- xbattle [- ...] [-