On Thu, Nov 18, 2021 at 12:56:48PM +0100, Omar Polo wrote:
> I tripped again on LOCALBASE vs TRUEPREFIX... diff updated, sorry for
> the noise.
>
> Omar Polo <o...@omarpolo.com> writes:
>
> > Hello,
> >
> > I'd like to include the desktop file (+ icon) and the manpage in the
> > Godot package.
> >
> > The manpage is some release old and lacks some newer flags, but it's way
> > better than `godot --help | less` and the missing options are not
> > super-important IMHO. Moreover, it specifies also where godot store its
> > files which is nice.
> >
> > For the curious, these are the flags mentioned in the help message that
> > are currently missing in the manpage:
> >
> > --enable-delta-smoothing When vsync is enabled, enabled frame
> > delta smoothing.
> > --disable-delta-smoothing Disable frame delta smoothing.
> > --tablet-driver Tablet input driver () (Windows only).
> >
> > Comments/thoughts/OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/games/godot/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- Makefile 10 Nov 2021 13:20:17 -0000 1.29
> +++ Makefile 18 Nov 2021 09:53:55 -0000
> @@ -8,6 +8,7 @@ V = 3.4
> GODOTSTEAM_V = g333-s151-g397
> DISTNAME = godot-${V}-stable
> PKGNAME = godot-${V}
> +REVISION = 0
> CATEGORIES = games
> HOMEPAGE = https://godotengine.org/
> MAINTAINER = Omar Polo <o...@omarpolo.com>
> @@ -82,6 +83,7 @@ LIB_DEPENDS = archivers/zstd \
> multimedia/libvpx \
> net/enet \
> security/polarssl
> +RUN_DEPENDS = devel/desktop-file-utils
>
> NO_TEST = Yes
>
> @@ -97,6 +99,7 @@ post-extract:
>
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp
> + ${SUBST_CMD} ${WRKSRC}/misc/dist/linux/*.desktop
> sed -E -i 's/ISteamHTMLSurface:://g' \
> ${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam/godotsteam.cpp
> sed -E -i 's/steam\/steam_api\.h/steam_api.h/g' \
> @@ -107,5 +110,17 @@ pre-configure:
> do-install:
> ${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \
> ${PREFIX}/bin/godot
> + ${INSTALL_MAN_DIR} ${PREFIX}/man/man6
> + ${INSTALL_MAN} ${WRKSRC}/misc/dist/linux/godot.6 \
> + ${PREFIX}/man/man6
> + ${INSTALL_DATA_DIR} ${PREFIX}/usr/share/pixmaps
> + ${INSTALL_DATA} ${WRKSRC}/icon.svg \
> + ${PREFIX}/usr/share/pixmaps/godot.svg
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> + ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.desktop \
> + ${PREFIX}/share/applications
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/metainfo
> + ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.appdata.xml \
> + ${PREFIX}/share/metainfo/
>
> .include <bsd.port.mk>
> Index: patches/patch-misc_dist_linux_godot_6
> ===================================================================
> RCS file: patches/patch-misc_dist_linux_godot_6
> diff -N patches/patch-misc_dist_linux_godot_6
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-misc_dist_linux_godot_6 18 Nov 2021 11:37:59 -0000
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +Index: misc/dist/linux/godot.6
> +--- misc/dist/linux/godot.6.orig
> ++++ misc/dist/linux/godot.6
> +@@ -1,4 +1,4 @@
> +-.TH GODOT "6" "January 2020" "godot 3.2" "Games"
> ++.TH GODOT "6" "January 2020" "Godot" "Games"
> + .SH NAME
> + godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor
> + .SH SYNOPSIS
> +@@ -56,7 +56,7 @@ Remote filesystem (<host/IP>[:<port>] address).
> + Password for remote filesystem.
> + .TP
> + \fB\-\-audio\-driver\fR <driver>
> +-Audio driver ('PulseAudio', 'ALSA', 'Dummy').
> ++Audio driver ('sndio', 'Dummy').
> + .TP
> + \fB\-\-video\-driver\fR <driver>
> + Video driver ('GLES3', 'GLES2').
> Index: patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
> ===================================================================
> RCS file: patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
> diff -N patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-misc_dist_linux_org_godotengine_Godot_desktop 18 Nov
> 2021 11:55:31 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Index: misc/dist/linux/org.godotengine.Godot.desktop
> +--- misc/dist/linux/org.godotengine.Godot.desktop.orig
> ++++ misc/dist/linux/org.godotengine.Godot.desktop
> +@@ -2,8 +2,8 @@
> + Name=Godot Engine
> + GenericName=Libre game engine
> + Comment=Multi-platform 2D and 3D game engine with a feature-rich editor
> +-Exec=godot %f
> +-Icon=godot
> ++Exec=${TRUEPREFIX}/bin/godot %f
> ++Icon=${TRUEPREFIX}/bin/godot
> + Terminal=false
> + PrefersNonDefaultGPU=true
> + Type=Application
Do we really need to patch this?
/usr/local/bin is in the default PATH.
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/games/godot/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 10 Nov 2021 13:20:17 -0000 1.2
> +++ pkg/PLIST 18 Nov 2021 11:04:46 -0000
> @@ -1,3 +1,12 @@
> @comment $OpenBSD: PLIST,v 1.2 2021/11/10 13:20:17 jca Exp $
> @bin bin/godot
> +@man man/man6/godot.6
> +share/applications/org.godotengine.Godot.desktop
> share/doc/pkg-readmes/${PKGSTEM}
> +share/metainfo/
> +share/metainfo/org.godotengine.Godot.appdata.xml
> +usr/
> +usr/share/
> +usr/share/pixmaps/
> +usr/share/pixmaps/godot.svg
That looks wrong.
It should install under /usr/local/share/pixmaps,
not /usr/local/usr/share/pixmaps
> +@tag update-desktop-database
>
--
Antoine
