From nobody Thu Mar 10 11:57:47 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 005251A01D33; Thu, 10 Mar 2022 11:57:49 +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 4KDncr3Bdmz4yn9; Thu, 10 Mar 2022 11:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646913468; 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=XvW2rigYQwEyXY1ud7z1ou819XCETY4QgbrsKogQV74=; b=XClUc16lLRgleiE7FAfS+6hqywPhUPLcRg764fbpQzwmKE3iGu8zECBBlhbG1Qd5bcTJMA 5nCcE7yk0ulqLBAXqCE0PM20Z1Z+B8OE1yEJeM04ybilK5A8BBNkCNsnSB3asBUCrpKAby /wWUDDPAQlqFSCJiASwXIu1rtnTIrRiN7f59t7NdJO4SLDwpm5RA8pNBcN1sHlbL4ZJZyP AYdPRjvLCWcVbSrFwX8Cni1WlXcKUTpU1X/6lFBHW4Bd3w801EnSh02JvjAMEc0NPDLEUQ f8q1QUL3Gk1AkXtggnABWq3IGnRmq3HQLpqP3ASLGGPAf8wMapqCkS771Bpz1Q== 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 0FEC324A02; Thu, 10 Mar 2022 11:57:48 +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 22ABvlng072116; Thu, 10 Mar 2022 11:57:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ABvlrV072115; Thu, 10 Mar 2022 11:57:47 GMT (envelope-from git) Date: Thu, 10 Mar 2022 11:57:47 GMT Message-Id: <202203101157.22ABvlrV072115@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: 9024df6abe7c - main - =?utf-8?Q?games/opentyrian: update 2.1.20130907 =E2=86=92 2.1.20220309?= 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: 9024df6abe7c4fa2ad1f6a2dccd6de3f1da11f6d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646913468; 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=XvW2rigYQwEyXY1ud7z1ou819XCETY4QgbrsKogQV74=; b=x1w5zJKxabLPDivet4yS3JH4zSBGcvlntkRZZ0rITFoGhrDbqjNu2oT6SG635YlOWy50uw 3UQ/hxns2iIXUDARKFZp2XMghvOFnjMFXVce6kGy3FBu9PVQMgEXkopLUfju+x7POAwSPU p1soVNlHort/rYfYsAUEFHiYziPzOHB26hrkAl6WtLDC4/KzWEi6UnACTEH/1Q6gVMeqJ2 m0/mcO0wymgs9jbHhy4vRxtDMn3VMfF1t69g/tgCqhVIhjk3GQbXdVhrq/VYmm+e7TN/e9 2l12tEyVbzq+myeJGi5B8MgHv+u+8ABuS8Bm/Apu312ZpfEx3vWQniq75hhivw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646913468; a=rsa-sha256; cv=none; b=O4ewvdsRbTSqhKDhdrg5Zciv8qWir6z+nzGBR4AavtjEMJCeB0utlYQbkihp5SuabWG8nA 0hRtmqrUoHnESFERVYsF6rh5Dy7cq8sgiFLiFzOKGcZ33qsTdAQEUImCD5LfTahG/BJnqm t525uztYuVurEjB/4mGp5ylm24d0O1CzsyGNOwmrE5VMTpmsyem/raARCGGymPCVBzURLi 9vwiVaeyQkqIbjJHBFace/QbJoKW726E5bFJCKD26l5B0KgT1HDt1Hn5tlEV/jF469OGUV CjvuUaiD8SjNPhmwARnO0kRb4Dw66ZRGnQ2DBch62lzcl8xQFOXDPaIU+HQCbA== 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=9024df6abe7c4fa2ad1f6a2dccd6de3f1da11f6d commit 9024df6abe7c4fa2ad1f6a2dccd6de3f1da11f6d Author: Dmitry Marakasov AuthorDate: 2022-03-10 11:15:41 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-10 11:40:46 +0000 games/opentyrian: update 2.1.20130907 → 2.1.20220309 - Switch to GitHub, SDL2, use upstream installation --- games/opentyrian/Makefile | 40 +++++++------------------ games/opentyrian/distinfo | 6 ++-- games/opentyrian/files/patch-Makefile | 31 ------------------- games/opentyrian/files/patch-src_arg__parse.c | 30 +++++++++++++++++++ games/opentyrian/files/patch-src_opl.c | 32 -------------------- games/opentyrian/files/patch-src_opl.h | 43 --------------------------- games/opentyrian/pkg-descr | 2 +- games/opentyrian/pkg-plist | 2 +- 8 files changed, 45 insertions(+), 141 deletions(-) diff --git a/games/opentyrian/Makefile b/games/opentyrian/Makefile index e893c0f4c127..65fb23acd145 100644 --- a/games/opentyrian/Makefile +++ b/games/opentyrian/Makefile @@ -1,11 +1,7 @@ PORTNAME= opentyrian -PORTVERSION= 2.1.20130907 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 2.1.20220309 CATEGORIES= games -MASTER_SITES= https://bitbucket.org/opentyrian/opentyrian/get/ \ - http://mirror.amdmi3.ru/distfiles/${DIST_SUBDIR}/ -DISTNAME= ${PORTVERSION} -DIST_SUBDIR= opentyrian MAINTAINER= amdmi3@FreeBSD.org COMMENT= Arcade-style vertical scrolling shooter @@ -13,41 +9,25 @@ COMMENT= Arcade-style vertical scrolling shooter LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake sdl tar:bzip2 -USE_SDL= sdl +USES= gmake pkgconfig sdl +USE_GITHUB= yes +USE_SDL= sdl2 net2 -MAKE_ENV= ALL_CFLAGS="${CFLAGS}" +MAKE_ENV= VCS_IDREV="${DISTVERSION}" \ + gamesdir="${PREFIX}/share" DATADIR= ${PREFIX}/share/tyrian PORTSCOUT= skipv:11402-phase-0.8 SUB_FILES= pkg-message -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-77a8715634e3 +PORTDOCS= * -PORTDOCS= CREDITS NEWS README +OPTIONS_DEFINE= DOCS -OPTIONS_DEFINE= NETWORK DOCS - -NETWORK_DESC= Enable network support -NETWORK_USE= SDL=net -NETWORK_MAKE_ARGS= WITH_NETWORK=true -NETWORK_MAKE_ARGS_OFF= WITH_NETWORK=false - -post-patch: - @${REINPLACE_CMD} -e '/custom_data_dir/ s|"."|"${DATADIR}"|' ${WRKSRC}/src/file.c - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ +post-install: ${INSTALL_DATA} ${WRKSRC}/linux/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${INSTALL_DATA} ${WRKSRC}/linux/icons/tyrian-32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png - ${INSTALL_MAN} ${WRKSRC}/linux/man/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/ @${MKDIR} ${STAGEDIR}${DATADIR} ${TOUCH} ${STAGEDIR}${DATADIR}/.keepme -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ -.endfor - .include diff --git a/games/opentyrian/distinfo b/games/opentyrian/distinfo index 9e753c4a4780..e83443ef1392 100644 --- a/games/opentyrian/distinfo +++ b/games/opentyrian/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1474071784 -SHA256 (opentyrian/2.1.20130907.tar.bz2) = b46b2ad5645f156393a6a79266e40e409a68fd6be2d324960c268e88ee3d1c64 -SIZE (opentyrian/2.1.20130907.tar.bz2) = 249267 +TIMESTAMP = 1646909236 +SHA256 (opentyrian-opentyrian-v2.1.20220309_GH0.tar.gz) = 6df44ca9b36acf9ba67099621b2fb1baa5f7b4ad2ec924ed943b87ff9061dbd2 +SIZE (opentyrian-opentyrian-v2.1.20220309_GH0.tar.gz) = 298329 diff --git a/games/opentyrian/files/patch-Makefile b/games/opentyrian/files/patch-Makefile deleted file mode 100644 index 48b7adbbc238..000000000000 --- a/games/opentyrian/files/patch-Makefile +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig 2013-09-07 23:56:16 UTC -+++ Makefile -@@ -8,8 +8,6 @@ endif - - TARGET := opentyrian - --WITH_NETWORK := true -- - ############################################################ - - STRIP := strip -@@ -21,19 +19,9 @@ OBJS := $(SRCS:src/%.c=obj/%.o) - - # FLAGS #################################################### - --ifneq ($(MAKECMDGOALS), release) -- EXTRA_CFLAGS += -g3 -O0 -Werror --else -- EXTRA_CFLAGS += -g0 -O2 -DNDEBUG --endif - EXTRA_CFLAGS += -MMD -pedantic -Wall -Wextra -Wno-missing-field-initializers - ifeq ($(WITH_NETWORK), true) - EXTRA_CFLAGS += -DWITH_NETWORK --endif -- --HG_REV := $(shell hg id -ib && touch src/hg_revision.h) --ifneq ($(HG_REV), ) -- EXTRA_CFLAGS += '-DHG_REV="$(HG_REV)"' - endif - - EXTRA_LDLIBS += -lm diff --git a/games/opentyrian/files/patch-src_arg__parse.c b/games/opentyrian/files/patch-src_arg__parse.c new file mode 100644 index 000000000000..9496fe636066 --- /dev/null +++ b/games/opentyrian/files/patch-src_arg__parse.c @@ -0,0 +1,30 @@ +--- src/arg_parse.c.orig 2022-03-10 02:50:47 UTC ++++ src/arg_parse.c +@@ -27,6 +27,7 @@ static void permute( const char *argv[], int *first_no + static int parse_short_opt( int argc, const char *const argv[], const Options *options, Option *option ); + static int parse_long_opt( int argc, const char *const argv[], const Options *options, Option *option ); + ++#ifndef __FreeBSD__ + /*! + * \brief Locate a character in a a string. + * +@@ -36,6 +37,7 @@ static int parse_long_opt( int argc, const char *const + * otherwise the pointer to the terminating NUL character of \p s + */ + static char *strchrnul( const char *s, int c ); ++#endif + + Option parse_args( int argc, const char *argv[], const Options *options ) + { +@@ -251,9 +253,11 @@ static int parse_long_opt( int argc, const char *const + return argn; // which arg in argv that parse_args() should examine when called again + } + ++#ifndef __FreeBSD__ + static char *strchrnul( const char *s, int c ) + { + for (; *s != c && *s != '\0'; ++s) + ; + return (char *)s; + } ++#endif diff --git a/games/opentyrian/files/patch-src_opl.c b/games/opentyrian/files/patch-src_opl.c deleted file mode 100644 index 0201a19e7234..000000000000 --- a/games/opentyrian/files/patch-src_opl.c +++ /dev/null @@ -1,32 +0,0 @@ ---- src/opl.c.orig 2013-09-07 23:56:16 UTC -+++ src/opl.c -@@ -145,6 +145,29 @@ static fltype decrelconst[4] = { - (fltype)(1/22.44608) - }; - -+// per-chip variables -+Bitu chip_num; -+op_type op[MAXOPERATORS]; -+ -+Bits int_samplerate; -+ -+Bit8u status; -+Bit32u opl_index; -+#if defined(OPLTYPE_IS_OPL3) -+Bit8u adlibreg[512]; // adlib register set (including second set) -+Bit8u wave_sel[44]; // waveform selection -+#else -+Bit8u adlibreg[256]; // adlib register set -+Bit8u wave_sel[22]; // waveform selection -+#endif -+ -+ -+// vibrato/tremolo increment/counter -+Bit32u vibtab_pos; -+Bit32u vibtab_add; -+Bit32u tremtab_pos; -+Bit32u tremtab_add; -+ - - void operator_advance(op_type* op_pt, Bit32s vib) { - op_pt->wfpos = op_pt->tcount; // waveform position diff --git a/games/opentyrian/files/patch-src_opl.h b/games/opentyrian/files/patch-src_opl.h deleted file mode 100644 index 966c6075a2af..000000000000 --- a/games/opentyrian/files/patch-src_opl.h +++ /dev/null @@ -1,43 +0,0 @@ ---- src/opl.h.orig 2013-09-07 23:56:16 UTC -+++ src/opl.h -@@ -149,27 +149,27 @@ typedef struct operator_struct { - } op_type; - - // per-chip variables --Bitu chip_num; --op_type op[MAXOPERATORS]; -+extern Bitu chip_num; -+extern op_type op[MAXOPERATORS]; - --Bits int_samplerate; -+extern Bits int_samplerate; - --Bit8u status; --Bit32u opl_index; -+extern Bit8u status; -+extern Bit32u opl_index; - #if defined(OPLTYPE_IS_OPL3) --Bit8u adlibreg[512]; // adlib register set (including second set) --Bit8u wave_sel[44]; // waveform selection -+extern Bit8u adlibreg[512]; // adlib register set (including second set) -+extern Bit8u wave_sel[44]; // waveform selection - #else --Bit8u adlibreg[256]; // adlib register set --Bit8u wave_sel[22]; // waveform selection -+extern Bit8u adlibreg[256]; // adlib register set -+extern Bit8u wave_sel[22]; // waveform selection - #endif - - - // vibrato/tremolo increment/counter --Bit32u vibtab_pos; --Bit32u vibtab_add; --Bit32u tremtab_pos; --Bit32u tremtab_add; -+extern Bit32u vibtab_pos; -+extern Bit32u vibtab_add; -+extern Bit32u tremtab_pos; -+extern Bit32u tremtab_add; - - - // enable an operator diff --git a/games/opentyrian/pkg-descr b/games/opentyrian/pkg-descr index 0886065361e2..6dabc1f258c5 100644 --- a/games/opentyrian/pkg-descr +++ b/games/opentyrian/pkg-descr @@ -7,4 +7,4 @@ Tyrian is an arcade-style vertical scrolling shooter. The story is set in 20,031 where you play as Trent Hawkins, a skilled fighter-pilot employed to fight Microsol and save the galaxy. -WWW: https://bitbucket.org/opentyrian/opentyrian/wiki/Home +WWW: https://github.com/opentyrian/opentyrian diff --git a/games/opentyrian/pkg-plist b/games/opentyrian/pkg-plist index a895391d6c28..3df2ab02ea50 100644 --- a/games/opentyrian/pkg-plist +++ b/games/opentyrian/pkg-plist @@ -1,5 +1,5 @@ bin/opentyrian -man/man6/opentyrian.6.gz share/applications/opentyrian.desktop +share/man/man6/opentyrian.6.gz share/pixmaps/opentyrian.png %%DATADIR%%/.keepme