[Update from Maintainer] databases/sqlcipher 4.6.0
Hi, Here's an update to databases/sqlcipher, upgrading it from 4.5.6 to 4.6.0. Changelog (from https://github.com/sqlcipher/sqlcipher/releases): v4.6.0 Latest Important: Starting in 4.6.0 the default configuration will emit ERROR and WARN level log messages upon initialization. Default log output is sent to logcat for Android, Console for iOS and macOS, and stderr for all other platforms. Sets default log level to WARN Sends default log output to: logcat for Android; Console for iOS and macOS; and stderr for all other platforms General improvements to log level assignments, output, and sanitization Fixes Apple Privacy Manifest by removing empty NSPrivacyCollectedDataType from PrivacyInfo.xcprivacy Moves Swift support defines for podspec user_target_xcconfig so they only apply to the consuming project v4.5.7 Updates baseline to upstream SQLite 3.45.3 Adds “device” logging and profile target using os_log for Apple and logcat on Android Updates podspec for current Xcode versions, improved Swift support, and Privacy Manifest Fixes issues compiling with SQLITE_OMIT_LOG macro Fixes a malformed man page caused by old merge conflict No changes to the shared library (verified with nm -g between the 4.5.6 and 4.6.0 libraries.) Thanks, Tom Index: Makefile === RCS file: /cvs/ports/databases/sqlcipher/Makefile,v diff -u -p -u -p -r1.9 Makefile --- Makefile2 Apr 2024 12:17:13 - 1.9 +++ Makefile2 Jun 2024 10:20:10 - @@ -2,7 +2,7 @@ COMMENT = encrypted SQLite database GH_ACCOUNT = sqlcipher GH_PROJECT = sqlcipher -GH_TAGNAME = v4.5.6 +GH_TAGNAME = v4.6.0 SHARED_LIBS += sqlcipher 1.1 # 8.6 Index: distinfo === RCS file: /cvs/ports/databases/sqlcipher/distinfo,v diff -u -p -u -p -r1.8 distinfo --- distinfo2 Apr 2024 12:17:13 - 1.8 +++ distinfo2 Jun 2024 10:20:10 - @@ -1,2 +1,2 @@ -SHA256 (sqlcipher-4.5.6.tar.gz) = 5KUn445nCQwdLcQd8oJw0WwV98pSEKPn7ExLj9o24o8= -SIZE (sqlcipher-4.5.6.tar.gz) = 18937692 +SHA256 (sqlcipher-4.6.0.tar.gz) = h5+wMMNrxROAKa9qo64/NsKMWOkgrwWsfKeKWRWy+jw= +SIZE (sqlcipher-4.6.0.tar.gz) = 19017463
[Maintainer Update] games/ezquake HOMEPAGE changed
Hi,
The original HOMEPAGE for the games/ezquake port has changed.
The old site has been removed and the site is at https://ezquake.com/
Below is a diff to update this in the ports tree.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
diff -u -p -u -p -r1.17 Makefile
--- Makefile15 Nov 2023 20:33:08 - 1.17
+++ Makefile13 May 2024 19:05:34 -
@@ -5,6 +5,7 @@ CATEGORIES =games
N =ezquake
V =3.6.4
PKGNAME = ${N}-${V}
+REVISION = 0
DIST_TUPLE += github QW-Group ${N}-source ${V} . # GPLv2+
DIST_TUPLE += github QW-Group qwprot 53af547d0608a1507895fc1629cdc3f4820fc0af
src/qwprot # GPLv2+
@@ -13,7 +14,7 @@ PERMIT_PACKAGE = Yes
MAINTAINER = Tom Murphy
-HOMEPAGE = https://ezquake.github.io/
+HOMEPAGE = https://ezquake.com/
WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m minizip pcre2-8 png
WANTLIB += pthread sndfile speex speexdsp z
Re: UPDATE: FreeOrion 0.5.0.1
On Wed, Apr 03, 2024 at 02:34:39AM -0400, Brad Smith wrote:
> Here is an update to FreeOrion 0.5.0.1.
>
>
> [v0.5.0.1] - 2024-03-04
> ---
>
> ### Bugfixes / Improvements
>
> - Fixed issue with Boost for Boost version 1.82 and greater
> - Fixed ship design validation
> - Fixed species description in encyclopedia
> - Fixed division by zero error in AI scripts
> - Fixed issue with rendering caret at start of line in multi line edit boxes
> - Update logistics facilitator description to fix number of external slots
> - Fixed Megalith increase infrastructure effect
> - Ignore irrelevant SDL error message
> - Build prerequisite ship facilities when needed
> - Only show scrap building popup if a scrap order could be issued for that
> building by the client empire
> - Apply self-sustaining xenophobic malus only where self-sustaining bonus
> applies
> - Fix division by zero when AI has researched everything
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/freeorion/Makefile,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 Makefile
> --- Makefile 26 Sep 2023 09:41:35 - 1.19
> +++ Makefile 3 Apr 2024 06:29:20 -
> @@ -1,4 +1,4 @@
> -V = 0.5
> +V = 0.5.0.1
> COMMENT =turn-based space empire and galactic conquest computer game
> DISTNAME = FreeOrion_v${V}_Source
> PKGNAME =freeorion-${V}
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/freeorion/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- distinfo 13 May 2023 18:34:18 - 1.6
> +++ distinfo 3 Apr 2024 06:29:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (FreeOrion_v0.5_Source.tar.gz) =
> CfMc/lXWFlvf7pfbOnXCRarhEzx5L9SAr3oTqmdnTLE=
> -SIZE (FreeOrion_v0.5_Source.tar.gz) = 152861207
> +SHA256 (FreeOrion_v0.5.0.1_Source.tar.gz) =
> xvYsO0ANULM21iUIrF1dZW5MDI5X0P8rJw9yOB5o4ds=
> +SIZE (FreeOrion_v0.5.0.1_Source.tar.gz) = 152861158
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/games/freeorion/patches/patch-CMakeLists_txt,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 13 May 2023 18:34:18 - 1.6
> +++ patches/patch-CMakeLists_txt 3 Apr 2024 06:29:20 -
> @@ -3,7 +3,7 @@ Remove hardcoded optimisation option.
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -501,7 +501,6 @@ target_compile_options(freeorionparseobj
> +@@ -500,7 +500,6 @@ target_compile_options(freeorionparseobj
> PRIVATE
> $<$:-ftemplate-depth=512>
> $<$:-ftemplate-depth=512>
> Index: patches/patch-GG_CMakeLists_txt
> ===
> RCS file: /cvs/ports/games/freeorion/patches/patch-GG_CMakeLists_txt,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-GG_CMakeLists_txt
> --- patches/patch-GG_CMakeLists_txt 13 May 2023 18:34:18 - 1.3
> +++ patches/patch-GG_CMakeLists_txt 3 Apr 2024 06:29:20 -
> @@ -2,7 +2,7 @@ Add X11BASE include directory
> Index: GG/CMakeLists.txt
> --- GG/CMakeLists.txt.orig
> +++ GG/CMakeLists.txt
> -@@ -86,6 +86,7 @@ endif()
> +@@ -85,6 +85,7 @@ endif()
> include_directories(
> ${CMAKE_CURRENT_SOURCE_DIR}
> ${CMAKE_CURRENT_BINARY_DIR}
> Index: patches/patch-GG_src_dialogs_FileDlg_cpp
> ===
> RCS file: patches/patch-GG_src_dialogs_FileDlg_cpp
> diff -N patches/patch-GG_src_dialogs_FileDlg_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-GG_src_dialogs_FileDlg_cpp 3 Apr 2024 06:29:20 -
> @@ -0,0 +1,46 @@
> +updates for Boost 1.85
> +https://github.com/freeorion/freeorion/commit/bc02d58fc1efc70c6c3d33c20a71ef0dd4852d23
> +
> +Index: GG/src/dialogs/FileDlg.cpp
> +--- GG/src/dialogs/FileDlg.cpp.orig
> GG/src/dialogs/FileDlg.cpp
> +@@ -9,7 +9,7 @@
> +
> + #include
> + #include
> +-#include
> ++#include
> + #include
> + // boost::spirit::classic pulls in windows.h which in turn defines macro
> + // versions of min and max. Defining NOMINMAX disables the creation of
> those
> +@@ -215,7 +215,7 @@ void FileDlg::CompleteConstruction()
> +
> + if (!m_init_filename.empty()) {
> + fs::path filename_path =
> fs::system_complete(fs::path(m_init_filename));
> +-m_files_edit->SetText(filename_path.leaf().string());
> ++m_files_edit->SetText(filename_path.filename().string());
> + }
> + }
> +
> +@@ -548,7 +548,7 @@ void FileDlg::UpdateList()
> + if (!m_in_win32_drive_selection) {
> + // parent directory selector
> + if ((s_working_dir.string() != s_working_dir.root_path().string() &&
> +- !s_working_dir.branch_path().string().empty()) ||
> ++ !s_working_dir.parent_path().string(
games/yquake2 8.00 -> 8.30
Hi,
Here's a diff to update games/yquake2 from 8.00 to 8.30.
Have only tested the server binary but not the client (as I don't
have an OpenBSD gaming machine at the moment) and it loads and runs.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/yquake2/Makefile,v
diff -u -p -u -p -r1.29 Makefile
--- Makefile6 Feb 2024 12:49:36 - 1.29
+++ Makefile2 Apr 2024 12:33:49 -
@@ -1,6 +1,6 @@
COMMENT= Yamagi Quake II
N= yquake2
-V= 8.00
+V= 8.30
PKGNAME= ${N}-${V}
DISTNAME= quake2-${V}
CATEGORIES=games
Index: distinfo
===
RCS file: /cvs/ports/games/yquake2/distinfo,v
diff -u -p -u -p -r1.11 distinfo
--- distinfo15 Dec 2021 13:44:12 - 1.11
+++ distinfo2 Apr 2024 12:33:49 -
@@ -1,2 +1,2 @@
-SHA256 (quake2-8.00.tar.xz) = YNjRD8K011uWElGZDk2QM1cZSnMhC8HkKSTt74h9DrI=
-SIZE (quake2-8.00.tar.xz) = 2086776
+SHA256 (quake2-8.30.tar.xz) = 4tlWOtgm/TflgHjxXbrpi71IOUnymwl9BKgxVrwQm4Y=
+SIZE (quake2-8.30.tar.xz) = 2165532
[Update from Maintainer] games/mvdsv v1.00
Hi,
Below is a diff to update games/mvdsv from 0.36 to 1.00.
Changelog:
Improvements
Reduce memory during loadmap (dsvensson)
Enable pm_bunnyspeedcap cvar (ceeeKay)
DOWNLOAD: bump download speed (qqshka)
DEMO: add epoch time to fullserverinfo (ciscon)
Bugfixes
laststats connectionless command responds with invalid json (vikpe)
Patch line numbers slightly updated but aside from that no changes to
the port.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/mvdsv/Makefile,v
diff -u -p -u -p -r1.10 Makefile
--- Makefile12 Nov 2023 17:58:31 - 1.10
+++ Makefile1 Apr 2024 10:11:10 -
@@ -3,7 +3,7 @@ COMMENT = QuakeWorld server
CATEGORIES = games
QUAKE_COMMIT = bf4ac424ce754894ac8f1dae6a3981954bc9852d
-DIST_TUPLE += github QW-Group mvdsv 0.36 .
+DIST_TUPLE += github QW-Group mvdsv v1.00 .
DIST_TUPLE += github QW-Group qwprot 53af547d0608a1507895fc1629cdc3f4820fc0af
src/qwprot
DIST_TUPLE += github id-software Quake ${QUAKE_COMMIT} .
Index: distinfo
===
RCS file: /cvs/ports/games/mvdsv/distinfo,v
diff -u -p -u -p -r1.5 distinfo
--- distinfo12 Nov 2023 17:58:31 - 1.5
+++ distinfo1 Apr 2024 10:11:10 -
@@ -1,6 +1,6 @@
-SHA256 (QW-Group-mvdsv-0.36.tar.gz) =
jyoHILfjcMyqejVQTA59165akFGzbpS3jWUlbzTpuOk=
+SHA256 (QW-Group-mvdsv-v1.00.tar.gz) =
Lon/SIERCWIpompgImcB5yQfQ6vI6/6YWmwmaqs39MM=
SHA256 (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) =
+nkEALY4D495qX9h2LdciMAwR3CWcT6ewRLjBUsuxFA=
SHA256 (id-software-Quake-bf4ac424ce754894ac8f1dae6a3981954bc9852d.tar.gz) =
+5joyZdAEj8/rIMME4dYTsH2hNuJCMv0K3GH0G05kBM=
-SIZE (QW-Group-mvdsv-0.36.tar.gz) = 551595
+SIZE (QW-Group-mvdsv-v1.00.tar.gz) = 552652
SIZE (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) = 8815
SIZE (id-software-Quake-bf4ac424ce754894ac8f1dae6a3981954bc9852d.tar.gz) =
2958901
Index: patches/patch-src_sv_ccmds_c
===
RCS file: /cvs/ports/games/mvdsv/patches/patch-src_sv_ccmds_c,v
diff -u -p -u -p -r1.3 patch-src_sv_ccmds_c
--- patches/patch-src_sv_ccmds_c24 Aug 2022 03:24:32 - 1.3
+++ patches/patch-src_sv_ccmds_c1 Apr 2024 10:11:10 -
@@ -5,7 +5,7 @@ at: https://github.com/deurk/mvdsv/pull/
Index: src/sv_ccmds.c
--- src/sv_ccmds.c.orig
+++ src/sv_ccmds.c
-@@ -741,54 +741,6 @@ void SV_ChmodFile_f (void)
+@@ -744,54 +744,6 @@ void SV_ChmodFile_f (void)
}
#endif //_WIN32
@@ -60,7 +60,7 @@ Index: src/sv_ccmds.c
/*
==
SV_Kick_f
-@@ -1847,8 +1799,6 @@ void SV_InitOperatorCommands (void)
+@@ -1853,8 +1805,6 @@ void SV_InitOperatorCommands (void)
Cmd_AddCommand ("chmod", SV_ChmodFile_f);
#endif //_WIN32
//<-
[Update from Maintainer] - databases/sqlcipher v4.5.6
Hi, Here's an update for databases/sqlcipher that updates it to version 4.5.6. Change log: * Updates baseline to upstream SQLite 3.44.2. * Improves PRAGMA cipher_integrity_check to report expected page size if invalid. * Implements PRAGMA page_size compatibility with PRAGMA cipher_page_size so both will operate properly on encrypted databases. I ran nm on libsqlcipher.so.1.0 between the versions but didn't see anything that looks like it would have broken the ABI. Is there a definite way to tell? I read up on https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs but I'm not sure if I need to update the minor version or not. Diff attached below. Thanks, Tom Index: Makefile === RCS file: /cvs/ports/databases/sqlcipher/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- Makefile29 Oct 2023 07:56:08 - 1.8 +++ Makefile18 Feb 2024 19:13:21 - @@ -2,7 +2,7 @@ COMMENT = encrypted SQLite database GH_ACCOUNT = sqlcipher GH_PROJECT = sqlcipher -GH_TAGNAME = v4.5.5 +GH_TAGNAME = v4.5.6 SHARED_LIBS += sqlcipher 1.0 # 8.6 Index: distinfo === RCS file: /cvs/ports/databases/sqlcipher/distinfo,v retrieving revision 1.7 diff -u -p -u -p -r1.7 distinfo --- distinfo29 Oct 2023 07:56:08 - 1.7 +++ distinfo18 Feb 2024 19:13:21 - @@ -1,2 +1,2 @@ -SHA256 (sqlcipher-4.5.5.tar.gz) = AU751PW19OevTZOtOZZnlHu1XjGGDmcfDe8biubwXeA= -SIZE (sqlcipher-4.5.5.tar.gz) = 18816611 +SHA256 (sqlcipher-4.5.6.tar.gz) = 5KUn445nCQwdLcQd8oJw0WwV98pSEKPn7ExLj9o24o8= +SIZE (sqlcipher-4.5.6.tar.gz) = 18937692
Update from Maintainer: databases/sqlcipher 4.5.4 -> 4.5.5
Hi,
The below diff updates databases/sqlcipher to v4.5.5.
Changes include:
* Updates baseline to upstream SQLite 3.42.0
* Does not allow key to be set again on a connection after it has been
successfully used for an encryption or decryption operation to prevent
accidental database corruption
* Raises an error if a rekey operation is attempted on an unencrypted
database
* Raises an error when a key or rekey operation is passed an empty key
* Minor improvements to constant time functions
* Miscellaneous code and comment cleanup
I've bumped SHARED_LIBS based on running nm -g between the old and
new libraries and 3 functions appear to have disappered between 4.5.4
and 4.5.5:
sqlcipher_codec_ctx_get_flag
sqlcipher_codec_ctx_set_flag
sqlcipher_codec_ctx_unset_flag
Based on the documentation it says to crank the major version by one,
so is 1.0 OK for this? The output of ${WRKBUILD}/shared_libs.log still
says:
# SHARED_LIBS+=#
SHARED_LIBS += sqlcipher0.4 # 8.6
This is what was originally in the Makefile. Not sure if this is
correct?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/databases/sqlcipher/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile10 May 2023 08:38:21 - 1.7
+++ Makefile27 Oct 2023 20:37:14 -
@@ -2,9 +2,9 @@ COMMENT = encrypted SQLite database
GH_ACCOUNT = sqlcipher
GH_PROJECT = sqlcipher
-GH_TAGNAME = v4.5.4
+GH_TAGNAME = v4.5.5
-SHARED_LIBS += sqlcipher 0.4 # 8.6
+SHARED_LIBS += sqlcipher 1.0 # 8.6
CATEGORIES = databases
Index: distinfo
===
RCS file: /cvs/ports/databases/sqlcipher/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo10 May 2023 08:38:21 - 1.6
+++ distinfo27 Oct 2023 20:37:14 -
@@ -1,2 +1,2 @@
-SHA256 (sqlcipher-4.5.4.tar.gz) = 6gUv5jTXKfnda2JAFhBN55b6+H5Iep6Gigf67jWVd3E=
-SIZE (sqlcipher-4.5.4.tar.gz) = 18755568
+SHA256 (sqlcipher-4.5.5.tar.gz) = AU751PW19OevTZOtOZZnlHu1XjGGDmcfDe8biubwXeA=
+SIZE (sqlcipher-4.5.5.tar.gz) = 18816611
[Maintainer Update] games/freeorion v0.5
Hi,
Here's a diff to update games/freeorion to v0.5 stable release.
A brief changelog is available at:
https://github.com/freeorion/freeorion/releases/tag/v0.5
A more detailed changelog is available here:
https://github.com/freeorion/freeorion/blob/v0.5/ChangeLog.md
The PLIST has changed because more content has been added to the
game. Installs and runs fine here on my amd64 system.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile24 Apr 2023 11:40:40 - 1.17
+++ Makefile11 May 2023 11:49:51 -
@@ -1,9 +1,8 @@
-V =0.4.10.2
+V =0.5
COMMENT = turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2021-08-01.f663dad_Source
+DISTNAME = FreeOrion_v${V}_Source
PKGNAME = freeorion-${V}
CATEGORIES = games
-REVISION = 3
HOMEPAGE = https://www.freeorion.org/
MAINTAINER = Tom Murphy
Index: distinfo
===
RCS file: /cvs/ports/games/freeorion/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo20 Aug 2021 16:24:25 - 1.5
+++ distinfo11 May 2023 11:49:51 -
@@ -1,2 +1,2 @@
-SHA256 (FreeOrion_v0.4.10.2_2021-08-01.f663dad_Source.tar.gz) =
9gVu6X7dRt7oB2zBzbEccRZS8eJvA87BJEoBo81bDXA=
-SIZE (FreeOrion_v0.4.10.2_2021-08-01.f663dad_Source.tar.gz) = 124836633
+SHA256 (FreeOrion_v0.5_Source.tar.gz) =
CfMc/lXWFlvf7pfbOnXCRarhEzx5L9SAr3oTqmdnTLE=
+SIZE (FreeOrion_v0.5_Source.tar.gz) = 152861207
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/freeorion/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 11 Mar 2022 19:04:25 - 1.4
+++ pkg/PLIST 11 May 2023 11:49:51 -
@@ -10,12 +10,7 @@ share/freeorion/
share/freeorion/default/
share/freeorion/default/COPYING
share/freeorion/default/README.md
-share/freeorion/default/content_specific_parameters.txt
share/freeorion/default/credits.xml
-share/freeorion/default/customizations/
-share/freeorion/default/customizations/README.md
-share/freeorion/default/customizations/common_user_customizations.txt
-share/freeorion/default/customizations/custom_sitreps.txt
share/freeorion/default/data/
share/freeorion/default/data/art/
share/freeorion/default/data/art/cursors/
@@ -48,9 +43,13 @@ share/freeorion/default/data/art/encyclo
share/freeorion/default/data/art/fields/
share/freeorion/default/data/art/fields/accretion_disc.png
share/freeorion/default/data/art/fields/ion_storm.png
+share/freeorion/default/data/art/fields/meteor_blizzard.png
share/freeorion/default/data/art/fields/molecular_cloud.png
+share/freeorion/default/data/art/fields/nanite_swarm.png
share/freeorion/default/data/art/fields/star_forming_nebula_1.png
share/freeorion/default/data/art/fields/star_forming_nebula_2.png
+share/freeorion/default/data/art/fields/star_forming_nebula_3.png
+share/freeorion/default/data/art/fields/void_rift.png
share/freeorion/default/data/art/galaxy_decoration/
share/freeorion/default/data/art/galaxy_decoration/blue_set/
share/freeorion/default/data/art/galaxy_decoration/blue_set/gaseous01.png
@@ -154,6 +153,7 @@ share/freeorion/default/data/art/hulls_d
share/freeorion/default/data/art/hulls_design/small_asteroid_hull.png
share/freeorion/default/data/art/hulls_design/small_camouflage_asteroid_hull.png
share/freeorion/default/data/art/hulls_design/solar_hull.png
+share/freeorion/default/data/art/hulls_design/space_flux_composite_hull.png
share/freeorion/default/data/art/hulls_design/spatial_flux_hull.png
share/freeorion/default/data/art/hulls_design/static_multicellular.png
share/freeorion/default/data/art/hulls_design/symbiotic_hull.png
@@ -182,6 +182,7 @@ share/freeorion/default/data/art/icons/b
share/freeorion/default/data/art/icons/building/concentration-camp.png
share/freeorion/default/data/art/icons/building/economic_sinkhole.png
share/freeorion/default/data/art/icons/building/evacuation.png
+share/freeorion/default/data/art/icons/building/field_repellor.png
share/freeorion/default/data/art/icons/building/gas-giant-generator.png
share/freeorion/default/data/art/icons/building/generic_building.png
share/freeorion/default/data/art/icons/building/genome_bank.png
@@ -199,6 +200,7 @@ share/freeorion/default/data/art/icons/b
share/freeorion/default/data/art/icons/building/paradise_planet.png
share/freeorion/default/data/art/icons/building/planetary_stardrive.png
share/freeorion/default/data/art/icons/building/psi-corps.png
+share/freeorion/default/data/art/icons/building/regional_administration.png
share/freeorion/default/data/art/icons/building/ring.png
share/freeorion/default/data/art/icons/building/scanning-facility.png
share/freeorion/default/data/art/icons/bui
[Update from Maintainer] databases/sqlcipher 4.5.3 -> 4.5.4
Hi, Here is a patch to update databases/sqlcipher to v4.5.4. Some changes of note: * Updates baseline to upstream SQLite 3.41.2 * Updates minimum Apple SDK versions in podspec for new Xcode compatibility * Return runtime OpenSSL version from PRAGMA cipher_provider_version (instead of hardcoded value) * Adds guard against zero block size and crash if cryptographic provider initialization fails * When an ATTACH occurs creating a new encrypted database as the first operation after keying the main database, the new database will have the same salt value. I have increased the shared library from 0.3 to 0.4 due to the addition of two new functions: * sqlite3_is_interrupted * sqlite3_value_encoding I'm curious as to where the 8.6 version came from in the comment on the SHARED_LIBS line as I can't see '8.6' in the source code. Thanks, Tom Index: Makefile === RCS file: /cvs/ports/databases/sqlcipher/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- Makefile3 Jan 2023 12:32:27 - 1.6 +++ Makefile8 May 2023 17:25:41 - @@ -2,9 +2,9 @@ COMMENT = encrypted SQLite database GH_ACCOUNT = sqlcipher GH_PROJECT = sqlcipher -GH_TAGNAME = v4.5.3 +GH_TAGNAME = v4.5.4 -SHARED_LIBS += sqlcipher 0.3 # 8.6 +SHARED_LIBS += sqlcipher 0.4 # 8.6 CATEGORIES = databases Index: distinfo === RCS file: /cvs/ports/databases/sqlcipher/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo3 Jan 2023 12:32:27 - 1.5 +++ distinfo8 May 2023 17:25:41 - @@ -1,2 +1,2 @@ -SHA256 (sqlcipher-4.5.3.tar.gz) = XJ1nLrpr5NBamoFw9wFw5Teuc1oJw95ESorWKbWV1eI= -SIZE (sqlcipher-4.5.3.tar.gz) = 18372471 +SHA256 (sqlcipher-4.5.4.tar.gz) = 6gUv5jTXKfnda2JAFhBN55b6+H5Iep6Gigf67jWVd3E= +SIZE (sqlcipher-4.5.4.tar.gz) = 18755568
net/dino and emojis
Hi all, I've been using net/dino for a while for XMPP communication, but I noticed that emojis just don't appear despite me having Noto Emoji and Noto Color Emoji fonts installed. I was wondering if anyone else had this problem and if they were able to fix it? I looked in the /etc/fonts/conf.d directories and couldn't find anything that looked like it would disable them. I believe dino has gone from gtk+3 to gtk+4 now so there's that. I'd just like to be able to get emojis working in the program but I can't find any meaningful answers. Does gtk+4 still use config paths like ~/.config/gtk-4.0/settings.ini or does it rely on something else? Thanks, Tom
[Maintainer Update] databases/sqlcipher 4.5.2 -> 4.5.3
Hi all, Here is an update for databases/sqlcipher that updates it to v4.5.3 which was released on December 19th. Changelog: Updates baseline to upstream SQLite 3.39.4 Checked the shared library and no functions were added or removed so it's not been cranked. Thanks, Tom Index: Makefile === RCS file: /cvs/ports/databases/sqlcipher/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile16 Oct 2022 15:59:04 - 1.5 +++ Makefile31 Dec 2022 22:04:58 - @@ -2,7 +2,7 @@ COMMENT = encrypted SQLite database GH_ACCOUNT = sqlcipher GH_PROJECT = sqlcipher -GH_TAGNAME = v4.5.2 +GH_TAGNAME = v4.5.3 SHARED_LIBS += sqlcipher 0.3 # 8.6 Index: distinfo === RCS file: /cvs/ports/databases/sqlcipher/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- distinfo16 Oct 2022 15:59:04 - 1.4 +++ distinfo31 Dec 2022 22:04:58 - @@ -1,2 +1,2 @@ -SHA256 (sqlcipher-4.5.2.tar.gz) = aSXwEt61WC45dhp9SBaIPMFbQYUajnC0R8IjuO9Abio= -SIZE (sqlcipher-4.5.2.tar.gz) = 18371300 +SHA256 (sqlcipher-4.5.3.tar.gz) = XJ1nLrpr5NBamoFw9wFw5Teuc1oJw95ESorWKbWV1eI= +SIZE (sqlcipher-4.5.3.tar.gz) = 18372471
[Update from Maintainer] games/ezquake 3.6.0 -> 3.6.1
Hi,
Another new release of ezquake. Changelog here:
https://github.com/QW-Group/ezquake-source/releases/tag/3.6.1
Just a version bump, new checksum for the tarball, and an updated
patch for the line numbers in the diff. Compiles and runs great on my
amd64 laptop and tested with a games/mvdsv server.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile30 Oct 2022 22:31:21 - 1.13
+++ Makefile5 Nov 2022 13:36:36 -
@@ -1,5 +1,5 @@
N =ezquake
-V =3.6.0
+V =3.6.1
COMMENT = modern QuakeWorld client
PKGNAME = ${N}-${V}
Index: distinfo
===
RCS file: /cvs/ports/games/ezquake/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo30 Oct 2022 22:31:21 - 1.8
+++ distinfo5 Nov 2022 13:36:36 -
@@ -1,2 +1,2 @@
-SHA256 (ezquake-source-3.6.0.tar.gz) =
TBok1cXFQj0dKdxJQLJkuDMNpHz6MhozRreIqvj8+VA=
-SIZE (ezquake-source-3.6.0.tar.gz) = 23487067
+SHA256 (ezquake-source-3.6.1.tar.gz) =
u2+D8QD+6h4ld2gE5J/79UjXh3wPR9XiuZ8+ShdnX/4=
+SIZE (ezquake-source-3.6.1.tar.gz) = 23503412
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/games/ezquake/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile 30 Oct 2022 22:31:21 - 1.5
+++ patches/patch-Makefile 5 Nov 2022 13:36:36 -
@@ -13,7 +13,7 @@ Index: Makefile
LIBS ?=
#Temporarily disable tree vectorization optimization enabled at O3 due to gcc
bug
-@@ -567,7 +567,7 @@ endif
+@@ -575,7 +575,7 @@ endif
ifdef CONFIG_WINDOWS
TARG_c := ezquake$(EZ_POSTFIX).exe
else
Re: [Update from Maintainer] games/ezquake 3.6.0
Hi Thomas,
On Sun, Oct 23, 2022 at 12:46:26PM -0400, Thomas Frohwein wrote:
> Looks good, but there is a bundled .orig file that gets picked up by
> make update-patches: vstudio-libs/include/SDL_config_macosx.h.orig
>
> Therefore, I propose making use of PATCHORIG=.orig.port as in the diff
> below.
Tested this diff and it works a treat and doesn't consider that file
any more.
Thanks!
-Tom
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/ezquake/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 11 Mar 2022 19:04:20 - 1.12
> +++ Makefile 23 Oct 2022 16:36:35 -
> @@ -1,9 +1,9 @@
> N = ezquake
> -V = 3.2.3
> +V = 3.6.0
> COMMENT =modern QuakeWorld client
>
> PKGNAME =${N}-${V}
> -GH_ACCOUNT = ezQuake
> +GH_ACCOUNT = QW-Group
> GH_PROJECT = ${N}-source
> GH_TAGNAME = ${V}
>
> @@ -15,10 +15,11 @@ MAINTAINER = Tom Murphy # GPLv2+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += GL SDL2 c curl expat jansson jpeg m pcre png pthread
> -WANTLIB += speex speexdsp z
> +WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m pcre png pthread
> +WANTLIB += sndfile speex speexdsp z
>
> -LIB_DEPENDS =audio/speex \
> +LIB_DEPENDS =audio/libsndfile \
> + audio/speex \
> graphics/jpeg \
> graphics/png \
> devel/sdl2 \
> @@ -33,6 +34,7 @@ NO_TEST = Yes
>
> GAMEDIR =${PREFIX}/share/ezquake
> SUBST_VARS +=GAMEDIR
> +PATCHORIG = .orig.port
>
> do-configure:
> ${SUBST_CMD} ${WRKSRC}/EX_browser_sources.c
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/ezquake/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 20 Mar 2021 18:28:52 - 1.7
> +++ distinfo 23 Oct 2022 16:36:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (ezquake-source-3.2.3.tar.gz) =
> 7FGHtHrYWc9Fk4Epbo0dVgBB/ZBGLb4KuJxl4yBnftQ=
> -SIZE (ezquake-source-3.2.3.tar.gz) = 5760982
> +SHA256 (ezquake-source-3.6.0.tar.gz) =
> TBok1cXFQj0dKdxJQLJkuDMNpHz6MhozRreIqvj8+VA=
> +SIZE (ezquake-source-3.6.0.tar.gz) = 23487067
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/games/ezquake/patches/patch-Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile
> --- patches/patch-Makefile11 Mar 2022 19:04:20 - 1.4
> +++ patches/patch-Makefile23 Oct 2022 16:36:35 -
> @@ -13,11 +13,11 @@ Index: Makefile
> LIBS ?=
>
> #Temporarily disable tree vectorization optimization enabled at O3 due to
> gcc bug
> -@@ -379,7 +379,7 @@ endif
> +@@ -567,7 +567,7 @@ endif
> ifdef CONFIG_WINDOWS
> - TARG_c := ezquake.exe
> + TARG_c := ezquake$(EZ_POSTFIX).exe
> else
> --TARG_c := ezquake-$(LSYS)-$(CPU)
> +-TARG_c := ezquake-$(LSYS)-$(CPU)$(EZ_POSTFIX)
> +TARG_c := ezquake
> endif
>
Re: [Update from Maintainer] games/ezquake 3.6.0
Hi,
Just a friendly ping to the list on this update to games/ezquake.
Thanks,
Tom
[prev in list] [next in list] [prev in thread] [next in thread]
List: openbsd-ports
Subject:[Update from Maintainer] games/ezquake 3.6.0
From: Tom Murphy
Date: 2022-10-06 7:55:55
Message-ID: 20221006075351.cygvler5z2jpnwkc () pertho ! net
[Download RAW message or body]
Hi,
This diff updates games/ezquake to 3.6.0 which came out roughly
9 hours ago. A few slight changes:
* Github Project changed from ezQuake to QW-Group
* New dependency on audio/libsndfile added
* WANTLIB needed freetype adding to it
Thanks,
Tom
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/ezquake/Makefile,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 Makefile
> --- Makefile 11 Mar 2022 19:04:20 - 1.12
> +++ Makefile 6 Oct 2022 07:47:26 -
> @@ -1,9 +1,9 @@
> N = ezquake
> -V = 3.2.3
> +V = 3.6.0
> COMMENT =modern QuakeWorld client
>
> PKGNAME =${N}-${V}
> -GH_ACCOUNT = ezQuake
> +GH_ACCOUNT = QW-Group
> GH_PROJECT = ${N}-source
> GH_TAGNAME = ${V}
>
> @@ -15,10 +15,11 @@ MAINTAINER = Tom Murphy # GPLv2+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += GL SDL2 c curl expat jansson jpeg m pcre png pthread
> -WANTLIB += speex speexdsp z
> +WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m pcre png pthread
> +WANTLIB += sndfile speex speexdsp z
>
> -LIB_DEPENDS =audio/speex \
> +LIB_DEPENDS =audio/libsndfile \
> + audio/speex \
> graphics/jpeg \
> graphics/png \
> devel/sdl2 \
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/ezquake/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 distinfo
> --- distinfo 20 Mar 2021 18:28:52 - 1.7
> +++ distinfo 6 Oct 2022 07:47:26 -
> @@ -1,2 +1,2 @@
> -SHA256 (ezquake-source-3.2.3.tar.gz) =
> 7FGHtHrYWc9Fk4Epbo0dVgBB/ZBGLb4KuJxl4yBnftQ=
> -SIZE (ezquake-source-3.2.3.tar.gz) = 5760982
> +SHA256 (ezquake-source-3.6.0.tar.gz) =
> TBok1cXFQj0dKdxJQLJkuDMNpHz6MhozRreIqvj8+VA=
> +SIZE (ezquake-source-3.6.0.tar.gz) = 23487067
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/games/ezquake/patches/patch-Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-Makefile
> --- patches/patch-Makefile11 Mar 2022 19:04:20 - 1.4
> +++ patches/patch-Makefile6 Oct 2022 07:47:26 -
> @@ -13,11 +13,11 @@ Index: Makefile
> LIBS ?=
>
> #Temporarily disable tree vectorization optimization enabled at O3 due to
> gcc bug
> -@@ -379,7 +379,7 @@ endif
> +@@ -567,7 +567,7 @@ endif
> ifdef CONFIG_WINDOWS
> - TARG_c := ezquake.exe
> + TARG_c := ezquake$(EZ_POSTFIX).exe
> else
> --TARG_c := ezquake-$(LSYS)-$(CPU)
> +-TARG_c := ezquake-$(LSYS)-$(CPU)$(EZ_POSTFIX)
> +TARG_c := ezquake
> endif
[Update from Maintainer] games/ezquake 3.6.0
Hi,
This diff updates games/ezquake to 3.6.0 which came out roughly
9 hours ago. A few slight changes:
* Github Project changed from ezQuake to QW-Group
* New dependency on audio/libsndfile added
* WANTLIB needed freetype adding to it
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile11 Mar 2022 19:04:20 - 1.12
+++ Makefile6 Oct 2022 07:47:26 -
@@ -1,9 +1,9 @@
N =ezquake
-V =3.2.3
+V =3.6.0
COMMENT = modern QuakeWorld client
PKGNAME = ${N}-${V}
-GH_ACCOUNT = ezQuake
+GH_ACCOUNT = QW-Group
GH_PROJECT = ${N}-source
GH_TAGNAME = ${V}
@@ -15,10 +15,11 @@ MAINTAINER =Tom Murphy
Re: [big-endian] unbreak games/mvdsv
On Fri, Sep 23, 2022 at 02:26:12PM -0400, Kurt Mosiejczuk wrote: > On Thu, Sep 22, 2022 at 11:22:08PM -0400, George Koehler wrote: > > About mvdsv, the QuakeWorld server, > > > I don't play this game, but I want to fix an error in CMakeLists.txt, > > which broke this package on big-endian platforms. kmos had added > > BROKEN-sparc64, but I got the same error on powerpc. This diff adds > > the missing PRIVATE keyword, so I can package mvdsv on powerpc. > > > I didn't bump REVISION. > > ok to commit? > > I can confirm it fixes sparc64. > > ok kmos > > --Kurt Hi, Is this something that can be send upstream to the mvdsv developers? Or best to keep it patched on OpenBSD ports? Thanks, Tom
Re: Update from Maintainer: games/mvdsv 0.34 -> 0.35
Hi,
I've redone the diff to match what you recommend upstream. I've also
added logic so that if system is UNIX but not OpenBSD, then link in dl
(which allows it to build for other platforms upstream). Once this is
committed upstream I can remove the CMakeLists.txt patch.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/mvdsv/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile11 Mar 2022 19:04:41 - 1.5
+++ Makefile23 Aug 2022 13:43:29 -
@@ -1,8 +1,8 @@
COMMENT = QuakeWorld server
-GH_ACCOUNT = deurk
+GH_ACCOUNT = QW-Group
GH_PROJECT = mvdsv
-GH_TAGNAME = 0.34
+GH_TAGNAME = 0.35
CATEGORIES = games
@@ -23,13 +23,10 @@ DISTFILES = mvdsv-{}${GH_TAGNAME}.tar.gz
qwprogs-${QWP_VERSION}{qwprogs}.dat:0
EXTRACT_ONLY = mvdsv-${GH_TAGNAME}.tar.gz
-MODULES = devel/meson
+MODULES = devel/cmake
LIB_DEPENDS = devel/pcre \
net/curl
-
-# help ld.bfd find libnghttp2
-LDFLAGS = -L${LOCALBASE}/lib
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/mvdsv/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo16 Oct 2021 14:43:12 - 1.3
+++ distinfo23 Aug 2022 13:43:29 -
@@ -1,4 +1,4 @@
-SHA256 (mvdsv-0.34.tar.gz) = gZBxjf4QiPTxKmYXfusBwaUn9fRl5w3sT7uP7tSZTGo=
+SHA256 (mvdsv-0.35.tar.gz) = bk7yLKpr85yxLjGLd9gFmVXb+fxBmttPbnR2aOYAC5o=
SHA256 (qwprogs-20120131.dat) = /1HLXnc2DXK5NIfYkZjc+UYpuS+LrhAPxupIpsEqeDA=
-SIZE (mvdsv-0.34.tar.gz) = 597476
+SIZE (mvdsv-0.35.tar.gz) = 555708
SIZE (qwprogs-20120131.dat) = 197684
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_txt23 Aug 2022 13:43:29 -
@@ -0,0 +1,75 @@
+Remove link to dl as it is in OpenBSD's libc
+Have Cmake find and link to devel/pcre if installed, otherwise fall back to
bundled pcre.
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -59,8 +59,6 @@ set(SRC_COMMON
+ "${DIR_SRC}/vfs_pak.c"
+ "${DIR_SRC}/world.c"
+ "${DIR_SRC}/zone.c"
+- "${DIR_SRC}/pcre/get.c"
+- "${DIR_SRC}/pcre/pcre.c"
+ )
+
+ # Check build target, and included sources
+@@ -89,14 +87,31 @@ else()
+ )
+ endif()
+
++##
+
++# Check for pcre, and include sources and libs, if found
++find_library(PCRE_LIBRARIES pcre)
++if(PCRE_LIBRARIES)
++ set(PCRE_FOUND 1)
++ find_path(PCRE_INCLUDE_DIR pcre.h)
++endif(PCRE_LIBRARIES)
++
++if(NOT PCRE_FOUND)
++ message(STATUS "PCRE library not found. Using bundled PCRE intead.")
++ list(APPEND SRC_COMMON
++ "${DIR_SRC}/pcre/get.c"
++ "${DIR_SRC}/pcre/pcre.c"
++ )
++else()
++ message(STATUS "Found PCRE: ${PCRE_LIBRARIES}")
++endif()
++
+
##
+
+ # Set base compiler flags
+ set(CFLAGS -Wall)
+ set(LFLAGS)
+
+-
+
##
+
+ # Set target
+@@ -111,14 +126,16 @@ set_target_properties(${PROJECT_NAME}
+
+ # Set include directories
+ target_include_directories(${PROJECT_NAME} PRIVATE ${CURL_INCLUDE_DIRS})
++target_include_directories(${PROJECT_NAME} PRIVATE ${PCRE_INCLUDE_DIR})
+
+-
+
##
+
+ # Check build target, and included sources and libs
+ if(UNIX)
+ target_link_libraries(${PROJECT_NAME} m)
++if(CMAKE_SYSTEM_NAME MATCHES !OpenBSD)
+ target_link_libraries(${PROJECT_NAME} dl)
++endif()
+ else()
+ target_link_libraries(${PROJECT_NAME} ws2_32)
+ target_link_libraries(${PROJECT_NAME} winmm)
+@@ -147,6 +164,9 @@ if(CURL_FOUND)
+ target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES})
+ endif()
+
++if(PCRE_FOUND)
++ target_link_libraries(${PROJECT_NAME} ${PCRE_LIBRARIES})
++endif()
+
+
##
+
Index: patches/patch-meson_build
===
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- patches/patch-meson_build 11 Mar 2022 19:04:41 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-Index: meson.build
meson.build.orig
-+++ meson.build
-@@ -86,8 +86,8 @@ if target_machine.system() == 'windows'
- else
- mvdsv_sources += 'src/sv_sys_unix.c'
- deps += [
-- meson.get_compil
Re: Update from Maintainer: games/mvdsv 0.34 -> 0.35
Hi Nam,
On Tue, Aug 16, 2022 at 06:52:03PM -0700, Nam Nguyen wrote:
> Tom Murphy writes:
>
> > Hi,
> >
> > Here is a diff to update games/mvdsv from 0.34 to 0.35.
> > A few notable changes:
> >
> > * meson build dropped -- only uses cmake
> > * devel/pcre no longer used -- dropped in favor of wraps
>
> wraps was part of meson and not cmake. Since it has moved to cmake, it
> now uses the ancient bundled pcre. I am concerned about security with
> the bundled pcre, so I would prefer holding off on this update until
> cmake is updated to allow linking against system pcre. It seems like
> debian had a similar concern.
>
> see: https://github.com/QW-Group/mvdsv/issues/40
I've reworked the diff and got Cmake to use devel/pcre instead of the
bundled, outdated pcre. Can you have a look and tell me if this looks
OK? My experience of CMake is rather limited.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/mvdsv/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile11 Mar 2022 19:04:41 - 1.5
+++ Makefile22 Aug 2022 16:46:36 -
@@ -1,8 +1,8 @@
COMMENT = QuakeWorld server
-GH_ACCOUNT = deurk
+GH_ACCOUNT = QW-Group
GH_PROJECT = mvdsv
-GH_TAGNAME = 0.34
+GH_TAGNAME = 0.35
CATEGORIES = games
@@ -23,13 +23,10 @@ DISTFILES = mvdsv-{}${GH_TAGNAME}.tar.gz
qwprogs-${QWP_VERSION}{qwprogs}.dat:0
EXTRACT_ONLY = mvdsv-${GH_TAGNAME}.tar.gz
-MODULES = devel/meson
+MODULES = devel/cmake
LIB_DEPENDS = devel/pcre \
net/curl
-
-# help ld.bfd find libnghttp2
-LDFLAGS = -L${LOCALBASE}/lib
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/mvdsv/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo16 Oct 2021 14:43:12 - 1.3
+++ distinfo22 Aug 2022 16:46:36 -
@@ -1,4 +1,4 @@
-SHA256 (mvdsv-0.34.tar.gz) = gZBxjf4QiPTxKmYXfusBwaUn9fRl5w3sT7uP7tSZTGo=
+SHA256 (mvdsv-0.35.tar.gz) = bk7yLKpr85yxLjGLd9gFmVXb+fxBmttPbnR2aOYAC5o=
SHA256 (qwprogs-20120131.dat) = /1HLXnc2DXK5NIfYkZjc+UYpuS+LrhAPxupIpsEqeDA=
-SIZE (mvdsv-0.34.tar.gz) = 597476
+SIZE (mvdsv-0.35.tar.gz) = 555708
SIZE (qwprogs-20120131.dat) = 197684
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_txt22 Aug 2022 16:46:36 -
@@ -0,0 +1,44 @@
+Remove link to dl as it is in OpenBSD's libc
+Have Cmake find and link to devel/pcre instead of the outdated bundled pcre
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -89,7 +89,20 @@ else()
+ )
+ endif()
+
++##
+
++# Check for pcre, and include sources and libs, if found
++find_library(PCRE_LIBRARIES pcre)
++if(PCRE_LIBRARIES)
++ set(HAVE_LIBPCRE 1)
++ find_path(PCRE_INCLUDE_DIR pcre.h)
++ if(PCRE_INCLUDE_DIR)
++ include_directories(${PCRE_INCLUDE_DIR})
++ set(CMAKE_REQUIRED_INCLUDES ${PCRE_INCLUDE_DIR})
++ endif(PCRE_INCLUDE_DIR)
++ mark_as_advanced(FORCE PCRE_LIBRARIES PCRE_INCLUDE_DIR)
++endif(PCRE_LIBRARIES)
++
+
##
+
+ # Set base compiler flags
+@@ -118,7 +131,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${C
+ # Check build target, and included sources and libs
+ if(UNIX)
+ target_link_libraries(${PROJECT_NAME} m)
+- target_link_libraries(${PROJECT_NAME} dl)
+ else()
+ target_link_libraries(${PROJECT_NAME} ws2_32)
+ target_link_libraries(${PROJECT_NAME} winmm)
+@@ -147,6 +159,9 @@ if(CURL_FOUND)
+ target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES})
+ endif()
+
++if(PCRE_LIBRARIES)
++ target_link_libraries(${PROJECT_NAME} ${PCRE_LIBRARIES})
++endif()
+
+
##
+
Index: patches/patch-meson_build
===
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- patches/patch-meson_build 11 Mar 2022 19:04:41 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-Index: meson.build
meson.build.orig
-+++ meson.build
-@@ -86,8 +86,8 @@ if target_machine.system() == 'windows'
- else
- mvdsv_sources += 'src/sv_sys_unix.c'
- deps += [
-- meson.get_compiler('c').find_library('m'),
-- meson.get_compiler('c'
Update from Maintainer: games/mvdsv 0.34 -> 0.35
Hi,
Here is a diff to update games/mvdsv from 0.34 to 0.35.
A few notable changes:
* Github project changed from 'deurk' to 'QW-Group'
* meson build dropped -- only uses cmake
* devel/pcre no longer used -- dropped in favor of wraps
* New patch for CMakeLists.txt to stop trying to link
'dl' which is already in OpenBSD's libc
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/mvdsv/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile11 Mar 2022 19:04:41 - 1.5
+++ Makefile3 Aug 2022 16:57:23 -
@@ -1,8 +1,8 @@
COMMENT = QuakeWorld server
-GH_ACCOUNT = deurk
+GH_ACCOUNT = QW-Group
GH_PROJECT = mvdsv
-GH_TAGNAME = 0.34
+GH_TAGNAME = 0.35
CATEGORIES = games
@@ -17,19 +17,15 @@ MASTER_SITES0 = https://raw.githubuserco
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += c curl m pcre pthread
+WANTLIB += c curl m pthread
DISTFILES =mvdsv-{}${GH_TAGNAME}.tar.gz \
qwprogs-${QWP_VERSION}{qwprogs}.dat:0
EXTRACT_ONLY = mvdsv-${GH_TAGNAME}.tar.gz
-MODULES = devel/meson
+MODULES = devel/cmake
-LIB_DEPENDS = devel/pcre \
- net/curl
-
-# help ld.bfd find libnghttp2
-LDFLAGS = -L${LOCALBASE}/lib
+LIB_DEPENDS = net/curl
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/mvdsv/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo16 Oct 2021 14:43:12 - 1.3
+++ distinfo3 Aug 2022 16:57:23 -
@@ -1,4 +1,4 @@
-SHA256 (mvdsv-0.34.tar.gz) = gZBxjf4QiPTxKmYXfusBwaUn9fRl5w3sT7uP7tSZTGo=
+SHA256 (mvdsv-0.35.tar.gz) = bk7yLKpr85yxLjGLd9gFmVXb+fxBmttPbnR2aOYAC5o=
SHA256 (qwprogs-20120131.dat) = /1HLXnc2DXK5NIfYkZjc+UYpuS+LrhAPxupIpsEqeDA=
-SIZE (mvdsv-0.34.tar.gz) = 597476
+SIZE (mvdsv-0.35.tar.gz) = 555708
SIZE (qwprogs-20120131.dat) = 197684
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_txt3 Aug 2022 16:57:23 -
@@ -0,0 +1,12 @@
+Remove link to dl as it is in OpenBSD's libc
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -118,7 +118,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${C
+ # Check build target, and included sources and libs
+ if(UNIX)
+ target_link_libraries(${PROJECT_NAME} m)
+- target_link_libraries(${PROJECT_NAME} dl)
+ else()
+ target_link_libraries(${PROJECT_NAME} ws2_32)
+ target_link_libraries(${PROJECT_NAME} winmm)
Index: patches/patch-meson_build
===
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- patches/patch-meson_build 11 Mar 2022 19:04:41 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-Index: meson.build
meson.build.orig
-+++ meson.build
-@@ -86,8 +86,8 @@ if target_machine.system() == 'windows'
- else
- mvdsv_sources += 'src/sv_sys_unix.c'
- deps += [
-- meson.get_compiler('c').find_library('m'),
-- meson.get_compiler('c').find_library('dl'),
-+ meson.get_compiler('c').find_library('m', required: false),
-+ meson.get_compiler('c').find_library('dl', required: false),
- ]
- endif
-
Index: patches/patch-src_sv_ccmds_c
===
RCS file: /cvs/ports/games/mvdsv/patches/patch-src_sv_ccmds_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_sv_ccmds_c
--- patches/patch-src_sv_ccmds_c11 Mar 2022 19:04:41 - 1.2
+++ patches/patch-src_sv_ccmds_c3 Aug 2022 16:57:23 -
@@ -5,7 +5,7 @@ at: https://github.com/deurk/mvdsv/pull/
Index: src/sv_ccmds.c
--- src/sv_ccmds.c.orig
+++ src/sv_ccmds.c
-@@ -738,54 +738,6 @@ void SV_ChmodFile_f (void)
+@@ -741,54 +741,6 @@ void SV_ChmodFile_f (void)
}
#endif //_WIN32
@@ -60,7 +60,7 @@ Index: src/sv_ccmds.c
/*
==
SV_Kick_f
-@@ -1844,8 +1796,6 @@ void SV_InitOperatorCommands (void)
+@@ -1847,8 +1799,6 @@ void SV_InitOperatorCommands (void)
Cmd_AddCommand ("chmod", SV_ChmodFile_f);
#endif //_WIN32
//<-
Re: UPDATE: xonotic-0.8.5
> Hi, > > Here's an update to xonotic. > > kn@ is no longer interested in maintaining it, and has asked me to drop > MAINTAINER. > > OK? I have tested this on my machine and played on a Xonotic server with it and it works OK for me on amd64 platform. Thanks, Tom
Re: [Maintainer Update] databases/sqlcipher v4.5.0 -> v4.5.1
On Tue, May 17, 2022 at 07:20:57PM +0200, Tim van der Molen wrote:
> Tom Murphy (2022-05-15 16:03 +0100):
> > Attached is a diff for databases/sqlcipher from v4.5.0 to v4.5.1.
> > I've bumped the shared library a minor version for dynamic export
> > changed in the library. The Changelog can be accessed here:
> > https://github.com/sqlcipher/sqlcipher/blob/v4.5.1/CHANGELOG.md
>
> Thanks. Would anyone mind if I also enabled JSON support? (The next
> SQLCipher release will enable it by default anyway.) I have been using
> 4.5.1 with JSON support for some time without problems.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/sqlcipher/Makefile,v
> retrieving revision 1.2
> diff -p -u -r1.2 Makefile
> --- Makefile 10 Nov 2021 15:23:24 - 1.2
> +++ Makefile 17 May 2022 17:11:52 -
> @@ -4,9 +4,9 @@ COMMENT = encrypted SQLite database
>
> GH_ACCOUNT = sqlcipher
> GH_PROJECT = sqlcipher
> -GH_TAGNAME = v4.5.0
> +GH_TAGNAME = v4.5.1
>
> -SHARED_LIBS += sqlcipher 0.1 # 8.6
> +SHARED_LIBS += sqlcipher 0.2 # 8.6
>
> CATEGORIES = databases
>
> @@ -27,7 +27,7 @@ CONFIGURE_ENV +=TCLSH_CMD=${MODTCL_BIN}
>
> NO_TEST =Yes
>
> -CFLAGS +=-DSQLITE_HAS_CODEC -DOMIT_MEMLOCK
> +CFLAGS +=-DSQLITE_HAS_CODEC -DOMIT_MEMLOCK -DSQLITE_ENABLE_JSON1
>
> MODULES =lang/tcl
> MODTCL_VERSION = 8.6
> Index: distinfo
> ===
> RCS file: /cvs/ports/databases/sqlcipher/distinfo,v
> retrieving revision 1.2
> diff -p -u -r1.2 distinfo
> --- distinfo 10 Nov 2021 15:23:24 - 1.2
> +++ distinfo 17 May 2022 17:11:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (sqlcipher-4.5.0.tar.gz) =
> IMRqhVxH1aChWf3KqEkex726pwanNO5SvHYYi5Ka+xQ=
> -SIZE (sqlcipher-4.5.0.tar.gz) = 17982431
> +SHA256 (sqlcipher-4.5.1.tar.gz) =
> AjSZUW7yreFPvNvpP7gcxpRYrmyzVEYU342+80g1tAY=
> +SIZE (sqlcipher-4.5.1.tar.gz) = 18132121
Hi Tim,
Nice addition! Thanks for committing the update!
Regards,
Tom
[Maintainer Update] databases/sqlcipher v4.5.0 -> v4.5.1
Hi, Attached is a diff for databases/sqlcipher from v4.5.0 to v4.5.1. I've bumped the shared library a minor version for dynamic export changed in the library. The Changelog can be accessed here: https://github.com/sqlcipher/sqlcipher/blob/v4.5.1/CHANGELOG.md Thanks, Tom Index: Makefile === RCS file: /cvs/ports/databases/sqlcipher/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile11 Mar 2022 18:31:46 - 1.3 +++ Makefile15 May 2022 14:58:18 - @@ -2,9 +2,9 @@ COMMENT = encrypted SQLite database GH_ACCOUNT = sqlcipher GH_PROJECT = sqlcipher -GH_TAGNAME = v4.5.0 +GH_TAGNAME = v4.5.1 -SHARED_LIBS += sqlcipher 0.1 # 8.6 +SHARED_LIBS += sqlcipher 0.2 # 8.6 CATEGORIES = databases Index: distinfo === RCS file: /cvs/ports/databases/sqlcipher/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo10 Nov 2021 15:23:24 - 1.2 +++ distinfo15 May 2022 14:58:18 - @@ -1,2 +1,2 @@ -SHA256 (sqlcipher-4.5.0.tar.gz) = IMRqhVxH1aChWf3KqEkex726pwanNO5SvHYYi5Ka+xQ= -SIZE (sqlcipher-4.5.0.tar.gz) = 17982431 +SHA256 (sqlcipher-4.5.1.tar.gz) = AjSZUW7yreFPvNvpP7gcxpRYrmyzVEYU342+80g1tAY= +SIZE (sqlcipher-4.5.1.tar.gz) = 18132121
Update for net/tintin++ 2.01.92 -> 2.02.12
Hi,
Here is a diff to update net/tintin++ to 2.02.12.
A change between 2.02.03 and 2.02.04 with the Makefile that
introduced a need to use GNU make.
List of changes is here: https://tintin.mudhalla.net/news.php
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/net/tintin++/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile7 Mar 2020 14:11:32 - 1.25
+++ Makefile24 Dec 2021 13:09:26 -
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.25 2020/03/07 14:11:32 bcallah Exp $
+# $OpenBSD: Makefile,v 1.25 2020/03/07 14:11:32 bcallah Exp $
COMMENT = client program for playing muds with advanced features
-DISTNAME = tintin-2.01.92
+DISTNAME = tintin-2.02.12
CATEGORIES = net games
HOMEPAGE = https://tintin.sourceforge.io/
@@ -22,6 +22,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_FLAGS = INCS=-I${LOCALBASE}/include
+
+USE_GMAKE =Yes
WRKDIST = ${WRKDIR}/tt/src
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/net/tintin++/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo7 Mar 2020 14:11:32 - 1.9
+++ distinfo24 Dec 2021 13:09:26 -
@@ -1,2 +1,2 @@
-SHA256 (tintin-2.01.92.tar.gz) = M4bUmBDy28Fi+JDya7geOAevNHU9ek6tZMxA6EXLqEU=
-SIZE (tintin-2.01.92.tar.gz) = 666084
+SHA256 (tintin-2.02.12.tar.gz) = tvn9TywefNyM/0Fy16gAFJYbA5Q4DO2RgiCdw014GgA=
+SIZE (tintin-2.02.12.tar.gz) = 2156614
Re: [UPDATE] games/bzflag to 2.4.22
On Thu, Dec 23, 2021 at 11:51:20PM +0100, Stefan Hagen wrote:
> Brad Smith wrote:
> > On 12/23/2021 5:27 PM, Stefan Hagen wrote:
> >
> > > Tom Murphy wrote:
> > > >Just pinging the list about an update to games/bzflag.
> > > >I posted this on the 28th of November originally.
> > > >
> > > >* Updates to v2.4.22
> > > >* graphics/glew added as dependency
> > > >
> > > >OK?
> > > Hi Tom,
> > >
> > > lib-depends-check reports:
> > > Extra: Xdamage.4
> > > WANTLIB += ICE SM Xau Xcursor Xdmcp Xi Xinerama Xmu Xrandr Xrender
> > > WANTLIB += Xss Xt xcb-shm xcb-xfixes
> > >
> > > I adjusted WANTLIB accordingly in the patch below:
> > >
> > > ok sdk@
> >
> > If you're going to update WANTLIB can you please regen the whole block
> > so they're sorted?
>
> I think it was sorted system libs first. But not 100% accurate.
> WANTLIB block fully sorted below.
>
> Index: games/bzflag/Makefile
> ===
> RCS file: /home/cvs/ports/games/bzflag/Makefile,v
> retrieving revision 1.49
> diff -u -p -u -p -r1.49 Makefile
> --- games/bzflag/Makefile 20 Mar 2020 16:44:23 - 1.49
> +++ games/bzflag/Makefile 23 Dec 2021 22:50:03 -
> @@ -2,7 +2,7 @@
>
> COMMENT= graphical multiplayer 3D tank war game
>
> -V= 2.4.14
> +V= 2.4.22
> DISTNAME=bzflag-${V}
> CATEGORIES= games x11
> MASTER_SITES=https://download.bzflag.org/bzflag/source/${V}/
> @@ -13,16 +13,19 @@ HOMEPAGE= https://www.bzflag.org/
> # LGPLv2.1 only or MPL 2.0
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm
> -WANTLIB += c cares crypto curl curses drm expat glapi m
> -WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb
> -WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync
> -WANTLIB += xshmfence z ${COMPILER_LIBCXX}
> +WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU ICE SDL2 SM X11
> +WANTLIB += X11-xcb Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama
> +WANTLIB += Xmu Xrandr Xrender Xss Xt Xxf86vm c cares crypto
> +WANTLIB += curl curses drm expat glapi m nghttp2 pthread
> +WANTLIB += samplerate sndio ssl usbhid xcb xcb-dri2 xcb-dri3
> +WANTLIB += xcb-glx xcb-present xcb-shm xcb-sync xcb-xfixes
> +WANTLIB += xshmfence z
>
> # C++11
> COMPILER=base-clang ports-gcc
>
> LIB_DEPENDS= devel/sdl2 \
> + graphics/glew \
> net/curl \
> net/libcares
> RUN_DEPENDS= devel/desktop-file-utils
> Index: games/bzflag/distinfo
> ===
> RCS file: /home/cvs/ports/games/bzflag/distinfo,v
> retrieving revision 1.13
> diff -u -p -u -p -r1.13 distinfo
> --- games/bzflag/distinfo 15 Sep 2018 19:26:50 - 1.13
> +++ games/bzflag/distinfo 23 Dec 2021 17:09:27 -
> @@ -1,2 +1,2 @@
> -SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U=
> -SIZE (bzflag-2.4.14.tar.bz2) = 14065461
> +SHA256 (bzflag-2.4.22.tar.bz2) = nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0=
> +SIZE (bzflag-2.4.22.tar.bz2) = 14169079
> Index: games/bzflag/patches/patch-src_platform_SDLMedia_cxx
> ===
> RCS file:
> /home/cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-src_platform_SDLMedia_cxx
> --- games/bzflag/patches/patch-src_platform_SDLMedia_cxx 3 Sep 2012
> 07:19:34 - 1.4
> +++ games/bzflag/patches/patch-src_platform_SDLMedia_cxx 23 Dec 2021
> 17:09:27 -
> @@ -1,13 +1,13 @@
> $OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34
> ajacoutot Exp $
> src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012
> -+++ src/platform/SDLMedia.cxxTue Aug 7 07:18:22 2012
> -@@ -109,8 +109,7 @@ bool SDLMedia::openAudio()
> +Index: src/platform/SDLMedia.cxx
> +--- src/platform/SDLMedia.cxx.orig
> src/platform/SDLMedia.cxx
> +@@ -130,7 +130,7 @@ boolSDLMedia::openAudio()
> + // how big a fragment to use? we want to hold at around 1/10th of
> + // a second.
> + // probably SDL is using multiple buffering, make it a 3rd
> +-int fragmentSize = (int)(0.03f * (float)audioOutputRate);
> ++int fragmentSize = (int)(0.1f * (float)audioOutputRate);
> + int n;
>
> - // how big a fragment to use? we want to hold at around 1/10th of
> - // a second.
> -- // p
Re: [UPDATE] games/bzflag to 2.4.22
Hi,
Just pinging the list about an update to games/bzflag.
I posted this on the 28th of November originally.
* Updates to v2.4.22
* graphics/glew added as dependency
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/bzflag/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile20 Mar 2020 16:44:23 - 1.49
+++ Makefile28 Nov 2021 12:26:08 -
@@ -2,7 +2,7 @@
COMMENT= graphical multiplayer 3D tank war game
-V= 2.4.14
+V= 2.4.22
DISTNAME= bzflag-${V}
CATEGORIES=games x11
MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/
@@ -13,7 +13,7 @@ HOMEPAGE= https://www.bzflag.org/
# LGPLv2.1 only or MPL 2.0
PERMIT_PACKAGE=Yes
-WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm
+WANTLIB += GL GLEW GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm
WANTLIB += c cares crypto curl curses drm expat glapi m
WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb
WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync
@@ -23,6 +23,7 @@ WANTLIB += xshmfence z ${COMPILER_LIBCXX
COMPILER= base-clang ports-gcc
LIB_DEPENDS= devel/sdl2 \
+ graphics/glew \
net/curl \
net/libcares
RUN_DEPENDS= devel/desktop-file-utils
Index: distinfo
===
RCS file: /cvs/ports/games/bzflag/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo15 Sep 2018 19:26:50 - 1.13
+++ distinfo28 Nov 2021 12:26:08 -
@@ -1,2 +1,2 @@
-SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U=
-SIZE (bzflag-2.4.14.tar.bz2) = 14065461
+SHA256 (bzflag-2.4.22.tar.bz2) = nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0=
+SIZE (bzflag-2.4.22.tar.bz2) = 14169079
Index: patches/patch-src_platform_SDLMedia_cxx
===
RCS file: /cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_platform_SDLMedia_cxx
--- patches/patch-src_platform_SDLMedia_cxx 3 Sep 2012 07:19:34 -
1.4
+++ patches/patch-src_platform_SDLMedia_cxx 28 Nov 2021 12:26:08 -
@@ -1,13 +1,13 @@
$OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34 ajacoutot
Exp $
src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012
-+++ src/platform/SDLMedia.cxx Tue Aug 7 07:18:22 2012
-@@ -109,8 +109,7 @@ bool SDLMedia::openAudio()
+Index: src/platform/SDLMedia.cxx
+--- src/platform/SDLMedia.cxx.orig
src/platform/SDLMedia.cxx
+@@ -130,7 +130,7 @@ boolSDLMedia::openAudio()
+ // how big a fragment to use? we want to hold at around 1/10th of
+ // a second.
+ // probably SDL is using multiple buffering, make it a 3rd
+-int fragmentSize = (int)(0.03f * (float)audioOutputRate);
++int fragmentSize = (int)(0.1f * (float)audioOutputRate);
+ int n;
- // how big a fragment to use? we want to hold at around 1/10th of
- // a second.
-- // probably SDL is using multiple buffering, make it a 3rd
-- int fragmentSize = (int)(0.03f * (float)audioOutputRate);
-+ int fragmentSize = (int)(0.1f * (float)audioOutputRate);
- int n;
-
- n = 0;
+ n = 0;
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/bzflag/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:12 - 1.15
+++ pkg/PLIST 28 Nov 2021 12:26:08 -
@@ -3,39 +3,39 @@
@bin bin/bzflag
@bin bin/bzfs
lib/bzflag/
-lib/bzflag/CustomZoneSample.so
-lib/bzflag/HoldTheFlag.so
-lib/bzflag/Phoenix.so
-lib/bzflag/RogueGenocide.so
-lib/bzflag/SAMPLE_PLUGIN.so
-lib/bzflag/TimeLimit.so
-lib/bzflag/airspawn.so
-lib/bzflag/autoFlagReset.so
-lib/bzflag/bzfscron.so
-lib/bzflag/chathistory.so
-lib/bzflag/customPollTypeSample.so
-lib/bzflag/customflagsample.so
-lib/bzflag/fairCTF.so
-lib/bzflag/fastmap.so
-lib/bzflag/flagStay.so
-lib/bzflag/keepaway.so
-lib/bzflag/killall.so
-lib/bzflag/koth.so
-lib/bzflag/logDetail.so
-lib/bzflag/nagware.so
-lib/bzflag/playHistoryTracker.so
-lib/bzflag/rabbitTimer.so
-lib/bzflag/rabidRabbit.so
-lib/bzflag/recordmatch.so
-lib/bzflag/regFlag.so
-lib/bzflag/serverControl.so
-lib/bzflag/serverSidePlayerSample.so
-lib/bzflag/shockwaveDeath.so
-lib/bzflag/superUser.so
-lib/bzflag/teamflagreset.so
-lib/bzflag/thiefControl.so
-lib/bzflag/timedctf.so
-lib/bzflag/wwzones.so
+@so lib/bzflag/CustomZoneSample.so
+@so lib/bzflag/HoldTheFlag.so
+@so lib/bzflag/Phoenix.so
+@so lib/bzflag/RogueGenocide.so
+@so lib/bzflag/SAMPLE_PLUGIN.so
+@so lib/bzflag/TimeLimit.so
+@so lib/bzflag/airspawn.so
+@so lib/bzflag/autoFlagReset.so
+@so lib/bzflag/bzfscron.so
+@so lib/bzflag/chathistory.so
+@so lib/bzflag/customPollTypeSample.so
+@so
Re: [UPDATE] games/vitetris
On Fri, Dec 10, 2021 at 11:39:40AM -0800, Ryan Freeman wrote: > On Sun, Nov 14, 2021 at 03:07:38PM -0800, Ryan Freeman wrote: > > On Sun, Nov 14, 2021 at 09:27:19AM +0000, Tom Murphy wrote: > > > Hi, > > > > > > Here's an update for games/vitetris. The patch-Makefile has been > > > updated slightly to accomodate recent changes to it. Compiles, > > > installs and runs great for me. > > > > Thanks Tom, works good here too on my amd64 laptop. > > > > > > > > OK? > > > > maintainer OK > > > > -ryan > > > > turns out this never actually sent, erg > > > > > > > Thanks, > > > Tom > > > > > > > > > Index: Makefile > > > === > > > RCS file: /cvs/ports/games/vitetris/Makefile,v > > > retrieving revision 1.11 > > > diff -u -p -r1.11 Makefile > > > --- Makefile 14 Apr 2020 04:46:12 - 1.11 > > > +++ Makefile 14 Nov 2021 09:24:37 - > > > @@ -3,7 +3,7 @@ > > > COMMENT =terminal-based tetris clone in vein of nintendo tetris > > > CATEGORIES = games > > > > > > -GH_TAGNAME = v0.58.0 > > > +GH_TAGNAME = v0.59.1 > > > GH_ACCOUNT = vicgeralds > > > GH_PROJECT = vitetris > > > > > > Index: distinfo > > > === > > > RCS file: /cvs/ports/games/vitetris/distinfo,v > > > retrieving revision 1.3 > > > diff -u -p -r1.3 distinfo > > > --- distinfo 14 Apr 2020 04:46:12 - 1.3 > > > +++ distinfo 14 Nov 2021 09:24:37 - > > > @@ -1,2 +1,2 @@ > > > -SHA256 (vitetris-0.58.0.tar.gz) = > > > 5+fLdLuBS5/sgP5O3jw/BBNNghfWMOCSoJcjgkjWBPk= > > > -SIZE (vitetris-0.58.0.tar.gz) = 96957 > > > +SHA256 (vitetris-0.59.1.tar.gz) = > > > aZRD3wPI1L8gUYOMEBXacgObu90KsO7eiRxZyEC99Y0= > > > +SIZE (vitetris-0.59.1.tar.gz) = 97182 > > > Index: patches/patch-Makefile > > > === > > > RCS file: /cvs/ports/games/vitetris/patches/patch-Makefile,v > > > retrieving revision 1.3 > > > diff -u -p -r1.3 patch-Makefile > > > --- patches/patch-Makefile14 Jul 2013 07:12:23 - 1.3 > > > +++ patches/patch-Makefile14 Nov 2021 09:24:37 - > > > @@ -1,7 +1,8 @@ > > > $OpenBSD: patch-Makefile,v 1.3 2013/07/14 07:12:23 rfreeman Exp $ > > > Makefile.origWed Jun 17 16:46:00 2009 > > > -+++ Makefile Fri Nov 9 17:08:44 2012 > > > -@@ -1,11 +1,11 @@ > > > +Index: Makefile > > > +--- Makefile.orig > > > Makefile > > > +@@ -1,9 +1,9 @@ > > > include config.mk > > > > > > -PROGNAME = tetris$(EXE) > > > @@ -11,11 +12,8 @@ $OpenBSD: patch-Makefile,v 1.3 2013/07/1 > > > -#HISCORE_FILENAME = /var/games/vitetris-hiscores > > > +HISCORE_FILENAME = /var/games/vitetris-hiscores > > > > > > --INSTALL = install -oroot -groot > > > -+INSTALL = install -oroot -gwheel > > > + INSTALL = install > > > > > > - default: build > > > - @echo Done. > > > @@ -18,7 +18,7 @@ build: src/src-conf.mk > > > cd src; $(MAKE) tetris > > > mv -f src/tetris$(EXE) $(PROGNAME) Hi, Just a friendly ping to the ports list for the update of games/vitetris. Has an OK from sdk@ and from maintainer. Thanks, Tom
Re: [UPDATE] games/yquake2 7.45 -> 8.00
On Sun, Dec 12, 2021 at 10:32:29AM +, Stuart Henderson wrote:
> Please put them in LIB_DEPENDS/WANTLIB with the annotation in the comment.
> What they're doing is not safe/reliable because it relies on the library ABI
> not changing. Adding as a LIB_DEPENDS ensures that yquake is updated when
> required due to any incompatible changes to the libraries.
OK here's a new patch.
1. Removes the patch that removes execinfo (since execinfo is in base
now, it's OK to keep it.)
2. Adds curl and openal to WANTLIB and keeps them in LIB_DEPENDS with
a comment that they are dlopen(3)'d.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/yquake2/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile7 Jan 2021 22:20:25 - 1.23
+++ Makefile12 Dec 2021 11:02:20 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
COMMENT= Yamagi Quake II
N= yquake2
-V= 7.45
+V= 8.00
PKGNAME= ${N}-${V}
DISTNAME= quake2-${V}
CATEGORIES=games
@@ -17,8 +17,9 @@ EXTRACT_SUFX= .tar.xz
# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += GL SDL2 c curl m openal pthread
+WANTLIB += GL SDL2 c curl execinfo m openal
+# openal and curl dlopen(3)'d if found
LIB_DEPENDS= audio/openal \
devel/sdl2 \
net/curl
Index: distinfo
===
RCS file: /cvs/ports/games/yquake2/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo7 Jan 2021 22:20:25 - 1.10
+++ distinfo12 Dec 2021 11:02:20 -
@@ -1,2 +1,2 @@
-SHA256 (quake2-7.45.tar.xz) = x1JFZ78apgRfJWGb6m5P2QZihLP7gYY7WB+0T09H/2U=
-SIZE (quake2-7.45.tar.xz) = 1997816
+SHA256 (quake2-8.00.tar.xz) = YNjRD8K011uWElGZDk2QM1cZSnMhC8HkKSTt74h9DrI=
+SIZE (quake2-8.00.tar.xz) = 2086776
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 7 Jan 2021 22:20:26 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2021/01/07 22:20:26 thfr Exp $
-
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -452,11 +452,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
- release/quake2 : LDFLAGS += -lexecinfo
- endif
-
--ifeq ($(YQ2_OSTYPE), OpenBSD)
--release/quake2 : CFLAGS += -DHAVE_EXECINFO
--release/quake2 : LDFLAGS += -lexecinfo
--endif
--
- ifeq ($(YQ2_OSTYPE), Haiku)
- release/quake2 : CFLAGS += -DHAVE_EXECINFO
- release/quake2 : LDFLAGS += -lexecinfo
Re: [UPDATE] games/yquake2 7.45 -> 8.00
On Sun, Dec 12, 2021 at 10:18:27AM +0100, Stefan Hagen wrote:
> Hi Tom,
>
> This update works for me. The execinfo problem has been discussed
> before. I'm quoting sthen:
>
> > Can it be disabled instead? The backtrace functions are a perennial
> > problem with ports and bulk builds.
> >
> > Software often checks for the headers and functions separately but
> > don't check with -lexecinfo (because they're often in libc), and uses
> > #ifdef HAVE_EXECINFO_H or similar around the #include, and
> > #ifdef HAVE_BACKTRACE or similar around function calls.
> > (yes this is not very sensible, but we do run into it quite often).
>
> So I think we should leave it disabled.
OK I'll leave the execinfo disabled as it was.
> Regarding the libraries. Make lib-depends-check now reports:
> Extra: curl.26 openal.4
>
> But the headers are needed at compile time. I first thought was to add
> them as BUILD_DEPENDS and RUN_DEPENDS. But this then doesn't package
> with errors:
>
> Create /home/dpb/data/packages/amd64/all/yquake2-8.00.tgz
> Missing library for curl>=0.0
> Missing library for openal>=0.0
>
> Therefore I think LIB_DEPENDS is still the correct place, but add a
> comment about these libs being dlopened' and the expected Extra lines.
>
> Best Regards,
> Stefan
Thanks for the info! I looked around other ports and saw they also
had similar comments above LIB_DEPENDS.
Here's an updated diff with the comment, and it also keeps the patch
to keep execinfo disabled as discussed above.
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/yquake2/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile7 Jan 2021 22:20:25 - 1.23
+++ Makefile12 Dec 2021 09:26:23 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
COMMENT= Yamagi Quake II
N= yquake2
-V= 7.45
+V= 8.00
PKGNAME= ${N}-${V}
DISTNAME= quake2-${V}
CATEGORIES=games
@@ -17,8 +17,9 @@ EXTRACT_SUFX= .tar.xz
# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += GL SDL2 c curl m openal pthread
+WANTLIB += GL SDL2 c curl m openal
+# openal and curl dlopen(3)'d if found
LIB_DEPENDS= audio/openal \
devel/sdl2 \
net/curl
Index: distinfo
===
RCS file: /cvs/ports/games/yquake2/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo7 Jan 2021 22:20:25 - 1.10
+++ distinfo12 Dec 2021 09:26:23 -
@@ -1,2 +1,2 @@
-SHA256 (quake2-7.45.tar.xz) = x1JFZ78apgRfJWGb6m5P2QZihLP7gYY7WB+0T09H/2U=
-SIZE (quake2-7.45.tar.xz) = 1997816
+SHA256 (quake2-8.00.tar.xz) = YNjRD8K011uWElGZDk2QM1cZSnMhC8HkKSTt74h9DrI=
+SIZE (quake2-8.00.tar.xz) = 2086776
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/games/yquake2/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 7 Jan 2021 22:20:26 - 1.3
+++ patches/patch-Makefile 12 Dec 2021 09:26:23 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.3 2021/01/0
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -452,11 +452,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
+@@ -505,11 +505,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
release/quake2 : LDFLAGS += -lexecinfo
endif
Re: [UPDATE] games/yquake2 7.45 -> 8.00
Hi again,
Here is a reworked diff. This time it keeps the patch for the
Makefile that takes execinfo out of the flags. (Though I think
it will compile with execinfo anyway, I'm not 100% sure if we
should be compiling it or shouldn't?)
This makes the least amount of changes to the port.
Is this preferable?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/yquake2/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile7 Jan 2021 22:20:25 - 1.23
+++ Makefile11 Dec 2021 18:37:05 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
COMMENT= Yamagi Quake II
N= yquake2
-V= 7.45
+V= 8.00
PKGNAME= ${N}-${V}
DISTNAME= quake2-${V}
CATEGORIES=games
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tar.xz
# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += GL SDL2 c curl m openal pthread
+WANTLIB += GL SDL2 c curl m openal
LIB_DEPENDS= audio/openal \
devel/sdl2 \
Index: distinfo
===
RCS file: /cvs/ports/games/yquake2/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo7 Jan 2021 22:20:25 - 1.10
+++ distinfo11 Dec 2021 18:37:05 -
@@ -1,2 +1,2 @@
-SHA256 (quake2-7.45.tar.xz) = x1JFZ78apgRfJWGb6m5P2QZihLP7gYY7WB+0T09H/2U=
-SIZE (quake2-7.45.tar.xz) = 1997816
+SHA256 (quake2-8.00.tar.xz) = YNjRD8K011uWElGZDk2QM1cZSnMhC8HkKSTt74h9DrI=
+SIZE (quake2-8.00.tar.xz) = 2086776
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/games/yquake2/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 7 Jan 2021 22:20:26 - 1.3
+++ patches/patch-Makefile 11 Dec 2021 18:37:05 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.3 2021/01/0
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -452,11 +452,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
+@@ -505,11 +505,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
release/quake2 : LDFLAGS += -lexecinfo
endif
[UPDATE] games/yquake2 7.45 -> 8.00
Hi,
Attached is a diff that updates games/yquake2 from 7.45 to 8.00.
* Makefile patch no longer needed as there have been extensive
fixes to the Makefile since 7.45
* audio/openal and net/curl are dlopen()'d instead of dynamically
linked, so they have been moved to RUN_DEPENDS
* execinfo added to WANTLIB. The original Makefile patch seems
to remove execinfo but I found it built just fine with it.
Builds and runs great on my amd64 system. Tested with my Quake2
server on a few maps.
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/yquake2/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile7 Jan 2021 22:20:25 - 1.23
+++ Makefile11 Dec 2021 12:53:57 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
COMMENT= Yamagi Quake II
N= yquake2
-V= 7.45
+V= 8.00
PKGNAME= ${N}-${V}
DISTNAME= quake2-${V}
CATEGORIES=games
@@ -17,11 +17,12 @@ EXTRACT_SUFX= .tar.xz
# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += GL SDL2 c curl m openal pthread
+WANTLIB += GL SDL2 c execinfo m
-LIB_DEPENDS= audio/openal \
- devel/sdl2 \
+RUN_DEPENDS= audio/openal \
net/curl
+
+LIB_DEPENDS= devel/sdl2
MAKE_ENV+= VERBOSE=1
USE_GMAKE= Yes
Index: distinfo
===
RCS file: /cvs/ports/games/yquake2/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo7 Jan 2021 22:20:25 - 1.10
+++ distinfo11 Dec 2021 12:53:57 -
@@ -1,2 +1,2 @@
-SHA256 (quake2-7.45.tar.xz) = x1JFZ78apgRfJWGb6m5P2QZihLP7gYY7WB+0T09H/2U=
-SIZE (quake2-7.45.tar.xz) = 1997816
+SHA256 (quake2-8.00.tar.xz) = YNjRD8K011uWElGZDk2QM1cZSnMhC8HkKSTt74h9DrI=
+SIZE (quake2-8.00.tar.xz) = 2086776
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 7 Jan 2021 22:20:26 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2021/01/07 22:20:26 thfr Exp $
-
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -452,11 +452,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
- release/quake2 : LDFLAGS += -lexecinfo
- endif
-
--ifeq ($(YQ2_OSTYPE), OpenBSD)
--release/quake2 : CFLAGS += -DHAVE_EXECINFO
--release/quake2 : LDFLAGS += -lexecinfo
--endif
--
- ifeq ($(YQ2_OSTYPE), Haiku)
- release/quake2 : CFLAGS += -DHAVE_EXECINFO
- release/quake2 : LDFLAGS += -lexecinfo
Re: [UPDATE] games/starfighter 1.7 -> 2.4
Hi,
Attaching a new diff for this with the build.by commented out.
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/starfighter/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.9
+++ Makefile10 Dec 2021 20:48:16 -
@@ -2,44 +2,37 @@
COMMENT = sidescrolling space shmup
-V =1.7
+V =2.4
DISTNAME = starfighter-$V-src
PKGNAME = starfighter-$V
-REVISION = 1
CATEGORIES = games
-HOMEPAGE = http://starfighter.nongnu.org/
+HOMEPAGE = https://pr-starfighter.github.io/
MAINTAINER = Anthony J. Bentley
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += SDL2 SDL2_image SDL2_mixer c m pthread ${COMPILER_LIBCXX}
+WANTLIB += SDL2 SDL2_image SDL2_mixer SDL2_ttf c glib-2.0 gobject-2.0
+WANTLIB += harfbuzz intl m pango-1.0 pthread
+
+MASTER_SITES =
https://github.com/pr-starfighter/starfighter/releases/download/v${V}/
COMPILER = base-clang ports-gcc base-gcc
-MASTER_SITES = ${MASTER_SITE_SAVANNAH:=starfighter/$V/}
+LIB_DEPENDS = devel/pango \
+ devel/sdl2-image \
+ devel/sdl2-mixer \
+ devel/sdl2-ttf
-LIB_DEPENDS = devel/sdl2-image \
- devel/sdl2-mixer
RUN_DEPENDS = devel/desktop-file-utils
-MAKE_FLAGS = CXX="${CXX}" \
- CXXFLAGS="${CXXFLAGS} \
- `pkg-config --cflags sdl2 SDL2_image SDL2_mixer`" \
- BINDIR="${PREFIX}/bin/" \
- DATADIR="${PREFIX}/share/starfighter/"
-FAKE_FLAGS = PREFIX=${TRUEPREFIX}
-
CONFIGURE_STYLE = gnu
USE_GMAKE =Yes
NO_TEST = Yes
-
-post-install:
- chmod ${SHAREMODE} ${PREFIX}/share/starfighter/*/*
.include
Index: distinfo
===
RCS file: /cvs/ports/games/starfighter/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo15 May 2018 07:10:42 - 1.3
+++ distinfo10 Dec 2021 20:48:16 -
@@ -1,2 +1,2 @@
-SHA256 (starfighter-1.7-src.tar.gz) =
W4xT7mgK0pVY4kS1k0X7x8IQClQtKDnddOIvhOWFhpg=
-SIZE (starfighter-1.7-src.tar.gz) = 46178626
+SHA256 (starfighter-2.4-src.tar.gz) =
Jae/Dz7hfAJpjHGtZGnEf+K1pgZqYkmM4sg3PWQ6+kY=
+SIZE (starfighter-2.4-src.tar.gz) = 50431362
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/starfighter/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 27 Jun 2018 21:03:49 - 1.4
+++ pkg/PLIST 10 Dec 2021 20:48:16 -
@@ -1,28 +1,18 @@
@comment $OpenBSD: PLIST,v 1.4 2018/06/27 21:03:49 espie Exp $
@bin bin/starfighter
+@man man/man6/starfighter.6
share/applications/starfighter.desktop
share/doc/starfighter/
share/doc/starfighter/COPYING
share/doc/starfighter/LICENSES
share/doc/starfighter/README.txt
-share/doc/starfighter/docs/
-share/doc/starfighter/docs/COPYING
-share/doc/starfighter/docs/arrowNorthEast.png
-share/doc/starfighter/docs/dollar.png
-share/doc/starfighter/docs/heart.png
-share/doc/starfighter/docs/index.html
-share/doc/starfighter/docs/plasmaAmmo.png
-share/doc/starfighter/docs/plasmaDamage.png
-share/doc/starfighter/docs/plasmaRate.png
-share/doc/starfighter/docs/rocket.png
-share/doc/starfighter/docs/rocketAmmo.png
-share/doc/starfighter/docs/sflogo.png
-share/doc/starfighter/docs/superCharge.png
share/pixmaps/
share/pixmaps/starfighter.png
share/starfighter/
share/starfighter/data/
+share/starfighter/data/TakaoPGothic.ttf
share/starfighter/data/credits.txt
+share/starfighter/data/ipa_font_license.txt
share/starfighter/gfx/
share/starfighter/gfx/aimFighter1.png
share/starfighter/gfx/aimFighter2.png
@@ -213,6 +203,22 @@ share/starfighter/gfx/tug2.png
share/starfighter/gfx/ursulaText.png
share/starfighter/gfx/wingmate1.png
share/starfighter/gfx/wingmate2.png
+share/starfighter/locale/
+@comment share/starfighter/locale/build.py
+share/starfighter/locale/en/
+share/starfighter/locale/en.po
+share/starfighter/locale/en/LC_MESSAGES/
+share/starfighter/locale/en/LC_MESSAGES/pr-starfighter.mo
+share/starfighter/locale/genpot.sh
+share/starfighter/locale/ja/
+share/starfighter/locale/ja.po
+share/starfighter/locale/ja/LC_MESSAGES/
+share/starfighter/locale/ja/LC_MESSAGES/pr-starfighter.mo
+share/starfighter/locale/nl/
+share/starfighter/locale/nl.po
+share/starfighter/locale/nl/LC_MESSAGES/
+share/starfighter/locale/nl/LC_MESSAGES/pr-starfighter.mo
+share/starfighter/locale/pr-starfighter.pot
share/starfighter/music/
share/starfighter/music/RE.ogg
share/starfighter/music/death.ogg
Re: [UPDATE] games/starfighter 1.7 -> 2.4
On Mon, Dec 06, 2021 at 05:30:02AM -0700, Anthony J. Bentley wrote:
> Tom Murphy writes:
> >Here is a diff to update games/starfighter v1.7 to v2.4.
>
> Thanks! Some comments:
>
> - Life is easier if you don't reindent WANTLIB. Just use the output
> from make port-lib-depends-check.
>
> - No need to set MODPY_VERSION, Python 3 is already default.
>
> - Since Python is just used for the build, set MODPY_RUNDEP=No.
>
> - Actually, according to README locales don't need to be rebuilt if
> we're using release tarballs, which we are. So just drop the Python
> stuff completely.
>
> - Drop glib2 and harfbuzz from LIB_DEPENDS, they are brought in by pango.
>
> - It looks like MAKE_FLAGS, FAKE_FLAGS, and post-install are no longer
> necessary and can be deleted.
Hi! Thanks for the feedback!
Please find the new diff below. portcheck still gives the message:
Python module without compiled version, consider using
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py: share/starfighter/locale/build.py
However, the locale files are in the PLIST so this should be OK?
-Tom
Index: Makefile
===
RCS file: /cvs/ports/games/starfighter/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.9
+++ Makefile10 Dec 2021 20:27:54 -
@@ -2,44 +2,37 @@
COMMENT = sidescrolling space shmup
-V =1.7
+V =2.4
DISTNAME = starfighter-$V-src
PKGNAME = starfighter-$V
-REVISION = 1
CATEGORIES = games
-HOMEPAGE = http://starfighter.nongnu.org/
+HOMEPAGE = https://pr-starfighter.github.io/
MAINTAINER = Anthony J. Bentley
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += SDL2 SDL2_image SDL2_mixer c m pthread ${COMPILER_LIBCXX}
+WANTLIB += SDL2 SDL2_image SDL2_mixer SDL2_ttf c glib-2.0 gobject-2.0
+WANTLIB += harfbuzz intl m pango-1.0 pthread
+
+MASTER_SITES =
https://github.com/pr-starfighter/starfighter/releases/download/v${V}/
COMPILER = base-clang ports-gcc base-gcc
-MASTER_SITES = ${MASTER_SITE_SAVANNAH:=starfighter/$V/}
+LIB_DEPENDS = devel/pango \
+ devel/sdl2-image \
+ devel/sdl2-mixer \
+ devel/sdl2-ttf
-LIB_DEPENDS = devel/sdl2-image \
- devel/sdl2-mixer
RUN_DEPENDS = devel/desktop-file-utils
-MAKE_FLAGS = CXX="${CXX}" \
- CXXFLAGS="${CXXFLAGS} \
- `pkg-config --cflags sdl2 SDL2_image SDL2_mixer`" \
- BINDIR="${PREFIX}/bin/" \
- DATADIR="${PREFIX}/share/starfighter/"
-FAKE_FLAGS = PREFIX=${TRUEPREFIX}
-
CONFIGURE_STYLE = gnu
USE_GMAKE =Yes
NO_TEST = Yes
-
-post-install:
- chmod ${SHAREMODE} ${PREFIX}/share/starfighter/*/*
.include
Index: distinfo
===
RCS file: /cvs/ports/games/starfighter/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo15 May 2018 07:10:42 - 1.3
+++ distinfo10 Dec 2021 20:27:54 -
@@ -1,2 +1,2 @@
-SHA256 (starfighter-1.7-src.tar.gz) =
W4xT7mgK0pVY4kS1k0X7x8IQClQtKDnddOIvhOWFhpg=
-SIZE (starfighter-1.7-src.tar.gz) = 46178626
+SHA256 (starfighter-2.4-src.tar.gz) =
Jae/Dz7hfAJpjHGtZGnEf+K1pgZqYkmM4sg3PWQ6+kY=
+SIZE (starfighter-2.4-src.tar.gz) = 50431362
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/starfighter/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 27 Jun 2018 21:03:49 - 1.4
+++ pkg/PLIST 10 Dec 2021 20:27:54 -
@@ -1,28 +1,18 @@
@comment $OpenBSD: PLIST,v 1.4 2018/06/27 21:03:49 espie Exp $
@bin bin/starfighter
+@man man/man6/starfighter.6
share/applications/starfighter.desktop
share/doc/starfighter/
share/doc/starfighter/COPYING
share/doc/starfighter/LICENSES
share/doc/starfighter/README.txt
-share/doc/starfighter/docs/
-share/doc/starfighter/docs/COPYING
-share/doc/starfighter/docs/arrowNorthEast.png
-share/doc/starfighter/docs/dollar.png
-share/doc/starfighter/docs/heart.png
-share/doc/starfighter/docs/index.html
-share/doc/starfighter/docs/plasmaAmmo.png
-share/doc/starfighter/docs/plasmaDamage.png
-share/doc/starfighter/docs/plasmaRate.png
-share/doc/starfighter/docs/rocket.png
-share/doc/starfighter/docs/rocketAmmo.png
-share/doc/starfighter/docs/sflogo.png
-share/doc/starfighter/docs/superCharge.png
share/pixmaps/
share/pixmaps/starfighter.png
share/starfighter/
share/starfighter/data/
+share/starfighter/data/TakaoPGothic.ttf
share/starfighter/data/credits.
[UPDATE] emulators/fceux to 2.5.0
Hi,
Here's an update to emulators/fceux to v2.5.0. A few highlights:
* Dependency on graphics/ffmpeg for recording videos
* Cmakelists patch changed. Some upstream changes went in
* QT ConsoleWindow.cpp patch no longer needed (upstream changes)
Runs well on my amd64 system -- tested with a few roms.
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/emulators/fceux/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile29 Oct 2021 10:26:23 - 1.22
+++ Makefile4 Dec 2021 13:00:58 -
@@ -2,7 +2,7 @@
COMMENT = emulator for Nintendo Entertainment System
-V =2.4.0
+V =2.5.0
DISTNAME = fceux-${V}
CATEGORIES = emulators games
@@ -16,14 +16,16 @@ PERMIT_PACKAGE =Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fceultra/}
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
-WANTLIB += GL GLU Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
-WANTLIB += SDL2 c m minizip x264 z
+WANTLIB += avcodec avformat avutil GL GLU Qt5Core
+WANTLIB += Qt5Gui Qt5OpenGL Qt5Widgets SDL2
+WANTLIB += swresample swscale c m minizip x264 x265 z
COMPILER = base-clang ports-gcc base-gcc
RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = archivers/minizip \
devel/sdl2 \
+ graphics/ffmpeg \
multimedia/x264
MODULES = devel/cmake \
Index: distinfo
===
RCS file: /cvs/ports/emulators/fceux/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo29 Oct 2021 10:13:16 - 1.5
+++ distinfo4 Dec 2021 13:00:58 -
@@ -1,2 +1,2 @@
-SHA256 (fceux-2.4.0.tar.gz) = p4wm2EfCIlPRTSZO8DiWk3GIowL8GQtgiLAaYFYsLno=
-SIZE (fceux-2.4.0.tar.gz) = 21807471
+SHA256 (fceux-2.5.0.tar.gz) = ZdhKPMWBStlYuKBrg1wWYMgyC9Zss07zPBR9Y3TNGyA=
+SIZE (fceux-2.5.0.tar.gz) = 21992303
Index: patches/patch-src_CMakeLists_txt
===
RCS file: /cvs/ports/emulators/fceux/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt29 Oct 2021 10:13:16 - 1.1
+++ patches/patch-src_CMakeLists_txt4 Dec 2021 13:00:58 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.1
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
-@@ -98,7 +98,7 @@ else(WIN32)
+@@ -128,7 +128,7 @@ else(WIN32)
endif()
# Check for LUA
@@ -11,17 +11,8 @@ Index: src/CMakeLists.txt
+ pkg_search_module( LUA lua51 lua-5.1 )
add_definitions( -DHAVE_ASPRINTF ) # What system wouldn't have this?
-
-@@ -106,7 +106,7 @@ else(WIN32)
- set( OPENGL_LDFLAGS "-framework OpenGL" )
- else()
- set( OPENGL_LDFLAGS ${OPENGL_LIBRARIES} )
-- set( SYS_LIBS -lrt -lpthread )
-+ set( SYS_LIBS -lpthread )
- endif()
-
- endif(WIN32)
-@@ -581,7 +581,7 @@ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/auxlib.
+ add_definitions( -DLUA_USE_LINUX ) # This needs to be set when link LUA
internally for linux and macosx
+@@ -631,7 +631,7 @@ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/auxlib.
install( DIRECTORY ${CMAKE_SOURCE_DIR}/output/.
DESTINATION share/fceux )
install( FILES ${CMAKE_SOURCE_DIR}/fceux1.png
DESTINATION share/pixmaps )
install( FILES ${CMAKE_SOURCE_DIR}/fceux.desktop
DESTINATION share/applications )
Index: patches/patch-src_drivers_Qt_ConsoleWindow_cpp
===
RCS file: patches/patch-src_drivers_Qt_ConsoleWindow_cpp
diff -N patches/patch-src_drivers_Qt_ConsoleWindow_cpp
--- patches/patch-src_drivers_Qt_ConsoleWindow_cpp 29 Oct 2021 10:13:16
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,41 +0,0 @@
-$OpenBSD: patch-src_drivers_Qt_ConsoleWindow_cpp,v 1.1 2021/10/29 10:13:16
bentley Exp $
-
-Index: src/drivers/Qt/ConsoleWindow.cpp
src/drivers/Qt/ConsoleWindow.cpp.orig
-+++ src/drivers/Qt/ConsoleWindow.cpp
-@@ -3817,7 +3817,7 @@ int consoleWin_t::getSchedParam( int &policy, int &pri
- {
- int ret = 0;
-
--#if defined(__linux__) || defined(__unix__)
-+#if defined(__linux__)
- struct sched_param p;
-
- policy = sched_getscheduler( getpid() );
-@@ -3833,7 +3833,7 @@ int consoleWin_t::getSchedParam( int &policy, int &pri
- priority = p.sched_priority;
- }
-
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__OpenBSD__)
- struct sched_param p;
-
- if ( pthread_getschedparam( pthread_self(), &policy, &p ) )
-@@ -3853,7 +3853,7 @@ int consoleWin_t::getSchedParam( int &policy, int &pri
- int consoleWin_t::setSchedParam( int policy, int
[UPDATE] games/bzflag to 2.4.22
Hi,
Here is a diff to update games/bzflag to v2.4.22. The bzflag
client now depends on graphics/glew, so it has been added as
a dependency.
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/bzflag/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile20 Mar 2020 16:44:23 - 1.49
+++ Makefile28 Nov 2021 12:26:08 -
@@ -2,7 +2,7 @@
COMMENT= graphical multiplayer 3D tank war game
-V= 2.4.14
+V= 2.4.22
DISTNAME= bzflag-${V}
CATEGORIES=games x11
MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/
@@ -13,7 +13,7 @@ HOMEPAGE= https://www.bzflag.org/
# LGPLv2.1 only or MPL 2.0
PERMIT_PACKAGE=Yes
-WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm
+WANTLIB += GL GLEW GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm
WANTLIB += c cares crypto curl curses drm expat glapi m
WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb
WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync
@@ -23,6 +23,7 @@ WANTLIB += xshmfence z ${COMPILER_LIBCXX
COMPILER= base-clang ports-gcc
LIB_DEPENDS= devel/sdl2 \
+ graphics/glew \
net/curl \
net/libcares
RUN_DEPENDS= devel/desktop-file-utils
Index: distinfo
===
RCS file: /cvs/ports/games/bzflag/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo15 Sep 2018 19:26:50 - 1.13
+++ distinfo28 Nov 2021 12:26:08 -
@@ -1,2 +1,2 @@
-SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U=
-SIZE (bzflag-2.4.14.tar.bz2) = 14065461
+SHA256 (bzflag-2.4.22.tar.bz2) = nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0=
+SIZE (bzflag-2.4.22.tar.bz2) = 14169079
Index: patches/patch-src_platform_SDLMedia_cxx
===
RCS file: /cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_platform_SDLMedia_cxx
--- patches/patch-src_platform_SDLMedia_cxx 3 Sep 2012 07:19:34 -
1.4
+++ patches/patch-src_platform_SDLMedia_cxx 28 Nov 2021 12:26:08 -
@@ -1,13 +1,13 @@
$OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34 ajacoutot
Exp $
src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012
-+++ src/platform/SDLMedia.cxx Tue Aug 7 07:18:22 2012
-@@ -109,8 +109,7 @@ bool SDLMedia::openAudio()
+Index: src/platform/SDLMedia.cxx
+--- src/platform/SDLMedia.cxx.orig
src/platform/SDLMedia.cxx
+@@ -130,7 +130,7 @@ boolSDLMedia::openAudio()
+ // how big a fragment to use? we want to hold at around 1/10th of
+ // a second.
+ // probably SDL is using multiple buffering, make it a 3rd
+-int fragmentSize = (int)(0.03f * (float)audioOutputRate);
++int fragmentSize = (int)(0.1f * (float)audioOutputRate);
+ int n;
- // how big a fragment to use? we want to hold at around 1/10th of
- // a second.
-- // probably SDL is using multiple buffering, make it a 3rd
-- int fragmentSize = (int)(0.03f * (float)audioOutputRate);
-+ int fragmentSize = (int)(0.1f * (float)audioOutputRate);
- int n;
-
- n = 0;
+ n = 0;
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/bzflag/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:12 - 1.15
+++ pkg/PLIST 28 Nov 2021 12:26:08 -
@@ -3,39 +3,39 @@
@bin bin/bzflag
@bin bin/bzfs
lib/bzflag/
-lib/bzflag/CustomZoneSample.so
-lib/bzflag/HoldTheFlag.so
-lib/bzflag/Phoenix.so
-lib/bzflag/RogueGenocide.so
-lib/bzflag/SAMPLE_PLUGIN.so
-lib/bzflag/TimeLimit.so
-lib/bzflag/airspawn.so
-lib/bzflag/autoFlagReset.so
-lib/bzflag/bzfscron.so
-lib/bzflag/chathistory.so
-lib/bzflag/customPollTypeSample.so
-lib/bzflag/customflagsample.so
-lib/bzflag/fairCTF.so
-lib/bzflag/fastmap.so
-lib/bzflag/flagStay.so
-lib/bzflag/keepaway.so
-lib/bzflag/killall.so
-lib/bzflag/koth.so
-lib/bzflag/logDetail.so
-lib/bzflag/nagware.so
-lib/bzflag/playHistoryTracker.so
-lib/bzflag/rabbitTimer.so
-lib/bzflag/rabidRabbit.so
-lib/bzflag/recordmatch.so
-lib/bzflag/regFlag.so
-lib/bzflag/serverControl.so
-lib/bzflag/serverSidePlayerSample.so
-lib/bzflag/shockwaveDeath.so
-lib/bzflag/superUser.so
-lib/bzflag/teamflagreset.so
-lib/bzflag/thiefControl.so
-lib/bzflag/timedctf.so
-lib/bzflag/wwzones.so
+@so lib/bzflag/CustomZoneSample.so
+@so lib/bzflag/HoldTheFlag.so
+@so lib/bzflag/Phoenix.so
+@so lib/bzflag/RogueGenocide.so
+@so lib/bzflag/SAMPLE_PLUGIN.so
+@so lib/bzflag/TimeLimit.so
+@so lib/bzflag/airspawn.so
+@so lib/bzflag/autoFlagReset.so
+@so lib/bzflag/bzfscron.so
+@so lib/bzflag/chathistory.so
+@so lib/bzflag/customPollTypeSample.so
+@so lib/bzflag/customflagsample
Re: [UPDATE] games/redeclipse to 2.0.0
On Sat, Nov 27, 2021 at 02:33:40PM +1100, Jonathan Gray wrote: > On Fri, Nov 26, 2021 at 04:17:35PM +0000, Tom Murphy wrote: > > Hi, > > > > I've updated games/redeclipse to 2.0.0. Compiles and runs fine here > > but it's kind of hard to figure out the "parkour" like movement in > > the game. (Looks like fun once you can coordinate your movements!) > > My concern is that this will run on less hardware. > > https://www.redeclipse.net/docs/System-Requirements > > "The next release of Red Eclipse, 2.0, is based on the Tesseract engine, > which is much more GPU heavy than the outgoing Cube 2 engine." > > From memory they dropped some maps as well. Hi Jonathan, What would you recommend? Split out the port into redeclipse1 and redeclipse2? Or use FLAVOR? Thanks, Tom
[UPDATE] games/starfighter 1.7 -> 2.4
Hi,
Here is a diff to update games/starfighter v1.7 to v2.4.
Some notable changes:
* Game is hosted up on Github in pr-starfighter project
* Homepage changed to github.io
* Added python module for compiling locales
* Some more libraries added in for dependencies
Is this OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/starfighter/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.9
+++ Makefile27 Nov 2021 14:46:57 -
@@ -2,28 +2,36 @@
COMMENT = sidescrolling space shmup
-V =1.7
+V =2.4
DISTNAME = starfighter-$V-src
PKGNAME = starfighter-$V
-REVISION = 1
CATEGORIES = games
-HOMEPAGE = http://starfighter.nongnu.org/
+HOMEPAGE = https://pr-starfighter.github.io/
MAINTAINER = Anthony J. Bentley
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += SDL2 SDL2_image SDL2_mixer c m pthread ${COMPILER_LIBCXX}
+WANTLIB += glib-2.0 gobject-2.0 harfbuzz intl pango-1.0 \
+ SDL2 SDL2_image SDL2_mixer SDL2_ttf c m pthread
+
+MASTER_SITES =
https://github.com/pr-starfighter/starfighter/releases/download/v${V}/
COMPILER = base-clang ports-gcc base-gcc
-MASTER_SITES = ${MASTER_SITE_SAVANNAH:=starfighter/$V/}
+MODULES = lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+
+LIB_DEPENDS = devel/harfbuzz \
+ devel/glib2 \
+ devel/pango \
+ devel/sdl2-image \
+ devel/sdl2-mixer \
+ devel/sdl2-ttf
-LIB_DEPENDS = devel/sdl2-image \
- devel/sdl2-mixer
RUN_DEPENDS = devel/desktop-file-utils
MAKE_FLAGS = CXX="${CXX}" \
@@ -40,6 +48,9 @@ USE_GMAKE = Yes
NO_TEST = Yes
post-install:
- chmod ${SHAREMODE} ${PREFIX}/share/starfighter/*/*
+ find ${PREFIX}/share -type d -exec chmod ${DIRMODE} {} + -o \
+ -type f -exec chmod ${SHAREMODE} {} +
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+${PREFIX}/share/starfighter/locale/build.py
.include
Index: distinfo
===
RCS file: /cvs/ports/games/starfighter/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo15 May 2018 07:10:42 - 1.3
+++ distinfo27 Nov 2021 14:46:57 -
@@ -1,2 +1,2 @@
-SHA256 (starfighter-1.7-src.tar.gz) =
W4xT7mgK0pVY4kS1k0X7x8IQClQtKDnddOIvhOWFhpg=
-SIZE (starfighter-1.7-src.tar.gz) = 46178626
+SHA256 (starfighter-2.4-src.tar.gz) =
Jae/Dz7hfAJpjHGtZGnEf+K1pgZqYkmM4sg3PWQ6+kY=
+SIZE (starfighter-2.4-src.tar.gz) = 50431362
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/starfighter/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 27 Jun 2018 21:03:49 - 1.4
+++ pkg/PLIST 27 Nov 2021 14:46:57 -
@@ -1,28 +1,18 @@
@comment $OpenBSD: PLIST,v 1.4 2018/06/27 21:03:49 espie Exp $
@bin bin/starfighter
+@man man/man6/starfighter.6
share/applications/starfighter.desktop
share/doc/starfighter/
share/doc/starfighter/COPYING
share/doc/starfighter/LICENSES
share/doc/starfighter/README.txt
-share/doc/starfighter/docs/
-share/doc/starfighter/docs/COPYING
-share/doc/starfighter/docs/arrowNorthEast.png
-share/doc/starfighter/docs/dollar.png
-share/doc/starfighter/docs/heart.png
-share/doc/starfighter/docs/index.html
-share/doc/starfighter/docs/plasmaAmmo.png
-share/doc/starfighter/docs/plasmaDamage.png
-share/doc/starfighter/docs/plasmaRate.png
-share/doc/starfighter/docs/rocket.png
-share/doc/starfighter/docs/rocketAmmo.png
-share/doc/starfighter/docs/sflogo.png
-share/doc/starfighter/docs/superCharge.png
share/pixmaps/
share/pixmaps/starfighter.png
share/starfighter/
share/starfighter/data/
+share/starfighter/data/TakaoPGothic.ttf
share/starfighter/data/credits.txt
+share/starfighter/data/ipa_font_license.txt
share/starfighter/gfx/
share/starfighter/gfx/aimFighter1.png
share/starfighter/gfx/aimFighter2.png
@@ -213,6 +203,24 @@ share/starfighter/gfx/tug2.png
share/starfighter/gfx/ursulaText.png
share/starfighter/gfx/wingmate1.png
share/starfighter/gfx/wingmate2.png
+share/starfighter/locale/
+${MODPY_COMMENT}share/starfighter/locale/${MODPY_PYCACHE}/
+share/starfighter/locale/${MODPY_PYCACHE}build.${MODPY_PYC_MAGIC_TAG}pyc
+share/starfighter/locale/build.py
+share/starfighter/locale/en/
+share/starfighter/locale/en.po
+share/starfighter/locale/en/LC_MESSAGES/
+share/starfighter/locale/en/LC_MESSAGES/pr-starfighter.mo
+share/starfighter/locale/genpot.sh
+share/starfighter/locale/ja/
+share/starfighter/local
[UPDATE] games/quakespasm to 0.94.1 -> 0.94.2
Hi,
Minor version update of games/quakespasm. Compiles and runs great on
my amd64 system. I took 'pthread' out of WANTLIB because it shows up
as an 'Extra'.
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/quakespasm/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile6 Sep 2021 01:08:31 - 1.12
+++ Makefile27 Nov 2021 12:57:40 -
@@ -2,7 +2,7 @@
COMMENT= SDL Quake port
CATEGORIES=games
-DISTNAME= quakespasm-0.94.1
+DISTNAME= quakespasm-0.94.2
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quakespasm/}
HOMEPAGE= http://quakespasm.sourceforge.net
@@ -11,7 +11,7 @@ MAINTAINER= Jonathan Gray
[UPDATE] games/redeclipse to 2.0.0
Hi, I've updated games/redeclipse to 2.0.0. Compiles and runs fine here but it's kind of hard to figure out the "parkour" like movement in the game. (Looks like fun once you can coordinate your movements!) I removed a duplicate MASTER_SITES line and switched the source to github.com/redeclipse since the original red-eclipse source seems to be discontinued. Diff gzipped to save space. OK? Thanks, Tom redeclipse.diff.gz Description: Binary data
Re: [UPDATE] for games/uqm 0.7.0 -> 0.8.0
On Sat, Nov 20, 2021 at 10:15:26PM +0100, Stefan Hagen wrote: > Hi Tom, > > Tom Murphy wrote: > > Here is a diff to update games/uqm from 0.7.0 to 0.8.0. The game > > now compiles under SDL2. > > > > OK? > > I don't know how to play this game, but I clicked around and it seems to > run fine. Tested on amd64. > > $ portcheck > both data/3domusic and some of its parents has distinfo > ... > > games/uqm/distinfo should be removed. > > OK sdk@ without parent distinfo. > > Best Regards, > Stefan Hi Stefan, Thanks! I've updated the diff so that removes the parent distinfo. Tom Index: distinfo === RCS file: distinfo diff -N distinfo --- distinfo20 Jan 2015 12:28:31 - 1.16 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,16 +0,0 @@ -SHA256 (uqm/uqm-0.7.0-3domusic.uqm) = xXCF5k2tS934pnmpqirfY/IVbV9sur5jr4BRkDPby4I= -SHA256 (uqm/uqm-0.7.0-content.uqm) = uPbbi6KfBij7HVwjODCJaxn0Qa7jdEvaZx6iZLRNo78= -SHA256 (uqm/uqm-0.7.0-source.tgz) = o2lcX38L5+ycD4DsVpkHs4ICOh/ubmNVMr1Tt7U7siE= -SHA256 (uqm/uqm-0.7.0-voice.uqm) = vMz4AbS6N1lP9iF7KSdE6lhu4tRH6SeASELMrotzyXk= -SHA256 (uqm/uqm-remix-disc1.uqm) = tpdpR0XZOTEejr/91e32kuAQwl15ZuFIEHSUCk0Eh+g= -SHA256 (uqm/uqm-remix-disc2.uqm) = f7tHRBAuMSc+RFmwGhVtoFLsU3wSj+kXk2Q+NIvBut4= -SHA256 (uqm/uqm-remix-disc3.uqm) = 5tifj2bPHfHLJ4/KHpImGxd27mcN/yYTLjPxTb0x6R0= -SHA256 (uqm/uqm-remix-disc4.uqm) = pMgZdxKltyqBx+96KjPqfTrJCrBjySndaOcyilWahtA= -SIZE (uqm/uqm-0.7.0-3domusic.uqm) = 18980671 -SIZE (uqm/uqm-0.7.0-content.uqm) = 11538533 -SIZE (uqm/uqm-0.7.0-source.tgz) = 1562003 -SIZE (uqm/uqm-0.7.0-voice.uqm) = 115143439 -SIZE (uqm/uqm-remix-disc1.uqm) = 50188876 -SIZE (uqm/uqm-remix-disc2.uqm) = 60282662 -SIZE (uqm/uqm-remix-disc3.uqm) = 39924875 -SIZE (uqm/uqm-remix-disc4.uqm) = 86545760 Index: data/3domusic/Makefile === RCS file: /cvs/ports/games/uqm/data/3domusic/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- data/3domusic/Makefile 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/3domusic/Makefile 21 Nov 2021 21:37:15 - @@ -2,14 +2,12 @@ COMMENT = ur-quan masters: 3DO music content -V =0.7.0 +V =0.8.0 UQM_ADDON =Yes # packages-specs(7): first digit following hyphen can only be version PKGNAME = uqm-threedomusic-$V DISTFILES =uqm-$V-3domusic.uqm - -REVISION = 6 .include Index: data/3domusic/distinfo === RCS file: /cvs/ports/games/uqm/data/3domusic/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- data/3domusic/distinfo 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/3domusic/distinfo 21 Nov 2021 21:37:15 - @@ -1,2 +1,2 @@ -SHA256 (uqm/uqm-0.7.0-3domusic.uqm) = xXCF5k2tS934pnmpqirfY/IVbV9sur5jr4BRkDPby4I= -SIZE (uqm/uqm-0.7.0-3domusic.uqm) = 18980671 +SHA256 (uqm/uqm-0.8.0-3domusic.uqm) = RM087H6VabQRettNd/FSKJCXJWYmc5GuCWMUhdIx2Lk= +SIZE (uqm/uqm-0.8.0-3domusic.uqm) = 18980671 Index: data/3domusic/pkg/PLIST === RCS file: /cvs/ports/games/uqm/data/3domusic/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- data/3domusic/pkg/PLIST 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/3domusic/pkg/PLIST 21 Nov 2021 21:37:15 - @@ -3,4 +3,4 @@ share/uqm/ share/uqm/content/ share/uqm/content/addons/ -share/uqm/content/addons/uqm-0.7.0-3domusic.uqm +share/uqm/content/addons/uqm-0.8.0-3domusic.uqm Index: data/content/Makefile === RCS file: /cvs/ports/games/uqm/data/content/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- data/content/Makefile 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/content/Makefile 21 Nov 2021 21:37:15 - @@ -2,13 +2,11 @@ COMMENT = ur-quan masters: game content -V =0.7.0 +V =0.8.0 UQM_PACKAGE = Yes PKGNAME = uqm-content-$V DISTFILES =uqm-$V-content.uqm - -REVISION = 6 .include Index: data/content/distinfo === RCS file: /cvs/ports/games/uqm/data/content/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- data/content/distinfo 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/content/distinfo 21 Nov 2021 21:37:15 - @@ -1,2 +1,2 @@ -SHA256 (uqm/uqm-0.7.0-content.uqm) = uPbbi6KfBij7HVwjODCJaxn0Qa7jdEvaZx6iZLRNo78= -SIZE (uqm/uqm-0.7.0-content.uqm) = 11538533 +SHA256 (uqm/uqm-0.8.0-content.uqm) = d9dawl5vt1WjPEujs4p7e8Qfy8AolokbDMmskhS3Lu8= +SIZE (uqm/uqm-0.8.0-content.uqm) = 11547353 Index: data/content/pkg/PLIST ==
[UPDATE] emulators/stella update to 6.6
Hi, Here is a diff to update emulators/stella (Atari 2600 emulator) to version 6.6. OK? Thanks, Tom Index: Makefile === RCS file: /cvs/ports/emulators/stella/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- Makefile25 Apr 2021 07:11:47 - 1.41 +++ Makefile20 Nov 2021 19:36:34 - @@ -2,7 +2,7 @@ COMMENT = Atari 2600 VCS emulator -V =6.5.3 +V =6.6 DISTNAME = stella-$V CATEGORIES = emulators EXTRACT_SUFX = -src.tar.xz Index: distinfo === RCS file: /cvs/ports/emulators/stella/distinfo,v retrieving revision 1.28 diff -u -p -r1.28 distinfo --- distinfo25 Apr 2021 07:11:47 - 1.28 +++ distinfo20 Nov 2021 19:36:34 - @@ -1,2 +1,2 @@ -SHA256 (stella-6.5.3-src.tar.xz) = tJ1eWlqocuH0tvJOq9cjBKvdV3gB1uw0l2DHO5nn8U0= -SIZE (stella-6.5.3-src.tar.xz) = 6221588 +SHA256 (stella-6.6-src.tar.xz) = 1IHvxtJ7UpRWXfzBCYPeLbxNuKWZMqZ4/9tNJAS4wgc= +SIZE (stella-6.6-src.tar.xz) = 10035924
[UPDATE] for games/uqm 0.7.0 -> 0.8.0
Hi, Here is a diff to update games/uqm from 0.7.0 to 0.8.0. The game now compiles under SDL2. OK? Thanks, Tom Index: data/3domusic/Makefile === RCS file: /cvs/ports/games/uqm/data/3domusic/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- data/3domusic/Makefile 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/3domusic/Makefile 20 Nov 2021 15:46:43 - @@ -2,14 +2,12 @@ COMMENT = ur-quan masters: 3DO music content -V =0.7.0 +V =0.8.0 UQM_ADDON =Yes # packages-specs(7): first digit following hyphen can only be version PKGNAME = uqm-threedomusic-$V DISTFILES =uqm-$V-3domusic.uqm - -REVISION = 6 .include Index: data/3domusic/distinfo === RCS file: /cvs/ports/games/uqm/data/3domusic/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- data/3domusic/distinfo 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/3domusic/distinfo 20 Nov 2021 15:46:43 - @@ -1,2 +1,2 @@ -SHA256 (uqm/uqm-0.7.0-3domusic.uqm) = xXCF5k2tS934pnmpqirfY/IVbV9sur5jr4BRkDPby4I= -SIZE (uqm/uqm-0.7.0-3domusic.uqm) = 18980671 +SHA256 (uqm/uqm-0.8.0-3domusic.uqm) = RM087H6VabQRettNd/FSKJCXJWYmc5GuCWMUhdIx2Lk= +SIZE (uqm/uqm-0.8.0-3domusic.uqm) = 18980671 Index: data/3domusic/pkg/PLIST === RCS file: /cvs/ports/games/uqm/data/3domusic/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- data/3domusic/pkg/PLIST 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/3domusic/pkg/PLIST 20 Nov 2021 15:46:43 - @@ -3,4 +3,4 @@ share/uqm/ share/uqm/content/ share/uqm/content/addons/ -share/uqm/content/addons/uqm-0.7.0-3domusic.uqm +share/uqm/content/addons/uqm-0.8.0-3domusic.uqm Index: data/content/Makefile === RCS file: /cvs/ports/games/uqm/data/content/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- data/content/Makefile 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/content/Makefile 20 Nov 2021 15:46:43 - @@ -2,13 +2,11 @@ COMMENT = ur-quan masters: game content -V =0.7.0 +V =0.8.0 UQM_PACKAGE = Yes PKGNAME = uqm-content-$V DISTFILES =uqm-$V-content.uqm - -REVISION = 6 .include Index: data/content/distinfo === RCS file: /cvs/ports/games/uqm/data/content/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- data/content/distinfo 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/content/distinfo 20 Nov 2021 15:46:43 - @@ -1,2 +1,2 @@ -SHA256 (uqm/uqm-0.7.0-content.uqm) = uPbbi6KfBij7HVwjODCJaxn0Qa7jdEvaZx6iZLRNo78= -SIZE (uqm/uqm-0.7.0-content.uqm) = 11538533 +SHA256 (uqm/uqm-0.8.0-content.uqm) = d9dawl5vt1WjPEujs4p7e8Qfy8AolokbDMmskhS3Lu8= +SIZE (uqm/uqm-0.8.0-content.uqm) = 11547353 Index: data/content/pkg/PLIST === RCS file: /cvs/ports/games/uqm/data/content/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- data/content/pkg/PLIST 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/content/pkg/PLIST 20 Nov 2021 15:46:43 - @@ -3,4 +3,4 @@ share/uqm/ share/uqm/content/ share/uqm/content/packages/ -share/uqm/content/packages/uqm-0.7.0-content.uqm +share/uqm/content/packages/uqm-0.8.0-content.uqm Index: data/remix/pkg/PLIST === RCS file: /cvs/ports/games/uqm/data/remix/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- data/remix/pkg/PLIST30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/remix/pkg/PLIST20 Nov 2021 15:46:43 - @@ -1,12 +1,12 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2020/08/30 10:05:35 bentley Exp $ -@pkgpath games/uqm,-remix1 -@pkgpath games/uqm,-remix2 -@pkgpath games/uqm,-remix3 -@pkgpath games/uqm,-remix4 @conflict uqm-remix1-* @conflict uqm-remix2-* @conflict uqm-remix3-* @conflict uqm-remix4-* +@pkgpath games/uqm,-remix1 +@pkgpath games/uqm,-remix2 +@pkgpath games/uqm,-remix3 +@pkgpath games/uqm,-remix4 share/uqm/ share/uqm/content/ share/uqm/content/addons/ Index: data/voice/Makefile === RCS file: /cvs/ports/games/uqm/data/voice/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- data/voice/Makefile 30 Aug 2020 10:05:35 - 1.1.1.1 +++ data/voice/Makefile 20 Nov 2021 15:46:43 - @@ -2,13 +2,11 @@ COMMENT = ur-quan masters: speech content -V =0.7.0 +V =0.8.0 UQM_ADDON =Yes PKGNAME = uqm-voice-$V DISTFILES =uqm-$V-voice.uqm - -REVISION = 6 .include Index: data/vo
[UPDATE] games/wesnoth
Hi,
Here's a diff to upgrade Wesnoth to 1.16.1. I replaced a hardcoded
/var in the Makefile with ${VARBASE}. Only one line changed in
PLIST. Compiles, installs and runs great on my machine.
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/wesnoth/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- Makefile1 Nov 2021 20:39:39 - 1.92
+++ Makefile14 Nov 2021 11:21:11 -
@@ -5,7 +5,7 @@ PORTROACH = limitw:1,even
BROKEN-hppa = missing atomic ops
COMMENT= fantasy turn-based strategy game
-DISTNAME= wesnoth-1.16.0
+DISTNAME= wesnoth-1.16.1
CATEGORIES=games x11
@@ -44,7 +44,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
textproc/libxslt \
x11/gtk+3,-guic
-CONFIGURE_ARGS+=-DFIFO_DIR=/var/wesnothd \
+CONFIGURE_ARGS+=-DFIFO_DIR=${VARBASE}/wesnothd \
-DSERVER_UID=708 \
-DSERVER_GID=708 \
-DENABLE_CAMPAIGN_SERVER=ON \
Index: distinfo
===
RCS file: /cvs/ports/games/wesnoth/distinfo,v
retrieving revision 1.44
diff -u -p -r1.44 distinfo
--- distinfo1 Nov 2021 20:39:39 - 1.44
+++ distinfo14 Nov 2021 11:21:11 -
@@ -1,2 +1,2 @@
-SHA256 (wesnoth-1.16.0.tar.bz2) = H25DDkNNph7KqnfixRTlmvtFWGhd1TE9ZuAborkAQWM=
-SIZE (wesnoth-1.16.0.tar.bz2) = 473896834
+SHA256 (wesnoth-1.16.1.tar.bz2) = jjO6I0uTVIWqT7GUoVpOfir7JSAFDHBqu/iO9Frl2TM=
+SIZE (wesnoth-1.16.1.tar.bz2) = 473960291
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/wesnoth/pkg/PLIST,v
retrieving revision 1.50
diff -u -p -r1.50 PLIST
--- pkg/PLIST 1 Nov 2021 20:39:39 - 1.50
+++ pkg/PLIST 14 Nov 2021 11:21:12 -
@@ -3235,6 +3235,7 @@ share/wesnoth/data/campaigns/tutorial/_m
share/wesnoth/data/campaigns/tutorial/gui/
share/wesnoth/data/campaigns/tutorial/gui/character_selection.cfg
share/wesnoth/data/campaigns/tutorial/images/
+share/wesnoth/data/campaigns/tutorial/images/campaign_image.png
share/wesnoth/data/campaigns/tutorial/images/misc/
share/wesnoth/data/campaigns/tutorial/images/misc/highlight-hex.png
share/wesnoth/data/campaigns/tutorial/images/portraits/
[UPDATE] games/vitetris
Hi, Here's an update for games/vitetris. The patch-Makefile has been updated slightly to accomodate recent changes to it. Compiles, installs and runs great for me. OK? Thanks, Tom Index: Makefile === RCS file: /cvs/ports/games/vitetris/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile14 Apr 2020 04:46:12 - 1.11 +++ Makefile14 Nov 2021 09:24:37 - @@ -3,7 +3,7 @@ COMMENT = terminal-based tetris clone in vein of nintendo tetris CATEGORIES = games -GH_TAGNAME = v0.58.0 +GH_TAGNAME = v0.59.1 GH_ACCOUNT = vicgeralds GH_PROJECT = vitetris Index: distinfo === RCS file: /cvs/ports/games/vitetris/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo14 Apr 2020 04:46:12 - 1.3 +++ distinfo14 Nov 2021 09:24:37 - @@ -1,2 +1,2 @@ -SHA256 (vitetris-0.58.0.tar.gz) = 5+fLdLuBS5/sgP5O3jw/BBNNghfWMOCSoJcjgkjWBPk= -SIZE (vitetris-0.58.0.tar.gz) = 96957 +SHA256 (vitetris-0.59.1.tar.gz) = aZRD3wPI1L8gUYOMEBXacgObu90KsO7eiRxZyEC99Y0= +SIZE (vitetris-0.59.1.tar.gz) = 97182 Index: patches/patch-Makefile === RCS file: /cvs/ports/games/vitetris/patches/patch-Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-Makefile --- patches/patch-Makefile 14 Jul 2013 07:12:23 - 1.3 +++ patches/patch-Makefile 14 Nov 2021 09:24:37 - @@ -1,7 +1,8 @@ $OpenBSD: patch-Makefile,v 1.3 2013/07/14 07:12:23 rfreeman Exp $ Makefile.orig Wed Jun 17 16:46:00 2009 -+++ Makefile Fri Nov 9 17:08:44 2012 -@@ -1,11 +1,11 @@ +Index: Makefile +--- Makefile.orig Makefile +@@ -1,9 +1,9 @@ include config.mk -PROGNAME = tetris$(EXE) @@ -11,11 +12,8 @@ $OpenBSD: patch-Makefile,v 1.3 2013/07/1 -#HISCORE_FILENAME = /var/games/vitetris-hiscores +HISCORE_FILENAME = /var/games/vitetris-hiscores --INSTALL = install -oroot -groot -+INSTALL = install -oroot -gwheel + INSTALL = install - default: build - @echo Done. @@ -18,7 +18,7 @@ build: src/src-conf.mk cd src; $(MAKE) tetris mv -f src/tetris$(EXE) $(PROGNAME)
Re: UPDATE: databases/sqlcipher
On Mon, Nov 01, 2021 at 09:07:48AM +0100, Tim van der Molen wrote:
> Here is an update to sqlcipher 4.5.0. Announcement:
>
> https://www.zetetic.net/blog/2021/10/28/sqlcipher-4.5.0-release/
>
> OK?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/sqlcipher/Makefile,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 Makefile
> --- Makefile 21 Mar 2021 12:04:26 - 1.1.1.1
> +++ Makefile 31 Oct 2021 20:25:59 -
> @@ -4,9 +4,9 @@ COMMENT = encrypted SQLite database
>
> GH_ACCOUNT = sqlcipher
> GH_PROJECT = sqlcipher
> -GH_TAGNAME = v4.4.3
> +GH_TAGNAME = v4.5.0
>
> -SHARED_LIBS += sqlcipher 0.0 # 8.6
> +SHARED_LIBS += sqlcipher 0.1 # 8.6
>
> CATEGORIES = databases
>
> @@ -16,7 +16,7 @@ MAINTAINER =Tom Murphy # PD and BSD
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += c crypto curses pthread readline z
> +WANTLIB += c crypto curses m pthread readline z
>
> CONFIGURE_STYLE =gnu
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/databases/sqlcipher/distinfo,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 distinfo
> --- distinfo 21 Mar 2021 12:04:26 - 1.1.1.1
> +++ distinfo 31 Oct 2021 20:25:59 -
> @@ -1,2 +1,2 @@
> -SHA256 (sqlcipher-4.4.3.tar.gz) =
> uN9puZjAQs5/ipnwfPEfRd/r5REQ75LelfFyg1iFMTM=
> -SIZE (sqlcipher-4.4.3.tar.gz) = 17639967
> +SHA256 (sqlcipher-4.5.0.tar.gz) =
> IMRqhVxH1aChWf3KqEkex726pwanNO5SvHYYi5Ka+xQ=
> +SIZE (sqlcipher-4.5.0.tar.gz) = 17982431
> Index: patches/patch-configure
> ===
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure 21 Mar 2021 12:04:26 - 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,50 +0,0 @@
> -$OpenBSD: patch-configure,v 1.1.1.1 2021/03/21 12:04:26 tim Exp $
> -
> -Fix bashisms. Should be fixed in next release.
> -
> -https://github.com/sqlcipher/sqlcipher/issues/382
> -
> -Index: configure
> configure.orig
> -+++ configure
> -@@ -11997,14 +11997,14 @@ if test "$crypto_lib" = "none"; then
> - $as_echo "none" >&6; }
> - else
> - if test "$crypto_lib" = "commoncrypto"; then
> --CFLAGS+=" -DSQLCIPHER_CRYPTO_CC"
> --BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_CC"
> -+CFLAGS="$CFLAGS -DSQLCIPHER_CRYPTO_CC"
> -+BUILD_CFLAGS="$BUILD_CFLAGS -DSQLCIPHER_CRYPTO_CC"
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: commoncrypto" >&5
> - $as_echo "commoncrypto" >&6; }
> - else
> - if test "$crypto_lib" = "libtomcrypt"; then
> -- CFLAGS+=" -DSQLCIPHER_CRYPTO_LIBTOMCRYPT"
> -- BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_LIBTOMCRYPT"
> -+ CFLAGS="$CFLAGS -DSQLCIPHER_CRYPTO_LIBTOMCRYPT"
> -+ BUILD_CFLAGS="$BUILD_CFLAGS -DSQLCIPHER_CRYPTO_LIBTOMCRYPT"
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libtomcrypt" >&5
> - $as_echo "libtomcrypt" >&6; }
> - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for register_cipher
> in -ltomcrypt" >&5
> -@@ -12056,8 +12056,8 @@ fi
> -
> - else
> - if test "$crypto_lib" = "nss"; then
> --CFLAGS+=" -DSQLCIPHER_CRYPTO_NSS"
> --BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_NSS"
> -+CFLAGS="$CFLAGS -DSQLCIPHER_CRYPTO_NSS"
> -+BUILD_CFLAGS="$BUILD_CFLAGS -DSQLCIPHER_CRYPTO_NSS"
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: nss3" >&5
> - $as_echo "nss3" >&6; }
> - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PK11_Decrypt
> in -lnss3" >&5
> -@@ -12108,8 +12108,8 @@ else
> - fi
> -
> - else
> --CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
> --BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
> -+CFLAGS="$CFLAGS -DSQLCIPHER_CRYPTO_OPENSSL"
> -+BUILD_CFLAGS="$BUILD_CFLAGS -DSQLCIPHER_CRYPTO_OPENSSL"
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: openssl" >&5
> - $as_echo "openssl" >&6; }
> - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_Init_ex
> in -lcrypto" >&5
> Index: patches/patch-src_crypto_impl_c
> ===
Re: Update from maintainer: games/mvdsv v0.34
Hi,
Just a quick ping to the list. Is this diff OK with the patch
that removes the localcommand from the source? I had submitted
a pull request upstream but was told it is only enabled if a
specific command-line flag is turned on. That was the answer
from upstream. I guess I should omit the patch the just leave
as is? I'm trying to make it a bit safer, but I don't think
the upstream project developers agree with my stance.
Are there any guidelines on this or should I re-submit this
diff without the patch that removes that function?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/mvdsv/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile22 Dec 2020 20:53:25 - 1.3
+++ Makefile25 Sep 2021 16:52:17 -
@@ -4,7 +4,7 @@ COMMENT = QuakeWorld server
GH_ACCOUNT = deurk
GH_PROJECT = mvdsv
-GH_TAGNAME = 0.33
+GH_TAGNAME = 0.34
CATEGORIES = games
Index: distinfo
===
RCS file: /cvs/ports/games/mvdsv/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo22 Dec 2020 20:53:25 - 1.2
+++ distinfo25 Sep 2021 16:52:17 -
@@ -1,4 +1,4 @@
-SHA256 (mvdsv-0.33.tar.gz) = 3Jq9u+B2Wdbtx/8LyIA08eWSihZPe6mq+Shpkw4uQYQ=
+SHA256 (mvdsv-0.34.tar.gz) = gZBxjf4QiPTxKmYXfusBwaUn9fRl5w3sT7uP7tSZTGo=
SHA256 (qwprogs-20120131.dat) = /1HLXnc2DXK5NIfYkZjc+UYpuS+LrhAPxupIpsEqeDA=
-SIZE (mvdsv-0.33.tar.gz) = 576306
+SIZE (mvdsv-0.34.tar.gz) = 597476
SIZE (qwprogs-20120131.dat) = 197684
Index: patches/patch-src_server_h
===
RCS file: patches/patch-src_server_h
diff -N patches/patch-src_server_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_server_h 25 Sep 2021 16:52:17 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Remove dangerous localcommand function even if it it not turned on
+by default and needs a command-line option. There is a pull request
+at: https://github.com/deurk/mvdsv/pull/69
+
+
+Index: src/server.h
+--- src/server.h.orig
src/server.h
+@@ -1087,7 +1087,6 @@ void SV_SetClientConnectionTime(client_t* client);
+ #ifdef SERVERONLY
+ // mvdsv not changed over to enums yet, which was more about documentation
+ #define SV_CommandLineEnableCheats() (COM_CheckParm("-cheats"))
+-#define SV_CommandLineEnableLocalCommand()
(COM_CheckParm("-enablelocalcommand"))
+ #define SV_CommandLineDemoCacheArgument() (COM_CheckParm("-democache"))
+ #define SV_CommandLineProgTypeArgument() (COM_CheckParm("-progtype"))
+ #define SV_CommandLineUseMinimumMemory() (COM_CheckParm("-minmemory"))
+@@ -1095,7 +1094,6 @@ void SV_SetClientConnectionTime(client_t* client);
+ #define SV_CommandLineHeapSizeMemoryMB() (COM_CheckParm("-mem"))
+ #else
+ #define SV_CommandLineEnableCheats()
(COM_CheckParm(cmdline_param_server_enablecheats))
+-#define SV_CommandLineEnableLocalCommand()
(COM_CheckParm(cmdline_param_server_enablelocalcommand))
+ #define SV_CommandLineDemoCacheArgument()
(COM_CheckParm(cmdline_param_server_democache_kb))
+ #define SV_CommandLineProgTypeArgument()
(COM_CheckParm(cmdline_param_server_progtype))
+ #define SV_CommandLineUseMinimumMemory()
(COM_CheckParm(cmdline_param_host_memory_minimum))
Index: patches/patch-src_sv_ccmds_c
===
RCS file: patches/patch-src_sv_ccmds_c
diff -N patches/patch-src_sv_ccmds_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_sv_ccmds_c25 Sep 2021 16:52:17 -
@@ -0,0 +1,73 @@
+$OpenBSD$
+
+Remove dangerous localcommand function even if it it not turned on
+by default and needs a command-line option. There is a pull request
+at: https://github.com/deurk/mvdsv/pull/69
+
+Index: src/sv_ccmds.c
+--- src/sv_ccmds.c.orig
src/sv_ccmds.c
+@@ -738,54 +738,6 @@ void SV_ChmodFile_f (void)
+ }
+ #endif //_WIN32
+
+-/*==
+-SV_LocalCommand_f
+-Execute system command
+-==*/
+-//bliP: REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME ->
+-void SV_LocalCommand_f (void)
+-{
+- int i, c;
+- char str[1024], *temp_file = "__output_temp_file__";
+-
+- if ((c = Cmd_Argc()) < 2)
+- {
+- Con_Printf("localcommand [command]\n");
+- return;
+- }
+-
+- str[0] = 0;
+- for (i = 1; i < c; i++)
+- {
+- strlcat (str, Cmd_Argv(i), sizeof(str));
+- strlcat (str, " ", sizeof(str));
+- }
+- strlcat (str, va("> %s 2>&1\n", temp_file), sizeof(str));
+-
+- if (system(str) == -1)
+- Con_Printf("command failed\n");
+- else
+- {
+- charbuf[512];
+- FILE*f;
+- if ((f = fopen(temp_file, "rt")) == NULL)
+- Con_Printf("(empty)\n");
+- else
+- {
+- whi
Update from maintainer: games/qstat v2.17
Hi,
This diff updated qstat to v2.17. Their build system has changed a little
and requires GNU make now to complete.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/qstat/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile2 Feb 2021 11:39:58 - 1.13
+++ Makefile2 Oct 2021 21:14:29 -
@@ -4,8 +4,7 @@ COMMENT=displays the status of multi-pl
GH_ACCOUNT=multiplay
GH_PROJECT=qstat
-GH_COMMIT= 502167b108b7d40daacfc75c2b5c9eb4c7714f2b
-DISTNAME= qstat-2.14pl20201129
+GH_TAGNAME=v2.17
CATEGORIES=games
MAINTAINER=Tom Murphy
@@ -15,11 +14,14 @@ PERMIT_PACKAGE= Yes
WANTLIB= c
+MAKE_ENV = QSTAT_VERSION=${GH_TAGNAME}
CONFIGURE_STYLE = autoreconf
+CONFIGURE_ENV =CFLAGS="-pipe -Wall"
-AUTOCONF_VERSION = 2.69
+AUTOCONF_VERSION = 2.71
AUTOMAKE_VERSION = 1.16
AUTORECONF = ./autogen.sh
+USE_GMAKE =yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qstat
Index: distinfo
===
RCS file: /cvs/ports/games/qstat/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo2 Feb 2021 11:39:58 - 1.7
+++ distinfo2 Oct 2021 21:14:29 -
@@ -1,2 +1,2 @@
-SHA256 (qstat-2.14pl20201129-502167b1.tar.gz) =
qFHwQYPS9GoqKc9ty/hbmRCQIuxCPJuQ0h8884r3KAA=
-SIZE (qstat-2.14pl20201129-502167b1.tar.gz) = 231705
+SHA256 (qstat-2.17.tar.gz) = /woFDoZ60db99rXXB+L8euooJrijgjISILOQxiH7FWI=
+SIZE (qstat-2.17.tar.gz) = 233981
Update from maintainer: games/mvdsv v0.34
Hi,
Attached is a diff to update games/mvdsv to 0.34.
I've added a patch that removes some dangerous code from the
port (which I've created as an upstream pull request:
https://github.com/deurk/mvdsv/pull/69)
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/mvdsv/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile22 Dec 2020 20:53:25 - 1.3
+++ Makefile25 Sep 2021 16:52:17 -
@@ -4,7 +4,7 @@ COMMENT = QuakeWorld server
GH_ACCOUNT = deurk
GH_PROJECT = mvdsv
-GH_TAGNAME = 0.33
+GH_TAGNAME = 0.34
CATEGORIES = games
Index: distinfo
===
RCS file: /cvs/ports/games/mvdsv/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo22 Dec 2020 20:53:25 - 1.2
+++ distinfo25 Sep 2021 16:52:17 -
@@ -1,4 +1,4 @@
-SHA256 (mvdsv-0.33.tar.gz) = 3Jq9u+B2Wdbtx/8LyIA08eWSihZPe6mq+Shpkw4uQYQ=
+SHA256 (mvdsv-0.34.tar.gz) = gZBxjf4QiPTxKmYXfusBwaUn9fRl5w3sT7uP7tSZTGo=
SHA256 (qwprogs-20120131.dat) = /1HLXnc2DXK5NIfYkZjc+UYpuS+LrhAPxupIpsEqeDA=
-SIZE (mvdsv-0.33.tar.gz) = 576306
+SIZE (mvdsv-0.34.tar.gz) = 597476
SIZE (qwprogs-20120131.dat) = 197684
Index: patches/patch-src_server_h
===
RCS file: patches/patch-src_server_h
diff -N patches/patch-src_server_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_server_h 25 Sep 2021 16:52:17 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Remove dangerous localcommand function even if it it not turned on
+by default and needs a command-line option. There is a pull request
+at: https://github.com/deurk/mvdsv/pull/69
+
+
+Index: src/server.h
+--- src/server.h.orig
src/server.h
+@@ -1087,7 +1087,6 @@ void SV_SetClientConnectionTime(client_t* client);
+ #ifdef SERVERONLY
+ // mvdsv not changed over to enums yet, which was more about documentation
+ #define SV_CommandLineEnableCheats() (COM_CheckParm("-cheats"))
+-#define SV_CommandLineEnableLocalCommand()
(COM_CheckParm("-enablelocalcommand"))
+ #define SV_CommandLineDemoCacheArgument() (COM_CheckParm("-democache"))
+ #define SV_CommandLineProgTypeArgument() (COM_CheckParm("-progtype"))
+ #define SV_CommandLineUseMinimumMemory() (COM_CheckParm("-minmemory"))
+@@ -1095,7 +1094,6 @@ void SV_SetClientConnectionTime(client_t* client);
+ #define SV_CommandLineHeapSizeMemoryMB() (COM_CheckParm("-mem"))
+ #else
+ #define SV_CommandLineEnableCheats()
(COM_CheckParm(cmdline_param_server_enablecheats))
+-#define SV_CommandLineEnableLocalCommand()
(COM_CheckParm(cmdline_param_server_enablelocalcommand))
+ #define SV_CommandLineDemoCacheArgument()
(COM_CheckParm(cmdline_param_server_democache_kb))
+ #define SV_CommandLineProgTypeArgument()
(COM_CheckParm(cmdline_param_server_progtype))
+ #define SV_CommandLineUseMinimumMemory()
(COM_CheckParm(cmdline_param_host_memory_minimum))
Index: patches/patch-src_sv_ccmds_c
===
RCS file: patches/patch-src_sv_ccmds_c
diff -N patches/patch-src_sv_ccmds_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_sv_ccmds_c25 Sep 2021 16:52:17 -
@@ -0,0 +1,73 @@
+$OpenBSD$
+
+Remove dangerous localcommand function even if it it not turned on
+by default and needs a command-line option. There is a pull request
+at: https://github.com/deurk/mvdsv/pull/69
+
+Index: src/sv_ccmds.c
+--- src/sv_ccmds.c.orig
src/sv_ccmds.c
+@@ -738,54 +738,6 @@ void SV_ChmodFile_f (void)
+ }
+ #endif //_WIN32
+
+-/*==
+-SV_LocalCommand_f
+-Execute system command
+-==*/
+-//bliP: REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME ->
+-void SV_LocalCommand_f (void)
+-{
+- int i, c;
+- char str[1024], *temp_file = "__output_temp_file__";
+-
+- if ((c = Cmd_Argc()) < 2)
+- {
+- Con_Printf("localcommand [command]\n");
+- return;
+- }
+-
+- str[0] = 0;
+- for (i = 1; i < c; i++)
+- {
+- strlcat (str, Cmd_Argv(i), sizeof(str));
+- strlcat (str, " ", sizeof(str));
+- }
+- strlcat (str, va("> %s 2>&1\n", temp_file), sizeof(str));
+-
+- if (system(str) == -1)
+- Con_Printf("command failed\n");
+- else
+- {
+- charbuf[512];
+- FILE*f;
+- if ((f = fopen(temp_file, "rt")) == NULL)
+- Con_Printf("(empty)\n");
+- else
+- {
+- while (!feof(f))
+- {
+- buf[fread (buf, 1, sizeof(buf) - 1, f)] = 0;
+- Con_Printf("%s", buf);
+- }
+- fclose(f);
+- if (Sys_remove(temp_file))
+- Con_Printf("Unable to r
[Update from Maintainer] - games/freeorion
Hi,
This diff updates the port to v0.4.10.2. The patch file being
removed was fixed upstream in this github issue:
https://github.com/freeorion/freeorion/issues/3464
Compiles and runs fine for me. OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile27 May 2021 04:14:22 - 1.11
+++ Makefile17 Aug 2021 08:02:12 -
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2021/05/27 04:14:22 rsadowski Exp $
-V =0.4.10.1
+V =0.4.10.2
COMMENT = turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2020-09-25.39cfe10_Source
+DISTNAME = FreeOrion_v${V}_2021-08-01.f663dad_Source
PKGNAME = freeorion-${V}
-REVISION = 0
CATEGORIES = games
HOMEPAGE = https://www.freeorion.org/
Index: distinfo
===
RCS file: /cvs/ports/games/freeorion/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo16 Dec 2020 02:04:52 - 1.4
+++ distinfo17 Aug 2021 08:02:12 -
@@ -1,2 +1,2 @@
-SHA256 (FreeOrion_v0.4.10.1_2020-09-25.39cfe10_Source.tar.gz) =
AAYZGttQRtURFvblpld3PyAVr3wjaE8p4qff99r15Oc=
-SIZE (FreeOrion_v0.4.10.1_2020-09-25.39cfe10_Source.tar.gz) = 124809524
+SHA256 (FreeOrion_v0.4.10.2_2021-08-01.f663dad_Source.tar.gz) =
9gVu6X7dRt7oB2zBzbEccRZS8eJvA87BJEoBo81bDXA=
+SIZE (FreeOrion_v0.4.10.2_2021-08-01.f663dad_Source.tar.gz) = 124836633
Index: patches/patch-UI_CombatReport_GraphicalSummary_cpp
===
RCS file: patches/patch-UI_CombatReport_GraphicalSummary_cpp
diff -N patches/patch-UI_CombatReport_GraphicalSummary_cpp
--- patches/patch-UI_CombatReport_GraphicalSummary_cpp 27 May 2021 04:14:22
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,113 +0,0 @@
-$OpenBSD: patch-UI_CombatReport_GraphicalSummary_cpp,v 1.1 2021/05/27 04:14:22
rsadowski Exp $
-
-https://github.com/freeorion/freeorion/issues/3464
-
-From 9cc1926e8126163d3b8877c0112e11c462a96384 Mon Sep 17 00:00:00 2001
-From: geoffthemedio
-Date: Sat, 22 May 2021 20:24:22 +0200
-Subject: [PATCH] remove DrawArrow function and calls because, as far as I can
- tell, nothing is visible on screen from it
-
-Index: UI/CombatReport/GraphicalSummary.cpp
UI/CombatReport/GraphicalSummary.cpp.orig
-+++ UI/CombatReport/GraphicalSummary.cpp
-@@ -370,7 +370,6 @@ class SideBar : public GG::Wnd { (public)
- AttachChild(m_dead_label);
-
- MakeBars();
--
- }
-
- void MakeBars() {
-@@ -407,91 +406,6 @@ class SideBar : public GG::Wnd { (public)
- }
-
- m_y_axis_label->MoveTo(GG::Pt(-m_y_axis_label->MinUsableSize().x / 2
- AXIS_WIDTH, Height()/2 - m_y_axis_label->Height()/2));
--}
--
--void DrawArrow(GG::Pt begin, GG::Pt end) {
--double head_width = 5.0;
--// A vector (math) of the arrow we wish to draw
--GG::Pt direction = end - begin;
--double length = sqrt(1.0*(Value(direction.x)*Value(direction.x) +
-- Value(direction.y)*Value(direction.y)));
--if (length == 0) {
--return;
--}
--
--// The point in the main line of the arrow,
--// paraller to which the head ends
--// \.
--// \.
--// h-->
--// /.
--// /.
--// h is at the handle
--GG::Pt handle;
--// How much to move off the handle to get to
--// the end point of one of the head lines
--GG::X delta_x;
--GG::Y delta_y;
--
--if (direction.x != 0 && direction.y != 0) {
--// In a skewed arrow we need
--// a bit of geometry to figure out the head
--double x = Value(direction.x);
--double y = Value(direction.y);
--double normalizer = head_width / sqrt(1 + x*x / (y*y));
--delta_x = GG::X(normalizer);
--delta_y = GG::Y(- x / y * normalizer);
--
--handle = end - GG::Pt((head_width / length) * direction.x,
(head_width / length) * direction.y);
--} else if (direction.x == 0) {
--// Vertical arrow
--handle = end;
--handle.y -=
boost::math::sign(Value(direction.y))*GG::Y(head_width);
--delta_x = GG::X(head_width);
--delta_y = GG::Y0;
--} else {
--//horizontal arrow
--handle = end;
--handle.x -= boost::math::sign(Value(direction.x)) *
GG::X(head_width);
--delta_x = GG::X0;
--delta_y = GG::Y(head_width);
--}
--
--GG::Pt left_head = handle;
--GG::Pt right_head = handle;
--
--left_head.x += delta_x;
--left_head.y += delta_y;
--// The other l
Re: [Update from Maintainer] games/ezquake 3.2.3
Hi,
Just pinging the list. I've attached a fixed diff which patches
the Makefile in the source which fixes the problem and allows it
to link properly. If this isn't the right place to do it, please
let me know.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile3 Oct 2020 14:58:48 - 1.10
+++ Makefile28 Feb 2021 21:44:25 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.10 2020/10/03 14:58:48 solene Exp $
N =ezquake
-V =3.2.2
+V =3.2.3
COMMENT = modern QuakeWorld client
PKGNAME = ${N}-${V}
Index: distinfo
===
RCS file: /cvs/ports/games/ezquake/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo3 Oct 2020 14:58:48 - 1.6
+++ distinfo28 Feb 2021 21:44:25 -
@@ -1,2 +1,2 @@
-SHA256 (ezquake-source-3.2.2.tar.gz) =
LKLEVbzdTNfDrJX6h6ik40Y6qGpdvg/RhXb42XkEJfo=
-SIZE (ezquake-source-3.2.2.tar.gz) = 5759652
+SHA256 (ezquake-source-3.2.3.tar.gz) =
7FGHtHrYWc9Fk4Epbo0dVgBB/ZBGLb4KuJxl4yBnftQ=
+SIZE (ezquake-source-3.2.3.tar.gz) = 5760982
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/games/ezquake/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 18 May 2020 09:29:06 - 1.2
+++ patches/patch-Makefile 28 Feb 2021 21:44:25 -
@@ -1,10 +1,20 @@
$OpenBSD: patch-Makefile,v 1.2 2020/05/18 09:29:06 solene Exp $
Skip the architecture dance.
+Add X11BASE/lib to LDFLAGS
Index: Makefile
--- Makefile.orig
+++ Makefile
+@@ -36,7 +36,7 @@ JSON2C ?= ./json2c.sh
+
+ CFLAGS ?= -O2 -Wall -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
-Wno-strict-aliasing -Werror=strict-prototypes -Werror=old-style-definition -g
-MMD $(INCLUDES)
+ RCFLAGS ?=
+-LDFLAGS ?=
++LDFLAGS ?= -L${X11BASE}/lib
+ LIBS ?=
+
+ #Temporarily disable tree vectorization optimization enabled at O3 due to gcc
bug
@@ -379,7 +379,7 @@ endif
ifdef CONFIG_WINDOWS
TARG_c := ezquake.exe
Re: [Update from Maintainer] games/ezquake 3.2.3
Hi,
I realized I hadn't cleaned up the Makefile properly. Anyway,
here is a fixed version of the patch.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile3 Oct 2020 14:58:48 - 1.10
+++ Makefile10 Feb 2021 08:12:08 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.10 2020/10/03 14:58:48 solene Exp $
N =ezquake
-V =3.2.2
+V =3.2.3
COMMENT = modern QuakeWorld client
PKGNAME = ${N}-${V}
Index: distinfo
===
RCS file: /cvs/ports/games/ezquake/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo3 Oct 2020 14:58:48 - 1.6
+++ distinfo10 Feb 2021 08:12:08 -
@@ -1,2 +1,2 @@
-SHA256 (ezquake-source-3.2.2.tar.gz) =
LKLEVbzdTNfDrJX6h6ik40Y6qGpdvg/RhXb42XkEJfo=
-SIZE (ezquake-source-3.2.2.tar.gz) = 5759652
+SHA256 (ezquake-source-3.2.3.tar.gz) =
7FGHtHrYWc9Fk4Epbo0dVgBB/ZBGLb4KuJxl4yBnftQ=
+SIZE (ezquake-source-3.2.3.tar.gz) = 5760982
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/games/ezquake/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 18 May 2020 09:29:06 - 1.2
+++ patches/patch-Makefile 10 Feb 2021 08:12:08 -
@@ -1,10 +1,20 @@
$OpenBSD: patch-Makefile,v 1.2 2020/05/18 09:29:06 solene Exp $
Skip the architecture dance.
+Add X11BASE/lib to LDFLAGS
Index: Makefile
--- Makefile.orig
+++ Makefile
+@@ -36,7 +36,7 @@ JSON2C ?= ./json2c.sh
+
+ CFLAGS ?= -O2 -Wall -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
-Wno-strict-aliasing -Werror=strict-prototypes -Werror=old-style-definition -g
-MMD $(INCLUDES)
+ RCFLAGS ?=
+-LDFLAGS ?=
++LDFLAGS ?= -L${X11BASE}/lib
+ LIBS ?=
+
+ #Temporarily disable tree vectorization optimization enabled at O3 due to gcc
bug
@@ -379,7 +379,7 @@ endif
ifdef CONFIG_WINDOWS
TARG_c := ezquake.exe
[Update from Maintainer] games/ezquake 3.2.3
Hi,
Patch below is to update games/ezquake to v3.2.3. I've updated the
patch for the Makefile to include ${X11BASE}/lib to LDFLAGS. It
seemed like the most logical place to put it. If there's a better way
let me know.
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile3 Oct 2020 14:58:48 - 1.10
+++ Makefile9 Feb 2021 21:38:43 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.10 2020/10/03 14:58:48 solene Exp $
N =ezquake
-V =3.2.2
+V =3.2.3
COMMENT = modern QuakeWorld client
PKGNAME = ${N}-${V}
@@ -17,7 +17,7 @@ MAINTAINER = Tom Murphy
Re: nicotine-plus port (take 2)
>This is take 2 for this port, I wasn't subscribed and I managed to >read over a small mistake for which is fixed in the included tarball. > > >Hi there, > >I've been working with the nicotine-plus team for over 9 month now and >it has been going from flakey outdated code to a very nice program. It >has been extensively tested on amd64 and I do expect it to work on >other platforms as well, but your mileage may vary. > >This is my first port in a long time and I'm open to improvements. I'd >like to thank epsilonKNOT from the #OpenBSD channel for his tips. > >Nicotine+ is a graphical client for the Soulseek peer-to-peer file >sharing network. > >Nicotine+ aims to be a pleasant, Free and Open Source (FOSS) >alternative to the official Soulseek client, providing additional >functionality while keeping current with the Soulseek protocol. > > >https://nicotine-plus.org/ > > > ># Han Tested on my OpenBSD amd64 -current system with my Soulseek account and it works great for me, thanks! -Tom
Re: New port: net/qtox and databases/sqlcipher and an update to net/toxcore
On Fri, Jan 01, 2021 at 10:25:36PM +, Stuart Henderson wrote: > On 2021/01/01 14:30, Tom Murphy wrote: > > Hi all, > > > > I've been wanting to get qtox running (since utox is rather > > unstable). > > > > Attached to this email are two new ports: > > > > databases/sqlcipher - Allows you to encrypt sqlite databases > > net/qtox - qtox client for the tox framework > > > > I'm also including a diff for net/toxcore to upgrade it from 0.2.3 to > > 0.2.12. > > Here's a diff I had hanging around in my tree to update > toxcore/toxic/utox, the API changed a bit and IIRC they all needed > updating together. Builds OK but I don't use any of this, since > you have a setup already could you give it a spin please? At least > toxcore needs SHARED_LIBS bumping that wasn't in your diff. > Diff for that is sent as a gzipped attachment because it was > unfortunately imported with MSDOS line endings in the patches > which usually gets mangled in email. > > > I'd like to propose that net/utox might be removed from the tree. > > It's alpha and pretty unstable (sometimes it makes the cpu fan race and > > I've had to kill -9 it sometimes) > > 0.18.0 changelog for utox suggests it's likely to be better: > https://github.com/uTox/uTox/releases/tag/v0.18.0 > > > Note: net/qtox relies on databases/sqlcipher to compile and run. > > It also relies on the newer net/toxcore. I'm not sure about net/toxic > > client as I don't use it. OK I just ran patch from my home dir and manually put in the paths to the files and it applied. net/toxcore patch to 0.2.12 - works and installs here. net/utox patch to 0.18.0 - works and installs and seems more stable net/toxic patch to 0.10.0 - Looks like PLIST is broken. Was your diff missing an updated PLIST? Running make update-plist produced a package with no files in it. Thanks, Tom
Re: New port: net/qtox and databases/sqlcipher and an update to net/toxcore
On Fri, Jan 01, 2021 at 10:42:00PM +, Stuart Henderson wrote:
> On 2021/01/01 18:52, Tom Murphy wrote:
> > Hi,
> >
> >Last port tarball was missing the #define USE_V4L so I've updated
> > it so it works.
> >
> >However, I can't seem to test this. Anything that tries to open
> > /dev/video even with kern.video.record=1 seems to fail.
>
> re the problem opening video:
>
> did you try video(1) too or just things from ports? kern.video.record=1
> should not stop it from opening, it just zeroes the video buffers before
> passing the frames to userland, though I have not updated to a version
> with that yet.
>
> re v4l2 in this port:
>
> it might be better to figure out a bit more what's going on and either
> prove that it works or doesn't work and enable or not based on that.
> v4l applications on OpenBSD often need some other changes than just the
> headers, I've had to workaround a problem with video ioctls failing on a
> few other ports.
I tried video(1) and it works on my system, so it's probably an ioctl.
I'll try to find the cause, but aside from the video device not working,
the rest of the qtox port works. I tested an audio call with a friend
and it worked fine. Also the messaging and other features work. It's
just the video that isn't working yet.
>
> >I'm on:
> >
> >OpenBSD 6.8-current (GENERIC.MP) #248: Tue Dec 29 12:07:27 MST 2020
> >
> >Anyway, it should properly try to open the video device now.
> >
> >Updated port attached as qtox3.tgz here.
> >
> >Thanks,
> >Tom
>
> couple of port tweaks below, I haven't looked closer yet.
>
>
> diff 4a421e6a1869cd82df717c62298316607805167d /usr/ports/mystuff
> blob - 5c7e9fee75b3ea2e473fb1d28a0e3274821b5ed5
> file + net/qtox/Makefile
> --- net/qtox/Makefile
> +++ net/qtox/Makefile
> @@ -1,20 +1,18 @@
> # $OpenBSD: Makefile,v 1.7 2020/04/05 09:45:30 ajacoutot Exp $
>
> -N = qtox
> -V = 1.17.3
> COMMENT =Tox client
>
> -PKGNAME =${N}-${V}
> GH_ACCOUNT = qTox
> GH_PROJECT = qTox
> -GH_TAGNAME = v${V}
> +GH_TAGNAME = v1.17.3
> +PKGNAME =${DISTNAME:L}
>
> CATEGORIES = net
>
> HOMEPAGE = https://qtox.github.io/
> MAINTAINER = Tom Murphy
>
> -# GPLv3
> +# GPLv3+
> PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} KF5SonnetUi Qt5Core Qt5Gui Qt5Network
>
Tweaks look good. I guess all the ${V} and ${N} stuff isn't needed
any more -- looks a lot cleaner, thanks!
Tom
Re: New port: net/qtox and databases/sqlcipher and an update to net/toxcore
On Fri, Jan 01, 2021 at 10:25:36PM +, Stuart Henderson wrote:
> On 2021/01/01 14:30, Tom Murphy wrote:
> > Hi all,
> >
> > I've been wanting to get qtox running (since utox is rather
> > unstable).
> >
> > Attached to this email are two new ports:
> >
> > databases/sqlcipher - Allows you to encrypt sqlite databases
> > net/qtox - qtox client for the tox framework
> >
> > I'm also including a diff for net/toxcore to upgrade it from 0.2.3 to
> > 0.2.12.
>
> Here's a diff I had hanging around in my tree to update
> toxcore/toxic/utox, the API changed a bit and IIRC they all needed
> updating together. Builds OK but I don't use any of this, since
> you have a setup already could you give it a spin please? At least
> toxcore needs SHARED_LIBS bumping that wasn't in your diff.
> Diff for that is sent as a gzipped attachment because it was
> unfortunately imported with MSDOS line endings in the patches
> which usually gets mangled in email.
>
> > I'd like to propose that net/utox might be removed from the tree.
> > It's alpha and pretty unstable (sometimes it makes the cpu fan race and
> > I've had to kill -9 it sometimes)
>
> 0.18.0 changelog for utox suggests it's likely to be better:
> https://github.com/uTox/uTox/releases/tag/v0.18.0
I wasn't able to apply that multiple port patch cleanly. It fails on
toxcore's Makefile and then refuses to run elsewhere. Do I need to
split it out? What command line for patch should I use for it?
> > Note: net/qtox relies on databases/sqlcipher to compile and run.
> > It also relies on the newer net/toxcore. I'm not sure about net/toxic
> > client as I don't use it.
>
> here are a few tweaks for sqlcipher.
>
> diff 4a421e6a1869cd82df717c62298316607805167d /usr/ports/mystuff
> blob - 3daac481dad3c5c05bc9d0fabb11ec97653347cb
> file + databases/sqlcipher/Makefile
> --- databases/sqlcipher/Makefile
> +++ databases/sqlcipher/Makefile
> @@ -1,13 +1,10 @@
> # $OpenBSD: Makefile,v 1.10 2020/10/03 14:58:48 solene Exp $
>
> -N = sqlcipher
> -V = 4.4.2
> COMMENT =encrypted SQLite database
>
> -PKGNAME =${N}-${V}
> GH_ACCOUNT = sqlcipher
> GH_PROJECT = sqlcipher
> -GH_TAGNAME = v${V}
> +GH_TAGNAME = v4.4.2
>
> SHARED_LIBS += sqlcipher 0.0 # 8.6
>
> @@ -27,11 +24,14 @@ CONFIGURE_ARGS += --enable-tempstore=yes \
> --disable-tcl \
> --disable-editline \
> --disable-readline
> +CONFIGURE_ENV += TCLSH_CMD=${MODTCL_BIN}
>
> NO_TEST =Yes
>
> CFLAGS +=-DSQLITE_HAS_CODEC
>
> -BUILD_DEPENDS = lang/tcl/8.6
> +MODULES =lang/tcl
> +MODTCL_VERSION = 8.6
> +BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS}
>
> .include
>
The tweaks for databases/sqlcipher work fine here. I tested and it
works OK for me.
Thanks,
Tom
Re: New port: net/qtox and databases/sqlcipher and an update to net/toxcore
Hi, Last port tarball was missing the #define USE_V4L so I've updated it so it works. However, I can't seem to test this. Anything that tries to open /dev/video even with kern.video.record=1 seems to fail. I'm on: OpenBSD 6.8-current (GENERIC.MP) #248: Tue Dec 29 12:07:27 MST 2020 Anyway, it should properly try to open the video device now. Updated port attached as qtox3.tgz here. Thanks, Tom qtox3.tgz Description: Binary data
Re: New port: net/qtox and databases/sqlcipher and an update to net/toxcore
Hi, Please find attached an updated qtox port. (Name: qtox2.tgz). I enabled a component that was only being compiled on Linux/FreeBSD (the camera/video component) and pointed it to sys/videoio.h which has V4L-like headers. Thanks, Tom qtox2.tgz Description: Binary data
New port: net/qtox and databases/sqlcipher and an update to net/toxcore
Hi all,
I've been wanting to get qtox running (since utox is rather
unstable).
Attached to this email are two new ports:
databases/sqlcipher - Allows you to encrypt sqlite databases
net/qtox - qtox client for the tox framework
I'm also including a diff for net/toxcore to upgrade it from 0.2.3 to
0.2.12.
I've tested all 3 and they appear to work just great.
I'd like to propose that net/utox might be removed from the tree.
It's alpha and pretty unstable (sometimes it makes the cpu fan race and
I've had to kill -9 it sometimes)
Note: net/qtox relies on databases/sqlcipher to compile and run.
It also relies on the newer net/toxcore. I'm not sure about net/toxic
client as I don't use it.
Let me know if anything needs changing or fixing.
Thanks,
Tom
qtox.tgz
Description: Binary data
sqlcipher.tgz
Description: Binary data
Index: Makefile
===
RCS file: /cvs/ports/net/toxcore/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile24 Nov 2019 23:05:10 - 1.7
+++ Makefile1 Jan 2021 14:22:53 -
@@ -2,8 +2,7 @@
COMMENT = Tox client library
-V =0.2.3
-REVISION = 3
+V =0.2.12
DISTNAME = toxcore-$V
GH_ACCOUNT = TokTok
Index: distinfo
===
RCS file: /cvs/ports/net/toxcore/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo26 Jun 2018 20:34:04 - 1.2
+++ distinfo1 Jan 2021 14:22:53 -
@@ -1,2 +1,2 @@
-SHA256 (toxcore-0.2.3.tar.gz) = IsUvKGxG0/gC7baXi88qU/gwE2Pit0V4RhNCejO6OjQ=
-SIZE (toxcore-0.2.3.tar.gz) = 471336
+SHA256 (toxcore-0.2.12.tar.gz) = MK4yY8m2jTvvBveZup16Z+P61EcDBiXw/6S7ImhCKLA=
+SIZE (toxcore-0.2.12.tar.gz) = 504832
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/net/toxcore/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt24 Nov 2019 23:05:10 - 1.4
+++ patches/patch-CMakeLists_txt1 Jan 2021 14:22:53 -
@@ -6,23 +6,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 201
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -171,7 +171,7 @@ if(NOT MSVC)
- # Comma at end of enum is supported everywhere we run.
- add_cxxflag("-Wno-c++98-compat-pedantic")
- # TODO(iphydf): Stop using flexible array members.
--add_cxxflag("-Wno-c99-extensions")
-+#add_cxxflag("-Wno-c99-extensions")
- # We're C-compatible, so use C style casts.
- add_cxxflag("-Wno-old-style-cast")
-
-@@ -463,24 +463,11 @@ if(ANDROID_CPU_FEATURES)
- endif()
+@@ -394,16 +394,7 @@ endif()
+ option(AUTOTEST "Enable autotests (mainly for CI)" OFF)
function(auto_test target)
-- if(NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD"))
+- if(AUTOTEST AND NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD"))
-add_executable(auto_${target}_test ${CPUFEATURES}
- auto_tests/${target}_test.c)
--target_link_modules(auto_${target}_test toxcore)
+-target_link_modules(auto_${target}_test toxcore misc_tools)
-if(NOT ARGV1 STREQUAL "DONT_RUN")
- add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR}
auto_${target}_test)
- set_tests_properties(${target} PROPERTIES TIMEOUT
"${TEST_TIMEOUT_SECONDS}")
@@ -32,28 +23,4 @@ Index: CMakeLists.txt
+ message (WARNING "Test ${target} not built because it breaks the build
with base-gcc and NO_TEST is set")
endfunction()
- if(BUILD_TOXAV)
- add_definitions(-D__STDC_LIMIT_MACROS=1)
-- add_executable(auto_monolith_test ${CPUFEATURES}
--auto_tests/monolith_test.cc)
-- target_link_libraries(auto_monolith_test ${toxcore_LINK_MODULES})
-- add_test(NAME monolith COMMAND ${CROSSCOMPILING_EMULATOR}
auto_monolith_test)
- endif()
-
auto_test(TCP)
-@@ -593,15 +580,3 @@ if(NOT WIN32
- set_source_files_properties(testing/av_test.c PROPERTIES LANGUAGE CXX)
- endif()
- endif()
--
--add_executable(DHT_test ${CPUFEATURES}
-- testing/DHT_test.c)
--target_link_modules(DHT_test toxcore)
--
--add_executable(Messenger_test ${CPUFEATURES}
-- testing/Messenger_test.c)
--target_link_modules(Messenger_test toxcore)
--
--add_executable(random_testing ${CPUFEATURES}
-- testing/random_testing.cc)
--target_link_modules(random_testing toxcore)
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/toxcore/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 29 Apr 2018 11:14:09 - 1.1.1.1
+++ pkg/PLIST 1 Jan 2021 14:22:53 -
@@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/29 11:14:09 landry Exp $
+@bin bin/DHT_bootstrap
@bin bin/tox-bootstrapd
include/tox/
include/tox/tox.h
include/tox/toxav.h
include/tox/toxencryptsave.h
-lib/libtox
[Update from Maintainer] games/mvdsv 0.33
Hi, Attached is an update for games/mvdsv to update it to 0.33 which came out in September. OK? Thanks, Tom Index: Makefile === RCS file: /cvs/ports/games/mvdsv/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile12 Jul 2019 20:46:21 - 1.2 +++ Makefile20 Dec 2020 10:34:30 - @@ -4,7 +4,7 @@ COMMENT = QuakeWorld server GH_ACCOUNT = deurk GH_PROJECT = mvdsv -GH_TAGNAME = 0.32 +GH_TAGNAME = 0.33 CATEGORIES = games Index: distinfo === RCS file: /cvs/ports/games/mvdsv/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo8 Dec 2018 09:40:53 - 1.1.1.1 +++ distinfo20 Dec 2020 10:34:30 - @@ -1,4 +1,4 @@ -SHA256 (mvdsv-0.32.tar.gz) = vuQIFmmEvNZCLRXcpnf+3R1E2h0/exjhJE9Kji3R08g= +SHA256 (mvdsv-0.33.tar.gz) = 3Jq9u+B2Wdbtx/8LyIA08eWSihZPe6mq+Shpkw4uQYQ= SHA256 (qwprogs-20120131.dat) = /1HLXnc2DXK5NIfYkZjc+UYpuS+LrhAPxupIpsEqeDA= -SIZE (mvdsv-0.32.tar.gz) = 710497 +SIZE (mvdsv-0.33.tar.gz) = 576306 SIZE (qwprogs-20120131.dat) = 197684
Re: [Update from Maintainer] games/freeorion 0.4.10.1
On 2020-11-23 11:57, Nam Nguyen wrote:
Tom Murphy writes:
Hi,
Attached below is an update for games/freeorion. This updates the game
to 0.4.10.1.
I removed GLU from WANTLIB (as it was complaining about Extra) and
patches/patch-cmake_make_versioncpp_py has been removed (fixed
upstream)
Full changelog for the game can be found here:
https://github.com/freeorion/freeorion/blob/v0.4.10.1/ChangeLog.md
OK?
Thanks,
Tom
Hi,
Just pinging the list about this diff. I posted it last month.
Re-attaching the diff.
OK?
Thanks!
Tom
Thank you for the update. Here is a fresh diff with two additional
tweaks:
- WANTLIB remove boost_system-mt and 80 column fix
- remove patch-cmake_FindBoost_cmake because boost python bindings are
now named boost_python38-mt
I am looking for another OK to commit and Tom's approval.
I tested runtime and it works.
Details
---
I went through the types of warnings and they seem harmless. The same
warnings appear in the previous version as this update. Here are the
gory details on why they are harmless:
-Wdelete-abstract-non-virtual-dtor:
---
Fixed upstream
https://github.com/freeorion/freeorion/commit/ff55c8ca0d534c9cb035412067a02d05211dfc11
-Wrange-loop-construct:
---
/usr/obj/pobj/freeorion-0.4.10.1/src-tarball/GG/src/GUI.cpp:1685:21:
warning: loop variable 'drop_wnd' of type 'const std::__1::pair, GG::Pt>' creates a copy from type 'const
std::__1::pair, GG::Pt>'
[-Wrange-loop-construct]
Loop variable can be replaced with reference to make this warning go
away, but it is harmless. Similar to:
https://github.com/opencv/opencv/pull/18559/commits/2dd2d6095584b957b243bb86948b13223ecb39b3
-Wreturn-std-move
-
GUI.cpp:908:16: warning: local variable 'focus_wnd' will be copied
despite being returned by name [-Wreturn-std-move]
Declared r-value but it ends up being copied anyways.
-Wunused-lambda-capture
---
/usr/obj/pobj/freeorion-0.4.10.1/src-tarball/universe/IDAllocator.cpp:346:60:
warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
These lambda captures really aren't used. Class members can be accessed
with 'this' in the capture list, but they actually aren't used.
UI/DesignWnd.cpp:1984:10: warning: lambda capture 'BUTTON_EDGE_PAD' is
not required to be captured for this use [-Wunused-lambda-capture]
However, this unused-lambda-capture is a bit confusing because
BUTTON_EDGE_PAD is actually used in the lambda.
-Woverloaded-shift-op-parentheses
-
ConditionParser7.cpp:157:40: warning: overloaded operator >> has higher
precedence than comparison operator [-Woverloaded-shift-op-parentheses]
This program uses the boost qi library to make a parser, and it relies
on overloading C++ syntax.
https://www.boost.org/doc/libs/1_74_0/libs/spirit/doc/html/spirit/qi/tutorials/warming_up.html
Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile15 Aug 2020 20:30:53 - 1.8
+++ Makefile23 Nov 2020 11:27:18 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2020/08/15 20:30:53 rsadowski Exp $
-V =0.4.10
+V =0.4.10.1
COMMENT = turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2020-07-10.f3d403e_Source
+DISTNAME = FreeOrion_v${V}_2020-09-25.39cfe10_Source
PKGNAME = freeorion-${V}
CATEGORIES = games
-REVISION = 0
HOMEPAGE = https://www.freeorion.org/
MAINTAINER = Tom Murphy
@@ -14,11 +13,11 @@ MAINTAINER =Tom Murphy WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt
boost_log_setup-mt
-WANTLIB += boost_python${MODPY_VERSION:C/\.//g}-mt boost_regex-mt
boost_serialization-mt
-WANTLIB += boost_system-mt boost_thread-mt c freetype m ogg openal
+WANTLIB += boost_python${MODPY_VERSION:C/\.//g}-mt boost_regex-mt
+WANTLIB += boost_serialization-mt boost_thread-mt c freetype m ogg
openal
WANTLIB += png ${MODPY_WANTLIB} vorbis vorbisenc vorbisfile z
MASTER_SITES
= https://github.com/freeorion/freeorion/releases/download/v${V}/
Index: distinfo
===
RCS file: /cvs/ports/games/freeorion/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo9 Aug 2020 09:37:07 - 1.3
+++ distinfo23 Nov 2020 11:27:18 -
@@ -1,2 +1,2 @@
-SHA256 (FreeOrion_v0.4.10_2020-07-10.f3d403e_Source.tar.gz) =
5yq0LLoe6IQlBzQJMe84nmQBHgQKStx0rdX0mXu8uos=
-SIZE (FreeOrion_v0.4.10_2020-07-10.f3d403e_Source.tar.gz) = 124810803
+SHA256 (FreeOrion_v0.4.10.1_2020-09-25.39cfe10_Source.tar.gz) =
AAYZGttQRtURFvblpld3PyAVr3wjaE8p4qff99r15Oc=
+SIZE (FreeOr
Re: net/nextcloudclient not talking to keyring for credentials
Hi, On 2020-11-20 17:24, Rafael Sadowski wrote: On Thu Nov 19, 2020 at 12:47:46PM +, Tom Murphy wrote: Hi, I'm trying to get net/nextcloudclient to save my password but I get this error: [ warning nextcloud.sync.credentials.http ]:Error while writing password "Unknown error" I've tried installing gnome-keyring, libgnome-keyring, and py3-keyring and it still doesn't want to save the credentials anywhere. Any ideas? All I can find are reports of it failing on Linux and to install various gnome-keyring packages. I do have gnome-keyring-daemon running but it doesn't seem to talk to it. Thanks, Tom I barley use any of the gnome-stack so I can't say anything about it but kwallet works great with nextcloudclient. Thanks for this. I installed 'kf5-kwallet' and it seems to work with it. Pulled in a lot of dependencies though, but I guess that's KDE apps for you. -Tom
Re: net/nextcloudclient not talking to keyring for credentials
Hi, I'm trying to get net/nextcloudclient to save my password but I get this error: [ warning nextcloud.sync.credentials.http ]:Error while writing password "Unknown error" I've tried installing gnome-keyring, libgnome-keyring, and py3-keyring and it still doesn't want to save the credentials anywhere. Any ideas? All I can find are reports of it failing on Linux and to install various gnome-keyring packages. I do have gnome-keyring-daemon running but it doesn't seem to talk to it. Thanks, Tom
Re: [Update from Maintainer] games/freeorion 0.4.10.1
Hi,
Just pinging the list about this diff. I posted it last month.
Re-attaching the diff.
OK?
Thanks!
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile15 Aug 2020 20:30:53 - 1.8
+++ Makefile8 Oct 2020 19:15:06 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2020/08/15 20:30:53 rsadowski Exp $
-V =0.4.10
+V =0.4.10.1
COMMENT = turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2020-07-10.f3d403e_Source
+DISTNAME = FreeOrion_v${V}_2020-09-25.39cfe10_Source
PKGNAME = freeorion-${V}
CATEGORIES = games
-REVISION = 0
HOMEPAGE = https://www.freeorion.org/
MAINTAINER = Tom Murphy
@@ -14,7 +13,7 @@ MAINTAINER = Tom Murphy :-ftemplate-depth=512>
$<$:-ftemplate-depth=512>
Index: patches/patch-cmake_make_versioncpp_py
===
RCS file: patches/patch-cmake_make_versioncpp_py
diff -N patches/patch-cmake_make_versioncpp_py
--- patches/patch-cmake_make_versioncpp_py 9 Aug 2020 09:37:07 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,33 +0,0 @@
-$OpenBSD: patch-cmake_make_versioncpp_py,v 1.1 2020/08/09 09:37:07 kirby Exp $
-
-Patch script to provide same information as if you had run git on the
-checked out tree. This script should not be executing git since this
-is the official source tarball and it does not provide any git info.
-Index: cmake/make_versioncpp.py
cmake/make_versioncpp.py.orig
-+++ cmake/make_versioncpp.py
-@@ -124,20 +124,12 @@ if system() == 'Darwin':
- generators.append(Generator('packaging/Info.plist.in',
'packaging/Info.plist'))
-
- version = "0.4.10"
--branch = ""
-+branch = "release-v0.4.10"
- build_no = INVALID_BUILD_NO
-+commit = 'a3e7a51'
-+timestamp = 1595927480
-
--try:
--branch = check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
universal_newlines=True).strip()
--if (branch == "master") or (branch[:7] == "release"):
--branch = ""
--else:
--branch += " "
--commit = check_output(["git", "show", "--no-show-signature", "-s",
"--format=%h", "--abbrev=7", "HEAD"], universal_newlines=True).strip()
--timestamp = float(check_output(["git", "show", "--no-show-signature",
"-s", "--format=%ct", "HEAD"], universal_newlines=True).strip())
--build_no =
".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit])
--except IOError:
--print("WARNING: git not installed or not setup correctly")
-+build_no =
".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit])
-
- for generator in generators:
- generator.execute(version, branch, build_no, build_sys)
[Update from Maintainer] games/freeorion 0.4.10.1
Hi,
Attached below is an update for games/freeorion. This updates the game
to 0.4.10.1.
I removed GLU from WANTLIB (as it was complaining about Extra) and
patches/patch-cmake_make_versioncpp_py has been removed (fixed upstream)
Full changelog for the game can be found here:
https://github.com/freeorion/freeorion/blob/v0.4.10.1/ChangeLog.md
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile15 Aug 2020 20:30:53 - 1.8
+++ Makefile8 Oct 2020 19:15:06 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2020/08/15 20:30:53 rsadowski Exp $
-V =0.4.10
+V =0.4.10.1
COMMENT = turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2020-07-10.f3d403e_Source
+DISTNAME = FreeOrion_v${V}_2020-09-25.39cfe10_Source
PKGNAME = freeorion-${V}
CATEGORIES = games
-REVISION = 0
HOMEPAGE = https://www.freeorion.org/
MAINTAINER = Tom Murphy
@@ -14,7 +13,7 @@ MAINTAINER = Tom Murphy :-ftemplate-depth=512>
$<$:-ftemplate-depth=512>
Index: patches/patch-cmake_make_versioncpp_py
===
RCS file: patches/patch-cmake_make_versioncpp_py
diff -N patches/patch-cmake_make_versioncpp_py
--- patches/patch-cmake_make_versioncpp_py 9 Aug 2020 09:37:07 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,33 +0,0 @@
-$OpenBSD: patch-cmake_make_versioncpp_py,v 1.1 2020/08/09 09:37:07 kirby Exp $
-
-Patch script to provide same information as if you had run git on the
-checked out tree. This script should not be executing git since this
-is the official source tarball and it does not provide any git info.
-Index: cmake/make_versioncpp.py
cmake/make_versioncpp.py.orig
-+++ cmake/make_versioncpp.py
-@@ -124,20 +124,12 @@ if system() == 'Darwin':
- generators.append(Generator('packaging/Info.plist.in',
'packaging/Info.plist'))
-
- version = "0.4.10"
--branch = ""
-+branch = "release-v0.4.10"
- build_no = INVALID_BUILD_NO
-+commit = 'a3e7a51'
-+timestamp = 1595927480
-
--try:
--branch = check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
universal_newlines=True).strip()
--if (branch == "master") or (branch[:7] == "release"):
--branch = ""
--else:
--branch += " "
--commit = check_output(["git", "show", "--no-show-signature", "-s",
"--format=%h", "--abbrev=7", "HEAD"], universal_newlines=True).strip()
--timestamp = float(check_output(["git", "show", "--no-show-signature",
"-s", "--format=%ct", "HEAD"], universal_newlines=True).strip())
--build_no =
".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit])
--except IOError:
--print("WARNING: git not installed or not setup correctly")
-+build_no =
".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit])
-
- for generator in generators:
- generator.execute(version, branch, build_no, build_sys)
[Update from Maintainer]: games/ezquake 3.2.1 -> 3.2.2
Hi,
One for after the ports lock. This diff updates games/ezquake from
v3.2.1 to v3.2.2.
Release notes are here:
https://github.com/ezQuake/ezquake-source/releases/tag/3.2.2
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile30 Jul 2020 11:40:29 - 1.9
+++ Makefile26 Sep 2020 12:59:00 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.9 2020/07/30 11:40:29 solene Exp $
N =ezquake
-V =3.2.1
+V =3.2.2
COMMENT = modern QuakeWorld client
PKGNAME = ${N}-${V}
Index: distinfo
===
RCS file: /cvs/ports/games/ezquake/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo30 Jul 2020 11:40:29 - 1.5
+++ distinfo26 Sep 2020 12:59:00 -
@@ -1,2 +1,2 @@
-SHA256 (ezquake-source-3.2.1.tar.gz) =
yPqe/MB2uw9yDRVnJ4RpZbqHh6/nsoSoXX0LyV/rYPw=
-SIZE (ezquake-source-3.2.1.tar.gz) = 5761231
+SHA256 (ezquake-source-3.2.2.tar.gz) =
LKLEVbzdTNfDrJX6h6ik40Y6qGpdvg/RhXb42XkEJfo=
+SIZE (ezquake-source-3.2.2.tar.gz) = 5759652
[Update from Maintainer] games/mvdsv 0.33
Hi, Diff below is for games/mvdsv (Quakeworld server) to update it to version 0.33. OK? Thanks, Tom Index: Makefile === RCS file: /cvs/ports/games/mvdsv/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile12 Jul 2019 20:46:21 - 1.2 +++ Makefile1 Sep 2020 08:31:51 - @@ -4,7 +4,7 @@ COMMENT = QuakeWorld server GH_ACCOUNT = deurk GH_PROJECT = mvdsv -GH_TAGNAME = 0.32 +GH_TAGNAME = 0.33 CATEGORIES = games Index: distinfo === RCS file: /cvs/ports/games/mvdsv/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo8 Dec 2018 09:40:53 - 1.1.1.1 +++ distinfo1 Sep 2020 08:31:51 - @@ -1,4 +1,4 @@ -SHA256 (mvdsv-0.32.tar.gz) = vuQIFmmEvNZCLRXcpnf+3R1E2h0/exjhJE9Kji3R08g= +SHA256 (mvdsv-0.33.tar.gz) = 3Jq9u+B2Wdbtx/8LyIA08eWSihZPe6mq+Shpkw4uQYQ= SHA256 (qwprogs-20120131.dat) = /1HLXnc2DXK5NIfYkZjc+UYpuS+LrhAPxupIpsEqeDA= -SIZE (mvdsv-0.32.tar.gz) = 710497 +SIZE (mvdsv-0.33.tar.gz) = 576306 SIZE (qwprogs-20120131.dat) = 197684
Re: [UPDATE FROM MAINTAINER]: games/freeorion
Hi Rafael, On 2020-08-18 05:29, Rafael Sadowski wrote: On Tue Aug 18, 2020 at 08:22:47AM +0300, Kirill Bychkov wrote: On Tue, August 18, 2020 08:10, Rafael Sadowski wrote: > On Sun Aug 02, 2020 at 11:18:44AM +0100, Tom Murphy wrote: >> Hi, >> >> This update brings games/freeorion to 0.4.10. The game now relies >> on Python 3 instead of Python 2. >> >> Compiles and runs fine here. There is a bug with their >> make_versioncpp.py utility which adds the version data based on a >> git commit, however the release source code of course contains no >> .git data. I've raised this as a bug here: >> >> https://github.com/freeorion/freeorion/issues/3129 >> >> OK? >> >> Thanks, >> Tom > > Your diff needs an update after the latest boost update. > >> It was updated before boost [1] and than fixed by you [2] :) [1] https://marc.info/?l=openbsd-ports-cvs&m=159696583926972&w=2 [2] https://marc.info/?l=openbsd-ports-cvs&m=159752347527449&w=2 Perfect, so sorry for the noise. It should work with both 1.66 and 1.67, but the newer boost is better to have, I think! -Tom
[UPDATE FROM MAINTAINER]: games/freeorion
Hi,
This update brings games/freeorion to 0.4.10. The game now relies
on Python 3 instead of Python 2.
Compiles and runs fine here. There is a bug with their
make_versioncpp.py utility which adds the version data based on a
git commit, however the release source code of course contains no
.git data. I've raised this as a bug here:
https://github.com/freeorion/freeorion/issues/3129
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile14 May 2020 18:14:50 - 1.6
+++ Makefile2 Aug 2020 08:17:26 -
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2020/05/14 18:14:50 kirby Exp $
-V =0.4.9
+V =0.4.10
COMMENT = turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2020-02-02.db53471_Source
+DISTNAME = FreeOrion_v${V}_2020-07-10.f3d403e_Source
PKGNAME = freeorion-${V}
CATEGORIES = games
@@ -13,13 +13,12 @@ MAINTAINER = Tom Murphy https://github.com/freeorion/freeorion/releases/download/v${V}/
@@ -28,8 +27,11 @@ COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+
BUILD_DEPENDS =devel/cppcheck \
- devel/py-codestyle
+ devel/doxygen \
+ devel/py-codestyle${MODPY_FLAVOR}
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
@@ -51,8 +53,11 @@ WRKDIST =${WRKDIR}/src-tarball
DPB_PROPERTIES = lonesome
.endif
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/GG/CMakeLists.txt
+
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
- ${PREFIX}/share/freeorion/default
+ ${PREFIX}/share/freeorion/default/
.include
Index: distinfo
===
RCS file: /cvs/ports/games/freeorion/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo14 May 2020 18:14:50 - 1.2
+++ distinfo2 Aug 2020 08:17:26 -
@@ -1,2 +1,2 @@
-SHA256 (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) =
Vomzpsq55s+8g9joLvMlu54AcRJi0msEbwg+pf3E1uE=
-SIZE (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 124662273
+SHA256 (FreeOrion_v0.4.10_2020-07-10.f3d403e_Source.tar.gz) =
5yq0LLoe6IQlBzQJMe84nmQBHgQKStx0rdX0mXu8uos=
+SIZE (FreeOrion_v0.4.10_2020-07-10.f3d403e_Source.tar.gz) = 124810803
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/games/freeorion/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt14 May 2020 18:14:50 - 1.2
+++ patches/patch-CMakeLists_txt2 Aug 2020 08:17:26 -
@@ -4,8 +4,8 @@ Remove hardcoded optimisation option.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -459,7 +459,6 @@ target_compile_options(freeorionparseobj
- $<$:-fvisibility=hidden>
+@@ -436,7 +436,6 @@ target_compile_options(freeorionparseobj
+ PRIVATE
$<$:-ftemplate-depth=512>
$<$:-ftemplate-depth=512>
-$<$>,$>:-O3>
Index: patches/patch-GG_CMakeLists_txt
===
RCS file: patches/patch-GG_CMakeLists_txt
diff -N patches/patch-GG_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-GG_CMakeLists_txt 2 Aug 2020 08:17:26 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Add X11BASE include directory
+Index: GG/CMakeLists.txt
+--- GG/CMakeLists.txt.orig
GG/CMakeLists.txt
+@@ -101,6 +101,7 @@ endif()
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
++${X11BASE}/include
+ )
+
+ configure_file(
Index: patches/patch-cmake_FindBoost_cmake
===
RCS file: patches/patch-cmake_FindBoost_cmake
diff -N patches/patch-cmake_FindBoost_cmake
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmake_FindBoost_cmake 2 Aug 2020 08:17:26 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Unset the Python minor version since OpenBSD uses library names
+like boost_python3-mt instead of boost_python38-mt
+
+Index: cmake/FindBoost.cmake
+--- cmake/FindBoost.cmake.orig
cmake/FindBoost.cmake
+@@ -1778,6 +1778,7 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ endif()
+
+ unset(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME)
++ unset(COMPONENT_PYTHON_VERSION_MINOR)
+ if (COMPONENT_PYTHON_VERSION_MINOR)
+ # Boost >= 1.67
+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
"${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
[Update] games/ezquake (from maintainer)
Hi,
Here's a diff to update games/ezquake from 3.2 to 3.2.1.
It fixes two bugs:
Fix bug in server browser which led to background thread
terminating program with message "EX_Browser_pathfind: max neighbours
count reached"
Fix bug where blank console variables were created, with side-effect
that stopped a chat message being entered at the console by pressing
space at the start of the line.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile18 May 2020 09:29:06 - 1.8
+++ Makefile24 Jun 2020 19:49:52 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.8 2020/05/18 09:29:06 solene Exp $
N =ezquake
-V =3.2
+V =3.2.1
COMMENT = modern QuakeWorld client
PKGNAME = ${N}-${V}
Index: distinfo
===
RCS file: /cvs/ports/games/ezquake/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 May 2020 09:29:06 - 1.4
+++ distinfo24 Jun 2020 19:49:52 -
@@ -1,2 +1,2 @@
-SHA256 (ezquake-source-3.2.tar.gz) =
gBFR1UBwYQbL0m2nJmql4zCEK4zMvFrNS8jVpz2zUV0=
-SIZE (ezquake-source-3.2.tar.gz) = 5758861
+SHA256 (ezquake-source-3.2.1.tar.gz) =
yPqe/MB2uw9yDRVnJ4RpZbqHh6/nsoSoXX0LyV/rYPw=
+SIZE (ezquake-source-3.2.1.tar.gz) = 5761231
Improvement to games/yquake2
Hi,
Running q2ded in a tty/tmux window, and then if that tty disappears,
q2ded begins spinning the CPU taking up sometimes 97% of the CPU.
The process is constantly polling for input, but if the tty is
marked 'bad' in fstat, the program can't cope.
Setting 'busywait' variable to 1 allows q2ded to use nanosleep and
stop spinning the cpu.
I've improved the rc script to include the busywait variable and
also removed the cd into the shared yquake2 directory since setting
+set basedir to that path does the same thing and is cleaner.
I've used the following flags for testing:
q2ded_flags="+set dedicated 1 +set game holywars +exec server.cfg"
It might be worth also hard coding +set dedicated 1 as well in the
rc script? What do you think?
Diff is attached.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/yquake2/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Mar 2020 21:22:59 - 1.21
+++ Makefile24 Jun 2020 08:49:24 -
@@ -8,7 +8,7 @@ V= 7.43
PKGNAME= ${N}-${V}
DISTNAME= quake2-${V}
CATEGORIES=games
-REVISION= 0
+REVISION= 1
HOMEPAGE= https://www.yamagi.org/quake2/
MAINTAINER=Adam Wolk
Index: pkg/q2ded.rc
===
RCS file: /cvs/ports/games/yquake2/pkg/q2ded.rc,v
retrieving revision 1.5
diff -u -p -r1.5 q2ded.rc
--- pkg/q2ded.rc11 Jan 2018 19:27:02 - 1.5
+++ pkg/q2ded.rc24 Jun 2020 08:49:24 -
@@ -12,7 +12,7 @@ rc_bg=YES
rc_reload=NO
rc_start() {
- ${rcexec} "cd ${TRUEPREFIX}/share/yquake2; ${daemon} ${daemon_flags}"
+ ${rcexec} "${daemon} +set gamedir ${TRUEPREFIX}/share/yquake2 +set
busywait 0 ${daemon_flags}"
}
rc_cmd $1
Re: [UPDATE]: games/freeorion 0.49
May 2, 2020 11:16 AM, "Ingo Schwarze" wrote: > Hi Tom, > > Tom Murphy wrote on Fri, May 01, 2020 at 01:34:08PM +0100: > >> Any update on this? Can it be committed? >> (I am the maintainer) > > Thanks for working on this, but now is not the time to commit > an Update because we are preparing the OpenBSD 6.7 release > right now. Updating the game is non-essential for the release, > and besdes, FreeOrion is a very massive beast. > > I think this should better wait until after the release has been > rolled out of the door. > > Yours, > Ingo Hi Ingo, Not a problem, I know it was cutting it a bit fine. Hope the release process is going smoothly! Kind regards, Tom
Re: [UPDATE]: games/freeorion 0.49
Hi, Any update on this? Can it be committed? (I am the maintainer) I believe the memory issues for compiling are just that ulimit -d needs to be increased to allow it to compile. Thanks, Tom
Re: [UPDATE] games/ezquake 3.2
Hi, Any update on this? Can it be committed? (I am the maintainer) Thanks, Tom
[UPDATE] games/ezquake 3.2
Hi,
Attached is a diff to update ezquake to v3.2 which was released today
the 19th of April 2020.
I had to change the Makefile to use the github tag since no release
tarball was available.
Builds and runs on my machine (amd64) and I played both single
player and connected to a multiplayer server (using games/mvdsv).
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile12 Jul 2019 20:46:17 - 1.7
+++ Makefile19 Apr 2020 14:57:19 -
@@ -1,11 +1,15 @@
# $OpenBSD: Makefile,v 1.7 2019/07/12 20:46:17 sthen Exp $
-V =3.1
+N =ezquake
+V =3.2
COMMENT = modern QuakeWorld client
-DISTNAME = ezquake-source-${V}
-PKGNAME = ezquake-${V}
+
+PKGNAME = ${N}-${V}
+GH_ACCOUNT = ezQuake
+GH_PROJECT = ${N}-source
+GH_TAGNAME = ${V}
+
CATEGORIES = games
-REVISION = 3
HOMEPAGE = https://ezquake.github.io/
MAINTAINER = Tom Murphy
@@ -16,8 +20,6 @@ PERMIT_PACKAGE = Yes
WANTLIB += GL SDL2 c curl expat jansson jpeg m pcre png pthread
WANTLIB += speex speexdsp z
-MASTER_SITES =
https://github.com/ezQuake/ezquake-source/releases/download/${V}/
-
LIB_DEPENDS = audio/speex \
graphics/jpeg \
graphics/png \
@@ -28,7 +30,6 @@ LIB_DEPENDS = audio/speex \
USE_GMAKE =Yes
MAKE_ENV = V=1
-WRKDIST = ${WRKDIR}
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/ezquake/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo15 Sep 2018 18:54:54 - 1.3
+++ distinfo19 Apr 2020 14:57:19 -
@@ -1,2 +1,2 @@
-SHA256 (ezquake-source-3.1.tar.gz) =
NGW6FyAXOzBOoppVfO6KFl9tUe7GgNoMqsnST4iqko4=
-SIZE (ezquake-source-3.1.tar.gz) = 3613947
+SHA256 (ezquake-source-3.2.tar.gz) =
gBFR1UBwYQbL0m2nJmql4zCEK4zMvFrNS8jVpz2zUV0=
+SIZE (ezquake-source-3.2.tar.gz) = 5758861
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/games/ezquake/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 15 Aug 2018 22:15:02 - 1.1.1.1
+++ patches/patch-Makefile 19 Apr 2020 14:57:19 -
@@ -5,7 +5,7 @@ Skip the architecture dance.
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -388,7 +388,7 @@ endif
+@@ -379,7 +379,7 @@ endif
ifdef CONFIG_WINDOWS
TARG_c := ezquake.exe
else
Re: [UPDATE]: games/freeorion 0.49
On Fri, Apr 10, 2020 at 11:05:33AM -0300, Elias M. Mariani wrote:
> Hi Tom,
> - You should remove REVISION.
> - The patch has an offset:
> Patching file CMakeLists.txt using Plan A...
> Hunk #1 succeeded at 459 (offset 65 lines).
>
> A make update-patches should fix it.
>
> OK mariani@ with those changes.
> I take your word on compiling and running. :)
>
> Cheers.
> Elias.
Hi Elias,
Many thanks for the review! I've removed REVISION and
updated the patch. Here's the new diff below.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile23 Nov 2019 22:08:42 - 1.5
+++ Makefile11 Apr 2020 13:50:05 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2019/11/23 22:08:42 cwen Exp $
-V =0.4.8
+V =0.4.9
COMMENT = turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2018-08-23.26f16b0_Source
+DISTNAME = FreeOrion_v${V}_2020-02-02.db53471_Source
PKGNAME = freeorion-${V}
CATEGORIES = games
-REVISION = 1
HOMEPAGE = https://www.freeorion.org/
MAINTAINER = Tom Murphy
@@ -18,7 +17,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL
WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
WANTLIB += boost_python-mt boost_regex-mt boost_serialization-mt
-WANTLIB += boost_signals-mt boost_system-mt boost_thread-mt c
+WANTLIB += boost_system-mt boost_thread-mt c
WANTLIB += freetype m ogg openal png ${MODPY_WANTLIB} vorbis vorbisenc
WANTLIB += vorbisfile z
Index: distinfo
===
RCS file: /cvs/ports/games/freeorion/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo3 Oct 2018 11:43:46 - 1.1.1.1
+++ distinfo11 Apr 2020 13:50:05 -
@@ -1,2 +1,2 @@
-SHA256 (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) =
1AXb60Ovt/p2k3zxXNsQsV6BjaFx7B6wPkocPsu6Rvc=
-SIZE (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 106254059
+SHA256 (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) =
Vomzpsq55s+8g9joLvMlu54AcRJi0msEbwg+pf3E1uE=
+SIZE (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 124662273
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/games/freeorion/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt1 Nov 2019 19:17:31 - 1.1
+++ patches/patch-CMakeLists_txt11 Apr 2020 13:50:05 -
@@ -4,7 +4,7 @@ Remove hardcoded optimisation option.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -394,7 +394,6 @@ target_compile_options(freeorionparseobj
+@@ -459,7 +459,6 @@ target_compile_options(freeorionparseobj
$<$:-fvisibility=hidden>
$<$:-ftemplate-depth=512>
$<$:-ftemplate-depth=512>
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/freeorion/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 3 Oct 2018 11:43:48 - 1.1.1.1
+++ pkg/PLIST 11 Apr 2020 13:50:06 -
@@ -3,10 +3,10 @@
@bin bin/freeorionca
@bin bin/freeoriond
lib/freeorion/
-lib/freeorion/libGiGi.so
-lib/freeorion/libGiGiSDL.so
-lib/freeorion/libfreeorioncommon.so
-lib/freeorion/libfreeorionparse.so
+@so lib/freeorion/libGiGi.so
+@so lib/freeorion/libGiGiSDL.so
+@so lib/freeorion/libfreeorioncommon.so
+@so lib/freeorion/libfreeorionparse.so
share/applications/freeorion.desktop
share/freeorion/
share/freeorion/default/
@@ -48,7 +48,11 @@ share/freeorion/default/data/art/encyclo
share/freeorion/default/data/art/encyclopedia/planet_environments/pt_toxic02.png
share/freeorion/default/data/art/encyclopedia/planet_environments/pt_tundra.png
share/freeorion/default/data/art/fields/
-share/freeorion/default/data/art/fields/rainbow_storm.png
+share/freeorion/default/data/art/fields/accretion_disc.png
+share/freeorion/default/data/art/fields/ion_storm.png
+share/freeorion/default/data/art/fields/molecular_cloud.png
+share/freeorion/default/data/art/fields/star_forming_nebula_1.png
+share/freeorion/default/data/art/fields/star_forming_nebula_2.png
share/freeorion/default/data/art/galaxy_decoration/
share/freeorion/default/data/art/galaxy_decoration/blue_set/
share/freeorion/default/data/art/galaxy_decoration/blue_set/gaseous01.png
@@ -527,6 +531,11 @@ share/freeorion/default/data/art/icons/p
share/freeorion/default/data/art/icons/planet/tiny.png
share/freeorion/default/data/art/icons/planet/toxic.png
share/freeorion/default/data/art/icons/planet/tundra.png
+share
[UPDATE]: games/freeorion 0.49
Hi,
Attached is a diff to bring games/freeorion to 0.4.9.
I removed boost_signals-mt from WANTLIB since it was
being listed as an extra lib.
Compiles fine and runs for me.
OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile23 Nov 2019 22:08:42 - 1.5
+++ Makefile10 Apr 2020 08:55:18 -
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2019/11/23 22:08:42 cwen Exp $
-V =0.4.8
+V =0.4.9
COMMENT = turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2018-08-23.26f16b0_Source
+DISTNAME = FreeOrion_v${V}_2020-02-02.db53471_Source
PKGNAME = freeorion-${V}
CATEGORIES = games
REVISION = 1
@@ -18,7 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL
WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
WANTLIB += boost_python-mt boost_regex-mt boost_serialization-mt
-WANTLIB += boost_signals-mt boost_system-mt boost_thread-mt c
+WANTLIB += boost_system-mt boost_thread-mt c
WANTLIB += freetype m ogg openal png ${MODPY_WANTLIB} vorbis vorbisenc
WANTLIB += vorbisfile z
Index: distinfo
===
RCS file: /cvs/ports/games/freeorion/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo3 Oct 2018 11:43:46 - 1.1.1.1
+++ distinfo10 Apr 2020 08:55:18 -
@@ -1,2 +1,2 @@
-SHA256 (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) =
1AXb60Ovt/p2k3zxXNsQsV6BjaFx7B6wPkocPsu6Rvc=
-SIZE (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 106254059
+SHA256 (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) =
Vomzpsq55s+8g9joLvMlu54AcRJi0msEbwg+pf3E1uE=
+SIZE (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 124662273
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/freeorion/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 3 Oct 2018 11:43:48 - 1.1.1.1
+++ pkg/PLIST 10 Apr 2020 08:55:18 -
@@ -3,10 +3,10 @@
@bin bin/freeorionca
@bin bin/freeoriond
lib/freeorion/
-lib/freeorion/libGiGi.so
-lib/freeorion/libGiGiSDL.so
-lib/freeorion/libfreeorioncommon.so
-lib/freeorion/libfreeorionparse.so
+@so lib/freeorion/libGiGi.so
+@so lib/freeorion/libGiGiSDL.so
+@so lib/freeorion/libfreeorioncommon.so
+@so lib/freeorion/libfreeorionparse.so
share/applications/freeorion.desktop
share/freeorion/
share/freeorion/default/
@@ -48,7 +48,11 @@ share/freeorion/default/data/art/encyclo
share/freeorion/default/data/art/encyclopedia/planet_environments/pt_toxic02.png
share/freeorion/default/data/art/encyclopedia/planet_environments/pt_tundra.png
share/freeorion/default/data/art/fields/
-share/freeorion/default/data/art/fields/rainbow_storm.png
+share/freeorion/default/data/art/fields/accretion_disc.png
+share/freeorion/default/data/art/fields/ion_storm.png
+share/freeorion/default/data/art/fields/molecular_cloud.png
+share/freeorion/default/data/art/fields/star_forming_nebula_1.png
+share/freeorion/default/data/art/fields/star_forming_nebula_2.png
share/freeorion/default/data/art/galaxy_decoration/
share/freeorion/default/data/art/galaxy_decoration/blue_set/
share/freeorion/default/data/art/galaxy_decoration/blue_set/gaseous01.png
@@ -527,6 +531,11 @@ share/freeorion/default/data/art/icons/p
share/freeorion/default/data/art/icons/planet/tiny.png
share/freeorion/default/data/art/icons/planet/toxic.png
share/freeorion/default/data/art/icons/planet/tundra.png
+share/freeorion/default/data/art/icons/planet_status_attacked.png
+share/freeorion/default/data/art/icons/planet_status_conquered.png
+share/freeorion/default/data/art/icons/planet_status_supply.png
+share/freeorion/default/data/art/icons/planet_status_unhappy.png
+share/freeorion/default/data/art/icons/planet_status_warning.png
share/freeorion/default/data/art/icons/ready.png
share/freeorion/default/data/art/icons/ship_hulls/
share/freeorion/default/data/art/icons/ship_hulls/agregate_asteroid_hull_small.png
@@ -700,6 +709,7 @@ share/freeorion/default/data/art/icons/s
share/freeorion/default/data/art/icons/sitrep/tech_researched.png
share/freeorion/default/data/art/icons/sitrep/tech_unlocked.png
share/freeorion/default/data/art/icons/sitrep/victory.png
+share/freeorion/default/data/art/icons/sitrep/weapon_upgrade.png
share/freeorion/default/data/art/icons/specials_huge/
share/freeorion/default/data/art/icons/specials_huge/abandoned-colony.png
share/freeorion/default/data/art/icons/specials_huge/ancient_ruins.png
@@ -1990,6 +2000,34 @@ share/freeorion/default/data/art/planets
share/freeorion/default/data/art/planets/rings/rings05.png
share/freeorion/default/data/art
Re: x11/lemonbar update - subpackage for xft
On Wed, Dec 25, 2019 at 12:31:59PM +0100, Jeremie Courreges-Anglas wrote: > On Wed, Dec 25 2019, Tom Murphy wrote: > > Hi Ingo & ports@, > > > > This is my first stab at redoing x11/lemonfonts into a SUBPACKAGE > > port. I've taken x11/lemonbar and added a -xft SUBPACKAGE that can > > do the nicer fonts. > > This doesn't really look like a SUBPACKAGE port. SUBPACKAGES are what > you use within *one* port to provide multiple subparts with varying > dependencies (eg a -postgresql subpackage that provides additional > support for postgres) or purpose (eg a -server subpackage). See > MULTI_PACKAGES in ports(7). > > With your current proposal I see no reason to move the regular port > under "base" and the fork under "xft", since they don't share anything > using an x11/lemonbar/Makefile.inc file. > > I fear I'm missing the whole picture, but as is this looks like > a candidate for a new port called x11/lemonbar-xft or whatever, with > proper @conflict markers added to the PLIST of both affected ports. > > Skimming through the proposal, the "xft" port has a patch to use pledge. > 1. it's better to note this using a # uses pledge() marker before WANTLIB > 2. a pledge(2) failure should be fatal > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE Hi, Yeah that's a good point. OK just ignore said subpackage. I have compiled and installed Ingo's port from: https://marc.info/?l=openbsd-ports&m=155042965323231&w=2 And it compiles, installs and runs fine for me as 'lemonbar-xft' (which is differentiated from 'lemonbar' from the original x11/lemonbar port) (I had to just change PERMIT_PACKAGE_CDROM to PERMIT_PACKAGE in the Makefile) Thanks, Tom
x11/lemonbar update - subpackage for xft
Hi Ingo & ports@, This is my first stab at redoing x11/lemonfonts into a SUBPACKAGE port. I've taken x11/lemonbar and added a -xft SUBPACKAGE that can do the nicer fonts. I've attached this as a tarball. Does this look OK? Thanks, Tom lemonbar.tgz Description: Binary data
Re: UPDATE: Nxtcloud-17.0.1
> Hello,
>
> Update for Nextcloud to 17.0.1:
>
> https://nextcloud.com/changelog/
>
> OK? Comments?
>
> Cheers.-
>
> --
>
> - gonzalo
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/nextcloud/Makefile,v
> retrieving revision 1.45
> diff -u -p -r1.45 Makefile
> --- Makefile 29 Oct 2019 07:24:03 - 1.45
> +++ Makefile 19 Nov 2019 07:17:43 -
> @@ -2,7 +2,7 @@
>
> COMMENT= easy and universal access to shared and/or personal
> files
>
> -V= 17.0.0
> +V= 17.0.1
> DISTNAME=nextcloud-${V}
> EXTRACT_SUFX=.tar.bz2
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/nextcloud/distinfo,v
> retrieving revision 1.29
> diff -u -p -r1.29 distinfo
> --- distinfo 29 Oct 2019 07:24:03 - 1.29
> +++ distinfo 19 Nov 2019 07:17:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (nextcloud-17.0.0.tar.bz2) =
> YIFCGzPs2zEwsr+yKTo/QEWusLRx7lcOZ13j2TGhQqY=
> -SIZE (nextcloud-17.0.0.tar.bz2) = 64500339
> +SHA256 (nextcloud-17.0.1.tar.bz2) =
> dz4O5SbCu8NZwBJ4Oz7GXzsBGaiCG8us+6K4Tti/K0s=
> +SIZE (nextcloud-17.0.1.tar.bz2) = 65252188
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
> retrieving revision 1.32
> diff -u -p -r1.32 PLIST
> --- pkg/PLIST 29 Oct 2019 07:24:03 - 1.32
> +++ pkg/PLIST 19 Nov 2019 07:17:44 -
> @@ -5393,6 +5393,8 @@ nextcloud/apps/accessibility/js/accessib
> nextcloud/apps/accessibility/l10n/
> nextcloud/apps/accessibility/l10n/af.js
> nextcloud/apps/accessibility/l10n/af.json
> +nextcloud/apps/accessibility/l10n/ar.js
> +nextcloud/apps/accessibility/l10n/ar.json
> nextcloud/apps/accessibility/l10n/bg.js
> nextcloud/apps/accessibility/l10n/bg.json
> nextcloud/apps/accessibility/l10n/ca.js
> @@ -5445,6 +5447,8 @@ nextcloud/apps/accessibility/l10n/ko.js
> nextcloud/apps/accessibility/l10n/ko.json
> nextcloud/apps/accessibility/l10n/lt_LT.js
> nextcloud/apps/accessibility/l10n/lt_LT.json
> +nextcloud/apps/accessibility/l10n/lv.js
> +nextcloud/apps/accessibility/l10n/lv.json
> nextcloud/apps/accessibility/l10n/mk.js
> nextcloud/apps/accessibility/l10n/mk.json
> nextcloud/apps/accessibility/l10n/nb.js
> @@ -6204,6 +6208,8 @@ nextcloud/apps/dav/l10n/lt_LT.js
> nextcloud/apps/dav/l10n/lt_LT.json
> nextcloud/apps/dav/l10n/lv.js
> nextcloud/apps/dav/l10n/lv.json
> +nextcloud/apps/dav/l10n/mk.js
> +nextcloud/apps/dav/l10n/mk.json
> nextcloud/apps/dav/l10n/nb.js
> nextcloud/apps/dav/l10n/nb.json
> nextcloud/apps/dav/l10n/nb_NO.js
> @@ -9406,6 +9412,7 @@ nextcloud/apps/files_versions/lib/Events
> nextcloud/apps/files_versions/lib/Expiration.php
> nextcloud/apps/files_versions/lib/Hooks.php
> nextcloud/apps/files_versions/lib/Sabre/
> +nextcloud/apps/files_versions/lib/Sabre/Plugin.php
> nextcloud/apps/files_versions/lib/Sabre/RestoreFolder.php
> nextcloud/apps/files_versions/lib/Sabre/RootCollection.php
> nextcloud/apps/files_versions/lib/Sabre/VersionCollection.php
> @@ -10078,8 +10085,6 @@ nextcloud/apps/logreader/js/Search.js
> nextcloud/apps/logreader/js/index.js
> nextcloud/apps/logreader/js/unserialize.js
> nextcloud/apps/logreader/l10n/
> -nextcloud/apps/logreader/l10n/af.js
> -nextcloud/apps/logreader/l10n/af.json
> nextcloud/apps/logreader/l10n/ar.js
> nextcloud/apps/logreader/l10n/ar.json
> nextcloud/apps/logreader/l10n/ast.js
> @@ -10140,8 +10145,6 @@ nextcloud/apps/logreader/l10n/et_EE.js
> nextcloud/apps/logreader/l10n/et_EE.json
> nextcloud/apps/logreader/l10n/eu.js
> nextcloud/apps/logreader/l10n/eu.json
> -nextcloud/apps/logreader/l10n/fa.js
> -nextcloud/apps/logreader/l10n/fa.json
> nextcloud/apps/logreader/l10n/fi.js
> nextcloud/apps/logreader/l10n/fi.json
> nextcloud/apps/logreader/l10n/fr.js
> @@ -10190,8 +10193,6 @@ nextcloud/apps/logreader/l10n/sr.js
> nextcloud/apps/logreader/l10n/sr.json
> nextcloud/apps/logreader/l10n/sv.js
> nextcloud/apps/logreader/l10n/sv.json
> -nextcloud/apps/logreader/l10n/th.js
> -nextcloud/apps/logreader/l10n/th.json
> nextcloud/apps/logreader/l10n/tr.js
> nextcloud/apps/logreader/l10n/tr.json
> nextcloud/apps/logreader/l10n/zh_CN.js
> @@ -10352,6 +10353,8 @@ nextcloud/apps/nextcloud_announcements/l
> nextcloud/apps/nextcloud_announcements/l10n/lt_LT.json
> nextcloud/apps/nextcloud_announcements/l10n/lv.js
> nextcloud/apps/nextcloud_announcements/l10n/lv.json
> +nextcloud/apps/nextcloud_announcements/l10n/mk.js
> +nextcloud/apps/nextcloud_announcements/l10n/mk.json
> nextcloud/apps/nextcloud_announcements/l10n/nb.js
> nextcloud/apps/nextcloud_announcements/l10n/nb.json
> nextcloud/apps/nextcloud_announcements/l10n/nl.js
> @@ -11139,6 +11142,8 @@ nextcloud/apps/recommendations/l10n/ru.j
> nextcloud/apps/recommendations/l10n/ru.json
> nextcloud/apps/recommendations/l10n/sk.js
> n
Re: [macppc] games/freeorion needs `DPB_PROPERTIES=lonesome'
On Mon, Nov 18, 2019 at 02:19:40PM +0100, Charlene Wendling wrote:
> Hi,
>
> I guess i could have just committed it.
>
> Freeorion is also a huge memory user when being built, and macppc is
> indeed a memory-challenged arch. It needs to be built alone, otherwise
> it's failing due to memory exhaustion.
>
> It survived the bulk :)
>
> OK?
>
> Charlène.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/freeorion/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 Makefile
> --- Makefile 1 Nov 2019 19:17:31 - 1.4
> +++ Makefile 18 Nov 2019 13:15:33 -
> @@ -48,6 +48,10 @@ NO_TEST = Yes
>
> WRKDIST =${WRKDIR}/src-tarball
>
> +.if ${MACHINE_ARCH:Mpowerpc}
> +DPB_PROPERTIES = lonesome
> +.endif
> +
> post-install:
> ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
> ${PREFIX}/share/freeorion/default
Hi,
That's fine if it makes it work on macppc. I have no way of testing
this as I don't use that arch but if it makes it compile, then that
works for me.
Thanks,
Tom
Re: [ports-gcc] games/freeorion is built with -03 with eg++
On Thu, Oct 24, 2019 at 09:27:29PM +0200, Charlene Wendling wrote:
> On Wed, 23 Oct 2019 09:17:16 +0100
> Tom Murphy wrote:
>
> > On 2019-10-22 18:17, Charlene Wendling wrote:
> > > Hi ports, Tom,
> > >
> > >> http://build-failures.rhaalovely.net/powerpc/2019-09-17/games/freeorion.log
> > >
> > > On base-clang archs, the game is built with the default -O2, but on
> > > base-gcc ones, it's built with -O3. On sparc64 it seems not to be an
> > > issue, but on macppc, it's causing an OOM error.
> > >
> > > On my macppc machine (2GB ram + 2GB swap) it builds (and swaps)
> > > fine [0].
> > > The runtime is very slow, i've load averages > 20, but afaik it's
> > > not a reason to mark it BROKEN :)
> > >
> > > Comments/feedback are welcome,
> > >
> > > Charlène.
> > >
> > >
> > > [0] https://bin.charlenew.xyz/freeorion.log
> > >
> > >
> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/games/freeorion/Makefile,v
> > > retrieving revision 1.3
> > > diff -u -p -u -p -r1.3 Makefile
> > > --- Makefile 12 Jul 2019 20:46:18 - 1.3
> > > +++ Makefile 22 Oct 2019 17:11:34 -
> > > @@ -5,7 +5,7 @@ COMMENT = turn-based space empire and ga
> > > DISTNAME = FreeOrion_v${V}_2018-08-23.26f16b0_Source
> > > PKGNAME =freeorion-${V}
> > > CATEGORIES = games
> > > -REVISION = 0
> > > +REVISION = 1
> > >
> > > HOMEPAGE = https://www.freeorion.org/
> > > MAINTAINER = Tom Murphy
> > > 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 22 Oct 2019 17:11:34 -
> > > @@ -0,0 +1,14 @@
> > > +$OpenBSD$
> > > +Remove hardcoded optimisation option.
> > > +
> > > +Index: CMakeLists.txt
> > > +--- CMakeLists.txt.orig
> > > CMakeLists.txt
> > > +@@ -394,7 +394,6 @@ target_compile_options(freeorionparseobj
> > > + $<$:-fvisibility=hidden>
> > > + $<$:-ftemplate-depth=512>
> > > + $<$:-ftemplate-depth=512>
> > > +-
> > > $<$>,$>:-O3>
> > > + )
> > > +
> > > + target_compile_definitions(freeorionparseobj
> >
> > Hi Charlène,
> >
> > The Makefile part of the diff doesn't apply cleanly. Is the line
> > numbering off?
>
> I've cleaned and checked out the whole port again and i don't meet
> that issue :|
>
> > Anyway, yes removing -O3 is good to me.
> >
> > Thanks,
> > Tom
> >
Hi Charlène,
I think there may have been something messed up with the formatting
when I saved it, I've re-tested with your diff and I've tested it and
it patches fine and compiles and runs for me!
Thanks,
Tom
Re: [ports-gcc] games/freeorion is built with -03 with eg++
On 2019-10-22 18:17, Charlene Wendling wrote:
Hi ports, Tom,
http://build-failures.rhaalovely.net/powerpc/2019-09-17/games/freeorion.log
On base-clang archs, the game is built with the default -O2, but on
base-gcc ones, it's built with -O3. On sparc64 it seems not to be an
issue, but on macppc, it's causing an OOM error.
On my macppc machine (2GB ram + 2GB swap) it builds (and swaps) fine
[0].
The runtime is very slow, i've load averages > 20, but afaik it's not a
reason to mark it BROKEN :)
Comments/feedback are welcome,
Charlène.
[0] https://bin.charlenew.xyz/freeorion.log
Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile12 Jul 2019 20:46:18 - 1.3
+++ Makefile22 Oct 2019 17:11:34 -
@@ -5,7 +5,7 @@ COMMENT = turn-based space empire and ga
DISTNAME = FreeOrion_v${V}_2018-08-23.26f16b0_Source
PKGNAME = freeorion-${V}
CATEGORIES = games
-REVISION = 0
+REVISION = 1
HOMEPAGE = https://www.freeorion.org/
MAINTAINER = Tom Murphy
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_txt22 Oct 2019 17:11:34 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+Remove hardcoded optimisation option.
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -394,7 +394,6 @@ target_compile_options(freeorionparseobj
+ $<$:-fvisibility=hidden>
+ $<$:-ftemplate-depth=512>
+ $<$:-ftemplate-depth=512>
+-
$<$>,$>:-O3>
+ )
+
+ target_compile_definitions(freeorionparseobj
Hi Charlène,
The Makefile part of the diff doesn't apply cleanly. Is the line
numbering off?
Anyway, yes removing -O3 is good to me.
Thanks,
Tom
Re: Update: emulators/stella
Hi,
I realized in my previous diff I hadn't removed the REVISION line,
so here is a new diff without it.
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/emulators/stella/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile24 Oct 2018 14:28:02 - 1.32
+++ Makefile24 Jun 2019 21:47:18 -
@@ -2,12 +2,11 @@
COMMENT = Atari 2600 VCS emulator
-V =5.1.3
+V =6.0.1
DISTNAME = stella-$V
CATEGORIES = emulators
EXTRACT_SUFX = -src.tar.xz
WRKDIST = ${WRKDIR}/${DISTNAME}
-REVISION = 0
HOMEPAGE = https://stella-emu.github.io/
Index: distinfo
===
RCS file: /cvs/ports/emulators/stella/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo27 Jun 2018 20:56:54 - 1.19
+++ distinfo24 Jun 2019 21:47:18 -
@@ -1,2 +1,2 @@
-SHA256 (stella-5.1.3-src.tar.xz) = 4HQxfCXl1Mq+xFWJCdMBw6dlStYghj8F00IkT+a9/go=
-SIZE (stella-5.1.3-src.tar.xz) = 1828448
+SHA256 (stella-6.0.1-src.tar.xz) = 1hH5i7Ne2erPtjgmsStOi2e4dKKocBnUva8ef0ckxA0=
+SIZE (stella-6.0.1-src.tar.xz) = 1730084
Index: pkg/PLIST
===
RCS file: /cvs/ports/emulators/stella/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 14 Mar 2018 04:37:59 - 1.12
+++ pkg/PLIST 24 Jun 2019 21:47:18 -
@@ -35,7 +35,6 @@ share/doc/stella/graphics/eventmapping_d
share/doc/stella/graphics/eventmapping_remap.png
share/doc/stella/graphics/jr_pacman.png
share/doc/stella/graphics/launcher.png
-share/doc/stella/graphics/launcher_filter.png
share/doc/stella/graphics/launcher_options_files.png
share/doc/stella/graphics/launcher_options_snapshots.png
share/doc/stella/graphics/launcher_override.png
@@ -60,13 +59,11 @@ share/doc/stella/graphics/options_video_
share/doc/stella/graphics/options_video_tv.png
share/doc/stella/graphics/pacman.png
share/doc/stella/graphics/qwertz.png
-share/doc/stella/graphics/rom_browser.png
share/doc/stella/graphics/romaudit.png
share/doc/stella/graphics/rominfo_1x_large.png
share/doc/stella/graphics/rominfo_1x_small.png
share/doc/stella/graphics/rominfo_2x_small.png
share/doc/stella/graphics/secret_quest.png
-share/doc/stella/graphics/select_romdir.png
share/doc/stella/graphics/space_invaders.png
share/doc/stella/graphics/timemachine.png
share/doc/stella/index.html
Update: emulators/stella
Hi, Here is an update for emulators/stella which brings it up to the latest stable version as of this email: v6.0.1. There are 3 images in the PLIST which have been removed between versions. Is this OK? Thanks, Tom Index: Makefile === RCS file: /cvs/ports/emulators/stella/Makefile,v retrieving revision 1.32 diff -u -p -r1.32 Makefile --- Makefile24 Oct 2018 14:28:02 - 1.32 +++ Makefile24 Jun 2019 21:04:25 - @@ -2,7 +2,7 @@ COMMENT = Atari 2600 VCS emulator -V =5.1.3 +V =6.0.1 DISTNAME = stella-$V CATEGORIES = emulators EXTRACT_SUFX = -src.tar.xz Index: distinfo === RCS file: /cvs/ports/emulators/stella/distinfo,v retrieving revision 1.19 diff -u -p -r1.19 distinfo --- distinfo27 Jun 2018 20:56:54 - 1.19 +++ distinfo24 Jun 2019 21:04:25 - @@ -1,2 +1,2 @@ -SHA256 (stella-5.1.3-src.tar.xz) = 4HQxfCXl1Mq+xFWJCdMBw6dlStYghj8F00IkT+a9/go= -SIZE (stella-5.1.3-src.tar.xz) = 1828448 +SHA256 (stella-6.0.1-src.tar.xz) = 1hH5i7Ne2erPtjgmsStOi2e4dKKocBnUva8ef0ckxA0= +SIZE (stella-6.0.1-src.tar.xz) = 1730084 Index: pkg/PLIST === RCS file: /cvs/ports/emulators/stella/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 14 Mar 2018 04:37:59 - 1.12 +++ pkg/PLIST 24 Jun 2019 21:04:25 - @@ -35,7 +35,6 @@ share/doc/stella/graphics/eventmapping_d share/doc/stella/graphics/eventmapping_remap.png share/doc/stella/graphics/jr_pacman.png share/doc/stella/graphics/launcher.png -share/doc/stella/graphics/launcher_filter.png share/doc/stella/graphics/launcher_options_files.png share/doc/stella/graphics/launcher_options_snapshots.png share/doc/stella/graphics/launcher_override.png @@ -60,13 +59,11 @@ share/doc/stella/graphics/options_video_ share/doc/stella/graphics/options_video_tv.png share/doc/stella/graphics/pacman.png share/doc/stella/graphics/qwertz.png -share/doc/stella/graphics/rom_browser.png share/doc/stella/graphics/romaudit.png share/doc/stella/graphics/rominfo_1x_large.png share/doc/stella/graphics/rominfo_1x_small.png share/doc/stella/graphics/rominfo_2x_small.png share/doc/stella/graphics/secret_quest.png -share/doc/stella/graphics/select_romdir.png share/doc/stella/graphics/space_invaders.png share/doc/stella/graphics/timemachine.png share/doc/stella/index.html
UPDATE: sysutils/borgmatic 1.3.2 -> 1.3.3 and fix No module named
Hi,
I was getting an error: ModuleNotFoundError: No module named
'borgmatic.borg.execute' when running borgmatic 1.3.2, and I
noticed execute.py was missing from the PLIST. (It appeared
in 1.3.1)
So I also took the liberty of updating Borgmatic to 1.3.3.
I've attached a diff below. Currently backing up my system
with 1.3.3 and it's working for me.
Is this OK?
Thanks,
Tom
Index: Makefile
===
RCS file: /cvs/ports/sysutils/borgmatic/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile9 May 2019 15:56:12 - 1.18
+++ Makefile12 May 2019 12:39:10 -
@@ -2,7 +2,7 @@
COMMENT = wrapper for Borg to create and prune backups
-MODPY_EGG_VERSION =1.3.2
+MODPY_EGG_VERSION =1.3.3
DISTNAME = borgmatic-${MODPY_EGG_VERSION}
MAINTAINER = Jasper Lievisse Adriaanse
Index: distinfo
===
RCS file: /cvs/ports/sysutils/borgmatic/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo9 May 2019 15:56:12 - 1.16
+++ distinfo12 May 2019 12:39:10 -
@@ -1,2 +1,2 @@
-SHA256 (borgmatic-1.3.2.tar.gz) = 1tWKTs9KR7ElrXzrb3XgHNPRDe4MP6rVP1+lkLDLVA8=
-SIZE (borgmatic-1.3.2.tar.gz) = 36775
+SHA256 (borgmatic-1.3.3.tar.gz) = agdkycx08hen1UucqADMGgLUljpquaGzCplLnXWeZTs=
+SIZE (borgmatic-1.3.3.tar.gz) = 36978
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/borgmatic/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 1 Apr 2019 04:18:38 - 1.8
+++ pkg/PLIST 12 May 2019 12:39:10 -
@@ -2,6 +2,7 @@
bin/borgmatic
bin/generate-borgmatic-config
bin/upgrade-borgmatic-config
+bin/validate-borgmatic-config
lib/python${MODPY_VERSION}/site-packages/borgmatic/
lib/python${MODPY_VERSION}/site-packages/borgmatic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/borgmatic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -22,6 +23,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}check.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}create.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}execute.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}extract.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
@@ -30,6 +32,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/check.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/create.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/environment.py
+lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/execute.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/extract.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/info.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/borg/init.py
@@ -43,10 +46,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/${MODPY_PYCACHE}convert_config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/${MODPY_PYCACHE}generate_config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/${MODPY_PYCACHE}hook.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/${MODPY_PYCACHE}validate_config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/borgmatic.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/convert_config.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/generate_config.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/hook.py
+lib/python${MODPY_VERSION}/site-packages/borgmatic/commands/validate_config.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/__init__.py
lib/python${MODPY_VERSION}/site-packages/borgmatic/config/${MODPY_PYCACHE}/
Re: Patch to enable Xft on lemonbar
Hi Ingo, Apologies, I didn't see the tarball until it was too late, so I untarred that and it compiles and runs fine here. No changes needed to the Makefile. (Sorry for getting your name wrong in the previous email's To: line.. bad muscle memory typing things!) I am really liking this new Xft-enabled lemonbar. The fonts are so much nicer now. Thanks for this! Kind regards, Tom
Re: Patch to enable XFT on lemonbar
Hi Ingo,
>A few days later ...
>
>Here is a diff that switches lemonbar to the krypt-n/bar fork supporting
>XFT. A tarball is attached for two patches (I wanted to avoid `cvs add`
>on the patches directory). The inline diff just shows the changes to the
>Makefile and distinfo.
>
>At the same time add pledge() before the main processing loop. It is
>nice to see that "stdio" is enough at this point (after initialization
>which needed at least "rpath" is my tests; likely for loading some
>fonts).
>
>Alternatively we could create a new port for the fork (e.g.,
>lemonbar-xft). But since both LemonBoy/bar and krypt-n/bar have not seen
>a lot of changes recently we won't miss anything important if we just
>switch.
>
>So OK for the switch?
>
>Best regards,
>Ingo
I've been looking for the Xft version of lemonbar in ports lately
too, however I couldn't get it to compile with your patch.
I had to amend CFLAGS in the Makefile like so:
CFLAGS += -I${X11BASE}/include \
-I${X11BASE}/include/freetype2
Without it, I got fatal errors building:
/usr/X11R6/include/X11/Xft/Xft.h:39:10: fatal error: 'ft2build.h'
file not found
Other than that, it built with the CFLAGS changes above and
works for me with Xft fonts.
Thanks,
Tom
Re: [NEW] games/mvdsv 0.32
On 2018-11-23 13:47, Jeremie Courreges-Anglas wrote:
On Fri, Nov 23 2018, Jeremie Courreges-Anglas wrote:
On Fri, Oct 19 2018, Solene Rapenne wrote:
Tom Murphy wrote:
On Thu, Oct 04, 2018 at 12:11:01PM +0200, Solene Rapenne wrote:
> Small introduction for people reading ports@.
>
> mvdsv is a quake world game server. It has some features like allowing to
> record games from every player point of view. That can be played again in a
> quake client like ezquake.
>
> ok solene@
Thanks Solene and Stuart for their help! Attached is a new tarball
using
GH_TAGNAME and the correct DISTFILES settings.
-Tom
up
looks fine to me
The build system is not very portable. The configure script hardcodes
a bunch of arch-dependent logic which breaks on eg. sparc64:
../../src/pr_exec.c:1: error: -m32 is not supported by this
configuration
Also, Makefile.BSD contains:
--8<--
. if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
USE_ASM=-Did386
DO_CFLAGS += ${USE_ASM}
. endif
-->8--
It would be good to check that the port builds on i386 with assembly
enabled. Or you could wait for bulk build reports. ;)
Using devel/meson could be a nicer alternative to Makefile.BSD, which
looks a bit outdated (no curl support for example).
Using meson is cleaner since meson.build doesn't hardcode so much crap.
Also it autodetects system pcre instead of falling back to an ancient
bundled version. Updated tarball.
This builds much faster and cleaner with those changes. Works on my
amd64.
Thanks for that!
-Tom
Re: [NEW] games/mvdsv 0.32
Hi, Is there any other issue holding up having this go in that I need to address? If so, let me know. Just pinging the list. Thanks, Tom
Re: games/ezquake add multiplayer server list
Hi, Just a friendly ping to say Solene's patch can go in if that's OK? Thanks, Tom
Re: games/ezquake and games/quakespasm broken on powerpc
Hi Solene,
> Hi,
>
> both games/ezquake and games/quakespasm won't even start. I think we should
> mark them broken, but I have no idea what the issue is...
>
> Below is a backtrace of ezquake crash and quakespasm crash log (I did not find
> a .core file)
>
>
> games/ezquake
> -
> Reading symbols from ezquake...(no debugging symbols found)...done.
> [New process 545505]
>
> warning: Unexpected size of section `.reg/545505' in core file.
> Core was generated by `ezquake'.
> Program terminated with signal SIGABRT, Aborted.
>
> warning: Unexpected size of section `.reg/545505' in core file.
> #0 0xb56d83b4 in thrkill () at {standard input}:5
> 5 {standard input}: No such file or directory.
> (gdb) bt
> #0 0xb56d83b4 in thrkill () at {standard input}:5
> #1 0xb567523c in *_libc___stack_smash_handler (func=0xe38f5424
> "X11_InitKeyboard", damaged=) at
> /usr/src/lib/libc/sys/stack_protector.c:79
> #2 0xe38a7ae0 in X11_InitKeyboard () from /usr/local/lib/libSDL2.so.0.5
> #3 0xe38af1e8 in X11_VideoInit () from /usr/local/lib/libSDL2.so.0.5
> #4 0xe3896034 in SDL_VideoInit_REAL () from /usr/local/lib/libSDL2.so.0.5
> #5 0xe37e9a40 in SDL_InitSubSystem_REAL () from /usr/local/lib/libSDL2.so.0.5
> #6 0xe37f546c in SDL_InitSubSystem () from /usr/local/lib/libSDL2.so.0.5
> #7 0x30a02424 in ?? ()
> #8 0x3091f2b0 in ?? ()
> #9 0x308ccb5c in ?? ()
> #10 0x30a4c998 in ?? ()
> #11 0x308b0264 in ?? ()
> #12 0x in ?? ()
Could you recompile ezquake with debugging symbols? I have no access to a
powerpc arch.
I have a sneaking suspicion this could be a SDL2 issue, though.
-Tom
Re: games/ezquake add multiplayer server list
Hi Solene, On Wed, Oct 17, 2018 at 10:43:55AM +0200, Solene Rapenne wrote: > new diff, with the patch made from "make update-patches", I don't remember why > but last time that command wasn't producing the patch so I made it manually. Just tested this and it works great on my machine. Thanks! -Tom
Re: games/ezquake add multiplayer server list
On Thu, Oct 04, 2018 at 08:21:25AM +0200, Solene Rapenne wrote:
> some people had issues copying this patch. I send it again, being sure it's
> not
> copied from tmux.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/ezquake/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 15 Sep 2018 18:54:54 - 1.4
> +++ Makefile 4 Oct 2018 06:19:32 -
> @@ -5,7 +5,7 @@ COMMENT = modern QuakeWorld client
> DISTNAME = ezquake-source-${V}
> PKGNAME =ezquake-${V}
> CATEGORIES = games
> -REVISION = 1
> +REVISION = 2
>
> HOMEPAGE = https://ezquake.github.io/
> MAINTAINER = Tom Murphy
> @@ -32,7 +32,16 @@ WRKDIST = ${WRKDIR}
>
> NO_TEST =Yes
>
> +GAMEDIR =${PREFIX}/share/ezquake
> +SUBST_VARS +=GAMEDIR
> +
> +do-configure:
> + ${SUBST_CMD} ${WRKSRC}/EX_browser_sources.c
> +
> do-install:
> - ${INSTALL_PROGRAM} ${WRKSRC}/ezquake ${PREFIX}/bin
> + ${INSTALL_PROGRAM} ${WRKSRC}/ezquake ${PREFIX}/bin
> + ${INSTALL_DATA_DIR} ${GAMEDIR}
> + @cp ${WRKSRC}/misc/sb/*.txt ${GAMEDIR}/
> + #${INSTALL_DATA} ${WRKSRC}/misc/sb/sources.txt ${GAMEDIR}
>
> .include
> Index: patches/patch-EX_browser_sources.c
> ===
> RCS file: patches/patch-EX_browser_sources.c
> diff -N patches/patch-EX_browser_sources.c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-EX_browser_sources.c4 Oct 2018 06:19:32 -
> @@ -0,0 +1,11 @@
> +--- /usr/ports/pobj/ezquake-3.1/EX_browser_sources.c.origTue Oct 2
> 18:45:41 2018
> /usr/ports/pobj/ezquake-3.1/EX_browser_sources.c Tue Oct 2 18:45:54 2018
> +@@ -36,7 +36,7 @@
> +
> + #include "EX_browser.h"
> +
> +-#define SOURCES_LIST_FILENAME "sb/sources.txt"
> ++#define SOURCES_LIST_FILENAME "${GAMEDIR}/sources.txt"
> +
> + // Used by curl to read server lists from the web
> + struct curl_buf
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/games/ezquake/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 4 Sep 2018 12:53:16 - 1.2
> +++ pkg/PLIST 4 Oct 2018 06:19:32 -
> @@ -1,3 +1,14 @@
> @comment $OpenBSD: PLIST,v 1.2 2018/09/04 12:53:16 espie Exp $
> @bin bin/ezquake
> share/doc/pkg-readmes/${PKGSTEM}
> +share/ezquake/
> +share/ezquake/au-sv.txt
> +share/ezquake/ctf.txt
> +share/ezquake/eu-4on4.txt
> +share/ezquake/eu-sv.txt
> +share/ezquake/global.txt
> +share/ezquake/na-sv.txt
> +share/ezquake/qizmo.txt
> +share/ezquake/sa-sv.txt
> +share/ezquake/sources.txt
> +share/ezquake/tf.txt
Hi,
Just tested this and it works well. Thanks for this addition!
I can ping servers and gather their info and join them with ezquake.
Only thing wrong is a missing $OpenBSD$ RCS tag at the top of
patches/patch-EX_browser_sources.c but otherwise works fine.
Thanks,
Tom
Re: [NEW] games/mvdsv 0.32
On Thu, Oct 04, 2018 at 12:11:01PM +0200, Solene Rapenne wrote: > Small introduction for people reading ports@. > > mvdsv is a quake world game server. It has some features like allowing to > record games from every player point of view. That can be played again in a > quake client like ezquake. > > ok solene@ Thanks Solene and Stuart for their help! Attached is a new tarball using GH_TAGNAME and the correct DISTFILES settings. -Tom mvdsv.tgz Description: application/tar-gz
Re: [NEW] games/mvdsv 0.32
Hi, Attached is an updated tarball for games/mvdsv 0.32. I incorporated some updates to the Makefile from solene@. Thanks Solene! -Tom mvdsv.tgz Description: application/tar-gz
Re: [NEW] games/freeorion
Hi,
On Thu, Sep 27, 2018 at 10:03:47AM +0100, Stuart Henderson wrote:
> Please replace python2.7 in WANTLIB with ${MODPY_WANTLIB} and add
> ${MODPY_LIB_DEPENDS} to LIB_DEPENDS.
I've changed Makefile to reflect this and also kirby@'s suggestions
for non-clang arches.
Attached is the tarball.
Thanks,
Tom
freeorion.tgz
Description: application/tar-gz
Re: [NEW] games/freeorion
Hi, On Sun, Sep 23, 2018 at 03:03:00PM +0200, Solene Rapenne wrote: > make port-lib-depend-check reports WANTLIB c++ is missing My make port-lib-depends-check didn't report any WANTLIB missing. > Makefile variables order should be BUILD/RUN/LIB and not BUILD/LIB/RUN, you > can > look at infrastructure/templates/Makefile.template for the right order. I've rearranged Makefile to go into that order now. Tarball attached. > with those 2 things fixed, ok solene@ for import Many thanks for looking at the port! -Tom freeorion.tgz Description: application/tar-gz
Re: [NEW] games/freeorion
Hi, Just pinging the list regarding this port. I know it takes a while to compile (45 minutes on my i7-8550U). Just wondering how everyone got on with compiling and running it? Thanks, Tom
Re: [UPDATE] sysutils/conky - detect battery properly/update_interval
On Fri, Sep 21, 2018 at 10:46:13AM +0100, Stuart Henderson wrote:
> Same problem exists, get_apm_adapter() allocates itself and returns
> a pointer to that memory, so now you're allocating yourself, throwing
> away the address, freeing the memory allocated by get_apm_adapter(),
> and leaking the memory from your calloc.
>
> Try something along these lines:
>
> char *apm_status;
> apm_status = get_apm_adapter();
> if (apm_status != NULL) {
> if (strcmp(apm_status,"off-line") == 0) {
> update_interval = update_interval_bat;
> else
> update_interval = update_interval_old;
> free(apm_status);
> }
>
>
>
>
> > +#endif
> > }
> > info.looped++;
Hi,
You're absolutely right. I re-checked get_apm_adapter() and it
left that bit of memory allocated without freeing it. There's only
one other bit in the code that calls it and it too frees the pointer.
(My C is very very rusty -- I'm kind of re-learning it after 25
years!)
Here's the updated diff below. Thanks for your guidance and
patience with me, Stuart. :)
-Tom
Index: Makefile
===
RCS file: /cvs/ports/sysutils/conky/Makefile,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 Makefile
--- Makefile1 Jun 2018 14:24:55 - 1.54
+++ Makefile23 Sep 2018 10:09:16 -
@@ -7,7 +7,7 @@ COMMENT=light-weight system monitor
DISTNAME= conky-1.9.0
CATEGORIES=sysutils
HOMEPAGE= http://conky.sourceforge.net/
-REVISION= 15
+REVISION= 16
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=conky/}
Index: patches/patch-src_conky_c
===
RCS file: /cvs/ports/sysutils/conky/patches/patch-src_conky_c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-src_conky_c
--- patches/patch-src_conky_c 31 Dec 2012 09:36:38 - 1.6
+++ patches/patch-src_conky_c 23 Sep 2018 10:09:16 -
@@ -1,6 +1,11 @@
$OpenBSD: patch-src_conky_c,v 1.6 2012/12/31 09:36:38 chrisz Exp $
src/conky.c.orig Thu May 3 23:22:21 2012
-+++ src/conky.cTue Jul 24 18:10:39 2012
+
+Correctly change update_interval based on whether AC is plugged in
+or on battery for OpenBSD.
+
+Index: src/conky.c
+--- src/conky.c.orig
src/conky.c
@@ -125,7 +125,7 @@
/* FIXME: apm_getinfo is unused here. maybe it's meant for common.c */
@@ -39,17 +44,31 @@ $OpenBSD: patch-src_conky_c,v 1.6 2012/1
OBJ(apm_adapter) {
char *msg;
-@@ -3496,12 +3492,14 @@ static void main_loop(void)
+@@ -3494,14 +3490,27 @@ static void main_loop(void)
+ info.looped = 0;
+ while (terminate == 0 && (total_run_times == 0 || info.looped <
total_run_times)) {
if(update_interval_bat != NOBATTERY && update_interval_bat !=
update_interval_old) {
- char buf[max_user_text];
+- char buf[max_user_text];
+#ifndef __OpenBSD__
++ char buf[max_user_text];
get_battery_short_status(buf, max_user_text, "BAT0");
if(buf[0] == 'D') {
update_interval = update_interval_bat;
} else {
update_interval = update_interval_old;
}
++#else
++ char *apm_status;
++ apm_status = get_apm_adapter();
++ if (apm_status != NULL) {
++if (strcmp(apm_status,"off-line") == 0) {
++update_interval = update_interval_bat;
++ } else {
++update_interval = update_interval_old;
++ }
++ free(apm_status);
++}
+#endif
}
info.looped++;
Re: [UPDATE] sysutils/conky - detect battery properly/update_interval
On Thu, Sep 20, 2018 at 10:42:50AM +0100, Stuart Henderson wrote:
> If you fix the memory leak you introduced I'll commit it :)
Ah. Yes. Here's a new diff. :)
-Tom
Index: Makefile
===
RCS file: /cvs/ports/sysutils/conky/Makefile,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 Makefile
--- Makefile1 Jun 2018 14:24:55 - 1.54
+++ Makefile21 Sep 2018 06:33:32 -
@@ -7,7 +7,7 @@ COMMENT=light-weight system monitor
DISTNAME= conky-1.9.0
CATEGORIES=sysutils
HOMEPAGE= http://conky.sourceforge.net/
-REVISION= 15
+REVISION= 16
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=conky/}
Index: patches/patch-src_conky_c
===
RCS file: /cvs/ports/sysutils/conky/patches/patch-src_conky_c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-src_conky_c
--- patches/patch-src_conky_c 31 Dec 2012 09:36:38 - 1.6
+++ patches/patch-src_conky_c 21 Sep 2018 06:33:32 -
@@ -1,6 +1,11 @@
$OpenBSD: patch-src_conky_c,v 1.6 2012/12/31 09:36:38 chrisz Exp $
src/conky.c.orig Thu May 3 23:22:21 2012
-+++ src/conky.cTue Jul 24 18:10:39 2012
+
+Correctly change update_interval based on whether AC is plugged in
+or on battery for OpenBSD.
+
+Index: src/conky.c
+--- src/conky.c.orig
src/conky.c
@@ -125,7 +125,7 @@
/* FIXME: apm_getinfo is unused here. maybe it's meant for common.c */
@@ -39,17 +44,32 @@ $OpenBSD: patch-src_conky_c,v 1.6 2012/1
OBJ(apm_adapter) {
char *msg;
-@@ -3496,12 +3492,14 @@ static void main_loop(void)
+@@ -3494,14 +3490,28 @@ static void main_loop(void)
+ info.looped = 0;
+ while (terminate == 0 && (total_run_times == 0 || info.looped <
total_run_times)) {
if(update_interval_bat != NOBATTERY && update_interval_bat !=
update_interval_old) {
- char buf[max_user_text];
+- char buf[max_user_text];
+#ifndef __OpenBSD__
++ char buf[max_user_text];
get_battery_short_status(buf, max_user_text, "BAT0");
if(buf[0] == 'D') {
update_interval = update_interval_bat;
} else {
update_interval = update_interval_old;
}
++#else
++ char *apm_status;
++ apm_status = (char *) calloc(16, sizeof(char));
++ if (apm_status != 0) {
++ apm_status = get_apm_adapter();
++if (strcmp(apm_status,"off-line") == 0) {
++update_interval = update_interval_bat;
++ } else {
++update_interval = update_interval_old;
++ }
++ free(apm_status);
++}
+#endif
}
info.looped++;
