From nobody Mon Sep 05 16:26:51 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MLv6h2MzTz1HJdV; Mon, 5 Sep 2022 16:26:52 +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 4MLv6h1mCNz44fv; Mon, 5 Sep 2022 16:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662395212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=caya1pk4xFZK0UvaGcaHvlbasURHqbLJJb3Ke3Gcv/E=; b=qQPXqdSaIZTrRkhSr1GMR2C2JEvg4pvAoGJtbW0bNiD2ImGxprZqqRVaG970uDSXiV/iTD 84NU8KXXCfqFrICSYpR4J2FLxYdWJdYk6IpqLELZF2Y5voRkMKERXq3bcrRktiTqZGL21o V8o6WeQbZDNloUVqljs5qdmq69aqG1b7d38WWDpjlPIwJ8ot/ORXtRUigx5HSdjUqgfq8L 77z5Mh8z9SvVUZDMku/A/oCFVbeOerOcyQtmqWsbOGOJyFE8khHm6OfQVyXhzJ1Ksj+pQN dpYE5xdJnaGAo9v4S2EfNd5YeIaxsGjW2ltNdjdcainS3C/zWsR9hjs7hpsvnQ== 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 4MLv6h0n4pzt1w; Mon, 5 Sep 2022 16:26:52 +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 285GQqPY012318; Mon, 5 Sep 2022 16:26:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 285GQp4Y012317; Mon, 5 Sep 2022 16:26:51 GMT (envelope-from git) Date: Mon, 5 Sep 2022 16:26:51 GMT Message-Id: <202209051626.285GQp4Y012317@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: 9ce981ef3cd7 - main - =?utf-8?Q?games/sdl-sopwith:=20move=20from=20games/sopwith,=20update=201.8.4=20=E2=86=92=202.1.0?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 9ce981ef3cd7ab3ee3de968f86a702e126488d48 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662395212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=caya1pk4xFZK0UvaGcaHvlbasURHqbLJJb3Ke3Gcv/E=; b=fbTHtZxIw65ruCT3UUAGdPRBZOB2pChMS2edfiZZpNppS99kL5n9I+QUmClMYOJWlADTTC Bk7XPkpFyzGAX03yAbmWaDQOH6g2uAxKdhyo3u8Ey8PmSERujv/Ei0Xs70dl+kU3URdkyP 13vFOoh1RksDk3zhbYGrWzpxsOOxECsfFxhd8k3XU/ZFMWTFb82yzBAhXP+bYYkBaSMx1q Voryadk4nXGVolAf9wXb2fp/QydK7axahnZLuzl2/ZkrSLPRapMpcm6/8PHCd4Bn6ywqFw UHNs27c5XCBffaFcI4FZP6ReqNGIVsS/aRlG1gGcTeT73TjnGJxup0jAmKsJ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662395212; a=rsa-sha256; cv=none; b=b0PFTOsrlVys02AOUpvU9Pe83BShGC+UtGmQRFjQ9RmZw2P4gnV1p/Ue2FwJP9Z0zlwSih QktVRSRUCdUe/wXyvT8Ui3VTjE4jVpon9eZG8OOC8v1YSHKUvvy0DUHEQOQhdlZzWtxgMG XYAZTT/F4ls7K+YTq1iu8xsnoeEQIY1qtaxK2HsU2oMH7HZg+RNxYu7x/mgK7pNdfEEcSU cf0st7b4NtDn+Yo4vjTW2k7PXOSb803rj1rBLtWg1ZYFwGAzWkD7Uv4MWdVYSMERVOSVNm nEB+k6Ka0xTowk4lJMOcQdXN8pXcX6y4R2XUZu9VDl+c33qS3/CYKLgz7fmG1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ce981ef3cd7ab3ee3de968f86a702e126488d48 commit 9ce981ef3cd7ab3ee3de968f86a702e126488d48 Author: Dmitry Marakasov AuthorDate: 2022-09-02 19:28:01 +0000 Commit: Dmitry Marakasov CommitDate: 2022-09-05 16:26:34 +0000 games/sdl-sopwith: move from games/sopwith, update 1.8.4 → 2.1.0 --- MOVED | 1 + games/Makefile | 2 +- games/sdl-sopwith/Makefile | 21 +++++++++++++++++++++ games/sdl-sopwith/distinfo | 3 +++ games/sdl-sopwith/files/patch-configure.ac | 15 +++++++++++++++ games/{sopwith => sdl-sopwith}/pkg-descr | 1 + games/sdl-sopwith/pkg-plist | 3 +++ games/sopwith/Makefile | 19 ------------------- games/sopwith/distinfo | 3 --- games/sopwith/files/patch-src__Makefile.in | 11 ----------- games/sopwith/pkg-plist | 6 ------ 11 files changed, 45 insertions(+), 40 deletions(-) diff --git a/MOVED b/MOVED index 0effed5b5a08..f62ae77fc552 100644 --- a/MOVED +++ b/MOVED @@ -17550,3 +17550,4 @@ x11-drivers/xf86-video-trident||2022-09-04|Has expired: Broken with recent xorg, x11-drivers/xf86-video-s3||2022-09-04|Has expired: Broken with recent xorg, no fixes upstream x11-drivers/xf86-video-glint||2022-09-04|Has expired: Broken with recent xorg, no fixes upstream www/mediawiki136||2022-09-04|Has expired: Upstream no longer maintained +games/sopwith|games/sdl-sopwith|2022-09-04|Moved to match upstream name diff --git a/games/Makefile b/games/Makefile index 0e7861a15e31..b33ea50b4cfe 100644 --- a/games/Makefile +++ b/games/Makefile @@ -880,6 +880,7 @@ SUBDIR += scummvm-tools SUBDIR += sdb SUBDIR += sdl-ball + SUBDIR += sdl-sopwith SUBDIR += sdl_jewels SUBDIR += sdl_lopan SUBDIR += sdl_scavenger @@ -915,7 +916,6 @@ SUBDIR += solarconquest SUBDIR += solarus SUBDIR += solarus-quest-editor - SUBDIR += sopwith SUBDIR += spacejunk SUBDIR += spacezero SUBDIR += speak diff --git a/games/sdl-sopwith/Makefile b/games/sdl-sopwith/Makefile new file mode 100644 index 000000000000..7147d0d81d6c --- /dev/null +++ b/games/sdl-sopwith/Makefile @@ -0,0 +1,21 @@ +PORTNAME= sdl-sopwith +DISTVERSIONPREFIX= ${PORTNAME}- +DISTVERSION= 2.1.0 +CATEGORIES= games + +MAINTAINER= amdmi3@FreeBSD.org +COMMENT= Classic WW1 biplane game + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING.md + +USES= autoreconf pkgconfig sdl +USE_GITHUB= yes +GH_ACCOUNT= fragglet +GNU_CONFIGURE= yes +USE_SDL= sdl2 + +PORTDOCS= * +OPTIONS_DEFINE= DOCS + +.include diff --git a/games/sdl-sopwith/distinfo b/games/sdl-sopwith/distinfo new file mode 100644 index 000000000000..f8cf3e4c5a66 --- /dev/null +++ b/games/sdl-sopwith/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1662145718 +SHA256 (fragglet-sdl-sopwith-sdl-sopwith-2.1.0_GH0.tar.gz) = 6f199c9e94c7b9bea1c9514cf088ac8283661da31749c52a2dee3eefe6fc986b +SIZE (fragglet-sdl-sopwith-sdl-sopwith-2.1.0_GH0.tar.gz) = 153957 diff --git a/games/sdl-sopwith/files/patch-configure.ac b/games/sdl-sopwith/files/patch-configure.ac new file mode 100644 index 000000000000..9ada53c0cbfd --- /dev/null +++ b/games/sdl-sopwith/files/patch-configure.ac @@ -0,0 +1,15 @@ +--- configure.ac.orig 2022-08-31 15:52:22 UTC ++++ configure.ac +@@ -27,12 +27,6 @@ AC_PROG_RANLIB + AC_CHECK_TOOL(STRIP, strip, ) + AC_CHECK_TOOL(CONVERT, convert, ) + +-if test "$GCC" = "yes" +-then +- WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls" +- CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS" +-fi +- + dnl network libraries + + case "$target" in diff --git a/games/sopwith/pkg-descr b/games/sdl-sopwith/pkg-descr similarity index 89% rename from games/sopwith/pkg-descr rename to games/sdl-sopwith/pkg-descr index 5a9b37eea3f8..43d793aad84c 100644 --- a/games/sopwith/pkg-descr +++ b/games/sdl-sopwith/pkg-descr @@ -6,3 +6,4 @@ initial code written toward a backport allowing it to be run under DOS, like the original. WWW: http://sdl-sopwith.sourceforge.net/ +WWW: https://github.com/fragglet/sdl-sopwith diff --git a/games/sdl-sopwith/pkg-plist b/games/sdl-sopwith/pkg-plist new file mode 100644 index 000000000000..7a27011f4ee9 --- /dev/null +++ b/games/sdl-sopwith/pkg-plist @@ -0,0 +1,3 @@ +bin/sopwith +man/man5/sopwith.cfg.5.gz +man/man6/sopwith.6.gz diff --git a/games/sopwith/Makefile b/games/sopwith/Makefile deleted file mode 100644 index 3f2953dc7fb1..000000000000 --- a/games/sopwith/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -PORTNAME= sopwith -PORTVERSION= 1.8.4 -CATEGORIES= games -MASTER_SITES= SF/sdl-${PORTNAME}/sdl_${PORTNAME}/${PORTVERSION} - -MAINTAINER= amdmi3@FreeBSD.org -COMMENT= Classic WW1 biplane game - -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING - -USES= gmake gnome pkgconfig sdl -USE_SDL= sdl -USE_GNOME= gtk20 -GNU_CONFIGURE= yes - -OPTIONS_DEFINE= DOCS - -.include diff --git a/games/sopwith/distinfo b/games/sopwith/distinfo deleted file mode 100644 index a98e15cb7391..000000000000 --- a/games/sopwith/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1473636971 -SHA256 (sopwith-1.8.4.tar.gz) = a5ecb795a7aeff6be3ebfb99f1c6218054b73048786809f8468a92c952c17bd0 -SIZE (sopwith-1.8.4.tar.gz) = 310438 diff --git a/games/sopwith/files/patch-src__Makefile.in b/games/sopwith/files/patch-src__Makefile.in deleted file mode 100644 index dd099f9a1aa9..000000000000 --- a/games/sopwith/files/patch-src__Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig 2014-11-17 21:43:31 UTC -+++ src/Makefile.in -@@ -82,7 +82,7 @@ EXTRA_SUBDIRS = sdl gtk psion - bin_PROGRAMS = @SOPWITH_BINS@ - EXTRA_PROGRAMS = sopwith gtksopwith psopwith - --CFLAGS = @CFLAGS@ -I.. -I/usr/include/SDL ${SDL_CGLAFS} -+CFLAGS = @CFLAGS@ -I.. ${SDL_CFLAGS} - - COMMON_SRC = video.h swcollsn.c swgames.h swmain.h swutil.h font.h swcollsn.h swground.c swmisc.c tcpcomm.c pcsound.h swconf.c swground.h swmisc.h swsound.c tcpcomm.h std.h swconf.h swgrpha.c swmove.c swsound.h timer.h sw.h swdisp.c swgrpha.h swmove.h swsymbol.c swasynio.c swdisp.h swinit.c swsymbol.h swasynio.h swend.c swinit.h swtitle.c swauto.c swend.h swobject.c swtitle.h swauto.h swgames.c swmain.c swobject.h swutil.c video.c - diff --git a/games/sopwith/pkg-plist b/games/sopwith/pkg-plist deleted file mode 100644 index 219fe93b32bc..000000000000 --- a/games/sopwith/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/sopwith -man/man6/sopwith.6.gz -%%PORTDOCS%%%%DOCSDIR%%/keys.txt -%%PORTDOCS%%%%DOCSDIR%%/dlcvsamj.txt -%%PORTDOCS%%%%DOCSDIR%%/origdoc.txt -%%PORTDOCS%%%%DOCSDIR%%/readme.txt