UPDATE: mail/p5-Mail-SpamAssassin
Hi,
major update to 4.0.0.
Lot of improvements and new features, more info at
https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_4_0_0/UPGRADE.
Comments ? Ok ?
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile8 Nov 2022 11:14:50 - 1.119
+++ Makefile20 Dec 2022 07:23:44 -
@@ -1,11 +1,10 @@
COMMENT= mailfilter to identify and mark spam
-VER= 3.4.6
+VER= 4.0.0
DISTNAME= Mail-SpamAssassin-${VER}
PKGNAME= p5-${DISTNAME}
-RULESNAME= Mail-SpamAssassin-rules-${VER}.r1888502.tgz
+RULESNAME= Mail-SpamAssassin-rules-${VER}.r1905950.tgz
CATEGORIES=mail perl5
-REVISION= 0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}
EXTRACT_SUFX= .tar.bz2
@@ -24,6 +23,8 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=spa
COMMON_DEPENDS=www/p5-HTML-Parser>=3.31 \
mail/p5-Mail-DKIM>=0.31 \
+ mail/p5-Email-Address-XS \
+ mail/p5-Mail-DMARC \
net/p5-Net-DNS>=0.34 \
net/p5-NetAddr-IP \
security/p5-IO-Socket-SSL
@@ -36,7 +37,7 @@ RUN_DEPENDS= ${COMMON_DEPENDS} \
devel/p5-IO-String \
p5-Mail-SPF-*|p5-Mail-SPF-Query-*:mail/p5-Mail-SPF \
p5-GeoIP2-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-GeoIP2 \
- net/p5-Net-LibIDN \
+ net/p5-Net-LibIDN2 \
net/p5-Net-Patricia \
security/gnupg \
textproc/p5-Encode-Detect \
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
retrieving revision 1.43
diff -u -p -r1.43 distinfo
--- distinfo30 Apr 2021 14:43:48 - 1.43
+++ distinfo20 Dec 2022 07:23:44 -
@@ -1,4 +1,4 @@
-SHA256 (Mail-SpamAssassin-3.4.6.tar.bz2) =
vEh18+S7WXnwwQKDITpRLEyWRiIK4BMqeMjjr5R4lhA=
-SHA256 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) =
se/NxX5rEAc1hV4k7oORsIVzJ9cOHh0sJ1fV9m6KHOY=
-SIZE (Mail-SpamAssassin-3.4.6.tar.bz2) = 6166807
-SIZE (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 369768
+SHA256 (Mail-SpamAssassin-4.0.0.tar.bz2) =
5aoXBQowvHK6qGr9xgSMrepNHsLsxh14dxegWbgxnog=
+SHA256 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) =
rk/7uRfrx/76ckD8W7UVHdpmP45AWRYa18m0Lu0brG0=
+SIZE (Mail-SpamAssassin-4.0.0.tar.bz2) = 6371055
+SIZE (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 355737
Index: patches/patch-Makefile_PL
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL,v
retrieving revision 1.16
diff -u -p -r1.16 patch-Makefile_PL
--- patches/patch-Makefile_PL 11 Mar 2022 19:34:50 - 1.16
+++ patches/patch-Makefile_PL 20 Dec 2022 07:23:44 -
@@ -1,7 +1,7 @@
Index: Makefile.PL
--- Makefile.PL.orig
+++ Makefile.PL
-@@ -857,7 +857,7 @@ sub MY::install {
+@@ -886,7 +886,7 @@ sub MY::install {
foreach (@code) {
# Add our install targets as a dependency to all top-level install targets
Index: patches/patch-t_sa_compile_t
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-t_sa_compile_t,v
retrieving revision 1.5
diff -u -p -r1.5 patch-t_sa_compile_t
--- patches/patch-t_sa_compile_t11 Mar 2022 19:34:50 - 1.5
+++ patches/patch-t_sa_compile_t20 Dec 2022 07:23:44 -
@@ -1,9 +1,9 @@
Index: t/sa_compile.t
--- t/sa_compile.t.orig
+++ t/sa_compile.t
-@@ -12,8 +12,7 @@ use Config;
- use File::Basename;
- use File::Path qw/mkpath/;
+@@ -10,8 +10,7 @@ use SATest; sa_t_init("sa_compile");
+
+ use Config;
-my $temp_binpath = $Config{sitebinexp};
-$temp_binpath =~ s|^\Q$Config{siteprefixexp}\E/||;
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v
retrieving revision 1.41
diff -u -p -r1.41 PLIST
--- pkg/PLIST 8 Nov 2022 11:14:51 - 1.41
+++ pkg/PLIST 20 Dec 2022 07:23:44 -
@@ -21,7 +21,7 @@ ${P5SITE}/Mail/SpamAssassin.pm
${P5SITE}/Mail/SpamAssassin/AICache.pm
${P5SITE}/Mail/SpamAssassin/ArchiveIterator.pm
${P5SITE}/Mail/SpamAssassin/AsyncLoop.pm
-${P5SITE}/Mail/SpamAssassin/AutoWhitelist.pm
+${P5SITE}/Mail/SpamAssassin/AutoWelcomelist.pm
${P5SITE}/Mail/SpamAssassin/Bayes/
${P5SITE}/Mail/SpamAssassin/Bayes.pm
${P5SITE}/Mail/SpamAssassin/Bayes/CombineChi.pm
@@ -45,6 +45,7 @@ ${P5SITE}/Mail/SpamAssassin/Constants.pm
${P5SITE}/Mail/SpamAssassin/DBBasedAddrList.pm
${P5SITE}/Ma
JRuby 9.3.9.0 -> 9.4.0.0
This updates JRuby to the latest release, 9.4.0.0. This is a large
jump over 9.3.9.0, as the version of Ruby being implemented is updated
from 2.6 to 3.1 (skipping 2.7 and 3.0). Release announcement at
https://www.jruby.org/2022/11/23/jruby-9-4-0-0.html
Porting wise, I'm switching the Java version from 1.8 to 17, to take
advantage of the performance improvements. JRuby 9.5 is going to drop
Java 1.8 support.
This fixes the creation of the site_ruby directory to match the version
of Ruby in use. Previously, it created site_ruby directories for
1.8, 1.9, 2.0, which probably dates back to JRuby 1.7.
Tested on amd64, the only supported arch. I plan to commit this in a
few days unless I hear objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile
--- Makefile26 Oct 2022 21:49:34 - 1.105
+++ Makefile19 Dec 2022 21:40:32 -
@@ -3,12 +3,12 @@ ONLY_FOR_ARCHS = amd64
COMMENT = pure-Java implementation of the Ruby language
-V =9.3.9.0
+V =9.4.0.0
DISTNAME = jruby-dist-${V}-bin
PKGNAME = jruby-${V}
CATEGORIES = lang lang/ruby
DISTFILES =${DISTNAME}.tar.gz \
- jffi-1.3.5.tar.gz:0 \
+ jffi-1.3.10.tar.gz:0 \
${JRUBY_LAUNCHER_GEM}:1
HOMEPAGE = http://www.jruby.org/
@@ -23,7 +23,7 @@ MASTER_SITES0 = https://github.com/jnr/j
MASTER_SITES1 =${MASTER_SITE_RUBYGEMS}
MODULES = java
-MODJAVA_VER = 1.8+
+MODJAVA_VER = 17+
MODJAVA_BUILD =ant
USE_GMAKE =Yes
@@ -42,6 +42,7 @@ JFFI_HOME = ${WRKDIST}/jffi
JFFI_ARCH =${MACHINE_ARCH:S/amd64/x86_64/}-OpenBSD
FFI_ARCH = ${JFFI_ARCH:L}
JRUBY_LAUNCHER_GEM = jruby-launcher-1.1.19-java.gem
+JRUBY_RUBY_VERSION = 3.1
SUBST_VARS = JRUBY_HOME JFFI_ARCH FFI_ARCH RAKE_V RDOC_V JAVA_HOME
MODJAVA_BUILD_DIR = ${JFFI_HOME}
@@ -77,13 +78,13 @@ do-install:
ln -s ${TRUEPREFIX}/jruby/bin/jruby ${PREFIX}/bin/jruby
${INSTALL_DATA_DIR} ${JRUBY_HOME}
${INSTALL_DATA_DIR} ${JRUBY_HOME}/bin
- for file in ast bundle bundler gem jgem jirb jirb_swing jruby jrubyc
racc rake rdoc ri; \
+ for file in ast bundle bundler erb irb gem jgem jirb jirb_swing jruby
jrubyc racc rake rdoc ri; \
do ${INSTALL_SCRIPT} ${WRKBUILD}/bin/$$file ${JRUBY_HOME}/bin/$$file;
\
done
${INSTALL_DATA_DIR} ${JRUBY_HOME}/lib
cd ${WRKBUILD}/lib && tar -cf - * | \
tar -C ${JRUBY_HOME}/lib -xf -
- mkdir -p ${JRUBY_HOME}/lib/ruby/{1.8,1.9,2.0}/site_ruby
+ mkdir -p ${JRUBY_HOME}/lib/ruby/${JRUBY_RUBY_VERSION}/site_ruby
find ${JRUBY_HOME}/lib \( -name '*.orig' -o -name '*.beforesubst' \) \
-delete
mv ${JRUBY_HOME}/lib/ruby/gems/{shared,1.8}
Index: distinfo
===
RCS file: /cvs/ports/lang/jruby/distinfo,v
retrieving revision 1.71
diff -u -p -r1.71 distinfo
--- distinfo26 Oct 2022 21:49:34 - 1.71
+++ distinfo19 Dec 2022 21:30:11 -
@@ -1,6 +1,6 @@
-SHA256 (jffi-1.3.5.tar.gz) = 15HSIg5X5jGP9s1jfd64nWu4O9HkJivnhS9tVmnLLrQ=
-SHA256 (jruby-dist-9.3.9.0-bin.tar.gz) =
JR5t2NHS+CkiyMd414V+G++C/lyiz3e8CTVkIdCwWrg=
+SHA256 (jffi-1.3.10.tar.gz) = QZWOTjjcxTOTidj4/JjERqcokJJ5SOiQualLs/ivHsw=
+SHA256 (jruby-dist-9.4.0.0-bin.tar.gz) =
iXu4qYrUOty/X9OqdeyFszEoOMlJWSyj9iPcH1adKHA=
SHA256 (jruby-launcher-1.1.19-java.gem) =
LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo=
-SIZE (jffi-1.3.5.tar.gz) = 3152240
-SIZE (jruby-dist-9.3.9.0-bin.tar.gz) = 28614865
+SIZE (jffi-1.3.10.tar.gz) = 3304571
+SIZE (jruby-dist-9.4.0.0-bin.tar.gz) = 29468004
SIZE (jruby-launcher-1.1.19-java.gem) = 64000
Index: patches/patch-jffi_build_xml
===
RCS file: /cvs/ports/lang/jruby/patches/patch-jffi_build_xml,v
retrieving revision 1.5
diff -u -p -r1.5 patch-jffi_build_xml
--- patches/patch-jffi_build_xml11 Mar 2022 19:29:04 - 1.5
+++ patches/patch-jffi_build_xml19 Dec 2022 21:32:37 -
@@ -3,7 +3,7 @@ Work with Java 10+.
Index: jffi/build.xml
--- jffi/build.xml.orig
+++ jffi/build.xml
-@@ -146,8 +146,9 @@
+@@ -151,8 +151,9 @@
@@ -14,7 +14,7 @@ Index: jffi/build.xml
-@@ -315,27 +316,10 @@
+@@ -320,27 +321,10 @@
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v
retrieving revision 1.62
diff -u -p -r1.62 PLIST
--- pkg/PLIST 26 Oct 2022 21:49:34 - 1.62
+++ pkg/PLIST 19 Dec 2022 23:02:20 -
@@ -4,8 +4,10 @@ jruby/bin/
jruby/bin/ast
jruby/bin/bundle
jruby/bin/bundler
+jruby/bin/erb
jruby/bin/gem
jruby/bin/jgem
+jruby/bin/irb
jruby/bin/jirb
jruby/bin/jirb_swing
@bin jruby/bin/jruby
@@ -20,443 +22,587 @@ jruby/lib/jni/${J
Re: UPDATE: games/choria
On Monday, December 19, 2022 15:13 CET, Stuart Henderson
wrote:
> You can add tars to a github repo and fetch from there, see mail/greyscanner
>
thanks for that pointer.
> But first check to see if upstream have made a tar release which includes
> all the necessary files. Did you try the src-tar.gz link under Other at
> https://gitlab.com/choria/code/-/releases ?
>
indeed the src-tar.gz contains the two submodules, hadn't noticed it before.
Updated version with less patches below and attached.
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/games/choria/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile28 May 2022 06:19:59 - 1.14
+++ Makefile19 Dec 2022 21:42:44 -
@@ -1,38 +1,52 @@
-BROKEN-mips64el = Bus error on startup, no core file left
-
-V =0.4.1
-REVISION = 5
COMMENT = 2D MMORPG focused on grinding
-DISTNAME = choria-${V}-src
+
+V =1.0.1
+COMMIT = d3de66a6
+DISTNAME = choria-${V}-${COMMIT}-src
PKGNAME = choria-${V}
CATEGORIES = games x11
+MAINTAINER = Sebastian Reitenbach
+
+HOMEPAGE = https://choria.gitlab.io/
-HOMEPAGE = https://github.com/jazztickets/choria
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += Irrlicht c m pthread sqlite3 ${COMPILER_LIBCXX}
+WANTLIB += c m pthread SDL2_image sqlite3 ${COMPILER_LIBCXX}
+WANTLIB += GL GLU SDL2 freetype jsoncpp ogg tinyxml2 vorbis vorbisfile
+WANTLIB += z openal ${MODLUA_WANTLIB}
COMPILER = base-clang ports-gcc base-gcc
MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
+MODLUA_VERSION = 5.3
-MASTER_SITES = ${MASTER_SITE_GOOGLECODE:=choria/}
+MASTER_SITES = https://gitlab.com/jazztickets/uploads/-/raw/main/
-MODULES = devel/cmake
+MODULES = devel/cmake lang/lua
-LIB_DEPENDS = x11/irrlicht \
- databases/sqlite3
+BUILD_DEPENDS =graphics/glm \
+ shells/bash
+LIB_DEPENDS = audio/libogg \
+ audio/libvorbis \
+ audio/openal \
+ devel/jsoncpp \
+ devel/sdl2 \
+ devel/sdl2-image \
+ databases/sqlite3 \
+ textproc/tinyxml2
RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
+WRKDIST = ${WRKDIR}/choria-${V}-${COMMIT}
+
post-patch:
perl -pi -e "s,games/,,g" ${WRKSRC}/CMakeLists.txt \
${WRKSRC}/deployment/choria
perl -pi -e "s,games,bin,g" ${WRKSRC}/CMakeLists.txt
- cp ${FILESDIR}/FindSqlite.cmake ${WRKSRC}/
-
+ ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
+
.include
Index: distinfo
===
RCS file: /cvs/ports/games/choria/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo23 Jun 2013 22:38:57 - 1.2
+++ distinfo19 Dec 2022 21:42:44 -
@@ -1,2 +1,2 @@
-SHA256 (choria-0.4.1-src.tar.gz) = bR5WjMrxZ4o76aukAAES0BwqbxMg9ylorWuhcEMHdxM=
-SIZE (choria-0.4.1-src.tar.gz) = 564637
+SHA256 (choria-1.0.1-d3de66a6-src.tar.gz) =
uJw9spEHASB23AsBdv1VibqRNFUGm01u/o1sTs2/GXk=
+SIZE (choria-1.0.1-d3de66a6-src.tar.gz) = 18072921
Index: files/FindSqlite.cmake
===
RCS file: files/FindSqlite.cmake
diff -N files/FindSqlite.cmake
--- files/FindSqlite.cmake 23 Sep 2016 09:16:54 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,50 +0,0 @@
-# - Try to find Sqlite
-# Once done this will define
-#
-# SQLITE_FOUND - system has Sqlite
-# SQLITE_INCLUDE_DIR - the Sqlite include directory
-# SQLITE_LIBRARIES - Link these to use Sqlite
-# SQLITE_DEFINITIONS - Compiler switches required for using Sqlite
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-# Copyright (c) 2008, Gilles Caulier,
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
- # in cache already
- SET(Sqlite_FIND_QUIETLY TRUE)
-endif ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
-
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-if( NOT WIN32 )
- find_package(PkgConfig)
-
- pkg_check_modules(PC_SQLITE QUIET sqlite3)
-
- set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER})
-endif( NOT WIN32 )
-
-find_path(SQLITE_INCLUDE_DIR NAMES sqlite3.h
- PATHS
- ${PC_SQLITE_INCLUDEDIR}
- ${PC_SQLITE_INCLUDE_DIRS}
-)
-
-find_library(SQLITE_LIBRARIES NAMES sqlite3
- PATHS
- ${PC_SQLITE_LIBDIR}
- ${PC_SQLITE_LIBRARY_DIRS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Sqlite DEFAULT_MSG SQLITE_INCLUDE_DIR
SQLITE_LIBRARIES )
-
-# show the SQLITE_INCLUDE_
Re: [maintainer-update] mail/mu 1.8.11 => 1.8.13
On 2022/12/18 19:32:58 +0100, Stefan Hagen wrote: > Hi > > and here is a simple bugfix release for mu: > > Changes (since 1.8.11; there was no 1.8.12 release): > > * Make server buffer invisible > * Fix mu-headers-toggle-setting user feedback > * Improve browse-url-handlers > * Update some tests, avoid compiler warnings > > OK? works for me, ok op@ thanks!
Re: Python access to Berkeley DB
-- Original Message -- From: stu.li...@spacehopper.org To: ports@openbsd.org Cc: m...@openbsd.org Sent: Monday, December 19, 2022 7:53 AM Subject: Re: Python access to Berkeley DB [ moving to ports@, hopefully reply-to will be set correctly if I got the gmane/nntp bits right :) ] You might possibly be able to kludge around it with some LD_PRELOAD, though tkinter is now built against Tcl 8.6 and the db-tcl package is built against Tcl 8.5 and I don't know if extensions are compatible cross-version. Extensions built against 8.5 should load into 8.6 no problem. Stu
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Sat Dec 17 01:28:41 MST 2022 finished at Mon Dec 19 07:24:22 MST 2022 lasted 2D05h55m done with kern.version=OpenBSD 7.2-current (GENERIC.MP) #1931: Fri Dec 16 15:01:10 MST 2022 built packages:11517 Dec 17:3297 Dec 18:3436 Dec 19:4783 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2022-12-17/summary.log build failures: 0 grep: /usr/ports/logs/aarch64/locks/*: No such file or directory find: failures: No such file or directory cp: failures/: No such file or directory recurrent failures new failures +++ ls-failures Mon Dec 19 07:24:33 2022 resolved failures --- ../old/aarch64/last//ls-failuresWed Dec 14 19:47:09 2022 -failures/devel/msp430/gcc.log -failures/devel/riscv-elf/newlib.log -failures/editors/TeXmacs.log -failures/emulators/stella.log -failures/games/stone-soup.log -failures/geo/osm2pgsql.log -failures/graphics/krita-gmic-plugin.log -failures/graphics/openscenegraph.log -failures/lang/php/8.0,embed,-embed.log -failures/lang/verilator.log -failures/math/gnumeric.log -failures/math/kst.log -failures/net/qbittorrent/qbittorrent.log -failures/sysutils/facter.log -failures/x11/kde-applications/katomic.log -failures/x11/kde-applications/kimagemapeditor.log -failures/x11/kde-applications/klickety.log tar: Unable to access aarch64/failures: No such file or directory tar: WARNING! These file names were not selected: aarch64/failures
Re: UPDATE: games/choria
You can add tars to a github repo and fetch from there, see mail/greyscanner
But first check to see if upstream have made a tar release which includes
all the necessary files. Did you try the src-tar.gz link under Other at
https://gitlab.com/choria/code/-/releases ?
--
Sent from a phone, apologies for poor formatting.
On 19 December 2022 13:37:21 "Sebastian Reitenbach"
wrote:
On Thursday, December 15, 2022 21:12 CET, "Sebastian Reitenbach"
wrote:
hi,
recently found games/choria, after playing a big, figured, our version is
ancient ;)
Updated version attached, much more visually appealing, as well as
gameplay, basically everything improved dramatically.
Switches from Irrlicht to SDL.
Due to the fact it uses Git submodules, I'm looking for a place to host the
distfile.
Current distfile can be found here: https://ufile.io/bl316fw8
singleplayer/multiplayer tested and works well on amd64.
comments/concerns/someone willing hosting the distfile, is welcome.
anyone?
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/games/choria/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 28 May 2022 06:19:59 - 1.14
+++ Makefile 15 Dec 2022 19:52:26 -
@@ -1,29 +1,42 @@
-BROKEN-mips64el = Bus error on startup, no core file left
-
-V = 0.4.1
-REVISION = 5
COMMENT = 2D MMORPG focused on grinding
-DISTNAME = choria-${V}-src
+
+V = 1.0.1
+DISTNAME = choria-${V}
PKGNAME = choria-${V}
CATEGORIES = games x11
+MAINTAINER = Sebastian Reitenbach
+
+HOMEPAGE = https://choria.gitlab.io/
-HOMEPAGE = https://github.com/jazztickets/choria
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += Irrlicht c m pthread sqlite3 ${COMPILER_LIBCXX}
+WANTLIB += c m pthread SDL2_image sqlite3 ${COMPILER_LIBCXX}
+WANTLIB += GL GLU SDL2 freetype jsoncpp ogg tinyxml2 vorbis vorbisfile
+WANTLIB += z openal ${MODLUA_WANTLIB}
COMPILER = base-clang ports-gcc base-gcc
MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
+MODLUA_VERSION = 5.3
+
+MASTER_SITES = https://need.a.mirror.due.to.submodules.selfhosting/
+#MASTER_SITES = https://gitlab.com/choria/code/-/archive/v${V}/
-MASTER_SITES = ${MASTER_SITE_GOOGLECODE:=choria/}
-MODULES = devel/cmake
+MODULES = devel/cmake lang/lua
-LIB_DEPENDS = x11/irrlicht \
- databases/sqlite3
+BUILD_DEPENDS = graphics/glm \
+ shells/bash
+LIB_DEPENDS = audio/libogg \
+ audio/libvorbis \
+ audio/openal \
+ devel/jsoncpp \
+ devel/sdl2 \
+ devel/sdl2-image \
+ databases/sqlite3 \
+ textproc/tinyxml2
RUN_DEPENDS = devel/desktop-file-utils
@@ -33,6 +46,7 @@
perl -pi -e "s,games/,,g" ${WRKSRC}/CMakeLists.txt \
${WRKSRC}/deployment/choria
perl -pi -e "s,games,bin,g" ${WRKSRC}/CMakeLists.txt
- cp ${FILESDIR}/FindSqlite.cmake ${WRKSRC}/
+ ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
+
.include
Index: distinfo
===
RCS file: /cvs/ports/games/choria/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 23 Jun 2013 22:38:57 - 1.2
+++ distinfo 15 Dec 2022 19:52:26 -
@@ -1,2 +1,2 @@
-SHA256 (choria-0.4.1-src.tar.gz) =
bR5WjMrxZ4o76aukAAES0BwqbxMg9ylorWuhcEMHdxM=
-SIZE (choria-0.4.1-src.tar.gz) = 564637
+SHA256 (choria-1.0.1.tar.gz) = rmIOUd8xMfRgZylAKaAOoGcaDqRcdepOpQZbkdGn8nc=
+SIZE (choria-1.0.1.tar.gz) = 21269207
Index: files/FindSqlite.cmake
===
RCS file: files/FindSqlite.cmake
diff -N files/FindSqlite.cmake
--- files/FindSqlite.cmake 23 Sep 2016 09:16:54 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,50 +0,0 @@
-# - Try to find Sqlite
-# Once done this will define
-#
-# SQLITE_FOUND - system has Sqlite
-# SQLITE_INCLUDE_DIR - the Sqlite include directory
-# SQLITE_LIBRARIES - Link these to use Sqlite
-# SQLITE_DEFINITIONS - Compiler switches required for using Sqlite
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-# Copyright (c) 2008, Gilles Caulier,
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
- # in cache already
- SET(Sqlite_FIND_QUIETLY TRUE)
-endif ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
-
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-if( NOT WIN32 )
- find_package(PkgConfig)
-
- pkg_check_modules(PC_SQLITE QUIET sqlite3)
-
- set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER})
-endif( NOT WIN32 )
-
-find_path(SQLITE_INCLUDE_DIR NAMES sqlite3.h
- PATHS
- ${PC_SQLITE_INCLUDEDIR}
- ${PC_SQLITE_INCLUDE_DIRS}
-)
-
-find_library(SQLITE_LIBRARIES NAMES sqlite3
- PATHS
- ${PC_SQLITE_LIBDIR}
- ${PC_SQLITE_LIBRARY_DIRS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Sqlite DEFAULT_MSG SQLITE_
Re: UPDATE: games/choria
On Thursday, December 15, 2022 21:12 CET, "Sebastian Reitenbach"
wrote:
> hi,
>
> recently found games/choria, after playing a big, figured, our version is
> ancient ;)
>
> Updated version attached, much more visually appealing, as well as gameplay,
> basically everything improved dramatically.
> Switches from Irrlicht to SDL.
>
> Due to the fact it uses Git submodules, I'm looking for a place to host the
> distfile.
> Current distfile can be found here: https://ufile.io/bl316fw8
>
> singleplayer/multiplayer tested and works well on amd64.
>
> comments/concerns/someone willing hosting the distfile, is welcome.
anyone?
>
> cheers,
> Sebastian
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/choria/Makefile,v
> retrieving revision 1.14
> diff -u -r1.14 Makefile
> --- Makefile 28 May 2022 06:19:59 - 1.14
> +++ Makefile 15 Dec 2022 19:52:26 -
> @@ -1,29 +1,42 @@
> -BROKEN-mips64el =Bus error on startup, no core file left
> -
> -V = 0.4.1
> -REVISION = 5
> COMMENT =2D MMORPG focused on grinding
> -DISTNAME = choria-${V}-src
> +
> +V = 1.0.1
> +DISTNAME = choria-${V}
> PKGNAME =choria-${V}
> CATEGORIES = games x11
> +MAINTAINER = Sebastian Reitenbach
> +
> +HOMEPAGE = https://choria.gitlab.io/
>
> -HOMEPAGE = https://github.com/jazztickets/choria
>
> # GPLv3+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += Irrlicht c m pthread sqlite3 ${COMPILER_LIBCXX}
> +WANTLIB += c m pthread SDL2_image sqlite3 ${COMPILER_LIBCXX}
> +WANTLIB += GL GLU SDL2 freetype jsoncpp ogg tinyxml2 vorbis vorbisfile
> +WANTLIB += z openal ${MODLUA_WANTLIB}
>
> COMPILER = base-clang ports-gcc base-gcc
>
> MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
> +MODLUA_VERSION = 5.3
> +
> +MASTER_SITES = https://need.a.mirror.due.to.submodules.selfhosting/
> +#MASTER_SITES = https://gitlab.com/choria/code/-/archive/v${V}/
>
> -MASTER_SITES = ${MASTER_SITE_GOOGLECODE:=choria/}
>
> -MODULES =devel/cmake
> +MODULES =devel/cmake lang/lua
>
> -LIB_DEPENDS =x11/irrlicht \
> - databases/sqlite3
> +BUILD_DEPENDS = graphics/glm \
> + shells/bash
> +LIB_DEPENDS =audio/libogg \
> + audio/libvorbis \
> + audio/openal \
> + devel/jsoncpp \
> + devel/sdl2 \
> + devel/sdl2-image \
> + databases/sqlite3 \
> + textproc/tinyxml2
>
> RUN_DEPENDS =devel/desktop-file-utils
>
> @@ -33,6 +46,7 @@
> perl -pi -e "s,games/,,g" ${WRKSRC}/CMakeLists.txt \
> ${WRKSRC}/deployment/choria
> perl -pi -e "s,games,bin,g" ${WRKSRC}/CMakeLists.txt
> - cp ${FILESDIR}/FindSqlite.cmake ${WRKSRC}/
> + ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
> +
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/choria/distinfo,v
> retrieving revision 1.2
> diff -u -r1.2 distinfo
> --- distinfo 23 Jun 2013 22:38:57 - 1.2
> +++ distinfo 15 Dec 2022 19:52:26 -
> @@ -1,2 +1,2 @@
> -SHA256 (choria-0.4.1-src.tar.gz) =
> bR5WjMrxZ4o76aukAAES0BwqbxMg9ylorWuhcEMHdxM=
> -SIZE (choria-0.4.1-src.tar.gz) = 564637
> +SHA256 (choria-1.0.1.tar.gz) = rmIOUd8xMfRgZylAKaAOoGcaDqRcdepOpQZbkdGn8nc=
> +SIZE (choria-1.0.1.tar.gz) = 21269207
> Index: files/FindSqlite.cmake
> ===
> RCS file: files/FindSqlite.cmake
> diff -N files/FindSqlite.cmake
> --- files/FindSqlite.cmake23 Sep 2016 09:16:54 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,50 +0,0 @@
> -# - Try to find Sqlite
> -# Once done this will define
> -#
> -# SQLITE_FOUND - system has Sqlite
> -# SQLITE_INCLUDE_DIR - the Sqlite include directory
> -# SQLITE_LIBRARIES - Link these to use Sqlite
> -# SQLITE_DEFINITIONS - Compiler switches required for using Sqlite
> -# Redistribution and use is allowed according to the terms of the BSD
> license.
> -# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
> -#
> -
> -
> -# Copyright (c) 2008, Gilles Caulier,
> -#
> -# Redistribution and use is allowed according to the terms of the BSD
> license.
> -# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
> -
> -if ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
> - # in cache already
> - SET(Sqlite_FIND_QUIETLY TRUE)
> -endif ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
> -
> -# use pkg-config to get the directories and then use these values
> -# in the FIND_PATH() and FIND_LIBRARY() calls
> -if( NOT WIN32 )
> - find_package(PkgConfig)
> -
> - pkg_check_modules(PC_SQLITE QUIET sqlite3)
> -
> - set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER})
> -endif( NOT WIN32 )
> -
> -find_path(SQLITE_INCLUDE_DIR NAMES sqlite3.h
> - PATHS
> - ${PC_SQLITE_INCLUDEDIR}
> - ${PC_SQLITE_INC
NEW: OSV-Scanner-1.0.1
Moin, This is a port for OSV-Scanner: https://github.com/google/osv-scanner OK? Comments? Cheers.- -- %gonzalo osv-scanner.tgz Description: Binary data
Re: Python access to Berkeley DB
[ moving to ports@, hopefully reply-to will be set correctly if I got the gmane/nntp bits right :) ] On 2022-12-17, Roger Marsh wrote: > The attempt to get at Berkeley DB, installed from packages, via tkinter fails > with some undefined symbol messages. > > Is there something I have not done which would make this work? > > I tried this because the bsddb3 (Python) package is not supported at Python > 10, and it's replacement, berkeleydb, does not support the Berkeley DB > versions provided as OpenBSD packages. You might possibly be able to kludge around it with some LD_PRELOAD, though tkinter is now built against Tcl 8.6 and the db-tcl package is built against Tcl 8.5 and I don't know if extensions are compatible cross-version. The real answer for direct access to bdb from Python is to provide a newer version of databases/db (probably by adding a v5 subdir for 5.3 i.e. the last pre-AGPL version) and replace py-bsddb3 with a new port for py-berkeleydb using this. There are newer 4.x versions but at least the log format if not the db format is different (I haven't looked in a while) and I have some recollection of db version updates being rather painful, so I feel it would make sense to review other ports using bdb individually to see if they can be updated to 5.x, and let sleeping cats lie for v4. -- Please keep replies on the mailing list.
py-tox update, new port needed
sending since I had it lying around, in case anyone is interested.
a new port (attached) is needed.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-tox/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile19 Dec 2022 11:51:35 - 1.21
+++ Makefile19 Dec 2022 12:26:43 -
@@ -1,10 +1,9 @@
COMMENT = virtualenv-based automation of test activities
-MODPY_EGG_VERSION =3.25.1
+MODPY_EGG_VERSION =4.0.5
DISTNAME = tox-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
-REVISION = 1
HOMEPAGE = https://tox.readthedocs.io/en/latest/
@@ -15,20 +14,33 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_PYTEST = Yes
-MODPY_PYBUILD =setuptools_scm
+MODPY_PYBUILD =hatch-vcs
-RUN_DEPENDS = devel/py-py${MODPY_FLAVOR} \
+RUN_DEPENDS = devel/py-cachetools${MODPY_FLAVOR} \
+ textproc/py-chardet${MODPY_FLAVOR} \
+ devel/py-colorama${MODPY_FLAVOR} \
+ sysutils/py-packaging${MODPY_FLAVOR} \
+ sysutils/py-platformdirs${MODPY_FLAVOR} \
devel/py-pluggy${MODPY_FLAVOR} \
- devel/py-six${MODPY_FLAVOR} \
+ devel/py-pyproject-api${MODPY_FLAVOR} \
+ textproc/py-tomli${MODPY_FLAVOR} \
devel/py-virtualenv${MODPY_FLAVOR} \
textproc/py-toml${MODPY_FLAVOR} \
sysutils/py-filelock${MODPY_FLAVOR} \
- sysutils/py-packaging${MODPY_FLAVOR}
-TEST_DEPENDS = devel/py-flaky${MODPY_FLAVOR} \
- devel/py-freezegun${MODPY_FLAVOR} \
- devel/py-test-cov${MODPY_FLAVOR} \
- devel/py-test-mock${MODPY_FLAVOR} \
- sysutils/py-psutil${MODPY_FLAVOR}
+ devel/py-importlib-metadata${MODPY_FLAVOR} \
+ devel/py-typing-extensions${MODPY_FLAVOR}
+# additional deps needed, at least devpi-process seems fairly necessary
+# (which needs a couple of other ports). also asks for covdefault,
+# diff-cover, re-assert, time-machine but some/all of those are likely
+# optional.
+NO_TEST = Yes
+#MODPY_PYTEST_ARGS = tests
+#TEST_DEPENDS =sysutils/py-distlib${MODPY_FLAVOR} \
+# devel/py-flaky${MODPY_FLAVOR} \
+# sysutils/py-psutil${MODPY_FLAVOR} \
+# devel/py-test-cov${MODPY_FLAVOR} \
+# devel/py-test-mock${MODPY_FLAVOR} \
+# devel/py-test-xdist${MODPY_FLAVOR}
FLAVORS = python3
FLAVOR = python3
Index: distinfo
===
RCS file: /cvs/ports/devel/py-tox/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo18 Aug 2022 19:34:22 - 1.5
+++ distinfo19 Dec 2022 12:26:43 -
@@ -1,2 +1,2 @@
-SHA256 (tox-3.25.1.tar.gz) = wTgyeBX1O8baT+VrrsXyXwBiKuae8/5OHjhXIOIkhvk=
-SIZE (tox-3.25.1.tar.gz) = 318457
+SHA256 (tox-4.0.5.tar.gz) = EaL14YrHa1RPcAb2lZgh7Dm/4k5Cy/mQ/A4hLBoH0JI=
+SIZE (tox-4.0.5.tar.gz) = 151968
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-tox/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 18 Aug 2022 19:34:22 - 1.5
+++ pkg/PLIST 19 Dec 2022 12:26:43 -
@@ -1,15 +1,14 @@
@conflict py-tox-<2.6.0p2
@pkgpath devel/py-tox
bin/tox
-bin/tox-quickstart
lib/python${MODPY_VERSION}/site-packages/tox/
lib/python${MODPY_VERSION}/site-packages/tox-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/tox-${MODPY_EGG_VERSION}.dist-info/LICENSE
lib/python${MODPY_VERSION}/site-packages/tox-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/tox-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/tox-${MODPY_EGG_VERSION}.dist-info/WHEEL
lib/python${MODPY_VERSION}/site-packages/tox-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/tox-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/tox-${MODPY_EGG_VERSION}.dist-info/licenses/
+lib/python${MODPY_VERSION}/site-packages/tox-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE
lib/python${MODPY_VERSION}/site-packages/tox/__init__.py
lib/python${MODPY_VERSION}/site-packages/tox/__main__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tox/${MODPY_PYCACHE}/
@@ -17,181 +16,342 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tox/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/tox/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/tox/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/tox/${MODPY_PYCACHE}_pytestplugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/py
