Re: [UPDATE] editors/wordgrinder

Hello,

it has been a month since this update was sent in.

Does anybody want to test this port so we can import the new version
with all the awesome bug fixes? XD

>
> for _updates_, could you send a diff instead please, it is easier to
> see what has changed, and avoids overwriting CVS control files
>
> here it is as a diff if someone wants to test. it's ok with me
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/wordgrinder/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 11 Mar 2022 18:58:39 -0000 1.3
> +++ Makefile 28 May 2022 12:22:55 -0000
> @@ -2,7 +2,7 @@ COMMENT = simple, Unicode-aware word pro
>
> GH_ACCOUNT = davidgiven
> GH_PROJECT = wordgrinder
> -GH_TAGNAME = 0.7.2
> +GH_TAGNAME = 0.8
>
> CATEGORIES = editors
>
> @@ -17,6 +17,7 @@ WANTLIB += X11 Xft c curses freetype m z
> MODULES = lang/lua
> MODLUA_VERSION = 5.3
> BUILD_DEPENDS = devel/ninja
> +RUN_DEPENDS = devel/desktop-file-utils
>
> MAKE_FLAGS = CC="${CC}" \
> CURSES_PACKAGE="--cflags={-I/usr/include} \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/editors/wordgrinder/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 11 Mar 2019 03:48:45 -0000 1.1.1.1
> +++ distinfo 28 May 2022 12:22:55 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (wordgrinder-0.7.2.tar.gz) = ThvGWUA/mEef6GGWVfkByMA+uHdDN0VItNIKQdMdHf8=
> -SIZE (wordgrinder-0.7.2.tar.gz) = 1882222
> +SHA256 (wordgrinder-0.8.tar.gz) = hWy+0rTM1RJ/YcSZejDmQtQUJHlw9pky8ltLWoGxjT8=
> +SIZE (wordgrinder-0.8.tar.gz) = 2015849
> Index: patches/patch-build_lua
> ===================================================================
> RCS file: /cvs/ports/editors/wordgrinder/patches/patch-build_lua,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-build_lua
> --- patches/patch-build_lua 11 Mar 2022 18:58:39 -0000 1.2
> +++ patches/patch-build_lua 28 May 2022 12:22:55 -0000
> @@ -1,7 +1,7 @@
> Index: build.lua
> --- build.lua.orig
> +++ build.lua
> -@@ -90,7 +90,6 @@ function build_wordgrinder_binary(exe, luapackage, fro
> +@@ -97,7 +97,6 @@ function build_wordgrinder_binary(exe, luapackage, fro
>
> local cflags = {
> "$CFLAGS",
> @@ -9,7 +9,7 @@ Index: build.lua
> "-DVERSION='\""..VERSION.."\"'",
> "-DFILEFORMAT="..FILEFORMAT,
> "-DNOUNCRYPT",
> -@@ -107,7 +106,6 @@ function build_wordgrinder_binary(exe, luapackage, fro
> +@@ -114,7 +113,6 @@ function build_wordgrinder_binary(exe, luapackage, fro
> "$LDFLAGS",
> "-lz",
> "-lm",
> @@ -17,7 +17,7 @@ Index: build.lua
> }
> local objs = {}
>
> -@@ -126,12 +124,6 @@ function build_wordgrinder_binary(exe, luapackage, fro
> +@@ -133,13 +131,6 @@ function build_wordgrinder_binary(exe, luapackage, fro
> cflags[#cflags+1] = "-DEMULATED_WCWIDTH"
> end
>
> @@ -25,22 +25,23 @@ Index: build.lua
> - cflags[#cflags+1] = "-O0"
> - else
> - cflags[#cflags+1] = "-Os"
> +- cflags[#cflags+1] = "-DNDEBUG"
> - end
> -
> if luapackage == "builtin" then
> cflags[#cflags+1] = "-Isrc/c/emu/lua-5.1.5"
> - cflags[#cflags+1] = "-DLUA_USE_MKSTEMP"
> -@@ -405,9 +397,11 @@ if want_frontend("curses") then
> + cflags[#cflags+1] = "-DWINSHIM"
> +@@ -451,9 +442,11 @@ if want_frontend("curses") then
> end
> if want_frontend("x11") then
> emit("X11_CFLAGS = ", package_flags("freetype2", "--cflags"),
> -- " ", package_flags(XFT_PACKAGE, "--cflags"))
> -+ " ", package_flags(XFT_PACKAGE, "--cflags"), " ",
> -+ package_flags("x11", "--cflags"))
> +- " ", package_flags(XFT_PACKAGE, "--cflags"))
> ++ " ", package_flags(XFT_PACKAGE, "--cflags"), " ",
> ++ package_flags("x11", "--cflags"))
> emit("X11_LDFLAGS = ", package_flags("freetype2", "--libs"),
> -- " ", package_flags(XFT_PACKAGE, "--libs"))
> -+ " ", package_flags(XFT_PACKAGE, "--libs"), " ",
> -+ package_flags("x11", "--libs"))
> +- " ", package_flags(XFT_PACKAGE, "--libs"))
> ++ " ", package_flags(XFT_PACKAGE, "--libs"), " ",
> ++ package_flags("x11", "--libs"))
> end
> emit("LUA_INTERPRETER = ", LUA_INTERPRETER)
> emit("WINDRES = ", WINDRES)
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/editors/wordgrinder/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 11 Mar 2022 18:58:39 -0000 1.2
> +++ pkg/PLIST 28 May 2022 12:22:55 -0000
> @@ -1,5 +1,12 @@
> @bin bin/wordgrinder
> @bin bin/xwordgrinder
> @man man/man1/wordgrinder.1
> +@man man/man1/xwordgrinder.1
> +share/applications/wordgrinder.desktop
> share/doc/wordgrinder/
> share/doc/wordgrinder/README.wg
> +share/mime-info/
> +share/mime-info/wordgrinder.mime
> +share/pixmaps/
> +share/pixmaps/wordgrinder.png
> +@tag update-desktop-database
>

--
OpenPGP Key Fingerprint:
543F EB89 7FDE 8E33 AFF7 E794 E4AB 4807 58F7 6C76