From nobody Sun Jan 01 15:17:16 2023 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 4NlMzw3rJtz2nw7h; Sun, 1 Jan 2023 15:17:16 +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 4NlMzw2bmbz4NT1; Sun, 1 Jan 2023 15:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672586236; 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=ojHXn4JBI9+Ohy1vSZrWUElbWHCzTGPZTYFSbncCXYg=; b=jBi4j9U36Vwziz2Ilpvy3UxUdphJl++UYYPOnRalTtuOgoGsDiL3mPORRauVWG7E4RR8L4 5haCQAiDE7Vww6vTzroXqAd+9smlLzLxQv3Jq5wQm0pC8bIeGONwj9yg51/kVUyDXWDG3/ whZeVvCO9iQcZweqauo7dP/JsGUoxVgpNIb1jE0IGPnzjM9qZPF3Uz0d/ukpS+oKE6lGKU LHEV5jz1ZizVX8nFkFhqgQffxbWre299aSwd1b+/jV/nLk27v5bD+L6BZKuY+gGrZsWkPF hBJmY8af9hDaPuC+zuOkq2Pv5Mjt1REFUW7dUc/CjIXx7rL1+FqLIYU8yXFvdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672586236; 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=ojHXn4JBI9+Ohy1vSZrWUElbWHCzTGPZTYFSbncCXYg=; b=FcLlZeYfL7trQa1xGlAyzAs96LY3MCkt0f12YyXyeJAPK0kgfwk3i0GbhEb6kH9mqP+JEk FX8R/sqp7EpuqbV+2Jee23yN+omLfA7ypG3+bIv1iOGIS7QhE8prmwlJq8yggEvTfe/hYq YMoDNJRcpNLuq4BsjnORYA4BTMfu8bscx+58HQJAZ/LpVPGbUjhQyqbcenSrcdIhOup16c GQK6sloIGOZkzkDC8Q+50f0NnRvouMdIoOHsxuep+s8x54uBpqGb6uTP+36DnKDnBkTjhw xHzlQ+p1r0pHP5OOvIba9iPHPar1g9S4B4m8WqPcq98wZFw5wpOMiNfD8I5rvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672586236; a=rsa-sha256; cv=none; b=HMyo8VXdyZHzthRuul3ZF/G21Zs10IWWy856W5LVn5zfV2jZbtmzWTb37mSbe0gtDeM577 TTcvPRUlMuGPkWxUNGo/Pv2mXqb8oxE+GnysUgBwCPkOPgrbtOmDqh6PxlQhOOIDsGMC9i L83IgHq0bS1aG00COTs+ek0SJ124kXFT4JZDqQ/zhzjznkjoKCARsZ2W0MWkomegi9j8o8 Jp3lNKtEuG56tOFmBBnfHijG91CC3uT13V2KuI2ubzugd2swAK+/yCZXIWTEhI7Po4Rw/E vu+Xkc+gEhMPCcVQ6tTnW94H30MGD9EUjdmnEpup7Ctw8ZW3qImRm+B6mwxpzA== 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 4NlMzw1dcYzXSh; Sun, 1 Jan 2023 15:17:16 +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 301FHGaX072774; Sun, 1 Jan 2023 15:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 301FHGXU072773; Sun, 1 Jan 2023 15:17:16 GMT (envelope-from git) Date: Sun, 1 Jan 2023 15:17:16 GMT Message-Id: <202301011517.301FHGXU072773@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: d5df74d0a876 - main - emulators/fuse-roms: switch to Daniel Menelkir's ROM distribution. 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5df74d0a8767fcffc94b998b5da01e2cd0865b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5df74d0a8767fcffc94b998b5da01e2cd0865b3 commit d5df74d0a8767fcffc94b998b5da01e2cd0865b3 Author: Rene Ladan AuthorDate: 2023-01-01 15:13:32 +0000 Commit: Rene Ladan CommitDate: 2023-01-01 15:16:51 +0000 emulators/fuse-roms: switch to Daniel Menelkir's ROM distribution. His distribution is a superset of the Fedora distribution used previously. This eases maintenance of the port. Suggested by Daniel per private mail. --- emulators/fuse-roms/Makefile | 47 ++++++++++++++++++++++++++++---------------- emulators/fuse-roms/distinfo | 8 +++----- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/emulators/fuse-roms/Makefile b/emulators/fuse-roms/Makefile index 03514e902fdd..dbdb8607c46c 100644 --- a/emulators/fuse-roms/Makefile +++ b/emulators/fuse-roms/Makefile @@ -1,12 +1,7 @@ PORTNAME= fuse-roms -PORTVERSION= 0.9.0 -PORTREVISION= 3 +DISTVERSION= 0.2 +PORTEPOCH= 1 CATEGORIES= emulators -MASTER_SITES= ftp://ftp.pbone.net/mirror/rpmfusion.org/${FC_SUBDIR}/:1 \ - https://gitlab.com/menelkir/fuseroms/-/raw/main/fuse/:2 -DISTFILES= fuse-emulator-roms-${PORTVERSION}-${FCREV}.fc${FCVER}.noarch.rpm:1 \ - opus.rom:2 -EXTRACT_ONLY= fuse-emulator-roms-${PORTVERSION}-${FCREV}.fc${FCVER}.noarch.rpm MAINTAINER= rene@FreeBSD.org COMMENT= Spectrum ROM files, for use with the Fuse emulator @@ -15,31 +10,49 @@ WWW= https://sourceforge.net/projects/fuse-emulator/ LICENSE= NONE # No explicit permission to redistribute -FCREV= 16 -FCVER= 35 -FC_SUBDIR= nonfree/fedora/releases/${FCVER}/Everything/x86_64/os/Packages/f +USE_GITLAB= yes +GL_ACCOUNT= menelkir +GL_PROJECT= fuseroms +GL_COMMIT= fed6cfca1d13acad86a0802bfbd4b8af3a42d688 NO_ARCH= yes NO_BUILD= yes DATADIR= ${PREFIX}/share/fuse -ROMS= 128p-0.rom 128p-1.rom 256s-0.rom 256s-1.rom 256s-2.rom \ - 256s-3.rom gluck.rom if1-1.rom if1-2.rom opus.rom trdos.rom +ROMS= 128-spanish-0.rom 128-spanish-1.rom \ + 128p-0.rom 128p-1.rom \ + 256s-0.rom 256s-1.rom 256s-2.rom 256s-3.rom \ + gluck.rom \ + if1-1.rom if1-2.rom \ + opus.rom \ + trdos.rom \ + disk_plus3.szx \ + tape_128.szx \ + tape_16.szx \ + tape_2048.szx \ + tape_2068.szx \ + tape_48.szx \ + tape_pentagon.szx \ + tape_plus2.szx \ + tape_plus2a.szx \ + tape_plus3.szx \ + tape_plus3e.szx \ + tape_scorpion.szx \ + tape_se.szx \ + tape_ts2068.szx + PLIST_FILES= ${ROMS:S|^|${DATADIR_REL}/|} OPTIONS_DEFINE= DOCS DOCS_PLIST_FILES=${DOCSDIR_REL}/rom-distribution.txt -post-extract: - ${CP} ${DISTDIR}/opus.rom ${WRKDIR}/usr/share/fuse/ - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKDIR}/usr/share/fuse && \ + (cd ${WRKSRC}/fuse-extra && \ ${INSTALL_DATA} ${ROMS} ${STAGEDIR}${DATADIR}) do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKDIR}/usr/share/doc/fuse-emulator-roms && \ + (cd ${WRKSRC} && \ ${INSTALL_DATA} rom-distribution.txt ${STAGEDIR}${DOCSDIR}) .include diff --git a/emulators/fuse-roms/distinfo b/emulators/fuse-roms/distinfo index 1d5753bb4101..a1f75dedde45 100644 --- a/emulators/fuse-roms/distinfo +++ b/emulators/fuse-roms/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1649363686 -SHA256 (fuse-emulator-roms-0.9.0-16.fc35.noarch.rpm) = 82e604d684dc535329d007ffb01337a03b35c00a533ff121077116742545ae9e -SIZE (fuse-emulator-roms-0.9.0-16.fc35.noarch.rpm) = 133832 -SHA256 (opus.rom) = 0a658b83257db99370f086f8ec57a5c9108ffc846e6fe567f262b63befc85dc9 -SIZE (opus.rom) = 8192 +TIMESTAMP = 1672585064 +SHA256 (menelkir-fuseroms-fed6cfca1d13acad86a0802bfbd4b8af3a42d688_GL0.tar.gz) = 011d3bb7f033b0424da0d944d3ac9a46b15e38c7888ba9a5ef8ded5045e87dde +SIZE (menelkir-fuseroms-fed6cfca1d13acad86a0802bfbd4b8af3a42d688_GL0.tar.gz) = 500560