From nobody Tue Nov 22 01:36:02 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 4NGRfq1hvJz4hNNW; Tue, 22 Nov 2022 01:36:03 +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 4NGRfq1Cgfz4R5c; Tue, 22 Nov 2022 01:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669080963; 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=Sf4o1/auADDrUAn6mQrdz7daWQv2yY556qkiZur1PCU=; b=KGyWcpCO43b5yoJWfIiwhTR1RS8htlAcciwlwbhb+5Ve+vbCtyiRq8yfSBjS34493NNVkq TeAgC7cZsZlutRwQZGviNRkzAUoUAk4eC95JdgNXrxn4l/c44d2Q54x0VbDiJb8uxnCZDU nUpN6dUnVvIO8NZX+Vlz2G7Jx7Sfr/BNRCtf4tELb8iqCMzgBtfEJMnCvnTSHvvxnJL73e rleVnlXQlEzhRtdhyLCk9myPQRymJQ0zCigmaPku831XKGA4xgLk4wuXaBMA5Y/tNH2Mfg eGWUhCPO/APjfev5a82Gz2UOOyXF0dfqwUemUwDX9oI+Rgqcdkjzl6IDB84Cow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669080963; 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=Sf4o1/auADDrUAn6mQrdz7daWQv2yY556qkiZur1PCU=; b=qEIWZIP2h0TUntoK+pABDG0j4EdaxRPIGd/zFW9LHQ8xr8WM02kzRjnNW/JhKPNX5vILW3 oHYvREWeS+zhlfU89ELccq/v1KPEGxiKkqxyHxi/6sx7rMslnCwNjFCSgy4Z9tUH7DumYV cvo2j3uQMXx3H2dwHhvnhPuM4JyoCgzrIZpfQxjpPcyV9ob0kkHWcC3pA7sK8NUtnanVpw FLDUILHrOppb9izLZLBZeAsTThy8hcSDi7v37PqN8CvdDU1uOmLQs2FcUkR04wP4wst9N7 zIo1X4kUAmKqbw/brxNO4Z3CNCQMVlLOMLuF6XVxC6dwFkPwvPDO0kGU9TSFMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669080963; a=rsa-sha256; cv=none; b=C87BG8BCwl6qsjYZpm6MRCOqRaC5/sN6eYzd+hNdpQe+/YqgtX5cQ2jTNvMsbNpkHWsyub 3Pgi7xzLUuAM6TcyAs+P01foQsgNNkP49exG9aPVckLYlDosgFz/XSRoZKdhEc8aytjPY6 ZKkdTii90gtgN9ikG86M4A705HvjVvHRJiQZSqCTjsGkHhurq1qvMdqm82udMAPYAzyyx7 M0IwecXMQIjEbEUpDgBcAc3RhqCqm1BjU4UfughFpiLbNR0/4XS2B3jsx6Wuhv1pxAEEVy sUjocdpIKzj8mb11HF1H5JhnqmOV1mrHvNpcRgB6BLfBJzIl8KEIYbC3pjn63w== 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 4NGRfq0Fc3zPZZ; Tue, 22 Nov 2022 01:36:03 +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 2AM1a2XE074946; Tue, 22 Nov 2022 01:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AM1a2AG074945; Tue, 22 Nov 2022 01:36:02 GMT (envelope-from git) Date: Tue, 22 Nov 2022 01:36:02 GMT Message-Id: <202211220136.2AM1a2AG074945@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 53c396443a88 - main - games/fotaq: Add translations (de, fr, he, it) 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53c396443a88f6ec16c9c3704d55bf1d6717de4b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=53c396443a88f6ec16c9c3704d55bf1d6717de4b commit 53c396443a88f6ec16c9c3704d55bf1d6717de4b Author: Jason E. Hale AuthorDate: 2022-11-22 00:13:55 +0000 Commit: Jason E. Hale CommitDate: 2022-11-22 01:35:55 +0000 games/fotaq: Add translations (de, fr, he, it) Add French, German, Hebrew (subtitles), and Italian (subtitles) language support as options. Unfortunately, these translations are all contained in separate distfiles and cannot be simultaneously installed without creating separate ports or flavors. Since this is an old game that one likely plays through once, separate ports are probably not warranted. The original English verison is still the default. It is noted that the translated version nubmers are different than the English version, but they are highly unlikely to receive future updates. Install the entire license text instead of just a stub. Remove pkg-message in favor of a desktop entry to easily launch the game from an XDG-compliant environment. Remove the 2-line pkg-plist in favor of PLIST_FILES and PORTDOCS to facilitate the transition to multiple distfiles with slightly differing file structures. Pet portlint(1). --- games/fotaq/Makefile | 51 +++++++++++++++++++++++++++++--------- games/fotaq/distinfo | 9 +++++++ games/fotaq/files/fotaq.desktop.in | 17 +++++++++++++ games/fotaq/files/pkg-message.in | 18 -------------- games/fotaq/pkg-plist | 2 -- 5 files changed, 65 insertions(+), 32 deletions(-) diff --git a/games/fotaq/Makefile b/games/fotaq/Makefile index 498ae9539550..f72bf3693e9c 100644 --- a/games/fotaq/Makefile +++ b/games/fotaq/Makefile @@ -1,36 +1,63 @@ PORTNAME= fotaq PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= SF/scummvm/extras/Flight%20of%20the%20Amazon%20Queen -DISTNAME= FOTAQ_Talkie-${PORTVERSION} +MASTER_SITES= SF/scummvm/extras/Flight%20of%20the%20Amazon%20Queen \ + https://downloads.scummvm.org/frs/extras/Flight%20of%20the%20Amazon%20Queen/ MAINTAINER= jhale@FreeBSD.org COMMENT= Flight of the Amazon Queen: a classic graphical adventure WWW= https://www.scummvm.org/ -RUN_DEPENDS= scummvm:games/scummvm - LICENSE= FOTAQ -LICENSE_TEXT= See ${DOCSDIR}/readme.txt LICENSE_NAME= Flight of the Amazon Queen license +LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= zip +RUN_DEPENDS= scummvm:games/scummvm + +USES= desktop-file-utils zip + NO_BUILD= yes NO_ARCH= yes NO_WRKSUBDIR= yes -SUB_FILES= pkg-message - -OPTIONS_DEFINE= DOCS +SUB_FILES= fotaq.desktop +PLIST_FILES= share/applications/fotaq.desktop \ + ${DATADIR}/queen.1c +PORTDOCS= * + +OPTIONS_DEFINE= DOCS +OPTIONS_SINGLE= LANG +OPTIONS_SINGLE_LANG= LANG_DE LANG_EN LANG_FR LANG_HE LANG_IT +OPTIONS_DEFAULT= LANG_EN + +LANG_DESC= Languages +LANG_DE_DISTFILES= FOTAQ_Ger_talkie-1.0${EXTRACT_SUFX} +LANG_EN_DESC= English language support +LANG_EN_DISTFILES= FOTAQ_Talkie-${PORTVERSION}${EXTRACT_SUFX} +LANG_FR_DISTFILES= FOTAQ_Fr_Talkie_1.0${EXTRACT_SUFX} +LANG_HE_DISTFILES= FOTAQ_Heb_talkie${EXTRACT_SUFX} +LANG_IT_DISTFILES= FOTAQ_It_Talkie_1.0${EXTRACT_SUFX} + +.include + +post-extract: +.if ${PORT_OPTIONS:MLANG_DE} || ${PORT_OPTIONS:MLANG_HE} + @${FMT} ${WRKSRC}/COPYING > ${WRKSRC}/LICENSE +.elif ${PORT_OPTIONS:MLANG_FR} || ${PORT_OPTIONS:MLANG_IT} + @${TAIL} -n +83 ${WRKSRC}/readme.txt | ${SED} -e '1G;10G' | ${FMT} -p > ${WRKSRC}/LICENSE +.elif ${PORT_OPTIONS:MLANG_EN} + @${TAIL} -n +81 ${WRKSRC}/readme.txt | ${SED} -e '1G;10G' | ${FMT} -p > ${WRKSRC}/LICENSE +.endif do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/queen.1c ${STAGEDIR}${DATADIR} - -do-install-DOCS-on: + ${INSTALL_DATA} ${WRKDIR}/fotaq.desktop ${STAGEDIR}${PREFIX}/share/applications +.if !${PORT_OPTIONS:MLANG_DE} && !${PORT_OPTIONS:MLANG_HE} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR} +.endif .include diff --git a/games/fotaq/distinfo b/games/fotaq/distinfo index 79f10a086755..8223195973a7 100644 --- a/games/fotaq/distinfo +++ b/games/fotaq/distinfo @@ -1,2 +1,11 @@ +TIMESTAMP = 1668971412 SHA256 (FOTAQ_Talkie-1.1.zip) = a25cdd5e003a0a5e402af99b218cc7ea81ad032cb36b8c05df3bd1167038d8a8 SIZE (FOTAQ_Talkie-1.1.zip) = 33744817 +SHA256 (FOTAQ_Ger_talkie-1.0.zip) = 6e2826993a94864c1dd3d299369cb320a119cede4be14bf3f59b0471fa20768f +SIZE (FOTAQ_Ger_talkie-1.0.zip) = 75938507 +SHA256 (FOTAQ_Fr_Talkie_1.0.zip) = 9e670686c538191a1acf3bd09ef83a11262d23247b9258ec1495b39931790543 +SIZE (FOTAQ_Fr_Talkie_1.0.zip) = 64531589 +SHA256 (FOTAQ_Heb_talkie.zip) = 18d00305642f7f426c95ff76fbf7f4a24e23d61f8144f9acdddcd0ff75f49f34 +SIZE (FOTAQ_Heb_talkie.zip) = 66213122 +SHA256 (FOTAQ_It_Talkie_1.0.zip) = 8d6c1a0f3bf4fbdf943e39fdb54951d3434bccc896d851ea94eedf4cc1f1e6c0 +SIZE (FOTAQ_It_Talkie_1.0.zip) = 65091076 diff --git a/games/fotaq/files/fotaq.desktop.in b/games/fotaq/files/fotaq.desktop.in new file mode 100644 index 000000000000..030e79c62cd5 --- /dev/null +++ b/games/fotaq/files/fotaq.desktop.in @@ -0,0 +1,17 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Flight of the Amazon Queen +GenericName=Adventure game +GenericName[de]=Abenteuerspiel +GenericName[fr]=Jeu vidéo d'aventure +GenericName[he]=משחק הרפתקה ממוחשב +GenericName[it]=Avventura grafica +Icon=scummvm.png +Exec=%%LOCALBASE%%/bin/scummvm -f -p %%DATADIR%% queen +Exec[de]=%%LOCALBASE%%/bin/scummvm -f -p %%DATADIR%% queen +Exec[fr]=%%LOCALBASE%%/bin/scummvm -f -p %%DATADIR%% queen +Exec[he]=%%LOCALBASE%%/bin/scummvm -f -n -p %%DATADIR%% queen +Exec[it]=%%LOCALBASE%%/bin/scummvm -f -n -p %%DATADIR%% queen +Categories=Game;AdventureGame; +StartupNotify=false diff --git a/games/fotaq/files/pkg-message.in b/games/fotaq/files/pkg-message.in deleted file mode 100644 index 9dc915004810..000000000000 --- a/games/fotaq/files/pkg-message.in +++ /dev/null @@ -1,18 +0,0 @@ -[ -{ type: install - message: <