From owner-svn-ports-head@freebsd.org Sat Mar 9 07:19:50 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F0D8153A9E3; Sat, 9 Mar 2019 07:19:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2839071C12; Sat, 9 Mar 2019 07:19:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 161877C1C; Sat, 9 Mar 2019 07:19:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x297JnMO048208; Sat, 9 Mar 2019 07:19:49 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x297JnRJ048203; Sat, 9 Mar 2019 07:19:49 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201903090719.x297JnRJ048203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 9 Mar 2019 07:19:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495099 - in head/games/liquidwar: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/games/liquidwar: . files X-SVN-Commit-Revision: 495099 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2839071C12 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.94)[-0.943,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Mar 2019 07:19:50 -0000 Author: tobik Date: Sat Mar 9 07:19:48 2019 New Revision: 495099 URL: https://svnweb.freebsd.org/changeset/ports/495099 Log: games/liquidwar: Update to 5.6.5 This prepares it for Allegro 4.4.3.1. - Add upstream site to MASTER_SITES - Add missing DOCS option - Stop installing the info page; the man page contains the same information - Add LICENSE and do not install the license multiple times. One copy is more than enough. - Simplify install and do not install with absolute symlinks PR: 235479 Added: head/games/liquidwar/files/patch-src_wwwsrv.c (contents, props changed) Deleted: head/games/liquidwar/files/patch-Makefile.in head/games/liquidwar/files/patch-src-Makefile.in Modified: head/games/liquidwar/Makefile head/games/liquidwar/distinfo head/games/liquidwar/files/patch-configure head/games/liquidwar/pkg-plist Modified: head/games/liquidwar/Makefile ============================================================================== --- head/games/liquidwar/Makefile Sat Mar 9 06:21:56 2019 (r495098) +++ head/games/liquidwar/Makefile Sat Mar 9 07:19:48 2019 (r495099) @@ -2,30 +2,40 @@ # $FreeBSD$ PORTNAME= liquidwar -PORTVERSION= 5.6.4 -PORTREVISION= 5 +PORTVERSION= 5.6.5 CATEGORIES= games -MASTER_SITES= http://liquidwar.sunsite.dk/archive/ \ +MASTER_SITES= http://www.ufoot.org/download/liquidwar/v5/${PORTVERSION}/ \ + http://liquidwar.sunsite.dk/archive/ \ SAVANNAH \ http://ufoot.hd.free.fr/pub/archive/ MAINTAINER= ports@FreeBSD.org COMMENT= You control an army of liquid and have to try and eat your opponents +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= liballeg.so:devel/allegro +USES= gmake python:2.7,build + GNU_CONFIGURE= yes -USES= gmake makeinfo python:2.7,build -CONFIGURE_ARGS= --disable-target-opt --disable-doc-ps --disable-doc-pdf -CONFIGURE_ENV= ac_cv_prog_PYTHON=yes +CONFIGURE_ARGS= --disable-doc-info \ + --disable-doc-pdf \ + --disable-doc-ps \ + --disable-target-opt +MAKE_ARGS= DATADIR=${DATADIR} \ + GAMEDIR=${PREFIX}/bin \ + MANDIR=${PREFIX}/man/man6 +INSTALL_TARGET= install_nolink -INFO= liquidwar +BINARY_ALIAS= python=${PYTHON_CMD} -OPTIONS_DEFINE= ASM +OPTIONS_DEFINE= ASM DOCS ASM_CONFIGURE_OFF= --disable-asm - -post-patch: - @${REINPLACE_CMD} 's,python,${PYTHON_CMD},' ${WRKSRC}/doc/Makefile.in +DOCS_CONFIGURE_OFF= --disable-doc-html \ + --disable-doc-man \ + --disable-doc-txt .include Modified: head/games/liquidwar/distinfo ============================================================================== --- head/games/liquidwar/distinfo Sat Mar 9 06:21:56 2019 (r495098) +++ head/games/liquidwar/distinfo Sat Mar 9 07:19:48 2019 (r495099) @@ -1,2 +1,3 @@ -SHA256 (liquidwar-5.6.4.tar.gz) = 32c52e4588e8e723f907ef43703b4ddf009e8ff1f29555c09bcc1f70bf5b93a3 -SIZE (liquidwar-5.6.4.tar.gz) = 3268432 +TIMESTAMP = 1549264493 +SHA256 (liquidwar-5.6.5.tar.gz) = dad0aa84dd416cad055421ed9b40df39efae78d3df759c0583c64c54f7f2ff5f +SIZE (liquidwar-5.6.5.tar.gz) = 6508987 Modified: head/games/liquidwar/files/patch-configure ============================================================================== --- head/games/liquidwar/files/patch-configure Sat Mar 9 06:21:56 2019 (r495098) +++ head/games/liquidwar/files/patch-configure Sat Mar 9 07:19:48 2019 (r495099) @@ -1,8 +1,8 @@ ---- configure.orig Sun Mar 11 09:05:03 2007 -+++ configure Sun Mar 11 09:05:54 2007 -@@ -5345,9 +5345,9 @@ - if test "${ac_cv_prog_PYTHON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +--- configure.orig 2018-12-23 19:04:36 UTC ++++ configure +@@ -3787,9 +3787,9 @@ $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_prog_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 else - if test -n "$PYTHON"; then - ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test. @@ -13,7 +13,7 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do -@@ -5364,7 +5364,7 @@ +@@ -3807,7 +3807,7 @@ IFS=$as_save_IFS test -z "$ac_cv_prog_PYTHON" && ac_cv_prog_PYTHON="no" fi @@ -21,4 +21,4 @@ +#fi PYTHON=$ac_cv_prog_PYTHON if test -n "$PYTHON"; then - echo "$as_me:$LINENO: result: $PYTHON" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 Added: head/games/liquidwar/files/patch-src_wwwsrv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/liquidwar/files/patch-src_wwwsrv.c Sat Mar 9 07:19:48 2019 (r495099) @@ -0,0 +1,18 @@ +--- src/wwwsrv.c.orig 2018-12-23 19:04:36 UTC ++++ src/wwwsrv.c +@@ -100,12 +100,12 @@ lw_wwwsrv_init (LW_WWWSRV_DATA * data, + + data->privacy = privacy; + data->log = log; +- strncpy (data->metaserver, metaserver, URL_SIZE); ++ strncpy (data->metaserver, metaserver, sizeof(data->metaserver)); + data->port = port; + data->busy_players = busy_players; + data->max_players = max_players; +- strncpy (data->password, password, PASSWORD_SIZE); +- strncpy (data->comment, comment, COMMENT_SIZE); ++ strncpy (data->password, password, sizeof(data->password)); ++ strncpy (data->comment, comment, sizeof(data->comment)); + } + + /*------------------------------------------------------------------*/ Modified: head/games/liquidwar/pkg-plist ============================================================================== --- head/games/liquidwar/pkg-plist Sat Mar 9 06:21:56 2019 (r495098) +++ head/games/liquidwar/pkg-plist Sat Mar 9 07:19:48 2019 (r495099) @@ -4,55 +4,53 @@ bin/liquidwar-mapgen man/man6/liquidwar-mapgen.6.gz man/man6/liquidwar-server.6.gz man/man6/liquidwar.6.gz -%%DOCSDIR%%/txt/algorithm.txt -%%DOCSDIR%%/txt/authors.txt -%%DOCSDIR%%/txt/bugs.txt -%%DOCSDIR%%/txt/copying.txt -%%DOCSDIR%%/txt/mailinglists.txt -%%DOCSDIR%%/txt/network.txt -%%DOCSDIR%%/txt/options.txt -%%DOCSDIR%%/txt/parameters.txt -%%DOCSDIR%%/txt/platforms.txt -%%DOCSDIR%%/txt/rules.txt -%%DOCSDIR%%/txt/source.txt -%%DOCSDIR%%/txt/todo.txt -%%DOCSDIR%%/txt/userlevels.txt -%%DOCSDIR%%/txt/fanfic.txt -%%DOCSDIR%%/txt/wip.txt -%%DOCSDIR%%/html/algorithm.html -%%DOCSDIR%%/html/authors.html -%%DOCSDIR%%/html/bugs.html -%%DOCSDIR%%/html/copying.html -%%DOCSDIR%%/html/index.html -%%DOCSDIR%%/html/mailinglists.html -%%DOCSDIR%%/html/network.html -%%DOCSDIR%%/html/options.html -%%DOCSDIR%%/html/parameters.html -%%DOCSDIR%%/html/platforms.html -%%DOCSDIR%%/html/rules.html -%%DOCSDIR%%/html/source.html -%%DOCSDIR%%/html/todo.html -%%DOCSDIR%%/html/userlevels.html -%%DOCSDIR%%/html/fanfic.html -%%DOCSDIR%%/html/wip.html -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/README -%%DOCSDIR%%/README.fr -%%DOCSDIR%%/README.de -%%DOCSDIR%%/README.dk -share/pixmaps/liquidwar.xpm share/applications/liquidwar.desktop -share/games/liquidwar/liquidwar.dat -share/games/liquidwar/map/meditate.bmp -share/games/liquidwar/map/pacman.bmp -share/games/liquidwar/map/paille.bmp -share/games/liquidwar/map/t4.bmp -share/games/liquidwar/music/colossus.mid -share/games/liquidwar/texture/bluesq.bmp -share/games/liquidwar/texture/clovers.bmp -share/games/liquidwar/texture/meditate.bmp -share/games/liquidwar/texture/rust.bmp -share/games/liquidwar/texture/warning.bmp -games/liquidwar-server -games/liquidwar-mapgen -games/liquidwar +%%PORTDOCS%%%%DOCSDIR%%/txt/algorithm.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/authors.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/bugs.txt +@comment %%PORTDOCS%%%%DOCSDIR%%/txt/copying.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/mailinglists.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/network.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/options.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/parameters.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/platforms.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/rules.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/source.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/todo.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/userlevels.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/fanfic.txt +%%PORTDOCS%%%%DOCSDIR%%/txt/wip.txt +%%PORTDOCS%%%%DOCSDIR%%/html/algorithm.html +%%PORTDOCS%%%%DOCSDIR%%/html/authors.html +%%PORTDOCS%%%%DOCSDIR%%/html/bugs.html +@comment %%PORTDOCS%%%%DOCSDIR%%/html/copying.html +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/mailinglists.html +%%PORTDOCS%%%%DOCSDIR%%/html/network.html +%%PORTDOCS%%%%DOCSDIR%%/html/options.html +%%PORTDOCS%%%%DOCSDIR%%/html/parameters.html +%%PORTDOCS%%%%DOCSDIR%%/html/platforms.html +%%PORTDOCS%%%%DOCSDIR%%/html/rules.html +%%PORTDOCS%%%%DOCSDIR%%/html/source.html +%%PORTDOCS%%%%DOCSDIR%%/html/todo.html +%%PORTDOCS%%%%DOCSDIR%%/html/userlevels.html +%%PORTDOCS%%%%DOCSDIR%%/html/fanfic.html +%%PORTDOCS%%%%DOCSDIR%%/html/wip.html +@comment %%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.fr +%%PORTDOCS%%%%DOCSDIR%%/README.de +%%PORTDOCS%%%%DOCSDIR%%/README.dk +%%PORTDOCS%%%%DOCSDIR%%/README.pl +%%DATADIR%%/liquidwar.dat +%%DATADIR%%/map/meditate.bmp +%%DATADIR%%/map/pacman.bmp +%%DATADIR%%/map/paille.bmp +%%DATADIR%%/map/t4.bmp +%%DATADIR%%/music/colossus.mid +%%DATADIR%%/texture/bluesq.bmp +%%DATADIR%%/texture/clovers.bmp +%%DATADIR%%/texture/meditate.bmp +%%DATADIR%%/texture/rust.bmp +%%DATADIR%%/texture/warning.bmp +share/pixmaps/liquidwar.xpm