From owner-dev-commits-ports-all@freebsd.org Fri Apr 23 15:05:23 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 436255F5AEF; Fri, 23 Apr 2021 15:05:23 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRczR1RsFz4lJM; Fri, 23 Apr 2021 15:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 160337688; Fri, 23 Apr 2021 15:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NF5Mgt019867; Fri, 23 Apr 2021 15:05:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NF5MYk019866; Fri, 23 Apr 2021 15:05:22 GMT (envelope-from git) Date: Fri, 23 Apr 2021 15:05:22 GMT Message-Id: <202104231505.13NF5MYk019866@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: a94953ebabef - main - games/gnurobots: fix build, simplify and modernize MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a94953ebabefd6cce7590c5d3479549e35dfc62f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 15:05:23 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=a94953ebabefd6cce7590c5d3479549e35dfc62f commit a94953ebabefd6cce7590c5d3479549e35dfc62f Author: Dmitry Marakasov AuthorDate: 2021-04-23 10:19:21 +0000 Commit: Dmitry Marakasov CommitDate: 2021-04-23 15:03:05 +0000 games/gnurobots: fix build, simplify and modernize - Fix build by depending on correct guile port - Simplify and modernize the port - Switch to USES=localbase --- games/gnurobots/Makefile | 37 +++++++++++++---------------- games/gnurobots/files/patch-configure.ac | 11 +++++++++ games/gnurobots/files/patch-src_ui-cmdwin.c | 16 +++++++++++++ games/gnurobots/pkg-plist | 2 +- 4 files changed, 44 insertions(+), 22 deletions(-) diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile index 1c9b1aa5304f..a59dfa7b1a21 100644 --- a/games/gnurobots/Makefile +++ b/games/gnurobots/Makefile @@ -2,13 +2,9 @@ PORTNAME= gnurobots PORTVERSION= 1.2.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= games -MASTER_SITES= GNU \ - SF/nemysisfreebsdp/${CATEGORIES}/:icons -DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ - ${PORTNAME}.png:icons -EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} +MASTER_SITES= GNU MAINTAINER= ports@FreeBSD.org COMMENT= GNU diversion wherein Scheme-coded robots explore a world @@ -16,33 +12,32 @@ COMMENT= GNU diversion wherein Scheme-coded robots explore a world LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libguile.so:lang/guile +LIB_DEPENDS= libguile.so:lang/guile1 -USES= gnome pkgconfig readline +USES= autoreconf gnome localbase:ldflags pkgconfig readline USE_GNOME= vte GNU_CONFIGURE= yes -CFLAGS+= -O0 -CPPFLAGS+= -I${LOCALBASE}/include -w -LDFLAGS+= -L${LOCALBASE}/lib -pthread - PORTDOCS= * -OPTIONS_DEFINE= DOCS +CFLAGS+= -O0 SUB_FILES= pkg-install pkg-message -DESKTOP_ENTRIES="GNU Robots" "" "${PORTNAME}" \ - "${PORTNAME}" "Game;ArcadeGame;" "" +DESKTOP_ENTRIES="GNU Robots" \ + "" \ + "${PORTNAME}" \ + "${PORTNAME}" \ + "Game;ArcadeGame;" \ + "" -post-patch: - @${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|#include ||g' ${WRKSRC}/src/ui-cmdwin.c - @${REINPLACE_CMD} -E 's,(readline.h|history.h),readline/\1,' ${WRKSRC}/src/ui-cmdwin.c +OPTIONS_DEFINE= DOCS post-install: - ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/xpm/robot.xpm \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.xpm + +post-install-DOCS-on: cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog NEWS README THANKS \ doc/Robots-HOWTO doc/contrib" ${STAGEDIR}${DOCSDIR} diff --git a/games/gnurobots/files/patch-configure.ac b/games/gnurobots/files/patch-configure.ac new file mode 100644 index 000000000000..4461820cfa5b --- /dev/null +++ b/games/gnurobots/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2008-08-03 19:48:45 UTC ++++ configure.ac +@@ -91,8 +91,6 @@ You need guile 1.8 to build this program. + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + +-CFLAGS="-pedantic-errors -Werror -Wall -g" +- + dnl Done. + AC_CONFIG_FILES([Makefile + contrib/Makefile diff --git a/games/gnurobots/files/patch-src_ui-cmdwin.c b/games/gnurobots/files/patch-src_ui-cmdwin.c new file mode 100644 index 000000000000..463cc8545652 --- /dev/null +++ b/games/gnurobots/files/patch-src_ui-cmdwin.c @@ -0,0 +1,16 @@ +--- src/ui-cmdwin.c.orig 2008-08-03 14:44:53 UTC ++++ src/ui-cmdwin.c +@@ -19,11 +19,10 @@ + #include "ui-cmdwin.h" + + #include +-#include + + #include +-#include +-#include ++#include ++#include + + struct _UICmdWinPrivate + { diff --git a/games/gnurobots/pkg-plist b/games/gnurobots/pkg-plist index ed2ea074eb8a..028b3343e924 100644 --- a/games/gnurobots/pkg-plist +++ b/games/gnurobots/pkg-plist @@ -8,4 +8,4 @@ bin/gnurobots %%DATADIR%%/scheme/simple.scm %%DATADIR%%/scheme/stop.scm %%DATADIR%%/scheme/zap.scm -share/pixmaps/gnurobots.png +share/pixmaps/gnurobots.xpm