From owner-dev-commits-ports-all@freebsd.org Tue Apr 13 12:12:14 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 82A325DE22C for ; Tue, 13 Apr 2021 12:12:14 +0000 (UTC) (envelope-from vanilla@fatpipi.com) Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FKPcG35qhz4dRf for ; Tue, 13 Apr 2021 12:12:13 +0000 (UTC) (envelope-from vanilla@fatpipi.com) Received: by mail-yb1-xb2b.google.com with SMTP id k73so11571925ybf.3 for ; Tue, 13 Apr 2021 05:12:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fatpipi-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:reply-to:from:date:message-id :subject:to:cc; bh=+Fjx/EtIA0dsyxkhXnJHtdZpaj9jLv+AVYft+dMdjAc=; b=nSnvQNr5PNXXH9aHPgg+eieHGNu+z2+XKoa2C+Z0B0Eu8SoCp4Al7HlMIcfUAH+1yN hT2ZMqO11blceMFR/8sqUxh4Qjgm3TWZLvBrZo5INa7Gf3Zl5r6YViyIzOv65pweXo1d zMS5Man+rNNnvNk8RQF/h+O5xU7ncLQa9sV2VmJhnZ4Gt1784Tg+wPl1naoB+QlF9g9B fakCrT1Bfy3k43dM6FyHv0t/taQ93QjIC6YTcV2fH/XmP9Cbr38lwuwknfVLBBIRdK0n dhZUO6RnmcxTkPVBMJINou8mKg9n/1+u8HUDtThc1GCYvRQnYeUn7P2YufaTaoUW/ke9 jmMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=+Fjx/EtIA0dsyxkhXnJHtdZpaj9jLv+AVYft+dMdjAc=; b=M0zm8B9BAwa9JVgsM2Ygzk2FctV80ax0QNZlpobGuW6MhtUCEJO8lduZ3AuWoPXN4U m1I3oLkdUwJ7K1rIJyI3LwSVOirHsW10hPZVIR7udiCU9x9C1uFFW2ZHRWWh13ZzWWEQ nJQNafJ2Fgo5K5MM5f6SY9rzDyg/Mn98N57QS5bxFgcw3Fen5jlSlXxdfKJa7h6wrPQV QEX8xyqk1Uygv0k5QQ5vOUQMprhEugTyExzXtstPGgGrWjumo8YJUfCjq0R5dkXxsbXe d2Kyfw539UxIWfghb6iQOEXwtkUtwAygrR56CBmuu5yWzZ1C026JZDOOrhVLCW4OxTlT B0ow== X-Gm-Message-State: AOAM5311ZH71PERg2D3++/fPvZLQTrdskvVeeqJ8Hs9wB1/KK0AxIMij w0rfrc2W3x1zx++/n+o84r5j22CsnrF6xPy9I59Rog== X-Google-Smtp-Source: ABdhPJwdYXTr6NwZfdh6K3uGADW1RZQOU7SUutz5VsIh4rMtDtjyn0lLOQ3t8Bew4QmiG9jyF0GX77RipBd4nHdCW/U= X-Received: by 2002:a25:4154:: with SMTP id o81mr16638274yba.69.1618315932871; Tue, 13 Apr 2021 05:12:12 -0700 (PDT) MIME-Version: 1.0 References: <202104131123.13DBNosA072405@gitrepo.freebsd.org> In-Reply-To: <202104131123.13DBNosA072405@gitrepo.freebsd.org> Reply-To: v@fatpipi.com From: Vanilla Hsu Date: Tue, 13 Apr 2021 20:12:02 +0800 Message-ID: Subject: Re: git: 91f15977cec6 - main - games/exult: fixup after aae00cbee1cef8d51abff5de932f7cf64c62dc87 To: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org X-Rspamd-Queue-Id: 4FKPcG35qhz4dRf X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Tue, 13 Apr 2021 12:12:14 -0000 You don't need bump PORTREVISION when PORTVERSION increased. Fernando Apestegu=C3=ADa =E6=96=BC 2021=E5=B9=B44=E6= =9C=8813=E6=97=A5 =E9=80=B1=E4=BA=8C =E4=B8=8B=E5=8D=887:23=E5=AF=AB=E9=81= =93=EF=BC=9A > The branch main has been updated by fernape: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D91f15977cec6282962f2fd6599799= b16949e8c21 > > commit 91f15977cec6282962f2fd6599799b16949e8c21 > Author: Fernando Apestegu=C3=ADa > AuthorDate: 2021-04-13 11:15:11 +0000 > Commit: Fernando Apestegu=C3=ADa > CommitDate: 2021-04-13 11:19:35 +0000 > > games/exult: fixup after aae00cbee1cef8d51abff5de932f7cf64c62dc87 > > Apparently, I did not pick up the very last patch in the PR. > > This additional commit adds the remaining bits discussed in the PR: > > * Convert to DISTVERSION > * Use c++17 > * Add missing glib dependency > * Make ALSA optional > * Reorder some variables > > PR: 254801 > Reported by: gspurki@gmail.com > --- > games/exult/Makefile | 61 > +++++++++++++++++++++++++++++++-------------------- > games/exult/distinfo | 6 ++--- > games/exult/pkg-descr | 13 +++++++---- > games/exult/pkg-plist | 32 +++++++++++++++------------ > 4 files changed, 67 insertions(+), 45 deletions(-) > > diff --git a/games/exult/Makefile b/games/exult/Makefile > index 29b4f1333a42..5124e4159b44 100644 > --- a/games/exult/Makefile > +++ b/games/exult/Makefile > @@ -1,52 +1,65 @@ > # Created by: Igor Pokrovsky > > PORTNAME=3D exult > -PORTVERSION=3D 1.7.0.20210405 > +DISTVERSIONPREFIX=3D v > +DISTVERSION=3D 1.7.0.20210410 > +PORTREVISION=3D 1 > CATEGORIES=3D games > > MAINTAINER=3D ports@FreeBSD.org > -COMMENT=3D Ultima VII engine > +COMMENT=3D Engine for Ultima VII (BG, FOV, SI, SS) > > LICENSE=3D GPLv2+ > LICENSE_FILE=3D ${WRKSRC}/COPYING > > -LIB_DEPENDS=3D libvorbis.so:audio/libvorbis \ > - libpng.so:graphics/png \ > +LIB_DEPENDS=3D libfreetype.so:print/freetype2 \ > libogg.so:audio/libogg \ > - libfreetype.so:print/freetype2 > + libpng.so:graphics/png \ > + libvorbis.so:audio/libvorbis > > -USES=3D autoreconf compiler:c++11-lib gmake libtool localbase > pkgconfig \ > - xorg sdl > +USES=3D autoreconf compiler:c++17-lang gmake libtool localbase = \ > + pkgconfig sdl xorg > > USE_GITHUB=3D yes > -GH_TAGNAME=3D 6150ae4 > +GH_TAGNAME=3D snapshot-${DISTVERSIONPREFIX}${DISTVERSION} > +USE_GNOME=3D cairo gdkpixbuf2 glib20 gtk30 > +USE_SDL=3D mixer2 sdl2 > +USE_XORG=3D xext x11 > > -USE_CXXSTD=3D c++17 > -USE_XORG=3D x11 xext > -USE_SDL=3D mixer2 > -USE_GNOME=3D gtk30 cairo gdkpixbuf2 > GNU_CONFIGURE=3D yes > -CONFIGURE_ARGS=3D --disable-alsa --with-sdl=3Dsdl2 \ > + > +CONFIGURE_ARGS=3D --disable-static \ > + --enable-shared \ > --with-icondir=3D${PREFIX}/share/pixmaps > + > SUB_FILES=3D pkg-message > > -OPTIONS_DEFINE=3D DOCS FLUIDSYNTH GIMP STUDIO THUMBNAILER > +OPTIONS_DEFINE=3D ALSA DOCS DEBUG FLUIDSYNTH GIMP STUDIO > THUMBNAILER > OPTIONS_DEFAULT=3D STUDIO > OPTIONS_SUB=3D yes > > -FLUIDSYNTH_LIB_DEPENDS=3D libfluidsynth.so:audio/fluidsynth > -FLUIDSYNTH_CONFIGURE_ENABLE=3D fluidsynth > GIMP_DESC=3D GIMP plugin support > -GIMP_LIB_DEPENDS=3D libgimp-2.0.so:graphics/gimp-app > -GIMP_CONFIGURE_ENABLE=3D gimp-plugin > - > STUDIO_DESC=3D Install Exult Studio > -STUDIO_CONFIGURE_ENABLE=3D exult-studio exult-studio-support > -STUDIO_USES=3D gnome > -STUDIO_USE=3D gnome=3Dlibglade2 > THUMBNAILER_DESC=3D Gnome SHP thumbnailer support > -THUMBNAILER_USES=3D gnome shared-mime-info > -THUMBNAILER_USE=3D gnome=3Dlibgnomeui > + > +ALSA_LIB_DEPENDS=3D libasound.so:audio/alsa-lib > +ALSA_CONFIGURE_ENABLE=3D alsa > + > +DEBUG_CONFIGURE_OFF=3D --with-debug=3Dno > +DEBUG_CONFIGURE_ON=3D --with-debug=3Dfull --with-optimization= =3Dnone > + > +FLUIDSYNTH_LIB_DEPENDS=3D libfluidsynth.so:audio/fluidsyn= th > +FLUIDSYNTH_CONFIGURE_ENABLE=3D fluidsynth > + > +GIMP_LIB_DEPENDS=3D libgimp-2.0.so:graphics/gimp-app > +GIMP_CONFIGURE_ENABLE=3D gimp-plugin > + > +STUDIO_CONFIGURE_ENABLE=3D exult-studio exult-studio-support > +STUDIO_USES=3D gnome > +STUDIO_USE=3D gnome=3Dlibglade2 > + > +THUMBNAILER_USES=3D gnome shared-mime-info > +THUMBNAILER_USE=3D gnome=3Dlibgnomeui > THUMBNAILER_CONFIGURE_ENABLE=3D gnome-shp-thumbnailer > > post-install-DOCS-on: > diff --git a/games/exult/distinfo b/games/exult/distinfo > index ee5a52407a5e..d190b1fbd8bb 100644 > --- a/games/exult/distinfo > +++ b/games/exult/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP =3D 1617640860 > -SHA256 (exult-exult-1.7.0.20210405-6150ae4_GH0.tar.gz) =3D > d124a8bc548d62dfbe034496d186b87aea4f29063febe28d92d7cf7be7148bd4 > -SIZE (exult-exult-1.7.0.20210405-6150ae4_GH0.tar.gz) =3D 18460223 > +TIMESTAMP =3D 1618045616 > +SHA256 (exult-exult-v1.7.0.20210410-snapshot-v1.7.0.20210410_GH0.tar.gz) > =3D ecbb5d40d374bec02d1c2d1b7c678519d8307d0ee9d0b000442ba6394fba84b2 > +SIZE (exult-exult-v1.7.0.20210410-snapshot-v1.7.0.20210410_GH0.tar.gz) = =3D > 18460612 > diff --git a/games/exult/pkg-descr b/games/exult/pkg-descr > index 13374afc307b..636aec50a461 100644 > --- a/games/exult/pkg-descr > +++ b/games/exult/pkg-descr > @@ -1,6 +1,11 @@ > -Exult is an engine built for running Ultima VII usecode. With Exult > -you can play both "The Black Gate" and "Serpent Isle" parts of the game. > -However, the original ORIGIN's Ultima VII data is required as Exult is > -just the engine. Refer to README file for details. > +Exult is an open source engine for playing Ultima VII on a variety of > +modern operating systems and environments. The Black Gate (including > +Forge of Virtue) and Serpent Isle (plus Silver Seed) are both playable > +to the end. Some differences to the original games exist; see sections > +5. of the FAQ. > + > +While it is possible to use the engine for other games, no such game has > +been written yet. Therefore, Exult is useless unless you own a copy of o= ne > +of the Ultima VIIs. > > WWW: http://exult.info > diff --git a/games/exult/pkg-plist b/games/exult/pkg-plist > index 5cecac851f81..ae81cbb15567 100644 > --- a/games/exult/pkg-plist > +++ b/games/exult/pkg-plist > @@ -1,7 +1,8 @@ > bin/cmanip > bin/expack > bin/exult > -bin/exult_studio > +%%STUDIO%%bin/exult_studio > +%%THUMBNAILER%%bin/gnome_shp_thumbnailer > bin/ipack > bin/mklink > bin/rip > @@ -19,6 +20,7 @@ man/man1/splitshp.1.gz > man/man1/textpack.1.gz > man/man1/ucc.1.gz > man/man6/exult.6.gz > +%%GIMP%%libexec/gimp/2.2/plug-ins/u7shp > share/applications/exult.desktop > %%PORTDOCS%%%%DOCSDIR%%/FAQ > %%PORTDOCS%%%%DOCSDIR%%/NEWS > @@ -46,22 +48,22 @@ share/applications/exult.desktop > %%PORTDOCS%%%%DOCSDIR%%/images/studio10.png > %%PORTDOCS%%%%DOCSDIR%%/images/studiobgiregs.png > %%PORTDOCS%%%%DOCSDIR%%/images/studiosiiregs.png > -%%DATADIR%%/estudio/new/avatar_data.txt > -%%DATADIR%%/estudio/new/blends.dat > -%%DATADIR%%/estudio/new/combos.flx > -%%DATADIR%%/estudio/new/faces.vga > -%%DATADIR%%/estudio/new/fonts.vga > -%%DATADIR%%/estudio/new/gumps.vga > -%%DATADIR%%/estudio/new/palettes.flx > -%%DATADIR%%/estudio/new/paperdol.vga > -%%DATADIR%%/estudio/new/pointers.shp > -%%DATADIR%%/estudio/new/shapes.vga > -%%DATADIR%%/estudio/new/sprites.vga > -%%DATADIR%%/estudio/new/text.flx > +%%STUDIO%%%%DATADIR%%/estudio/new/avatar_data.txt > +%%STUDIO%%%%DATADIR%%/estudio/new/blends.dat > +%%STUDIO%%%%DATADIR%%/estudio/new/combos.flx > +%%STUDIO%%%%DATADIR%%/estudio/new/faces.vga > +%%STUDIO%%%%DATADIR%%/estudio/new/fonts.vga > +%%STUDIO%%%%DATADIR%%/estudio/new/gumps.vga > +%%STUDIO%%%%DATADIR%%/estudio/new/palettes.flx > +%%STUDIO%%%%DATADIR%%/estudio/new/paperdol.vga > +%%STUDIO%%%%DATADIR%%/estudio/new/pointers.shp > +%%STUDIO%%%%DATADIR%%/estudio/new/shapes.vga > +%%STUDIO%%%%DATADIR%%/estudio/new/sprites.vga > +%%STUDIO%%%%DATADIR%%/estudio/new/text.flx > %%DATADIR%%/exult.flx > %%DATADIR%%/exult_bg.flx > %%DATADIR%%/exult_si.flx > -%%DATADIR%%/exult_studio.glade > +%%STUDIO%%%%DATADIR%%/exult_studio.glade > %%DATADIR%%/exultmsg.txt > %%DATADIR%%/midisfx.flx > %%DATADIR%%/u7bgintrinsics.data > @@ -69,4 +71,6 @@ share/applications/exult.desktop > %%DATADIR%%/u7opcodes.data > %%DATADIR%%/u7sibetaintrinsics.data > %%DATADIR%%/u7siintrinsics.data > +%%THUMBNAILER%%share/mime/packages/x-shapefile.xml > +%%THUMBNAILER%%share/thumbnailers/gnome_u7shapes.thumbnailer > share/pixmaps/exult.png >