Re: update games/gzdoom
On Tue, May 14 2024, Thomas Frohwein wrote:
> On Sun, May 12, 2024 at 08:26:57PM +0200, Solene Rapenne wrote:
>> changelog https://github.com/ZDoom/gzdoom/compare/g4.11.3...g4.12.2
>>
>> tested with doom2 and brutal doom, sound + music worked fine
>>
>> one patch was merged upstream
>
> I have the same diff and it works as expected with FreeDoom. ok thfr@
> for update; see if Timo can weigh in, too.
>
Works fine here as well so ok from me as well.
Timo
>> diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile
>> index 50b4a92f320..e4ca89b89c3 100644
>> --- a/games/gzdoom/Makefile
>> +++ b/games/gzdoom/Makefile
>> @@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = i386 amd64
>>
>> COMMENT = OpenGL engine for idTech 1 games like
>> doom,hexen,heretic...
>>
>> -V = 4.11.3
>> +V = 4.12.2
>>
>> DIST_TUPLE =github ZDoom gzdoom g${V} .
>> PKGNAME = gzdoom-${V}
>> diff --git a/games/gzdoom/distinfo b/games/gzdoom/distinfo
>> index 34c0a704339..926b22dec20 100644
>> --- a/games/gzdoom/distinfo
>> +++ b/games/gzdoom/distinfo
>> @@ -1,2 +1,2 @@
>> -SHA256 (ZDoom-gzdoom-g4.11.3.tar.gz) =
>> WUPbpQ2iD/lPH8xBUTJnLUKhWRfFcbHCt87v4Uk19dU=
>> -SIZE (ZDoom-gzdoom-g4.11.3.tar.gz) = 24354699
>> +SHA256 (ZDoom-gzdoom-g4.12.2.tar.gz) =
>> hkxaHsl23WBo+c2T+SxUBMZigkmWEB8UEd2yWlSvxzI=
>> +SIZE (ZDoom-gzdoom-g4.12.2.tar.gz) = 25910359
>> diff --git a/games/gzdoom/patches/patch-CMakeLists_txt
>> b/games/gzdoom/patches/patch-CMakeLists_txt
>> deleted file mode 100644
>> index 6d2aba4be6d..000
>> --- a/games/gzdoom/patches/patch-CMakeLists_txt
>> +++ /dev/null
>> @@ -1,12 +0,0 @@
>> -Index: CMakeLists.txt
>> CMakeLists.txt.orig
>> -+++ CMakeLists.txt
>> -@@ -301,7 +301,7 @@ else()
>> -
>> -if ( UNIX )
>> -include(CheckSymbolExists)
>> -- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
>> -+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h"
>> HAVE_FTS )
>> -if ( NOT HAVE_FTS )
>> -include ( FindPkgConfig )
>> -pkg_check_modules( MUSL_FTS musl-fts )
>> diff --git a/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt
>> b/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt
>> new file mode 100644
>> index 000..f9dd257c5a3
>> --- /dev/null
>> +++ b/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt
>> @@ -0,0 +1,12 @@
>> +Index: libraries/ZWidget/CMakeLists.txt
>> +--- libraries/ZWidget/CMakeLists.txt.orig
>> libraries/ZWidget/CMakeLists.txt
>> +@@ -127,7 +127,7 @@ elseif(APPLE)
>> +add_link_options(-pthread)
>> + else()
>> +set(ZWIDGET_SOURCES ${ZWIDGET_SOURCES} ${ZWIDGET_SDL2_SOURCES})
>> +- set(ZWIDGET_LIBS ${CMAKE_DL_LIBS} -ldl)
>> ++ set(ZWIDGET_LIBS ${CMAKE_DL_LIBS})
>> +add_definitions(-DUNIX -D_UNIX)
>> +add_link_options(-pthread)
>> + endif()
>>
Re: Followup after update lang/sbcl
On Fri, Apr 19 2024, Kirill A. Korinsky wrote: > On Fri, 19 Apr 2024 09:01:50 +0200, > Kirill A. Korinsky wrote: >> >> That can be addreses by enabling global cache which seems to be disabled. >> > > Which also a bit tricky, because stumpwm is built with > ASDF_OUTPUT_TRANSLATIONS=/ that makes cache path like /stumpw-XXX that can't > be created from a user. Would it help if the make-image.lisp was patched to clear asdf configuration[0] by pushing (asdf:clear-configuration) to sb-ext:*save-hooks*? 0 https://asdf.common-lisp.dev/asdf.html#Resetting-the-ASDF-configuration
Re: Followup after update lang/sbcl
On Fri, Apr 19 2024, Sebastien Marie wrote: > (Adding Cc to stumpwm maintainer) > > Kirill A. Korinsky writes: > >> Greetings, >> >> I've encountered an edge case with update of sbcl which lead to broken >> stumpwm. >> >> My stumpwm configuration uses mpd modules which requires sb-bsd-sockets, so >> after update of sbcl... it was broken. >> >> To overstep that issue I must rebuild stumpwm because it is saved image >> which includes sbcl which was used when it was build. >> >> To avoid such issue in the future I suggest to add a note inside lang/sbcl >> that after update x11/stumpwm should have increased revision. >> >> I haven't found any other port which depends on lang/sbcl. > > I commited a REVISION bump to x11/stumpwm (REVISION starts at 0). > > if I properly understand the problem, it is due that you are using both > stumpwm (compiled with older sbcl compiler) and sbcl parts (for a mpd > module), and the version mismatches. > > For now, bumping stumpwm is the simpler, but I wonder if it would be > possible to use stumpwm somehow from source and let's sbcl compilation > to refresh the fasl files if updated. Timo, any idea ? > > Thanks. I don't like the revision bump approach as why SBCL port should be changed for each libraries/application using it. That being said, I do not have anything better to offer here at the moment. I'm not that well versed in the CL compilation process but looking at the SBCL manual [0] tells the FASL is tied to specific SBCL version. It also has configuration option to refresh stale FASL files which could be added system-wide in /etc/sbclrc. So instead of current stumpwm build where it dumps the image, we could use the ASDF to compile the stumpwm to some directory (which directory?) and copy sources to other directory under /usr/local. And then create shell wrapper to /usr/local/bin/stumpwm to start the stumpwm using the asdf so that it would be recompiled if stale... But this recompilation is then done as user I think, so it can't refresh the package's own files but stores the updated FASL files to user-specific directory. Is that something to aim for? 0 http://www.sbcl.org/manual/#FASL-Format
Re: x11/stumpwm: update to 23.11
On Fri, Feb 16 2024, Kirill A. Korinsky wrote: > Greetings, > > This is almost clean update which requires one trivial patch which was > backported as https://github.com/stumpwm/stumpwm/pull/1179 > > Tested on amd64. Hi, The diff reads ok but it should just drop the REVISION line as the version gets updated. Tested the newer version and works for me in basic use. Timo
Re: GZDoom update, next attempt
On Thu, Nov 23 2023, Thomas Frohwein wrote:
> On Wed, Nov 22, 2023 at 07:51:28AM +0100, Stefan Hagen wrote:
>
> [...]
>
>> > So I think the values in the README are correct for OpenBSD. But if
>> > you're uneasy with this, we can also write something like:
>> >
>> > "Valid backenend values are 0-3, play around with them until you find one
>> > that works."
>> >
>> > Diff with updated README below.
>>
>> I just found your earlier comment:
>>
>> > I'm on an Intel Tigerlake system and OpenGL (vid_preferbackend=0) and
>> > GLES2 (vid_preferbackend=3) work, but vulkan segfaults.
>>
>> So appearently, GLES2 is available on intel based machines. I added the
>> value to the list.
>
> ok thfr@
>
>>
>> Index: games/gzdoom/Makefile
>> ===
>> RCS file: /cvs/ports/games/gzdoom/Makefile,v
>> diff -u -p -u -p -r1.17 Makefile
>> --- games/gzdoom/Makefile18 Jul 2022 08:27:45 - 1.17
>> +++ games/gzdoom/Makefile22 Nov 2023 06:49:27 -
>> @@ -6,11 +6,10 @@ ONLY_FOR_ARCHS = i386 amd64
>>
>> COMMENT = OpenGL engine for idTech 1 games like
>> doom,hexen,heretic...
>>
>> -V = 4.8.2
>> -GH_ACCOUNT =coelckers
>> -GH_PROJECT =gzdoom
>> -GH_TAGNAME =g${V}
>> -DISTNAME = gzdoom-${V}
>> +V = 4.11.3
>> +
>> +DIST_TUPLE =github ZDoom gzdoom g${V} .
>> +PKGNAME = gzdoom-${V}
>>
>> CATEGORIES= games
>>
>> @@ -21,8 +20,8 @@ MAINTAINER = Timo Myyra > # GPLv3
>> PERMIT_PACKAGE =Yes
>>
>> -WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
>> -WANTLIB += openal vpx z zmusic
>> +WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo m
>> +WANTLIB += openal vpx webp webpdemux webpmux zmusic
>>
>> # C++17
>> COMPILER = base-clang ports-gcc
>> @@ -34,13 +33,14 @@ CONFIGURE_ARGS +=-DDYN_OPENAL=NO
>> CONFIGURE_ARGS += -DHAVE_STDINT_H=1
>> CONFIGURE_ARGS += -DNO_OPENMP=ON
>>
>> -CXXFLAGS += -I. -I${LOCALBASE}/include
>> +CFLAGS += -I${X11BASE}/include
>> +CXXFLAGS += -I. -I${LOCALBASE}/include
>>
>> LIB_DEPENDS = archivers/bzip2 \
>> audio/openal \
>> audio/zmusic \
>> devel/sdl2 \
>> -graphics/jpeg \
>> +graphics/libwebp \
>> multimedia/libvpx
>>
>> NO_TEST = Yes
>> Index: games/gzdoom/distinfo
>> ===
>> RCS file: /cvs/ports/games/gzdoom/distinfo,v
>> diff -u -p -u -p -r1.7 distinfo
>> --- games/gzdoom/distinfo18 Jul 2022 08:27:45 - 1.7
>> +++ games/gzdoom/distinfo22 Nov 2023 06:49:27 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (gzdoom-4.8.2.tar.gz) = Tt1g+AlMncPft0AL28DrsKXldLCmdH7uTI2fH2r3cSc=
>> -SIZE (gzdoom-4.8.2.tar.gz) = 24247668
>> +SHA256 (ZDoom-gzdoom-g4.11.3.tar.gz) =
>> WUPbpQ2iD/lPH8xBUTJnLUKhWRfFcbHCt87v4Uk19dU=
>> +SIZE (ZDoom-gzdoom-g4.11.3.tar.gz) = 24354699
>> Index: games/gzdoom/patches/patch-CMakeLists_txt
>> ===
>> RCS file: /cvs/ports/games/gzdoom/patches/patch-CMakeLists_txt,v
>> diff -u -p -u -p -r1.3 patch-CMakeLists_txt
>> --- games/gzdoom/patches/patch-CMakeLists_txt18 Jul 2022 08:27:46
>> - 1.3
>> +++ games/gzdoom/patches/patch-CMakeLists_txt22 Nov 2023 06:49:27
>> -
>> @@ -1,7 +1,7 @@
>> Index: CMakeLists.txt
>> --- CMakeLists.txt.orig
>> +++ CMakeLists.txt
>> -@@ -272,7 +272,7 @@ else()
>> +@@ -301,7 +301,7 @@ else()
>>
>> if ( UNIX )
>> include(CheckSymbolExists)
>> Index: games/gzdoom/patches/patch-libraries_ZVulkan_CMakeLists_txt
>> ===
>> RCS file: games/gzdoom/patches/patch-libraries_ZVulkan_CMakeLists_txt
>> diff -N games/gzdoom/patches/patch-libraries_ZVulkan_CMakeLists_txt
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ games/gzdoom/patches/patch-libraries_ZVulkan_CMakeLists_txt 22 Nov
>> 2023 06:49:27 -
>> @@ -0,0 +1,12 @@
>> +Index: libraries/ZVulkan/CMakeLists.txt
>> +--- libraries/ZVulkan/CMakeLists.txt.orig
>> libraries/ZVulkan/CMakeLists.txt
>> +@@ -188,7 +188,7 @@ if(WIN32)
>> +add_definitions(-DUNICODE -D_UNICODE)
>> + else()
>> +set(ZVULKAN_SOURCES ${ZVULKAN_SOURCES} ${ZVULKAN_UNIX_SOURCES})
>> +- set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
>> ++ set(ZVULKAN_LIBS ${CMAKE_DL_LIBS})
>> +add_definitions(-DUNIX -D_UNIX)
>> +add_link_options(-pthread)
>> + endif()
>> Index: games/gzdoom/patches/patch-libraries_discordrpc_CMakeLists_txt
>> ===
>> RCS file: games/gzdoom/patches/patch-libraries_discordrpc_CMakeLists_txt
>> diff -N games/gzdoom/patches/patch-libraries_discordrpc_CMakeLists_txt
>>
Re: GZDoom update, next attempt
On Fri, Nov 10 2023, Stefan Hagen wrote:
> Thomas Frohwein wrote (2023-11-09 21:16 CET):
>> Here is an update to GZDoom 4.11.3. It works to run mods like the
>> recently released Beyond Sunset.
>>
>> Of note, you may need to switch the video backend to opengl as I
>> outlined after previous concerns:
>>
>> https://marc.info/?l=openbsd-ports=169132550927983=2
>>
>> Of note, we are several versions behind upstream - the current version
>> in ports is 4.8.2.
>
> What's the deal with:
>> +- set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
>> ++ #set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
>
> It builds and works fine with
> set(ZVULKAN_LIBS ${CMAKE_DL_LIBS})
>
> There doesn't seem to be a difference at runtime. At least on my
> machine (amd), vulkan runs fine with and without this line.
>
> (I haven't diffed the build logs to figure out if it has picked up
> something differently)
>
> Regarding:
>> https://marc.info/?l=openbsd-ports=169132550927983=2
>> After changing that back to default opengl (0),
>
> It seems to be untrue that opengl is the default backend. If I remove
> gzdoom.ini and start the game, the vulkan backend is automatically
> selected.
>
> If we have issues with the vulkan backend on more than a few machines,
> should we change the default? And/Or described the issue in the README?
>
> Best regards,
> Stefan
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/games/gzdoom/Makefile,v
>> retrieving revision 1.17
>> diff -u -p -r1.17 Makefile
>> --- Makefile 18 Jul 2022 08:27:45 - 1.17
>> +++ Makefile 9 Nov 2023 20:12:53 -
>> @@ -6,11 +6,10 @@ ONLY_FOR_ARCHS = i386 amd64
>>
>> COMMENT = OpenGL engine for idTech 1 games like
>> doom,hexen,heretic...
>>
>> -V = 4.8.2
>> -GH_ACCOUNT =coelckers
>> -GH_PROJECT =gzdoom
>> -GH_TAGNAME =g${V}
>> -DISTNAME = gzdoom-${V}
>> +V = 4.11.3
>> +
>> +DIST_TUPLE =github ZDoom gzdoom g${V} .
>> +PKGNAME = gzdoom-${V}
>>
>> CATEGORIES= games
>>
>> @@ -21,8 +20,8 @@ MAINTAINER = Timo Myyra > # GPLv3
>> PERMIT_PACKAGE =Yes
>>
>> -WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
>> -WANTLIB += openal vpx z zmusic
>> +WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo m
>> +WANTLIB += openal vpx webp webpdemux webpmux zmusic
>>
>> # C++17
>> COMPILER = base-clang ports-gcc
>> @@ -34,13 +33,14 @@ CONFIGURE_ARGS +=-DDYN_OPENAL=NO
>> CONFIGURE_ARGS += -DHAVE_STDINT_H=1
>> CONFIGURE_ARGS += -DNO_OPENMP=ON
>>
>> -CXXFLAGS += -I. -I${LOCALBASE}/include
>> +CFLAGS += -I${X11BASE}/include
>> +CXXFLAGS += -I. -I${LOCALBASE}/include
>>
>> LIB_DEPENDS = archivers/bzip2 \
>> audio/openal \
>> audio/zmusic \
>> devel/sdl2 \
>> -graphics/jpeg \
>> +graphics/libwebp \
>> multimedia/libvpx
>>
>> NO_TEST = Yes
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/games/gzdoom/distinfo,v
>> retrieving revision 1.7
>> diff -u -p -r1.7 distinfo
>> --- distinfo 18 Jul 2022 08:27:45 - 1.7
>> +++ distinfo 9 Nov 2023 20:12:53 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (gzdoom-4.8.2.tar.gz) = Tt1g+AlMncPft0AL28DrsKXldLCmdH7uTI2fH2r3cSc=
>> -SIZE (gzdoom-4.8.2.tar.gz) = 24247668
>> +SHA256 (ZDoom-gzdoom-g4.11.3.tar.gz) =
>> WUPbpQ2iD/lPH8xBUTJnLUKhWRfFcbHCt87v4Uk19dU=
>> +SIZE (ZDoom-gzdoom-g4.11.3.tar.gz) = 24354699
>> Index: patches/patch-CMakeLists_txt
>> ===
>> RCS file: /cvs/ports/games/gzdoom/patches/patch-CMakeLists_txt,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 patch-CMakeLists_txt
>> --- patches/patch-CMakeLists_txt 18 Jul 2022 08:27:46 - 1.3
>> +++ patches/patch-CMakeLists_txt 9 Nov 2023 20:12:53 -
>> @@ -1,7 +1,7 @@
>> Index: CMakeLists.txt
>> --- CMakeLists.txt.orig
>> +++ CMakeLists.txt
>> -@@ -272,7 +272,7 @@ else()
>> +@@ -301,7 +301,7 @@ else()
>>
>> if ( UNIX )
>> include(CheckSymbolExists)
>> Index: patches/patch-libraries_ZVulkan_CMakeLists_txt
>> ===
>> RCS file: patches/patch-libraries_ZVulkan_CMakeLists_txt
>> diff -N patches/patch-libraries_ZVulkan_CMakeLists_txt
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ patches/patch-libraries_ZVulkan_CMakeLists_txt 9 Nov 2023 20:12:53
>> -
>> @@ -0,0 +1,12 @@
>> +Index: libraries/ZVulkan/CMakeLists.txt
>> +--- libraries/ZVulkan/CMakeLists.txt.orig
>> libraries/ZVulkan/CMakeLists.txt
>> +@@ -188,7 +188,7 @@ if(WIN32)
>> +add_definitions(-DUNICODE -D_UNICODE)
>> + else()
>> +set(ZVULKAN_SOURCES ${ZVULKAN_SOURCES}
Re: gzdoom update to 4.10.0
On Fri, Aug 04 2023, Thomas Frohwein wrote:
> On Sat, Jan 28, 2023 at 11:46:10AM +0200, Timo Myyrä wrote:
>> Thomas Frohwein writes:
>>
>> > Hi,
>> >
>> > This diff updates gzdoom to latest version 4.10.0. I've been trying out
>> > a few gzdoom games and ended up updating this port in the process, even
>> > though not strictly necessary to run the one I mainly tested - the demo
>> > of Beyond Sunset [1]. Hands of Necromancy also works.
>> >
>> > The diff drops 2 patches that are no longer needed. Adds a new one to
>> > bypass get_current_dir_name() in i_system.cpp.
>> >
>> > CC'ing maintainer
>> >
>> > [1] https://metacorp.itch.io/beyond-sunset
>
> [...]
>
>> Hi,
>>
>> Great that someone has play-tested the update so it works.
>> The I_GetCWD should be patched correctly instead of bypassing the
>> logic. It seems to be used when adding WAD files from directory so this
>> version would break that functionality. The other function may be
>> patched as well but I recall that was only used for debugging so it is
>> not that important.
>>
>> Timo
>
> A couple of months later, but I finally got around to figuring out the
> fix. This can also run the early access version of "Supplice" [1].
>
> The change in GH_ACCOUNT is because the previous repo now forwards to
> https://github.com/ZDoom/gzdoom anyway.
>
> ok?
>
> [1] https://store.steampowered.com/app/1693280/Supplice/
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/gzdoom/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 18 Jul 2022 08:27:45 - 1.17
> +++ Makefile 5 Aug 2023 02:58:11 -
> @@ -6,8 +6,8 @@ ONLY_FOR_ARCHS = i386 amd64
>
> COMMENT =OpenGL engine for idTech 1 games like
> doom,hexen,heretic...
>
> -V = 4.8.2
> -GH_ACCOUNT = coelckers
> +V = 4.10.0
> +GH_ACCOUNT = ZDoom
> GH_PROJECT = gzdoom
> GH_TAGNAME = g${V}
> DISTNAME = gzdoom-${V}
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/gzdoom/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 18 Jul 2022 08:27:45 - 1.7
> +++ distinfo 5 Aug 2023 02:58:11 -
> @@ -1,2 +1,2 @@
> -SHA256 (gzdoom-4.8.2.tar.gz) = Tt1g+AlMncPft0AL28DrsKXldLCmdH7uTI2fH2r3cSc=
> -SIZE (gzdoom-4.8.2.tar.gz) = 24247668
> +SHA256 (gzdoom-4.10.0.tar.gz) = hwJSLAUEjf1KdlxqyConDYvQlC6BPVvG9LaXlaXSOiA=
> +SIZE (gzdoom-4.10.0.tar.gz) = 24319337
> Index: patches/patch-libraries_discordrpc_CMakeLists_txt
> ===
> RCS file: patches/patch-libraries_discordrpc_CMakeLists_txt
> diff -N patches/patch-libraries_discordrpc_CMakeLists_txt
> --- patches/patch-libraries_discordrpc_CMakeLists_txt 31 Jul 2022 20:50:40
> - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -don't pick up clang-format is present
> -
> -Index: libraries/discordrpc/CMakeLists.txt
> libraries/discordrpc/CMakeLists.txt.orig
> -+++ libraries/discordrpc/CMakeLists.txt
> -@@ -10,7 +10,8 @@ file(GLOB_RECURSE ALL_SOURCE_FILES
> - )
> -
> - # Set CLANG_FORMAT_SUFFIX if you are using custom clang-format, e.g.
> clang-format-5.0
> --find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX})
> -+#find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX})
> -+set(CLANG_FORMAT_CMD, FALSE)
> -
> - if (CLANG_FORMAT_CMD)
> - add_custom_target(
> Index: patches/patch-src_common_platform_posix_sdl_i_system_cpp
> ===
> RCS file: patches/patch-src_common_platform_posix_sdl_i_system_cpp
> diff -N patches/patch-src_common_platform_posix_sdl_i_system_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_common_platform_posix_sdl_i_system_cpp 5 Aug 2023
> 02:58:11 -
> @@ -0,0 +1,42 @@
> +use getcwd(3) instead of non-portable get_current_dir_name()
> +
> +Index: src/common/platform/posix/sdl/i_system.cpp
> +--- src/common/platform/posix/sdl/i_system.cpp.orig
> src/common/platform/posix/sdl/i_system.cpp
> +@@ -52,6 +52,8 @@
> + #include
> + #include
> + #include "printf.h"
> ++#elif defined(__OpenBSD__)
> ++#include "printf.h"
> + #endif
> +
> + #include
> +@@ -408,11 +410,10 @@ FString I_GetFromClipboard (bool use_primary_selection
> +
> + FString I_GetC
Re: (maintainer update) gerbil-0.17
On Tue, Aug 01 2023, Sebastien Marie wrote: > On Tue, Aug 01, 2023 at 03:34:30PM +0300, Timo Myyrä wrote: >> >> Thanks for the review, the suggested fixes seem to work and here is >> updated diff: >> > > I have one main concern with the diff: it is installing lot of gerbil stuff > directly inside /usr/local/lib. > > PLIST extract (with @bin stripped for readability): > lib/gx-gambc.o1 > lib/gx-gambc0.o1 > lib/gx-gambc1.o1 > lib/gx-gambc2.o1 > lib/gx-init-exe.scm > lib/gx-init-static-exe.scm > lib/gx-init.scm > lib/gxi-init.scm > lib/gxi-interactive.scm > lib/init.ss > lib/r7rs-init.ss > lib/scheme/ > lib/scheme/base-etc.ssi > ... > lib/static/ > lib/static/gerbil__core$_MOP_$_MOP_1_.scm > lib/static/gerbil__core$_MOP_$_MOP_2_.scm > ... > lib/std/ > lib/std/actor/ > lib/std/actor.ssi > lib/std/actor.ssxi.ss > ... > > is it possible to move that to some subdirectory ? > > and a little nits below. > > thanks. Yeah, the previous version installed gerbil to /usr/local/gerbil but this requires setting GERBIL_HOME environment variable pointing there and adding /usr/local/gerbil/bin to PATH. Ideally the lib stuff would be put to /usr/local/lib/gerbil so they would not interfere with other ports. I'll see if I can manage to do that somehow and have gerbil work without setting extra env variables. Otherwise I think the safest option would be to install the whole thing to /usr/local/gerbil with possibly adding symlinks to /usr/local/bin to avoid PATH setting... Timo
(maintainer update) abcl-1.9.2
Hi,
Simple update for ABCL, seems to work on amd64.
Timo
diff /usr/ports
commit - 5bf3179bb9032056cf8b8a7114fd5364d403e2d6
path + /usr/ports
blob - e0fedb1208355f95784b3e1660a64391fd3ad848
file + lang/abcl/Makefile
--- lang/abcl/Makefile
+++ lang/abcl/Makefile
@@ -1,5 +1,5 @@
COMMENT = Common Lisp dialect for the Java Virtual Machine
-V =1.9.1
+V =1.9.2
DISTNAME = abcl-src-${V}
PKGNAME = abcl-${V}
PKG_ARCH = *
blob - 7388dc023e1a09fd9f83fc47fdb9c8acba29f39f
file + lang/abcl/distinfo
--- lang/abcl/distinfo
+++ lang/abcl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (abcl-src-1.9.1.tar.gz) = pbxnfJRB9KgzwgpUG93Rb/+SZIRmkd6aHa9mmfj/EeI=
-SIZE (abcl-src-1.9.1.tar.gz) = 2598026
+SHA256 (abcl-src-1.9.2.tar.gz) = Ti9Lj4Xi2V2V5b282foXrWExoX4vzxK8Gf+5e0i8HTg=
+SIZE (abcl-src-1.9.2.tar.gz) = 2477992
blob - ffc45e5bf9b0ad70d98da858cc5b2bb51a2ecf9a
file + lang/abcl/files/abcl_completions
--- lang/abcl/files/abcl_completions
+++ lang/abcl/files/abcl_completions
@@ -1979,6 +1979,7 @@ reinitialize-instance
realp
realpart
reduce
+register-asdf
reinitialize-instance
rem
remf
@@ -2173,8 +2174,11 @@ system:%import
system:%fresh-line
system:%get-output-stream-array
system:%get-output-stream-bytes
+system:%get-step-counter
system:%import
system:%in-package
+system:%initialize-step-block
+system:%initialize-step-counter
system:%ldb
system:%length
system:%load
@@ -2229,6 +2233,7 @@ system:%reverse
system:%read-from-string
system:%reader-error
system:%reinit-emf-cache
+system:%return-from-stepper
system:%reverse
system:%run-shell-command
system:%server-socket-close
@@ -2273,6 +2278,8 @@ system:%set-documentation
system:%set-class-name
system:%set-class-precedence-list
system:%set-class-slots
+system:%set-delimited-stepping-off
+system:%set-delimited-stepping-on
system:%set-documentation
system:%set-eighth
system:%set-elt
@@ -2290,6 +2297,10 @@ system:%set-stream-external-format
system:%set-sixth
system:%set-standard-instance-access
system:%set-std-instance-layout
+system:%set-stepper-off
+system:%set-stepper-on
+system:%set-stepping-task-off
+system:%set-stepping-task-on
system:%set-stream-external-format
system:%set-subseq
system:%set-symbol-function
blob - 96f69fac3651bf4489f0a75bb57d02b0fc35e0ab
file + lang/abcl/pkg/PLIST
--- lang/abcl/pkg/PLIST
+++ lang/abcl/pkg/PLIST
@@ -88,6 +88,7 @@ abcl/src/org/armedbear/lisp/HashTable.java
abcl/src/org/armedbear/lisp/Function.java
abcl/src/org/armedbear/lisp/FunctionBinding.java
abcl/src/org/armedbear/lisp/Go.java
+abcl/src/org/armedbear/lisp/GrayStream.java
abcl/src/org/armedbear/lisp/HashTable.java
abcl/src/org/armedbear/lisp/HashTableFunctions.java
abcl/src/org/armedbear/lisp/IllegalMonitorState.java
@@ -311,6 +312,7 @@ abcl/src/org/armedbear/lisp/gray-streams.lisp
abcl/src/org/armedbear/lisp/gentemp.lisp
abcl/src/org/armedbear/lisp/get-pid.lisp
abcl/src/org/armedbear/lisp/get_properties.java
+abcl/src/org/armedbear/lisp/gray-streams-java.lisp
abcl/src/org/armedbear/lisp/gray-streams.lisp
abcl/src/org/armedbear/lisp/gui.lisp
abcl/src/org/armedbear/lisp/inline.lisp
(update) gambit-4.9.5
Hi,
Here's an update for gambit for latest release.
Noticed that it has one failing test case on amd64:
*** FAILED 13-modules/prim_filesystem.scm WITH EXIT CODE HI=1 LO=0
(executable-path) in (include "~~lib/gambit/prim/filesystem#.scm") returned
# but expected
#
(executable-path) in (namespace ("##")) returned
# but expected
#
Not sure if this is ok or not.
Timo
diff /usr/ports
commit - 5bf3179bb9032056cf8b8a7114fd5364d403e2d6
path + /usr/ports
blob - 38a5b472c77244c78da2a7604d10b69eb2d120f7
file + lang/gambit/Makefile
--- lang/gambit/Makefile
+++ lang/gambit/Makefile
@@ -2,8 +2,7 @@ V= 4.9.4
COMMENT= complete, efficient and reliable implementation of Scheme
-V= 4.9.4
-REVISION= 0
+V= 4.9.5
DISTNAME= gambit-v${V:S/./_/g}
PKGNAME= gambit-$V
API_V= ${V:R:S/./0/}00${V:E}
@@ -38,8 +37,6 @@ WRKDIST= ${WRKDIR}/gambit-$V
CONFIGURE_ENV= CC=${CC} CXX=${CXX} CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-WRKDIST= ${WRKDIR}/gambit-$V
-
MAKE_FILE= ${WRKSRC}/makefile
# On sparc64, gcc crashes with the default stack limit:
blob - f74a4b9899b06903515e5a33d7bcea913ec7e809
file + lang/gambit/distinfo
--- lang/gambit/distinfo
+++ lang/gambit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gambit-v4_9_4.tgz) = GftEpltmkjT2wEZ83D2+LiyVpELzjkY459ickOJHvQg=
-SIZE (gambit-v4_9_4.tgz) = 15452771
+SHA256 (gambit-v4_9_5.tgz) = 4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw=
+SIZE (gambit-v4_9_5.tgz) = 16613205
blob - 54c587e30f09418a76768a40966d7e962c4d401a
file + lang/gambit/patches/patch-configure
--- lang/gambit/patches/patch-configure
+++ lang/gambit/patches/patch-configure
@@ -3,7 +3,7 @@ Index: configure
Index: configure
--- configure.orig
+++ configure
-@@ -14988,7 +14988,7 @@ if test "$C_COMP_VISUALC" = yes; then
+@@ -15371,7 +15371,7 @@ if test "$C_COMP_VISUALC" = yes; then
else
blob - 17b844b031c36702bf77e962b953ea3cecd54cb2
file + lang/gambit/pkg/PLIST
--- lang/gambit/pkg/PLIST
+++ lang/gambit/pkg/PLIST
@@ -30,6 +30,18 @@ lib/gambit/_codegen#.scm
lib/gambit/_arm#.scm
lib/gambit/_asm#.scm
lib/gambit/_assert#.scm
+lib/gambit/_base64/
+lib/gambit/_base64/_base64#.scm
+lib/gambit/_base64/_base64.scm
+lib/gambit/_base64/_base64.sld
+lib/gambit/_base64/_base64@gambit${API_V}@C/
+lib/gambit/_base64/_base64@gambit${API_V}@C/_base64.c
+@bin lib/gambit/_base64/_base64@gambit${API_V}@C/_base64.o1
+lib/gambit/_base64/_base64@gambit${API_V}@js/
+lib/gambit/_base64/_base64@gambit${API_V}@js/_base64.js
+lib/gambit/_base64/_base64@gambit${API_V}@js/_base64.o1
+lib/gambit/_base64/test/
+lib/gambit/_base64/test/test.scm
lib/gambit/_codegen#.scm
lib/gambit/_define-library/
lib/gambit/_define-library/_define-library#.scm
@@ -70,6 +82,7 @@ lib/gambit/_gambit#.scm
lib/gambit/_digest/test/
lib/gambit/_digest/test/test.scm
lib/gambit/_eval#.scm
+lib/gambit/_fifo#.scm
lib/gambit/_gambit#.scm
lib/gambit/_gambit.c
lib/gambit/_gambit.js
@@ -170,6 +183,15 @@ lib/gambit/_six/six-expand#.scm
lib/gambit/_six/js@gambit${API_V}@js/
lib/gambit/_six/js@gambit${API_V}@js/js.js
lib/gambit/_six/js@gambit${API_V}@js/js.o1
+lib/gambit/_six/python#.scm
+lib/gambit/_six/python.scm
+lib/gambit/_six/python.sld
+lib/gambit/_six/python@gambit${API_V}@C/
+lib/gambit/_six/python@gambit${API_V}@C/python.c
+@bin lib/gambit/_six/python@gambit${API_V}@C/python.o1
+lib/gambit/_six/python@gambit${API_V}@js/
+lib/gambit/_six/python@gambit${API_V}@js/python.js
+lib/gambit/_six/python@gambit${API_V}@js/python.o1
lib/gambit/_six/six-expand#.scm
lib/gambit/_six/six-expand.scm
lib/gambit/_six/six-expand@gambit${API_V}@C/
@@ -204,6 +226,7 @@ lib/gambit/_test/_test@gambit${API_V}@C/
lib/gambit/_test/
lib/gambit/_test/_test#.scm
lib/gambit/_test/_test.scm
+lib/gambit/_test/_test.sld
lib/gambit/_test/_test@gambit${API_V}@C/
lib/gambit/_test/_test@gambit${API_V}@C/_test.c
@bin lib/gambit/_test/_test@gambit${API_V}@C/_test.o1
@@ -870,6 +893,8 @@ lib/gambit/srfi/0/test/
lib/gambit/srfi/0/0@gambit${API_V}@js/
lib/gambit/srfi/0/0@gambit${API_V}@js/0.js
lib/gambit/srfi/0/0@gambit${API_V}@js/0.o1
+lib/gambit/srfi/0/demo/
+lib/gambit/srfi/0/demo/demo.scm
lib/gambit/srfi/0/test/
lib/gambit/srfi/0/test/test.scm
lib/gambit/srfi/1/
@@ -934,8 +959,11 @@ lib/gambit/srfi/132/test/
lib/gambit/srfi/132/lmsort.scm
lib/gambit/srfi/132/merge.scm
lib/gambit/srfi/132/select.scm
+lib/gambit/srfi/132/sort.scm
+lib/gambit/srfi/132/sortp.scm
lib/gambit/srfi/132/test/
lib/gambit/srfi/132/test/test.scm
+lib/gambit/srfi/132/vector-util.scm
lib/gambit/srfi/132/vhsort.scm
lib/gambit/srfi/132/visort.scm
lib/gambit/srfi/132/vmsort.scm
@@ -954,7 +982,32 @@ lib/gambit/srfi/158/
lib/gambit/srfi/14/14@gambit${API_V}@js/14.o1
lib/gambit/srfi/14/test/
lib/gambit/srfi/14/test/test.scm
+lib/gambit/srfi/141/
+lib/gambit/srfi/141/141#.scm
+lib/gambit/srfi/141/141.scm
+lib/gambit/srfi/141/141.sld
+lib/gambit/srfi/141/141@gambit${API_V}@C/
+lib/gambit/srfi/141/141@gambit${API_V}@C/141.c
Re: [Update] editors/emacs 28.2 -> 29.1
On Mon, Jul 31 2023, Sebastien Marie wrote: > On Mon, Jul 31, 2023 at 11:14:38AM +0300, Timo Myyrä wrote: >> On Mon, Jul 31 2023, Renato Aguiar wrote: >> >> > On Mon, Jul 31 2023, lux wrote: >> > >> >> Hi, Emacs 29.1 was released yesterday, I update to 29.1. >> >> >> > >> > Maybe add textproc/tree-sitter to LIB_DEPENDS to enable the new >> > built-in tree-sitter integration? >> >> Hi, >> >> Here is a bit more fleshed out version for emacs-29 update. >> >> - adds sqlite, tree-sitter and libwebp dependencies > > webp ? > > anyway, the diff doesn't seems consistent: > > - CONFIGURE_ARGS += --without-webp > - LIB_DEPENDS += graphics/libwebp > - no WANTLIB change for webp > > Thanks. The new emacs version adds support for the WebP image format. The port should only use it when building graphics support, same way as other image formats. Timo
Re: [Update] editors/emacs 28.2 -> 29.1
On Mon, Jul 31 2023, Renato Aguiar wrote:
> On Mon, Jul 31 2023, lux wrote:
>
>> Hi, Emacs 29.1 was released yesterday, I update to 29.1.
>>
>
> Maybe add textproc/tree-sitter to LIB_DEPENDS to enable the new
> built-in tree-sitter integration?
Hi,
Here is a bit more fleshed out version for emacs-29 update.
- adds sqlite, tree-sitter and libwebp dependencies
- add texinfo as build dep to cope with info generation
- add step to rename emacs dump image to have portable name for it
- drop unused patches
Timo
diff /usr/ports
commit - 5bf3179bb9032056cf8b8a7114fd5364d403e2d6
path + /usr/ports
blob - 8424b4685309e158b3a173b29e1c00114d24ed79
file + editors/emacs/Makefile
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -1,7 +1,6 @@
COMMENT= GNU editor: extensible, customizable, self-documenting
-VERSION= 28.2
-REVISION= 4
+VERSION= 29.1
DISTNAME= emacs-${VERSION}
CATEGORIES=editors
@@ -13,7 +12,8 @@ WANTLIB = c curses execinfo jansson gmp gnutls m
pthr
# GPLv3+
PERMIT_PACKAGE=Yes
-WANTLIB = c curses execinfo jansson gmp gnutls m pthread xml2 z
+WANTLIB = c curses jansson gmp gnutls m pthread sqlite3 \
+ tree-sitter xml2 z
MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
EXTRACT_SUFX= .tar.xz
@@ -28,10 +28,12 @@ CONFIGURE_ARGS= --build="${GCCARCH}" \
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
CONFIGURE_ARGS=--build="${GCCARCH}" \
- --without-sound
+ --without-sound \
+ --without-native-compilation
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
+ MAKEINFO=${PREFIX}/bin/gmakeinfo
MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRIPT}" \
LOGNAME="${SHAREOWN}"
@@ -39,10 +41,15 @@ LIB_DEPENDS=devel/jansson \
SUBST_VARS=GCCARCH VERSION
USE_GMAKE= Yes
+
+BUILD_DEPENDS= databases/sqlite \
+ print/texinfo
+
LIB_DEPENDS= devel/jansson \
devel/gmp \
security/gnutls \
- textproc/libxml
+ textproc/libxml \
+ textproc/tree-sitter
.if ${FLAVOR} == "no_x11"
CONFIGURE_ARGS+= --without-x \
@@ -52,7 +59,8 @@ CONFIGURE_ARGS+= --without-x \
--without-jpeg \
--without-lcms2 \
--without-libotf \
- --without-m17n-flt
+ --without-m17n-flt \
+ --without-webp
.else
LIB_DEPENDS+= devel/harfbuzz \
devel/libotf \
@@ -61,6 +69,7 @@ LIB_DEPENDS+= devel/harfbuzz \
graphics/tiff \
graphics/giflib \
graphics/lcms2 \
+ graphics/libwebp \
misc/m17n/lib \
x11/dbus \
x11/gnome/librsvg
@@ -70,11 +79,11 @@ WANTLIB += ICE SM X11 X11-xcb Xaw3d Xext Xfixes Xinera
. if ${FLAVOR} == "athena"
CONFIGURE_ARGS+= --with-x-toolkit=athena
LIB_DEPENDS+= x11/Xaw3d
-WANTLIB += ICE SM X11 X11-xcb Xaw3d Xext Xfixes Xinerama Xmu
-WANTLIB += Xpm Xrandr Xrender Xt cairo dbus-1 fontconfig freetype
-WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 harfbuzz
-WANTLIB += intl jpeg lcms2 m17n-core m17n-flt otf png rsvg-2 tiff
-WANTLIB += xcb
+WANTLIB += ICE SM X11 X11-xcb Xaw3d Xcomposite Xext Xfixes Xi
+WANTLIB += Xinerama Xmu Xpm Xrandr Xrender Xt cairo dbus-1 fontconfig
+WANTLIB += freetype gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += harfbuzz intl jpeg lcms2 m17n-core m17n-flt otf png rsvg-2
+WANTLIB += sharpyuv tiff webp webpdemux xcb xcb-shape xcb-util
. elif ${FLAVOR} == "gtk2"
CONFIGURE_ARGS+= --with-x-toolkit=gtk2
LIB_DEPENDS+= x11/gtk+2
@@ -83,23 +92,32 @@ WANTLIB += pangoft2-1.0 png rsvg-2 tiff xcb
WANTLIB += dbus-1 fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz
WANTLIB += intl jpeg lcms2 m17n-core m17n-flt otf pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 png rsvg-2 tiff xcb
+WANTLIB += pangoft2-1.0 png rsvg-2 sharpyuv tiff webp webpdemux
+WANTLIB += xcb xcb-shape xcb-util
. elif ${FLAVOR} == "gtk3"
CONFIGURE_ARGS+= --with-x-toolkit=gtk3
LIB_DEPENDS+= x11/gtk+3
-WANTLIB += ICE SM X11 X11-xcb Xext Xfixes Xinerama Xpm Xrandr
-WANTLIB += Xrender atk-1.0 cairo cairo-gobject dbus-1 fontconfig
-WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
-WANTLIB
Re: x11/stumpwm: few adjustments after lang/sbcl update
On Fri, Jun 30, 2023, at 20:36, Sebastien Marie wrote:
> Hi,
>
> As lang/sbcl has been updated to 2.3.6, the compression method changed
> from libz
> to libzstd.
>
> As stumpwm is built using sbcl, the port needs few adjustments to add
> LIB_DEPENDS on zstd, and updated WANTLIB.
>
> Comments or OK ?
> --
> Sebastien Marie
>
> diff /home/semarie/repos/openbsd/ports
> commit - f2b2271db0cce22f098315362598c10c5db64ead
> path + /home/semarie/repos/openbsd/ports
> blob - 1fe35715ef106358692d35766dd50025d89563b0
> file + x11/stumpwm/Makefile
> --- x11/stumpwm/Makefile
> +++ x11/stumpwm/Makefile
> @@ -2,6 +2,7 @@ DISTNAME= stumpwm-${VERSION}
>
> VERSION= 22.11
> DISTNAME=stumpwm-${VERSION}
> +REVISION=0
>
> CATEGORIES= x11
>
> @@ -12,7 +13,7 @@ WANTLIB += c m pthread util z
> # GPLv2
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += c m pthread util z
> +WANTLIB += c m pthread util zstd
>
> MASTER_SITES=https://github.com/stumpwm/stumpwm/archive/
> MASTER_SITES0= https://github.com/edicl/cl-ppcre/archive/
> @@ -26,6 +27,7 @@ BUILD_DEPENDS= lang/sbcl,threads \
>
> BUILD_DEPENDS= lang/sbcl,threads \
> print/texinfo
> +LIB_DEPENDS= archivers/zstd
>
> AUTOCONF_VERSION=2.69
> CONFIGURE_STYLE= autoconf no-autoheader
Looks good to me.
Timo
Re: lang/ecl: backport a fix for building recent lang/sbcl
On Wed, Jun 28 2023, Sebastien Marie wrote: > Hi, > > The following diff backports a commit > (https://gitlab.com/embeddable-common-lisp/ecl/-/commit/f3d4cf4b66ab6c3cd8629ab6d0c7f7c50d7fd8a4) > > to fix a compiler bug. > > This bug is on the way to update lang/sbcl to more recent version (I tested > compiling sbcl-2.3.6 with ecl on amd64). > > While here, some smalls changes: > - V isn't present in PLIST, no need to add it to SUBST_VARS > - the licence is wrong: it is LGPLv2 or later > - use --enable-gmp=system instead of --with-system-gmp to unify the way > system libraries are configured > > Comments or OK ? looks good to me. timo
[maintainer update] dunst-1.9.2
Hi,
Here's a bit delayed update to dunst port.
Tweaked two regex test cases which seem to behave differently between OpenBSD
and Linux.
Seems to be working on amd64.
Timo
diff /usr/ports
commit - 006e9b20e2a3475a2347ae53fa188aac011d22d0
path + /usr/ports
blob - 36d61a448bda5246c0d1b41144661adcff637cc1
file + x11/dunst/Makefile
--- x11/dunst/Makefile
+++ x11/dunst/Makefile
@@ -2,7 +2,7 @@ GH_TAGNAME =v1.9.0
GH_ACCOUNT = dunst-project
GH_PROJECT = dunst
-GH_TAGNAME = v1.9.0
+GH_TAGNAME = v1.9.2
CATEGORIES = x11
blob - 1941e141aa88a482621ddf77a197a9985b6e1c9b
file + x11/dunst/distinfo
--- x11/dunst/distinfo
+++ x11/dunst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.9.0.tar.gz) = t7jX1lYLskGx5NN+uncM3xm51dv8HU1HVyrWdvP3yYo=
-SIZE (dunst-1.9.0.tar.gz) = 4609222
+SHA256 (dunst-1.9.2.tar.gz) = +mzkXAr0uuGIsNZ5pbqS+Pm35DAbsbtHboLfJrzp5xo=
+SIZE (dunst-1.9.2.tar.gz) = 4614703
blob - aac51d44bcda0dd6dfe4ecf99ea7328927098788
file + x11/dunst/patches/patch-config_mk
--- x11/dunst/patches/patch-config_mk
+++ x11/dunst/patches/patch-config_mk
@@ -1,7 +1,7 @@
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -36,8 +36,8 @@ endif
+@@ -42,8 +42,8 @@ endif
# flags
DEFAULT_CPPFLAGS = -Wno-gnu-zero-variadic-macro-arguments -D_DEFAULT_SOURCE
-DVERSION=\"${VERSION}\" -DSYSCONFDIR=\"${SYSCONFDIR}\"
blob - 352d61b0fb04ec1bf550992b0490dbb93f7a01b6
file + x11/dunst/patches/patch-docs_dunst_5_pod
--- x11/dunst/patches/patch-docs_dunst_5_pod
+++ x11/dunst/patches/patch-docs_dunst_5_pod
@@ -1,7 +1,7 @@
Index: docs/dunst.5.pod
--- docs/dunst.5.pod.orig
+++ docs/dunst.5.pod
-@@ -399,7 +399,7 @@ Hide the count of stacked duplicate notifications.
+@@ -409,7 +409,7 @@ Hide the count of stacked duplicate notifications.
Show an indicator if a notification contains actions and/or open-able URLs.
See
ACTIONS below for further details.
@@ -10,7 +10,7 @@ Index: docs/dunst.5.pod
Can be set to a colon-separated list of paths to search for icons to use with
notifications.
-@@ -413,7 +413,7 @@ replace this and will need new settings.
+@@ -423,7 +423,7 @@ replace this and will need new settings.
Comma-separated of names of the the themes to use for looking up icons. This
has
to be the name of the directory in which the theme is located, not the
human-friendly name of the theme. So for example, the theme B is
@@ -19,7 +19,7 @@ Index: docs/dunst.5.pod
theme to B.
The first theme in the list is the most important. Only if the icon cannot be
-@@ -451,12 +451,12 @@ Maximum number of notifications that will be kept in h
+@@ -461,12 +461,12 @@ Maximum number of notifications that will be kept in h
is reached, older notifications will be deleted once a new one arrives. See
HISTORY.
blob - 8ad0b097d1fbb4b654e586efcc31ffdc0cf32d28
file + x11/dunst/patches/patch-dunstrc
--- x11/dunst/patches/patch-dunstrc
+++ x11/dunst/patches/patch-dunstrc
@@ -1,7 +1,7 @@
Index: dunstrc
--- dunstrc.orig
+++ dunstrc
-@@ -212,7 +212,7 @@
+@@ -217,7 +217,7 @@
max_icon_size = 128
# Paths to default icons (only neccesary when not using recursive icon
lookup)
@@ -10,7 +10,7 @@ Index: dunstrc
### History ###
-@@ -226,10 +226,10 @@
+@@ -231,10 +231,10 @@
### Misc/Advanced ###
# dmenu path.
blob - 530744f08ce2aa03548075fe61320f7cdf36e110
file + x11/dunst/patches/patch-src_dunst_c
--- x11/dunst/patches/patch-src_dunst_c
+++ x11/dunst/patches/patch-src_dunst_c
@@ -1,9 +1,9 @@
Index: src/dunst.c
--- src/dunst.c.orig
+++ src/dunst.c
-@@ -96,7 +96,7 @@ static gboolean run(void *data)
- gint64 sleep = queues_get_next_datachange(now);
- gint64 timeout_at = now + sleep;
+@@ -100,7 +100,7 @@ static gboolean run(void *data)
+ gint64 sleep = timeout_at - now;
+ sleep = MAX(sleep, 1000); // Sleep at least 1ms
-LOG_D("Sleeping for %li ms", sleep/1000);
+LOG_D("Sleeping for %lli ms", (long long)sleep/1000);
blob - 3402cef0c0229e5e6cc686acf71eb5a7b40993e7
file + /dev/null
--- x11/dunst/patches/patch-src_icon-lookup_c
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't use malloc.h header on OpenBSD.
-
-Index: src/icon-lookup.c
src/icon-lookup.c.orig
-+++ src/icon-lookup.c
-@@ -3,7 +3,6 @@
-
- #include
- #include
--#include
- #include
- #include
-
blob - 1cfcbf811904bc7b5ce8b5838b9fb97f8fdee478
file + x11/dunst/patches/patch-src_notification_c
--- x11/dunst/patches/patch-src_notification_c
+++ x11/dunst/patches/patch-src_notification_c
@@ -21,7 +21,7 @@ Index: src/notification.c
safe_setenv("DUNST_APP_NAME", appname);
safe_setenv("DUNST_SUMMARY", summary);
safe_setenv("DUNST_BODY", body);
-@@ -683,14 +683,14 @@ void notification_update_text_to_render(struct notific
+@@ -684,14 +684,14 @@ void notification_update_text_to_render(struct notific
char
Re: [maintainer update] x11/pekwm-0.3.0
On Sun, Apr 16 2023, Omar Polo wrote:
> On 2023/04/16 09:48:25 +0300, Timo Myyrä wrote:
>> Hi,
>>
>> Here's an update for the pekwm. Briefly tested on amd64.
>
> with this update it uses pangocairo if found at build time. Don't
> have as strong opinion on whether it should be enabled, but being it a
> major improvement of this 0.3.0 I propend to leave it enabled and add
> pangocairo as LDEP.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/pekwm/Makefile,v
> retrieving revision 1.40
> diff -u -p -r1.40 Makefile
> --- Makefile 11 Mar 2022 20:16:55 - 1.40
> +++ Makefile 16 Apr 2023 07:11:05 -
> @@ -1,7 +1,7 @@
> COMMENT= aewm++ based pretty themable window manager
>
> DISTNAME=pekwm-${V}
> -V= 0.2.1
> +V= 0.3.0
> CATEGORIES= x11
>
> HOMEPAGE=https://www.pekwm.se/
> @@ -12,13 +12,16 @@ MAINTAINER= Timo Myyra PERMIT_PACKAGE= Yes
>
> # uses pledge()
> -WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
> -WANTLIB += ${COMPILER_LIBCXX}
> +WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xext Xft Xinerama Xpm
> +WANTLIB += Xrandr c cairo fontconfig freetype glib-2.0 gobject-2.0
> +WANTLIB += harfbuzz intl jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
> +WANTLIB += pangoxft-1.0 png
>
> COMPILER = base-clang ports-gcc base-gcc
>
> MASTER_SITES=
> https://github.com/pekdon/pekwm/releases/download/release-${V}/
> -LIB_DEPENDS= graphics/jpeg \
> +LIB_DEPENDS= devel/pango \
> + graphics/jpeg \
> graphics/png
>
> MODULES= devel/cmake
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/pekwm/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo 10 Dec 2021 13:35:58 - 1.14
> +++ distinfo 16 Apr 2023 07:11:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (pekwm-0.2.1.tar.gz) = AV5uud/8gW+i1Km4yzRaUolPTcpaAdBhLzAkLbh+DlA=
> -SIZE (pekwm-0.2.1.tar.gz) = 943072
> +SHA256 (pekwm-0.3.0.tar.gz) = l+D101bki5Sj1mLzrwovtp7xvA84LqTF2LufTs5IFiQ=
> +SIZE (pekwm-0.3.0.tar.gz) = 1210295
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/x11/pekwm/patches/patch-CMakeLists_txt,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 11 Mar 2022 20:16:55 - 1.3
> +++ patches/patch-CMakeLists_txt 16 Apr 2023 07:11:05 -
> @@ -1,7 +1,7 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -67,6 +67,7 @@ int main() { std::stof(\"42.0\"); }
> +@@ -81,6 +81,7 @@ int main() { std::stof(\"42.0\"); }
> set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
>
> # Look for platform specific methods
> Index: patches/patch-src_CfgParserSource_cc
> ===
> RCS file: patches/patch-src_CfgParserSource_cc
> diff -N patches/patch-src_CfgParserSource_cc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_CfgParserSource_cc 16 Apr 2023 07:11:05 -
> @@ -0,0 +1,14 @@
> +backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
> +
> +Index: src/CfgParserSource.cc
> +--- src/CfgParserSource.cc.orig
> src/CfgParserSource.cc
> +@@ -144,7 +144,7 @@ CfgParserSourceCommand::open(void)
> + std::string path(Util::getEnv("PATH"));
> + path = _command_path + ":" + path;
> + env.override("PATH", path);
> +-execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), nullptr,
> ++execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), NULL,
> +env.getCEnv());
> +
> + ::close (STDOUT_FILENO);
> Index: patches/patch-src_Util_cc
> ===
> RCS file: patches/patch-src_Util_cc
> diff -N patches/patch-src_Util_cc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Util_cc 16 Apr 2023 07:11:05 -
> @@ -0,0 +1,14 @@
> +backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
> +
> +Index: src/Util.cc
> +--- src/Util.cc.orig
> src/Util.cc
> +@@ -191,7 +191,7 @@ namespace Util {
> + case 0:
> + setsid();
> + execlp(PEKWM_SH, PEKWM_SH, "-c", command.c_str(),
> +- static_cast(0));
> ++ NULL);
> + P_ER
[maintainer update] x11/pekwm-0.3.0
Hi,
Here's an update for the pekwm. Briefly tested on amd64.
Timo
diff /usr/ports
commit - 9e018f7a7b38c947fedc6adbadada1a4d72e6b1c
path + /usr/ports
blob - 4a38f474b830a9a79bb9c62d830c8542596d5ba7
file + x11/pekwm/Makefile
--- x11/pekwm/Makefile
+++ x11/pekwm/Makefile
@@ -1,7 +1,7 @@
COMMENT= aewm++ based pretty themable window manager
DISTNAME= pekwm-${V}
-V= 0.2.1
+V= 0.3.0
CATEGORIES=x11
HOMEPAGE= https://www.pekwm.se/
@@ -12,8 +12,8 @@ WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c f
PERMIT_PACKAGE=Yes
# uses pledge()
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c fontconfig freetype
+WANTLIB += jpeg m png ${COMPILER_LIBCXX}
COMPILER = base-clang ports-gcc base-gcc
blob - e780505f9b46912d82a64933a8781578b9e5f86d
file + x11/pekwm/distinfo
--- x11/pekwm/distinfo
+++ x11/pekwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.2.1.tar.gz) = AV5uud/8gW+i1Km4yzRaUolPTcpaAdBhLzAkLbh+DlA=
-SIZE (pekwm-0.2.1.tar.gz) = 943072
+SHA256 (pekwm-0.3.0.tar.gz) = l+D101bki5Sj1mLzrwovtp7xvA84LqTF2LufTs5IFiQ=
+SIZE (pekwm-0.3.0.tar.gz) = 1210295
blob - a2ed7ab39f72d9e5d72634eaf9d8572e4f6c8e16
file + x11/pekwm/patches/patch-CMakeLists_txt
--- x11/pekwm/patches/patch-CMakeLists_txt
+++ x11/pekwm/patches/patch-CMakeLists_txt
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -67,6 +67,7 @@ int main() { std::stof(\"42.0\"); }
+@@ -81,6 +81,7 @@ int main() { std::stof(\"42.0\"); }
set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
# Look for platform specific methods
blob - /dev/null
file + x11/pekwm/patches/patch-src_CfgParserSource_cc (mode 644)
--- /dev/null
+++ x11/pekwm/patches/patch-src_CfgParserSource_cc
@@ -0,0 +1,14 @@
+backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
+
+Index: src/CfgParserSource.cc
+--- src/CfgParserSource.cc.orig
src/CfgParserSource.cc
+@@ -144,7 +144,7 @@ CfgParserSourceCommand::open(void)
+ std::string path(Util::getEnv("PATH"));
+ path = _command_path + ":" + path;
+ env.override("PATH", path);
+- execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), nullptr,
++ execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), NULL,
+ env.getCEnv());
+
+ ::close (STDOUT_FILENO);
blob - /dev/null
file + x11/pekwm/patches/patch-src_Util_cc (mode 644)
--- /dev/null
+++ x11/pekwm/patches/patch-src_Util_cc
@@ -0,0 +1,14 @@
+backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
+
+Index: src/Util.cc
+--- src/Util.cc.orig
src/Util.cc
+@@ -191,7 +191,7 @@ namespace Util {
+ case 0:
+ setsid();
+ execlp(PEKWM_SH, PEKWM_SH, "-c", command.c_str(),
+- static_cast(0));
++ NULL);
+ P_ERR("execlp failed: " << strerror(errno));
+ exit(1);
+ case -1:
blob - /dev/null
file + x11/pekwm/patches/patch-src_pekwm_cc (mode 644)
--- /dev/null
+++ x11/pekwm/patches/patch-src_pekwm_cc
@@ -0,0 +1,14 @@
+backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
+
+Index: src/pekwm.cc
+--- src/pekwm.cc.orig
src/pekwm.cc
+@@ -100,7 +100,7 @@ handleOkResult(char *path, char **argv, int read_fd)
+ } else {
+ command = "exec " + command;
+ execl(PEKWM_SH, PEKWM_SH , "-c", command.c_str(),
+-static_cast(0));
++NULL);
+ }
+
+ std::cerr << "failed to run restart command: "
blob - 806341a75110e87e95a5b679298cb45cef4cfa71
file + x11/pekwm/patches/patch-src_pekwm_wm_cc
--- x11/pekwm/patches/patch-src_pekwm_wm_cc
+++ x11/pekwm/patches/patch-src_pekwm_wm_cc
@@ -1,27 +1,18 @@
Index: src/pekwm_wm.cc
--- src/pekwm_wm.cc.orig
+++ src/pekwm_wm.cc
-@@ -21,7 +21,7 @@
-
- extern "C" {
- #include
--#include // execlp
-+#include // execlp,pledge
- }
-
- /**
-@@ -141,6 +141,14 @@ main(int argc, char **argv)
- << "using configuration at " << config_file);
-
- WindowManager *wm = WindowManager::start(config_file, replace,
synchronous);
-+
-+#if PEKWM_HAVE_PLEDGE
-+ if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) {
-+ cerr << "failed to pledge" << endl;
-+ return 1;
-+ }
-+#endif
-+
+@@ -181,6 +181,14 @@ main(int argc, char **argv)
+ WindowManager::start(config_file, replace, synchronous);
if (wm) {
try {
++
++#if PEKWM_HAVE_PLEDGE
++ if (pledge("stdio rpath wpath cpath proc exec", NULL)
== -1) {
++ std::cerr << "failed to pledge" << std::endl;
++ return 1;
++ }
++#endif
++
[maintainer update] lang/abcl-1.9.1
Hi,
Here's small bump to ABCL port.
Release details:
https://abcl-dev.blogspot.com/2023/02/abcl-191-never-use-dot-oh.html
Timo
diff /usr/ports
commit - 9e018f7a7b38c947fedc6adbadada1a4d72e6b1c
path + /usr/ports
blob - 398bbf58fe356886316e50ad51893697575b81ea
file + lang/abcl/Makefile
--- lang/abcl/Makefile
+++ lang/abcl/Makefile
@@ -1,5 +1,5 @@
COMMENT = Common Lisp dialect for the Java Virtual Machine
-V =1.9.0
+V =1.9.1
DISTNAME = abcl-src-${V}
PKGNAME = abcl-${V}
PKG_ARCH = *
blob - db6cfff0eed2677aa3d80cd67a04bc13e62cc6d1
file + lang/abcl/distinfo
--- lang/abcl/distinfo
+++ lang/abcl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (abcl-src-1.9.0.tar.gz) = oStchPKINL2Yjjra4K0q1MxsRR2eRPPAhT0AcVjBmGk=
-SIZE (abcl-src-1.9.0.tar.gz) = 2470791
+SHA256 (abcl-src-1.9.1.tar.gz) = pbxnfJRB9KgzwgpUG93Rb/+SZIRmkd6aHa9mmfj/EeI=
+SIZE (abcl-src-1.9.1.tar.gz) = 2598026
blob - a0e14d558065211bc171a988e45a902645bb4388
file + lang/abcl/files/abcl_completions
--- lang/abcl/files/abcl_completions
+++ lang/abcl/files/abcl_completions
@@ -543,6 +543,8 @@ java:define-java-class
java:canonicalize-java-type
java:canonicalize-jproxy-interfaces
java:chain
+java:classloader
+java:context-classloader
java:define-java-class
java:describe-java-object
java:dump-classpath
@@ -622,6 +624,7 @@ jvm:%%emit
java:runtime-class-add-methods
java:unregister-java-exception
java:vector-from-jarray
+java:with-classloader
jvm:%%emit
jvm:%define-opcode
jvm:%emit
@@ -695,6 +698,7 @@ jvm:class-name-from-filespec
jvm:class-file-p
jvm:class-method
jvm:class-methods-by-name
+jvm:class-name->type-signature
jvm:class-name-from-filespec
jvm:class-remove-method
jvm:code-add-attribute
@@ -1014,6 +1018,7 @@ jvm:map-flags
jvm:make-unwind-protect-node
jvm:make-var-ref
jvm:make-variable
+jvm:map-array-type
jvm:map-flags
jvm:map-method-name
jvm:map-primitive-type
@@ -3039,6 +3044,7 @@ threads:get-mutex
third
threads:current-thread
threads:destroy-thread
+threads:get-java-thread
threads:get-mutex
threads:interrupt-thread
threads:mailbox-empty-p
@@ -3311,7 +3317,3 @@ zerop
y-or-n-p
yes-or-no-p
zerop
--structure-p
-y-or-n-p
-yes-or-no-p
-zerop
blob - 7c4bd0c198187396e901d508a83b7eaf8ef01051
file + lang/abcl/pkg/PLIST
--- lang/abcl/pkg/PLIST
+++ lang/abcl/pkg/PLIST
@@ -234,6 +234,7 @@ abcl/src/org/armedbear/lisp/clos.lisp
abcl/src/org/armedbear/lisp/cell_error_name.java
abcl/src/org/armedbear/lisp/chars.lisp
abcl/src/org/armedbear/lisp/check-type.lisp
+abcl/src/org/armedbear/lisp/classloader.lisp
abcl/src/org/armedbear/lisp/clos.lisp
abcl/src/org/armedbear/lisp/coerce.lisp
abcl/src/org/armedbear/lisp/collect.lisp
[maintainer update] stumpwm-22.11
Hi,
Here's simple update to stumpwm, works fine on amd64.
Timo
diff /usr/ports
commit - 8cec033a832648202f0f3a061ca9f3ad31fdd582
path + /usr/ports
blob - 40721ec514013238bb49ed422b4a3832a6495317
file + x11/stumpwm/Makefile
--- x11/stumpwm/Makefile
+++ x11/stumpwm/Makefile
@@ -1,6 +1,6 @@
COMMENT= easily hackable Common LISP window manager
-VERSION= 22.05
+VERSION= 22.11
DISTNAME= stumpwm-${VERSION}
CATEGORIES=x11
blob - 3d06be6f7ebafe440b1f259177e96d767e81e5e1
file + x11/stumpwm/distinfo
--- x11/stumpwm/distinfo
+++ x11/stumpwm/distinfo
@@ -1,8 +1,8 @@
SHA256 (alexandria-20220707-git.tgz) =
jmFzEg3oeGx64P77qBAtgmIPrELpqt6VSvkTXghw1rE=
SHA256 (cl-ppcre-2.1.1.tar.gz) = iWMRebcWSNnmxWWpKPaJap1XQqogg7nBtwX+C0XYXe8=
SHA256 (clx-20220707-git.tgz) = FATKAKLy/BwEjrWiLRYXrvsLGi7qhO643QK4bsDlFc4=
-SHA256 (stumpwm-22.05.tar.gz) = 2EMwL5zlRmC8luTw2OlYTweoHUPEwmNX1aKcsHGUq64=
+SHA256 (stumpwm-22.11.tar.gz) = NpQPOywbpUIZqNOnhBA8+oP4TGUtHb19O3NgxV5e8CY=
SIZE (alexandria-20220707-git.tgz) = 56838
SIZE (cl-ppcre-2.1.1.tar.gz) = 159055
SIZE (clx-20220707-git.tgz) = 459236
-SIZE (stumpwm-22.05.tar.gz) = 238196
+SIZE (stumpwm-22.11.tar.gz) = 280147
Re: gzdoom update to 4.10.0
Thomas Frohwein writes:
> Hi,
>
> This diff updates gzdoom to latest version 4.10.0. I've been trying out
> a few gzdoom games and ended up updating this port in the process, even
> though not strictly necessary to run the one I mainly tested - the demo
> of Beyond Sunset [1]. Hands of Necromancy also works.
>
> The diff drops 2 patches that are no longer needed. Adds a new one to
> bypass get_current_dir_name() in i_system.cpp.
>
> CC'ing maintainer
>
> [1] https://metacorp.itch.io/beyond-sunset
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/gzdoom/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 18 Jul 2022 08:27:45 - 1.17
> +++ Makefile 24 Jan 2023 05:02:28 -
> @@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = i386 amd64
>
> COMMENT =OpenGL engine for idTech 1 games like
> doom,hexen,heretic...
>
> -V = 4.8.2
> +V = 4.10.0
> GH_ACCOUNT = coelckers
> GH_PROJECT = gzdoom
> GH_TAGNAME = g${V}
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/gzdoom/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 18 Jul 2022 08:27:45 - 1.7
> +++ distinfo 24 Jan 2023 05:02:28 -
> @@ -1,2 +1,2 @@
> -SHA256 (gzdoom-4.8.2.tar.gz) = Tt1g+AlMncPft0AL28DrsKXldLCmdH7uTI2fH2r3cSc=
> -SIZE (gzdoom-4.8.2.tar.gz) = 24247668
> +SHA256 (gzdoom-4.10.0.tar.gz) = hwJSLAUEjf1KdlxqyConDYvQlC6BPVvG9LaXlaXSOiA=
> +SIZE (gzdoom-4.10.0.tar.gz) = 24319337
> Index: patches/patch-libraries_discordrpc_CMakeLists_txt
> ===
> RCS file: patches/patch-libraries_discordrpc_CMakeLists_txt
> diff -N patches/patch-libraries_discordrpc_CMakeLists_txt
> --- patches/patch-libraries_discordrpc_CMakeLists_txt 31 Jul 2022 20:50:40
> - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -don't pick up clang-format is present
> -
> -Index: libraries/discordrpc/CMakeLists.txt
> libraries/discordrpc/CMakeLists.txt.orig
> -+++ libraries/discordrpc/CMakeLists.txt
> -@@ -10,7 +10,8 @@ file(GLOB_RECURSE ALL_SOURCE_FILES
> - )
> -
> - # Set CLANG_FORMAT_SUFFIX if you are using custom clang-format, e.g.
> clang-format-5.0
> --find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX})
> -+#find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX})
> -+set(CLANG_FORMAT_CMD, FALSE)
> -
> - if (CLANG_FORMAT_CMD)
> - add_custom_target(
> Index: patches/patch-src_common_platform_posix_sdl_i_system_cpp
> ===
> RCS file: patches/patch-src_common_platform_posix_sdl_i_system_cpp
> diff -N patches/patch-src_common_platform_posix_sdl_i_system_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_common_platform_posix_sdl_i_system_cpp 24 Jan 2023
> 05:02:28 -
> @@ -0,0 +1,52 @@
> +Index: src/common/platform/posix/sdl/i_system.cpp
> +--- src/common/platform/posix/sdl/i_system.cpp.orig
> src/common/platform/posix/sdl/i_system.cpp
> +@@ -54,6 +54,10 @@
> + #include "printf.h"
> + #endif
> +
> ++#ifdef __OpenBSD__
> ++#include "printf.h"
> ++#endif
> ++
> + #include
> +
> + #include "version.h"
> +@@ -408,14 +412,7 @@ FString I_GetFromClipboard (bool use_primary_selection
> +
> + FString I_GetCWD()
> + {
> +-char* curdir = get_current_dir_name();
> +-if (!curdir)
> +-{
> +-return "";
> +-}
> +-FString ret(curdir);
> +-free(curdir);
> +-return ret;
> ++return "";
> + }
> +
> + bool I_ChDir(const char* path)
> +@@ -447,18 +444,18 @@ unsigned int I_MakeRNGSeed()
> +
> + void I_OpenShellFolder(const char* infolder)
> + {
> +-char* curdir = get_current_dir_name();
> ++//char* curdir = get_current_dir_name();
> +
> + if (!chdir(infolder))
> + {
> + Printf("Opening folder: %s\n", infolder);
> + std::system("xdg-open .");
> +-chdir(curdir);
> ++//chdir(curdir);
> + }
> + else
> + {
> + Printf("Unable to open directory '%s\n", infolder);
> + }
> +-free(curdir);
> ++//free(curdir);
> + }
> +
> Index: patches/patch-src_d_main_cpp
> ===
> RCS file: patches/patch-src_d_main_cpp
> diff -N patches/patch-src_d_main_cpp
> --- patches/patch-src_d_main_cpp 18 Jul 2022 08:27:46 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,24 +0,0 @@
> -fix gzdoom.pk3 not found error, backport of
> -https://github.com/coelckers/gzdoom/pull/1665
> -
> -Index: src/d_main.cpp
> src/d_main.cpp.orig
> -+++ src/d_main.cpp
> -@@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void)
> -
> - std::set_new_handler(NewFailure);
> - const char *batchout =
(security fix) chicken-5.3.0p0
Hi,
Here's security fix for chicken to address CVE-2022-45145.
Details:
https://lists.nongnu.org/archive/html/chicken-announce/2022-11/msg0.html
Lightly tested on amd64.
timo
diff /usr/ports
commit - 528717c7be7c511f687700e972f9c49ea0c67f97
path + /usr/ports
blob - ed8d6eddfd6647ba5d6a303cb7f17ee779d7ca9b
file + lang/chicken/Makefile.inc
--- lang/chicken/Makefile.inc
+++ lang/chicken/Makefile.inc
@@ -2,6 +2,7 @@ DISTNAME= chicken-${V}
V= 5.3.0
DISTNAME= chicken-${V}
+REVISION= 0
MAINTAINER=Timo Myyra
blob - /dev/null
file + lang/chicken/core/patches/patch-egg-compile_scm (mode 644)
--- /dev/null
+++ lang/chicken/core/patches/patch-egg-compile_scm
@@ -0,0 +1,51 @@
+Fix CVE-2022-45145 by backporting commit
a08f8f548d772ef410c672ba33a27108d8d434f3.
+
+See:
https://lists.nongnu.org/archive/html/chicken-announce/2022-11/msg0.html
+
+Index: egg-compile.scm
+--- egg-compile.scm.orig
egg-compile.scm
+@@ -1191,7 +1191,7 @@ EOF
+
+ ~a ~a~a
+ ~a ~a~a
+-cat >~a~a <~a~a <<'ENDINFO'
+ ~aENDINFO~%
+ EOF
+mkdir ddir qdir
+@@ -1201,11 +1201,18 @@ EOF
+(printf #<~a~a~%
++copy /y nul ~a~a~%
++~a
+ EOF
+mkdir ddir qdir
+- (string-intersperse (string-split infostr "\n") "^\n\n")
+- ddir dest)
++ ddir dest
++ (string-intersperse (map (lambda (line)
++(ensure-line-limit
++ (caretize (format "echo ~a
>>~a~a"
++ line ddir
dest))
++ 8191 ))
++ (string-split infostr "\n"))
++ "\n"))
+
+ ;;; some utilities for mangling + quoting
+
+@@ -1277,3 +1284,12 @@ EOF
+ (define (joins strs) (string-intersperse strs " "))
+
+ (define (maybe f x) (if f (list x) '()))
++
++(define (caretize str)
++ (string-translate* str '(("&" . "^&") ("^" . "^^") ("|" . "^|")
++ ("<" . "^<") (">" . "^>"
++
++(define (ensure-line-limit str lim)
++ (when (>= (string-length str) lim)
++(error "line length exceeds platform limit: " str))
++ str)
Re: [update] emacs-28.2
Hi,
I've been testing various emacs builds, at one point I was attempting to enable
the native-compilation so it was probably leftover from there.
Timo
On Fri, Sep 16, 2022, at 16:54, Jeremie Courreges-Anglas wrote:
> On Thu, Sep 15 2022, Timo Myyrä wrote:
>> Hmm, not sure why it removes directories.
>> I tested by manually updating the PLIST to keep the directories. After
>> unistalling emacs it seems to leave behind the /usr/local/share/emacs
>> directory. It probably should remove it as it is mentioned in the
>> PLIST?
>
> Regarding the directories stripped: it happens with eg the gtk3 FLAVOR,
> probably because some dep already ships those directories.
>
> Here's a minimal diff. Since --without-native-compilation is the
> default I dropped it. Was there a reason to explicitely add it?
>
> By popular demand, here are the no_x11 and gtk3 package flavors:
>
> https://russell.wxcvbn.org/pub/OpenBSD/snapshots/emacs-28.2/
>
> I'm not aware of users affected by the bugs fixed in this 28.2 update,
> but it seems worthwhile to push this in 7.2. I would appreciate some
> test reports. Also if someone could confirm that emacs-28.2 builds on
> sparc64 (base-gcc) that would help.
>
> Thanks for bringing this up, Timo.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.105
> diff -u -p -r1.105 Makefile
> --- Makefile 19 Apr 2022 11:54:34 - 1.105
> +++ Makefile 14 Sep 2022 22:07:19 -
> @@ -1,6 +1,6 @@
> COMMENT= GNU editor: extensible, customizable, self-documenting
>
> -VERSION= 28.1
> +VERSION= 28.2
> DISTNAME=emacs-${VERSION}
>
> CATEGORIES= editors
> Index: distinfo
> ===
> RCS file: /cvs/ports/editors/emacs/distinfo,v
> retrieving revision 1.16
> diff -u -p -r1.16 distinfo
> --- distinfo 19 Apr 2022 11:54:34 - 1.16
> +++ distinfo 14 Sep 2022 22:07:19 -
> @@ -1,2 +1,2 @@
> -SHA256 (emacs-28.1.tar.xz) = KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=
> -SIZE (emacs-28.1.tar.xz) = 47699512
> +SHA256 (emacs-28.2.tar.xz) = 7iEYIjPvMjLcl7SGry2G4UBC27ZbvFNd9WLDqFgjJIg=
> +SIZE (emacs-28.2.tar.xz) = 47722600
> Index: patches/patch-lisp_files_el
> ===
> RCS file: /cvs/ports/editors/emacs/patches/patch-lisp_files_el,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-lisp_files_el
> --- patches/patch-lisp_files_el 19 Apr 2022 11:54:34 - 1.7
> +++ patches/patch-lisp_files_el 14 Sep 2022 22:07:19 -
> @@ -3,7 +3,7 @@
> Index: lisp/files.el
> --- lisp/files.el.orig
> +++ lisp/files.el
> -@@ -2918,6 +2918,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
> +@@ -2919,6 +2919,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
>("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
>("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
>("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS
> Index: patches/patch-src_emacs_c
> ===
> RCS file: /cvs/ports/editors/emacs/patches/patch-src_emacs_c,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-src_emacs_c
> --- patches/patch-src_emacs_c 19 Apr 2022 11:54:34 - 1.3
> +++ patches/patch-src_emacs_c 14 Sep 2022 22:07:19 -
> @@ -3,7 +3,7 @@ Don't use printf %n.
> Index: src/emacs.c
> --- src/emacs.c.orig
> +++ src/emacs.c
> -@@ -2742,21 +2742,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
> +@@ -2746,21 +2746,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
> reset_all_sys_modes ();
> if (sig && sig != SIGTERM)
> {
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
> retrieving revision 1.28
> diff -u -p -r1.28 PLIST
> --- pkg/PLIST 19 Apr 2022 11:54:34 - 1.28
> +++ pkg/PLIST 14 Sep 2022 22:07:19 -
> @@ -3810,6 +3810,8 @@ share/emacs/${VERSION}/lisp/term/common-
> share/emacs/${VERSION}/lisp/term/common-win.elc
> share/emacs/${VERSION}/lisp/term/cygwin.el.gz
> share/emacs/${VERSION}/lisp/term/cygwin.elc
> +share/emacs/${VERSION}/lisp/term/fbterm.el.gz
> +share/emacs/${VERSION}/lisp/term/fbterm.elc
> share/emacs/${VERSION}/lisp/term/internal.el.gz
> share/emacs/${VERSION}/lisp/term/internal.elc
> share/emacs/${VERSION}/lisp/term/iris-ansi.el.gz
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [update] emacs-28.2
Hmm, not sure why it removes directories.
I tested by manually updating the PLIST to keep the directories. After
unistalling emacs it seems to leave behind the /usr/local/share/emacs
directory. It probably should remove it as it is mentioned in the PLIST?
Timo
On Wed, Sep 14, 2022, at 11:57, Stuart Henderson wrote:
> Why are the directories removed from PLIST?
>
> --
> Sent from a phone, apologies for poor formatting.
>
> On 14 September 2022 04:36:55 Timo Myyrä wrote:
>
>> Hi,
>>
>> I'd like to see latest emacs in 7.2 release. Here's update to latest
>> 28.2 which was minor release focused on fixing bugs. Works for me on
>> amd64 with gtk3 flavor.
>>
>> Timo
>>
>> diff /usr/ports
>> commit - b5573adcb9ec5d1af5faa614d573d3c4f66faf53
>> path + /usr/ports
>> blob - 0e98a6ae4357a3f36db5187d58ff0b150a2fa8f6
>> file + editors/emacs/Makefile
>> --- editors/emacs/Makefile
>> +++ editors/emacs/Makefile
>> @@ -1,6 +1,6 @@
>> COMMENT= GNU editor: extensible, customizable, self-documenting
>>
>> -VERSION=28.1
>> +VERSION=28.2
>> DISTNAME=emacs-${VERSION}
>>
>> CATEGORIES= editors
>> @@ -27,7 +27,8 @@ GCCARCH= ${MACHINE_ARCH}-unknown-openbsd
>> CONFIGURE_STYLE= gnu
>> MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
>> CONFIGURE_ARGS= --build="${GCCARCH}" \
>> ---without-sound
>> +--without-sound \
>> +--without-native-compilation
>>
>> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
>> LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
>> blob - f0f4496ccf69ed3c9680d987f261312d0cf1d56f
>> file + editors/emacs/distinfo
>> --- editors/emacs/distinfo
>> +++ editors/emacs/distinfo
>> @@ -1,2 +1,2 @@
>> -SHA256 (emacs-28.1.tar.xz) = KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=
>> -SIZE (emacs-28.1.tar.xz) = 47699512
>> +SHA256 (emacs-28.2.tar.xz) = 7iEYIjPvMjLcl7SGry2G4UBC27ZbvFNd9WLDqFgjJIg=
>> +SIZE (emacs-28.2.tar.xz) = 47722600
>> blob - ecfec6ea57f35c450a7d7151a49b311d77e976ad
>> file + editors/emacs/patches/patch-lisp_files_el
>> --- editors/emacs/patches/patch-lisp_files_el
>> +++ editors/emacs/patches/patch-lisp_files_el
>> @@ -3,7 +3,7 @@
>> Index: lisp/files.el
>> --- lisp/files.el.orig
>> +++ lisp/files.el
>> -@@ -2918,6 +2918,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
>> +@@ -2919,6 +2919,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
>> ("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
>> ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
>> ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS
>> blob - ffe5d789b5333e8f9e5c043534746f9c3fce45eb
>> file + editors/emacs/patches/patch-src_emacs_c
>> --- editors/emacs/patches/patch-src_emacs_c
>> +++ editors/emacs/patches/patch-src_emacs_c
>> @@ -3,7 +3,7 @@ Don't use printf %n.
>> Index: src/emacs.c
>> --- src/emacs.c.orig
>> +++ src/emacs.c
>> -@@ -2742,21 +2742,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
>> +@@ -2746,21 +2746,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
>>reset_all_sys_modes ();
>>if (sig && sig != SIGTERM)
>> {
>> blob - e9cfe21585d748e19f19862e9b1bbdb2e433f389
>> file + editors/emacs/pkg/PLIST
>> --- editors/emacs/pkg/PLIST
>> +++ editors/emacs/pkg/PLIST
>> @@ -80,8 +80,6 @@ include/emacs-module.h
>> @info info/widget.info
>> @info info/wisent.info
>> @info info/woman.info
>> -lib/systemd/
>> -lib/systemd/user/
>> lib/systemd/user/emacs.service
>> libexec/emacs/
>> libexec/emacs/${VERSION}/
>> @@ -96,7 +94,6 @@ libexec/emacs/${VERSION}/${GCCARCH}/rcs2log
>> @man man/man1/emacsclient.1
>> @man man/man1/etags.1
>> share/doc/pkg-readmes/${PKGSTEM}
>> -share/emacs/
>> share/emacs/${VERSION}/
>> share/emacs/${VERSION}/etc/
>> share/emacs/${VERSION}/etc/AUTHORS
>> @@ -3810,6 +3807,8 @@ share/emacs/${VERSION}/lisp/term/common-win.el.gz
>> share/emacs/${VERSION}/lisp/term/common-win.elc
>> share/emacs/${VERSION}/lisp/term/cygwin.el.gz
>> share/emacs/${VERSION}/lisp/term/cygwin.elc
>> +share/emacs/${VERSION}/lisp/term/fbterm.el.gz
>> +share/emacs/${VERSION}/lisp/term/fbterm.elc
>> share/emacs/${VERSION}/lisp/term/internal.el.gz
>> share/emacs/${VERSION}/lisp/term/internal.elc
>> share/emacs/${VERSION}/lisp/term/iris-ansi.el.gz
>> @@ -4173,7 +4172,6 @@ share/emacs/${VERSION}/lisp/xwidget.el.gz
>> share/emacs/${VERSION}/lisp/xwidget.elc
>> share/emacs/${VERSION}/site-lisp/
>> share/emacs/${VERSION}/site-lisp/subdirs.el
>> -share/emacs/site-lisp/
>> share/emacs/site-lisp/subdirs.el
>> share/metainfo/
>> share/metainfo/emacs.metainfo.xml
[update] emacs-28.2
Hi,
I'd like to see latest emacs in 7.2 release. Here's update to latest
28.2 which was minor release focused on fixing bugs. Works for me on
amd64 with gtk3 flavor.
Timo
diff /usr/ports
commit - b5573adcb9ec5d1af5faa614d573d3c4f66faf53
path + /usr/ports
blob - 0e98a6ae4357a3f36db5187d58ff0b150a2fa8f6
file + editors/emacs/Makefile
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -1,6 +1,6 @@
COMMENT= GNU editor: extensible, customizable, self-documenting
-VERSION= 28.1
+VERSION= 28.2
DISTNAME= emacs-${VERSION}
CATEGORIES=editors
@@ -27,7 +27,8 @@ GCCARCH= ${MACHINE_ARCH}-unknown-openbsd
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
CONFIGURE_ARGS=--build="${GCCARCH}" \
- --without-sound
+ --without-sound \
+ --without-native-compilation
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
blob - f0f4496ccf69ed3c9680d987f261312d0cf1d56f
file + editors/emacs/distinfo
--- editors/emacs/distinfo
+++ editors/emacs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-28.1.tar.xz) = KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=
-SIZE (emacs-28.1.tar.xz) = 47699512
+SHA256 (emacs-28.2.tar.xz) = 7iEYIjPvMjLcl7SGry2G4UBC27ZbvFNd9WLDqFgjJIg=
+SIZE (emacs-28.2.tar.xz) = 47722600
blob - ecfec6ea57f35c450a7d7151a49b311d77e976ad
file + editors/emacs/patches/patch-lisp_files_el
--- editors/emacs/patches/patch-lisp_files_el
+++ editors/emacs/patches/patch-lisp_files_el
@@ -3,7 +3,7 @@
Index: lisp/files.el
--- lisp/files.el.orig
+++ lisp/files.el
-@@ -2918,6 +2918,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
+@@ -2919,6 +2919,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS
blob - ffe5d789b5333e8f9e5c043534746f9c3fce45eb
file + editors/emacs/patches/patch-src_emacs_c
--- editors/emacs/patches/patch-src_emacs_c
+++ editors/emacs/patches/patch-src_emacs_c
@@ -3,7 +3,7 @@ Don't use printf %n.
Index: src/emacs.c
--- src/emacs.c.orig
+++ src/emacs.c
-@@ -2742,21 +2742,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
+@@ -2746,21 +2746,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
reset_all_sys_modes ();
if (sig && sig != SIGTERM)
{
blob - e9cfe21585d748e19f19862e9b1bbdb2e433f389
file + editors/emacs/pkg/PLIST
--- editors/emacs/pkg/PLIST
+++ editors/emacs/pkg/PLIST
@@ -80,8 +80,6 @@ include/emacs-module.h
@info info/widget.info
@info info/wisent.info
@info info/woman.info
-lib/systemd/
-lib/systemd/user/
lib/systemd/user/emacs.service
libexec/emacs/
libexec/emacs/${VERSION}/
@@ -96,7 +94,6 @@ libexec/emacs/${VERSION}/${GCCARCH}/rcs2log
@man man/man1/emacsclient.1
@man man/man1/etags.1
share/doc/pkg-readmes/${PKGSTEM}
-share/emacs/
share/emacs/${VERSION}/
share/emacs/${VERSION}/etc/
share/emacs/${VERSION}/etc/AUTHORS
@@ -3810,6 +3807,8 @@ share/emacs/${VERSION}/lisp/term/common-win.el.gz
share/emacs/${VERSION}/lisp/term/common-win.elc
share/emacs/${VERSION}/lisp/term/cygwin.el.gz
share/emacs/${VERSION}/lisp/term/cygwin.elc
+share/emacs/${VERSION}/lisp/term/fbterm.el.gz
+share/emacs/${VERSION}/lisp/term/fbterm.elc
share/emacs/${VERSION}/lisp/term/internal.el.gz
share/emacs/${VERSION}/lisp/term/internal.elc
share/emacs/${VERSION}/lisp/term/iris-ansi.el.gz
@@ -4173,7 +4172,6 @@ share/emacs/${VERSION}/lisp/xwidget.el.gz
share/emacs/${VERSION}/lisp/xwidget.elc
share/emacs/${VERSION}/site-lisp/
share/emacs/${VERSION}/site-lisp/subdirs.el
-share/emacs/site-lisp/
share/emacs/site-lisp/subdirs.el
share/metainfo/
share/metainfo/emacs.metainfo.xml
Re: (maintainer update) lang/abcl-1.9.0
Timo Myyrä [2022-07-18, 09:19 +0300]:
> Stuart Henderson [2022-07-16, 10:00 +0100]:
>
>> Quick comments:
>>
>> - if the Java version needs to be kept in sync with jna, it would be
>> worth adding a comment to jna mentioning that
>>
>> - pkg/README is supposed to use a standard format with the header text.
>> Or there's probably not much downside to adding a tub dependency on
>> jna and getting rid of the readme.
>>
>> - up to you as maintainer what to do for tests, seems you have picked a
>> sensible way to handle it to me. Tests are not run in bulk builds.
>
>
> Here's another attempt at this:
> - add bash as build dependency and use it to generate abcl.properties
> - remove the patches for getting the java tests to run
> - remove README and add jna as run dependency
> - add mention to about syncing MODJAVA_VER with jna
>
> I removed the test setup, a bit too much patching for just running 16
> tests. Perphaps easier to just run tests separately as needed.
>
> timo
>
>
> diff fa25a47aa4e844fb29f93cb52cae81fdcf98ad16 /usr/ports
> blob - 821f1c92c6f3b82b2e43d6327452fb9cffb0a742
> file + lang/abcl/Makefile
> --- lang/abcl/Makefile
> +++ lang/abcl/Makefile
> @@ -1,9 +1,8 @@
> COMMENT =Common Lisp dialect for the Java Virtual Machine
> -V = 1.8.0
> +V = 1.9.0
> DISTNAME = abcl-src-${V}
> PKGNAME =abcl-${V}
> PKG_ARCH = *
> -REVISION = 0
>
> CATEGORIES = lang
>
> @@ -19,18 +18,25 @@ MASTER_SITES =${HOMEPAGE}/releases/${V}/
> DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
> EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
>
> +# Remember to keep MODJAVA_VER in sync with jna
> MODULES =java
> -MODJAVA_VER =1.8+
> +MODJAVA_VER =11
> MODJAVA_BUILD = ant
> MODJAVA_BUILD_TARGET_NAME = abcl.jar
>
> +BUILD_DEPENDS = shells/bash
> +
> RUN_DEPENDS =java/javaPathHelper \
> + java/jna \
> misc/rlwrap
>
> NO_TEST =Yes
>
> ABCL_HOME = ${PREFIX}/abcl
>
> +pre-configure:
> + bash ${WRKSRC}/ci/create-abcl-properties.bash ${MODJAVA_VER}
> +
> do-install:
> ${INSTALL_DATA_DIR} ${ABCL_HOME}
> ${INSTALL_DATA} ${WRKSRC}/dist/abcl.jar ${ABCL_HOME}
> blob - 9dd1aa6f45939c8b6cbca890d519245d8047f544
> file + lang/abcl/distinfo
> --- lang/abcl/distinfo
> +++ lang/abcl/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (abcl-src-1.8.0.tar.gz) = HYce4va8+ZHVpu/36lEF74CGENuIJgTU3wQR6XGtJX8=
> -SIZE (abcl-src-1.8.0.tar.gz) = 2613411
> +SHA256 (abcl-src-1.9.0.tar.gz) = oStchPKINL2Yjjra4K0q1MxsRR2eRPPAhT0AcVjBmGk=
> +SIZE (abcl-src-1.9.0.tar.gz) = 2470791
> blob - a41cb1e432aad256f439a9ad0ff2721415b3d25e
> file + lang/abcl/files/abcl_completions
> --- lang/abcl/files/abcl_completions
> +++ lang/abcl/files/abcl_completions
> @@ -50,6 +50,7 @@ array-rank
> array-row-major-index
> array-total-size
> arrayp
> +as-jar-pathname-archive
> ash
> asin
> asinh
> @@ -128,7 +129,6 @@ cdddr
> cddr
> cdr
> ceiling
> -cell-error-name
> cerror
> change-class
> char
> @@ -284,7 +284,6 @@ ffloor
> fifth
> file-author
> file-directory-p
> -file-error-pathname
> file-length
> file-namestring
> file-position
> @@ -1816,7 +1815,6 @@ os-oldmac-p
> os-unix-p
> os-windows-p
> output-stream-p
> -package-error-package
> package-local-nicknames
> package-locally-nicknamed-by-list
> package-name
> @@ -2377,7 +2375,6 @@ system:case-body
> system:case-body-aux
> system:case-body-error
> system:casify
> -system:cfp-output-file-default
> system:check-declaration-type
> system:check-disjoint
> system:check-for-circularity
> @@ -2867,6 +2864,7 @@ system:read-evaluated-form
> system:read-feature
> system:read-list
> system:read-quote
> +system:read-random-state
> system:read-right-paren
> system:read-string
> system:read-vector-unsigned-byte-8
> @@ -3313,3 +3311,7 @@ xp:xp-structure-p
> y-or-n-p
> yes-or-no-p
> zerop
> +-structure-p
> +y-or-n-p
> +yes-or-no-p
> +zerop
> blob - 53f21721432307466ac4b90381a0ce858dffd7e2
> file + lang/abcl/pkg/PLIST
> --- lang/abcl/pkg/PLIST
> +++ lang/abcl/pkg/PLIST
> @@ -295,7 +295,6 @@ abcl/src/org/armedbear/lisp/fasl-concat.lisp
> abcl/src/org/armedbear/lisp/fdefinition.lisp
> abcl/src/org/armedbear/lisp/featurep.lisp
> abcl/src/org/armedbear/lisp/file_author.java
> -abcl/src/org/armedbear/lisp/file_error_pathname.java
> abcl/src/
Re: (maintainer update) lang/abcl-1.9.0
Stuart Henderson [2022-07-16, 10:00 +0100]:
> Quick comments:
>
> - if the Java version needs to be kept in sync with jna, it would be
> worth adding a comment to jna mentioning that
>
> - pkg/README is supposed to use a standard format with the header text.
> Or there's probably not much downside to adding a tub dependency on
> jna and getting rid of the readme.
>
> - up to you as maintainer what to do for tests, seems you have picked a
> sensible way to handle it to me. Tests are not run in bulk builds.
Here's another attempt at this:
- add bash as build dependency and use it to generate abcl.properties
- remove the patches for getting the java tests to run
- remove README and add jna as run dependency
- add mention to about syncing MODJAVA_VER with jna
I removed the test setup, a bit too much patching for just running 16
tests. Perphaps easier to just run tests separately as needed.
timo
diff fa25a47aa4e844fb29f93cb52cae81fdcf98ad16 /usr/ports
blob - 821f1c92c6f3b82b2e43d6327452fb9cffb0a742
file + lang/abcl/Makefile
--- lang/abcl/Makefile
+++ lang/abcl/Makefile
@@ -1,9 +1,8 @@
COMMENT = Common Lisp dialect for the Java Virtual Machine
-V =1.8.0
+V =1.9.0
DISTNAME = abcl-src-${V}
PKGNAME = abcl-${V}
PKG_ARCH = *
-REVISION = 0
CATEGORIES = lang
@@ -19,18 +18,25 @@ MASTER_SITES = ${HOMEPAGE}/releases/${V}/
DISTFILES =${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
+# Remember to keep MODJAVA_VER in sync with jna
MODULES = java
-MODJAVA_VER = 1.8+
+MODJAVA_VER = 11
MODJAVA_BUILD =ant
MODJAVA_BUILD_TARGET_NAME =abcl.jar
+BUILD_DEPENDS =shells/bash
+
RUN_DEPENDS = java/javaPathHelper \
+ java/jna \
misc/rlwrap
NO_TEST = Yes
ABCL_HOME =${PREFIX}/abcl
+pre-configure:
+ bash ${WRKSRC}/ci/create-abcl-properties.bash ${MODJAVA_VER}
+
do-install:
${INSTALL_DATA_DIR} ${ABCL_HOME}
${INSTALL_DATA} ${WRKSRC}/dist/abcl.jar ${ABCL_HOME}
blob - 9dd1aa6f45939c8b6cbca890d519245d8047f544
file + lang/abcl/distinfo
--- lang/abcl/distinfo
+++ lang/abcl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (abcl-src-1.8.0.tar.gz) = HYce4va8+ZHVpu/36lEF74CGENuIJgTU3wQR6XGtJX8=
-SIZE (abcl-src-1.8.0.tar.gz) = 2613411
+SHA256 (abcl-src-1.9.0.tar.gz) = oStchPKINL2Yjjra4K0q1MxsRR2eRPPAhT0AcVjBmGk=
+SIZE (abcl-src-1.9.0.tar.gz) = 2470791
blob - a41cb1e432aad256f439a9ad0ff2721415b3d25e
file + lang/abcl/files/abcl_completions
--- lang/abcl/files/abcl_completions
+++ lang/abcl/files/abcl_completions
@@ -50,6 +50,7 @@ array-rank
array-row-major-index
array-total-size
arrayp
+as-jar-pathname-archive
ash
asin
asinh
@@ -128,7 +129,6 @@ cdddr
cddr
cdr
ceiling
-cell-error-name
cerror
change-class
char
@@ -284,7 +284,6 @@ ffloor
fifth
file-author
file-directory-p
-file-error-pathname
file-length
file-namestring
file-position
@@ -1816,7 +1815,6 @@ os-oldmac-p
os-unix-p
os-windows-p
output-stream-p
-package-error-package
package-local-nicknames
package-locally-nicknamed-by-list
package-name
@@ -2377,7 +2375,6 @@ system:case-body
system:case-body-aux
system:case-body-error
system:casify
-system:cfp-output-file-default
system:check-declaration-type
system:check-disjoint
system:check-for-circularity
@@ -2867,6 +2864,7 @@ system:read-evaluated-form
system:read-feature
system:read-list
system:read-quote
+system:read-random-state
system:read-right-paren
system:read-string
system:read-vector-unsigned-byte-8
@@ -3313,3 +3311,7 @@ xp:xp-structure-p
y-or-n-p
yes-or-no-p
zerop
+-structure-p
+y-or-n-p
+yes-or-no-p
+zerop
blob - 53f21721432307466ac4b90381a0ce858dffd7e2
file + lang/abcl/pkg/PLIST
--- lang/abcl/pkg/PLIST
+++ lang/abcl/pkg/PLIST
@@ -295,7 +295,6 @@ abcl/src/org/armedbear/lisp/fasl-concat.lisp
abcl/src/org/armedbear/lisp/fdefinition.lisp
abcl/src/org/armedbear/lisp/featurep.lisp
abcl/src/org/armedbear/lisp/file_author.java
-abcl/src/org/armedbear/lisp/file_error_pathname.java
abcl/src/org/armedbear/lisp/file_length.java
abcl/src/org/armedbear/lisp/file_string_length.java
abcl/src/org/armedbear/lisp/file_write_date.java
@@ -387,7 +386,6 @@ abcl/src/org/armedbear/lisp/open_stream_p.java
abcl/src/org/armedbear/lisp/or.lisp
abcl/src/org/armedbear/lisp/output_stream_p.java
abcl/src/org/armedbear/lisp/package.lisp
-abcl/src/org/armedbear/lisp/package_error_package.java
abcl/src/org/armedbear/lisp/parse-integer.lisp
abcl/src/org/armedbear/lisp/parse-lambda-list.lisp
abcl/src/org/armedbear/lisp/pathnames.lisp
@@ -487,4 +485,3 @@ abcl/src/org/armedbear/lisp/with-standard-io-syntax.li
abcl/src/org/armedbear/lisp/write-sequence.lisp
abcl/src/org/armedbear/lisp/zip.java
bin/abcl
-share/doc/pkg-readmes/${PKGSTEM}
blob -
(maintainer update) lang/abcl-1.9.0
Hi,
Working on updating the abcl port to latest release. This seems to be
work as expected once I removed old customizations from my .abclrc file.
I bumped the MODJAVA_VER to 11 so it matches the jna packages version.
ABCL uses jna for foreign functions and I got java version errors when
they did not match.
The following diff enables the java junit tests. I'm not sure if these
are useful for bulk builds, ant seems to return success irregardless of
the test outcome. Also the running of tests requires a bit of work on
patching and setup before they work.
ABCL has following targets for running tests:
abcl.test
-- Run all available tests.
abcl.test.java
-- Run the ABCL junit Java tests under ${basedir}/test/src/
abcl.test.lisp
-- Run the 'test.ansi.compiled', 'test.abcl', 'test.cl-bench' targets
test.ansi.compiled
-- Run the compiled version of the ANSI test suite
test.abcl
-- Run the Lisp RT tests collected in ${basedir}/test/lisp/abcl/
test.cl-bench
-- Run the cl-bench test suite.
Java Junit tests require Junit and Maven installations which is
implemented currently. ANSI test suite requires the downloading the full
test suite before running tests and I don't think ABCL still passess it.
test.abcl target has some lisp tests which require setting up
*user-cache* directory for _pbuild user where the FASL files stored.
This requires a bit of patching for build.xml.
The cl-bench runs common lisp tests against all available common lisp
systems from quicklisp so it is not expected to complete successfully.
What do you think? Skip all tests as was done before or patch in some of
the tests?
Timo
diff fa25a47aa4e844fb29f93cb52cae81fdcf98ad16 /usr/ports
blob - 821f1c92c6f3b82b2e43d6327452fb9cffb0a742
file + lang/abcl/Makefile
--- lang/abcl/Makefile
+++ lang/abcl/Makefile
@@ -1,10 +1,12 @@
COMMENT = Common Lisp dialect for the Java Virtual Machine
-V =1.8.0
+V =1.9.0
DISTNAME = abcl-src-${V}
PKGNAME = abcl-${V}
PKG_ARCH = *
-REVISION = 0
+MAVEN_V = 3.3.9
+JUNIT_V = 4.8.1
+
CATEGORIES = lang
HOMEPAGE = https://abcl.org/
@@ -15,22 +17,28 @@ MAINTAINER =Timo Myyra
PERMIT_PACKAGE = Yes
MASTER_SITES = ${HOMEPAGE}/releases/${V}/
+MASTER_SITES1 =
https://repo1.maven.org/maven2/junit/junit/${JUNIT_V}/
+MASTER_SITES2 =
https://www.apache.org/dist/maven/maven-3/${MAVEN_V}/binaries/
DISTFILES =${DISTNAME}${EXTRACT_SUFX}
+SUPDISTFILES+= junit-${JUNIT_V}.jar:1
+SUPDISTFILES+= apache-maven-${MAVEN_V}-bin.zip:2
+
EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
MODULES = java
-MODJAVA_VER = 1.8+
+MODJAVA_VER = 11
MODJAVA_BUILD =ant
MODJAVA_BUILD_TARGET_NAME =abcl.jar
RUN_DEPENDS = java/javaPathHelper \
misc/rlwrap
-NO_TEST = Yes
-
ABCL_HOME =${PREFIX}/abcl
+pre-configure:
+ ${INSTALL_DATA} ${FILESDIR}/abcl.properties ${WRKSRC}/abcl.properties
+
do-install:
${INSTALL_DATA_DIR} ${ABCL_HOME}
${INSTALL_DATA} ${WRKSRC}/dist/abcl.jar ${ABCL_HOME}
@@ -40,6 +48,18 @@ do-install:
chown -R ${SHAREOWN}:${SHAREGRP} ${ABCL_HOME}/src
${INSTALL_DATA} ${FILESDIR}/abcl_completions ${ABCL_HOME}
+pre-test:
+ ${INSTALL_DATA_DIR} ${WRKDIR}/.cache
+
+do-test:
+ ${INSTALL_DATA_DIR} ${WRKSRC}/ext
+ cp ${DISTDIR}/junit-${JUNIT_V}.jar ${WRKSRC}/ext/
+ cp ${DISTDIR}/apache-maven-${MAVEN_V}-bin.zip ${WRKSRC}/ext/
+ cd ${MODJAVA_BUILD_DIR} && \
+ ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/ant \
+ -buildfile ${MODJAVA_BUILD_FILE} abcl.test.java
+
+
# maintainer target to generate completions file
completions: install
${LOCALBASE}/bin/abcl --noinit --load ${FILESDIR}/gen-completions.lisp
blob - 9dd1aa6f45939c8b6cbca890d519245d8047f544
file + lang/abcl/distinfo
--- lang/abcl/distinfo
+++ lang/abcl/distinfo
@@ -1,2 +1,6 @@
-SHA256 (abcl-src-1.8.0.tar.gz) = HYce4va8+ZHVpu/36lEF74CGENuIJgTU3wQR6XGtJX8=
-SIZE (abcl-src-1.8.0.tar.gz) = 2613411
+SHA256 (abcl-src-1.9.0.tar.gz) = oStchPKINL2Yjjra4K0q1MxsRR2eRPPAhT0AcVjBmGk=
+SHA256 (apache-maven-3.3.9-bin.zip) =
uzcUamfQZwaXVMd1ucnwO1LalTJhmBc43pYwVwI82jo=
+SHA256 (junit-4.8.1.jar) = 79jPk7V9Aej1HxeuOebiJVNhWSbgCm7vwwfaIeY=
+SIZE (abcl-src-1.9.0.tar.gz) = 2470791
+SIZE (apache-maven-3.3.9-bin.zip) = 8617253
+SIZE (junit-4.8.1.jar) = 237047
blob - /dev/null
file + lang/abcl/files/abcl.properties
--- /dev/null
+++ lang/abcl/files/abcl.properties
@@ -0,0 +1,101 @@
+## Ant based build process and runtime settings
+
+## A file named 'abcl.properties' controls settings for the ABCL
+## build. This is the prototype for its contents.
+
+# Attempt to perform incremental compilation?
[maintainer update] devel/py-progress-1.6
Hi,
Simple bump to py-progress library. Prompted by portno12 a while back.
Timo
diff 922bc0dd1b90e02f44c8c00183cad19f3c566aa5 /usr/ports
blob - 3d8420404f366a4f0c2bb262f5bb3d6299e8281a
file + devel/py-progress/Makefile
--- devel/py-progress/Makefile
+++ devel/py-progress/Makefile
@@ -2,11 +2,10 @@
COMMENT = easy to use progressbar library for python
-MODPY_EGG_VERSION =1.5
+MODPY_EGG_VERSION =1.6
DISTNAME = progress-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
-REVISION = 2
HOMEPAGE = https://github.com/verigak/progress/
blob - ee77193cb2216c9898e94f54b754e5969d693774
file + devel/py-progress/distinfo
--- devel/py-progress/distinfo
+++ devel/py-progress/distinfo
@@ -1,2 +1,2 @@
-SHA256 (progress-1.5.tar.gz) = aezt0dG75xv2MT2I0ebE0pV7fx1PcTEsIRJX99rmQ3I=
-SIZE (progress-1.5.tar.gz) = 5842
+SHA256 (progress-1.6.tar.gz) = ychumLXAP6H+EeO2fB/tpHiLjQ/nM2wv99VkTM+6NM0=
+SIZE (progress-1.6.tar.gz) = 7842
blob - 3ee2faf0edfd6653adf245d17e08ab3701b1ad03
file + devel/py-progress/pkg/PLIST
--- devel/py-progress/pkg/PLIST
+++ devel/py-progress/pkg/PLIST
@@ -9,9 +9,11 @@ lib/python${MODPY_VERSION}/site-packages/progress-${MO
lib/python${MODPY_VERSION}/site-packages/progress/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/progress/bar.py
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}bar.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/progress/counter.py
+lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}colors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}counter.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/progress/spinner.py
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}spinner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/progress/bar.py
+lib/python${MODPY_VERSION}/site-packages/progress/colors.py
+lib/python${MODPY_VERSION}/site-packages/progress/counter.py
+lib/python${MODPY_VERSION}/site-packages/progress/spinner.py
Re: [maintainer update] audio/zmusic-1.1.9
Klemens Nanni [2022-07-10, 11:15 +]: > On Wed, Jul 06, 2022 at 09:42:56AM +0300, Timo Myyrä wrote: > >> Hi, >> >> While looking gzdoom update I noticed the zmusic has newer tags present >> in github which are not noticeable from quickly looking the frontpage. >> In any case, here is an new version of zmusic. Tested with latest gzdoom >> version (diff incoming) > > OK kn > > Not importing now since the gzdoom update is still pending. Well the zmusic is not really tied to specific version of gzdoom. The updated zmusic works with the older gzdoom so should be safe to commit. timo
Re: [maintainer update] games/gzdoom-4.8.2
Omar Polo [2022-07-11, 12:09 +0200]: > Timo Myyrä wrote: > >> Timo Myyrä [2022-07-10, 20:12 +0300]: >> > Asked about it and there is an open bug for it: >> > https://github.com/coelckers/gzdoom/issues/1615 >> > >> > Let's wait until that is fixed before updating the gzdoom port. >> > >> > timo >> >> Actually found a simple patch on archlinux's port of gzdoom which seems >> to fix the 'cannot find gzdoom.pk3' error. >> >> Here's updated diff: >> - explicitly disable OpenMP for now so it won't pick it up if found >> - added multimedia/libvpx to LIB_DEPENDS (port complains its unused but ldd >> lists it in gzdoom binary ) > > vpx was missing in WANTLIB ;) > > (i've added it locally, no need to re-send the diff.) > >> - patch progdir in i_main.cpp so gzdoom.pk3 is found > > I've opened https://github.com/coelckers/gzdoom/pull/1665 as an > alternative fix for the issue. I was thinking of waiting a bit for > upstream to chime in; if they like the diff I'll commit the update > with that included, if they don't or if it takes long to sort it out > we can commit the update with the hardcoded path to the pk3. what do > you think? > > Thanks, > > Omar Polo Your diff seems simpler and better so I'd prefer to go with it but I'd wait a bit to see if the upstream has some other fix brewing. Timo
[maintainer update] x11/stumpwm-22.05
Hi,
Stumpwm has had an release so here's bump for it:
- bump dependency dist versions
- enable core compression support (enabled by default in sbcl)
- set module dir to /usr/local/share/stumpwm/modules
I'm not sure about setting the module dir when the stumpwm modules are
not installed. But currently it default to use non-existant directory by
default so this seems step in better direction.
Any thoughts?
timo
diff 603e76dd58833a7b9423e59292778e6e145a472f /usr/ports
blob - 5207eca5ad8ee1dd9bb22a0ca1622724610e4564
file + x11/stumpwm/Makefile
--- x11/stumpwm/Makefile
+++ x11/stumpwm/Makefile
@@ -1,6 +1,6 @@
COMMENT= easily hackable Common LISP window manager
-VERSION= 20.11
+VERSION= 22.05
DISTNAME= stumpwm-${VERSION}
CATEGORIES=x11
@@ -12,23 +12,25 @@ MAINTAINER= Timo Myyra
# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += c m util z
+WANTLIB += c m pthread util z
MASTER_SITES= https://github.com/stumpwm/stumpwm/archive/
MASTER_SITES0= https://github.com/edicl/cl-ppcre/archive/
-MASTER_SITES1= https://beta.quicklisp.org/archive/clx/2019-08-13/
-MASTER_SITES2=
https://beta.quicklisp.org/archive/alexandria/2019-07-10/
+MASTER_SITES1= https://beta.quicklisp.org/archive/clx/2022-07-07/
+MASTER_SITES2=
https://beta.quicklisp.org/archive/alexandria/2022-07-07/
DISTFILES= ${DISTNAME}{${VERSION}}${EXTRACT_SUFX} \
cl-ppcre-2.1.1{v2.1.1}.tar.gz:0 \
- clx-20190813-git.tgz:1 \
- alexandria-20190710-git.tgz:2
+ clx-20220707-git.tgz:1 \
+ alexandria-20220707-git.tgz:2
BUILD_DEPENDS= lang/sbcl,threads \
print/texinfo
AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf no-autoheader
+CONFIGURE_ARGS+= --with-module-dir=${LOCALBASE}/share/stumpwm/modules \
+ --enable-compression
USE_GMAKE= yes
MAKE_ENV= MAKEINFO=${PREFIX}/bin/gmakeinfo \
blob - 5ec1300efd903d2a5a3428092856a68cfc9df93f
file + x11/stumpwm/distinfo
--- x11/stumpwm/distinfo
+++ x11/stumpwm/distinfo
@@ -1,8 +1,8 @@
-SHA256 (alexandria-20190710-git.tgz) =
4GQr1vivjrceM1m0XhGhNfo8mlEUkrydu80Q7H1pRwQ=
+SHA256 (alexandria-20220707-git.tgz) =
jmFzEg3oeGx64P77qBAtgmIPrELpqt6VSvkTXghw1rE=
SHA256 (cl-ppcre-2.1.1.tar.gz) = iWMRebcWSNnmxWWpKPaJap1XQqogg7nBtwX+C0XYXe8=
-SHA256 (clx-20190813-git.tgz) = qrn8jYEnnT1Dxh748Dn8rj31jbwzUzDrb4gORwVuE98=
-SHA256 (stumpwm-20.11.tar.gz) = jJqqua18vDXnBcCF6GYbINiLhOdQ97GFnmWosvGtViw=
-SIZE (alexandria-20190710-git.tgz) = 53436
+SHA256 (clx-20220707-git.tgz) = FATKAKLy/BwEjrWiLRYXrvsLGi7qhO643QK4bsDlFc4=
+SHA256 (stumpwm-22.05.tar.gz) = 2EMwL5zlRmC8luTw2OlYTweoHUPEwmNX1aKcsHGUq64=
+SIZE (alexandria-20220707-git.tgz) = 56838
SIZE (cl-ppcre-2.1.1.tar.gz) = 159055
-SIZE (clx-20190813-git.tgz) = 460647
-SIZE (stumpwm-20.11.tar.gz) = 219590
+SIZE (clx-20220707-git.tgz) = 459236
+SIZE (stumpwm-22.05.tar.gz) = 238196
Re: [maintainer update] games/gzdoom-4.8.2
Timo Myyrä [2022-07-10, 20:12 +0300]:
> Omar Polo [2022-07-08, 10:43 +0200]:
>
>> Hello,
>>
>> Timo Myyrä wrote:
>>> Hi,
>>>
>>> Here's companion for the audio/zmusic diff to bring gzdoom to latest
>>> release. Seemed to work on quick test on amd64.
>>
>> It seems to automatically picks up multimedia/libvpx if installed,
>> should we add it as dependency or disable it?
>>
>
> I'd say it should be added as LIB_DEPENDS, quick glance at the source
> would tell it is used by movie playback.
>
>> It fails to start for me: it pops up a windwo with "Cannot find
>> gzdoom.pk3" and that's it. Looking at ktrace it does
>>
>> 8005 gzdoom CALL stat(0x9e670681cb0,0x7f7f6fc8)
>> 8005 gzdoom NAMI "./gzdoom.pk3"
>> 8005 gzdoom RET stat -1 errno 2 No such file or directory
>> 8005 gzdoom CALL stat(0x9e66f2a06c0,0x7f7f6fc8)
>> 8005 gzdoom NAMI "gzdoom.pk3"
>> 8005 gzdoom RET stat -1 errno 2 No such file or directory
>>
>> However, if i run it from /usr/local/games/gzdoom it works as expected
>> (gzdoom.pk3 is installed there.) Any idea why is doing that?
>>
>>
>> Thanks,
>>
>> Omar Polo
>
> Asked about it and there is an open bug for it:
> https://github.com/coelckers/gzdoom/issues/1615
>
> Let's wait until that is fixed before updating the gzdoom port.
>
> timo
Actually found a simple patch on archlinux's port of gzdoom which seems
to fix the 'cannot find gzdoom.pk3' error.
Here's updated diff:
- explicitly disable OpenMP for now so it won't pick it up if found
- added multimedia/libvpx to LIB_DEPENDS (port complains its unused but ldd
lists it in gzdoom binary )
- patch progdir in i_main.cpp so gzdoom.pk3 is found
timo
diff 603e76dd58833a7b9423e59292778e6e145a472f /usr/ports
blob - 3fac26e1bd4e6c193a372d0f4f2bbaf423d98108
file + games/gzdoom/Makefile
--- games/gzdoom/Makefile
+++ games/gzdoom/Makefile
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS =i386 amd64
COMMENT = OpenGL engine for idTech 1 games like
doom,hexen,heretic...
-V =4.7.1
+V =4.8.2
GH_ACCOUNT = coelckers
GH_PROJECT = gzdoom
GH_TAGNAME = g${V}
@@ -32,6 +32,7 @@ MODULES = devel/cmake
CONFIGURE_ARGS += -DNO_GTK=ON
CONFIGURE_ARGS += -DDYN_OPENAL=NO
CONFIGURE_ARGS += -DHAVE_STDINT_H=1
+CONFIGURE_ARGS += -DNO_OPENMP=ON
CXXFLAGS += -I. -I${LOCALBASE}/include
@@ -39,8 +40,12 @@ LIB_DEPENDS =audio/openal \
audio/zmusic \
archivers/bzip2 \
graphics/jpeg \
- devel/sdl2
+ devel/sdl2 \
+ multimedia/libvpx
NO_TEST = Yes
+pre-configure:
+ ${SUBST_CMD}
${WRKSRC}/src/common/platform/posix/sdl/i_main.cpp
+
.include
blob - 6202659488a2b382b898f9d0d323437b3b71ba72
file + games/gzdoom/distinfo
--- games/gzdoom/distinfo
+++ games/gzdoom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gzdoom-4.7.1.tar.gz) = RUJXWCvgV2UB7vHvyZ/n6nDxxNeZNUnbPLxwnOdfwQI=
-SIZE (gzdoom-4.7.1.tar.gz) = 19562412
+SHA256 (gzdoom-4.8.2.tar.gz) = Tt1g+AlMncPft0AL28DrsKXldLCmdH7uTI2fH2r3cSc=
+SIZE (gzdoom-4.8.2.tar.gz) = 24247668
blob - a9570e7e1c6555bd1f22655ea44c360a54663331
file + games/gzdoom/patches/patch-CMakeLists_txt
--- games/gzdoom/patches/patch-CMakeLists_txt
+++ games/gzdoom/patches/patch-CMakeLists_txt
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -271,7 +271,7 @@ else()
+@@ -272,7 +272,7 @@ else()
if ( UNIX )
include(CheckSymbolExists)
blob - be01fd6c393eb8966d784b53469e75e6ae95ed2c
file + /dev/null
--- games/gzdoom/patches/patch-src_CMakeLists_txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/CMakeLists.txt
src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
-@@ -356,7 +360,7 @@ CHECK_CXX_SOURCE_COMPILES("thread_local int i; int mai
- HAVE_THREAD_LOCAL)
-
- if( NOT HAVE_THREAD_LOCAL )
-- message( SEND_ERROR "C++ compiler doesn't support thread_local storage
duration specifier" )
-+ message( STATUS "C++ compiler doesn't support thread_local storage
duration specifier" )
- endif()
-
- # Check for functions that may or may not exist.
blob - /dev/null
file + games/gzdoom/patches/patch-src_common_platform_posix_sdl_i_main_cpp
--- /dev/null
+++ games/gzdoom/patches/patch-src_common_platform_posix_sdl_i_main_cpp
@@ -0,0 +1,24 @@
+Index: src/common/platform/posix/sdl/i_main.cpp
+--- src/common/platform/posix/sdl/i_main.cpp.orig
src/common/platform/posix/sdl/i_main.cpp
+@@ -175,19 +175,7 @@ int main (int argc, char **argv)
+ Args = new FArgs(argc, argv)
Re: [maintainer update] games/gzdoom-4.8.2
Omar Polo [2022-07-08, 10:43 +0200]: > Hello, > > Timo Myyrä wrote: >> Hi, >> >> Here's companion for the audio/zmusic diff to bring gzdoom to latest >> release. Seemed to work on quick test on amd64. > > It seems to automatically picks up multimedia/libvpx if installed, > should we add it as dependency or disable it? > I'd say it should be added as LIB_DEPENDS, quick glance at the source would tell it is used by movie playback. > It fails to start for me: it pops up a windwo with "Cannot find > gzdoom.pk3" and that's it. Looking at ktrace it does > > 8005 gzdoom CALL stat(0x9e670681cb0,0x7f7f6fc8) > 8005 gzdoom NAMI "./gzdoom.pk3" > 8005 gzdoom RET stat -1 errno 2 No such file or directory > 8005 gzdoom CALL stat(0x9e66f2a06c0,0x7f7f6fc8) > 8005 gzdoom NAMI "gzdoom.pk3" > 8005 gzdoom RET stat -1 errno 2 No such file or directory > > However, if i run it from /usr/local/games/gzdoom it works as expected > (gzdoom.pk3 is installed there.) Any idea why is doing that? > > > Thanks, > > Omar Polo Asked about it and there is an open bug for it: https://github.com/coelckers/gzdoom/issues/1615 Let's wait until that is fixed before updating the gzdoom port. timo
[maintainer update] x11/dunst-1.9.0
Hi,
Dunst seems to have few releases so bump port to latest version.
Timo
diff 3c1d0e6f7c1a7453566310164ea13533318a7bd7 /usr/ports
blob - 28c87e25a47b28b381fa082e338dd4665aae932e
file + x11/dunst/Makefile
--- x11/dunst/Makefile
+++ x11/dunst/Makefile
@@ -2,7 +2,7 @@ COMMENT = customizable and lightweight notification-da
GH_ACCOUNT = dunst-project
GH_PROJECT = dunst
-GH_TAGNAME = v1.7.3
+GH_TAGNAME = v1.9.0
CATEGORIES = x11
blob - eb7d8f63bc2adeae21bc31243fd112256e1ec948
file + x11/dunst/distinfo
--- x11/dunst/distinfo
+++ x11/dunst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.7.3.tar.gz) = FQx4JpAobhY2Y7DrJgW3M5JyQBWXOLg2WAi4UeCvu+4=
-SIZE (dunst-1.7.3.tar.gz) = 4596283
+SHA256 (dunst-1.9.0.tar.gz) = t7jX1lYLskGx5NN+uncM3xm51dv8HU1HVyrWdvP3yYo=
+SIZE (dunst-1.9.0.tar.gz) = 4609222
blob - 439191b52fddda5c163cab7eac36aadc42715766
file + x11/dunst/patches/patch-config_mk
--- x11/dunst/patches/patch-config_mk
+++ x11/dunst/patches/patch-config_mk
@@ -4,7 +4,7 @@ Index: config.mk
@@ -36,8 +36,8 @@ endif
# flags
- DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
-DSYSCONFDIR=\"${SYSCONFDIR}\"
+ DEFAULT_CPPFLAGS = -Wno-gnu-zero-variadic-macro-arguments -D_DEFAULT_SOURCE
-DVERSION=\"${VERSION}\" -DSYSCONFDIR=\"${SYSCONFDIR}\"
-DEFAULT_CFLAGS = -g -std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os
${ENABLE_WAYLAND} ${EXTRA_CFLAGS}
-DEFAULT_LDFLAGS = -lm -lrt
+DEFAULT_CFLAGS = -g -std=gnu99 -pedantic -Wall -Wno-overlength-strings
${ENABLE_WAYLAND} ${EXTRA_CFLAGS}
blob - 0ec627a863ba162b29fe30a7c439aa460f16472b
file + x11/dunst/patches/patch-docs_dunst_5_pod
--- x11/dunst/patches/patch-docs_dunst_5_pod
+++ x11/dunst/patches/patch-docs_dunst_5_pod
@@ -1,16 +1,16 @@
Index: docs/dunst.5.pod
--- docs/dunst.5.pod.orig
+++ docs/dunst.5.pod
-@@ -384,7 +384,7 @@ gets the last say.
+@@ -399,7 +399,7 @@ Hide the count of stacked duplicate notifications.
+ Show an indicator if a notification contains actions and/or open-able URLs.
See
+ ACTIONS below for further details.
- If B is set to off, this setting is ignored.
-
-=item B (default:
"/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/")
+=item B (default:
"${PREFIX}/share/icons/gnome/16x16/status/:${PREFIX}/share/icons/gnome/16x16/devices/")
Can be set to a colon-separated list of paths to search for icons to use with
notifications.
-@@ -398,7 +398,7 @@ replace this and will need new settings.
+@@ -413,7 +413,7 @@ replace this and will need new settings.
Comma-separated of names of the the themes to use for looking up icons. This
has
to be the name of the directory in which the theme is located, not the
human-friendly name of the theme. So for example, the theme B is
@@ -19,12 +19,12 @@ Index: docs/dunst.5.pod
theme to B.
The first theme in the list is the most important. Only if the icon cannot be
-@@ -438,12 +438,12 @@ Maximum number of notifications that will be kept in h
+@@ -451,12 +451,12 @@ Maximum number of notifications that will be kept in h
is reached, older notifications will be deleted once a new one arrives. See
HISTORY.
--=item B (default: "/usr/bin/dmenu")
-+=item B (default: "${LOCALBASE}/bin/dmenu")
+-=item B (default: "/usr/bin/dmenu -p dunst")
++=item B (default: "${LOCALBASE}/bin/dmenu -p dunst")
The command that will be run when opening the context menu. Should be either
a dmenu command or a dmenu-compatible menu.
blob - 7acbe30e4c8e1f8935ba0e4a11fbf55c706790fe
file + x11/dunst/patches/patch-dunstrc
--- x11/dunst/patches/patch-dunstrc
+++ x11/dunst/patches/patch-dunstrc
@@ -1,16 +1,16 @@
Index: dunstrc
--- dunstrc.orig
+++ dunstrc
-@@ -196,7 +196,7 @@
- max_icon_size = 32
+@@ -212,7 +212,7 @@
+ max_icon_size = 128
- # Paths to default icons.
+ # Paths to default icons (only neccesary when not using recursive icon
lookup)
-icon_path =
/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
+icon_path =
${LOCALBASE}/share/icons/gnome/16x16/status/:${LOCALBASE}/share/icons/gnome/16x16/devices/
### History ###
-@@ -210,10 +210,10 @@
+@@ -226,10 +226,10 @@
### Misc/Advanced ###
# dmenu path.
blob - 0b2e63528e26dda69a0653a5f1101ee8ec1f3009
file + x11/dunst/patches/patch-src_dunst_c
--- x11/dunst/patches/patch-src_dunst_c
+++ x11/dunst/patches/patch-src_dunst_c
@@ -1,7 +1,7 @@
Index: src/dunst.c
--- src/dunst.c.orig
+++ src/dunst.c
-@@ -95,7 +95,7 @@ static gboolean run(void *data)
+@@ -96,7 +96,7 @@ static gboolean run(void *data)
gint64 sleep = queues_get_next_datachange(now);
gint64 timeout_at = now + sleep;
@@ -9,4 +9,4 @@ Index: src/dunst.c
+LOG_D("Sleeping for %lli ms", (long long)sleep/1000);
if (sleep >= 0) {
- if (next_timeout < now || timeout_at < next_timeout) {
+ if (reason == 0 || next_timeout < now ||
[maintainer update] games/gzdoom-4.8.2
Hi,
Here's companion for the audio/zmusic diff to bring gzdoom to latest
release. Seemed to work on quick test on amd64.
timo
diff 3c1d0e6f7c1a7453566310164ea13533318a7bd7 /usr/ports
blob - f967002f56e09919f748bc96ecee73c0ae94c9b6
file + games/gzdoom/Makefile
--- games/gzdoom/Makefile
+++ games/gzdoom/Makefile
@@ -8,7 +8,7 @@ ONLY_FOR_ARCHS =i386 amd64
COMMENT = OpenGL engine for idTech 1 games like
doom,hexen,heretic...
-V =4.7.1
+V =4.8.2
GH_ACCOUNT = coelckers
GH_PROJECT = gzdoom
GH_TAGNAME = g${V}
blob - 6202659488a2b382b898f9d0d323437b3b71ba72
file + games/gzdoom/distinfo
--- games/gzdoom/distinfo
+++ games/gzdoom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gzdoom-4.7.1.tar.gz) = RUJXWCvgV2UB7vHvyZ/n6nDxxNeZNUnbPLxwnOdfwQI=
-SIZE (gzdoom-4.7.1.tar.gz) = 19562412
+SHA256 (gzdoom-4.8.2.tar.gz) = Tt1g+AlMncPft0AL28DrsKXldLCmdH7uTI2fH2r3cSc=
+SIZE (gzdoom-4.8.2.tar.gz) = 24247668
blob - a9570e7e1c6555bd1f22655ea44c360a54663331
file + games/gzdoom/patches/patch-CMakeLists_txt
--- games/gzdoom/patches/patch-CMakeLists_txt
+++ games/gzdoom/patches/patch-CMakeLists_txt
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -271,7 +271,7 @@ else()
+@@ -272,7 +272,7 @@ else()
if ( UNIX )
include(CheckSymbolExists)
blob - be01fd6c393eb8966d784b53469e75e6ae95ed2c
file + /dev/null
--- games/gzdoom/patches/patch-src_CMakeLists_txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/CMakeLists.txt
src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
-@@ -356,7 +360,7 @@ CHECK_CXX_SOURCE_COMPILES("thread_local int i; int mai
- HAVE_THREAD_LOCAL)
-
- if( NOT HAVE_THREAD_LOCAL )
-- message( SEND_ERROR "C++ compiler doesn't support thread_local storage
duration specifier" )
-+ message( STATUS "C++ compiler doesn't support thread_local storage
duration specifier" )
- endif()
-
- # Check for functions that may or may not exist.
blob - /dev/null
file + games/gzdoom/patches/patch-src_common_scripting_vm_vmframe_cpp
--- /dev/null
+++ games/gzdoom/patches/patch-src_common_scripting_vm_vmframe_cpp
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/common/scripting/vm/vmframe.cpp
+--- src/common/scripting/vm/vmframe.cpp.orig
src/common/scripting/vm/vmframe.cpp
+@@ -45,7 +45,7 @@
+ #include "version.h"
+
+ #ifdef HAVE_VM_JIT
+-#ifdef __DragonFly__
++#ifdef __DragonFly__ || __OpenBSD__
+ CUSTOM_CVAR(Bool, vm_jit, false, CVAR_NOINITCALL)
+ #else
+ CUSTOM_CVAR(Bool, vm_jit, true, CVAR_NOINITCALL)
[maintainer update] audio/zmusic-1.1.9
Hi,
While looking gzdoom update I noticed the zmusic has newer tags present
in github which are not noticeable from quickly looking the frontpage.
In any case, here is an new version of zmusic. Tested with latest gzdoom
version (diff incoming)
Timo
diff 3c1d0e6f7c1a7453566310164ea13533318a7bd7 /usr/ports
blob - db317c2d27167511fa56b587ad759e3eb3b9d5b1
file + audio/zmusic/Makefile
--- audio/zmusic/Makefile
+++ audio/zmusic/Makefile
@@ -4,10 +4,10 @@ PKGNAME = ${DISTNAME:L}
GH_ACCOUNT = coelckers
GH_PROJECT = ZMusic
-GH_TAGNAME = 1.1.3
+GH_TAGNAME = 1.1.9
-SHARED_LIBS += zmusic 0.0 # 1.1.0
-SHARED_LIBS += zmusiclite 0.0 # 1.1.0
+SHARED_LIBS += zmusic 1.0 # 1.1.0
+SHARED_LIBS += zmusiclite 1.0 # 1.1.0
CATEGORIES = audio
@@ -27,7 +27,8 @@ MODULES = devel/cmake
CONFIGURE_ARGS += -DDYN_FLUIDSYNTH=NO \
-DDYN_MPG123=NO \
- -DDYN_SNDFILE=NO
+ -DDYN_SNDFILE=NO \
+ -DCMAKE_INSTALL_PREFIX=${LOCALBASE}
LIB_DEPENDS = audio/fluidsynth \
audio/libsndfile \
blob - 4f72be286757241168b97cc58e528149c06cd556
file + audio/zmusic/distinfo
--- audio/zmusic/distinfo
+++ audio/zmusic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ZMusic-1.1.3.tar.gz) = X0MrAi4CMXXq53AWJfeSh+n/6ImkRBeWgTgQJrT7k78=
-SIZE (ZMusic-1.1.3.tar.gz) = 1532044
+SHA256 (ZMusic-1.1.9.tar.gz) = S/OZFwKLvi84J0i0QAocuuuJdRV/5ATP9TQRKX1qxow=
+SIZE (ZMusic-1.1.9.tar.gz) = 1813045
blob - 5ac39b04967e4054ad491d31e94d7a8e78b3966b
file + /dev/null
--- audio/zmusic/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: CMakeLists.txt
CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -137,7 +137,7 @@ else()
-
- if ( UNIX )
- include(CheckSymbolExists)
-- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
-+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h"
HAVE_FTS )
- if ( NOT HAVE_FTS )
- include ( FindPkgConfig )
- pkg_check_modules( MUSL_FTS musl-fts )
blob - b71903312300ab52a99923652c0191a5bc9d6af0
file + audio/zmusic/pkg/PLIST
--- audio/zmusic/pkg/PLIST
+++ audio/zmusic/pkg/PLIST
@@ -1,3 +1,10 @@
include/zmusic.h
+lib/cmake/ZMusic/
+lib/cmake/ZMusic/ZMusicConfig.cmake
+lib/cmake/ZMusic/ZMusicConfigVersion.cmake
+lib/cmake/ZMusic/ZMusicFullTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/ZMusic/ZMusicFullTargets.cmake
+lib/cmake/ZMusic/ZMusicLiteTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/ZMusic/ZMusicLiteTargets.cmake
@lib lib/libzmusic.so.${LIBzmusic_VERSION}
@lib lib/libzmusiclite.so.${LIBzmusiclite_VERSION}
[maintainer update] multimedia/yle-dl-20220704
Hi,
Here's small update for yle-dl to bring it to latest release.
Slightly tested that downloading works with yle.
Timo
diff 3c1d0e6f7c1a7453566310164ea13533318a7bd7 /usr/ports
blob - 4784cd34c78bb9a80e86dccbb01d1b057c40eb35
file + multimedia/yle-dl/Makefile
--- multimedia/yle-dl/Makefile
+++ multimedia/yle-dl/Makefile
@@ -1,8 +1,7 @@
GH_ACCOUNT = aajanki
GH_PROJECT = yle-dl
-GH_TAGNAME = 20210808
+GH_TAGNAME = 20220704
MODPY_EGG_VERSION =${GH_TAGNAME}
-REVISION = 0
COMMENT = download videos from YLE Areena
blob - f6a1de21176aa982d87befc5af91b88b41bb5026
file + multimedia/yle-dl/distinfo
--- multimedia/yle-dl/distinfo
+++ multimedia/yle-dl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yle-dl-20210808.tar.gz) = iAnPitg+16xSyHPXRmz0L3vKYGlvHD5g6QM1PDgRQlk=
-SIZE (yle-dl-20210808.tar.gz) = 66360
+SHA256 (yle-dl-20220704.tar.gz) = XpJm1IDVcYHDIPMOBOw3m6jZje2+aln2JCEFLLdSwjM=
+SIZE (yle-dl-20220704.tar.gz) = 69784
blob - 6a29a3bc6e73324804a6991fdf8b7ddbae87fa49
file + multimedia/yle-dl/pkg/PLIST
--- multimedia/yle-dl/pkg/PLIST
+++ multimedia/yle-dl/pkg/PLIST
@@ -8,17 +8,19 @@ lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODP
lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/yledl/
lib/python${MODPY_VERSION}/site-packages/yledl/__init__.py
+lib/python${MODPY_VERSION}/site-packages/yledl/__main__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}backends.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}downloader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}exitcodes.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}extractors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}ffprobe.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}geolocation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}io.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}jsonhelpers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}kaltura.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}localization.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}streamfilters.${MODPY_PYC_MAGIC_TAG}pyc
@@ -32,13 +34,13 @@ lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY
lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}yledl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/backends.py
lib/python${MODPY_VERSION}/site-packages/yledl/downloader.py
+lib/python${MODPY_VERSION}/site-packages/yledl/errors.py
lib/python${MODPY_VERSION}/site-packages/yledl/exitcodes.py
lib/python${MODPY_VERSION}/site-packages/yledl/extractors.py
lib/python${MODPY_VERSION}/site-packages/yledl/ffprobe.py
lib/python${MODPY_VERSION}/site-packages/yledl/geolocation.py
lib/python${MODPY_VERSION}/site-packages/yledl/http.py
lib/python${MODPY_VERSION}/site-packages/yledl/io.py
-lib/python${MODPY_VERSION}/site-packages/yledl/jsonhelpers.py
lib/python${MODPY_VERSION}/site-packages/yledl/kaltura.py
lib/python${MODPY_VERSION}/site-packages/yledl/localization.py
lib/python${MODPY_VERSION}/site-packages/yledl/streamfilters.py
Re: [maintainer update] ecl-21.2.1
Omar Polo [2022-01-21, 23:51 +0100]:
> Timo Myyrä writes:
>
>> Timo Myyrä [2021-12-21, 13:08 +0200]:
>>
>> ping ping...
>>
>>> Ping
>>>
>>> On Sat, Dec 11, 2021, at 18:34, Timo Myyrä wrote:
>>>> Hi,
>>>>
>>>> Here's an bump to bring ecl to latest version.
>>>> Lightly tested on amd64.
>>>>
>>>> Timo
>>>>
>>>> [...]
>
> Hello,
>
> I finally found some time to test the diff! :)
>
> The port builds fine, the diff looks good, the majority of the test are
> also passing (18013 pass and 84 fail, the failings seems to be mostly
> from math stuff.)
>
> There's only one issue I can see and even if it's not introduced by the
> diff I think we should fix it: the symlink /usr/loclal/lib/libecl.so ->
> libecl.so.0.8 should be removed.
>
> The situation with the dependencies is:
>
> - math/maxima: builds and the majority of the tests are passing, but I
>don't use the software so I can't really comment
> - math/wxMaxima: marked as broken, so doesn't count
> - net/clic: I don't know if I'm doing something wrong but it's failing
>at runtime:
>
> % clic
> ;;; Loading #P"/usr/local/lib/ecl/asdf.fas"
> clic:/usr/local/lib/libecl.so.8.0: /usr/local/lib/libecl.so.7.0 : WARNING:
> symbol(cl_symbols) size mismatch, relink your program
>
> Condition of type: SEGMENTATION-VIOLATION
> Detected access to an invalid or protected memory address.
> Available restarts:
>
> 1. (CONTINUE) Ignore signal
>
> Top level in: #.
>>
>
> which I don't understand, as I've rebuilt the package *after* installing
> the ecl update which bumps the library.
>
> - sysutils/reed-alert: I don't use it and it doesn't have tests
>
> I'll look more deeply into this two issues (the symlink and net/clic) in
> a couple of days, I just wanted to let you know I'm interested in seeing
> ecl updated and that the email wasn't lost :)
Here is updated diff which removes the symlink. Note that with this we
need to patch the ecl source as it checks library directory based on the
libecl.so location. Added simple patch to fix it by skipping the symlink
check.
timo
diff 94718e017cf91b90185b8b806a67911b82f46d66 /usr/ports
blob - 49c2de291af99891af2eab90692315ae9b00654f
file + lang/ecl/Makefile
--- lang/ecl/Makefile
+++ lang/ecl/Makefile
@@ -3,9 +3,9 @@
COMMENT = embeddable common-lisp
CATEGORIES = lang
-V =20.4.24
+V =21.2.1
DISTNAME = ecl-$V
-SHARED_LIBS += ecl 7.0
+SHARED_LIBS += ecl 8.0
HOMEPAGE = https://common-lisp.net/project/ecl/
MAINTAINER = Timo Myyra
@@ -46,9 +46,7 @@ LIB_DEPENDS +=devel/gmp \
devel/libffi
TEST_DEPENDS = ${BASE_PKGPATH}
+TEST_ENV = "ECL=${WRKDIST}/build/bin/ecl" \
+ "TEST_IMAGE=${WRKDIST}/build/bin/ecl"
-# XXX: Workaround for missing Copyright file
-post-configure:
- @cp ${WRKSRC}/{LICENSE,Copyright}
-
.include
blob - 5c3377469374e1eefeb7900f2d30b5660b4c9528
file + lang/ecl/distinfo
--- lang/ecl/distinfo
+++ lang/ecl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc=
-SIZE (ecl-20.4.24.tgz) = 7815444
+SHA256 (ecl-21.2.1.tgz) = sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA=
+SIZE (ecl-21.2.1.tgz) = 7875088
blob - b44246b9b8d755df5784e6b4dd04570657feb031
file + lang/ecl/patches/patch-src_Makefile_in
--- lang/ecl/patches/patch-src_Makefile_in
+++ lang/ecl/patches/patch-src_Makefile_in
@@ -2,11 +2,9 @@ $OpenBSD: patch-src_Makefile_in,v 1.7 2020/08/24 21:38
Index: src/Makefile.in
--- src/Makefile.in.orig
+++ src/Makefile.in
-@@ -212,30 +212,15 @@ install:
- for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \
+@@ -213,29 +213,13 @@ install:
$(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \
done
-+ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir)
$(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir)
- for i in build-stamp help.doc TAGS ; do \
-$(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \
@@ -26,8 +24,8 @@ Index: src/Makefile.in
- $(LN_S) @SONAME3@ @SONAME1@ && \
- $(LN_S) @SONAME3@ @SONAME@ ) \
- fi
++ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir)
+ ${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES)
-+ cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so
$(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir)
$(INSTALL_PROGRAM) $(ECL_MIN) $(DESTDIR)$(ecldir)
for i in `cat modules`; do \
blob - 510d663817b8a3936ee24c14411001f61c030bbf
file + /dev/null
--- lang/ecl/patches/patch-src_c_package_d
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_c_package_d,v 1.1 2020/08/24 21:38:06 gkoehler Exp $
-
-Wor
Re: [maintainer update] ecl-21.2.1
Timo Myyrä [2021-12-21, 13:08 +0200]:
ping ping...
> Ping
>
> On Sat, Dec 11, 2021, at 18:34, Timo Myyrä wrote:
>> Hi,
>>
>> Here's an bump to bring ecl to latest version.
>> Lightly tested on amd64.
>>
>> Timo
>>
>> diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports
>> blob - 49c2de291af99891af2eab90692315ae9b00654f
>> file + lang/ecl/Makefile
>> --- lang/ecl/Makefile
>> +++ lang/ecl/Makefile
>> @@ -3,9 +3,9 @@
>> COMMENT = embeddable common-lisp
>> CATEGORIES =lang
>>
>> -V = 20.4.24
>> +V = 21.2.1
>> DISTNAME = ecl-$V
>> -SHARED_LIBS += ecl 7.0
>> +SHARED_LIBS += ecl 8.0
>>
>> HOMEPAGE = https://common-lisp.net/project/ecl/
>> MAINTAINER =Timo Myyra
>> @@ -46,9 +46,7 @@ LIB_DEPENDS += devel/gmp \
>> devel/libffi
>>
>> TEST_DEPENDS = ${BASE_PKGPATH}
>> +TEST_ENV = "ECL=${WRKDIST}/build/bin/ecl" \
>> +"TEST_IMAGE=${WRKDIST}/build/bin/ecl"
>>
>> -# XXX: Workaround for missing Copyright file
>> -post-configure:
>> -@cp ${WRKSRC}/{LICENSE,Copyright}
>> -
>> .include
>> blob - 5c3377469374e1eefeb7900f2d30b5660b4c9528
>> file + lang/ecl/distinfo
>> --- lang/ecl/distinfo
>> +++ lang/ecl/distinfo
>> @@ -1,2 +1,2 @@
>> -SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc=
>> -SIZE (ecl-20.4.24.tgz) = 7815444
>> +SHA256 (ecl-21.2.1.tgz) = sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA=
>> +SIZE (ecl-21.2.1.tgz) = 7875088
>> blob - b44246b9b8d755df5784e6b4dd04570657feb031
>> file + lang/ecl/patches/patch-src_Makefile_in
>> --- lang/ecl/patches/patch-src_Makefile_in
>> +++ lang/ecl/patches/patch-src_Makefile_in
>> @@ -6,7 +6,6 @@ Index: src/Makefile.in
>> for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \
>>$(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \
>> done
>> -+ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir)
>> $(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir)
>> - for i in build-stamp help.doc TAGS ; do \
>> - $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \
>> @@ -26,6 +25,7 @@ Index: src/Makefile.in
>> - $(LN_S) @SONAME3@ @SONAME1@ && \
>> - $(LN_S) @SONAME3@ @SONAME@ ) \
>> - fi
>> ++ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir)
>> + ${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES)
>> + cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so
>> $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir)
>> blob - 510d663817b8a3936ee24c14411001f61c030bbf
>> file + /dev/null
>> --- lang/ecl/patches/patch-src_c_package_d
>> +++ /dev/null
>> @@ -1,26 +0,0 @@
>> -$OpenBSD: patch-src_c_package_d,v 1.1 2020/08/24 21:38:06 gkoehler Exp $
>> -
>> -Work around a SIGSEGV on 64-bit big-endian platforms
>> -(mips64, powerpc64, sparc64), from Daniel Kochmaski,
>> -https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381
>> -
>> -Index: src/c/package.d
>> src/c/package.d.orig
>> -+++ src/c/package.d
>> -@@ -327,10 +327,12 @@ ecl_find_package_nolock(cl_object name)
>> - return name;
>> - name = cl_string(name);
>> -
>> -- p = ecl_symbol_value(@'*package*');
>> -- if (ECL_PACKAGEP(p)) {
>> --p = ecl_assoc(name, p->pack.local_nicknames);
>> --if (!Null(p)) return ECL_CONS_CDR(p);
>> -+ if (ecl_option_values[ECL_OPT_BOOTED]) {
>> -+p = ecl_symbol_value(@'*package*');
>> -+if (ECL_PACKAGEP(p)) {
>> -+ p = ecl_assoc(name, p->pack.local_nicknames);
>> -+ if (!Null(p)) return ECL_CONS_CDR(p);
>> -+}
>> - }
>> -
>> - l = cl_core.packages;
>> blob - 1f720b8258ab12e59b9c01b247cf29641de99555
>> file + lang/ecl/patches/patch-src_configure
>> --- lang/ecl/patches/patch-src_configure
>> +++ lang/ecl/patches/patch-src_configure
>> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_configure,v 1.9 2020/08/24 21:38:0
>> Index: src/configure
>> --- src/configure.orig
>> +++ src/configure
>> -@@ -5050,7 +5050,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
>> +@@ -5240,7 +5240,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
>> BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
>> ECL_LDRPATH="-Wl,--rpath,~A"
>> clibs="-lpthread ${clibs}"
>> @@ -11,7 +11,7 @@ Index: src/configure
>> SONAME_LDFLAGS="-Wl,-soname,SONAME"
>> ;;
>> solaris*)
>> -@@ -9682,7 +9682,7 @@ if test ${enable_shared} = "yes"; then
>> +@@ -9910,7 +9910,7 @@ if test ${enable_shared} = "yes"; then
>>
>> $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h
>>
>> blob - aaa872a968b99a07f318f3b31e3a8bf0ebbfea40
>> file + lang/ecl/pkg/PLIST
>> --- lang/ecl/pkg/PLIST
>> +++ lang/ecl/pkg/PLIST
>> @@ -29,7 +29,6 @@ include/ecl/object.h
>> include/ecl/page.h
>> include/ecl/stack-resize.h
>> include/ecl/stacks.h
>> -info/ecl.info.gz
>> lib/ecl/
>> lib/ecl/COPYING
>> lib/ecl/LICENSE
(update) icewm-2.9.3
Hi,
Here's an little bump for icewm, works fine here on amd64.
timo
diff 662d3c88e627c51affd7cc20a8a157055592792b /usr/ports
blob - 6e7a702e37a8d0fccb933cde45689e72d847e279
file + x11/icewm/Makefile
--- x11/icewm/Makefile
+++ x11/icewm/Makefile
@@ -3,7 +3,7 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS=${APM_ARCHS}
-V= 2.8.0
+V= 2.9.3
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
blob - f7d25af8f69ad0be4ca5407b4a99b7c4dbc593d0
file + x11/icewm/distinfo
--- x11/icewm/distinfo
+++ x11/icewm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-2.8.0.tar.lz) = ErfM5nuVsJ80hz9GlI5/HO+e3YhoITngVLeboWXFPkk=
-SIZE (icewm-2.8.0.tar.lz) = 1745937
+SHA256 (icewm-2.9.3.tar.lz) = DA26xolQYLsHlJH9e6z+tVyJlvRccu4qCvqPjGrCx6g=
+SIZE (icewm-2.9.3.tar.lz) = 1760889
blob - f65368be2fd27864867da150e47eabdf7235f234
file + x11/icewm/pkg/PLIST
--- x11/icewm/pkg/PLIST
+++ x11/icewm/pkg/PLIST
@@ -66,6 +66,7 @@ share/icewm/icons/app_16x16.xpm
share/icewm/icons/app_32x32.xpm
share/icewm/icons/bomb_16x16.xpm
share/icewm/icons/bomb_32x32.xpm
+share/icewm/icons/cancel-logout_16x16.xpm
share/icewm/icons/communicator-abook_16x16.xpm
share/icewm/icons/communicator-abook_32x32.xpm
share/icewm/icons/communicator-browser_16x16.xpm
@@ -139,6 +140,15 @@ share/icewm/icons/suspend_16x16.xpm
share/icewm/icons/suspend_32x32.xpm
share/icewm/icons/themes_16x16.xpm
share/icewm/icons/themes_32x32.xpm
+share/icewm/icons/tilebottom_48x48.png
+share/icewm/icons/tilebottomleft_48x48.png
+share/icewm/icons/tilebottomright_48x48.png
+share/icewm/icons/tilecenter_48x48.png
+share/icewm/icons/tileleft_48x48.png
+share/icewm/icons/tileright_48x48.png
+share/icewm/icons/tiletop_48x48.png
+share/icewm/icons/tiletopleft_48x48.png
+share/icewm/icons/tiletopright_48x48.png
share/icewm/icons/vim_16x16.xpm
share/icewm/icons/vim_32x32.xpm
share/icewm/icons/vim_48x48.xpm
Re: [maintainer update] gzdoom-4.7.1
Timo Myyrä [2021-12-19, 10:58 +0200]:
> Omar Polo [2021-12-15, 20:44 +0100]:
>
>> Timo Myyrä writes:
>>
>>> Hi,
>>>
>>> A bit delayed update to gzdoom. The upstream have made chopped the music
>>> part as standalone library which I sent to ports@ earlier (audio/zmusic)
>>> which is needed by this update.
>>>
>>> Quickly tested on doom1 which appeared to be working.
>>>
>>>[...]
>>>
>>> CONFIGURE_ARGS += -DNO_GTK=ON
>>> -CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
>>> -CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so"
>>> +CONFIGURE_ARGS += -DDYN_OPENAL=NO
>>> +# Sync with audio/fluidsynth
>>> +CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so.2.0"
>>
>> this bit (and the relative patch to the CMakeList.txt) is no more needed
>> since the audio is moved to zmusic, and I can't find other instances of
>> FLUIDSYNTHLIB1, so they can be dropped
>>
>
> ah, good point. A grepped the sources but did not notice the
> FLUIDSYNTHLIB1 was added by local patch so I kept that.
>
>>> [...]
>>> - if ( UNIX )
>>> - include(CheckSymbolExists)
>>> -- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
>>> -+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h"
>>> HAVE_FTS )
>>
>> this is still needed otherwise it doesn't find fts_set (there's
>> virtually the same patch on zmusic too)
>>
>
> Good catch.
>
>>> [...]
>>
>> It breaks the build if graphics/glslang is installed. gzdoom uses its
>> own bundled version of the vulkan sdk but the compiler ends up including
>> the system header instead of the bundled one. There are different
>> solution for this:
>>
>> 1. cherry-pick this diff
>>
>> https://github.com/alexey-lysiuk/gzdoom/commit/5c9fb205d9231abbd8a3bf744850db02c0754057
>>
>> (see https://github.com/coelckers/gzdoom/issues/1382)
>>
>> 2. add `CONFIGURE_ARGS += -DHAVE_VULKAN=OFF' to completely disable
>>vulkan, or
>>
>> 3. use the same trick sdk@ used for net/tdlib-purple:
>>
>> CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I. -I${LOCALBASE}/include"
>>
>>
>
> Yeah, I think we can go with the third option.
>
>> 1) is probably overkill for us, 2) is what I initially did but 3) is
>> probably the more pragmatic solution. I went with the third option in
>> the diff below, but either is fine I guess.
>>
>> I'm also re-attaching the tweaked audio/zmusic tarball for convenience
>> (which is ok op@ to import if someone wants to). see
>> https://marc.info/?l=openbsd-ports=163916682506561=2
>>
>> Tested on amdgpu with the shareware IWAD file mentioned in README and
>> works fine!
>>
>> Thanks,
>>
>> Omar Polo
>
> Ok from me for these fixes.
>
> Timo
>
>>
>> Index: Makefile
>> ===
>> RCS file: /home/cvs/ports/games/gzdoom/Makefile,v
>> retrieving revision 1.13
>> diff -u -p -r1.13 Makefile
>> --- Makefile 25 Oct 2021 07:19:59 - 1.13
>> +++ Makefile 15 Dec 2021 19:59:09 -
>> @@ -8,12 +8,11 @@ ONLY_FOR_ARCHS = i386 amd64
>>
>> COMMENT = OpenGL engine for idTech 1 games like
>> doom,hexen,heretic...
>>
>> -V = 4.3.3
>> +V = 4.7.1
>> GH_ACCOUNT =coelckers
>> GH_PROJECT =gzdoom
>> GH_TAGNAME =g${V}
>> DISTNAME = gzdoom-${V}
>> -REVISION = 1
>>
>> CATEGORIES= games
>>
>> @@ -24,21 +23,21 @@ MAINTAINER = Timo Myyra > # GPLv3
>> PERMIT_PACKAGE =Yes
>>
>> -WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m mpg123
>> -WANTLIB += openal sndfile z
>> +WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
>> +WANTLIB += openal z zmusic
>>
>> +# C++17
>> COMPILER = base-clang ports-gcc
>>
>> MODULES = devel/cmake
>>
>> CONFIGURE_ARGS += -DNO_GTK=ON
>> -CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
>> -CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so"
>> +CONFIGURE_ARGS += -DDYN_OPENAL=NO
>> CONFIGURE_ARGS += -DHAVE_STDINT_H=1
>> +CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="$
Re: [maintainer update] ecl-21.2.1
Ping
On Sat, Dec 11, 2021, at 18:34, Timo Myyrä wrote:
> Hi,
>
> Here's an bump to bring ecl to latest version.
> Lightly tested on amd64.
>
> Timo
>
> diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports
> blob - 49c2de291af99891af2eab90692315ae9b00654f
> file + lang/ecl/Makefile
> --- lang/ecl/Makefile
> +++ lang/ecl/Makefile
> @@ -3,9 +3,9 @@
> COMMENT =embeddable common-lisp
> CATEGORIES = lang
>
> -V = 20.4.24
> +V = 21.2.1
> DISTNAME = ecl-$V
> -SHARED_LIBS += ecl 7.0
> +SHARED_LIBS += ecl 8.0
>
> HOMEPAGE = https://common-lisp.net/project/ecl/
> MAINTAINER = Timo Myyra
> @@ -46,9 +46,7 @@ LIB_DEPENDS += devel/gmp \
> devel/libffi
>
> TEST_DEPENDS = ${BASE_PKGPATH}
> +TEST_ENV = "ECL=${WRKDIST}/build/bin/ecl" \
> + "TEST_IMAGE=${WRKDIST}/build/bin/ecl"
>
> -# XXX: Workaround for missing Copyright file
> -post-configure:
> - @cp ${WRKSRC}/{LICENSE,Copyright}
> -
> .include
> blob - 5c3377469374e1eefeb7900f2d30b5660b4c9528
> file + lang/ecl/distinfo
> --- lang/ecl/distinfo
> +++ lang/ecl/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc=
> -SIZE (ecl-20.4.24.tgz) = 7815444
> +SHA256 (ecl-21.2.1.tgz) = sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA=
> +SIZE (ecl-21.2.1.tgz) = 7875088
> blob - b44246b9b8d755df5784e6b4dd04570657feb031
> file + lang/ecl/patches/patch-src_Makefile_in
> --- lang/ecl/patches/patch-src_Makefile_in
> +++ lang/ecl/patches/patch-src_Makefile_in
> @@ -6,7 +6,6 @@ Index: src/Makefile.in
> for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \
> $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \
> done
> -+$(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir)
> $(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir)
> -for i in build-stamp help.doc TAGS ; do \
> - $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \
> @@ -26,6 +25,7 @@ Index: src/Makefile.in
> -$(LN_S) @SONAME3@ @SONAME1@ && \
> -$(LN_S) @SONAME3@ @SONAME@ ) \
> -fi
> ++$(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir)
> +${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES)
> +cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so
> $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir)
> blob - 510d663817b8a3936ee24c14411001f61c030bbf
> file + /dev/null
> --- lang/ecl/patches/patch-src_c_package_d
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -$OpenBSD: patch-src_c_package_d,v 1.1 2020/08/24 21:38:06 gkoehler Exp $
> -
> -Work around a SIGSEGV on 64-bit big-endian platforms
> -(mips64, powerpc64, sparc64), from Daniel Kochmaski,
> -https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381
> -
> -Index: src/c/package.d
> src/c/package.d.orig
> -+++ src/c/package.d
> -@@ -327,10 +327,12 @@ ecl_find_package_nolock(cl_object name)
> - return name;
> - name = cl_string(name);
> -
> -- p = ecl_symbol_value(@'*package*');
> -- if (ECL_PACKAGEP(p)) {
> --p = ecl_assoc(name, p->pack.local_nicknames);
> --if (!Null(p)) return ECL_CONS_CDR(p);
> -+ if (ecl_option_values[ECL_OPT_BOOTED]) {
> -+p = ecl_symbol_value(@'*package*');
> -+if (ECL_PACKAGEP(p)) {
> -+ p = ecl_assoc(name, p->pack.local_nicknames);
> -+ if (!Null(p)) return ECL_CONS_CDR(p);
> -+}
> - }
> -
> - l = cl_core.packages;
> blob - 1f720b8258ab12e59b9c01b247cf29641de99555
> file + lang/ecl/patches/patch-src_configure
> --- lang/ecl/patches/patch-src_configure
> +++ lang/ecl/patches/patch-src_configure
> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_configure,v 1.9 2020/08/24 21:38:0
> Index: src/configure
> --- src/configure.orig
> +++ src/configure
> -@@ -5050,7 +5050,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
> +@@ -5240,7 +5240,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
> BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
> ECL_LDRPATH="-Wl,--rpath,~A"
> clibs="-lpthread ${clibs}"
> @@ -11,7 +11,7 @@ Index: src/configure
> SONAME_LDFLAGS="-Wl,-soname,SONAME"
> ;;
> solaris*)
> -@@ -9682,7 +9682,7 @@ if test ${enable_shared} = "yes"; then
> +@@ -9910,7 +9910,7 @@ if test ${enable_shared} = "yes"; then
>
> $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h
>
> blob - aaa872a968b99a07f318f3b31e3a8bf0ebbfea40
> file + lang/ecl/pkg/PLIST
> --- lang/ecl/pkg/PLIST
> +++ lang/ecl/pkg/PLIST
> @@ -29,7 +29,6 @@ include/ecl/object.h
> include/ecl/page.h
> include/ecl/stack-resize.h
> include/ecl/stacks.h
> -info/ecl.info.gz
> lib/ecl/
> lib/ecl/COPYING
> lib/ecl/LICENSE
Re: [maintainer update] gzdoom-4.7.1
Omar Polo [2021-12-15, 20:44 +0100]:
> Timo Myyrä writes:
>
>> Hi,
>>
>> A bit delayed update to gzdoom. The upstream have made chopped the music
>> part as standalone library which I sent to ports@ earlier (audio/zmusic)
>> which is needed by this update.
>>
>> Quickly tested on doom1 which appeared to be working.
>>
>>[...]
>>
>> CONFIGURE_ARGS += -DNO_GTK=ON
>> -CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
>> -CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so"
>> +CONFIGURE_ARGS += -DDYN_OPENAL=NO
>> +# Sync with audio/fluidsynth
>> +CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so.2.0"
>
> this bit (and the relative patch to the CMakeList.txt) is no more needed
> since the audio is moved to zmusic, and I can't find other instances of
> FLUIDSYNTHLIB1, so they can be dropped
>
ah, good point. A grepped the sources but did not notice the
FLUIDSYNTHLIB1 was added by local patch so I kept that.
>> [...]
>> -if ( UNIX )
>> -include(CheckSymbolExists)
>> -- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
>> -+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h"
>> HAVE_FTS )
>
> this is still needed otherwise it doesn't find fts_set (there's
> virtually the same patch on zmusic too)
>
Good catch.
>> [...]
>
> It breaks the build if graphics/glslang is installed. gzdoom uses its
> own bundled version of the vulkan sdk but the compiler ends up including
> the system header instead of the bundled one. There are different
> solution for this:
>
> 1. cherry-pick this diff
>
> https://github.com/alexey-lysiuk/gzdoom/commit/5c9fb205d9231abbd8a3bf744850db02c0754057
>
> (see https://github.com/coelckers/gzdoom/issues/1382)
>
> 2. add `CONFIGURE_ARGS += -DHAVE_VULKAN=OFF' to completely disable
>vulkan, or
>
> 3. use the same trick sdk@ used for net/tdlib-purple:
>
> CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I. -I${LOCALBASE}/include"
>
>
Yeah, I think we can go with the third option.
> 1) is probably overkill for us, 2) is what I initially did but 3) is
> probably the more pragmatic solution. I went with the third option in
> the diff below, but either is fine I guess.
>
> I'm also re-attaching the tweaked audio/zmusic tarball for convenience
> (which is ok op@ to import if someone wants to). see
> https://marc.info/?l=openbsd-ports=163916682506561=2
>
> Tested on amdgpu with the shareware IWAD file mentioned in README and
> works fine!
>
> Thanks,
>
> Omar Polo
Ok from me for these fixes.
Timo
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/games/gzdoom/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- Makefile 25 Oct 2021 07:19:59 - 1.13
> +++ Makefile 15 Dec 2021 19:59:09 -
> @@ -8,12 +8,11 @@ ONLY_FOR_ARCHS =i386 amd64
>
> COMMENT =OpenGL engine for idTech 1 games like
> doom,hexen,heretic...
>
> -V = 4.3.3
> +V = 4.7.1
> GH_ACCOUNT = coelckers
> GH_PROJECT = gzdoom
> GH_TAGNAME = g${V}
> DISTNAME = gzdoom-${V}
> -REVISION = 1
>
> CATEGORIES= games
>
> @@ -24,21 +23,21 @@ MAINTAINER = Timo Myyra # GPLv3
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m mpg123
> -WANTLIB += openal sndfile z
> +WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
> +WANTLIB += openal z zmusic
>
> +# C++17
> COMPILER = base-clang ports-gcc
>
> MODULES =devel/cmake
>
> CONFIGURE_ARGS +=-DNO_GTK=ON
> -CONFIGURE_ARGS +=-DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
> -CONFIGURE_ARGS +=-DFLUIDSYNTHLIB1="libfluidsynth.so"
> +CONFIGURE_ARGS +=-DDYN_OPENAL=NO
> CONFIGURE_ARGS +=-DHAVE_STDINT_H=1
> +CONFIGURE_ARGS +=-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I.
> -I${LOCALBASE}/include"
>
> -LIB_DEPENDS =audio/libsndfile \
> - audio/mpg123 \
> - audio/openal \
> +LIB_DEPENDS =audio/openal \
> + audio/zmusic \
> archivers/bzip2 \
> graphics/jpeg \
> devel/sdl2
> Index: distinfo
> ===
&g
Re: [maintainer update] dunst-1.7.2
Stefan Hagen [2021-12-12, 20:18 +0100]:
> Omar Polo wrote:
>
>> Omar Polo writes:
>>
>> > Omar Polo writes:
>> >
>> >> Omar Polo writes:
>> >>
>> >>> Timo Myyrä writes:
>> >>>
>> >>>> Hi,
>> >>>>
>> >>>> Dunst has had few releases since last update so bump it to latest.
>> >>>>
>> >>>> Timo
>> >>>
>> >>> Hello,
>> >>>
>> >>> diff looks fine, it builds and package fine. don't know if it was an
>> >>> issue with my previous configuration but now I can see the icons too!
>> >>>
>> >>> However, the configuration changed a bit since last update and so dunst
>> >>> refuse to start if one had a custom configuration. Settings like
>> >>> `geometry' are gone and the keybindings are completely removed in favour
>> >>> of dunstctl(1). Probably not important enough to warrant an entry on
>> >>> current.html but at least nice to notify ;)
>> >>>
>> >>> For the laziest out there `bind-key C-space "dunstctl close"` in .cwmrc
>> >>> restores the default control-space to close the topmost notification.
>> >>>
>> >>> Thanks!
>> >>>
>> >>> Omar Polo
>> >>
>> >> I was about to commit the diff, when I noticed that 1.7.3 is already
>> >> out: https://github.com/dunst-project/dunst/releases/tag/v1.7.3
>> >>
>> >> Attaching your patch with the version number bumped, new checksums and
>> >> reindented the continuation line in pre-configure. (make update-patches
>> >> changed an offsets in a diff I think)
>> >>
>> >> here it works just as fine, is it still ok for you?
>> >>
>> >> Thanks,
>> >>
>> >> Omar Polo
>> >
>> > Oops, it was mangled somehow. attaching the diff (for real) again
>>
>> ...and I forgot to cvs add the new patches before re-generating the
>> diff...
>>
>> thanks sdk@ for noticing :)
>
> This one works, thank you.
>
> TEST_DEPENDS= shells/bash should be added. I did not look around if this
> can be avoided. But "make test" errors out with:
> env: bash: No such file or directory
>
> with that, ok sdk@
>
>> Index: Makefile
>> ===
>> RCS file: /home/cvs/ports/x11/dunst/Makefile,v
>> retrieving revision 1.11
>> diff -u -p -r1.11 Makefile
>> --- Makefile 27 Sep 2020 18:37:40 - 1.11
>> +++ Makefile 12 Dec 2021 18:31:52 -
>> @@ -4,7 +4,7 @@ COMMENT =customizable and lightweight n
>>
>> GH_ACCOUNT =dunst-project
>> GH_PROJECT =dunst
>> -GH_TAGNAME =v1.5.0
>> +GH_TAGNAME =v1.7.3
>>
>> CATEGORIES =x11
>>
>> @@ -21,7 +21,8 @@ WANTLIB += pango-1.0 pangocairo-1.0 pthr
>>
>> USE_GMAKE = Yes
>>
>> -BUILD_DEPENDS = x11/dbus
>> +BUILD_DEPENDS = graphics/png \
>> +x11/dbus
>>
>> LIB_DEPENDS += devel/gettext,-runtime \
>> devel/glib2 \
>> @@ -32,11 +33,18 @@ LIB_DEPENDS += devel/gettext,-runtime \
>>
>> RUN_DEPENDS += x11/dbus
>>
>> +MAKE_FLAGS =WAYLAND=0
>> +
>> FAKE_FLAGS =PREFIX="${PREFIX}" \
>> MANPREFIX="${PREFIX}/man" \
>> -DATADIR="${PREFIX}/share/examples"
>> +DATADIR="${PREFIX}/share/examples" \
>> +SYSCONFDIR="/etc"
>>
>> pre-configure:
>> -${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
>> +${SUBST_CMD} ${WRKSRC}/docs/dunst.1.pod \
>> +${WRKSRC}/docs/dunst.5.pod ${WRKSRC}/dunstrc
>> +
>> +post-install:
>> +mv ${WRKINST}/${SYSCONFDIR}/dunst ${PREFIX}/share
>>
>> .include
>> Index: distinfo
>> ===
>> RCS file: /home/cvs/ports/x11/dunst/distinfo,v
>> retrieving revision 1.6
>> diff -u -p -r1.6 distinfo
>> --- distinfo 25 Sep 2020 13:53:53 - 1.6
>> +++ distinfo 12 Dec 2021 18:32:01 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (dunst-1.5.0.tar.gz) = LDkK3xRLX6D/AH6jYWyQ8btTffaoBCGWmT9VhdG8jJo=
>> -SIZE (dunst-1.5.0.tar.gz) = 169272
>> +SHA256 (dunst-1.7.3.tar.gz) = FQx4JpAobhY2Y7DrJgW
[maintainer update] dunst-1.7.2
Hi,
Dunst has had few releases since last update so bump it to latest.
Timo
diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports
blob - ae82b7b8711d1ac1a7ab6b9373246aeee4998970
file + x11/dunst/Makefile
--- x11/dunst/Makefile
+++ x11/dunst/Makefile
@@ -4,7 +4,7 @@ COMMENT = customizable and lightweight notification-da
GH_ACCOUNT = dunst-project
GH_PROJECT = dunst
-GH_TAGNAME = v1.5.0
+GH_TAGNAME = v1.7.2
CATEGORIES = x11
@@ -21,7 +21,8 @@ WANTLIB += pango-1.0 pangocairo-1.0 pthread
USE_GMAKE =Yes
-BUILD_DEPENDS =x11/dbus
+BUILD_DEPENDS =graphics/png \
+ x11/dbus
LIB_DEPENDS += devel/gettext,-runtime \
devel/glib2 \
@@ -32,11 +33,18 @@ LIB_DEPENDS += devel/gettext,-runtime \
RUN_DEPENDS += x11/dbus
+MAKE_FLAGS = WAYLAND=0
+
FAKE_FLAGS = PREFIX="${PREFIX}" \
MANPREFIX="${PREFIX}/man" \
- DATADIR="${PREFIX}/share/examples"
+ DATADIR="${PREFIX}/share/examples" \
+ SYSCONFDIR="/etc"
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
+ ${SUBST_CMD} ${WRKSRC}/docs/dunst.1.pod \
+ ${WRKSRC}/docs/dunst.5.pod ${WRKSRC}/dunstrc
+post-install:
+ mv ${WRKINST}/${SYSCONFDIR}/dunst ${PREFIX}/share
+
.include
blob - 9db4c3129a491cc257474d7627d25426e7527c8b
file + x11/dunst/distinfo
--- x11/dunst/distinfo
+++ x11/dunst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.5.0.tar.gz) = LDkK3xRLX6D/AH6jYWyQ8btTffaoBCGWmT9VhdG8jJo=
-SIZE (dunst-1.5.0.tar.gz) = 169272
+SHA256 (dunst-1.7.2.tar.gz) = 5Po3bTJ+ikzTddANTDGMk8wJaNTxhKtA2pTKazBHcYE=
+SIZE (dunst-1.7.2.tar.gz) = 4595479
blob - 3799afc73b4cd2c5eded360894771790b0be9812
file + x11/dunst/patches/patch-config_mk
--- x11/dunst/patches/patch-config_mk
+++ x11/dunst/patches/patch-config_mk
@@ -1,14 +1,16 @@
-$OpenBSD: patch-config_mk,v 1.4 2019/08/02 13:49:29 sthen Exp $
+$OpenBSD$
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -26,7 +26,7 @@ VALGRIND ?= valgrind
+@@ -36,8 +36,8 @@ endif
# flags
- DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
--DEFAULT_CFLAGS = -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os
${STATIC}
-+DEFAULT_CFLAGS = -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings
${STATIC}
- DEFAULT_LDFLAGS = -lm
+ DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
-DSYSCONFDIR=\"${SYSCONFDIR}\"
+-DEFAULT_CFLAGS = -g -std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os
${ENABLE_WAYLAND} ${EXTRA_CFLAGS}
+-DEFAULT_LDFLAGS = -lm -lrt
++DEFAULT_CFLAGS = -g -std=gnu99 -pedantic -Wall -Wno-overlength-strings
${ENABLE_WAYLAND} ${EXTRA_CFLAGS}
++DEFAULT_LDFLAGS = -lm
CPPFLAGS_DEBUG := -DDEBUG_BUILD
+ CFLAGS_DEBUG := -O0
blob - /dev/null
file + x11/dunst/patches/patch-docs_dunst_1_pod
--- /dev/null
+++ x11/dunst/patches/patch-docs_dunst_1_pod
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: docs/dunst.1.pod
+--- docs/dunst.1.pod.orig
docs/dunst.1.pod
+@@ -61,7 +61,7 @@ Display a notification on startup.
+
+ A default configuration file is included (usually
##SYSCONFDIR##/dunst/dunstrc)
+ and serves as the least important configuration file. Note: this was
previously
+-/usr/share/dunst/dunstrc. You can edit this file to change the system-wide
++${PREFIX}/share/dunst/dunstrc. You can edit this file to change the
system-wide
+ defaults or copy it to a more important location to override its settings. See
+ the FILES section for more details on where dunst searches for its
+ configuration files and how settings get applied.
blob - /dev/null
file + x11/dunst/patches/patch-docs_dunst_5_pod
--- /dev/null
+++ x11/dunst/patches/patch-docs_dunst_5_pod
@@ -0,0 +1,38 @@
+$OpenBSD$
+
+Index: docs/dunst.5.pod
+--- docs/dunst.5.pod.orig
docs/dunst.5.pod
+@@ -384,7 +384,7 @@ gets the last say.
+
+ If B is set to off, this setting is ignored.
+
+-=item B (default:
"/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/")
++=item B (default:
"${PREFIX}/share/icons/gnome/16x16/status/:${PREFIX}/share/icons/gnome/16x16/devices/")
+
+ Can be set to a colon-separated list of paths to search for icons to use with
+ notifications.
+@@ -398,7 +398,7 @@ replace this and will need new settings.
+ Comma-separated of names of the the themes to use for looking up icons. This
has
+ to be the name of the directory in which the theme is located, not the
+ human-friendly name of the theme. So for example, the theme B is
+-located in F. In this case you have to set the
++located in F<${PREFIX}/share/icons/breeze-dark>. In this case you have to set
the
+ theme to B.
+
+ The first theme in the list is the most important. Only if the icon cannot be
+@@ -438,12 +438,12 @@ Maximum number of notifications that will be kept in h
+ is reached, older notifications will be deleted once a new one arrives. See
+ HISTORY.
+
+-=item B (default: "/usr/bin/dmenu")
++=item B (default: "${LOCALBASE}/bin/dmenu")
+
[maintainer update] ecl-21.2.1
Hi,
Here's an bump to bring ecl to latest version.
Lightly tested on amd64.
Timo
diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports
blob - 49c2de291af99891af2eab90692315ae9b00654f
file + lang/ecl/Makefile
--- lang/ecl/Makefile
+++ lang/ecl/Makefile
@@ -3,9 +3,9 @@
COMMENT = embeddable common-lisp
CATEGORIES = lang
-V =20.4.24
+V =21.2.1
DISTNAME = ecl-$V
-SHARED_LIBS += ecl 7.0
+SHARED_LIBS += ecl 8.0
HOMEPAGE = https://common-lisp.net/project/ecl/
MAINTAINER = Timo Myyra
@@ -46,9 +46,7 @@ LIB_DEPENDS +=devel/gmp \
devel/libffi
TEST_DEPENDS = ${BASE_PKGPATH}
+TEST_ENV = "ECL=${WRKDIST}/build/bin/ecl" \
+ "TEST_IMAGE=${WRKDIST}/build/bin/ecl"
-# XXX: Workaround for missing Copyright file
-post-configure:
- @cp ${WRKSRC}/{LICENSE,Copyright}
-
.include
blob - 5c3377469374e1eefeb7900f2d30b5660b4c9528
file + lang/ecl/distinfo
--- lang/ecl/distinfo
+++ lang/ecl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc=
-SIZE (ecl-20.4.24.tgz) = 7815444
+SHA256 (ecl-21.2.1.tgz) = sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA=
+SIZE (ecl-21.2.1.tgz) = 7875088
blob - b44246b9b8d755df5784e6b4dd04570657feb031
file + lang/ecl/patches/patch-src_Makefile_in
--- lang/ecl/patches/patch-src_Makefile_in
+++ lang/ecl/patches/patch-src_Makefile_in
@@ -6,7 +6,6 @@ Index: src/Makefile.in
for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \
$(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \
done
-+ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir)
$(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir)
- for i in build-stamp help.doc TAGS ; do \
-$(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \
@@ -26,6 +25,7 @@ Index: src/Makefile.in
- $(LN_S) @SONAME3@ @SONAME1@ && \
- $(LN_S) @SONAME3@ @SONAME@ ) \
- fi
++ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir)
+ ${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES)
+ cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so
$(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir)
blob - 510d663817b8a3936ee24c14411001f61c030bbf
file + /dev/null
--- lang/ecl/patches/patch-src_c_package_d
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_c_package_d,v 1.1 2020/08/24 21:38:06 gkoehler Exp $
-
-Work around a SIGSEGV on 64-bit big-endian platforms
-(mips64, powerpc64, sparc64), from Daniel Kochmaski,
-https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381
-
-Index: src/c/package.d
src/c/package.d.orig
-+++ src/c/package.d
-@@ -327,10 +327,12 @@ ecl_find_package_nolock(cl_object name)
- return name;
- name = cl_string(name);
-
-- p = ecl_symbol_value(@'*package*');
-- if (ECL_PACKAGEP(p)) {
--p = ecl_assoc(name, p->pack.local_nicknames);
--if (!Null(p)) return ECL_CONS_CDR(p);
-+ if (ecl_option_values[ECL_OPT_BOOTED]) {
-+p = ecl_symbol_value(@'*package*');
-+if (ECL_PACKAGEP(p)) {
-+ p = ecl_assoc(name, p->pack.local_nicknames);
-+ if (!Null(p)) return ECL_CONS_CDR(p);
-+}
- }
-
- l = cl_core.packages;
blob - 1f720b8258ab12e59b9c01b247cf29641de99555
file + lang/ecl/patches/patch-src_configure
--- lang/ecl/patches/patch-src_configure
+++ lang/ecl/patches/patch-src_configure
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_configure,v 1.9 2020/08/24 21:38:0
Index: src/configure
--- src/configure.orig
+++ src/configure
-@@ -5050,7 +5050,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
+@@ -5240,7 +5240,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
ECL_LDRPATH="-Wl,--rpath,~A"
clibs="-lpthread ${clibs}"
@@ -11,7 +11,7 @@ Index: src/configure
SONAME_LDFLAGS="-Wl,-soname,SONAME"
;;
solaris*)
-@@ -9682,7 +9682,7 @@ if test ${enable_shared} = "yes"; then
+@@ -9910,7 +9910,7 @@ if test ${enable_shared} = "yes"; then
$as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h
blob - aaa872a968b99a07f318f3b31e3a8bf0ebbfea40
file + lang/ecl/pkg/PLIST
--- lang/ecl/pkg/PLIST
+++ lang/ecl/pkg/PLIST
@@ -29,7 +29,6 @@ include/ecl/object.h
include/ecl/page.h
include/ecl/stack-resize.h
include/ecl/stacks.h
-info/ecl.info.gz
lib/ecl/
lib/ecl/COPYING
lib/ecl/LICENSE
Re: [new] audio/zmusic-1.1.3
Omar Polo [2021-12-11, 12:56 +0100]:
> Timo Myyrä writes:
>
>> Hi,
>>
>> Here's an new port audio/zmusic. It is the music library which got
>> extracted from the gzdoom as standalone part. This is dependency for
>> upcoming games/gzdoom update.
>>
>> Timo
>
> Hello,
>
> the port looks fine, just some comments. -DZMUSIC_VERSION is not
> needed, modcmake takes care by itself of the library name once you have
> SHARED_LIBS defined. (usually one does a first build then sets
> SHARED_LIBS and re-build again so the plist is correct)
>
> source/CMakeLists.txt unconditionally checks for FluidSynth too, so we
> need to either patch that out or add a LDEP, I went with the latter.
>
> I'd also add a comment about the C++ version (C++11 in this case) before
> the COMPILER line.
>
> Regarding the licensing, the only instance of 'Free Software Foundation'
> in sources/ is a GPLv2+ header, while various stuff in thirdparties is
> gpl2+ or 3+. In short, I'd set it to GPLv3+, should be fair enough.
>
> Then, some nitpicking:
>
> - we can avoid to define V and DISTNAME by setting
>PKGNAME=${DISTNAME:L}
> - don't indent WANTLIBs, taking the output from make
>port-lib-depends-check is easier
> - I think CONFIGURE_ARGS one per line are more readable.
>
> It'd be nice to use timidity from ports instead of the bundled one, but
> it needs also tidmidityplus and I don't know how hard it could be. The
> other stuff in thirdparty/ doesn't seem to be available in the port
> tree, and cmake doesn't even try to look for a system version of those
> libraries, so it shouldn't be a problem for bulk builds.
>
> btw, there was a previous submission for libgme[0] as deps for srb2,
> zmusic could use libgme too instead of bundling it. (this note is more
> for the archive if/when we'll import it than a comment on the submission
> itself)
>
> [0]: https://marc.info/?l=openbsd-ports=163878475724147=2
>
>
> Here's a diff against your makefile and an updated tarball:
>
> --- Makefile.orig Sat Dec 11 12:51:25 2021
> +++ Makefile Sat Dec 11 13:17:51 2021
> @@ -2,11 +2,11 @@
>
> COMMENT =gzdoom music library as standalone form for reuse
>
> -V = 1.1.3
> +PKGNAME =${DISTNAME:L}
> +
> GH_ACCOUNT = coelckers
> GH_PROJECT = ZMusic
> -GH_TAGNAME = ${V}
> -DISTNAME = zmusic-${V}
> +GH_TAGNAME = 1.1.3
>
> SHARED_LIBS += zmusic 0.0 # 1.1.0
> SHARED_LIBS += zmusiclite 0.0 # 1.1.0
> @@ -17,20 +17,22 @@
>
> MAINTAINER = Timo Myyra
>
> -# GPL3
> +# GPL3+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} m mpg123
> -WANTLIB += sndfile z
> +WANTLIB += ${COMPILER_LIBCXX} fluidsynth m mpg123 sndfile z
>
> +# C++11
> COMPILER = base-clang ports-gcc
>
> MODULES =devel/cmake
>
> -CONFIGURE_ARGS +=-DZMUSIC_VERSION=${LIBzmusic_VERSION}
> -CONFIGURE_ARGS +=-DDYN_MPG123=NO -DDYN_SNDFILE=NO
> +CONFIGURE_ARGS +=-DDYN_FLUIDSYNTH=NO \
> + -DDYN_MPG123=NO \
> + -DDYN_SNDFILE=NO
>
> -LIB_DEPENDS =audio/libsndfile \
> +LIB_DEPENDS =audio/fluidsynth \
> + audio/libsndfile \
> audio/mpg123
>
> NO_TEST =Yes
Good points and makes the diff better.
Timo
[maintainer update] gzdoom-4.7.1
Hi,
A bit delayed update to gzdoom. The upstream have made chopped the music
part as standalone library which I sent to ports@ earlier (audio/zmusic)
which is needed by this update.
Quickly tested on doom1 which appeared to be working.
diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports
blob - cb3a31e48d0ca9011f02eba2ddaa00f23368fa05
file + games/gzdoom/Makefile
--- games/gzdoom/Makefile
+++ games/gzdoom/Makefile
@@ -8,12 +8,11 @@ ONLY_FOR_ARCHS = i386 amd64
COMMENT = OpenGL engine for idTech 1 games like
doom,hexen,heretic...
-V =4.3.3
+V =4.7.1
GH_ACCOUNT = coelckers
GH_PROJECT = gzdoom
GH_TAGNAME = g${V}
DISTNAME = gzdoom-${V}
-REVISION = 1
CATEGORIES=games
@@ -24,21 +23,21 @@ MAINTAINER =Timo Myyra
# GPLv3
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m mpg123
-WANTLIB += openal sndfile z
+WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
+WANTLIB += openal z zmusic
COMPILER = base-clang ports-gcc
MODULES = devel/cmake
CONFIGURE_ARGS += -DNO_GTK=ON
-CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
-CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so"
+CONFIGURE_ARGS += -DDYN_OPENAL=NO
+# Sync with audio/fluidsynth
+CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so.2.0"
CONFIGURE_ARGS += -DHAVE_STDINT_H=1
-LIB_DEPENDS = audio/libsndfile \
- audio/mpg123 \
- audio/openal \
+LIB_DEPENDS = audio/openal \
+ audio/zmusic \
archivers/bzip2 \
graphics/jpeg \
devel/sdl2
blob - 5ceb4789c874b9bcfcbfc5d248c1840b989c8261
file + games/gzdoom/distinfo
--- games/gzdoom/distinfo
+++ games/gzdoom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gzdoom-4.3.3.tar.gz) = j+a/WQcdxgPmEenoIs2KaTTMSB0KKhmNkhr4gSZmG2A=
-SIZE (gzdoom-4.3.3.tar.gz) = 13704956
+SHA256 (gzdoom-4.7.1.tar.gz) = RUJXWCvgV2UB7vHvyZ/n6nDxxNeZNUnbPLxwnOdfwQI=
+SIZE (gzdoom-4.7.1.tar.gz) = 19562412
blob - e3b609fb15ffa8b1f585f6348cdfd8e8fc2925d6
file + /dev/null
--- games/gzdoom/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2019/12/06 17:40:24 solene Exp $
-
-Index: CMakeLists.txt
CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -271,7 +271,7 @@ else()
-
- if ( UNIX )
- include(CheckSymbolExists)
-- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
-+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h"
HAVE_FTS )
- if ( NOT HAVE_FTS )
- include ( FindPkgConfig )
- pkg_check_modules( MUSL_FTS musl-fts )
blob - 321cec48b300ed7c83b2b3b536b77a7c726a075c
file + /dev/null
--- games/gzdoom/patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libraries_glslang_glslang_Include_PoolAlloc_h,v 1.1 2020/08/06
11:11:12 edd Exp $
-
-Fix build on base Clang 10.
-
-It's the same fix as this:
-https://github.com/KhronosGroup/glslang/pull/2010/commits/24b3e8384e93f3e73b6aa14ea00a30574112f9ba
-
-Index: libraries/glslang/glslang/Include/PoolAlloc.h
libraries/glslang/glslang/Include/PoolAlloc.h.orig
-+++ libraries/glslang/glslang/Include/PoolAlloc.h
-@@ -304,7 +304,6 @@ class pool_allocator { (public)
- size_type max_size() const { return static_cast(-1) /
sizeof(T); }
- size_type max_size(int size) const { return static_cast(-1) /
size; }
-
--void setAllocator(TPoolAllocator* a) { allocator = *a; }
- TPoolAllocator& getAllocator() const { return allocator; }
-
- protected:
blob - a11157a4eb5f6d4ae6ad466226f857d4d962e7c1
file + /dev/null
--- games/gzdoom/patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-libraries_wildmidi_wildmidi_wildmidi_lib_h,v 1.1 2019/12/06
17:40:24 solene Exp $
-
-Index: libraries/wildmidi/wildmidi/wildmidi_lib.h
libraries/wildmidi/wildmidi/wildmidi_lib.h.orig
-+++ libraries/wildmidi/wildmidi/wildmidi_lib.h
-@@ -28,6 +28,7 @@
- #define WILDMIDI_LIB_H
-
- #include "../../music_common/fileio.h"
-+#include
-
- namespace WildMidi
- {
blob - 76a732d132b52dec88bc38c11420c00da44359c8
file + /dev/null
---
games/gzdoom/patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp,v
1.2 2020/03/09 12:18:50 solene Exp $
-
-Index: libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp.orig
-+++ libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
-@@ -141,8 +141,12 @@ class
Re: [maintainer update] pekwm-0.2.1
Omar Polo [2021-12-10, 15:13 +0100]: > Stuart Henderson writes: > >> On 2021/12/10 09:50, Omar Polo wrote: >>> Timo Myyrä writes: >>> >>> > Hi, >>> > >>> > Pekwm got new minor release containing fixes. It adds a new >>> > configuration option which allows us to remove local doc patch. With >>> > quick test >>> > seems to be working ok here on amd64. > > Thanks, committed! > >>> [...] >>> >>> Just one curiosity, now there are only two remaining patches and they're >>> both for pledge, has anybody tried to upstream those? They seem in a >>> good shape for being merged, but I don't see anything on github. I'm >>> missing some bit of history here? >> >> personally I prefer it if pledge patches aren't upstreamed unless >> upstream is actively running and testing with OpenBSD, we can easily >> end up in the situation like with i3 where we have to patch to remove >> them again. > > I didn't know about the i3 case, I agree completely then. The two > patches are also small and not a burden. > > (also, if upstream is actively running and testing with OpenBSD chances > are that we don't need to add pledge patches in the first place ;-) I'm not too keen on sending the pledge support upstream as it is now. I haven't done any deep analysis on the pledge, just thought a reasonable set of privileges it needs and slapped that around the main loop and tested it still worked. I was mostly interested on limiting the networking stuff away. I think a more in-depth pledging would be needed for it to be upstreamed and it should be monitored and updated as development goes on. Timo
[new] audio/zmusic-1.1.3
Hi, Here's an new port audio/zmusic. It is the music library which got extracted from the gzdoom as standalone part. This is dependency for upcoming games/gzdoom update. Timo zmusic.tgz Description: zmusic.tgz
[maintainer update] pekwm-0.2.1
Hi,
Pekwm got new minor release containing fixes. It adds a new
configuration option which allows us to remove local doc patch. With quick test
seems to be working ok here on amd64.
Timo
diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports
blob - 0889f2f13c04067e4828c8c973f6478c5a6c7663
file + x11/pekwm/Makefile
--- x11/pekwm/Makefile
+++ x11/pekwm/Makefile
@@ -3,7 +3,7 @@
COMMENT= aewm++ based pretty themable window manager
DISTNAME= pekwm-${V}
-V= 0.2.0
+V= 0.2.1
CATEGORIES=x11
HOMEPAGE= https://www.pekwm.se/
@@ -26,6 +26,7 @@ LIB_DEPENDS= graphics/jpeg \
MODULES= devel/cmake
CONFIGURE_ARGS=-DCMAKE_INSTALL_SYSCONFDIR=${SYSCONFDIR} \
+ -DCMAKE_INSTALL_FULL_MANDIR=${PREFIX}/man \
-DAWK=/usr/bin/awk \
-DSED=/usr/bin/sed \
-DSH=/bin/sh \
blob - 2bc5d49abf9efdef3281c086653d0779dd9b7c68
file + x11/pekwm/distinfo
--- x11/pekwm/distinfo
+++ x11/pekwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.2.0.tar.gz) = KFZVUN29JPsrdi8eA+CopGaEPcl6gxBlAYoFHnJAZR4=
-SIZE (pekwm-0.2.0.tar.gz) = 938147
+SHA256 (pekwm-0.2.1.tar.gz) = AV5uud/8gW+i1Km4yzRaUolPTcpaAdBhLzAkLbh+DlA=
+SIZE (pekwm-0.2.1.tar.gz) = 943072
blob - 13b4c9553045c050e7ea0fa097bc14827c2035cb
file + x11/pekwm/patches/patch-CMakeLists_txt
--- x11/pekwm/patches/patch-CMakeLists_txt
+++ x11/pekwm/patches/patch-CMakeLists_txt
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 2021/11/19 21:15:
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -65,6 +65,7 @@ int main() { std::stof(\"42.0\"); }
+@@ -67,6 +67,7 @@ int main() { std::stof(\"42.0\"); }
set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
# Look for platform specific methods
blob - e3e6c81d5a9df99b6c7d40fadaa4dcfcc82a31b0
file + /dev/null
--- x11/pekwm/patches/patch-doc_CMakeLists_txt
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2021/11/19 21:15:51 op Exp $
-
-Index: doc/CMakeLists.txt
doc/CMakeLists.txt.orig
-+++ doc/CMakeLists.txt
-@@ -13,4 +13,4 @@ endif (ENABLE_IMAGE_PNG AND PNG_FOUND)
-
- install(FILES
- ${manpages}
-- DESTINATION share/man/man1)
-+ DESTINATION man/man1)
Re: Package gccjit in lang/gcc?
Jeremie Courreges-Anglas [2021-12-07, 18:46 +0100]:
> cc'ing maintainer,
>
> On Tue, Dec 07 2021, Timo Myyrä wrote:
>> Hi,
>>
>> The upcoming emacs 28 has native compilation feature which allows it to
>> use gcc to compile emacs lisp files to loadable libraries by using the
>> libgccjit library. This library is not currently provided by the lang/gcc
>> port
>> and I took first stab at getting it done.
>
> I've heard about this feature, but I'm not eager to make use of it.
> We'll have to weigh the pros and cons. emacs is already a complex port
> which has become a bit easier to handle since the pdumper was
> introduced. I have no idea how deep this gccjit rabbit-hole is.
>
> Do you have a working setup? Care to share the details?
>
The idea of the emacs --with-native-compilation flag is to integrate
emacs with gcc using the libgccjit library. This allows the emacs to
compile all of the bundled emacs lisp bytecode files using gcc into
dynamic libraries. The idea would be that the packager could compile the
files on the build host and share these with packaged emacs. If these
files are missing the emacs could compile them during the run-time as
well but this will take some time on each host. The end result should be
a bit faster emacs operations for the more heavier elisp parts. So it is
quite a big change for emacs port. But I think that part can be done by
doing custom port or just manually compiling emacs as it is relatively
fast operation compared to doing changes to the gcc port and compiling it.
I did not get so far to get working setup, I did most of this during the
summer but had since forgotten it to rot on my disk so I thought to
share my current progress to see if this is something that could be
added in to ports tree once polished.
>> The --enable-host-shared flag is required by the jit LANG but I'm not
>> sure if it is wise to put in generic CONFIGURE_ARGS.
>
> https://gcc.gnu.org/install/configure.html
>
> --enable-host-shared
>
> Specify that the host code should be built into position-independent
> machine code (with -fPIC), allowing it to be used within shared
> libraries, but yielding a slightly slower compiler.
>
> This option is required when building the libgccjit.so library.
>
> Contrast with --enable-shared, which affects target libraries.
>
> No idea whether this is relevant to us. We're building the egcc
> executable with PIE, for example, so maybe we already pay the price of
> PIC code.
>
>> How does this look?
>
> One thing struck me,
>
>> blob - /dev/null
>> file + lang/gcc/11/pkg/PLIST-jit
>> --- /dev/null
>> +++ lang/gcc/11/pkg/PLIST-jit
>> @@ -0,0 +1,7 @@
>> +@comment $OpenBSD$
>> +include/libgccjit++.h
>> +include/libgccjit.h
>> +@info info/libgccjit.info
>
>> +@so lib/libgccjit.so
>> +lib/libgccjit.so.0
>> +@bin lib/libgccjit.so.0.0.1
>
> This looks incorrect.
Ah, right you are. Need to tweak the build a bit to get this working.
>
>> blob - /dev/null
>> file + lang/gcc/8/pkg/PLIST-jit
>> --- /dev/null
>> +++ lang/gcc/8/pkg/PLIST-jit
>> @@ -0,0 +1,5 @@
>> +@comment $OpenBSD: PLIST-jit,v$
>> +@lib lib/libgccjit.so.${LIBgccjit_VERSION}
>
> This looks correct.
>
>> +include/libgccjit++.h
>> +include/libgccjit.h
>> +@info info/libgccjit.info
Package gccjit in lang/gcc?
Hi,
The upcoming emacs 28 has native compilation feature which allows it to
use gcc to compile emacs lisp files to loadable libraries by using the
libgccjit library. This library is not currently provided by the lang/gcc port
and I took first stab at getting it done.
The --enable-host-shared flag is required by the jit LANG but I'm not
sure if it is wise to put in generic CONFIGURE_ARGS.
How does this look?
Timo
diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports
blob - 0ce4997174291a22be0cc03ec2b258751be50afc
file + lang/gcc/11/Makefile
--- lang/gcc/11/Makefile
+++ lang/gcc/11/Makefile
@@ -19,8 +19,7 @@ DPB_PROPERTIES = parallel
V = 11.2.0
FULL_VERSION = $V
FULL_PKGVERSION = $V
-REVISION = 0
-REVISION-dlang = 1
+REVISION = 1
ADASTRAP-amd64 = adastrap-amd64-$V-0.tar.xz
ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
@@ -37,6 +36,7 @@ PKGNAME-f95 = g95-${FULL_PKGVERSION}
PKGNAME-objc = gobjc-${FULL_PKGVERSION}
PKGNAME-ada = gnat-${FULL_PKGVERSION}
PKGNAME-dlang = gdc-${FULL_PKGVERSION}
+PKGNAME-jit = gcc-jit-${FULL_PKGVERSION}
PKGSPEC-main = gcc->=11,<12
SHARED_LIBS = estdc++ 20.0 \
@@ -50,12 +50,13 @@ SHARED_LIBS = estdc++ 20.0 \
cc1plugin 2.0 \
cp1plugin 1.0 \
gphobos 0.0 \
- gdruntime 0.0
+ gdruntime 0.0 \
+ gccjit 0.0
PSEUDO_FLAVORS = no_ada full
-FLAVOR ?=
+FLAVOR ?=
-MULTI_PACKAGES = -main -libs -f95 -objc -c++ -ada -dlang
+MULTI_PACKAGES = -main -libs -f95 -objc -c++ -ada -dlang -jit
MAINTAINER = Pascal Stumpf
@@ -94,7 +95,7 @@ MASTER_SITES0 = https://distfiles.stumpf.co/ \
https://spacehopper.org/mirrors/ \
https://distfiles.bsdfrog.org/
-LANGS = c,c++,fortran,objc
+LANGS = c,c++,fortran,objc,jit
.if ${BUILD_PACKAGES:M-ada}
LANGS := ${LANGS},ada
DISTFILES += ${ADASTRAP-${MACHINE_ARCH}}:0
@@ -152,6 +153,7 @@ CONFIGURE_ARGS += \
--with-gnu-ld \
--with-gnu-as \
--enable-threads=posix \
+ --enable-host-shared \
--enable-wchar_t \
--with-gmp="${LOCALBASE}" \
--enable-languages=${LANGS} \
@@ -226,6 +228,7 @@ WANTLIB-main = ${WANTLIB}
WANTLIB-ada = ${WANTLIB} pthread util
WANTLIB-dlang =${WANTLIB} pthread
WANTLIB-libs = m pthread
+WANTLIB-jit = gmp m mpc mpfr z
LIB_DEPENDS += devel/gmp,no_cxx,bootstrap \
devel/mpfr \
blob - /dev/null
file + lang/gcc/11/patch-gcc_jit_Make-lang_in
--- /dev/null
+++ lang/gcc/11/patch-gcc_jit_Make-lang_in
@@ -0,0 +1,37 @@
+$OpenBSD$
+
+Index: gcc/jit/Make-lang.in
+--- gcc/jit/Make-lang.in.orig
gcc/jit/Make-lang.in
+@@ -40,13 +40,15 @@
+ # into the jit rule, but that needs a little bit of work
+ # to do the right thing within all.cross.
+
+-LIBGCCJIT_LINKER_NAME = libgccjit.so
++include $(top_srcdir)/../libversions
++
++LIBGCCJIT_LINKER_NAME = libgccjit.so.$(LIBGCCJIT_VERSION_NUM)
+ LIBGCCJIT_VERSION_NUM = 0
+ LIBGCCJIT_MINOR_NUM = 0
+ LIBGCCJIT_RELEASE_NUM = 1
+-LIBGCCJIT_SONAME = $(LIBGCCJIT_LINKER_NAME).$(LIBGCCJIT_VERSION_NUM)
++LIBGCCJIT_SONAME = $(LIBGCCJIT_LINKER_NAME)
+ LIBGCCJIT_FILENAME = \
+- $(LIBGCCJIT_SONAME).$(LIBGCCJIT_MINOR_NUM).$(LIBGCCJIT_RELEASE_NUM)
++ $(LIBGCCJIT_SONAME).$(LIBGCCJIT_VERSION_NUM)
+
+ LIBGCCJIT_LINKER_NAME_SYMLINK = $(LIBGCCJIT_LINKER_NAME)
+ LIBGCCJIT_SONAME_SYMLINK = $(LIBGCCJIT_SONAME)
+@@ -275,12 +277,6 @@ check_jit_parallelize = 10
+ jit.install-common: installdirs
+ $(INSTALL_PROGRAM) $(LIBGCCJIT_FILENAME) \
+ $(DESTDIR)/$(libdir)/$(LIBGCCJIT_FILENAME)
+- ln -sf \
+-$(LIBGCCJIT_FILENAME) \
+-$(DESTDIR)/$(libdir)/$(LIBGCCJIT_SONAME_SYMLINK)
+- ln -sf \
+-$(LIBGCCJIT_SONAME_SYMLINK)\
+-$(DESTDIR)/$(libdir)/$(LIBGCCJIT_LINKER_NAME_SYMLINK)
+ $(INSTALL_DATA) $(srcdir)/jit/libgccjit.h \
+ $(DESTDIR)/$(includedir)/libgccjit.h
+ $(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \
blob - /dev/null
file + lang/gcc/11/patches/patch-gcc_jit_Make-lang_in
--- /dev/null
+++ lang/gcc/11/patches/patch-gcc_jit_Make-lang_in
@@ -0,0 +1,45 @@
+$OpenBSD$
+
+Index: gcc/jit/Make-lang.in
+--- gcc/jit/Make-lang.in.orig
gcc/jit/Make-lang.in
+@@ -40,6 +40,8 @@
+ # into the jit rule, but that needs a little bit of work
+ # to do the right thing within all.cross.
+
++include $(top_srcdir)/../libversions
++
+ LIBGCCJIT_VERSION_NUM = 0
+ LIBGCCJIT_MINOR_NUM = 0
+ LIBGCCJIT_RELEASE_NUM = 1
+@@ -53,11 +55,11 @@ jit: $(LIBGCCJIT_FILENAME) \
+
+ else
+
+-LIBGCCJIT_LINKER_NAME = libgccjit.so
++LIBGCCJIT_LINKER_NAME = libgccjit.so.$(LIBGCCJIT_VERSION_NUM)
+
+-LIBGCCJIT_SONAME = $(LIBGCCJIT_LINKER_NAME).$(LIBGCCJIT_VERSION_NUM)
++LIBGCCJIT_SONAME = $(LIBGCCJIT_LINKER_NAME)
+ LIBGCCJIT_FILENAME = \
+- $(LIBGCCJIT_SONAME).$(LIBGCCJIT_MINOR_NUM).$(LIBGCCJIT_RELEASE_NUM)
++
Re: [maintainer update] chicken-5.3.0
Omar Polo [2021-12-04, 17:37 +0100]:
> Timo Myyrä writes:
>
>> Hi,
>>
>> Here's an bump to chicken scheme.
>> Works here on amd64.
>
> Hello,
>
> builds fine, WANTLIB and plist ok, and from a quick test it's working
> correctly. `make test` passes too :D
>
> I've only one doubt
>
>> -SHARED_LIBS=chicken 7.1 # 11
>> +SHARED_LIBS=chicken 7.2 # 11
>
> I think this should be a major bump because C_startup_time_seconds was
> removed according to check_sym. It's not a big deal, libchicken isn't
> used by anything in port, but anyway...
>
> % /usr/src/lib/check_sym /usr/local/lib/libchicken.so.7.1 \
> /usr/ports/pobj/chicken-5.3.0/fake-amd64/usr/local/lib/libchicken.so.*
> /usr/local/lib/libchicken.so.7.1 -->
> /usr/ports/pobj/chicken-5.3.0/fake-amd64/usr/local/lib/libchicken.so.7.2
> Dynamic export changes:
> added:
> C_current_process_milliseconds
> C_heap_half_min_free
> C_startup_time_msec
> C_startup_time_sec
> heap_shrink_counter
>
> removed:
> C_startup_time_seconds
>
> PLT added:
> C_current_process_milliseconds
>
> PLT removed:
> C_pair
>
> Index: Makefile.inc
> ===
> RCS file: /home/cvs/ports/lang/chicken/Makefile.inc,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile.inc
> --- Makefile.inc 3 Mar 2020 10:27:40 - 1.16
> +++ Makefile.inc 4 Dec 2021 15:30:07 -
> @@ -2,7 +2,7 @@
>
> COMMENT= practical and portable Scheme system
>
> -V= 5.2.0
> +V= 5.3.0
> DISTNAME=chicken-${V}
>
> MAINTAINER= Timo Myyra
> Index: bootstrap/distinfo
> ===
> RCS file: /home/cvs/ports/lang/chicken/bootstrap/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- bootstrap/distinfo3 Mar 2020 10:27:40 - 1.9
> +++ bootstrap/distinfo4 Dec 2021 15:30:07 -
> @@ -1,2 +1,2 @@
> -SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
> -SIZE (chicken-5.2.0.tar.gz) = 4052305
> +SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
> +SIZE (chicken-5.3.0.tar.gz) = 4069549
> Index: core/Makefile
> ===
> RCS file: /home/cvs/ports/lang/chicken/core/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- core/Makefile 3 Mar 2020 10:27:40 - 1.15
> +++ core/Makefile 4 Dec 2021 16:43:01 -
> @@ -1,6 +1,6 @@
> # $OpenBSD: Makefile,v 1.15 2020/03/03 10:27:40 semarie Exp $
>
> -SHARED_LIBS= chicken 7.1 # 11
> +SHARED_LIBS= chicken 8.0 # 11
>
> TEST_TARGET= check
> TEST_DEPENDS=${BUILD_PKGPATH}
> Index: core/distinfo
> ===
> RCS file: /home/cvs/ports/lang/chicken/core/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- core/distinfo 3 Mar 2020 10:27:40 - 1.9
> +++ core/distinfo 4 Dec 2021 15:30:07 -
> @@ -1,2 +1,2 @@
> -SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
> -SIZE (chicken-5.2.0.tar.gz) = 4052305
> +SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
> +SIZE (chicken-5.3.0.tar.gz) = 4069549
> Index: core/patches/patch-Makefile_bsd
> ===
> RCS file: /home/cvs/ports/lang/chicken/core/patches/patch-Makefile_bsd,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-Makefile_bsd
> --- core/patches/patch-Makefile_bsd 27 Aug 2015 22:40:33 - 1.3
> +++ core/patches/patch-Makefile_bsd 4 Dec 2021 15:30:07 -
> @@ -1,15 +1,14 @@
> -$OpenBSD: patch-Makefile_bsd,v 1.3 2015/08/27 22:40:33 juanfra Exp $
> Makefile.bsd.origTue Aug 4 21:46:22 2015
> -+++ Makefile.bsd Thu Aug 27 19:11:22 2015
> -@@ -45,10 +45,9 @@ endif
> +$OpenBSD$
> +
> +Index: Makefile.bsd
> +--- Makefile.bsd.orig
> Makefile.bsd
> +@@ -45,7 +45,7 @@ endif
> LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
> - LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared
> -Wl,-R"$(RUNTIME_LINKER_PATH)" -Wl,-L.
> - LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R"$(RUNTIME_LINKER_PATH)"
> + LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared
> -Wl,-rpath="$(RUNTIME_LINKER_PATH)" -Wl,-L.
> + LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-rpath="$(RUNTIME_LINKER_PATH)"
> -LIBCHICKEN_SO_LINKER_OPTIONS =
> -Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(
[maintainer update] chicken-5.3.0
Hi,
Here's an bump to chicken scheme.
Works here on amd64.
Timo
diff 1c7cb3a469cd4eafc1a5285d791d86da4f5c86b5 /usr/ports
blob - 2f597d8a02ca3a374834eea760842bda0da788ff
file + lang/chicken/Makefile.inc
--- lang/chicken/Makefile.inc
+++ lang/chicken/Makefile.inc
@@ -2,7 +2,7 @@
COMMENT= practical and portable Scheme system
-V= 5.2.0
+V= 5.3.0
DISTNAME= chicken-${V}
MAINTAINER=Timo Myyra
blob - 3ab250efefd57c869a9e4572bbd6b414496432af
file + lang/chicken/bootstrap/distinfo
--- lang/chicken/bootstrap/distinfo
+++ lang/chicken/bootstrap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
-SIZE (chicken-5.2.0.tar.gz) = 4052305
+SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
+SIZE (chicken-5.3.0.tar.gz) = 4069549
blob - 1dbda52c7782bf0ee97e43d9d265c52970626f54
file + lang/chicken/core/Makefile
--- lang/chicken/core/Makefile
+++ lang/chicken/core/Makefile
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.15 2020/03/03 10:27:40 semarie Exp $
-SHARED_LIBS= chicken 7.1 # 11
+SHARED_LIBS= chicken 7.2 # 11
TEST_TARGET= check
TEST_DEPENDS= ${BUILD_PKGPATH}
blob - 3ab250efefd57c869a9e4572bbd6b414496432af
file + lang/chicken/core/distinfo
--- lang/chicken/core/distinfo
+++ lang/chicken/core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
-SIZE (chicken-5.2.0.tar.gz) = 4052305
+SHA256 (chicken-5.3.0.tar.gz) = w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=
+SIZE (chicken-5.3.0.tar.gz) = 4069549
blob - 6bac523099a1c4fa479713dcf143a2dd21c0278d
file + lang/chicken/core/patches/patch-Makefile_bsd
--- lang/chicken/core/patches/patch-Makefile_bsd
+++ lang/chicken/core/patches/patch-Makefile_bsd
@@ -1,15 +1,14 @@
-$OpenBSD: patch-Makefile_bsd,v 1.3 2015/08/27 22:40:33 juanfra Exp $
Makefile.bsd.orig Tue Aug 4 21:46:22 2015
-+++ Makefile.bsd Thu Aug 27 19:11:22 2015
-@@ -45,10 +45,9 @@ endif
+$OpenBSD$
+
+Index: Makefile.bsd
+--- Makefile.bsd.orig
Makefile.bsd
+@@ -45,7 +45,7 @@ endif
LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
- LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-R"$(RUNTIME_LINKER_PATH)"
-Wl,-L.
- LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R"$(RUNTIME_LINKER_PATH)"
+ LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared
-Wl,-rpath="$(RUNTIME_LINKER_PATH)" -Wl,-L.
+ LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-rpath="$(RUNTIME_LINKER_PATH)"
-LIBCHICKEN_SO_LINKER_OPTIONS =
-Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(BINARYVERSION)
+LIBCHICKEN_SO_LINKER_OPTIONS =
-Wl,-soname,lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX).so.$(LIBchicken_VERSION)
LIBRARIES = -lm -lpthread
NEEDS_RELINKING = yes
--USES_SONAME = yes
-
- # special files
-
+ USES_SONAME = yes
blob - 1eb6d105f8bc5a3f41e236e895421d3059024053
file + lang/chicken/core/patches/patch-eval_scm
--- lang/chicken/core/patches/patch-eval_scm
+++ lang/chicken/core/patches/patch-eval_scm
@@ -2,7 +2,7 @@ $OpenBSD: patch-eval_scm,v 1.5 2019/08/06 18:19:51 jua
Index: eval.scm
--- eval.scm.orig
+++ eval.scm
-@@ -1110,8 +1110,7 @@
+@@ -1115,8 +1115,7 @@
(if uses-soname?
(string-append
load-library-extension
blob - 4db8809563264170fb4632094112ff5be8296166
file + lang/chicken/core/patches/patch-rules_make
--- lang/chicken/core/patches/patch-rules_make
+++ lang/chicken/core/patches/patch-rules_make
@@ -12,3 +12,31 @@ Index: rules.make
$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_LINKER_OPTIONS) \
$(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES)
ifdef USES_SONAME
+@@ -281,9 +281,6 @@ ifdef DLLSINPATH
+ $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(IBINDIR)"
+ else
+ ifdef USES_SONAME
+- $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE)
"$(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE).$(BINARYVERSION)"
+- cd "$(DESTDIR)$(ILIBDIR)" && ln -sf
$(LIBCHICKEN_SO_FILE).$(BINARYVERSION)
lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)
+-else
+ $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS)
$(LIBCHICKEN_SO_FILE) "$(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE)"
+ endif
+ endif
+@@ -415,7 +412,7 @@ uninstall:
+ $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(A)"
+ $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
+ ifdef USES_SONAME
+- -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO).$(BINARYVERSION)"
++ -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
"$(DESTDIR)$(ILIBDIR)$(SEP)lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)"
+ endif
+ ifdef WINDOWS
+ $(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS)
Re: [maintainer update] pekwm-0.2.0
Omar Polo [2021-11-19, 16:00 +0100]:
> Omar Polo writes:
>
>> Timo Myyrä writes:
>>
>>> Hi,
>>
>> Hello :)
>>
>>> Another attempt at updating pekwm.
>>
>> packages and works fine; I'm typing this mail from pekwm (using the
>> default configuration thought.) portcheck and make
>> port-lib-depends-check are happy too.
>>
>>> I noticed the pekwm_theme script picked up wrong copies of sed and awk
>>> commands so pass in configure flags to fix them. The script could be
>>> patched so that can use 'ftp' for fetching themes.
>>
>> Yep, the CMakeLists.txt uses find_program and search into /usr/local/bin
>> before /usr/bin and /bin, so it may pick up gsed or GNU awk instead of
>> base one. -DSH=/bin/sh is probably redundant, from a quick pkglocate I
>> don't see any port that installs a /usr/local/bin/sh but since we're
>> there it's probably best to set that too.
>>
>> We could just as well enable the tests, here are all passing!
>>
>>> Timo
>>
>> Cheers,
>>
>> Omar Polo
>
> Now with 100% more patches! (forgot to cvs add...)
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/x11/pekwm/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- Makefile 26 Aug 2021 04:23:03 - 1.37
> +++ Makefile 19 Nov 2021 14:51:05 -
> @@ -3,7 +3,7 @@
> COMMENT= aewm++ based pretty themable window manager
>
> DISTNAME=pekwm-${V}
> -V= 0.1.18
> +V= 0.2.0
> CATEGORIES= x11
>
> HOMEPAGE=https://www.pekwm.se/
> @@ -14,26 +14,22 @@ MAINTAINER= Timo Myyra PERMIT_PACKAGE= Yes
>
> # uses pledge()
> -WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv jpeg m png z
> +WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
> WANTLIB += ${COMPILER_LIBCXX}
>
> -COMPILER = base-clang ports-gcc base-gcc
> +COMPILER = base-clang ports-gcc base-gcc
>
> MASTER_SITES=
> https://github.com/pekdon/pekwm/releases/download/release-${V}/
> -LIB_DEPENDS= converters/libiconv \
> - graphics/jpeg \
> +LIB_DEPENDS= graphics/jpeg \
> graphics/png
>
> -NO_TEST= Yes
> +MODULES= devel/cmake
>
> -USE_GMAKE= Yes
> -
> -CONFIGURE_STYLE=autoconf
> -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib"
> -CONFIGURE_ARGS= --enable-xinerama
> -
> -AUTOCONF_VERSION=2.69
> +CONFIGURE_ARGS= -DCMAKE_INSTALL_SYSCONFDIR=${SYSCONFDIR} \
> + -DAWK=/usr/bin/awk \
> + -DSED=/usr/bin/sed \
> + -DSH=/bin/sh \
> + -DTESTS=ON
>
> post-install:
> @mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/x11/pekwm/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo 26 Aug 2021 04:23:03 - 1.12
> +++ distinfo 19 Nov 2021 09:51:03 -
> @@ -1,2 +1,2 @@
> -SHA256 (pekwm-0.1.18.tar.gz) = e+zEO3nqsP91RXKFLjhUNSIkIDhRB8iBqTrE3ErpYGU=
> -SIZE (pekwm-0.1.18.tar.gz) = 531611
> +SHA256 (pekwm-0.2.0.tar.gz) = KFZVUN29JPsrdi8eA+CopGaEPcl6gxBlAYoFHnJAZR4=
> +SIZE (pekwm-0.2.0.tar.gz) = 938147
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-CMakeLists_txt 19 Nov 2021 09:51:03 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> CMakeLists.txt
> +@@ -65,6 +65,7 @@ int main() { std::stof(\"42.0\"); }
> + set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
> +
> + # Look for platform specific methods
> ++check_function_exists(pledge PEKWM_HAVE_PLEDGE)
> + check_function_exists(setenv PEKWM_HAVE_SETENV)
> + check_function_exists(unsetenv PEKWM_HAVE_UNSETENV)
> + check_function_exists(daemon PEKWM_HAVE_DAEMON)
> Index: patches/patch-configure_ac
> ===
> RCS file: patches/patch-configure_ac
> diff -N patches/patch-configure_ac
> --- patches/patch-configure_ac26 Aug 2021 04:23:03 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-configure_ac,v 1.2 2021/08/26 04:23:03 semari
[maintainer update] pekwm-0.2.0
Hi,
Another attempt at updating pekwm.
I noticed the pekwm_theme script picked up wrong copies of sed and awk
commands so pass in configure flags to fix them. The script could be
patched so that can use 'ftp' for fetching themes.
Timo
diff 922bc0dd1b90e02f44c8c00183cad19f3c566aa5 /usr/ports
blob - 13d0876d3be258fe7eae3b4b84e55bd6be3fc822
file + x11/pekwm/Makefile
--- x11/pekwm/Makefile
+++ x11/pekwm/Makefile
@@ -3,7 +3,7 @@
COMMENT= aewm++ based pretty themable window manager
DISTNAME= pekwm-${V}
-V= 0.1.18
+V= 0.2.0
CATEGORIES=x11
HOMEPAGE= https://www.pekwm.se/
@@ -14,27 +14,24 @@ MAINTAINER= Timo Myyra
PERMIT_PACKAGE=Yes
# uses pledge()
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv jpeg m png z
+WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
WANTLIB += ${COMPILER_LIBCXX}
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES= https://github.com/pekdon/pekwm/releases/download/release-${V}/
-LIB_DEPENDS= converters/libiconv \
- graphics/jpeg \
+LIB_DEPENDS= graphics/jpeg \
graphics/png
NO_TEST= Yes
-USE_GMAKE= Yes
+MODULES= devel/cmake
-CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=--enable-xinerama
+CONFIGURE_ARGS=-DCMAKE_INSTALL_SYSCONFDIR=${SYSCONFDIR} \
+ -DAWK=/usr/bin/awk \
+ -DSED=/usr/bin/sed \
+ -DSH=/bin/sh
-AUTOCONF_VERSION= 2.69
-
post-install:
@mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples
blob - 0387b2ddf3443fceafb537b1f05c0cd580d24bf5
file + x11/pekwm/distinfo
--- x11/pekwm/distinfo
+++ x11/pekwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.1.18.tar.gz) = e+zEO3nqsP91RXKFLjhUNSIkIDhRB8iBqTrE3ErpYGU=
-SIZE (pekwm-0.1.18.tar.gz) = 531611
+SHA256 (pekwm-0.2.0.tar.gz) = KFZVUN29JPsrdi8eA+CopGaEPcl6gxBlAYoFHnJAZR4=
+SIZE (pekwm-0.2.0.tar.gz) = 938147
blob - /dev/null
file + x11/pekwm/patches/patch-CMakeLists_txt
--- /dev/null
+++ x11/pekwm/patches/patch-CMakeLists_txt
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -65,6 +65,7 @@ int main() { std::stof(\"42.0\"); }
+ set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
+
+ # Look for platform specific methods
++check_function_exists(pledge PEKWM_HAVE_PLEDGE)
+ check_function_exists(setenv PEKWM_HAVE_SETENV)
+ check_function_exists(unsetenv PEKWM_HAVE_UNSETENV)
+ check_function_exists(daemon PEKWM_HAVE_DAEMON)
blob - 3c0effc1f264b5ebebe13e7699519889cb32d7b4
file + /dev/null
--- x11/pekwm/patches/patch-configure_ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: configure.ac
configure.ac.orig
-+++ configure.ac
-@@ -32,6 +32,9 @@ CXXFLAGS="$CXXFLAGS $INCICONV"
- dnl Check for iconvctl
- AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you
the iconvctl call])], )
-
-+dnl Check for pledge
-+AC_CHECK_FUNC(pledge, [AC_DEFINE(HAVE_PLEDGE, [1], [Define to 1 if you the
pledge call])], )
-+
- dnl add x11 to the env
- AC_PATH_X
- AC_PATH_XTRA
blob - 981137eb0312d193c741474d6fad409ed1b7aaaf
file + /dev/null
--- x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-data_scripts_pekwm_screenshot_sh,v 1.2 2021/08/26 04:23:03
semarie Exp $
-
-Fix getopt: unknown option -- n
-
-Index: data/scripts/pekwm_screenshot.sh
data/scripts/pekwm_screenshot.sh.orig
-+++ data/scripts/pekwm_screenshot.sh
-@@ -151,6 +151,6 @@ main()
- exit 0
- }
-
--OPTIONS=$(getopt -o c:d:ho: -n 'pekwm_screenshot.sh' -- "$@")
-+OPTIONS=$(getopt c:d:ho: $*)
- main
-
blob - /dev/null
file + x11/pekwm/patches/patch-doc_CMakeLists_txt
--- /dev/null
+++ x11/pekwm/patches/patch-doc_CMakeLists_txt
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
doc/CMakeLists.txt
+@@ -13,4 +13,4 @@ endif (ENABLE_IMAGE_PNG AND PNG_FOUND)
+
+ install(FILES
+ ${manpages}
+- DESTINATION share/man/man1)
++ DESTINATION man/man1)
blob - e86f273afc1f6e892ee2d8ef874b51c3a8c4e0be
file + /dev/null
--- x11/pekwm/patches/patch-src_main_cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_main_cc,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: src/main.cc
src/main.cc.orig
-+++ src/main.cc
-@@ -127,6 +127,12 @@ main(int argc, char **argv)
- #endif // DEBUG
-
- WindowManager *wm = WindowManager::start(config_file, replace);
-+#if HAVE_PLEDGE
-+if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) {
-+cerr << "failed to pledge" << endl;
-+return 1;
-+}
-+#endif
-
- if (wm) {
- try {
blob - /dev/null
file + x11/pekwm/patches/patch-src_pekwm_wm_cc
--- /dev/null
+++ x11/pekwm/patches/patch-src_pekwm_wm_cc
@@ -0,0 +1,29 @@
+$OpenBSD$
+
[update] py-progress-1.6
Hi,
Here's an update diff to update py-progress. Py-progress was originally
added to ports as dependency of multimedia/yle-dl but it no longer
uses py-progress. Py-progress is not used by any other port so it could
be safely removed or updated. Which would be preferable?
timo
diff 922bc0dd1b90e02f44c8c00183cad19f3c566aa5 /usr/ports
blob - 3d8420404f366a4f0c2bb262f5bb3d6299e8281a
file + devel/py-progress/Makefile
--- devel/py-progress/Makefile
+++ devel/py-progress/Makefile
@@ -2,11 +2,10 @@
COMMENT = easy to use progressbar library for python
-MODPY_EGG_VERSION =1.5
+MODPY_EGG_VERSION =1.6
DISTNAME = progress-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
-REVISION = 2
HOMEPAGE = https://github.com/verigak/progress/
blob - ee77193cb2216c9898e94f54b754e5969d693774
file + devel/py-progress/distinfo
--- devel/py-progress/distinfo
+++ devel/py-progress/distinfo
@@ -1,2 +1,2 @@
-SHA256 (progress-1.5.tar.gz) = aezt0dG75xv2MT2I0ebE0pV7fx1PcTEsIRJX99rmQ3I=
-SIZE (progress-1.5.tar.gz) = 5842
+SHA256 (progress-1.6.tar.gz) = ychumLXAP6H+EeO2fB/tpHiLjQ/nM2wv99VkTM+6NM0=
+SIZE (progress-1.6.tar.gz) = 7842
blob - 3ee2faf0edfd6653adf245d17e08ab3701b1ad03
file + devel/py-progress/pkg/PLIST
--- devel/py-progress/pkg/PLIST
+++ devel/py-progress/pkg/PLIST
@@ -9,9 +9,11 @@ lib/python${MODPY_VERSION}/site-packages/progress-${MO
lib/python${MODPY_VERSION}/site-packages/progress/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/progress/bar.py
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}bar.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/progress/counter.py
+lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}colors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}counter.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/progress/spinner.py
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}spinner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/progress/bar.py
+lib/python${MODPY_VERSION}/site-packages/progress/colors.py
+lib/python${MODPY_VERSION}/site-packages/progress/counter.py
+lib/python${MODPY_VERSION}/site-packages/progress/spinner.py
Re: [maintainer update] pekwm-0.2.0
Stuart Henderson [2021-11-05, 16:23 +]:
> On 2021/11/05 18:13, Timo Myyrä wrote:
>
>> @bin bin/pekwm
>> -@man man/man1/pekwm.1
>> -share/examples/pekwm/
>> @sample ${SYSCONFDIR}/pekwm/
>> -share/examples/pekwm/autoproperties
>> -@sample ${SYSCONFDIR}/pekwm/autoproperties
>> -share/examples/pekwm/autoproperties_typerules
>> -@sample ${SYSCONFDIR}/pekwm/autoproperties_typerules
>> -share/examples/pekwm/config
>> -@sample ${SYSCONFDIR}/pekwm/config
>> -share/examples/pekwm/config_system
>> -@sample ${SYSCONFDIR}/pekwm/config_system
>> -share/examples/pekwm/keys
>> -@sample ${SYSCONFDIR}/pekwm/keys
>> -share/examples/pekwm/menu
>> -@sample ${SYSCONFDIR}/pekwm/menu
>> -share/examples/pekwm/mouse
>> -@sample ${SYSCONFDIR}/pekwm/mouse
>> -share/examples/pekwm/mouse_click
>> -@sample ${SYSCONFDIR}/pekwm/mouse_click
>> -share/examples/pekwm/mouse_sloppy
>> -@sample ${SYSCONFDIR}/pekwm/mouse_sloppy
>> -share/examples/pekwm/mouse_system
>> -@sample ${SYSCONFDIR}/pekwm/mouse_system
>> -share/examples/pekwm/start
>> -@sample ${SYSCONFDIR}/pekwm/start
>> -share/examples/pekwm/vars
>> -@sample ${SYSCONFDIR}/pekwm/vars
> ..
>> +etc/
>> +etc/pekwm/
>> +etc/pekwm/autoproperties
>> +etc/pekwm/autoproperties_typerules
>
> this will need fixing up, we don't use /usr/local/etc, so pekwm will
> need to look in /etc for the files at runtime, but they will need to
> be packaged in share/examples/pekwm and @sample'd again.
Ah, forgot about that yet again...
Here's revised diff:
diff 0bd996c76c153b11b2bbd99e630395633220d98d /usr/ports
blob - 13d0876d3be258fe7eae3b4b84e55bd6be3fc822
file + x11/pekwm/Makefile
--- x11/pekwm/Makefile
+++ x11/pekwm/Makefile
@@ -1,9 +1,10 @@
+
# $OpenBSD: Makefile,v 1.37 2021/08/26 04:23:03 semarie Exp $
COMMENT= aewm++ based pretty themable window manager
DISTNAME= pekwm-${V}
-V= 0.1.18
+V= 0.2.0
CATEGORIES=x11
HOMEPAGE= https://www.pekwm.se/
@@ -14,27 +15,21 @@ MAINTAINER= Timo Myyra
PERMIT_PACKAGE=Yes
# uses pledge()
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv jpeg m png z
+WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
WANTLIB += ${COMPILER_LIBCXX}
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES= https://github.com/pekdon/pekwm/releases/download/release-${V}/
-LIB_DEPENDS= converters/libiconv \
- graphics/jpeg \
+LIB_DEPENDS= graphics/jpeg \
graphics/png
NO_TEST= Yes
-USE_GMAKE= Yes
+MODULES= devel/cmake
-CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=--enable-xinerama
+CONFIGURE_ARGS=-DCMAKE_INSTALL_SYSCONFDIR=${SYSCONFDIR}
-AUTOCONF_VERSION= 2.69
-
post-install:
@mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples
blob - 0387b2ddf3443fceafb537b1f05c0cd580d24bf5
file + x11/pekwm/distinfo
--- x11/pekwm/distinfo
+++ x11/pekwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.1.18.tar.gz) = e+zEO3nqsP91RXKFLjhUNSIkIDhRB8iBqTrE3ErpYGU=
-SIZE (pekwm-0.1.18.tar.gz) = 531611
+SHA256 (pekwm-0.2.0.tar.gz) = KFZVUN29JPsrdi8eA+CopGaEPcl6gxBlAYoFHnJAZR4=
+SIZE (pekwm-0.2.0.tar.gz) = 938147
blob - /dev/null
file + x11/pekwm/patches/patch-CMakeLists_txt
--- /dev/null
+++ x11/pekwm/patches/patch-CMakeLists_txt
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -65,6 +65,7 @@ int main() { std::stof(\"42.0\"); }
+ set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
+
+ # Look for platform specific methods
++check_function_exists(pledge PEKWM_HAVE_PLEDGE)
+ check_function_exists(setenv PEKWM_HAVE_SETENV)
+ check_function_exists(unsetenv PEKWM_HAVE_UNSETENV)
+ check_function_exists(daemon PEKWM_HAVE_DAEMON)
blob - 3c0effc1f264b5ebebe13e7699519889cb32d7b4
file + /dev/null
--- x11/pekwm/patches/patch-configure_ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: configure.ac
configure.ac.orig
-+++ configure.ac
-@@ -32,6 +32,9 @@ CXXFLAGS="$CXXFLAGS $INCICONV"
- dnl Check for iconvctl
- AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you
the iconvctl call])], )
-
-+dnl Check for pledge
-+AC_CHECK_FUNC(pledge, [AC_DEFINE(HAVE_PLEDGE, [1], [Define to 1 if you the
pledge call])], )
-+
- dnl add x11 to the env
- AC_PATH_X
- AC_PATH_XTRA
blob - 981137eb0312d193c741474d6fad409ed1b7aaaf
file + /dev/null
--- x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-data_scripts_pekwm_screenshot_sh,v 1.2 2021/08/26 04:23:03
[maintainer update] pekwm-0.2.0
Hi,
Here's an update for pekwm:
- build system changed to cmake
- libiconv no longer needed
Very lightly tested on amd64
Timo
diff 0bd996c76c153b11b2bbd99e630395633220d98d /usr/ports
blob - 13d0876d3be258fe7eae3b4b84e55bd6be3fc822
file + x11/pekwm/Makefile
--- x11/pekwm/Makefile
+++ x11/pekwm/Makefile
@@ -3,7 +3,7 @@
COMMENT= aewm++ based pretty themable window manager
DISTNAME= pekwm-${V}
-V= 0.1.18
+V= 0.2.0
CATEGORIES=x11
HOMEPAGE= https://www.pekwm.se/
@@ -14,28 +14,17 @@ MAINTAINER= Timo Myyra
PERMIT_PACKAGE=Yes
# uses pledge()
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv jpeg m png z
+WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
WANTLIB += ${COMPILER_LIBCXX}
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES= https://github.com/pekdon/pekwm/releases/download/release-${V}/
-LIB_DEPENDS= converters/libiconv \
- graphics/jpeg \
+LIB_DEPENDS= graphics/jpeg \
graphics/png
NO_TEST= Yes
-USE_GMAKE= Yes
+MODULES= devel/cmake
-CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=--enable-xinerama
-
-AUTOCONF_VERSION= 2.69
-
-post-install:
- @mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples
-
.include
blob - 0387b2ddf3443fceafb537b1f05c0cd580d24bf5
file + x11/pekwm/distinfo
--- x11/pekwm/distinfo
+++ x11/pekwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.1.18.tar.gz) = e+zEO3nqsP91RXKFLjhUNSIkIDhRB8iBqTrE3ErpYGU=
-SIZE (pekwm-0.1.18.tar.gz) = 531611
+SHA256 (pekwm-0.2.0.tar.gz) = KFZVUN29JPsrdi8eA+CopGaEPcl6gxBlAYoFHnJAZR4=
+SIZE (pekwm-0.2.0.tar.gz) = 938147
blob - /dev/null
file + x11/pekwm/patches/patch-CMakeLists_txt
--- /dev/null
+++ x11/pekwm/patches/patch-CMakeLists_txt
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -65,6 +65,7 @@ int main() { std::stof(\"42.0\"); }
+ set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
+
+ # Look for platform specific methods
++check_function_exists(pledge PEKWM_HAVE_PLEDGE)
+ check_function_exists(setenv PEKWM_HAVE_SETENV)
+ check_function_exists(unsetenv PEKWM_HAVE_UNSETENV)
+ check_function_exists(daemon PEKWM_HAVE_DAEMON)
blob - 3c0effc1f264b5ebebe13e7699519889cb32d7b4
file + /dev/null
--- x11/pekwm/patches/patch-configure_ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: configure.ac
configure.ac.orig
-+++ configure.ac
-@@ -32,6 +32,9 @@ CXXFLAGS="$CXXFLAGS $INCICONV"
- dnl Check for iconvctl
- AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you
the iconvctl call])], )
-
-+dnl Check for pledge
-+AC_CHECK_FUNC(pledge, [AC_DEFINE(HAVE_PLEDGE, [1], [Define to 1 if you the
pledge call])], )
-+
- dnl add x11 to the env
- AC_PATH_X
- AC_PATH_XTRA
blob - 981137eb0312d193c741474d6fad409ed1b7aaaf
file + /dev/null
--- x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-data_scripts_pekwm_screenshot_sh,v 1.2 2021/08/26 04:23:03
semarie Exp $
-
-Fix getopt: unknown option -- n
-
-Index: data/scripts/pekwm_screenshot.sh
data/scripts/pekwm_screenshot.sh.orig
-+++ data/scripts/pekwm_screenshot.sh
-@@ -151,6 +151,6 @@ main()
- exit 0
- }
-
--OPTIONS=$(getopt -o c:d:ho: -n 'pekwm_screenshot.sh' -- "$@")
-+OPTIONS=$(getopt c:d:ho: $*)
- main
-
blob - /dev/null
file + x11/pekwm/patches/patch-doc_CMakeLists_txt
--- /dev/null
+++ x11/pekwm/patches/patch-doc_CMakeLists_txt
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
doc/CMakeLists.txt
+@@ -13,4 +13,4 @@ endif (ENABLE_IMAGE_PNG AND PNG_FOUND)
+
+ install(FILES
+ ${manpages}
+- DESTINATION share/man/man1)
++ DESTINATION man/man1)
blob - e86f273afc1f6e892ee2d8ef874b51c3a8c4e0be
file + /dev/null
--- x11/pekwm/patches/patch-src_main_cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_main_cc,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: src/main.cc
src/main.cc.orig
-+++ src/main.cc
-@@ -127,6 +127,12 @@ main(int argc, char **argv)
- #endif // DEBUG
-
- WindowManager *wm = WindowManager::start(config_file, replace);
-+#if HAVE_PLEDGE
-+if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) {
-+cerr << "failed to pledge" << endl;
-+return 1;
-+}
-+#endif
-
- if (wm) {
- try {
blob - /dev/null
file + x11/pekwm/patches/patch-src_pekwm_wm_cc
--- /dev/null
+++ x11/pekwm/patches/patch-src_pekwm_wm_cc
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: src/pekwm_wm.cc
+--- src/pekwm_wm.cc.orig
src/pekwm_wm.cc
+@@ -21,7 +21,7 @@
+
+ extern "C" {
+ #include
+-#include // execlp
++#include // execlp,pledge
+ }
+
+ /**
+@@ -141,6 +141,14 @@ main(int argc, char **argv)
+ << "using
[maintainer update] yle-dl-20210808
Hi,
Here's an update to yle-dl to bring it to latest release.
Also noticed that yle-dl has not used py-progress in a while and neither
seems other ports so I think the devel/py-progress package can be
removed from ports as well.
Timo
diff 371b6764b2df6debf3627eb837d09e8179336ad8 /usr/ports
blob - 6885991441d99f057140de1e93b2c3975b7023d4
file + multimedia/yle-dl/Makefile
--- multimedia/yle-dl/Makefile
+++ multimedia/yle-dl/Makefile
@@ -2,7 +2,7 @@
GH_ACCOUNT = aajanki
GH_PROJECT = yle-dl
-GH_TAGNAME = 20210212
+GH_TAGNAME = 20210808
MODPY_EGG_VERSION =${GH_TAGNAME}
COMMENT = download videos from YLE Areena
blob - 78f619b2fc945df9c659c01b7d08fcf335aa4c8b
file + multimedia/yle-dl/distinfo
--- multimedia/yle-dl/distinfo
+++ multimedia/yle-dl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yle-dl-20210212.tar.gz) = CyqKcDTSGBvHFHadNcJYND0sl2EkSHfHXCDY7yG++24=
-SIZE (yle-dl-20210212.tar.gz) = 64609
+SHA256 (yle-dl-20210808.tar.gz) = iAnPitg+16xSyHPXRmz0L3vKYGlvHD5g6QM1PDgRQlk=
+SIZE (yle-dl-20210808.tar.gz) = 66360
Re: update: x11/pekwm to 0.1.18
Sebastien Marie [2021-08-25, 17:44 +0200]:
> On Wed, Aug 25, 2021 at 05:04:13PM +0200, Stefan Hagen wrote:
>
>> Sebastien Marie wrote:
>> > Here an update for x11/pekwm.
>> >
>> > Please note that www.pekwm.org is subtily squatted: see
>> > https://pekdon.pekwm.se/posts/pekwm-development-reboot/
>>
>> Wow, that's really bad. Sad, that such things happen.
>>
>> > This update has been only build tested: someone told me the version we
>> > had is old and HOMEPAGE was wrong. Some real test would be appreciate.
>> >
>> > Comments or OK ?
>>
>> Pekwm still works fine after this update. My own config works as well as
>> with no config (creates default config in ~/.pekwm).
>>
>> The diff applied cleanly, but the port patch stage failed. Your diff
>> left patch-src_ActionHandler_cc untouched, which didn't apply on the
>> updated version. Did you forget to add removed files to the diff?
>
> I have removed patches/patch-src_ActionHandler_cc and
> patches/patch-data_scripts_pekwm_screenshot_sh and omit to include the
> removal in the diff.
>
>> I attached a modified diff that I think is correct with some changes.
>>
>> Chanced patch-data_scripts_pekwm_screenshot_sh
>> It converted a perfectly fine shell script to a bash script.
>> The only issue I could see was getopt -n, which we don't
>> support. So I took the fix for this and dropped the bashism part.
>
> I missed to convert this patch. initially it didn't applied (due to
> shebang change), so I removed it and intented to look at reapply it
> after.
>
> I agree with your fix.
>
>> Removed patch-src_ActionHandler_cc
>> The upstream version looks fine now. This patch doesn't apply on
>> the updated version.
>
> Yes.
>
>> With or without the patch-data_scripts_pekwm_screenshot_sh changes but
>> with patch-src_ActionHandler_cc removed: LGTM.
>
> I will let Timo to ack before commiting.
>
> Thanks for your testing.
>
>
Looks good, quickly tested and seems to be working. The
patch-data_scripts_pekwm_screenshot_sh can be cleaned by me.
Good to know pekwm has a new home.
Timo
>> portcheck, lib-depends-check are happy.
>>
>> Best regards,
>> Stefan
>>
>> Index: x11/pekwm/Makefile
>> ===
>> RCS file: /cvs/ports/x11/pekwm/Makefile,v
>> retrieving revision 1.36
>> diff -u -p -u -p -r1.36 Makefile
>> --- x11/pekwm/Makefile 12 Jul 2019 20:51:19 - 1.36
>> +++ x11/pekwm/Makefile 25 Aug 2021 14:45:55 -
>> @@ -2,11 +2,11 @@
>>
>> COMMENT=aewm++ based pretty themable window manager
>>
>> -DISTNAME= pekwm-0.1.17
>> -REVISION= 4
>> +DISTNAME= pekwm-${V}
>> +V= 0.1.18
>> CATEGORIES= x11
>>
>> -HOMEPAGE= https://www.pekwm.org/
>> +HOMEPAGE= https://www.pekwm.se/
>>
>> MAINTAINER= Timo Myyra
>>
>> @@ -19,8 +19,7 @@ WANTLIB += ${COMPILER_LIBCXX}
>>
>> COMPILER = base-clang ports-gcc base-gcc
>>
>> -MASTER_SITES= ${HOMEPAGE}/files/
>> -EXTRACT_SUFX= .tar.bz2
>> +MASTER_SITES=
>> https://github.com/pekdon/pekwm/releases/download/release-${V}/
>> LIB_DEPENDS=converters/libiconv \
>> graphics/jpeg \
>> graphics/png
>> Index: x11/pekwm/distinfo
>> ===
>> RCS file: /cvs/ports/x11/pekwm/distinfo,v
>> retrieving revision 1.11
>> diff -u -p -u -p -r1.11 distinfo
>> --- x11/pekwm/distinfo 31 Oct 2016 17:07:30 - 1.11
>> +++ x11/pekwm/distinfo 25 Aug 2021 14:45:55 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (pekwm-0.1.17.tar.bz2) = ih/Tv5846Me7KyhkwJD5hrYM7CKB7PG7pGLRIPsyfQA=
>> -SIZE (pekwm-0.1.17.tar.bz2) = 405742
>> +SHA256 (pekwm-0.1.18.tar.gz) = e+zEO3nqsP91RXKFLjhUNSIkIDhRB8iBqTrE3ErpYGU=
>> +SIZE (pekwm-0.1.18.tar.gz) = 531611
>> Index: x11/pekwm/patches/patch-configure_ac
>> ===
>> RCS file: /cvs/ports/x11/pekwm/patches/patch-configure_ac,v
>> retrieving revision 1.1
>> diff -u -p -u -p -r1.1 patch-configure_ac
>> --- x11/pekwm/patches/patch-configure_ac 20 Dec 2017 17:22:37 -
>> 1.1
>> +++ x11/pekwm/patches/patch-configure_ac 25 Aug 2021 14:45:55 -
>> @@ -3,7 +3,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2017/
>> Index: configure.ac
>> --- configure.ac.orig
>> +++ configure.ac
>> -@@ -31,6 +31,9 @@ CXXFLAGS="$CXXFLAGS $INCICONV"
>> +@@ -32,6 +32,9 @@ CXXFLAGS="$CXXFLAGS $INCICONV"
>> dnl Check for iconvctl
>> AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you
>> the iconvctl call])], )
>>
>> Index: x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh
>> ===
>> RCS file:
>> /cvs/ports/x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh,v
>> retrieving revision 1.1
>> diff -u -p -u -p -r1.1 patch-data_scripts_pekwm_screenshot_sh
>> --- x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh 31 Oct 2016
Re: py-mini-amf / setuptools >=46
On Wed, Jul 21, 2021, at 16:49, Stuart Henderson wrote: > py-mini-amf fails with newer setuptools, there's a patch in git history > of gentoo to make it work, but I think it was only added for yle-dl which > no longer uses it. OK to remove it? > Ok by me. Timo
Re: [NEW] textproc/libvoikko
Stuart Henderson [2021-07-21, 10:48 +0100]: > On 2021/07/21 12:21, Timo Myyrä wrote: > >> Hi, >> >> I'm working on porting Voikko, a free linguistic software and data for >> Finnish for OpenBSD. >> >> Here's first attempt at textproc/libvoikko to get things rolling. >> >> Timo >> > > Here are some tweaks, > > - use GH_* > - a start at getting tests to do something > > Wondering about structure, seeing as other parts are in the same distfile > it might be better to start with textproc/voikko/libvoikko and put shared > pieces in textproc/voikko/Makefile.inc, it's easier to do that from the > start rather than have to fiddle with @pkgpath markers Ok, here's first stab at the voikko directory structure and using the GH_* variables. I didn't have time to look at fixing the tests yet. I'll look at fixing those next, probably tomorrow. Timo voikko.tar.gz Description: Binary data
[NEW] textproc/libvoikko
Hi, I'm working on porting Voikko, a free linguistic software and data for Finnish for OpenBSD. Here's first attempt at textproc/libvoikko to get things rolling. Timo libvoikko.tar.gz Description: Binary data
Re: [update] emacs-27.2
Jeremie Courreges-Anglas [2021-04-03, 21:26 +0200]:
> Update to emacs-27.2, a bugfix only release, except maybe for an update
> of Org Mode. The fix for GTK+3 from yazuoka@ has been merged.
>
> Since emacs-27 doesn't play linking games any more, closs-platform
> tests are less relevant (but still welcome). And since release is
> approaching I'd prefer to get confirmations that it doesn't break your
> setup.
>
> oks welcome too.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.97
> diff -u -p -r1.97 Makefile
> --- Makefile 28 Feb 2021 10:47:09 - 1.97
> +++ Makefile 3 Apr 2021 17:00:32 -
> @@ -2,8 +2,7 @@
>
> COMMENT= GNU editor: extensible, customizable, self-documenting
>
> -VERSION= 27.1
> -REVISION=0
> +VERSION= 27.2
> DISTNAME=emacs-${VERSION}
>
> CATEGORIES= editors
> Index: distinfo
> ===
> RCS file: /cvs/ports/editors/emacs/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo 23 Aug 2020 09:55:00 - 1.14
> +++ distinfo 3 Apr 2021 17:00:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (emacs-27.1.tar.xz) = SkwSj5FfyTfWHt/Cc8mBBnEbVAyb481dLiubWy8XLkE=
> -SIZE (emacs-27.1.tar.xz) = 43752012
> +SHA256 (emacs-27.2.tar.xz) = tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=
> +SIZE (emacs-27.2.tar.xz) = 44624480
> Index: patches/patch-src_gtkutil_c
> ===
> RCS file: patches/patch-src_gtkutil_c
> diff -N patches/patch-src_gtkutil_c
> --- patches/patch-src_gtkutil_c 28 Feb 2021 10:47:09 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,51 +0,0 @@
> -$OpenBSD: patch-src_gtkutil_c,v 1.1 2021/02/28 10:47:09 yasuoka Exp $
> -
> -Avoid crashes in Mew due to corrupted tool-bar label
> -https://debbugs.gnu.org/cgi/bugreport.cgi?bug=46791
> -
> -Index: src/gtkutil.c
> src/gtkutil.c.orig
> -+++ src/gtkutil.c
> -@@ -5019,11 +5019,10 @@ update_frame_tool_bar (struct frame *f)
> - GtkWidget *wbutton = NULL;
> - Lisp_Object specified_file;
> - bool vert_only = ! NILP (PROP (TOOL_BAR_ITEM_VERT_ONLY));
> -- const char *label
> --= (EQ (style, Qimage) || (vert_only && horiz)) ? NULL
> --: STRINGP (PROP (TOOL_BAR_ITEM_LABEL))
> --? SSDATA (PROP (TOOL_BAR_ITEM_LABEL))
> --: "";
> -+ Lisp_Object label
> -+= (EQ (style, Qimage) || (vert_only && horiz))
> -+? Qnil
> -+: PROP (TOOL_BAR_ITEM_LABEL);
> -
> - ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), j);
> -
> -@@ -5136,8 +5135,11 @@ update_frame_tool_bar (struct frame *f)
> -
> - /* If there is an existing widget, check if it's stale; if so,
> - remove it and make a new tool item from scratch. */
> -- if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name,
> -- img, label, horiz))
> -+ if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name, img,
> -+ NILP (label)
> -+ ? NULL
> -+ : STRINGP (label) ? SSDATA (label) : "",
> -+ horiz))
> - {
> - gtk_container_remove (GTK_CONTAINER (wtoolbar),
> - GTK_WIDGET (ti));
> -@@ -5194,7 +5196,11 @@ update_frame_tool_bar (struct frame *f)
> - #else
> - if (w) gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
> - #endif
> -- ti = xg_make_tool_item (f, w, , label, i, horiz,
> text_image);
> -+ ti = xg_make_tool_item (f, w, ,
> -+ NILP (label)
> -+ ? NULL
> -+ : STRINGP (label) ? SSDATA (label) : "",
> -+ i, horiz, text_image);
> - gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, j);
> - }
> -
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
> retrieving revision 1.25
> diff -u -p -r1.25 PLIST
> --- pkg/PLIST 23 Aug 2020 09:55:01 - 1.25
> +++ pkg/PLIST 3 Apr 2021 17:00:32 -
> @@ -1026,6 +1026,7 @@ share/emacs/${VERSION}/etc/tutorials/TUT
> share/emacs/${VERSION}/etc/tutorials/TUTORIAL.th
> share/emacs/${VERSION}/etc/tutorials/TUTORIAL.translators
> share/emacs/${VERSION}/etc/tutorials/TUTORIAL.zh
> +share/emacs/${VERSION}/etc/w32-feature.el
> share/emacs/${VERSION}/etc/yow.lines
> share/emacs/${VERSION}/lisp/
> share/emacs/${VERSION}/lisp/COPYING
> @@ -3346,6 +3347,8 @@ share/emacs/${VERSION}/lisp/org/org-plot
> share/emacs/${VERSION}/lisp/org/org-plot.elc
> share/emacs/${VERSION}/lisp/org/org-protocol.el.gz
> share/emacs/${VERSION}/lisp/org/org-protocol.elc
>
[maintainer update] yle-dl-20210212
Hi,
Here's a bump to yle-dl port.
- drop py-future dependency (requires python 3.5+)
- drop py-mini-amf ( not used by this )
Tests pass and test download from areena worked.
After this is in the converters/py-mini-amf port can be removed.
timo
Index: Makefile
===
RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile7 Jul 2020 13:01:45 - 1.27
+++ Makefile20 Feb 2021 07:30:27 -
@@ -2,7 +2,7 @@
GH_ACCOUNT = aajanki
GH_PROJECT = yle-dl
-GH_TAGNAME = 20200628
+GH_TAGNAME = 20210212
MODPY_EGG_VERSION =${GH_TAGNAME}
COMMENT = download videos from YLE Areena
@@ -23,12 +23,10 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION
RUN_DEPENDS = devel/py-attrs${MODPY_FLAVOR} \
devel/py-configargparse${MODPY_FLAVOR} \
- devel/py-future${MODPY_FLAVOR} \
graphics/ffmpeg \
www/py-requests${MODPY_FLAVOR} \
net/wget \
textproc/py-lxml${MODPY_FLAVOR} \
- converters/py-mini-amf${MODPY_FLAVOR}
TEST_DEPENDS = devel/py-test-runner${MODPY_FLAVOR}
Index: distinfo
===
RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo7 Jul 2020 13:01:45 - 1.15
+++ distinfo20 Feb 2021 07:30:27 -
@@ -1,2 +1,2 @@
-SHA256 (yle-dl-20200628.tar.gz) = S47xMLgLC8/pU9Vq72QPCSJ+bmRIYQTFO8j1r3lhXp8=
-SIZE (yle-dl-20200628.tar.gz) = 61748
+SHA256 (yle-dl-20210212.tar.gz) = CyqKcDTSGBvHFHadNcJYND0sl2EkSHfHXCDY7yG++24=
+SIZE (yle-dl-20210212.tar.gz) = 64609
Index: pkg/PLIST
===
RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 7 Jul 2020 13:01:45 - 1.9
+++ pkg/PLIST 20 Feb 2021 07:30:27 -
@@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST,v 1.9 2020/07/07 13:01:45 kn Exp $
bin/yle-dl
-lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/yledl/
lib/python${MODPY_VERSION}/site-packages/yledl/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}/
Re: Icewm update 2.1.0
John Batteen [2021-01-22, 18:52 -0600]:
> Hi ports,
>
> IceWM has released 2.1.0 to fix a bug introduced in 2.0.0, related to going
> from a maximized window to fullscreen and back again. Making the new port
> myself is beyond my abilities, sorry.
>
> Thanks for making a great operating system.
>
> John
Here's an patch for icewm, very lightly tested on amd64 so far. More
tests welcome.
timo
Index: Makefile
===
RCS file: /cvs/ports/x11/icewm/Makefile,v
retrieving revision 1.77
diff -u -p -u -p -r1.77 Makefile
--- Makefile29 Dec 2020 10:47:00 - 1.77
+++ Makefile23 Jan 2021 06:49:03 -
@@ -3,7 +3,7 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS=${APM_ARCHS}
-V= 2.0.0
+V= 2.1.0
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
Index: distinfo
===
RCS file: /cvs/ports/x11/icewm/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo29 Dec 2020 10:47:00 - 1.26
+++ distinfo23 Jan 2021 06:49:03 -
@@ -1,2 +1,2 @@
-SHA256 (icewm-2.0.0.tar.lz) = RHgXK5Nvf33PwhIL6NjxU/11WTO/mLjpjj6uUMQUk5w=
-SIZE (icewm-2.0.0.tar.lz) = 1694653
+SHA256 (icewm-2.1.0.tar.lz) = 6d4xXkb67Ic3mmC3LuXy2UBEF/yIhJ5XI195GnikC0o=
+SIZE (icewm-2.1.0.tar.lz) = 1696214
Re: [update] icewm-2.0.0
Charlene Wendling [2020-12-21, 15:11 +0100]:
> On Sat, 19 Dec 2020 16:09:50 +0200
> Timo Myyrä wrote:
>
>> Charlene Wendling [2020-12-12, 13:37 +0100]:
>>
>> > Hi,
>> >
>> > On Sat, 05 Dec 2020 09:25:26 +0200
>> > Timo Myyrä wrote:
>> >
>> >> Hi,
>> >>
>> >> This updates icewm to latest release, works for me on amd64.
>> >>
>> >> timo
>> >
>> > I've tested it successfully on macppc and amd64. OK cwen@
>> >
>
>>
>> Icewm had new release since, here's updated diff.
>> This version changes the default image rendering library from
>> gdb-pixbuf-xlib to Imlib2 so I changed the port as well to use Imlib2.
>
> I think it's great to do it right now so we won't have any problem
> later (gdk-pixbuf-xlib has been deprecated and archived by GNOME [0]).
>
>> Works for me on amd64.
>>
>> timo
>>
>
> Looks like gdk-pixbuf-xlib used to pull some libraries that are now
> missing; in an empty chroot i get:
>
> Missing library for gio-2.0>=0.0
> Missing library for glib-2.0>=0.0
> Missing library for gmodule-2.0>=0.0
> Missing library for gobject-2.0>=0.0
> Missing library for pcre>=0.0
>
> port-lib-depends-check was not happy and asked for more LIB_DEPENDS
> as well:
>
> icewm-2.0.0(x11/icewm):
> Missing lib: cairo.13 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: gdk_pixbuf-2.0.3200 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: harfbuzz.15 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: pango-1.0.3801 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: pangocairo-1.0.3801 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: pangoft2-1.0.3801 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: rsvg-2.38 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: xml2.16 (/usr/local/bin/icewmbg) (NOT REACHABLE)
>
> I added them all explicitly; we could reduce the number of
> LIB_DEPENDS lines by playing with implicit dependencies (like
> gdk_pixbuf-2.0.3200 pulling xml2.16). But as seen by this update, it's
> a dangerous game to play.
>
> I've modified your diff below.
>
> This builds and works fine on amd64 and macppc, i've tested a number
> of themes, and met no issues with standard themes. Other themes may
> have a titlebar buttons issue, with the leftmost icon on the right
> side being slightly mangled.
>
> Charlène.
>
>
> [0] https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/icewm/Makefile,v
> retrieving revision 1.76
> diff -u -p -u -p -r1.76 Makefile
> --- Makefile 11 Nov 2020 09:51:46 - 1.76
> +++ Makefile 21 Dec 2020 13:54:44 -
> @@ -3,23 +3,25 @@
> # unconditionally uses machine/apmvar.h and related structures/defines
> ONLY_FOR_ARCHS= ${APM_ARCHS}
>
> -V= 1.8.3
> +V= 2.0.0
> COMMENT= small and fast window manager
> DISTNAME=icewm-${V}
> EXTRACT_SUFX=.tar.lz
> CATEGORIES= x11
> -REVISION=0
>
> HOMEPAGE=https://ice-wm.org/
>
> # LGPLv2 only
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xcomposite Xdamage
> -WANTLIB += Xext Xfixes Xft Xinerama Xpm Xrandr Xrender ao c expat
> -WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0
> -WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv intl
> -WANTLIB += m ogg pcre sndfile vorbis vorbisenc xcb z
> +WANTLIB += ${COMPILER_LIBCXX} FLAC ICE Imlib2 SM X11 Xcomposite
> +WANTLIB += Xdamage Xext Xfixes Xft Xinerama Xpm Xrandr Xrender
> +WANTLIB += ao c cairo cairo-gobject expat ffi fontconfig freetype
> +WANTLIB += fribidi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
> +WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m ogg pango-1.0
> +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png rsvg-2
> +WANTLIB += sndfile vorbis vorbisenc xcb xcb-render xcb-shm xml2
> +WANTLIB += z
>
> COMPILER=base-clang ports-gcc base-gcc
>
> @@ -31,7 +33,15 @@ BUILD_DEPENDS= devel/gettext,-tools \
> LIB_DEPENDS= audio/libao \
> audio/libsndfile \
> devel/fribidi \
> - graphics/gdk-pixbuf-xlib
> + devel/glib2 \
> + devel/harfbuzz \
> + devel/pango \
> + devel/pcre \
> + graphics/cairo \
> + graphics/gdk-pixbuf2 \
> + graphics/imlib2 \
> + textproc/libxml,-main \
> + x11/gnome/librsvg
>
> RUN_DEPENDS= devel/desktop-file-u
Re: [update] icewm-1.9.3
Charlene Wendling [2020-12-12, 13:37 +0100]:
> Hi,
>
> On Sat, 05 Dec 2020 09:25:26 +0200
> Timo Myyrä wrote:
>
>> Hi,
>>
>> This updates icewm to latest release, works for me on amd64.
>>
>> timo
>
> I've tested it successfully on macppc and amd64. OK cwen@
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/x11/icewm/Makefile,v
>> retrieving revision 1.76
>> diff -u -p -u -p -r1.76 Makefile
>> --- Makefile 11 Nov 2020 09:51:46 - 1.76
>> +++ Makefile 5 Dec 2020 07:20:53 -
>> @@ -3,12 +3,11 @@
>> # unconditionally uses machine/apmvar.h and related
>> # structures/defines
>> ONLY_FOR_ARCHS= ${APM_ARCHS}
>>
>> -V= 1.8.3
>> +V= 1.9.2
>> COMMENT=small and fast window manager
>> DISTNAME= icewm-${V}
>> EXTRACT_SUFX= .tar.lz
>> CATEGORIES= x11
>> -REVISION= 0
>>
>> HOMEPAGE= https://ice-wm.org/
>>
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/x11/icewm/distinfo,v
>> retrieving revision 1.25
>> diff -u -p -u -p -r1.25 distinfo
>> --- distinfo 22 Sep 2020 12:02:31 - 1.25
>> +++ distinfo 5 Dec 2020 07:20:53 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (icewm-1.8.3.tar.lz) =
>> N7FR+Zd6AgzefrsjQZYcuWwJVMUgn8/RFRz2kHRvf9M= -SIZE
>> (icewm-1.8.3.tar.lz) = 1686603 +SHA256 (icewm-1.9.2.tar.lz) =
>> cTvXhJ+fuoM4vrJ4yUwWpq5hDefnGHB+GaM0Qp8XID8= +SIZE
>> (icewm-1.9.2.tar.lz) = 1694602 Index: pkg/PLIST
>> ===
>> RCS file: /cvs/ports/x11/icewm/pkg/PLIST,v
>> retrieving revision 1.23
>> diff -u -p -u -p -r1.23 PLIST
>> --- pkg/PLIST22 Sep 2020 12:02:32 - 1.23
>> +++ pkg/PLIST5 Dec 2020 07:20:53 -
>> @@ -125,10 +125,18 @@ share/icewm/icons/run_16x16.xpm
>> share/icewm/icons/run_32x32.xpm
>> share/icewm/icons/save_16x16.png
>> share/icewm/icons/save_32x32.png
>> +share/icewm/icons/setscreen12_32x32.png
>> +share/icewm/icons/setscreen12x_32x32.png
>> +share/icewm/icons/setscreen1_32x32.png
>> +share/icewm/icons/setscreen21_32x32.png
>> +share/icewm/icons/setscreen21x_32x32.png
>> +share/icewm/icons/setscreen2_32x32.png
>> share/icewm/icons/settings_16x16.xpm
>> share/icewm/icons/settings_32x32.xpm
>> share/icewm/icons/shutdown_16x16.xpm
>> share/icewm/icons/shutdown_32x32.xpm
>> +share/icewm/icons/suspend_16x16.xpm
>> +share/icewm/icons/suspend_32x32.xpm
>> share/icewm/icons/themes_16x16.xpm
>> share/icewm/icons/themes_32x32.xpm
>> share/icewm/icons/vim_16x16.xpm
>>
Icewm had new release since, here's updated diff.
This version changes the default image rendering library from
gdb-pixbuf-xlib to Imlib2 so I changed the port as well to use Imlib2.
Works for me on amd64.
timo
Index: Makefile
===
RCS file: /cvs/ports/x11/icewm/Makefile,v
retrieving revision 1.76
diff -u -p -u -p -r1.76 Makefile
--- Makefile11 Nov 2020 09:51:46 - 1.76
+++ Makefile19 Dec 2020 14:07:22 -
@@ -3,23 +3,24 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS=${APM_ARCHS}
-V= 1.8.3
+V= 2.0.0
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
CATEGORIES=x11
-REVISION= 0
HOMEPAGE= https://ice-wm.org/
# LGPLv2 only
PERMIT_PACKAGE=Yes
-WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xcomposite Xdamage
-WANTLIB += Xext Xfixes Xft Xinerama Xpm Xrandr Xrender ao c expat
-WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv intl
-WANTLIB += m ogg pcre sndfile vorbis vorbisenc xcb z
+WANTLIB += ${COMPILER_LIBCXX} FLAC ICE Imlib2 SM X11 Xcomposite
+WANTLIB += Xdamage Xext Xfixes Xft Xinerama Xpm Xrandr Xrender
+WANTLIB += ao c expat ffi fontconfig freetype fribidi gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 iconv intl lzma m
+WANTLIB += ogg pcre pixman-1 png sndfile vorbis vorbisenc xcb
+WANTLIB += xcb-render xcb-shm z
+
COMPILER= base-clang ports-gcc base-gcc
@@ -31,7 +32,7 @@ BUILD_DEPENDS=devel/gettext,-tools \
LIB_DEPENDS= audio/libao \
audio/libsndfile \
devel/fribidi \
- graphics/gdk-pixbuf-xlib
+ graphics/imlib2
RUN_DEPENDS= devel/desktop-file-utils
Index: distinfo
===
RCS fi
[maintainer update] stumpwm-20.11
Hi,
StumpWM got new release, seems to be working on my amd64.
Added MAKE_FLAGS option to port as otherwise the build didn't update the
used makeinfo command.
Timo
Index: Makefile
===
RCS file: /cvs/ports/x11/stumpwm/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile20 Dec 2019 08:45:07 - 1.6
+++ Makefile5 Dec 2020 07:29:03 -
@@ -2,7 +2,7 @@
COMMENT= easily hackable Common LISP window manager
-VERSION= 19.11
+VERSION= 20.11
DISTNAME= stumpwm-${VERSION}
CATEGORIES=x11
@@ -35,6 +35,8 @@ CONFIGURE_STYLE= autoconf no-autoheader
USE_GMAKE= yes
MAKE_ENV= MAKEINFO=${PREFIX}/bin/gmakeinfo \
ASDF_OUTPUT_TRANSLATIONS=/:
+
+MAKE_FLAGS='-e'
DESTDIRNAME= destdir
NO_TEST= yes
Index: distinfo
===
RCS file: /cvs/ports/x11/stumpwm/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo20 Dec 2019 08:45:07 - 1.4
+++ distinfo5 Dec 2020 07:29:03 -
@@ -1,8 +1,8 @@
SHA256 (alexandria-20190710-git.tgz) =
4GQr1vivjrceM1m0XhGhNfo8mlEUkrydu80Q7H1pRwQ=
SHA256 (cl-ppcre-2.1.1.tar.gz) = iWMRebcWSNnmxWWpKPaJap1XQqogg7nBtwX+C0XYXe8=
SHA256 (clx-20190813-git.tgz) = qrn8jYEnnT1Dxh748Dn8rj31jbwzUzDrb4gORwVuE98=
-SHA256 (stumpwm-19.11.tar.gz) = shsClNZkNxtASwYb4QBVKJyrShPm1Q7wOF19ibFL8+8=
+SHA256 (stumpwm-20.11.tar.gz) = jJqqua18vDXnBcCF6GYbINiLhOdQ97GFnmWosvGtViw=
SIZE (alexandria-20190710-git.tgz) = 53436
SIZE (cl-ppcre-2.1.1.tar.gz) = 159055
SIZE (clx-20190813-git.tgz) = 460647
-SIZE (stumpwm-19.11.tar.gz) = 214705
+SIZE (stumpwm-20.11.tar.gz) = 219590
[update] icewm-1.9.3
Hi,
This updates icewm to latest release, works for me on amd64.
timo
Index: Makefile
===
RCS file: /cvs/ports/x11/icewm/Makefile,v
retrieving revision 1.76
diff -u -p -u -p -r1.76 Makefile
--- Makefile11 Nov 2020 09:51:46 - 1.76
+++ Makefile5 Dec 2020 07:20:53 -
@@ -3,12 +3,11 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS=${APM_ARCHS}
-V= 1.8.3
+V= 1.9.2
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
CATEGORIES=x11
-REVISION= 0
HOMEPAGE= https://ice-wm.org/
Index: distinfo
===
RCS file: /cvs/ports/x11/icewm/distinfo,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 distinfo
--- distinfo22 Sep 2020 12:02:31 - 1.25
+++ distinfo5 Dec 2020 07:20:53 -
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.8.3.tar.lz) = N7FR+Zd6AgzefrsjQZYcuWwJVMUgn8/RFRz2kHRvf9M=
-SIZE (icewm-1.8.3.tar.lz) = 1686603
+SHA256 (icewm-1.9.2.tar.lz) = cTvXhJ+fuoM4vrJ4yUwWpq5hDefnGHB+GaM0Qp8XID8=
+SIZE (icewm-1.9.2.tar.lz) = 1694602
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/icewm/pkg/PLIST,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 PLIST
--- pkg/PLIST 22 Sep 2020 12:02:32 - 1.23
+++ pkg/PLIST 5 Dec 2020 07:20:53 -
@@ -125,10 +125,18 @@ share/icewm/icons/run_16x16.xpm
share/icewm/icons/run_32x32.xpm
share/icewm/icons/save_16x16.png
share/icewm/icons/save_32x32.png
+share/icewm/icons/setscreen12_32x32.png
+share/icewm/icons/setscreen12x_32x32.png
+share/icewm/icons/setscreen1_32x32.png
+share/icewm/icons/setscreen21_32x32.png
+share/icewm/icons/setscreen21x_32x32.png
+share/icewm/icons/setscreen2_32x32.png
share/icewm/icons/settings_16x16.xpm
share/icewm/icons/settings_32x32.xpm
share/icewm/icons/shutdown_16x16.xpm
share/icewm/icons/shutdown_32x32.xpm
+share/icewm/icons/suspend_16x16.xpm
+share/icewm/icons/suspend_32x32.xpm
share/icewm/icons/themes_16x16.xpm
share/icewm/icons/themes_32x32.xpm
share/icewm/icons/vim_16x16.xpm
[maintainer update] gerbil-0.16
Hi, Heres regenerated diff to update gerbil to latest release: - R7RS Tangerine, Polydactyl Gerbil, Class Sealing and more. - Overhauled std/make library and parallelized builds. - Configure and install scripts. - Overhauled documentation, with a beautiful new logo! - A new Gitter chat room at https://gitter.im/gerbil-scheme/community Incompatibilities: - std/iter:in-range has been renamed to in-iota, with a new in-range compatible with Racket See the full CHANGELOG in https://github.com/vyzo/gerbil/blob/master/CHANGELOG.md Timo Index: Makefile === RCS file: /cvs/ports/lang/gerbil/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- Makefile4 Nov 2020 18:46:01 - 1.11 +++ Makefile5 Nov 2020 18:44:04 - @@ -9,8 +9,7 @@ COMMENT = dialect of Scheme designed for GH_ACCOUNT = vyzo GH_PROJECT = gerbil -GH_TAGNAME = v0.15.1 -REVISION = 0 +GH_TAGNAME = v0.16 CATEGORIES = lang Index: distinfo === RCS file: /cvs/ports/lang/gerbil/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo10 Feb 2019 18:01:30 - 1.3 +++ distinfo5 Nov 2020 18:44:04 - @@ -1,2 +1,2 @@ -SHA256 (gerbil-0.15.1.tar.gz) = PSnuzaqEWwc7+EE81U5CCz9Ix5wl5D+rWjed3gKdDN4= -SIZE (gerbil-0.15.1.tar.gz) = 1326871 +SHA256 (gerbil-0.16.tar.gz) = EVfU72DatqD3xJhtXJODkZcwRQk8RwoD/+AiZsTT4Rk= +SIZE (gerbil-0.16.tar.gz) = 1715765 Index: patches/patch-src_tools_gxtags_ss === RCS file: patches/patch-src_tools_gxtags_ss diff -N patches/patch-src_tools_gxtags_ss --- patches/patch-src_tools_gxtags_ss 4 Nov 2020 18:46:01 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_tools_gxtags_ss,v 1.1 2020/11/04 18:46:01 jasper Exp $ - -https://github.com/vyzo/gerbil/commit/64968c943ac2a1900e9e19643c0e619d80ee108e - -Index: src/tools/gxtags.ss src/tools/gxtags.ss.orig -+++ src/tools/gxtags.ss -@@ -241,8 +241,10 @@ - (lp (fx1+ i) offs - - (def (source-location-line locat) -- (let (filepos (##position->filepos (##locat-position locat))) --(fx1+ (##filepos-line filepos -+ (if (##locat? locat) -+(let (filepos (##position->filepos (##locat-position locat))) -+ (fx1+ (##filepos-line filepos))) -+1)) - - (def (try-import-module filename) - (try Index: pkg/PLIST === RCS file: /cvs/ports/lang/gerbil/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- pkg/PLIST 10 Feb 2019 18:01:30 - 1.3 +++ pkg/PLIST 5 Nov 2020 18:44:04 - @@ -5,6 +5,7 @@ gerbil/LICENSE-APACHE-2.0.txt gerbil/LICENSE-LGPL.txt gerbil/README.md gerbil/bin/ +gerbil/bin/.keep gerbil/bin/gxc gerbil/bin/gxi gerbil/bin/gxi-build-script @@ -15,7 +16,16 @@ gerbil/bin/gxi-script gerbil/doc/ gerbil/doc/.vuepress/ gerbil/doc/.vuepress/config.js -gerbil/doc/.vuepress/style.styl +gerbil/doc/.vuepress/public/ +gerbil/doc/.vuepress/public/img/ +gerbil/doc/.vuepress/public/img/gerbil-detailed-consio_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-detailed_INK.svg +gerbil/doc/.vuepress/public/img/gerbil-detailed_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored-consio_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored_INK.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored_OPT.svg +gerbil/doc/.vuepress/styles/ +gerbil/doc/.vuepress/styles/index.styl gerbil/doc/build.sh gerbil/doc/guide/ gerbil/doc/guide/README.md @@ -32,6 +42,7 @@ gerbil/doc/guide/profiler.md gerbil/doc/guide/r7rs.md gerbil/doc/guide/shell.md gerbil/doc/guide/srfi.md +gerbil/doc/package-lock.json gerbil/doc/package.json gerbil/doc/readme.md gerbil/doc/reference/ @@ -70,6 +81,7 @@ gerbil/doc/reference/sort.md gerbil/doc/reference/srfi.md gerbil/doc/reference/stdlib.md gerbil/doc/reference/stxparam.md +gerbil/doc/reference/stxutil.md gerbil/doc/reference/sugar.md gerbil/doc/reference/test.md gerbil/doc/reference/text.md @@ -82,6 +94,7 @@ gerbil/doc/tutorials/kvstore.md gerbil/doc/tutorials/languages.md gerbil/doc/tutorials/proxy.md gerbil/lib/ +gerbil/lib/.keep gerbil/lib/gerbil/ gerbil/lib/gerbil/compiler/ gerbil/lib/gerbil/compiler.ssi @@ -113,6 +126,10 @@ gerbil/lib/gerbil/compiler/optimize-call gerbil/lib/gerbil/compiler/optimize-call.ssxi.ss @bin gerbil/lib/gerbil/compiler/optimize-call__0.o1 @bin gerbil/lib/gerbil/compiler/optimize-call__rt.o1 +gerbil/lib/gerbil/compiler/optimize-spec.ssi +gerbil/lib/gerbil/compiler/optimize-spec.ssxi.ss +@bin gerbil/lib/gerbil/compiler/optimize-spec__0.o1 +@bin gerbil/lib/gerbil/compiler/optimize-spec__rt.o1 gerbil/lib/gerbil/compiler/optimize-top.ssi gerbil/lib/gerbil/compiler/optimize-top.ssxi.ss @bin gerbil/lib/gerbil/compiler/optimize-top__0.o1 @@ -266,6 +283,11 @@
[maintainer update] abcl-1.8.0
Hi,
ABCL got a new release recently, list of changes can be read:
https://abcl.org/svn/tags/1.8.0/CHANGES
Here's pretty straightforward update, seems to work on amd64.
timo
Index: Makefile
===
RCS file: /cvs/ports/lang/abcl/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile2 Oct 2020 19:16:53 - 1.19
+++ Makefile31 Oct 2020 13:05:18 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.19 2020/10/02 19:16:53 solene Exp $
COMMENT = Common Lisp dialect for the Java Virtual Machine
-V =1.7.1
+V =1.8.0
DISTNAME = abcl-src-${V}
PKGNAME = abcl-${V}
PKG_ARCH = *
Index: distinfo
===
RCS file: /cvs/ports/lang/abcl/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo2 Oct 2020 19:16:53 - 1.9
+++ distinfo31 Oct 2020 13:05:18 -
@@ -1,2 +1,2 @@
-SHA256 (abcl-src-1.7.1.tar.gz) = 1RAUsr5uy1vKqs2grfRgepld1Lbp5QnIofWpmLdkkic=
-SIZE (abcl-src-1.7.1.tar.gz) = 2557628
+SHA256 (abcl-src-1.8.0.tar.gz) = HYce4va8+ZHVpu/36lEF74CGENuIJgTU3wQR6XGtJX8=
+SIZE (abcl-src-1.8.0.tar.gz) = 2613411
Index: files/abcl_completions
===
RCS file: /cvs/ports/lang/abcl/files/abcl_completions,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 abcl_completions
--- files/abcl_completions 7 Jul 2020 12:05:58 - 1.6
+++ files/abcl_completions 31 Oct 2020 13:05:18 -
@@ -2,7 +2,6 @@
%cadr
%car
%cdr
-%invalidate-namestring
%make-dialog-prompt-stream
%socket-address
%socket-port
@@ -1637,6 +1636,7 @@ mop:find-generic-function
mop:find-method-combination
mop:find-slot-definition
mop:fixup-standard-class-hierarchy
+mop:flet-call-next-method
mop:funcallable-instance-function
mop:funcallable-standard-instance-access
mop:generate-emf-lambda
@@ -2389,6 +2389,7 @@ system:choose-disassembler
system:circle-subst
system:class-bytes
system:class-resource-path
+system:clear-zip-cache
system:coerce-error
system:coerce-list-to-vector
system:coerce-object-to-and-type
@@ -2485,6 +2486,7 @@ system:digest
system:digest-nio
system:digest-path
system:dimension-subtypep
+system:directory-as-file
system:directory-match-components
system:directory-match-p
system:disable-zip-cache
@@ -2513,7 +2515,6 @@ system:dump-uninterned-symbol-index
system:dump-vector
system:empty-environment-p
system:ensure-available-symbols
-system:ensure-input-stream
system:enumerate-resource-directories
system:environment-add-function-definition
system:environment-add-macro-definition
@@ -2588,6 +2589,7 @@ system:get-cached-emf
system:get-fasl-function
system:get-fasl-readtable
system:get-function-info-value
+system:get-input-stream
system:get-instance-form
system:get-loaded-from
system:get-memory-function
@@ -2763,7 +2765,7 @@ system:normal-mumble-delete-from-end
system:normal-mumble-remove
system:normal-mumble-remove-from-end
system:normalize-type
-system:not-java-6
+system:not-java-6-p
system:note-name-defined
system:note-toplevel-form
system:notinline-p
@@ -2794,11 +2796,11 @@ system:parse-keyword-pairs
system:parse-lambda-list
system:parse-lambda-list-like-thing
system:parse-name-and-options
-system:pathname-as-file
system:pathname-directory-p
system:pick-obvious-year
system:pick-result-array
system:populate-zip-fasl
+system:pre-java-11-p
system:precompile-package
system:precompile-toplevel-form
system:predicate-for-type
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/abcl/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 7 Jul 2020 12:05:58 - 1.6
+++ pkg/PLIST 31 Oct 2020 13:05:18 -
@@ -45,12 +45,14 @@ abcl/src/org/armedbear/lisp/CompiledPrim
abcl/src/org/armedbear/lisp/Complex.java
abcl/src/org/armedbear/lisp/ComplexArray.java
abcl/src/org/armedbear/lisp/ComplexArray_ByteBuffer.java
+abcl/src/org/armedbear/lisp/ComplexArray_IntBuffer.java
abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte32.java
abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte8.java
abcl/src/org/armedbear/lisp/ComplexBitVector.java
abcl/src/org/armedbear/lisp/ComplexString.java
abcl/src/org/armedbear/lisp/ComplexVector.java
abcl/src/org/armedbear/lisp/ComplexVector_ByteBuffer.java
+abcl/src/org/armedbear/lisp/ComplexVector_IntBuffer.java
abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte32.java
abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte8.java
abcl/src/org/armedbear/lisp/ConcatenatedStream.java
@@ -94,6 +96,7 @@ abcl/src/org/armedbear/lisp/IntegrityErr
abcl/src/org/armedbear/lisp/Interpreter.java
abcl/src/org/armedbear/lisp/JHandler.java
abcl/src/org/armedbear/lisp/JProxy.java
+abcl/src/org/armedbear/lisp/JarPathname.java
[maintainer update] gerbil-0.16
Hi, Re-sending gerbil update, still looking for i386 test for this. timo Index: Makefile === RCS file: /cvs/ports/lang/gerbil/Makefile,v retrieving revision 1.10 diff -u -p -u -p -r1.10 Makefile --- Makefile19 Aug 2020 11:28:29 - 1.10 +++ Makefile25 Sep 2020 03:55:35 - @@ -10,7 +10,7 @@ COMMENT = dialect of Scheme designed for GH_ACCOUNT = vyzo GH_PROJECT = gerbil -GH_TAGNAME = v0.15.1 +GH_TAGNAME = v0.16 CATEGORIES = lang Index: distinfo === RCS file: /cvs/ports/lang/gerbil/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo10 Feb 2019 18:01:30 - 1.3 +++ distinfo25 Sep 2020 03:55:35 - @@ -1,2 +1,2 @@ -SHA256 (gerbil-0.15.1.tar.gz) = PSnuzaqEWwc7+EE81U5CCz9Ix5wl5D+rWjed3gKdDN4= -SIZE (gerbil-0.15.1.tar.gz) = 1326871 +SHA256 (gerbil-0.16.tar.gz) = EVfU72DatqD3xJhtXJODkZcwRQk8RwoD/+AiZsTT4Rk= +SIZE (gerbil-0.16.tar.gz) = 1715765 Index: pkg/PLIST === RCS file: /cvs/ports/lang/gerbil/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- pkg/PLIST 10 Feb 2019 18:01:30 - 1.3 +++ pkg/PLIST 25 Sep 2020 03:55:35 - @@ -5,6 +5,7 @@ gerbil/LICENSE-APACHE-2.0.txt gerbil/LICENSE-LGPL.txt gerbil/README.md gerbil/bin/ +gerbil/bin/.keep gerbil/bin/gxc gerbil/bin/gxi gerbil/bin/gxi-build-script @@ -15,7 +16,16 @@ gerbil/bin/gxi-script gerbil/doc/ gerbil/doc/.vuepress/ gerbil/doc/.vuepress/config.js -gerbil/doc/.vuepress/style.styl +gerbil/doc/.vuepress/public/ +gerbil/doc/.vuepress/public/img/ +gerbil/doc/.vuepress/public/img/gerbil-detailed-consio_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-detailed_INK.svg +gerbil/doc/.vuepress/public/img/gerbil-detailed_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored-consio_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored_INK.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored_OPT.svg +gerbil/doc/.vuepress/styles/ +gerbil/doc/.vuepress/styles/index.styl gerbil/doc/build.sh gerbil/doc/guide/ gerbil/doc/guide/README.md @@ -32,6 +42,7 @@ gerbil/doc/guide/profiler.md gerbil/doc/guide/r7rs.md gerbil/doc/guide/shell.md gerbil/doc/guide/srfi.md +gerbil/doc/package-lock.json gerbil/doc/package.json gerbil/doc/readme.md gerbil/doc/reference/ @@ -70,6 +81,7 @@ gerbil/doc/reference/sort.md gerbil/doc/reference/srfi.md gerbil/doc/reference/stdlib.md gerbil/doc/reference/stxparam.md +gerbil/doc/reference/stxutil.md gerbil/doc/reference/sugar.md gerbil/doc/reference/test.md gerbil/doc/reference/text.md @@ -82,6 +94,7 @@ gerbil/doc/tutorials/kvstore.md gerbil/doc/tutorials/languages.md gerbil/doc/tutorials/proxy.md gerbil/lib/ +gerbil/lib/.keep gerbil/lib/gerbil/ gerbil/lib/gerbil/compiler/ gerbil/lib/gerbil/compiler.ssi @@ -113,6 +126,10 @@ gerbil/lib/gerbil/compiler/optimize-call gerbil/lib/gerbil/compiler/optimize-call.ssxi.ss @bin gerbil/lib/gerbil/compiler/optimize-call__0.o1 @bin gerbil/lib/gerbil/compiler/optimize-call__rt.o1 +gerbil/lib/gerbil/compiler/optimize-spec.ssi +gerbil/lib/gerbil/compiler/optimize-spec.ssxi.ss +@bin gerbil/lib/gerbil/compiler/optimize-spec__0.o1 +@bin gerbil/lib/gerbil/compiler/optimize-spec__rt.o1 gerbil/lib/gerbil/compiler/optimize-top.ssi gerbil/lib/gerbil/compiler/optimize-top.ssxi.ss @bin gerbil/lib/gerbil/compiler/optimize-top__0.o1 @@ -266,6 +283,11 @@ gerbil/lib/gerbil/gambit/threads.ssxi.ss @bin gerbil/lib/gerbil/gambit/threads__0.o1 @bin gerbil/lib/gerbil/gambit/threads__rt.o1 @bin gerbil/lib/gerbil/gambit__rt.o1 +@bin gerbil/lib/gerbil/polydactyl$_gambit__rt.o1 +gerbil/lib/gerbil/polydactyl.ssi +gerbil/lib/gerbil/polydactyl.ssxi.ss +@bin gerbil/lib/gerbil/polydactyl__1.o1 +@bin gerbil/lib/gerbil/polydactyl__rt.o1 gerbil/lib/gerbil/tools/ gerbil/lib/gerbil/tools/gxpkg.ssi gerbil/lib/gerbil/tools/gxpkg.ssxi.ss @@ -295,162 +317,317 @@ gerbil/lib/scheme/ gerbil/lib/scheme/base-etc.ssi gerbil/lib/scheme/base-etc.ssxi.ss @bin gerbil/lib/scheme/base-etc__0.o1 +gerbil/lib/scheme/base-etc__0.scm @bin gerbil/lib/scheme/base-etc__1.o1 +gerbil/lib/scheme/base-etc__1.scm @bin gerbil/lib/scheme/base-etc__rt.o1 +gerbil/lib/scheme/base-etc__rt.scm gerbil/lib/scheme/base-impl.ssi gerbil/lib/scheme/base-impl.ssxi.ss @bin gerbil/lib/scheme/base-impl__0.o1 +gerbil/lib/scheme/base-impl__0.scm @bin gerbil/lib/scheme/base-impl__1.o1 +gerbil/lib/scheme/base-impl__1.scm @bin gerbil/lib/scheme/base-impl__rt.o1 +gerbil/lib/scheme/base-impl__rt.scm gerbil/lib/scheme/base-ports.ssi gerbil/lib/scheme/base-ports.ssxi.ss @bin gerbil/lib/scheme/base-ports__0.o1 +gerbil/lib/scheme/base-ports__0.scm @bin gerbil/lib/scheme/base-ports__rt.o1 +gerbil/lib/scheme/base-ports__rt.scm gerbil/lib/scheme/base-vectors.ssi gerbil/lib/scheme/base-vectors.ssxi.ss @bin
Re: [maintainer update] x11/dunst
Ingo Feinerer [2020-09-24, 16:04 +0200]:
> On Mon, Sep 21, 2020 at 06:22:44PM +0000, Timo Myyrä wrote:
>> Here's a bump for x11/dunst. Dbus doesn't seem to be needed during build
>> so move to run_depends.
>>
>> works for me on amd64.
>
> Works for me on amd64 as well.
>
> Two nits:
>
> 1)
>
> $ make port-lib-depends-check
>
> dunst-1.5.0(x11/dunst):
> Missing lib: notify.4 (/usr/local/bin/dunstify) (NOT REACHABLE)
>
> So add
>
> devel/libnotify \
>
> to LIB_DEPENDS and add
>
> notify
>
> to WANTLIB.
>
> 2)
>
> @bin/dunstctl in pkg/PLIST
>
> Drop the @ at the beginning as it is a shell script.
>
> Besides that OK feinerer@
>
> Best regards,
> Ingo
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/x11/dunst/Makefile,v
>> retrieving revision 1.9
>> diff -u -p -u -p -r1.9 Makefile
>> --- Makefile 2 Aug 2019 13:49:29 - 1.9
>> +++ Makefile 20 Sep 2020 05:51:11 -
>> @@ -4,7 +4,7 @@ COMMENT =customizable and lightweight n
>>
>> GH_ACCOUNT =dunst-project
>> GH_PROJECT =dunst
>> -GH_TAGNAME =v1.4.1
>> +GH_TAGNAME =v1.5.0
>>
>> CATEGORIES =x11
>>
>> @@ -15,9 +15,9 @@ MAINTAINER = Timo Myyra > # BSD
>> PERMIT_PACKAGE =Yes
>>
>> -WANTLIB += X11 Xext Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
>> -WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0 pangocairo-1.0
>> -WANTLIB += pthread
>> +WANTLIB += X11 Xext Xinerama Xrandr Xss c cairo gdk_pixbuf-2.0
>> +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 harfbuzz intl m
>> +WANTLIB += pango-1.0 pangocairo-1.0 pthread
>>
>> USE_GMAKE = Yes
>>
>> @@ -25,8 +25,9 @@ LIB_DEPENDS += devel/gettext,-runtime \
>> devel/glib2 \
>> devel/pango \
>> graphics/cairo \
>> -graphics/gdk-pixbuf2 \
>> -x11/dbus
>> +graphics/gdk-pixbuf2
>> +
>> +RUN_DEPENDS += x11/dbus
>>
>> FAKE_FLAGS =PREFIX="${PREFIX}" \
>> MANPREFIX="${PREFIX}/man" \
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/x11/dunst/distinfo,v
>> retrieving revision 1.5
>> diff -u -p -u -p -r1.5 distinfo
>> --- distinfo 2 Aug 2019 13:49:29 - 1.5
>> +++ distinfo 20 Sep 2020 05:51:11 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (dunst-1.4.1.tar.gz) = FWP+jJ6vMwej19vtJAUh956EFfE2SXAwUSxpcTEYvf4=
>> -SIZE (dunst-1.4.1.tar.gz) = 160124
>> +SHA256 (dunst-1.5.0.tar.gz) = LDkK3xRLX6D/AH6jYWyQ8btTffaoBCGWmT9VhdG8jJo=
>> +SIZE (dunst-1.5.0.tar.gz) = 169272
>> Index: patches/patch-dunstrc
>> ===
>> RCS file: /cvs/ports/x11/dunst/patches/patch-dunstrc,v
>> retrieving revision 1.2
>> diff -u -p -u -p -r1.2 patch-dunstrc
>> --- patches/patch-dunstrc2 Aug 2019 13:49:29 - 1.2
>> +++ patches/patch-dunstrc20 Sep 2020 05:51:11 -
>> @@ -3,7 +3,7 @@ $OpenBSD: patch-dunstrc,v 1.2 2019/08/02
>> Index: dunstrc
>> --- dunstrc.orig
>> +++ dunstrc
>> -@@ -166,7 +166,7 @@
>> +@@ -175,7 +175,7 @@
>> max_icon_size = 32
>>
>> # Paths to default icons.
>> @@ -12,7 +12,7 @@ Index: dunstrc
>>
>> ### History ###
>>
>> -@@ -180,10 +180,10 @@
>> +@@ -189,10 +189,10 @@
>> ### Misc/Advanced ###
>>
>> # dmenu path.
>> Index: patches/patch-src_notification_c
>> ===
>> RCS file: patches/patch-src_notification_c
>> diff -N patches/patch-src_notification_c
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ patches/patch-src_notification_c 20 Sep 2020 05:51:11 -
>> @@ -0,0 +1,34 @@
>> +$OpenBSD$
>> +
>> +Index: src/notification.c
>> +--- src/notification.c.orig
>> src/notification.c
>> +@@ -58,7 +58,7 @@ void notification_print(const struct notification *n)
>> + printf("\ticon_id: '%s'\n", n->icon_id);
>> + printf("\tdesktop_entry: '%s'\n", n->desktop_entry ?
>> n->desktop_entry : "");
>> + printf("\tcategory: %s\n", n->category);
>> +-printf("\ttimeout: %ld\n", n->timeout/1000);
>> ++printf("\
[maintainer update] x11/dunst
Hi,
Here's a bump for x11/dunst. Dbus doesn't seem to be needed during build
so move to run_depends.
works for me on amd64.
timo
Index: Makefile
===
RCS file: /cvs/ports/x11/dunst/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile2 Aug 2019 13:49:29 - 1.9
+++ Makefile20 Sep 2020 05:51:11 -
@@ -4,7 +4,7 @@ COMMENT = customizable and lightweight n
GH_ACCOUNT = dunst-project
GH_PROJECT = dunst
-GH_TAGNAME = v1.4.1
+GH_TAGNAME = v1.5.0
CATEGORIES = x11
@@ -15,9 +15,9 @@ MAINTAINER = Timo Myyra icon_id);
+ printf("\tdesktop_entry: '%s'\n", n->desktop_entry ? n->desktop_entry
: "");
+ printf("\tcategory: %s\n", n->category);
+-printf("\ttimeout: %ld\n", n->timeout/1000);
++printf("\ttimeout: %lld\n", (long long)n->timeout/1000);
+ printf("\turgency: %s\n", notification_urgency_to_string(n->urgency));
+ printf("\ttransient: %d\n", n->transient);
+ printf("\tformatted: '%s'\n", n->msg);
+@@ -574,14 +574,14 @@ void notification_update_text_to_render(struct notific
+ char *new_buf;
+ if (hours > 0) {
+ new_buf =
+-g_strdup_printf("%s (%ldh %ldm %lds old)", buf,
hours,
+-minutes, seconds);
++g_strdup_printf("%s (%lldh %lldm %llds old)",
buf, (long long)hours,
++(long long)minutes, (long
long)seconds);
+ } else if (minutes > 0) {
+ new_buf =
+-g_strdup_printf("%s (%ldm %lds old)", buf,
minutes,
+-seconds);
++g_strdup_printf("%s (%lldm %llds old)", buf,
(long long)minutes,
++(long long)seconds);
+ } else {
+-new_buf = g_strdup_printf("%s (%lds old)", buf,
seconds);
++new_buf = g_strdup_printf("%s (%llds old)", buf,
(long long)seconds);
+ }
+
+ g_free(buf);
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/dunst/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 23 Feb 2018 22:34:18 - 1.3
+++ pkg/PLIST 20 Sep 2020 05:51:11 -
@@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.3 2018/02/23 22:34:18 kn Exp $
@bin bin/dunst
+@bin bin/dunstctl
+@bin bin/dunstify
@man man/man1/dunst.1
+@man man/man1/dunstctl.1
share/dbus-1/services/org.knopwob.dunst.service
share/examples/dunst/
share/examples/dunst/dunstrc
[update] x11/icewm-1.8.3
Hi,
Noticed that icewm has had few releases since last update.
This one seems to work for me on amd64.
timo
Index: Makefile
===
RCS file: /cvs/ports/x11/icewm/Makefile,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 Makefile
--- Makefile24 Jun 2020 20:52:49 - 1.74
+++ Makefile20 Sep 2020 05:10:12 -
@@ -3,7 +3,7 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS=${APM_ARCHS}
-V= 1.6.6
+V= 1.8.3
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
Index: distinfo
===
RCS file: /cvs/ports/x11/icewm/distinfo,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 distinfo
--- distinfo24 Jun 2020 20:52:49 - 1.24
+++ distinfo20 Sep 2020 05:10:12 -
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.6.6.tar.lz) = d/US4LzcnG7I4aEMgiuCOFSCZbq8cN/k63a0Ug1gwBw=
-SIZE (icewm-1.6.6.tar.lz) = 1684639
+SHA256 (icewm-1.8.3.tar.lz) = N7FR+Zd6AgzefrsjQZYcuWwJVMUgn8/RFRz2kHRvf9M=
+SIZE (icewm-1.8.3.tar.lz) = 1686603
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/icewm/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 PLIST
--- pkg/PLIST 24 Jun 2020 20:52:49 - 1.22
+++ pkg/PLIST 20 Sep 2020 05:10:12 -
@@ -188,6 +188,8 @@ share/icewm/taskbar/windows.xpm
share/icewm/taskbar/xfreeos2.xpm
share/icewm/themes/
share/icewm/themes/CrystalBlue/
+share/icewm/themes/CrystalBlue/buttonA.xpm
+share/icewm/themes/CrystalBlue/buttonI.xpm
share/icewm/themes/CrystalBlue/close.xpm
share/icewm/themes/CrystalBlue/closeA.xpm
share/icewm/themes/CrystalBlue/closeO.xpm
@@ -272,6 +274,8 @@ share/icewm/themes/CrystalBlue/taskbar/t
share/icewm/themes/CrystalBlue/taskbar/taskbuttonminimized.xpm
share/icewm/themes/CrystalBlue/taskbar/toolbuttonbg.xpm
share/icewm/themes/CrystalBlue/taskbar/windows.xpm
+share/icewm/themes/CrystalBlue/taskbar/workspacebuttonactive.xpm
+share/icewm/themes/CrystalBlue/taskbar/workspacebuttonbg.xpm
share/icewm/themes/CrystalBlue/titleAB.xpm
share/icewm/themes/CrystalBlue/titleAJ.xpm
share/icewm/themes/CrystalBlue/titleAM.xpm
@@ -394,8 +398,6 @@ share/icewm/themes/NanoBlue/dframeIR.xpm
share/icewm/themes/NanoBlue/dframeIT.xpm
share/icewm/themes/NanoBlue/dframeITL.xpm
share/icewm/themes/NanoBlue/dframeITR.xpm
-share/icewm/themes/NanoBlue/drameAB.xpm
-share/icewm/themes/NanoBlue/drameATR.xpm
share/icewm/themes/NanoBlue/eos.jpg
share/icewm/themes/NanoBlue/expandA.xpm
share/icewm/themes/NanoBlue/expandI.xpm
@@ -417,21 +419,22 @@ share/icewm/themes/NanoBlue/frameIT.xpm
share/icewm/themes/NanoBlue/frameITL.xpm
share/icewm/themes/NanoBlue/frameITR.xpm
share/icewm/themes/NanoBlue/icons/
-share/icewm/themes/NanoBlue/icons/IceWM_16x16.png
-share/icewm/themes/NanoBlue/icons/IceWM_32x32.png
-share/icewm/themes/NanoBlue/icons/app_16x16.png
-share/icewm/themes/NanoBlue/icons/firefox_16x16.png
-share/icewm/themes/NanoBlue/icons/firefox_32x32.png
-share/icewm/themes/NanoBlue/icons/folder_16x16.png
-share/icewm/themes/NanoBlue/icons/folder_32x32.png
-share/icewm/themes/NanoBlue/icons/gimp_16x16.png
-share/icewm/themes/NanoBlue/icons/gimp_32x32.png
-share/icewm/themes/NanoBlue/icons/mplayer_16x16.png
-share/icewm/themes/NanoBlue/icons/mplayer_32x32.png
-share/icewm/themes/NanoBlue/icons/thunderbird_16x16.png
-share/icewm/themes/NanoBlue/icons/thunderbird_32x32.png
-share/icewm/themes/NanoBlue/icons/xterm_16x16.png
-share/icewm/themes/NanoBlue/icons/xterm_32x32.png
+share/icewm/themes/NanoBlue/icons/IceWM_16x16.xpm
+share/icewm/themes/NanoBlue/icons/IceWM_32x32.xpm
+share/icewm/themes/NanoBlue/icons/app_16x16.xpm
+share/icewm/themes/NanoBlue/icons/app_32x32.xpm
+share/icewm/themes/NanoBlue/icons/firefox_16x16.xpm
+share/icewm/themes/NanoBlue/icons/firefox_32x32.xpm
+share/icewm/themes/NanoBlue/icons/folder_16x16.xpm
+share/icewm/themes/NanoBlue/icons/folder_32x32.xpm
+share/icewm/themes/NanoBlue/icons/gimp_16x16.xpm
+share/icewm/themes/NanoBlue/icons/gimp_32x32.xpm
+share/icewm/themes/NanoBlue/icons/mplayer_16x16.xpm
+share/icewm/themes/NanoBlue/icons/mplayer_32x32.xpm
+share/icewm/themes/NanoBlue/icons/thunderbird_16x16.xpm
+share/icewm/themes/NanoBlue/icons/thunderbird_32x32.xpm
+share/icewm/themes/NanoBlue/icons/xterm_16x16.xpm
+share/icewm/themes/NanoBlue/icons/xterm_32x32.xpm
share/icewm/themes/NanoBlue/ledclock/
share/icewm/themes/NanoBlue/ledclock/a.xpm
share/icewm/themes/NanoBlue/ledclock/colon.xpm
@@ -640,6 +643,7 @@ share/locale/nb/LC_MESSAGES/icewm.mo
share/locale/nl/LC_MESSAGES/icewm.mo
share/locale/no/LC_MESSAGES/icewm.mo
share/locale/pl/LC_MESSAGES/icewm.mo
+share/locale/pt/LC_MESSAGES/icewm.mo
share/locale/pt_BR/LC_MESSAGES/icewm.mo
share/locale/ro/LC_MESSAGES/icewm.mo
share/locale/ru/LC_MESSAGES/icewm.mo
[maintainer update] lang/abcl-1.7.1
Hi,
I forgot to send this bug fix update for abcl.
Fixes:
-
[r15337] Fix ELT on vectors specialized on (unsigned-byte 32)
[r15327] Restore svref optimizations for SIMPLE-VECTOR sorts
[r15326] Fix sorting vectors of length 0
timo
Index: Makefile
===
RCS file: /cvs/ports/lang/abcl/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile7 Jul 2020 12:05:58 - 1.18
+++ Makefile20 Sep 2020 06:12:04 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.18 2020/07/07 12:05:58 sthen Exp $
COMMENT = Common Lisp dialect for the Java Virtual Machine
-V =1.7.0
+V =1.7.1
DISTNAME = abcl-src-${V}
PKGNAME = abcl-${V}
PKG_ARCH = *
Index: distinfo
===
RCS file: /cvs/ports/lang/abcl/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo7 Jul 2020 12:05:58 - 1.8
+++ distinfo20 Sep 2020 06:12:04 -
@@ -1,2 +1,2 @@
-SHA256 (abcl-src-1.7.0.tar.gz) = pVNyQ6D5EQvyOwWMFSRFwgAhzHmJyZ/BNPP5L4Qudl0=
-SIZE (abcl-src-1.7.0.tar.gz) = 2563051
+SHA256 (abcl-src-1.7.1.tar.gz) = 1RAUsr5uy1vKqs2grfRgepld1Lbp5QnIofWpmLdkkic=
+SIZE (abcl-src-1.7.1.tar.gz) = 2557628
Re: Switch to LLVM 10 imminent
Ok then, I got black screen with daisy's head cursor and it stuck there. I recall I was testing some soundfonts last time so it might be my local issue. So, ok from me on the gzdoom. Timo On Thu, Aug 6, 2020, at 13:40, Edd Barrett wrote: > On Thu, Aug 06, 2020 at 01:33:33PM +0300, Timo Myyrä wrote: > > Did you play test? I quickly tried to check it and got just black > > screen. I didn't have time to debug it so it might be something else. > > I killed a couple of zombies on the first level of Doom 2. I'm an idiot > though, because I forgot to get the chainsaw before dropping down :P > > There's an unrelated bug that might be biting you: gzdoom sometimes > takes an age to start and during that time it draws and full-screen SDL > window and appears to hang. > > When this happens I don't get a black screen though. I get an "undrawn" > screen that just contains whatever was there before (usually my desktop > in the state is was prior to running doom). Kind of hard to explain. > > Might be the same bug? > > -- > Best Regards > Edd Barrett > > http://www.theunixzoo.co.uk > >
Re: Switch to LLVM 10 imminent
Did you play test? I quickly tried to check it and got just black screen. I
didn't have time to debug it so it might be something else.
Timo
On Thu, Aug 6, 2020, at 13:23, Edd Barrett wrote:
> On Tue, Aug 04, 2020 at 10:34:59PM -0400, Daniel Dickman wrote:
> > > emulators/dolphin
> > > games/gzdoom
> >
> > These two should be 1-liner fixes. See:
> >
> > https://github.com/KhronosGroup/glslang/pull/2010/commits/24b3e8384e93f3e73b6aa14ea00a30574112f9ba
>
> Works fine for gzdoom. Diff below (no bump needed I think):
>
>
> Index: patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
> ===
> RCS file: patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
> diff -N patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h 6 Aug
> 2020 10:07:11 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: libraries/glslang/glslang/Include/PoolAlloc.h
> +--- libraries/glslang/glslang/Include/PoolAlloc.h.orig
> libraries/glslang/glslang/Include/PoolAlloc.h
> +@@ -304,7 +304,6 @@ class pool_allocator { (public)
> + size_type max_size() const { return static_cast(-1) /
> sizeof(T); }
> + size_type max_size(int size) const { return
> static_cast(-1) / size; }
> +
> +-void setAllocator(TPoolAllocator* a) { allocator = *a; }
> + TPoolAllocator& getAllocator() const { return allocator; }
> +
> + protected:
>
> --
> Best Regards
> Edd Barrett
>
> http://www.theunixzoo.co.uk
>
>
Re: Switch to LLVM 10 imminent
"Raymond E. Pasco" writes: > On Sat Aug 1, 2020 at 4:14 PM EDT, Christian Weisgerber wrote: >> I have uploaded the failure logs from early builds at >> http://build-failures.rhaalovely.net/amd64-clang/ > > games/gzdoom may be fixable by updating the port to 4.4.x, which removes > the offending line. Yeah, I've been looking at updating the port but its a bigger process. They split the music backend to separate project ZMusic project which needs to be built for gzdoom update. timo
Re: Update lang/ecl to 20.4.24
Solene Rapenne writes: > On Tue, 28 Jul 2020 23:59:03 -0400 > George Koehler : > >> On Tue, 19 May 2020 08:59:48 -0700 >> Josh Elsasser wrote: >> >> > Here's a quick update to the new release, minimally tested as a >> > lang/sbcl build host. The patch removes files, don't forget patch -E >> > >> > diff -ruN --exclude .git /usr/ports/lang/ecl/Makefile ./Makefile >> > --- /usr/ports/lang/ecl/Makefile Tue Feb 18 15:29:40 2020 >> > +++ ./Makefile Mon May 18 09:44:49 2020 >> > @@ -5,10 +5,9 @@ >> > >> > BROKEN-mips64 = ecl_min fails >> > >> > -V = 16.1.3 >> > +V = 20.4.24 >> >> This update might break sparc64. I don't have sparc64, but found a >> bug in 20.4.24 on powerpc64 that might affect other 64-bit big-endian >> arch (mips64 and sparc64). It's BROKEN-mips64, but the sparc64 snap >> has packages of clic and maxima with ecl-16.1.3.p3. >> >> The ecl update has been stuck because it breaks net/clic (as Solene >> said). In other ways, the update looks good to me. >> > > I have a fix for net/clic that I will commit when ecl update is done I don't have any exotic archs to test this with, anyone with sparc64 able to spin a ecl test? If sparc64 still works we could update this. timo
Re: sbcl-2.0.6 update with arm support
Josh Elsasser writes: > On Tue, Jul 07, 2020 at 08:40:35AM +0300, Timo Myyrä wrote: > >> Hi, >> >> SBCL has had few releases since last update. Biggest change on sbcl releases >> is >> experimental support for arm platforms on OpenBSD. >> >> So here's update to sbcl to latest release and adds sbcl to arm platforms as >> well. Tested lightly on amd64, so far looking good. >> Seeking arm/aarch64 tests to see how well sbcl works on those. > > We will need to get lang/ecl updated first, and to switch the heap for > devel/boehm-gc from sbrk to mmap. Then the sbcl port can switch the > cross-compilation host lisp from clisp to ecl. > > Alternately, lang/clisp can be updated to a newer version. I started > this but the ffcall patches are ugly and upstream wants to be able to > run openbsd/macppc in qemu before accepting patches. If you want to go > this route then see https://github.com/jre/libffcall-port and > https://github.com/jre/clisp-port as well as the patches I sent to the > ffcall list. Ah, more work to do then. I polished the ecl port update but it needs a bit of troubleshooting before its ready for import. Currently the updated ecl port has some test failures and I guess those errors cause the math/maxima test suite to fail as well. Timo
Re: UPDATE: security/keepassxc
Rafael Sadowski writes:
> Update keepassxc to 2.6.0.
>
> - Enable Keeshare. It only depends on quazip5 and I would like to play with it
> - Fix ld issue with missing library path.
> - Add patch to unbreak ninja build.
>
> Changlog from upstream:
> https://github.com/keepassxreboot/keepassxc/releases/tag/2.6.0
>
> Tested on amd64. Feedback and OK welcome.
>
> Rafael Sadowski
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/keepassxc/Makefile,v
> retrieving revision 1.30
> diff -u -p -u -p -r1.30 Makefile
> --- Makefile 25 Apr 2020 11:12:35 - 1.30
> +++ Makefile 7 Jul 2020 06:28:30 -
> @@ -2,7 +2,7 @@
>
> COMMENT =management tool for password and sensitive data
>
> -V = 2.5.4
> +V = 2.6.0
> DISTNAME = keepassxc-${V}
>
> CATEGORIES = security
> @@ -16,8 +16,8 @@ PERMIT_PACKAGE =Yes
>
> WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
> WANTLIB += Qt5Network Qt5Svg Qt5Widgets Qt5X11Extras X11 Xi Xtst
> -WANTLIB += argon2 c gcrypt gpg-error m qrencode readline sodium
> -WANTLIB += z
> +WANTLIB += argon2 c gcrypt gpg-error m qrencode quazip5 readline
> +WANTLIB += sodium z
>
> MASTER_SITES =
> https://github.com/keepassxreboot/keepassxc/releases/download/${V}/
> EXTRACT_SUFX = -src.tar.xz
> @@ -25,7 +25,8 @@ EXTRACT_SUFX = -src.tar.xz
> MODULES =x11/qt5 \
> devel/cmake
>
> -LIB_DEPENDS =security/libgcrypt \
> +LIB_DEPENDS =archivers/quazip \
> + security/libgcrypt \
> security/libsodium \
> security/argon2 \
> graphics/libqrencode \
> @@ -36,12 +37,15 @@ RUN_DEPENDS = devel/desktop-file-utils \
> misc/shared-mime-info \
> x11/gtk+3,-guic
>
> +BUILD_DEPENDS = textproc/asciidoctor
> +
> CONFIGURE_ARGS= -DCMAKE_INSTALL_MANDIR="man" \
> -DWITH_GUI_TESTS=ON \
> -DWITH_XC_AUTOTYPE=ON \
> -DWITH_XC_SSHAGENT=ON \
> -DWITH_XC_UPDATECHECK=OFF \
> - -DWITH_XC_FDOSECRETS=ON
> + -DWITH_XC_FDOSECRETS=ON \
> + -DWITH_XC_KEESHARE=ON
>
> TEST_IS_INTERACTIVE =X11
>
> @@ -62,11 +66,15 @@ CONFIGURE_ARGS += -DWITH_XC_BROWSER=ON \
> -DWITH_XC_NETWORKING=ON
> .endif
>
> +# ld: error: unable to find library -lX11
> +CONFIGURE_ARGS +=-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} -L${X11BASE}/lib"
> +
> post-patch:
> cd ${WRKSRC}/src/; sed -i -e 's/Q_OS_LINUX/Q_OS_UNIX/g' \
> - browser/HostInstaller.cpp \
> core/ScreenLockListenerPrivate.cpp \
> gui/MainWindow.cpp \
> - main.cpp
> + main.cpp \
> + browser/BrowserSettingsWidget.cpp \
> + browser/NativeMessageInstaller.cpp
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/keepassxc/distinfo,v
> retrieving revision 1.18
> diff -u -p -u -p -r1.18 distinfo
> --- distinfo 10 Apr 2020 07:25:02 - 1.18
> +++ distinfo 7 Jul 2020 06:28:30 -
> @@ -1,2 +1,2 @@
> -SHA256 (keepassxc-2.5.4-src.tar.xz) =
> pV4IAcMYsCsaxOFum3qHzPp7A56mDSxiYQvRu73WzUo=
> -SIZE (keepassxc-2.5.4-src.tar.xz) = 6839396
> +SHA256 (keepassxc-2.6.0-src.tar.xz) =
> 0NI9l6c6wcv1m/yi9dFQauNt/NT7+0Il7+GZMfA1/To=
> +SIZE (keepassxc-2.6.0-src.tar.xz) = 5628800
> Index: patches/patch-docs_CMakeLists_txt
> ===
> RCS file: patches/patch-docs_CMakeLists_txt
> diff -N patches/patch-docs_CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-docs_CMakeLists_txt 7 Jul 2020 06:28:30 -
> @@ -0,0 +1,41 @@
> +$OpenBSD$
> +
> +ninja: error:
> '/usr/ports/pobj/keepassxc-2.6.0/keepassxc-2.6.0/docs/topics/*',
> +needed by 'docs/KeePassXC_GettingStarted.html', missing and no known rule to
> +make it
> +
> +Index: docs/CMakeLists.txt
> +--- docs/CMakeLists.txt.orig
> docs/CMakeLists.txt
> +@@ -26,16 +26,16 @@ set(OUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
> + # Build html documentation on all platforms
> + add_custom_command(OUTPUT KeePassXC_GettingStarted.html
> + COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o
> KeePassXC_GettingStarted.html ${DOC_DIR}/GettingStarted.adoc
> +-DEPENDS ${DOC_DIR}/topics/* ${DOC_DIR}/styles/* ${DOC_DIR}/images/*
> ${DOC_DIR}/GettingStarted.adoc
> ++DEPENDS ${DOC_DIR}/GettingStarted.adoc
> + VERBATIM)
> + add_custom_command(OUTPUT KeePassXC_UserGuide.html
> + COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -o KeePassXC_UserGuide.html
> ${DOC_DIR}/UserGuide.adoc
> +-DEPENDS ${DOC_DIR}/topics/* ${DOC_DIR}/styles/* ${DOC_DIR}/images/*
> ${DOC_DIR}/UserGuide.adoc
> ++DEPENDS ${DOC_DIR}/UserGuide.adoc
> + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
> + VERBATIM)
> +
Re: [maintainer update] gerbil-0.16
Timo Myyrä writes: > Hi, > > Gerbil scheme got new release a while ago. > Only tested on amd64, would be nice if someone could test if the tags building > still fails on i386. > > timo > > Index: Makefile > === > RCS file: /cvs/ports/lang/gerbil/Makefile,v > retrieving revision 1.9 > diff -u -p -u -p -r1.9 Makefile > --- Makefile 21 Feb 2020 20:25:55 - 1.9 > +++ Makefile 9 Jun 2020 17:34:33 - > @@ -9,7 +9,7 @@ COMMENT = dialect of Scheme designed for > > GH_ACCOUNT = vyzo > GH_PROJECT = gerbil > -GH_TAGNAME = v0.15.1 > +GH_TAGNAME = v0.16 > > CATEGORIES = lang > > Index: distinfo > === > RCS file: /cvs/ports/lang/gerbil/distinfo,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 distinfo > --- distinfo 10 Feb 2019 18:01:30 - 1.3 > +++ distinfo 9 Jun 2020 17:34:33 - > @@ -1,2 +1,2 @@ > -SHA256 (gerbil-0.15.1.tar.gz) = PSnuzaqEWwc7+EE81U5CCz9Ix5wl5D+rWjed3gKdDN4= > -SIZE (gerbil-0.15.1.tar.gz) = 1326871 > +SHA256 (gerbil-0.16.tar.gz) = EVfU72DatqD3xJhtXJODkZcwRQk8RwoD/+AiZsTT4Rk= > +SIZE (gerbil-0.16.tar.gz) = 1715765 > Index: pkg/PLIST > === > RCS file: /cvs/ports/lang/gerbil/pkg/PLIST,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 PLIST > --- pkg/PLIST 10 Feb 2019 18:01:30 - 1.3 > +++ pkg/PLIST 9 Jun 2020 17:34:33 - > @@ -5,6 +5,7 @@ gerbil/LICENSE-APACHE-2.0.txt > gerbil/LICENSE-LGPL.txt > gerbil/README.md > gerbil/bin/ > +gerbil/bin/.keep > gerbil/bin/gxc > gerbil/bin/gxi > gerbil/bin/gxi-build-script > @@ -15,7 +16,16 @@ gerbil/bin/gxi-script > gerbil/doc/ > gerbil/doc/.vuepress/ > gerbil/doc/.vuepress/config.js > -gerbil/doc/.vuepress/style.styl > +gerbil/doc/.vuepress/public/ > +gerbil/doc/.vuepress/public/img/ > +gerbil/doc/.vuepress/public/img/gerbil-detailed-consio_OPT.svg > +gerbil/doc/.vuepress/public/img/gerbil-detailed_INK.svg > +gerbil/doc/.vuepress/public/img/gerbil-detailed_OPT.svg > +gerbil/doc/.vuepress/public/img/gerbil-flat-colored-consio_OPT.svg > +gerbil/doc/.vuepress/public/img/gerbil-flat-colored_INK.svg > +gerbil/doc/.vuepress/public/img/gerbil-flat-colored_OPT.svg > +gerbil/doc/.vuepress/styles/ > +gerbil/doc/.vuepress/styles/index.styl > gerbil/doc/build.sh > gerbil/doc/guide/ > gerbil/doc/guide/README.md > @@ -32,6 +42,7 @@ gerbil/doc/guide/profiler.md > gerbil/doc/guide/r7rs.md > gerbil/doc/guide/shell.md > gerbil/doc/guide/srfi.md > +gerbil/doc/package-lock.json > gerbil/doc/package.json > gerbil/doc/readme.md > gerbil/doc/reference/ > @@ -70,6 +81,7 @@ gerbil/doc/reference/sort.md > gerbil/doc/reference/srfi.md > gerbil/doc/reference/stdlib.md > gerbil/doc/reference/stxparam.md > +gerbil/doc/reference/stxutil.md > gerbil/doc/reference/sugar.md > gerbil/doc/reference/test.md > gerbil/doc/reference/text.md > @@ -82,6 +94,7 @@ gerbil/doc/tutorials/kvstore.md > gerbil/doc/tutorials/languages.md > gerbil/doc/tutorials/proxy.md > gerbil/lib/ > +gerbil/lib/.keep > gerbil/lib/gerbil/ > gerbil/lib/gerbil/compiler/ > gerbil/lib/gerbil/compiler.ssi > @@ -113,6 +126,10 @@ gerbil/lib/gerbil/compiler/optimize-call > gerbil/lib/gerbil/compiler/optimize-call.ssxi.ss > @bin gerbil/lib/gerbil/compiler/optimize-call__0.o1 > @bin gerbil/lib/gerbil/compiler/optimize-call__rt.o1 > +gerbil/lib/gerbil/compiler/optimize-spec.ssi > +gerbil/lib/gerbil/compiler/optimize-spec.ssxi.ss > +@bin gerbil/lib/gerbil/compiler/optimize-spec__0.o1 > +@bin gerbil/lib/gerbil/compiler/optimize-spec__rt.o1 > gerbil/lib/gerbil/compiler/optimize-top.ssi > gerbil/lib/gerbil/compiler/optimize-top.ssxi.ss > @bin gerbil/lib/gerbil/compiler/optimize-top__0.o1 > @@ -266,6 +283,11 @@ gerbil/lib/gerbil/gambit/threads.ssxi.ss > @bin gerbil/lib/gerbil/gambit/threads__0.o1 > @bin gerbil/lib/gerbil/gambit/threads__rt.o1 > @bin gerbil/lib/gerbil/gambit__rt.o1 > +@bin gerbil/lib/gerbil/polydactyl$_gambit__rt.o1 > +gerbil/lib/gerbil/polydactyl.ssi > +gerbil/lib/gerbil/polydactyl.ssxi.ss > +@bin gerbil/lib/gerbil/polydactyl__1.o1 > +@bin gerbil/lib/gerbil/polydactyl__rt.o1 > gerbil/lib/gerbil/tools/ > gerbil/lib/gerbil/tools/gxpkg.ssi > gerbil/lib/gerbil/tools/gxpkg.ssxi.ss > @@ -295,162 +317,317 @@ gerbil/lib/scheme/ > gerbil/lib/scheme/base-etc.ssi > gerbil/lib/scheme/base-etc.ssxi.ss > @bin gerbil/lib/scheme/base-etc__0.o1 > +gerbil/lib/scheme/base-etc__0.scm > @bin gerbil/lib/scheme/base-etc__1.o1 > +gerbil/lib/scheme/base-etc__1.scm > @bin gerbil/lib/scheme/base-et
Re: [maintainer update] abcl-1.7.0
Timo Myyrä writes:
> Hi,
>
> ABCL got new release recently and here's small bump to it.
> It also disables the tests from bulk build, the tests almost run but they
> always
> seem to return true so skip running them on bulk builds.
>
> Timo
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/abcl/Makefile,v
> retrieving revision 1.17
> diff -u -p -u -p -r1.17 Makefile
> --- Makefile 3 Dec 2019 19:46:34 - 1.17
> +++ Makefile 9 Jun 2020 17:30:16 -
> @@ -1,8 +1,7 @@
> # $OpenBSD: Makefile,v 1.17 2019/12/03 19:46:34 solene Exp $
>
> COMMENT =Common Lisp dialect for the Java Virtual Machine
> -V = 1.6.0
> -JUNIT_V =4.12
> +V = 1.7.0
> DISTNAME = abcl-src-${V}
> PKGNAME =abcl-${V}
> PKG_ARCH = *
> @@ -16,12 +15,9 @@ MAINTAINER = Timo Myyra # GPLv2
> PERMIT_PACKAGE = Yes
>
> -MASTER_SITES = ${HOMEPAGE}/releases/$V/
> -MASTER_SITES0 =
> https://github.com/junit-team/junit4/releases/download/r${JUNIT_V}/
> -
> -DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
> - junit-${JUNIT_V}.jar:0
> +MASTER_SITES = ${HOMEPAGE}/releases/${V}/
>
> +DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
> EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
>
> MODULES =java
> @@ -32,7 +28,7 @@ MODJAVA_BUILD_TARGET_NAME = abcl.jar
> RUN_DEPENDS =java/javaPathHelper \
> misc/rlwrap
>
> -TEST_TARGET =abcl.test
> +NO_TEST =Yes
>
> ABCL_HOME = ${PREFIX}/abcl
>
> @@ -44,11 +40,6 @@ do-install:
> cd ${WRKDIST} && tar -cf - src | tar -C ${ABCL_HOME} -xf -
> chown -R ${SHAREOWN}:${SHAREGRP} ${ABCL_HOME}/src
> ${INSTALL_DATA} ${FILESDIR}/abcl_completions ${ABCL_HOME}
> -
> -do-test:
> - cp -v ${FULLDISTDIR}/junit-${JUNIT_V}.jar ${WRKDIR}
> - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/ant \
> - -Djunit.path=${WRKDIR}/junit-${JUNIT_V}.jar ${TEST_TARGET}
>
> # maintainer target to generate completions file
> completions: install
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/abcl/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 distinfo
> --- distinfo 3 Dec 2019 19:46:34 - 1.7
> +++ distinfo 9 Jun 2020 17:30:16 -
> @@ -1,4 +1,2 @@
> -SHA256 (abcl-src-1.6.0.tar.gz) = iT/OgV0/yaOqJQx4/4TtLlG3AvccsR4b78Ki7Jxma0M=
> -SHA256 (junit-4.12.jar) = WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=
> -SIZE (abcl-src-1.6.0.tar.gz) = 2509074
> -SIZE (junit-4.12.jar) = 314932
> +SHA256 (abcl-src-1.7.0.tar.gz) = pVNyQ6D5EQvyOwWMFSRFwgAhzHmJyZ/BNPP5L4Qudl0=
> +SIZE (abcl-src-1.7.0.tar.gz) = 2563051
> Index: files/abcl_completions
> ===
> RCS file: /cvs/ports/lang/abcl/files/abcl_completions,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 abcl_completions
> --- files/abcl_completions3 Dec 2019 19:46:34 - 1.5
> +++ files/abcl_completions9 Jun 2020 17:30:16 -
> @@ -2450,6 +2450,8 @@ system:dd-type
> system:debug-loop
> system:decf-complex
> system:declaration-error
> +system:decode-float-double
> +system:decode-float-single
> system:default-constructor-name
> system:default-ed-function
> system:default-time-zone
> @@ -2885,6 +2887,7 @@ system:round-up
> system:run-hook
> system:run-program
> system:safe-length
> +system:sane-integer-decode-float
> system:sanitize-class-name
> system:satisfies-the-test
> system:scale-exponent
> Index: patches/patch-build_xml
> ===
> RCS file: patches/patch-build_xml
> diff -N patches/patch-build_xml
> --- patches/patch-build_xml 3 Dec 2019 19:46:34 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,22 +0,0 @@
> -$OpenBSD: patch-build_xml,v 1.1 2019/12/03 19:46:34 solene Exp $
> -
> -allows skipping junit fetch during test phase.
> -
> -Index: build.xml
> build.xml.orig
> -+++ build.xml
> -@@ -1014,11 +1014,9 @@ ${basedir}/../cl-bench
> --
> src="http://cloud.github.com/downloads/KentBeck/junit/junit-4.8.1.jar;
> - usetimestamp="true"
> -- dest="${junit.path}"/>
> -- -- src="${maven.dist.uri}"
> -- usetimestamp="true"
> -- dest="${maven.local.path}&
sbcl-2.0.6 update with arm support
Hi,
SBCL has had few releases since last update. Biggest change on sbcl releases is
experimental support for arm platforms on OpenBSD.
So here's update to sbcl to latest release and adds sbcl to arm platforms as
well. Tested lightly on amd64, so far looking good.
Seeking arm/aarch64 tests to see how well sbcl works on those.
timo
Index: Makefile
===
RCS file: /cvs/ports/lang/sbcl/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile15 Mar 2020 19:53:59 - 1.44
+++ Makefile7 Jul 2020 05:30:45 -
@@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.44 2020/03/15 19:53:59 solene Exp $
# not yet ported to other arches
-ONLY_FOR_ARCHS = amd64 i386 powerpc
+ONLY_FOR_ARCHS = aarch64 amd64 arm i386 powerpc
USE_WXNEEDED = Yes
COMMENT= compiler and runtime system for ANSI Common Lisp
-V =2.0.1
+V =2.0.6
DISTNAME= sbcl-${V}-source
PKGNAME= sbcl-${V}
WRKDIST= ${WRKDIR}/sbcl-${V}
Index: distinfo
===
RCS file: /cvs/ports/lang/sbcl/distinfo,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 distinfo
--- distinfo15 Mar 2020 19:53:59 - 1.19
+++ distinfo7 Jul 2020 05:30:45 -
@@ -1,2 +1,2 @@
-SHA256 (sbcl-2.0.1-source.tar.bz2) =
hFDWC3Jko0FY+IEdRtxudP+FW70SJ3Ulcod+ZgTOVug=
-SIZE (sbcl-2.0.1-source.tar.bz2) = 6466983
+SHA256 (sbcl-2.0.6-source.tar.bz2) =
/ZLWTB2XzE9C/j3K0rGDvLIl0BzbpEYWNJJvL3Ct3a4=
+SIZE (sbcl-2.0.6-source.tar.bz2) = 6562022
Index: patches/patch-src_runtime_Config_generic-openbsd
===
RCS file:
/cvs/ports/lang/sbcl/patches/patch-src_runtime_Config_generic-openbsd,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_runtime_Config_generic-openbsd
--- patches/patch-src_runtime_Config_generic-openbsd14 May 2019 07:59:53
- 1.4
+++ patches/patch-src_runtime_Config_generic-openbsd7 Jul 2020 05:30:45
-
@@ -5,13 +5,14 @@ Don't try to guess (wrong) with clang. J
Index: src/runtime/Config.generic-openbsd
--- src/runtime/Config.generic-openbsd.orig
+++ src/runtime/Config.generic-openbsd
-@@ -17,9 +17,7 @@ CFLAGS += -pthread -DOS_THREAD_STACK
- OS_LIBS += -pthread
+@@ -18,10 +18,8 @@ OS_LIBS += -pthread
endif
+ ifeq ($(DISABLE_PIE),yes)
-ifneq ($(shell $(CC) -dM -E - < /dev/null 2>/dev/null | grep -e '__clang__'),)
CFLAGS += -fno-pie
- LINKFLAGS += -Wl,-nopie
+ LINKFLAGS += -nopie
LDFLAGS += -nopie
__LDFLAGS__ += -nopie
-endif
+ endif
Index: patches/patch-src_runtime_GNUmakefile
===
RCS file: /cvs/ports/lang/sbcl/patches/patch-src_runtime_GNUmakefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-src_runtime_GNUmakefile
--- patches/patch-src_runtime_GNUmakefile 15 Mar 2020 19:54:00 -
1.9
+++ patches/patch-src_runtime_GNUmakefile 7 Jul 2020 05:30:45 -
@@ -9,5 +9,5 @@ Index: src/runtime/GNUmakefile
-CFLAGS += -g -Wall -Wundef -Wsign-compare -Wpointer-arith -O3
+CFLAGS += -Wall -Wundef -Wsign-compare -Wpointer-arith
ASFLAGS += $(CFLAGS)
- CPPFLAGS += -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
+ CPPFLAGS += -I.
Index: patches/patch-src_runtime_gc-common_c
===
RCS file: /cvs/ports/lang/sbcl/patches/patch-src_runtime_gc-common_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_runtime_gc-common_c
--- patches/patch-src_runtime_gc-common_c 15 Mar 2020 19:54:00 -
1.3
+++ patches/patch-src_runtime_gc-common_c 7 Jul 2020 05:30:45 -
@@ -5,7 +5,7 @@ clang only has it as builtin
Index: src/runtime/gc-common.c
--- src/runtime/gc-common.c.orig
+++ src/runtime/gc-common.c
-@@ -57,6 +57,8 @@
+@@ -58,6 +58,8 @@
#define LONG_FLOAT_SIZE 3
#endif
Re: [maintainer update] yle-dl-20200628
Klemens Nanni writes:
> On Mon, Jul 06, 2020 at 10:44:15PM +0300, Timo Myyrä wrote:
>> And here's a hopefully a working diff:
> This one applies and "make test" started fine but then went bananas as
> tests require network; ${WRKDIR}/test.log is almost 50.000 lines long.
>
> Shouldn't we mention this in TEST_IS_INTERACTIVE?
>
> I have not run-tested this any further, but port-wise it looks fine to
> me. With that py-configargparse can be made py3 only :)
Ah, that explains the errors in tests. The integration tests download streams
from Yle archives to check that it works. I'm using the PORTS_PRIVSEP so network
access is blocked causing the test failures.
I run the tests as my local user and they passed.
Does this look good?
Index: Makefile
===
RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile5 Jan 2020 23:22:48 - 1.26
+++ Makefile7 Jul 2020 04:45:52 -
@@ -2,7 +2,7 @@
GH_ACCOUNT = aajanki
GH_PROJECT = yle-dl
-GH_TAGNAME = 20191022
+GH_TAGNAME = 20200628
MODPY_EGG_VERSION =${GH_TAGNAME}
COMMENT = download videos from YLE Areena
@@ -15,29 +15,25 @@ MAINTAINER =Timo Myyra
Index: distinfo
===
RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo1 Dec 2019 20:59:12 - 1.14
+++ distinfo7 Jul 2020 04:45:52 -
@@ -1,2 +1,2 @@
-SHA256 (yle-dl-20191022.tar.gz) = +WjwqHARpvt6I6hSmdBdADrc3Didj2/gk8TevhAumo4=
-SIZE (yle-dl-20191022.tar.gz) = 84694
+SHA256 (yle-dl-20200628.tar.gz) = S47xMLgLC8/pU9Vq72QPCSJ+bmRIYQTFO8j1r3lhXp8=
+SIZE (yle-dl-20200628.tar.gz) = 61748
Index: pkg/PLIST
===
RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- pkg/PLIST 1 Dec 2019 20:59:12 - 1.8
+++ pkg/PLIST 7 Jul 2020 04:45:52 -
@@ -1,55 +1,51 @@
@comment $OpenBSD: PLIST,v 1.8 2019/12/01 20:59:12 fcambus Exp $
bin/yle-dl
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/yledl/
-lib/python${MODPY_VERSION}/site-packages/yledl/AdobeHDS.php
lib/python${MODPY_VERSION}/site-packages/yledl/__init__.py
-lib/python${MODPY_VERSION}/site-packages/yledl/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}backends.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}downloader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}exitcodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}extractors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}ffprobe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}geolocation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/sit
Re: [maintainer update] yle-dl-20200628
Timo Myyrä writes:
> Hi,
>
> Here's a bit larger update to yle-dl.
> - Drop php, rtmpdump,cryptodome dependencies, not needed
> - add python3 support
> - drop pre-configure target as unneeded
>
> Tested quickly by downloading single episode from areena.
> Noticed that this has test failures so far I haven't found the root cause for
> them.
>
> timo
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
> retrieving revision 1.26
> diff -u -p -u -p -r1.26 Makefile
> --- Makefile 5 Jan 2020 23:22:48 - 1.26
> +++ Makefile 6 Jul 2020 18:55:48 -
> @@ -2,7 +2,7 @@
>
> GH_ACCOUNT = aajanki
> GH_PROJECT = yle-dl
> -GH_TAGNAME = 20191022
> +GH_TAGNAME = 20200628
> MODPY_EGG_VERSION = ${GH_TAGNAME}
>
> COMMENT =download videos from YLE Areena
> @@ -15,29 +15,23 @@ MAINTAINER = Timo Myyra # GPLv3+
> PERMIT_PACKAGE = Yes
>
> -MODULES =lang/python \
> - lang/php
> +MODULES =lang/python
> +
> +MODPY_SETUPTOOLS=Yes
> +MODPY_PYTEST=Yes
> +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
>
> TEST_ENV = HOME=/tmp
>
> -RUN_DEPENDS =devel/py-attrs \
> - devel/py-configargparse \
> - devel/py-future \
> - net/rtmpdump \
> - security/py-cryptodome \
> - www/py-requests \
> - lang/php/${MODPHP_VERSION},-curl \
> +RUN_DEPENDS =devel/py-attrs${MODPY_FLAVOR} \
> + devel/py-configargparse${MODPY_FLAVOR} \
> + devel/py-future${MODPY_FLAVOR} \
> + graphics/ffmpeg \
> + www/py-requests${MODPY_FLAVOR} \
> net/wget \
> - textproc/py-lxml \
> - converters/py-mini-amf
> -TEST_DEPENDS = devel/py-test-runner
> -
> -MODPY_SETUPTOOLS = Yes
> -MODPHP_BUILDDEP =No
> -MODPY_PYTEST = Yes
> -
> -pre-configure:
> - @sed -i -e "s,'php','${MODPHP_BIN}',g" ${WRKSRC}/yledl/io.py
> - @sed -i -e "s,'pycryptodomex','pycryptodome',g" ${WRKSRC}/setup.py
> + textproc/py-lxml${MODPY_FLAVOR} \
> + converters/py-mini-amf${MODPY_FLAVOR}
> +TEST_DEPENDS = devel/py-test-runner${MODPY_FLAVOR}
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 distinfo
> --- distinfo 1 Dec 2019 20:59:12 - 1.14
> +++ distinfo 6 Jul 2020 18:55:48 -
> @@ -1,2 +1,2 @@
> -SHA256 (yle-dl-20191022.tar.gz) =
> +WjwqHARpvt6I6hSmdBdADrc3Didj2/gk8TevhAumo4=
> -SIZE (yle-dl-20191022.tar.gz) = 84694
> +SHA256 (yle-dl-20200628.tar.gz) =
> S47xMLgLC8/pU9Vq72QPCSJ+bmRIYQTFO8j1r3lhXp8=
> +SIZE (yle-dl-20200628.tar.gz) = 61748
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 PLIST
> --- pkg/PLIST 1 Dec 2019 20:59:12 - 1.8
> +++ pkg/PLIST 6 Jul 2020 18:55:48 -
> @@ -1,55 +1,51 @@
> @comment $OpenBSD: PLIST,v 1.8 2019/12/01 20:59:12 fcambus Exp $
> bin/yle-dl
> -lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> -lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> -lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> -lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> -lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
> -lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
> -lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/PKG-INFO
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/SOURCES.txt
> +lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-in
[maintainer update] yle-dl-20200628
Hi,
Here's a bit larger update to yle-dl.
- Drop php, rtmpdump,cryptodome dependencies, not needed
- add python3 support
- drop pre-configure target as unneeded
Tested quickly by downloading single episode from areena.
Noticed that this has test failures so far I haven't found the root cause for
them.
timo
Index: Makefile
===
RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile5 Jan 2020 23:22:48 - 1.26
+++ Makefile6 Jul 2020 18:55:48 -
@@ -2,7 +2,7 @@
GH_ACCOUNT = aajanki
GH_PROJECT = yle-dl
-GH_TAGNAME = 20191022
+GH_TAGNAME = 20200628
MODPY_EGG_VERSION =${GH_TAGNAME}
COMMENT = download videos from YLE Areena
@@ -15,29 +15,23 @@ MAINTAINER =Timo Myyra
Index: distinfo
===
RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo1 Dec 2019 20:59:12 - 1.14
+++ distinfo6 Jul 2020 18:55:48 -
@@ -1,2 +1,2 @@
-SHA256 (yle-dl-20191022.tar.gz) = +WjwqHARpvt6I6hSmdBdADrc3Didj2/gk8TevhAumo4=
-SIZE (yle-dl-20191022.tar.gz) = 84694
+SHA256 (yle-dl-20200628.tar.gz) = S47xMLgLC8/pU9Vq72QPCSJ+bmRIYQTFO8j1r3lhXp8=
+SIZE (yle-dl-20200628.tar.gz) = 61748
Index: pkg/PLIST
===
RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- pkg/PLIST 1 Dec 2019 20:59:12 - 1.8
+++ pkg/PLIST 6 Jul 2020 18:55:48 -
@@ -1,55 +1,51 @@
@comment $OpenBSD: PLIST,v 1.8 2019/12/01 20:59:12 fcambus Exp $
bin/yle-dl
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/yledl/
-lib/python${MODPY_VERSION}/site-packages/yledl/AdobeHDS.php
lib/python${MODPY_VERSION}/site-packages/yledl/__init__.py
-lib/python${MODPY_VERSION}/site-packages/yledl/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}backends.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}downloader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}exitcodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}extractors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}ffprobe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}geolocation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}kaltura.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}localization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}streamfilters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}streamflavor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}streamprobe.${MODPY_PYC_MAGIC_TAG}pyc
Re: [pretest] emacs-27.0.91
Jeremie Courreges-Anglas writes:
> The BIG change is the portable dumper, enabled by default. This means
> that emacs quits the ELF linker business and uses regular malloc(3)
> even at build time. Also: gmp is used for bignums (almost free because
> gnutls and libnettle), harfbuzz for text layout, etc
>
> pretest announce:
> https://lists.gnu.org/archive/html/emacs-devel/2020-04/msg01123.html
>
> Tested on amd64 and sparc64, no problem experienced except perhaps some
> odd (unreadable) syntax hilighting with diffs.
>
> Feedback welcome.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.95
> diff -u -p -r1.95 Makefile
> --- Makefile 3 Jul 2020 17:05:14 - 1.95
> +++ Makefile 3 Jul 2020 18:17:41 -
> @@ -2,8 +2,7 @@
>
> COMMENT= GNU editor: extensible, customizable, self-documenting
>
> -VERSION= 26.3
> -REVISION=2
> +VERSION= 27.0.91
> DISTNAME=emacs-${VERSION}
>
> CATEGORIES= editors
> @@ -13,11 +12,11 @@ HOMEPAGE= https://www.gnu.org/software/
> MAINTAINER= Jeremie Courreges-Anglas
>
> # GPLv3+
> -PERMIT_PACKAGE= Yes
> +PERMIT_PACKAGE= Yes
>
> -WANTLIB= c m curses pthread gnutls xml2 z
> +WANTLIB =c curses gmp gnutls m pthread xml2 z
>
> -MASTER_SITES=${MASTER_SITE_GNU:=emacs/}
> +MASTER_SITES=https://alpha.gnu.org/gnu/emacs/pretest/
> EXTRACT_SUFX=.tar.xz
>
> DEBUG_PACKAGES = ${BUILD_PACKAGES}
> @@ -30,21 +29,12 @@ GCCARCH= ${MACHINE_ARCH}-unknown-openbs
> CONFIGURE_STYLE= gnu
> MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
> CONFIGURE_ARGS= --build="${GCCARCH}" \
> - --without-sound
> + --without-sound \
> + --without-json
>
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib -nopie ${LDFLAGS}" \
> + LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
> ac_cv_header_execinfo_h=no
> -CFLAGS+= -fno-pie
> -
> -.include
> -.if ${PROPERTIES:Mlld}
> -# ld -Z not supported
> -.elif ${MACHINE_ARCH} == "sparc64"
> -# No need for ld -Z
> -.else
> -CONFIGURE_ENV+= EMACS_LD_SWITCH_SYSTEM="-Z"
> -.endif
>
> MAKE_ENV=INSTALL_EMACS="${INSTALL_SCRIPT}" \
> LOGNAME="${SHAREOWN}"
> @@ -52,24 +42,26 @@ MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRI
> SUBST_VARS= GCCARCH VERSION
>
> USE_GMAKE= Yes
> -LIB_DEPENDS= security/gnutls \
> +LIB_DEPENDS= devel/gmp \
> + security/gnutls \
> textproc/libxml
>
> .if ${FLAVOR} == "no_x11"
> CONFIGURE_ARGS+= --without-x \
> --without-dbus \
> --without-gsettings \
> + --without-harfbuzz \
> --without-jpeg \
> --without-lcms2 \
> --without-libotf \
> --without-m17n-flt
> .else
> -LIB_DEPENDS+=devel/libotf \
> +LIB_DEPENDS+=devel/harfbuzz \
> + devel/libotf \
> graphics/jpeg \
> graphics/png \
> graphics/tiff \
> graphics/giflib \
> - graphics/ImageMagick \
> graphics/lcms2 \
> misc/m17n/lib \
> x11/dbus \
> @@ -80,30 +72,29 @@ RUN_DEPENDS+= devel/desktop-file-utils
> . if ${FLAVOR} == "athena"
> CONFIGURE_ARGS+= --with-x-toolkit=athena
> LIB_DEPENDS+=x11/Xaw3d
> -WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> -WANTLIB += Xaw3d Xext Xfixes Xft Xinerama Xmu Xpm Xrandr Xrender
> -WANTLIB += Xt cairo dbus-1 fontconfig freetype gdk_pixbuf-2.0
> -WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 intl jpeg lcms2 m17n-core
> -WANTLIB += m17n-flt otf png rsvg-2 tiff xcb
> +WANTLIB += ICE SM X11 X11-xcb Xaw3d Xext Xfixes Xft Xinerama Xmu
> +WANTLIB += Xpm Xrandr Xrender Xt cairo dbus-1 fontconfig freetype
> +WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 harfbuzz
> +WANTLIB += intl jpeg lcms2 m17n-core m17n-flt otf png rsvg-2 tiff
> +WANTLIB += xcb
> . elif ${FLAVOR} == "gtk2"
> CONFIGURE_ARGS+= --with-x-toolkit=gtk2
> LIB_DEPENDS+=x11/gtk+2
> -WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> -WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
> -WANTLIB += Xpm Xrandr Xrender atk-1.0 cairo dbus-1 fontconfig
> -WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
> -WANTLIB += gobject-2.0 gtk-x11-2.0 intl jpeg lcms2 m17n-core m17n-flt
Re: [update] openmw-0.46.0
Thomas Frohwein writes:
> On Sun, Jun 21, 2020 at 01:42:56PM +0300, Timo Myyrä wrote:
>
>> Hi,
>>
>> OpenMW got a new release:
>> https://openmw.org/2020/openmw-0-46-0-released/
>>
>> I've been playing with this on amd64, seems to work so far.
>
> Compiles fine; runs on a few minutes of playtesting, but performance on
> this Ryzen 7 2700 with Radeon HD6870 still leaves a bit to be desired,
> but that was similar before. Feels like 20-30 FPS on 1080p with details
> on the higher side.
>
> It looks like some missing WANTLIBs are picked up by make
> port-lib-depends-check:
>
> Missing: boost_iostreams-mt.10 from boost-1.66.0p11
> (/usr/local/bin/openmw-wizard)
> Missing: osgShadow.1 from openscenegraph-3.4.1p6
> (/usr/local/bin/openmw-wizard)
> WANTLIB += boost_iostreams-mt osgShadow
>
> Would be good if that could be added or clarified by Pascal. With that
> ok thfr@
>
>>
>> timo
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/games/openmw/Makefile,v
>> retrieving revision 1.23
>> diff -u -p -u -p -r1.23 Makefile
>> --- Makefile 24 May 2020 21:11:00 - 1.23
>> +++ Makefile 21 Jun 2020 10:39:50 -
>> @@ -4,12 +4,11 @@ ONLY_FOR_ARCHS = amd64 i386
>>
>> COMMENT = open source implementation of TES III: Morrowind
>>
>> -V = 0.45.0
>> +V = 0.46.0
>> GH_ACCOUNT =OpenMW
>> GH_PROJECT =openmw
>> GH_TAGNAME =openmw-$V
>> DISTNAME = openmw-$V
>> -REVISION = 0
>>
>> CATEGORIES =games
>>
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/games/openmw/distinfo,v
>> retrieving revision 1.9
>> diff -u -p -u -p -r1.9 distinfo
>> --- distinfo 25 Nov 2019 10:21:25 - 1.9
>> +++ distinfo 21 Jun 2020 10:39:50 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (openmw-0.45.0.tar.gz) = tjz5cfQG718oAZ9l6eK9lkGiJ0We3kXRR1YpF/Z+HGQ=
>> -SIZE (openmw-0.45.0.tar.gz) = 4711103
>> +SHA256 (openmw-0.46.0.tar.gz) = B6NajxX2f1qnIQwqMHpttWYKm2H+NJg8NbFyyGca/Vg=
>> +SIZE (openmw-0.46.0.tar.gz) = 5155004
>> Index: patches/patch-components_crashcatcher_crashcatcher_cpp
>> ===
>> RCS file: patches/patch-components_crashcatcher_crashcatcher_cpp
>> diff -N patches/patch-components_crashcatcher_crashcatcher_cpp
>> --- patches/patch-components_crashcatcher_crashcatcher_cpp 25 Nov 2019
>> 10:21:25 - 1.1
>> +++ /dev/null1 Jan 1970 00:00:00 -
>> @@ -1,152 +0,0 @@
>> -$OpenBSD: patch-components_crashcatcher_crashcatcher_cpp,v 1.1 2019/11/25
>> 10:21:25 solene Exp $
>> -
>> -Fixes game failing to start.
>> -Upstream commit fe69e5507df97d84d3cb29d760da78f64e41cc07
>> -
>> -Index: components/crashcatcher/crashcatcher.cpp
>> components/crashcatcher/crashcatcher.cpp.orig
>> -+++ components/crashcatcher/crashcatcher.cpp
>> -@@ -17,6 +17,7 @@
>> - #include
>> -
>> - #include
>> -+#include
>> -
>> - namespace bfs = boost::filesystem;
>> -
>> -@@ -34,9 +35,13 @@ namespace bfs = boost::filesystem;
>> -
>> - #if defined(__APPLE__)
>> - #include
>> -+#include
>> - #endif
>> -
>> --#define UNUSED(x) (void)(x)
>> -+#if defined(__FreeBSD__)
>> -+#include
>> -+#include
>> -+#endif
>> -
>> - static const char crash_switch[] = "--cc-handle-crash";
>> -
>> -@@ -413,6 +418,39 @@ static void crash_handler(const char *logfile)
>> - exit(0);
>> - }
>> -
>> -+static void getExecPath(char **argv)
>> -+{
>> -+#if defined (__FreeBSD__)
>> -+int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
>> -+size_t size = sizeof(argv0);
>> -+
>> -+if (sysctl(mib, 4, argv0, , nullptr, 0) == 0)
>> -+return;
>> -+#endif
>> -+
>> -+#if defined (__APPLE__)
>> -+if(proc_pidpath(getpid(), argv0, sizeof(argv0)) > 0)
>> -+return;
>> -+#endif
>> -+int cwdlen;
>> -+const char *statusPaths[] = {"/proc/self/exe", "/proc/self/file",
>> "/proc/curproc/exe", "/proc/curproc/file"};
>> -+memset(argv0, 0, sizeof(argv0));
>> -+
>> -+for(const char *path : statusPaths)
>> -+{
>> -+if (readlink(path, arg
[update] openmw-0.46.0
Hi,
OpenMW got a new release:
https://openmw.org/2020/openmw-0-46-0-released/
I've been playing with this on amd64, seems to work so far.
timo
Index: Makefile
===
RCS file: /cvs/ports/games/openmw/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile24 May 2020 21:11:00 - 1.23
+++ Makefile21 Jun 2020 10:39:50 -
@@ -4,12 +4,11 @@ ONLY_FOR_ARCHS = amd64 i386
COMMENT = open source implementation of TES III: Morrowind
-V =0.45.0
+V =0.46.0
GH_ACCOUNT = OpenMW
GH_PROJECT = openmw
GH_TAGNAME = openmw-$V
DISTNAME = openmw-$V
-REVISION = 0
CATEGORIES = games
Index: distinfo
===
RCS file: /cvs/ports/games/openmw/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo25 Nov 2019 10:21:25 - 1.9
+++ distinfo21 Jun 2020 10:39:50 -
@@ -1,2 +1,2 @@
-SHA256 (openmw-0.45.0.tar.gz) = tjz5cfQG718oAZ9l6eK9lkGiJ0We3kXRR1YpF/Z+HGQ=
-SIZE (openmw-0.45.0.tar.gz) = 4711103
+SHA256 (openmw-0.46.0.tar.gz) = B6NajxX2f1qnIQwqMHpttWYKm2H+NJg8NbFyyGca/Vg=
+SIZE (openmw-0.46.0.tar.gz) = 5155004
Index: patches/patch-components_crashcatcher_crashcatcher_cpp
===
RCS file: patches/patch-components_crashcatcher_crashcatcher_cpp
diff -N patches/patch-components_crashcatcher_crashcatcher_cpp
--- patches/patch-components_crashcatcher_crashcatcher_cpp 25 Nov 2019
10:21:25 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,152 +0,0 @@
-$OpenBSD: patch-components_crashcatcher_crashcatcher_cpp,v 1.1 2019/11/25
10:21:25 solene Exp $
-
-Fixes game failing to start.
-Upstream commit fe69e5507df97d84d3cb29d760da78f64e41cc07
-
-Index: components/crashcatcher/crashcatcher.cpp
components/crashcatcher/crashcatcher.cpp.orig
-+++ components/crashcatcher/crashcatcher.cpp
-@@ -17,6 +17,7 @@
- #include
-
- #include
-+#include
-
- namespace bfs = boost::filesystem;
-
-@@ -34,9 +35,13 @@ namespace bfs = boost::filesystem;
-
- #if defined(__APPLE__)
- #include
-+#include
- #endif
-
--#define UNUSED(x) (void)(x)
-+#if defined(__FreeBSD__)
-+#include
-+#include
-+#endif
-
- static const char crash_switch[] = "--cc-handle-crash";
-
-@@ -413,6 +418,39 @@ static void crash_handler(const char *logfile)
- exit(0);
- }
-
-+static void getExecPath(char **argv)
-+{
-+#if defined (__FreeBSD__)
-+int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
-+size_t size = sizeof(argv0);
-+
-+if (sysctl(mib, 4, argv0, , nullptr, 0) == 0)
-+return;
-+#endif
-+
-+#if defined (__APPLE__)
-+if(proc_pidpath(getpid(), argv0, sizeof(argv0)) > 0)
-+return;
-+#endif
-+int cwdlen;
-+const char *statusPaths[] = {"/proc/self/exe", "/proc/self/file",
"/proc/curproc/exe", "/proc/curproc/file"};
-+memset(argv0, 0, sizeof(argv0));
-+
-+for(const char *path : statusPaths)
-+{
-+if (readlink(path, argv0, sizeof(argv0)) != -1)
-+return;
-+}
-+
-+if(argv[0][0] == '/')
-+snprintf(argv0, sizeof(argv0), "%s", argv[0]);
-+else if (getcwd(argv0, sizeof(argv0)) != NULL)
-+{
-+cwdlen = strlen(argv0);
-+snprintf(argv0+cwdlen, sizeof(argv0)-cwdlen, "/%s", argv[0]);
-+}
-+}
-+
- int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int
*signals, const char *logfile, int (*user_info)(char*, char*))
- {
- struct sigaction sa;
-@@ -424,20 +462,7 @@ int crashCatcherInstallHandlers(int argc, char **argv,
-
- cc_user_info = user_info;
-
--if(argv[0][0] == '/')
--snprintf(argv0, sizeof(argv0), "%s", argv[0]);
--else
--{
--{
--/* we don't want to disable "ignoring return value" warnings, so
we make
-- * a special exception here. */
--char * unused;
--unused = getcwd(argv0, sizeof(argv0));
--UNUSED(unused);
--}
--retval = strlen(argv0);
--snprintf(argv0+retval, sizeof(argv0)-retval, "/%s", argv[0]);
--}
-+getExecPath(argv);
-
- /* Set an alternate signal stack so SIGSEGVs caused by stack overflows
- * still run */
-@@ -467,20 +492,24 @@ int crashCatcherInstallHandlers(int argc, char **argv,
-
- static bool is_debugger_present()
- {
--#if !defined (__APPLE__)
--bfs::ifstream file((bfs::path("/proc/self/status")));
--while (!file.eof())
-+#if defined (__linux__)
-+bfs::path procstatus = bfs::path("/proc/self/status");
-+if (bfs::exists(procstatus))
- {
--std::string word;
--file >> word;
--if (word == "TracerPid:")
-+bfs::ifstream file((procstatus));
-+while (!file.eof())
- {
-+std::string word;
-
Re: Can't load extensions with postgresql-server
Nevermind, seems this was a case of botched package installation, re-installing
postgresql-contrib package fixed file collisions and now loading extensions
work.
timo
Timo Myyrä writes:
> Hi,
>
> Does the OpenBSD require some extra steps for loading postgresql server
> extensions?
>
>
> tmy@asteroid tmy $ psql -d jemma -U postgres
> Password for user postgres:
> psql (12.3)
> Type "help" for help.
>
> jemma=# create extension pgcrypto;
> ERROR: could not load library "/usr/local/lib/postgresql/pgcrypto.so":
> Cannot load specified object
> jemma=# \du
>List of roles
> Role name | Attributes |
> Member of
> ---++---
> jemma || {}
> postgres | Superuser, Create role, Create DB, Replication, Bypass RLS | {}
>
> jemma=# \q
> tmy@asteroid tmy $ ldd /usr/local/lib/postgresql/pgcrypto.so
> /usr/local/lib/postgresql/pgcrypto.so:
> StartEnd Type Open Ref GrpRef Name
> 168b6def7000 168b6df2e000 dlib 10 0
> /usr/local/lib/postgresql/pgcrypto.so
> 168b2cbea000 168b2ccde000 rlib 01 0
> /usr/lib/libc.so.95.1
> 168b9df22000 168b9e141000 rlib 01 0
> /usr/lib/libcrypto.so.45.5
> 168b35403000 168b3541e000 rlib 01 0
> /usr/lib/libz.so.5.0
> tmy@asteroid tmy $ ls -l /usr/lib/libc.so.95.1 /usr/lib/libcrypto.so.45.5
> /usr/lib/libz.so.5.0
> -r--r--r-- 1 root bin 3564664 Oct 25 2019 /usr/lib/libc.so.95.1
> -r--r--r-- 1 root bin 7188496 Oct 25 2019 /usr/lib/libcrypto.so.45.5
> -r--r--r-- 1 root bin 239960 Jun 9 03:23 /usr/lib/libz.so.5.0
Can't load extensions with postgresql-server
Hi,
Does the OpenBSD require some extra steps for loading postgresql server
extensions?
tmy@asteroid tmy $ psql -d jemma -U postgres
Password for user postgres:
psql (12.3)
Type "help" for help.
jemma=# create extension pgcrypto;
ERROR: could not load library "/usr/local/lib/postgresql/pgcrypto.so": Cannot
load specified object
jemma=# \du
List of roles
Role name | Attributes |
Member of
---++---
jemma || {}
postgres | Superuser, Create role, Create DB, Replication, Bypass RLS | {}
jemma=# \q
tmy@asteroid tmy $ ldd /usr/local/lib/postgresql/pgcrypto.so
/usr/local/lib/postgresql/pgcrypto.so:
StartEnd Type Open Ref GrpRef Name
168b6def7000 168b6df2e000 dlib 10 0
/usr/local/lib/postgresql/pgcrypto.so
168b2cbea000 168b2ccde000 rlib 01 0
/usr/lib/libc.so.95.1
168b9df22000 168b9e141000 rlib 01 0
/usr/lib/libcrypto.so.45.5
168b35403000 168b3541e000 rlib 01 0
/usr/lib/libz.so.5.0
tmy@asteroid tmy $ ls -l /usr/lib/libc.so.95.1 /usr/lib/libcrypto.so.45.5
/usr/lib/libz.so.5.0
-r--r--r-- 1 root bin 3564664 Oct 25 2019 /usr/lib/libc.so.95.1
-r--r--r-- 1 root bin 7188496 Oct 25 2019 /usr/lib/libcrypto.so.45.5
-r--r--r-- 1 root bin 239960 Jun 9 03:23 /usr/lib/libz.so.5.0
[maintainer update] gerbil-0.16
Hi, Gerbil scheme got new release a while ago. Only tested on amd64, would be nice if someone could test if the tags building still fails on i386. timo Index: Makefile === RCS file: /cvs/ports/lang/gerbil/Makefile,v retrieving revision 1.9 diff -u -p -u -p -r1.9 Makefile --- Makefile21 Feb 2020 20:25:55 - 1.9 +++ Makefile9 Jun 2020 17:34:33 - @@ -9,7 +9,7 @@ COMMENT = dialect of Scheme designed for GH_ACCOUNT = vyzo GH_PROJECT = gerbil -GH_TAGNAME = v0.15.1 +GH_TAGNAME = v0.16 CATEGORIES = lang Index: distinfo === RCS file: /cvs/ports/lang/gerbil/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo10 Feb 2019 18:01:30 - 1.3 +++ distinfo9 Jun 2020 17:34:33 - @@ -1,2 +1,2 @@ -SHA256 (gerbil-0.15.1.tar.gz) = PSnuzaqEWwc7+EE81U5CCz9Ix5wl5D+rWjed3gKdDN4= -SIZE (gerbil-0.15.1.tar.gz) = 1326871 +SHA256 (gerbil-0.16.tar.gz) = EVfU72DatqD3xJhtXJODkZcwRQk8RwoD/+AiZsTT4Rk= +SIZE (gerbil-0.16.tar.gz) = 1715765 Index: pkg/PLIST === RCS file: /cvs/ports/lang/gerbil/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- pkg/PLIST 10 Feb 2019 18:01:30 - 1.3 +++ pkg/PLIST 9 Jun 2020 17:34:33 - @@ -5,6 +5,7 @@ gerbil/LICENSE-APACHE-2.0.txt gerbil/LICENSE-LGPL.txt gerbil/README.md gerbil/bin/ +gerbil/bin/.keep gerbil/bin/gxc gerbil/bin/gxi gerbil/bin/gxi-build-script @@ -15,7 +16,16 @@ gerbil/bin/gxi-script gerbil/doc/ gerbil/doc/.vuepress/ gerbil/doc/.vuepress/config.js -gerbil/doc/.vuepress/style.styl +gerbil/doc/.vuepress/public/ +gerbil/doc/.vuepress/public/img/ +gerbil/doc/.vuepress/public/img/gerbil-detailed-consio_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-detailed_INK.svg +gerbil/doc/.vuepress/public/img/gerbil-detailed_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored-consio_OPT.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored_INK.svg +gerbil/doc/.vuepress/public/img/gerbil-flat-colored_OPT.svg +gerbil/doc/.vuepress/styles/ +gerbil/doc/.vuepress/styles/index.styl gerbil/doc/build.sh gerbil/doc/guide/ gerbil/doc/guide/README.md @@ -32,6 +42,7 @@ gerbil/doc/guide/profiler.md gerbil/doc/guide/r7rs.md gerbil/doc/guide/shell.md gerbil/doc/guide/srfi.md +gerbil/doc/package-lock.json gerbil/doc/package.json gerbil/doc/readme.md gerbil/doc/reference/ @@ -70,6 +81,7 @@ gerbil/doc/reference/sort.md gerbil/doc/reference/srfi.md gerbil/doc/reference/stdlib.md gerbil/doc/reference/stxparam.md +gerbil/doc/reference/stxutil.md gerbil/doc/reference/sugar.md gerbil/doc/reference/test.md gerbil/doc/reference/text.md @@ -82,6 +94,7 @@ gerbil/doc/tutorials/kvstore.md gerbil/doc/tutorials/languages.md gerbil/doc/tutorials/proxy.md gerbil/lib/ +gerbil/lib/.keep gerbil/lib/gerbil/ gerbil/lib/gerbil/compiler/ gerbil/lib/gerbil/compiler.ssi @@ -113,6 +126,10 @@ gerbil/lib/gerbil/compiler/optimize-call gerbil/lib/gerbil/compiler/optimize-call.ssxi.ss @bin gerbil/lib/gerbil/compiler/optimize-call__0.o1 @bin gerbil/lib/gerbil/compiler/optimize-call__rt.o1 +gerbil/lib/gerbil/compiler/optimize-spec.ssi +gerbil/lib/gerbil/compiler/optimize-spec.ssxi.ss +@bin gerbil/lib/gerbil/compiler/optimize-spec__0.o1 +@bin gerbil/lib/gerbil/compiler/optimize-spec__rt.o1 gerbil/lib/gerbil/compiler/optimize-top.ssi gerbil/lib/gerbil/compiler/optimize-top.ssxi.ss @bin gerbil/lib/gerbil/compiler/optimize-top__0.o1 @@ -266,6 +283,11 @@ gerbil/lib/gerbil/gambit/threads.ssxi.ss @bin gerbil/lib/gerbil/gambit/threads__0.o1 @bin gerbil/lib/gerbil/gambit/threads__rt.o1 @bin gerbil/lib/gerbil/gambit__rt.o1 +@bin gerbil/lib/gerbil/polydactyl$_gambit__rt.o1 +gerbil/lib/gerbil/polydactyl.ssi +gerbil/lib/gerbil/polydactyl.ssxi.ss +@bin gerbil/lib/gerbil/polydactyl__1.o1 +@bin gerbil/lib/gerbil/polydactyl__rt.o1 gerbil/lib/gerbil/tools/ gerbil/lib/gerbil/tools/gxpkg.ssi gerbil/lib/gerbil/tools/gxpkg.ssxi.ss @@ -295,162 +317,317 @@ gerbil/lib/scheme/ gerbil/lib/scheme/base-etc.ssi gerbil/lib/scheme/base-etc.ssxi.ss @bin gerbil/lib/scheme/base-etc__0.o1 +gerbil/lib/scheme/base-etc__0.scm @bin gerbil/lib/scheme/base-etc__1.o1 +gerbil/lib/scheme/base-etc__1.scm @bin gerbil/lib/scheme/base-etc__rt.o1 +gerbil/lib/scheme/base-etc__rt.scm gerbil/lib/scheme/base-impl.ssi gerbil/lib/scheme/base-impl.ssxi.ss @bin gerbil/lib/scheme/base-impl__0.o1 +gerbil/lib/scheme/base-impl__0.scm @bin gerbil/lib/scheme/base-impl__1.o1 +gerbil/lib/scheme/base-impl__1.scm @bin gerbil/lib/scheme/base-impl__rt.o1 +gerbil/lib/scheme/base-impl__rt.scm gerbil/lib/scheme/base-ports.ssi gerbil/lib/scheme/base-ports.ssxi.ss @bin gerbil/lib/scheme/base-ports__0.o1 +gerbil/lib/scheme/base-ports__0.scm @bin gerbil/lib/scheme/base-ports__rt.o1 +gerbil/lib/scheme/base-ports__rt.scm gerbil/lib/scheme/base-vectors.ssi
Re: Update lang/ecl to 20.4.24
On Tue, Jun 2, 2020, at 12:20, Timo Myyrä wrote: > > > On Tue, Jun 2, 2020, at 12:16, Ingo Feinerer wrote: > > On Tue, Jun 02, 2020 at 07:01:57AM +0300, Timo Myyrä wrote: > > > Did you get the maxima tests to run as well? I didn't have success yet > > > with those although the compilation worked. > > > > How did you run the tests? > > > > `make test` runs a test suite but the results are only written to a log > > file (pobj/maxima-5.43.2/maxima-5.43.2/tests/ecl-test.sh.log). As the > > tests take some time the test suite might appear to hang. > > > > The same test suite can be triggered manually if you start xmaxima and > > click on the `Maxima->Run Tests` menu entry. The output is immediately > > shown in the input/output window. > > > > Best regards, > > Ingo > > > > I did use the make test. Wondered a bit about the lack of output mut > noticed with ktrace it has doing the tests so I waited. I'll check > again later to see if the exact failure. > > Timo > > I run the tests and got following output: Running the testsuite... ;;; Loading #P"/usr/local/lib/ecl/sb-bsd-sockets.fas" ;;; Loading #P"/usr/local/lib/ecl/sockets.fas" Maxima 5.43.2 http://maxima.sourceforge.net using Lisp ECL 20.4.24 Distributed under the GNU Public License. See the file COPYING. Dedicated to the memory of William Schelter. The function bug_report() provides bug reporting information. (%i1) build_info() (%o1) Maxima version: "5.43.2" Maxima build date: "2020-05-31 08:38:24" Host type: "x86_64-unknown-openbsd6.7" Lisp implementation type: "ECL" Lisp implementation version: "20.4.24" User dir: "/maxima-5.43.2_writes_to_HOME/.maxima" Temp dir: "/tmp" Object dir: "/usr/ports/pobj/maxima-5.43.2/maxima-5.43.2/binary/5_43_2/ecl/20_4_24" Frontend: false (%i2) testsuite_files:append(["rtest_ask.mac"],testsuite_files) (%o2) [rtest_ask.mac, [rtest_rules], rtestnset, [rtest1, [115, 183, 185, 186]], [rtest1a, [33]], [rtest2, [86, 95]], rtest4, [rtest5], [rtest6, [43, 45, 46]], rtest6a, rtest6b, rtest7, rtest9, [rtest9a], [rtest10, [24, 25]], [rtest11], rtest13, rtest13s, [rtest14, [145, 201, 233, 234, 249, 250, 251, 252, 267, 297, 298, 307, 310, 312, 315, 319]], rtest15, [rtest16, [50, 524, 525, 561]], rtestode, rtestode_zp, rtest3, [rtest8, [104]], [rtest12, [76, 78]], rexamples, [rtesthyp, [105, 112, 113, 123, 124, 128]], [rtest_hypgeo, [143]], rtestmt19937, rtest_allnummod, rtestconjugate, [rtestsum, [3, 4, 18, 75]], [rtest_trig], rtest_zeta, rtest_diff_invtrig, rtest_scalarp, rtest_everysome, [rtestint, [232]], rtest_numth, rtestifactor, [rtest_equal, [157, 160]], rtest_abs, [rtest_taylor, [88, 91, 97, 104, 128, 129]], [rtest_dot], rtest_mset, rtest_boolean, rtest_round, [rtest_map, [2, 3, 4]], [rtest_sign, [21, 25, 30, 40, 65, 72, 79]], rtest_algebraic, [rtest_gamma], rtest_expintegral, rtest_signum, rtest_lambert_w, [rtest_elliptic, [129, 143]], rtest_integrate, rtest_integrate_special, [rtest_sqrt, [89]], [rtest_carg, [40, 41]], [rtest_log], [rtest_power, [19, 20, 26, 58, 65]], rtestdefstruct, [rtest_limit], rtest_powerseries, [rtest_laplace, [29, 49, 50, 51, 54, 59, 60, 61, 62, 78, 80]], rtest_plotoptions, rtest_algsys, rtest_trace] (%i3) run_testsuite(share_tests = true) Testsuite run for ECL 20.4.24: Running tests in rtest_ask.mac: 135/135 tests passed Running tests in rtest_rules: 119/119 tests passed Running tests in rtestnset: 617/617 tests passed Running tests in rtest1: ** Problem 115 (line 341) *** Input: (batch(file_search(test_readbase_maxima, file_search_tests)), test_readbase_maxima()) Result: read and interpret /usr/ports/pobj/maxima-5.43.2/maxima-5.43.2/tests/test_readbase_maxima.mac (%i1) test_readbase_maxima():=[4,3,2,1,40,30,20,10] (%o1) test_readbase_maxima() := [4, 3, 2, 1, 40, 30, 20, 10] [4, 3, 2, 1, 40, 30, 20, 10] ... Which was correct, but was expected to be wrong due to a known bug in Maxima or ECL. 185/185 tests passed (not counting 4 expected errors) The following 1 problem passed but was expected to fail: (115) Running tests in rtest1a: 34/34 tests passed (not counting 1 expected errors) Running tests in rtest2: 287/287 tests passed (not counting 2 expected errors) Running tests in rtest4: 94/94 tests passed Running tests in rtest5: 83/83 tests passed Running tests in rtest6: ** Problem 43 (line 166) *** Input: (string(2.0e-7), (%% = 2.0e-7) or (%% = 2.0E-7) or %%) Result: true ... Which was correct, but was expected to be wrong due to a known bug in Maxima or ECL. ** Problem 45 (line 172) *** Input: 1 (string(--), (%% = 9.765625e-4) or (%%
Re: Update lang/ecl to 20.4.24
On Tue, Jun 2, 2020, at 12:16, Ingo Feinerer wrote: > On Tue, Jun 02, 2020 at 07:01:57AM +0300, Timo Myyrä wrote: > > Did you get the maxima tests to run as well? I didn't have success yet > > with those although the compilation worked. > > How did you run the tests? > > `make test` runs a test suite but the results are only written to a log > file (pobj/maxima-5.43.2/maxima-5.43.2/tests/ecl-test.sh.log). As the > tests take some time the test suite might appear to hang. > > The same test suite can be triggered manually if you start xmaxima and > click on the `Maxima->Run Tests` menu entry. The output is immediately > shown in the input/output window. > > Best regards, > Ingo > I did use the make test. Wondered a bit about the lack of output mut noticed with ktrace it has doing the tests so I waited. I'll check again later to see if the exact failure. Timo
Re: Update lang/ecl to 20.4.24
On Sun, May 31, 2020, at 10:43, Ingo Feinerer wrote: > On Sat, May 30, 2020 at 08:32:23AM -0700, Josh Elsasser wrote: > > Maxima needs an upstream patch to build with ecl 20.4.24. This should > > be safe to commit now, before updating ecl. > > > > diff --git a/math/maxima/patches/patch-lisp-utils_defsystem_lisp > > b/math/maxima/patches/patch-lisp-utils_defsystem_lisp > > new file mode 100644 > > index 000..b3fd1683402 > > --- /dev/null > > +++ b/math/maxima/patches/patch-lisp-utils_defsystem_lisp > > @@ -0,0 +1,17 @@ > > +$OpenBSD$ > > + > > +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 > > +Fix for Bug #3629, to compile with ECL 20.4.24 > > + > > +Index: lisp-utils/defsystem.lisp > > +--- lisp-utils/defsystem.lisp.orig > > lisp-utils/defsystem.lisp > > +@@ -4152,7 +4152,7 @@ the system definition, if provided." > > + #+:ecl > > + (progn > > + (ext:package-lock "CL" nil) > > +-(setf (symbol-function 'lisp:require) > > ++(setf (symbol-function 'cl:require) > > + (symbol-function 'new-require)) > > + (ext:package-lock "CL" t)) > > + #+:lispworks > > diff --git a/math/maxima/patches/patch-src_maxima_system > > b/math/maxima/patches/patch-src_maxima_system > > new file mode 100644 > > index 000..5d651aa002e > > --- /dev/null > > +++ b/math/maxima/patches/patch-src_maxima_system > > @@ -0,0 +1,18 @@ > > +$OpenBSD$ > > + > > +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 > > +Fix for Bug #3629, to compile with ECL 20.4.24 > > + > > +Index: src/maxima.system > > +--- src/maxima.system.orig > > src/maxima.system > > +@@ -80,8 +80,7 @@ > > + (let ((x (symbol-value (find-symbol > > "*AUTOCONF-LD-FLAGS*" > > + (find-package > > "MAXIMA") > > + (if (and x (not (string= x ""))) (list x))) > > +-:epilogue-code '(progn (require :defsystem) > > +- (cl-user::run))) > > ++:epilogue-code '(progn (cl-user::run))) > > + > > + (defun maxima-binary-pathname () > > + #+clisp > > Committed. Thanks for the patch! > > Best regards, > Ingo > > Did you get the maxima tests to run as well? I didn't have success yet with those although the compilation worked. Timo
