CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/11/19 00:43:56 Modified files: mail/mozilla-thunderbird: Tag: OPENBSD_7_0 Makefile distinfo Log message: mail/mozilla-thunderbird: MFC update to 91.3.2. See https://www.thunderbird.net/en-US/thunderbird/91.3.2/releasenotes/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2021/11/19 00:39:40 Modified files: geo/py-proj: Makefile distinfo Log message: Update to py-proj-3.3.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/11/19 00:39:17 Modified files: mail/mozilla-thunderbird: Makefile distinfo mail/thunderbird-i18n: Makefile.inc distinfo Log message: mail/mozilla-thunderbird: update to 91.3.2. See https://www.thunderbird.net/en-US/thunderbird/91.3.2/releasenotes/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/11/19 00:38:06 Modified files: www/mozilla-firefox: Tag: OPENBSD_7_0 Makefile distinfo Log message: www/mozilla-firefox: MFC update to 94.0.2. See https://www.mozilla.org/en-US/firefox/94.0.2/releasenotes/
Re: [NEW] devel/py-ordered-set
ping. sthen@ already gave an OK, anyone else wants to have a look? Reattached are both ports for convenience. Thanks for your time. November 14, 2021 8:56 PM, "Stuart Henderson" wrote: > 2022 1637 [ *] 1149 [NEW] devel/py-ordered-set Clemens Gößnitzer > 2022 1639 [ *] 1150 [NEW] print/py-pylatex Clemens Gößnitzer > > These two are OK sthen@ to import py-ordered-set.tgz Description: GNU Zip compressed data py-pylatex.tgz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/11/19 00:36:24 Modified files: www/mozilla-firefox: Makefile distinfo www/firefox-i18n: Makefile.inc distinfo Log message: www/mozilla-firefox: update to 94.0.2. See https://www.mozilla.org/en-US/firefox/94.0.2/releasenotes/ note that 94.0.1 was skipped for being macos-bugfix only
[maintainer update] pekwm-0.2.0
Hi,
Another attempt at updating pekwm.
I noticed the pekwm_theme script picked up wrong copies of sed and awk
commands so pass in configure flags to fix them. The script could be
patched so that can use 'ftp' for fetching themes.
Timo
diff 922bc0dd1b90e02f44c8c00183cad19f3c566aa5 /usr/ports
blob - 13d0876d3be258fe7eae3b4b84e55bd6be3fc822
file + x11/pekwm/Makefile
--- x11/pekwm/Makefile
+++ x11/pekwm/Makefile
@@ -3,7 +3,7 @@
COMMENT= aewm++ based pretty themable window manager
DISTNAME= pekwm-${V}
-V= 0.1.18
+V= 0.2.0
CATEGORIES=x11
HOMEPAGE= https://www.pekwm.se/
@@ -14,27 +14,24 @@ MAINTAINER= Timo Myyra
PERMIT_PACKAGE=Yes
# uses pledge()
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv jpeg m png z
+WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
WANTLIB += ${COMPILER_LIBCXX}
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES= https://github.com/pekdon/pekwm/releases/download/release-${V}/
-LIB_DEPENDS= converters/libiconv \
- graphics/jpeg \
+LIB_DEPENDS= graphics/jpeg \
graphics/png
NO_TEST= Yes
-USE_GMAKE= Yes
+MODULES= devel/cmake
-CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=--enable-xinerama
+CONFIGURE_ARGS=-DCMAKE_INSTALL_SYSCONFDIR=${SYSCONFDIR} \
+ -DAWK=/usr/bin/awk \
+ -DSED=/usr/bin/sed \
+ -DSH=/bin/sh
-AUTOCONF_VERSION= 2.69
-
post-install:
@mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples
blob - 0387b2ddf3443fceafb537b1f05c0cd580d24bf5
file + x11/pekwm/distinfo
--- x11/pekwm/distinfo
+++ x11/pekwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.1.18.tar.gz) = e+zEO3nqsP91RXKFLjhUNSIkIDhRB8iBqTrE3ErpYGU=
-SIZE (pekwm-0.1.18.tar.gz) = 531611
+SHA256 (pekwm-0.2.0.tar.gz) = KFZVUN29JPsrdi8eA+CopGaEPcl6gxBlAYoFHnJAZR4=
+SIZE (pekwm-0.2.0.tar.gz) = 938147
blob - /dev/null
file + x11/pekwm/patches/patch-CMakeLists_txt
--- /dev/null
+++ x11/pekwm/patches/patch-CMakeLists_txt
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -65,6 +65,7 @@ int main() { std::stof(\"42.0\"); }
+ set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
+
+ # Look for platform specific methods
++check_function_exists(pledge PEKWM_HAVE_PLEDGE)
+ check_function_exists(setenv PEKWM_HAVE_SETENV)
+ check_function_exists(unsetenv PEKWM_HAVE_UNSETENV)
+ check_function_exists(daemon PEKWM_HAVE_DAEMON)
blob - 3c0effc1f264b5ebebe13e7699519889cb32d7b4
file + /dev/null
--- x11/pekwm/patches/patch-configure_ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: configure.ac
configure.ac.orig
-+++ configure.ac
-@@ -32,6 +32,9 @@ CXXFLAGS="$CXXFLAGS $INCICONV"
- dnl Check for iconvctl
- AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you
the iconvctl call])], )
-
-+dnl Check for pledge
-+AC_CHECK_FUNC(pledge, [AC_DEFINE(HAVE_PLEDGE, [1], [Define to 1 if you the
pledge call])], )
-+
- dnl add x11 to the env
- AC_PATH_X
- AC_PATH_XTRA
blob - 981137eb0312d193c741474d6fad409ed1b7aaaf
file + /dev/null
--- x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-data_scripts_pekwm_screenshot_sh,v 1.2 2021/08/26 04:23:03
semarie Exp $
-
-Fix getopt: unknown option -- n
-
-Index: data/scripts/pekwm_screenshot.sh
data/scripts/pekwm_screenshot.sh.orig
-+++ data/scripts/pekwm_screenshot.sh
-@@ -151,6 +151,6 @@ main()
- exit 0
- }
-
--OPTIONS=$(getopt -o c:d:ho: -n 'pekwm_screenshot.sh' -- "$@")
-+OPTIONS=$(getopt c:d:ho: $*)
- main
-
blob - /dev/null
file + x11/pekwm/patches/patch-doc_CMakeLists_txt
--- /dev/null
+++ x11/pekwm/patches/patch-doc_CMakeLists_txt
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
doc/CMakeLists.txt
+@@ -13,4 +13,4 @@ endif (ENABLE_IMAGE_PNG AND PNG_FOUND)
+
+ install(FILES
+ ${manpages}
+- DESTINATION share/man/man1)
++ DESTINATION man/man1)
blob - e86f273afc1f6e892ee2d8ef874b51c3a8c4e0be
file + /dev/null
--- x11/pekwm/patches/patch-src_main_cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_main_cc,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: src/main.cc
src/main.cc.orig
-+++ src/main.cc
-@@ -127,6 +127,12 @@ main(int argc, char **argv)
- #endif // DEBUG
-
- WindowManager *wm = WindowManager::start(config_file, replace);
-+#if HAVE_PLEDGE
-+if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) {
-+cerr << "failed to pledge" << endl;
-+return 1;
-+}
-+#endif
-
- if (wm) {
- try {
blob - /dev/null
file + x11/pekwm/patches/patch-src_pekwm_wm_cc
--- /dev/null
+++ x11/pekwm/patches/patch-src_pekwm_wm_cc
@@ -0,0 +1,29 @@
+$OpenBSD$
+
[update] py-progress-1.6
Hi,
Here's an update diff to update py-progress. Py-progress was originally
added to ports as dependency of multimedia/yle-dl but it no longer
uses py-progress. Py-progress is not used by any other port so it could
be safely removed or updated. Which would be preferable?
timo
diff 922bc0dd1b90e02f44c8c00183cad19f3c566aa5 /usr/ports
blob - 3d8420404f366a4f0c2bb262f5bb3d6299e8281a
file + devel/py-progress/Makefile
--- devel/py-progress/Makefile
+++ devel/py-progress/Makefile
@@ -2,11 +2,10 @@
COMMENT = easy to use progressbar library for python
-MODPY_EGG_VERSION =1.5
+MODPY_EGG_VERSION =1.6
DISTNAME = progress-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
-REVISION = 2
HOMEPAGE = https://github.com/verigak/progress/
blob - ee77193cb2216c9898e94f54b754e5969d693774
file + devel/py-progress/distinfo
--- devel/py-progress/distinfo
+++ devel/py-progress/distinfo
@@ -1,2 +1,2 @@
-SHA256 (progress-1.5.tar.gz) = aezt0dG75xv2MT2I0ebE0pV7fx1PcTEsIRJX99rmQ3I=
-SIZE (progress-1.5.tar.gz) = 5842
+SHA256 (progress-1.6.tar.gz) = ychumLXAP6H+EeO2fB/tpHiLjQ/nM2wv99VkTM+6NM0=
+SIZE (progress-1.6.tar.gz) = 7842
blob - 3ee2faf0edfd6653adf245d17e08ab3701b1ad03
file + devel/py-progress/pkg/PLIST
--- devel/py-progress/pkg/PLIST
+++ devel/py-progress/pkg/PLIST
@@ -9,9 +9,11 @@ lib/python${MODPY_VERSION}/site-packages/progress-${MO
lib/python${MODPY_VERSION}/site-packages/progress/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/progress/bar.py
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}bar.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/progress/counter.py
+lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}colors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}counter.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/progress/spinner.py
lib/python${MODPY_VERSION}/site-packages/progress/${MODPY_PYCACHE}spinner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/progress/bar.py
+lib/python${MODPY_VERSION}/site-packages/progress/colors.py
+lib/python${MODPY_VERSION}/site-packages/progress/counter.py
+lib/python${MODPY_VERSION}/site-packages/progress/spinner.py
Re: OpenBSD wrapper for Linux/FreeBSD sendfile?
On Thu, 18 Nov 2021 18:04:26 -0800 Steve Williams wrote: > Hi, > > I'm trying to compile a Linux/FreeBSD application (zoneminder) under > OpenBSD 7.0. > > I'm slowly working through it but have gotten stuck at the point where > it has a dependency on sendfile(2) which OpenBSD doesn't have. > > Doing some research, I found one reference that sosplice(2) might be > able to be used in place of sendfile. Elsewhere, I have found reference > to a "simple-sendfile" package, but that doesn't seem to exist. Linux sendfile(2) and FreeBSD sendfile(2) are different functions. simple_sendfile() is a function in lang/ruby that wraps FreeBSD's sendfile to act like Linux's. simple_sendfile() is not for OpenBSD. Linux: https://man7.org/linux/man-pages/man2/sendfile.2.html FreeBSD: https://www.freebsd.org/cgi/man.cgi?query=sendfile simple_sendfile: https://github.com/ruby/ruby/blob/0db68f023372b634603c74fca94588b457be084c/io.c#L11320 OpenBSD's SO_SPLICE can only "splice together two TCP or UDP sockets", says setsockopt(2). You can't SO_SPLICE if your code copies a regular file to a socket. > Is this an issue people have already resolved with other ports? Or is > it a deal breaker? > > I guess the devil is in the details, but I thought I'd reach out here > first in case there's already a good solution to this. Check what your code does if sendfile fails. If it falls back to a read/write loop, then you might patch it to skip sendfile. If it doesn't have a read/write loop, then you might need to add one. --George > > Thanks, > Steve Williams >
Re: OpenBSD wrapper for Linux/FreeBSD sendfile?
Hi, Steve Williams wrote on Thu, Nov 18, 2021 at 06:04:26PM -0800: > I'm trying to compile a Linux/FreeBSD application (zoneminder) under > OpenBSD 7.0. > > I'm slowly working through it but have gotten stuck at the point where > it has a dependency on sendfile(2) which OpenBSD doesn't have. Judging from the Linux manual page https://man.bsd.lv/Linux-5.13/sendfile you should be able to trivially implement a replacement function for sendfile(2) using lseek(2), read(2), and write(2). Of course, that will be slower than doing the copying inside the kernel as sendfile(2) does. But it should get you going in order to make the program run at all. Try that unless somebody else has a better idea. > Doing some research, I found one reference that sosplice(2) might be > able to be used in place of sendfile. A system call soplice(2) does not exist. The sosplice(9) manual page describes kernel internals, so to implement sendfile(2) based on sosplice(9), you would have to do some real kernel hacking. Given the questions you are asking, you are clearly not up to that, and even if you were - hacking up the kernel just to port some software is usually not the best idea. Yours, Ingo
OpenBSD wrapper for Linux/FreeBSD sendfile?
Hi, I'm trying to compile a Linux/FreeBSD application (zoneminder) under OpenBSD 7.0. I'm slowly working through it but have gotten stuck at the point where it has a dependency on sendfile(2) which OpenBSD doesn't have. Doing some research, I found one reference that sosplice(2) might be able to be used in place of sendfile. Elsewhere, I have found reference to a "simple-sendfile" package, but that doesn't seem to exist. Is this an issue people have already resolved with other ports? Or is it a deal breaker? I guess the devil is in the details, but I thought I'd reach out here first in case there's already a good solution to this. Thanks, Steve Williams
回复：Failed to install Python 3.8 through ports
No, I don't have that symbolic link. My mk.conf is as follows: WRKOBJDIR=/home/song/ports DISTDIR=/home/song/distfiles PACKAGE_ REPOSITORY=/usr/packages #FETCH_ PACKAGES= My ports tree is in : /usr/ports Is there a problem with this setting? -- 发件人：Stuart Henderson 发送时间：2021年11月18日(星期四) 17:56 收件人：songzongquan 抄 送：kmos ; ports 主 题：Re: Failed to install Python 3.8 through ports On 2021/11/18 11:38, songzongquan wrote: > 3、My problem: > After I execute make install under / usr / ports / Lang / Python / 3.8, the > following error message appears in a certain link. Please help me solve this > problem or provide > .. > Create /usr/packages/mips64el/all/python-3.8.12.tgz > Creating package python-3.8.12 > checksumming|| 7% > Error: > /home/song/ports/Python-3.8.12/fake-mips64el/usr/local/lib/libpython3.8.so.0.0 > does not exist It looks like you have a symlink from /usr/ports -> /home/song/ports - that doesn't work properly. Set PORTSDIR=/home/song/ports in /etc/mk.conf instead.
Re: [PATCH] update www/unit to 1.26.0
On Thu, Nov 18, 2021 at 11:28:27PM +, Sergey A. Osokin wrote: > > > What do you think Sergey, does this arrangement work for you? > > It looks fantastic and works well to me! Official documentation on the https://unit.nginx.org/ has been updated recently, it contains OpenBSD staff now, please visit https://unit.nginx.org/installation/#community-openbsd Please let me know if you any updates/concerns on that. Thank you! -- Sergey Osokin signature.asc Description: PGP signature
Re: sogo/gnustep mysteriously adds XML-encoded UTF-8 BOM
On Thu, Oct 28, 2021 at 01:41:24PM +0200, Landry Breuil wrote:
> Le Thu, Oct 28, 2021 at 01:18:33PM +0200, Marcus MERIGHI a écrit :
> > Hello!
> >
> > This is just a heads-up for fellow SOGo users and a plea to
> > @landry: would you mind sharing your new gnustep/sogo packages?
> >
> > After upgrading to OpenBSD 7.0 with the updates to:
> >
> > -sogo-5.0.1p0web based groupware server
> > +sogo-5.2.0 web based groupware server
> > -gnustep-base-1.27.0p0 GNUstep base library
> > +gnustep-base-1.28.0p1 GNUstep base library
> >
> > I experience a symptom of "you can create events but you cannot change
> > them". Clients are DAVx5 for android and caldavsynchronizer for
> > Outlook/Windows10. DAV access with e.g. cadaver(1) works.
> >
> > While chasing the cause I soon found I'm not the first to do so, thank
> > you, landry@, for beeing quicker:
> >
> > SOGo bug report by landry@
> > https://www.sogo.nu/bugs/view.php?id=5416
> >
> > Gnustep bug report by landry@
> > https://github.com/gnustep/libs-base/issues/212
> >
> > The commit landry@ reverted to get www/sogo to a working state:
> > https://github.com/gnustep/libs-base/commit/bd5f2909e6edc8012a0a6e44ea1402dfbe1353a4
>
> I havent tested access with DAVx5 or anything else, only from
> thunderbird/lightning. But if it's the same bug and reverting the commit
> fixes it for you too, please add your voice to the sogo/gnustep bug
> reports..
>
your diff/package works with DAVx5 clients as well, thanks.
unfortunately I have no idea if this is the correct fix or just a
workaround.
Giovanni
> I use the attached diff on 7.0-stable, there's an (unsigned) package at
> https://packages.rhaalovely.net/7.0/amd64/
>
> Landry
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/gnustep/base/Makefile,v
> retrieving revision 1.81
> diff -u -r1.81 Makefile
> --- Makefile 3 Sep 2021 11:47:42 - 1.81
> +++ Makefile 26 Oct 2021 14:50:55 -
> @@ -3,7 +3,7 @@
> COMMENT= GNUstep base library
>
> DISTNAME=gnustep-base-1.28.0
> -REVISION=1
> +REVISION=2
>
> SHARED_LIBS= gnustep-base 10.4
> CATEGORIES= devel
> Index: patches/patch-Headers_Foundation_NSString_h
> ===
> RCS file: patches/patch-Headers_Foundation_NSString_h
> diff -N patches/patch-Headers_Foundation_NSString_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Headers_Foundation_NSString_h 26 Oct 2021 14:50:55
> -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +Revert
> https://github.com/gnustep/libs-base/commit/bd5f2909e6edc8012a0a6e44ea1402dfbe1353a4
> +https://github.com/gnustep/libs-base/issues/212
> +
> +Index: Headers/Foundation/NSString.h
> +--- Headers/Foundation/NSString.h.orig
> Headers/Foundation/NSString.h
> +@@ -482,10 +482,6 @@ GS_EXPORT_CLASS
> + // Working With Encodings
> + - (BOOL) canBeConvertedToEncoding: (NSStringEncoding)encoding;
> + - (NSData*) dataUsingEncoding: (NSStringEncoding)encoding;
> +-/** Conversion to an encoding where byte order matters but is not specified
> +- * (NSUnicodeStringEncoding, NSUTF16StringEncoding, NSUTF32StringEncoding)
> +- * produces data with a Byte Order Marker (BOM) at the start of the data.
> +- */
> + - (NSData*) dataUsingEncoding: (NSStringEncoding)encoding
> + allowLossyConversion: (BOOL)flag;
> + + (NSStringEncoding) defaultCStringEncoding;
> Index: patches/patch-Source_GSString_m
> ===
> RCS file: patches/patch-Source_GSString_m
> diff -N patches/patch-Source_GSString_m
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Source_GSString_m 26 Oct 2021 14:50:55 -
> @@ -0,0 +1,196 @@
> +$OpenBSD$
> +
> +Revert
> https://github.com/gnustep/libs-base/commit/bd5f2909e6edc8012a0a6e44ea1402dfbe1353a4
> +https://github.com/gnustep/libs-base/issues/212
> +
> +Index: Source/GSString.m
> +--- Source/GSString.m.orig
> Source/GSString.m
> +@@ -2379,6 +2379,133 @@ cStringLength_u(GSStr self, NSStringEncoding enc)
> + }
> + }
> +
> ++static inline NSData*
> ++dataUsingEncoding_c(GSStr self, NSStringEncoding encoding, BOOL lossy)
> ++{
> ++ unsigned len = self->_count;
> ++
> ++ if (len == 0)
> ++{
> ++ return [NSDataClass data];
> ++}
> ++
> ++ if ((encoding == internalEncoding)
> ++|| ((internalEncoding == NSASCIIStringEncoding)
> ++ && (encoding == NSUTF8StringEncoding || isByteEncoding(encoding
> ++{
> ++ unsigned char *buff;
> ++
> ++ buff = (unsigned char*)NSZoneMalloc(NSDefaultMallocZone(), len);
> ++ memcpy(buff, self->_contents.c, len);
> ++ return [NSDataClass dataWithBytesNoCopy: buff length: len];
> ++}
> ++ else if (encoding == NSUnicodeStringEncoding)
> ++{
> ++ unsigned int l = 0;
> ++ unichar *r = 0;
> ++ unsigned int options = GSUniBOM;
> ++
> ++ if
Re: [PATCH] update www/unit to 1.26.0
Hi Stuart, thanks very much for the update. On Thu, Nov 18, 2021 at 09:59:43PM +, Stuart Henderson wrote: > On 2021/11/18 21:54, Stuart Henderson wrote: > > On 2021/11/18 19:45, Stuart Henderson wrote: > > > I have PHP working but need to do a bit of reorganisation to handle > > > building multiple versions, I'll mail you later > > > > I've attached this as a tar.gz. (I think this will be easier to read > > than a diff due to the reorganised directory layout). > > > > What do you think Sergey, does this arrangement work for you? It looks fantastic and works well to me! > > I've loosely based some of the changes on what's in FreeBSD ports but > > we don't have the "master port" concept and use multi-level > > directories to similar effect. > > > > Setup for tests is a little messier now that the modules are built in > > separate ports, but it works and I think it's good enough. (We plan to > > update pytest but need to deal with remaining Python 2.x ports using it > > first - I am testing with a locally updated pytest and related ports). That sounds also great to me! > Now with attachment :) -- Sergey Osokin signature.asc Description: PGP signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/18 15:41:05 Modified files: lang/ruby/2.7 : Makefile Removed files: lang/ruby/2.7/patches: patch-ext_openssl_ossl_ssl_c Log message: ruby/2.7: remove unnecessary TLS1_3_VERSION patch. ok jeremy (maintainer)
Re: games/godot: install manpage and desktop file
Antoine Jacoutot writes:
> [...]
>> pre-configure:
>> ${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp
>> +${SUBST_CMD} ${WRKSRC}/misc/dist/linux/*.desktop
>
> I assume you don't need that anymore.
...right! Thanks!
(and after this I need to get some sleep ^^")
Index: Makefile
===
RCS file: /home/cvs/ports/games/godot/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile10 Nov 2021 13:20:17 - 1.29
+++ Makefile18 Nov 2021 21:52:23 -
@@ -8,6 +8,7 @@ V = 3.4
GODOTSTEAM_V = g333-s151-g397
DISTNAME = godot-${V}-stable
PKGNAME = godot-${V}
+REVISION = 0
CATEGORIES = games
HOMEPAGE = https://godotengine.org/
MAINTAINER = Omar Polo
@@ -82,6 +83,7 @@ LIB_DEPENDS = archivers/zstd \
multimedia/libvpx \
net/enet \
security/polarssl
+RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
@@ -107,5 +109,17 @@ pre-configure:
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \
${PREFIX}/bin/godot
+ ${INSTALL_MAN_DIR} ${PREFIX}/man/man6
+ ${INSTALL_MAN} ${WRKSRC}/misc/dist/linux/godot.6 \
+ ${PREFIX}/man/man6
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/icon.svg \
+ ${PREFIX}/share/pixmaps/godot.svg
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.desktop \
+ ${PREFIX}/share/applications
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/metainfo
+ ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.appdata.xml \
+ ${PREFIX}/share/metainfo/
.include
Index: patches/patch-misc_dist_linux_godot_6
===
RCS file: patches/patch-misc_dist_linux_godot_6
diff -N patches/patch-misc_dist_linux_godot_6
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-misc_dist_linux_godot_6 18 Nov 2021 11:37:59 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: misc/dist/linux/godot.6
+--- misc/dist/linux/godot.6.orig
misc/dist/linux/godot.6
+@@ -1,4 +1,4 @@
+-.TH GODOT "6" "January 2020" "godot 3.2" "Games"
++.TH GODOT "6" "January 2020" "Godot" "Games"
+ .SH NAME
+ godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor
+ .SH SYNOPSIS
+@@ -56,7 +56,7 @@ Remote filesystem ([:] address).
+ Password for remote filesystem.
+ .TP
+ \fB\-\-audio\-driver\fR
+-Audio driver ('PulseAudio', 'ALSA', 'Dummy').
++Audio driver ('sndio', 'Dummy').
+ .TP
+ \fB\-\-video\-driver\fR
+ Video driver ('GLES3', 'GLES2').
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/games/godot/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 10 Nov 2021 13:20:17 - 1.2
+++ pkg/PLIST 18 Nov 2021 21:31:19 -
@@ -1,3 +1,10 @@
@comment $OpenBSD: PLIST,v 1.2 2021/11/10 13:20:17 jca Exp $
@bin bin/godot
+@man man/man6/godot.6
+share/applications/org.godotengine.Godot.desktop
share/doc/pkg-readmes/${PKGSTEM}
+share/metainfo/
+share/metainfo/org.godotengine.Godot.appdata.xml
+share/pixmaps/
+share/pixmaps/godot.svg
+@tag update-desktop-database
Re: [PATCH] update www/unit to 1.26.0
On 2021/11/18 21:54, Stuart Henderson wrote: > On 2021/11/18 19:45, Stuart Henderson wrote: > > I have PHP working but need to do a bit of reorganisation to handle > > building multiple versions, I'll mail you later > > I've attached this as a tar.gz. (I think this will be easier to read > than a diff due to the reorganised directory layout). > > What do you think Sergey, does this arrangement work for you? > I've loosely based some of the changes on what's in FreeBSD ports but > we don't have the "master port" concept and use multi-level > directories to similar effect. > > Setup for tests is a little messier now that the modules are built in > separate ports, but it works and I think it's good enough. (We plan to > update pytest but need to deal with remaining Python 2.x ports using it > first - I am testing with a locally updated pytest and related ports). > Now with attachment :) unit.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 14:54:55 Modified files: devel/py-yamllint: Makefile distinfo devel/py-yamllint/pkg: PLIST Log message: update to py3-yamllint-1.26.3, ok rpointel@
Re: [PATCH] update www/unit to 1.26.0
On 2021/11/18 19:45, Stuart Henderson wrote: > I have PHP working but need to do a bit of reorganisation to handle > building multiple versions, I'll mail you later I've attached this as a tar.gz. (I think this will be easier to read than a diff due to the reorganised directory layout). What do you think Sergey, does this arrangement work for you? I've loosely based some of the changes on what's in FreeBSD ports but we don't have the "master port" concept and use multi-level directories to similar effect. Setup for tests is a little messier now that the modules are built in separate ports, but it works and I think it's good enough. (We plan to update pytest but need to deal with remaining Python 2.x ports using it first - I am testing with a locally updated pytest and related ports).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/18 14:53:50 Modified files: devel/py-jedi : Makefile distinfo devel/py-jedi/pkg: PLIST Log message: Update to py3-jedi-0.18.1.
Re: games/godot: install manpage and desktop file
On Thu, Nov 18, 2021 at 10:32:17PM +0100, Omar Polo wrote:
> Antoine Jacoutot writes:
>
> >> Omar Polo writes:
> >>
> >> > Hello,
> >> >
> >> > I'd like to include the desktop file (+ icon) and the manpage in the
> >> > Godot package.
> >> >
> >> > The manpage is some release old and lacks some newer flags, but it's way
> >> > better than `godot --help | less` and the missing options are not
> >> > super-important IMHO. Moreover, it specifies also where godot store its
> >> > files which is nice.
> >> >
> >> > For the curious, these are the flags mentioned in the help message that
> >> > are currently missing in the manpage:
> >> >
> >> > --enable-delta-smoothing When vsync is enabled, enabled frame
> >> > delta smoothing.
> >> > --disable-delta-smoothingDisable frame delta smoothing.
> >> > --tablet-driver Tablet input driver () (Windows only).
> >> >
> >> > Comments/thoughts/OK?
> >> [...]
> >> +-Exec=godot %f
> >> +-Icon=godot
> >> ++Exec=${TRUEPREFIX}/bin/godot %f
> >> ++Icon=${TRUEPREFIX}/bin/godot
> >> + Terminal=false
> >> + PrefersNonDefaultGPU=true
> >> + Type=Application
> >
> > Do we really need to patch this?
> > /usr/local/bin is in the default PATH.
>
> I thought it was considered better to list the full paths, but now I've
> checked and effectively there are various desktop files with just the
> executable name as exec field.
>
> >> +usr/
> >> +usr/share/
> >> +usr/share/pixmaps/
> >> +usr/share/pixmaps/godot.svg
> >
> > That looks wrong.
> > It should install under /usr/local/share/pixmaps,
> > not /usr/local/usr/share/pixmaps
>
> a typo, sorry. I mean ${PREFIX}/share/pixmaps obviously.
>
> Thanks for looking at the diff :)
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/games/godot/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- Makefile 10 Nov 2021 13:20:17 - 1.29
> +++ Makefile 18 Nov 2021 21:26:33 -
> @@ -8,6 +8,7 @@ V = 3.4
> GODOTSTEAM_V = g333-s151-g397
> DISTNAME = godot-${V}-stable
> PKGNAME =godot-${V}
> +REVISION = 0
> CATEGORIES = games
> HOMEPAGE = https://godotengine.org/
> MAINTAINER = Omar Polo
> @@ -82,6 +83,7 @@ LIB_DEPENDS = archivers/zstd \
> multimedia/libvpx \
> net/enet \
> security/polarssl
> +RUN_DEPENDS =devel/desktop-file-utils
>
> NO_TEST =Yes
>
> @@ -97,6 +99,7 @@ post-extract:
>
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp
> + ${SUBST_CMD} ${WRKSRC}/misc/dist/linux/*.desktop
I assume you don't need that anymore.
> sed -E -i 's/ISteamHTMLSurface:://g' \
> ${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam/godotsteam.cpp
> sed -E -i 's/steam\/steam_api\.h/steam_api.h/g' \
> @@ -107,5 +110,17 @@ pre-configure:
> do-install:
> ${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \
> ${PREFIX}/bin/godot
> + ${INSTALL_MAN_DIR} ${PREFIX}/man/man6
> + ${INSTALL_MAN} ${WRKSRC}/misc/dist/linux/godot.6 \
> + ${PREFIX}/man/man6
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
> + ${INSTALL_DATA} ${WRKSRC}/icon.svg \
> + ${PREFIX}/share/pixmaps/godot.svg
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> + ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.desktop \
> + ${PREFIX}/share/applications
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/metainfo
> + ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.appdata.xml \
> + ${PREFIX}/share/metainfo/
>
> .include
> Index: patches/patch-misc_dist_linux_godot_6
> ===
> RCS file: patches/patch-misc_dist_linux_godot_6
> diff -N patches/patch-misc_dist_linux_godot_6
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-misc_dist_linux_godot_6 18 Nov 2021 11:37:59 -
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +Index: misc/dist/linux/godot.6
> +--- misc/dist/linux/godot.6.orig
> misc/dist/linux/godot.6
> +@@ -1,4 +1,4 @@
> +-.TH GODOT "6" "January 2020" "godot 3.2" "Games"
> ++.TH GODOT "6" "January 2020" "Godot" "Games"
> + .SH NAME
> + godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor
> + .SH SYNOPSIS
> +@@ -56,7 +56,7 @@ Remote filesystem ([:] address).
> + Password for remote filesystem.
> + .TP
> + \fB\-\-audio\-driver\fR
> +-Audio driver ('PulseAudio', 'ALSA', 'Dummy').
> ++Audio driver ('sndio', 'Dummy').
> + .TP
> + \fB\-\-video\-driver\fR
> + Video driver ('GLES3', 'GLES2').
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/games/godot/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 10 Nov 2021 13:20:17 - 1.2
> +++ pkg/PLIST 18 Nov 2021 21:31:19
Re: games/godot: install manpage and desktop file
Antoine Jacoutot writes:
>> Omar Polo writes:
>>
>> > Hello,
>> >
>> > I'd like to include the desktop file (+ icon) and the manpage in the
>> > Godot package.
>> >
>> > The manpage is some release old and lacks some newer flags, but it's way
>> > better than `godot --help | less` and the missing options are not
>> > super-important IMHO. Moreover, it specifies also where godot store its
>> > files which is nice.
>> >
>> > For the curious, these are the flags mentioned in the help message that
>> > are currently missing in the manpage:
>> >
>> > --enable-delta-smoothing When vsync is enabled, enabled frame
>> > delta smoothing.
>> > --disable-delta-smoothingDisable frame delta smoothing.
>> > --tablet-driver Tablet input driver () (Windows only).
>> >
>> > Comments/thoughts/OK?
>> [...]
>> +-Exec=godot %f
>> +-Icon=godot
>> ++Exec=${TRUEPREFIX}/bin/godot %f
>> ++Icon=${TRUEPREFIX}/bin/godot
>> + Terminal=false
>> + PrefersNonDefaultGPU=true
>> + Type=Application
>
> Do we really need to patch this?
> /usr/local/bin is in the default PATH.
I thought it was considered better to list the full paths, but now I've
checked and effectively there are various desktop files with just the
executable name as exec field.
>> +usr/
>> +usr/share/
>> +usr/share/pixmaps/
>> +usr/share/pixmaps/godot.svg
>
> That looks wrong.
> It should install under /usr/local/share/pixmaps,
> not /usr/local/usr/share/pixmaps
a typo, sorry. I mean ${PREFIX}/share/pixmaps obviously.
Thanks for looking at the diff :)
Index: Makefile
===
RCS file: /home/cvs/ports/games/godot/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile10 Nov 2021 13:20:17 - 1.29
+++ Makefile18 Nov 2021 21:26:33 -
@@ -8,6 +8,7 @@ V = 3.4
GODOTSTEAM_V = g333-s151-g397
DISTNAME = godot-${V}-stable
PKGNAME = godot-${V}
+REVISION = 0
CATEGORIES = games
HOMEPAGE = https://godotengine.org/
MAINTAINER = Omar Polo
@@ -82,6 +83,7 @@ LIB_DEPENDS = archivers/zstd \
multimedia/libvpx \
net/enet \
security/polarssl
+RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
@@ -97,6 +99,7 @@ post-extract:
pre-configure:
${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp
+ ${SUBST_CMD} ${WRKSRC}/misc/dist/linux/*.desktop
sed -E -i 's/ISteamHTMLSurface:://g' \
${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam/godotsteam.cpp
sed -E -i 's/steam\/steam_api\.h/steam_api.h/g' \
@@ -107,5 +110,17 @@ pre-configure:
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \
${PREFIX}/bin/godot
+ ${INSTALL_MAN_DIR} ${PREFIX}/man/man6
+ ${INSTALL_MAN} ${WRKSRC}/misc/dist/linux/godot.6 \
+ ${PREFIX}/man/man6
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/icon.svg \
+ ${PREFIX}/share/pixmaps/godot.svg
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.desktop \
+ ${PREFIX}/share/applications
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/metainfo
+ ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.appdata.xml \
+ ${PREFIX}/share/metainfo/
.include
Index: patches/patch-misc_dist_linux_godot_6
===
RCS file: patches/patch-misc_dist_linux_godot_6
diff -N patches/patch-misc_dist_linux_godot_6
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-misc_dist_linux_godot_6 18 Nov 2021 11:37:59 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: misc/dist/linux/godot.6
+--- misc/dist/linux/godot.6.orig
misc/dist/linux/godot.6
+@@ -1,4 +1,4 @@
+-.TH GODOT "6" "January 2020" "godot 3.2" "Games"
++.TH GODOT "6" "January 2020" "Godot" "Games"
+ .SH NAME
+ godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor
+ .SH SYNOPSIS
+@@ -56,7 +56,7 @@ Remote filesystem ([:] address).
+ Password for remote filesystem.
+ .TP
+ \fB\-\-audio\-driver\fR
+-Audio driver ('PulseAudio', 'ALSA', 'Dummy').
++Audio driver ('sndio', 'Dummy').
+ .TP
+ \fB\-\-video\-driver\fR
+ Video driver ('GLES3', 'GLES2').
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/games/godot/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 10 Nov 2021 13:20:17 - 1.2
+++ pkg/PLIST 18 Nov 2021 21:31:19 -
@@ -1,3 +1,10 @@
@comment $OpenBSD: PLIST,v 1.2 2021/11/10 13:20:17 jca Exp $
@bin bin/godot
+@man man/man6/godot.6
+share/applications/org.godotengine.Godot.desktop
share/doc/pkg-readmes/${PKGSTEM}
+share/metainfo/
+share/metainfo/org.godotengine.Godot.appdata.xml
+share/pixmaps/
+share/pixmaps/godot.svg
+@tag
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/18 14:36:21 Modified files: mail/cyrus-imapd: Makefile Removed files: mail/cyrus-imapd/patches: patch-imap_tls_c Log message: cyrus-imapd: remove no longer needed patch due to missing definition of SSL_OP_NO_TLSv1_3. discussed with aja
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2021/11/18 14:03:31 Modified files: devel/luarocks : Makefile Log message: add missing BDEP on archivers/zip reported by kmos@, ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/18 13:20:10 Modified files: www/nginx : Makefile Log message: www/nginx: drop definition of TLS1_3_VERSION and SSL_OP_NO_TLSv1_3 from CFLAGS. Since LibreSSL 3.4.1 this gross hack is no longer needed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/18 13:18:08 Modified files: net/haproxy: Makefile Log message: net/haproxy: drop definition of TLS1_3_VERSION and SSL_OP_NO_TLSv1_3 via CFLAGS. Since LibreSSL 3.4.1 this gross hack is no longer needed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/18 13:16:10 Modified files: www/aria2 : Makefile Log message: www/aria2: drop definition of TLS1_3_VERSION in CPPFLAGS. Since LibreSSL 3.4.1 this gross hack is no longer needed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 13:11:35 Modified files: www/unit : Makefile distinfo Log message: update to unit-1.26.0, from maintainer Sergey A. Osokin small tweaks from me, also looked over by op@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 13:08:01 Modified files: sysutils/py-packaging: Makefile Log message: py-packaging doesn't use six any more
Re: [PATCH] update www/unit to 1.26.0
On 2021/11/18 18:15, Sergey A. Osokin wrote: > Hi Omar, > > hope you're doing well. > > On Thu, Nov 18, 2021 at 06:34:08PM +0100, Omar Polo wrote: > > "Sergey A. Osokin" writes: > > > > > here's the maintainer update for www/unit port, could > > > you please review and commit. > > > > I think the REVISION-python should be dropped since we're bumping the > > version. `make port-lib-depends-check` still complains about extra > > WANTLIB for -ruby :/ > > > > Regarding the tests there seem to be slightly more failures. > > > > With the current version: > > > 69 failed, 366 passed, 265 skipped, 144 error in 362.32 seconds > > and after the update: > > > 79 failed, 316 passed, 274 skipped, 273 error in 345.81 seconds > > The NGINX Unit test suite is based on the recent version of pytest > framework, so we'd need to update devel/py-test first. This is how it looks with 6.2.5, : === short test summary info : FAILED test/test_asgi_websockets.py::TestASGIWebsockets::test_asgi_websockets_4_1_1__4_2_5[3.9.8] : FAILED test/test_asgi_websockets.py::TestASGIWebsockets::test_asgi_websockets_5_1__5_20[3.9.8] not sure, some ECONNRESET : FAILED test/test_perl_application.py::TestPerlApplication::test_perl_application_threads[5.32.1] maybe because OpenBSD perl build does not support threads : FAILED test/test_respawn.py::TestRespawn::test_respawn_router - assert 2 == 1 : FAILED test/test_respawn.py::TestRespawn::test_respawn_controller - assert 2 ... not sure : FAILED test/test_tls_sni.py::TestTLSSNI::test_tls_sni_same_alt - subprocess.C... looks like maybe a libressl/openssl difference, it does [ myca_req_extensions ] subjectAltName = @alt_names and wants altnames from the separate config seciton : ERROR test/test_perl_application.py::TestPerlApplication::test_perl_application_threads[5.32.1] : ERROR test/test_return.py::TestReturn::test_return_location - AssertionError:... : ERROR test/test_tls.py::TestTLS::test_tls_certificate_chain - AssertionError:... : === 6 failed, 478 passed, 277 skipped, 3 errors in 343.13s (0:05:43) ===
Re: [PATCH] update www/unit to 1.26.0
On 2021/11/18 17:28, Sergey A. Osokin wrote: > here's the maintainer update for www/unit port, could > you please review and commit. Thanks, I will commit soon with small tweaks. I have PHP working but need to do a bit of reorganisation to handle building multiple versions, I'll mail you later
Re: games/godot: install manpage and desktop file
On Thu, Nov 18, 2021 at 12:56:48PM +0100, Omar Polo wrote:
> I tripped again on LOCALBASE vs TRUEPREFIX... diff updated, sorry for
> the noise.
>
> Omar Polo writes:
>
> > Hello,
> >
> > I'd like to include the desktop file (+ icon) and the manpage in the
> > Godot package.
> >
> > The manpage is some release old and lacks some newer flags, but it's way
> > better than `godot --help | less` and the missing options are not
> > super-important IMHO. Moreover, it specifies also where godot store its
> > files which is nice.
> >
> > For the curious, these are the flags mentioned in the help message that
> > are currently missing in the manpage:
> >
> > --enable-delta-smoothing When vsync is enabled, enabled frame
> > delta smoothing.
> > --disable-delta-smoothingDisable frame delta smoothing.
> > --tablet-driver Tablet input driver () (Windows only).
> >
> > Comments/thoughts/OK?
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/games/godot/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- Makefile 10 Nov 2021 13:20:17 - 1.29
> +++ Makefile 18 Nov 2021 09:53:55 -
> @@ -8,6 +8,7 @@ V = 3.4
> GODOTSTEAM_V = g333-s151-g397
> DISTNAME = godot-${V}-stable
> PKGNAME =godot-${V}
> +REVISION = 0
> CATEGORIES = games
> HOMEPAGE = https://godotengine.org/
> MAINTAINER = Omar Polo
> @@ -82,6 +83,7 @@ LIB_DEPENDS = archivers/zstd \
> multimedia/libvpx \
> net/enet \
> security/polarssl
> +RUN_DEPENDS =devel/desktop-file-utils
>
> NO_TEST =Yes
>
> @@ -97,6 +99,7 @@ post-extract:
>
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp
> + ${SUBST_CMD} ${WRKSRC}/misc/dist/linux/*.desktop
> sed -E -i 's/ISteamHTMLSurface:://g' \
> ${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam/godotsteam.cpp
> sed -E -i 's/steam\/steam_api\.h/steam_api.h/g' \
> @@ -107,5 +110,17 @@ pre-configure:
> do-install:
> ${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \
> ${PREFIX}/bin/godot
> + ${INSTALL_MAN_DIR} ${PREFIX}/man/man6
> + ${INSTALL_MAN} ${WRKSRC}/misc/dist/linux/godot.6 \
> + ${PREFIX}/man/man6
> + ${INSTALL_DATA_DIR} ${PREFIX}/usr/share/pixmaps
> + ${INSTALL_DATA} ${WRKSRC}/icon.svg \
> + ${PREFIX}/usr/share/pixmaps/godot.svg
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> + ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.desktop \
> + ${PREFIX}/share/applications
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/metainfo
> + ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.appdata.xml \
> + ${PREFIX}/share/metainfo/
>
> .include
> Index: patches/patch-misc_dist_linux_godot_6
> ===
> RCS file: patches/patch-misc_dist_linux_godot_6
> diff -N patches/patch-misc_dist_linux_godot_6
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-misc_dist_linux_godot_6 18 Nov 2021 11:37:59 -
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +Index: misc/dist/linux/godot.6
> +--- misc/dist/linux/godot.6.orig
> misc/dist/linux/godot.6
> +@@ -1,4 +1,4 @@
> +-.TH GODOT "6" "January 2020" "godot 3.2" "Games"
> ++.TH GODOT "6" "January 2020" "Godot" "Games"
> + .SH NAME
> + godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor
> + .SH SYNOPSIS
> +@@ -56,7 +56,7 @@ Remote filesystem ([:] address).
> + Password for remote filesystem.
> + .TP
> + \fB\-\-audio\-driver\fR
> +-Audio driver ('PulseAudio', 'ALSA', 'Dummy').
> ++Audio driver ('sndio', 'Dummy').
> + .TP
> + \fB\-\-video\-driver\fR
> + Video driver ('GLES3', 'GLES2').
> Index: patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
> ===
> RCS file: patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
> diff -N patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-misc_dist_linux_org_godotengine_Godot_desktop 18 Nov
> 2021 11:55:31 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Index: misc/dist/linux/org.godotengine.Godot.desktop
> +--- misc/dist/linux/org.godotengine.Godot.desktop.orig
> misc/dist/linux/org.godotengine.Godot.desktop
> +@@ -2,8 +2,8 @@
> + Name=Godot Engine
> + GenericName=Libre game engine
> + Comment=Multi-platform 2D and 3D game engine with a feature-rich editor
> +-Exec=godot %f
> +-Icon=godot
> ++Exec=${TRUEPREFIX}/bin/godot %f
> ++Icon=${TRUEPREFIX}/bin/godot
> + Terminal=false
> + PrefersNonDefaultGPU=true
> + Type=Application
Do we really need to patch this?
/usr/local/bin is in the default PATH.
> Index: pkg/PLIST
>
Re: [PATCH] update www/unit to 1.26.0
Hi Omar,
hope you're doing well.
On Thu, Nov 18, 2021 at 06:34:08PM +0100, Omar Polo wrote:
> "Sergey A. Osokin" writes:
>
> > here's the maintainer update for www/unit port, could
> > you please review and commit.
>
> I think the REVISION-python should be dropped since we're bumping the
> version. `make port-lib-depends-check` still complains about extra
> WANTLIB for -ruby :/
>
> Regarding the tests there seem to be slightly more failures.
>
> With the current version:
> > 69 failed, 366 passed, 265 skipped, 144 error in 362.32 seconds
> and after the update:
> > 79 failed, 316 passed, 274 skipped, 273 error in 345.81 seconds
The NGINX Unit test suite is based on the recent version of pytest
framework, so we'd need to update devel/py-test first.
> but I don't run this so I don't know the real impact of these numbers;
> I've tested only for curiosity and because I spotted the REVISION-python
> in the context of the diff ;)
[...]
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/www/unit/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 2 Nov 2021 00:02:57 - 1.3
> +++ Makefile 18 Nov 2021 17:33:55 -
> @@ -5,9 +5,8 @@ COMMENT-perl= NGINX Unit perl module
> COMMENT-python= NGINX Unit python module
> COMMENT-ruby=NGINX Unit ruby module
>
> -VERSION= 1.25.0
> +VERSION= 1.26.0
> DISTNAME=unit-${VERSION}
> -REVISION-python= 0
>
> PKGNAME-main=${DISTNAME}
> PKGNAME-perl=unit-perl-${VERSION}
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/www/unit/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 23 Oct 2021 16:02:51 - 1.1.1.1
> +++ distinfo 18 Nov 2021 17:33:59 -
> @@ -1,2 +1,2 @@
> -SHA256 (unit-1.25.0.tar.gz) = SrTwWpNN0AYowOBn99DFumK7Veni56Mz+jdkoYC5dl0=
> -SIZE (unit-1.25.0.tar.gz) = 853280
> +SHA256 (unit-1.26.0.tar.gz) = wEpAq4LsDVWFqZl6SEMX2J6VBECJ1y68yu3Shg3r9vw=
> +SIZE (unit-1.26.0.tar.gz) = 865556
Brilliant!
--
Sergey Osokin
>
signature.asc
Description: PGP signature
Re: [PATCH] update www/unit to 1.26.0
"Sergey A. Osokin" writes:
> Hi,
>
> here's the maintainer update for www/unit port, could
> you please review and commit.
>
> Thank you.
I think the REVISION-python should be dropped since we're bumping the
version. `make port-lib-depends-check` still complains about extra
WANTLIB for -ruby :/
Regarding the tests there seem to be slightly more failures.
With the current version:
> 69 failed, 366 passed, 265 skipped, 144 error in 362.32 seconds
and after the update:
> 79 failed, 316 passed, 274 skipped, 273 error in 345.81 seconds
but I don't run this so I don't know the real impact of these numbers;
I've tested only for curiosity and because I spotted the REVISION-python
in the context of the diff ;)
Cheers,
Omar Polo
Index: Makefile
===
RCS file: /home/cvs/ports/www/unit/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile2 Nov 2021 00:02:57 - 1.3
+++ Makefile18 Nov 2021 17:33:55 -
@@ -5,9 +5,8 @@ COMMENT-perl= NGINX Unit perl module
COMMENT-python=NGINX Unit python module
COMMENT-ruby= NGINX Unit ruby module
-VERSION= 1.25.0
+VERSION= 1.26.0
DISTNAME= unit-${VERSION}
-REVISION-python= 0
PKGNAME-main= ${DISTNAME}
PKGNAME-perl= unit-perl-${VERSION}
Index: distinfo
===
RCS file: /home/cvs/ports/www/unit/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo23 Oct 2021 16:02:51 - 1.1.1.1
+++ distinfo18 Nov 2021 17:33:59 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.25.0.tar.gz) = SrTwWpNN0AYowOBn99DFumK7Veni56Mz+jdkoYC5dl0=
-SIZE (unit-1.25.0.tar.gz) = 853280
+SHA256 (unit-1.26.0.tar.gz) = wEpAq4LsDVWFqZl6SEMX2J6VBECJ1y68yu3Shg3r9vw=
+SIZE (unit-1.26.0.tar.gz) = 865556
[PATCH] update www/unit to 1.26.0
Hi,
here's the maintainer update for www/unit port, could
you please review and commit.
Thank you.
--
Sergey Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/unit/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 2 Nov 2021 00:02:57 - 1.3
+++ Makefile 18 Nov 2021 17:25:15 -
@@ -5,7 +5,7 @@ COMMENT-perl= NGINX Unit perl module
COMMENT-python= NGINX Unit python module
COMMENT-ruby= NGINX Unit ruby module
-VERSION= 1.25.0
+VERSION= 1.26.0
DISTNAME= unit-${VERSION}
REVISION-python= 0
Index: distinfo
===
RCS file: /cvs/ports/www/unit/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 23 Oct 2021 16:02:51 - 1.1.1.1
+++ distinfo 18 Nov 2021 17:25:15 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.25.0.tar.gz) = SrTwWpNN0AYowOBn99DFumK7Veni56Mz+jdkoYC5dl0=
-SIZE (unit-1.25.0.tar.gz) = 853280
+SHA256 (unit-1.26.0.tar.gz) = wEpAq4LsDVWFqZl6SEMX2J6VBECJ1y68yu3Shg3r9vw=
+SIZE (unit-1.26.0.tar.gz) = 865556
signature.asc
Description: PGP signature
Update to TimescaleDB 2.5.0
Here is an update to v2.5.0
While at it, enable Timescale License (TSL) features. As Антон Касимов
(kasimov . an at gmail . com) pointed, distributing binaries is not prohibited.
Index: Makefile
===
RCS file: /cvs/ports/databases/timescaledb/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile16 Oct 2021 20:43:41 - 1.9
+++ Makefile18 Nov 2021 16:35:36 -
@@ -4,7 +4,7 @@ COMMENT = database designed to make SQL
GH_ACCOUNT = timescale
GH_PROJECT = timescaledb
-GH_TAGNAME = 2.4.2
+GH_TAGNAME = 2.5.0
CATEGORIES = databases
HOMEPAGE = https://www.timescale.com/
@@ -30,9 +30,5 @@ CONFIGURE_ARGS += -DREGRESS_CHECKS=OFF \
-DCLANG_FORMAT=OFF \
-DSEND_TELEMETRY_DEFAULT=OFF \
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-
-# only build Apache-licensed code, disabling the TsL library which
-# is licensed under its own license, see tsl/LICENSE-TIMESCALE
-CONFIGURE_ARGS += -DAPACHE_ONLY=1
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/timescaledb/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo16 Oct 2021 20:43:41 - 1.8
+++ distinfo18 Nov 2021 16:35:36 -
@@ -1,2 +1,2 @@
-SHA256 (timescaledb-2.4.2.tar.gz) =
sgajdiUSWet0Xu6BnnqFOz+6udyEQzA3FEhKD++JoqQ=
-SIZE (timescaledb-2.4.2.tar.gz) = 2409324
+SHA256 (timescaledb-2.5.0.tar.gz) =
nWf+cKoBzqX+zrCErcAeyooILYR/kX5o4HOrZ+SXr3Y=
+SIZE (timescaledb-2.5.0.tar.gz) = 2737786
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/timescaledb/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 16 Oct 2021 20:43:41 - 1.8
+++ pkg/PLIST 18 Nov 2021 16:35:36 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.8 2021/10/16 20:43:41 denis Exp $
@so lib/postgresql/timescaledb-${GH_TAGNAME}.so
+@so lib/postgresql/timescaledb-tsl-${GH_TAGNAME}.so
@so lib/postgresql/timescaledb.so
share/doc/pkg-readmes/${PKGSTEM}
share/postgresql/extension/timescaledb--1.7.0--${GH_TAGNAME}.sql
@@ -23,5 +24,6 @@ share/postgresql/extension/timescaledb--
share/postgresql/extension/timescaledb--2.3.1--${GH_TAGNAME}.sql
share/postgresql/extension/timescaledb--2.4.0--${GH_TAGNAME}.sql
share/postgresql/extension/timescaledb--2.4.1--${GH_TAGNAME}.sql
+share/postgresql/extension/timescaledb--2.4.2--${GH_TAGNAME}.sql
share/postgresql/extension/timescaledb--${GH_TAGNAME}.sql
share/postgresql/extension/timescaledb.control
Re: new: fonts/zh-wqy-microhei-ttf: another Chinese font from the WenQuanYi project
On 2021/11/18 12:24, Yifei Zhan wrote:
> Hi,
>
> fonts/zh-wqy-microhei-ttf is another Chinese sans-serif font from the
> WenQuanYi family. It is one of the most widely used open source Chinese
> sans-serif font and I would like to import it.
>
> This port is based on fonts/zh-wqy-zenhei-ttf, tested on -CURRENT.
>
> Here is how it looks in comparison with zh-wqy-zenhei-ttf:
>
> https://user-images.githubusercontent.com/87886461/142413924-1fbbc882-0dfd-4468-9073-e57e64eff12e.png
Please don't include CVS directories in tars
I think "beta" should be part of the version number, here is one way to do it
TYPEFACE = wqy-microhei
V = 0.2.0beta
DISTNAME = ${TYPEFACE}-${V:S/beta/-beta/}
PKGNAME = zh-wqy-microhei-ttf-$V
> ok to import?
it's only really useful to ask for an ok to import if you are a committer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2021/11/18 09:22:37 Modified files: x11/py-wxPython: Makefile x11/py-wxPython/patches: patch-wxPython_setup_py Log message: disable the webview to avoid the dependency on the newly added wxWidgets-webkit spotted by naddy@, ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: tra...@cvs.openbsd.org 2021/11/18 09:03:24 Modified files: devel/arduino-esp32: Makefile distinfo devel/arduino-esp32/patches: patch-platform_txt devel/arduino-esp32/pkg: PLIST Log message: Update devel/arduino-esp32 to 2.0.1. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/11/18 08:58:32 Removed files: devel/jdk/16 : Makefile distinfo devel/jdk/16/files: cacerts devel/jdk/16/patches: patch-make_common_NativeCompilation_gmk devel/jdk/16/pkg: DESCR PFRAG.aot PFRAG.ci PLIST README Log message: Remove jdk-16.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: tra...@cvs.openbsd.org 2021/11/18 08:54:28 Modified files: devel/xtensa-esp32-elf: Makefile.inc devel/xtensa-esp32-elf/binutils: Makefile distinfo devel/xtensa-esp32-elf/binutils/patches: patch-bfd_xtensa-modules_c patch-include_xtensa-config_h devel/xtensa-esp32-elf/binutils/pkg: PLIST devel/xtensa-esp32-elf/gcc: Makefile distinfo devel/xtensa-esp32-elf/gcc/pkg: PLIST devel/xtensa-esp32-elf/gcc-bootstrap: Makefile distinfo devel/xtensa-esp32-elf/gcc-bootstrap/pkg: PLIST devel/xtensa-esp32-elf/gdb: Makefile distinfo devel/xtensa-esp32-elf/gdb/patches: patch-bfd_xtensa-modules_c patch-gdb_gdbserver_xtensa-regmap_c patch-gdb_gdbserver_xtensa-xtregs_c patch-gdb_xtensa-config_c patch-gdb_xtensa-xtregs_c patch-include_xtensa-config_h devel/xtensa-esp32-elf/gdb/pkg: PLIST devel/xtensa-esp32-elf/newlib: Makefile distinfo devel/xtensa-esp32-elf/newlib/pkg: PLIST Log message: Update xtensa-esp32-elf to 2021.2. ok benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/18 08:45:28 Modified files: lang/python/2.7: Makefile lang/python/2.7/patches: patch-Modules__ssl_c lang/python/3.10: Makefile lang/python/3.10/files: CHANGES.OpenBSD lang/python/3.10/patches: patch-Modules__ssl_c lang/python/3.8: Makefile lang/python/3.8/patches: patch-Modules__ssl_c lang/python/3.9: Makefile lang/python/3.9/patches: patch-Modules__ssl_c Log message: pythons: Tweak LibreSSL patches: drop a hunk that retains backward compatibility with LibreSSL 2.7 and tweak comments in the patches. In Python 3.10, fix the security level patch. Add a missing const and drop @SECLEVEL=2 from the PY_SSL_DEFAULT_CIPHER_STRING, as that will currently result in a runtime failure. ok kmos
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/11/18 08:25:28 Modified files: net/dendrite : Makefile distinfo modules.inc Log message: Update dendrite to 0.5.1 - This has a fix for removing old log files after they are compressed!
Re: [s...@spacehopper.org: Re: Failed to install Python 3.8 through ports]
On Thu, Nov 18, 2021 at 10:04:55AM +, Stuart Henderson wrote:
> OK to add this check?
Yes please.
ok kmos
--Kurt
> Index: Makefile.inc
> ===
> RCS file: /cvs/ports/lang/python/Makefile.inc,v
> retrieving revision 1.141
> diff -u -p -r1.141 Makefile.inc
> --- Makefile.inc 1 Nov 2021 16:56:24 - 1.141
> +++ Makefile.inc 18 Nov 2021 10:03:19 -
> @@ -143,6 +143,8 @@ ALL_TARGET = all
>
> post-extract:
> rm -r ${WRKDIST}/Modules/expat
> + @if [ -h ${PORTSDIR} ]; then echo \
> + "PORTSDIR (${PORTSDIR}) cannot be a symbolic link. Set PORTSDIR in
> /etc/mk.conf instead." >&2; exit 1; fi
>
> do-gen:
> ${SUBST_CMD} ${WRKSRC}/configure.ac
>
Re: [s...@spacehopper.org: Re: Failed to install Python 3.8 through ports]
On Thu, Nov 18, 2021 at 10:04:55AM +, Stuart Henderson wrote:
> - Forwarded message from Stuart Henderson -
>
> From: Stuart Henderson
> Date: Thu, 18 Nov 2021 09:56:39 +
> To: songzongquan
> Cc: kmos , ports
> Subject: Re: Failed to install Python 3.8 through ports
> Mail-Followup-To: songzongquan , kmos
> , ports
>
> On 2021/11/18 11:38, songzongquan wrote:
> > 3、My problem:
> > After I execute make install under / usr / ports / Lang / Python / 3.8,
> > the following error message appears in a certain link. Please help me solve
> > this problem or provide
> > ..
> > Create /usr/packages/mips64el/all/python-3.8.12.tgz
> > Creating package python-3.8.12
> > checksumming|| 7%
> > Error:
> > /home/song/ports/Python-3.8.12/fake-mips64el/usr/local/lib/libpython3.8.so.0.0
> > does not exist
>
> It looks like you have a symlink from /usr/ports -> /home/song/ports - that
> doesn't work properly.
>
> Set PORTSDIR=/home/song/ports in /etc/mk.conf instead.
>
>
> - End forwarded message -
>
>
> OK to add this check?
>
>
> Index: Makefile.inc
> ===
> RCS file: /cvs/ports/lang/python/Makefile.inc,v
> retrieving revision 1.141
> diff -u -p -r1.141 Makefile.inc
> --- Makefile.inc 1 Nov 2021 16:56:24 - 1.141
> +++ Makefile.inc 18 Nov 2021 10:03:19 -
> @@ -143,6 +143,8 @@ ALL_TARGET = all
>
> post-extract:
> rm -r ${WRKDIST}/Modules/expat
> + @if [ -h ${PORTSDIR} ]; then echo \
> + "PORTSDIR (${PORTSDIR}) cannot be a symbolic link. Set PORTSDIR in
> /etc/mk.conf instead." >&2; exit 1; fi
>
> do-gen:
> ${SUBST_CMD} ${WRKSRC}/configure.ac
>
>
How about setting this globally as this creeps up on a case-by-case basis ?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 06:22:24 Modified files: math/py-mpmath : Makefile Log message: missing BDEP on py-setuptools_scm, found by phessler@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2021/11/18 05:07:25 Modified files: textproc/apertium-dicts/nob: Makefile textproc/apertium-dicts/nob/pkg: PLIST Log message: Update plist. Build failure in dependent packages reported by ajacoutot@ naddy@
Re: games/godot: install manpage and desktop file
I tripped again on LOCALBASE vs TRUEPREFIX... diff updated, sorry for
the noise.
Omar Polo writes:
> Hello,
>
> I'd like to include the desktop file (+ icon) and the manpage in the
> Godot package.
>
> The manpage is some release old and lacks some newer flags, but it's way
> better than `godot --help | less` and the missing options are not
> super-important IMHO. Moreover, it specifies also where godot store its
> files which is nice.
>
> For the curious, these are the flags mentioned in the help message that
> are currently missing in the manpage:
>
> --enable-delta-smoothing When vsync is enabled, enabled frame
> delta smoothing.
> --disable-delta-smoothingDisable frame delta smoothing.
> --tablet-driver Tablet input driver () (Windows only).
>
> Comments/thoughts/OK?
Index: Makefile
===
RCS file: /home/cvs/ports/games/godot/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile10 Nov 2021 13:20:17 - 1.29
+++ Makefile18 Nov 2021 09:53:55 -
@@ -8,6 +8,7 @@ V = 3.4
GODOTSTEAM_V = g333-s151-g397
DISTNAME = godot-${V}-stable
PKGNAME = godot-${V}
+REVISION = 0
CATEGORIES = games
HOMEPAGE = https://godotengine.org/
MAINTAINER = Omar Polo
@@ -82,6 +83,7 @@ LIB_DEPENDS = archivers/zstd \
multimedia/libvpx \
net/enet \
security/polarssl
+RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
@@ -97,6 +99,7 @@ post-extract:
pre-configure:
${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp
+ ${SUBST_CMD} ${WRKSRC}/misc/dist/linux/*.desktop
sed -E -i 's/ISteamHTMLSurface:://g' \
${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam/godotsteam.cpp
sed -E -i 's/steam\/steam_api\.h/steam_api.h/g' \
@@ -107,5 +110,17 @@ pre-configure:
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \
${PREFIX}/bin/godot
+ ${INSTALL_MAN_DIR} ${PREFIX}/man/man6
+ ${INSTALL_MAN} ${WRKSRC}/misc/dist/linux/godot.6 \
+ ${PREFIX}/man/man6
+ ${INSTALL_DATA_DIR} ${PREFIX}/usr/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/icon.svg \
+ ${PREFIX}/usr/share/pixmaps/godot.svg
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.desktop \
+ ${PREFIX}/share/applications
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/metainfo
+ ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.appdata.xml \
+ ${PREFIX}/share/metainfo/
.include
Index: patches/patch-misc_dist_linux_godot_6
===
RCS file: patches/patch-misc_dist_linux_godot_6
diff -N patches/patch-misc_dist_linux_godot_6
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-misc_dist_linux_godot_6 18 Nov 2021 11:37:59 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: misc/dist/linux/godot.6
+--- misc/dist/linux/godot.6.orig
misc/dist/linux/godot.6
+@@ -1,4 +1,4 @@
+-.TH GODOT "6" "January 2020" "godot 3.2" "Games"
++.TH GODOT "6" "January 2020" "Godot" "Games"
+ .SH NAME
+ godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor
+ .SH SYNOPSIS
+@@ -56,7 +56,7 @@ Remote filesystem ([:] address).
+ Password for remote filesystem.
+ .TP
+ \fB\-\-audio\-driver\fR
+-Audio driver ('PulseAudio', 'ALSA', 'Dummy').
++Audio driver ('sndio', 'Dummy').
+ .TP
+ \fB\-\-video\-driver\fR
+ Video driver ('GLES3', 'GLES2').
Index: patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
===
RCS file: patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
diff -N patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-misc_dist_linux_org_godotengine_Godot_desktop 18 Nov 2021
11:55:31 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: misc/dist/linux/org.godotengine.Godot.desktop
+--- misc/dist/linux/org.godotengine.Godot.desktop.orig
misc/dist/linux/org.godotengine.Godot.desktop
+@@ -2,8 +2,8 @@
+ Name=Godot Engine
+ GenericName=Libre game engine
+ Comment=Multi-platform 2D and 3D game engine with a feature-rich editor
+-Exec=godot %f
+-Icon=godot
++Exec=${TRUEPREFIX}/bin/godot %f
++Icon=${TRUEPREFIX}/bin/godot
+ Terminal=false
+ PrefersNonDefaultGPU=true
+ Type=Application
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/games/godot/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 10 Nov 2021 13:20:17 - 1.2
+++ pkg/PLIST 18 Nov 2021 11:04:46 -
@@ -1,3 +1,12 @@
@comment $OpenBSD: PLIST,v 1.2 2021/11/10 13:20:17 jca Exp $
@bin bin/godot
+@man man/man6/godot.6
games/godot: install manpage and desktop file
Hello,
I'd like to include the desktop file (+ icon) and the manpage in the
Godot package.
The manpage is some release old and lacks some newer flags, but it's way
better than `godot --help | less` and the missing options are not
super-important IMHO. Moreover, it specifies also where godot store its
files which is nice.
For the curious, these are the flags mentioned in the help message that
are currently missing in the manpage:
--enable-delta-smoothing When vsync is enabled, enabled frame
delta smoothing.
--disable-delta-smoothingDisable frame delta smoothing.
--tablet-driver Tablet input driver () (Windows only).
Comments/thoughts/OK?
Index: Makefile
===
RCS file: /home/cvs/ports/games/godot/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile10 Nov 2021 13:20:17 - 1.29
+++ Makefile18 Nov 2021 09:53:55 -
@@ -8,6 +8,7 @@ V = 3.4
GODOTSTEAM_V = g333-s151-g397
DISTNAME = godot-${V}-stable
PKGNAME = godot-${V}
+REVISION = 0
CATEGORIES = games
HOMEPAGE = https://godotengine.org/
MAINTAINER = Omar Polo
@@ -82,6 +83,7 @@ LIB_DEPENDS = archivers/zstd \
multimedia/libvpx \
net/enet \
security/polarssl
+RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
@@ -97,6 +99,7 @@ post-extract:
pre-configure:
${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp
+ ${SUBST_CMD} ${WRKSRC}/misc/dist/linux/*.desktop
sed -E -i 's/ISteamHTMLSurface:://g' \
${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam/godotsteam.cpp
sed -E -i 's/steam\/steam_api\.h/steam_api.h/g' \
@@ -107,5 +110,17 @@ pre-configure:
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \
${PREFIX}/bin/godot
+ ${INSTALL_MAN_DIR} ${PREFIX}/man/man6
+ ${INSTALL_MAN} ${WRKSRC}/misc/dist/linux/godot.6 \
+ ${PREFIX}/man/man6
+ ${INSTALL_DATA_DIR} ${PREFIX}/usr/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/icon.svg \
+ ${PREFIX}/usr/share/pixmaps/godot.svg
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.desktop \
+ ${PREFIX}/share/applications
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/metainfo
+ ${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.appdata.xml \
+ ${PREFIX}/share/metainfo/
.include
Index: patches/patch-misc_dist_linux_godot_6
===
RCS file: patches/patch-misc_dist_linux_godot_6
diff -N patches/patch-misc_dist_linux_godot_6
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-misc_dist_linux_godot_6 18 Nov 2021 11:37:59 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: misc/dist/linux/godot.6
+--- misc/dist/linux/godot.6.orig
misc/dist/linux/godot.6
+@@ -1,4 +1,4 @@
+-.TH GODOT "6" "January 2020" "godot 3.2" "Games"
++.TH GODOT "6" "January 2020" "Godot" "Games"
+ .SH NAME
+ godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor
+ .SH SYNOPSIS
+@@ -56,7 +56,7 @@ Remote filesystem ([:] address).
+ Password for remote filesystem.
+ .TP
+ \fB\-\-audio\-driver\fR
+-Audio driver ('PulseAudio', 'ALSA', 'Dummy').
++Audio driver ('sndio', 'Dummy').
+ .TP
+ \fB\-\-video\-driver\fR
+ Video driver ('GLES3', 'GLES2').
Index: patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
===
RCS file: patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
diff -N patches/patch-misc_dist_linux_org_godotengine_Godot_desktop
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-misc_dist_linux_org_godotengine_Godot_desktop 18 Nov 2021
10:06:19 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: misc/dist/linux/org.godotengine.Godot.desktop
+--- misc/dist/linux/org.godotengine.Godot.desktop.orig
misc/dist/linux/org.godotengine.Godot.desktop
+@@ -2,8 +2,8 @@
+ Name=Godot Engine
+ GenericName=Libre game engine
+ Comment=Multi-platform 2D and 3D game engine with a feature-rich editor
+-Exec=godot %f
+-Icon=godot
++Exec=${LOCALBASE}/bin/godot %f
++Icon=${LOCALBASE}/bin/godot
+ Terminal=false
+ PrefersNonDefaultGPU=true
+ Type=Application
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/games/godot/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 10 Nov 2021 13:20:17 - 1.2
+++ pkg/PLIST 18 Nov 2021 11:04:46 -
@@ -1,3 +1,12 @@
@comment $OpenBSD: PLIST,v 1.2 2021/11/10 13:20:17 jca Exp $
@bin bin/godot
+@man man/man6/godot.6
+share/applications/org.godotengine.Godot.desktop
share/doc/pkg-readmes/${PKGSTEM}
+share/metainfo/
+share/metainfo/org.godotengine.Godot.appdata.xml
+usr/
Re: update productivity/timewarrior. Was [Re: update productivity/taskwarrior to 2.6.1]
On 2021/11/18 02:49, Erling Westenvik wrote:
> On Wed, Nov 17, 2021 at 05:35:08PM +0100, Paco Esteban wrote:
> > On Sun, 14 Nov 2021, Erling Westenvik wrote:
> >
> > > Thanks for caring about taskwarrior. Any chance that you can update
> > > timewarrior too? Since the two are kind of siblings from the same
> > > developers I mean? Our 1.1.1p0 lags awfully behind the official 1.4.3.
> >
> > I don't use timewarrior at all, so I cannot test it properly. Could you
> > take a look at the diff at the end ?
>
> Diff applied and port compiled without any problems. Thank you very much!
>
> (Is there a way to build with the extensive man pages that comes with
> timewarrior?)
There are some problems with the cmakefiles for building/installing
the docs. Firstly although pregenerated files are included with the releases
the installation target is not used unless asciidoctor was detected at
configure time. And secondly there's some confusion between
CMAKE_CURRENT_SOURCE_DIR not CMAKE_CURRENT_BINARY_DIR in the doc cmakefiles
that isn't compatible with SEPARATE_BUILD.
If you want to have a play around to try fixing this, I recommend installing
ccache and setting USE_CCACHE=Yes in mk.conf, it will save a lot of time
when rebuilding to try things.
> > By the way, this is a good opportunity for you to adopt a port ;-)
>
> I guess. Especially if I'm the only user of timewarrior. Next year marks
> my OpenBSD twentieth year anniversary and I reckon it's time to take some
> least amount of responsibility. Sign me up.
>
> Regards,
>
> Erling
>
> >
> > Cheers,
> > Paco.
> >
> > diff 27f3dd7c26bdb48f530ada84e53150ba0dad7546 /usr/ports
> > blob - adff63080591f23124de87a0bfe23cd43a69a5b5
> > file + productivity/timewarrior/Makefile
> > --- productivity/timewarrior/Makefile
> > +++ productivity/timewarrior/Makefile
> > @@ -2,35 +2,34 @@
> >
> > COMMENT = command line tracking time tool
> >
> > -VERSION = 1.1.1
> > +VERSION = 1.4.3
> > DISTNAME = timew-${VERSION}
> > PKGNAME = timewarrior-${VERSION}
> > CATEGORIES = productivity
> > -REVISION = 0
> >
> > HOMEPAGE = https://timewarrior.net/
> >
> > # MIT
> > PERMIT_PACKAGE = Yes
> >
> > +MASTER_SITES =
> > https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${VERSION}/
> > +
> > WANTLIB += c m ${COMPILER_LIBCXX}
> >
> > -MASTER_SITES = https://taskwarrior.org/download/
> > -
> > COMPILER = base-clang ports-gcc
> >
> > MODULES = devel/cmake \
> > lang/python
> > -MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
> > +
> > MODPY_RUNDEP = No
> > MODPY_BUILDDEP = No
> > MODPY_ADJ_FILES = ext/totals.py
> >
> > CONFIGURE_STYLE = cmake
> >
> > -CONFIGURE_ARGS += -DTIMEW_DOCDIR=share/doc/timewarrior
> > -CONFIGURE_ARGS += -DTIMEW_RCDIR=share/doc/timewarrior/rc
> > -CONFIGURE_ARGS += -DTIMEW_MAN1DIR=man/man1
> > +CONFIGURE_ARGS += -DTIMEW_DOCDIR=share/doc/timewarrior \
> > + -DTIMEW_RCDIR=share/doc/timewarrior/rc \
> > + -DTIMEW_MAN1DIR=man/man1
> >
> > NO_TEST = Yes
> >
> > blob - cfcb76568eb20a1031d00b22d79e7bbe048ab3d0
> > file + productivity/timewarrior/distinfo
> > --- productivity/timewarrior/distinfo
> > +++ productivity/timewarrior/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (timew-1.1.1.tar.gz) = H32aYuVfxaMSZDNlTMsf19LRNfBvBWl/hxiXydt3zMk=
> > -SIZE (timew-1.1.1.tar.gz) = 166484
> > +SHA256 (timew-1.4.3.tar.gz) = xN9+MGyaJnxDJSLDeVhTC4/W5aQQwFj1deJa9NjHylM=
> > +SIZE (timew-1.4.3.tar.gz) = 3188726
> > blob - 16b06872bece4fe8281aabcfd1dd43cd5e273c4c
> > file + productivity/timewarrior/pkg/PLIST
> > --- productivity/timewarrior/pkg/PLIST
> > +++ productivity/timewarrior/pkg/PLIST
> > @@ -1,13 +1,10 @@
> > @comment $OpenBSD: PLIST,v 1.1.1.1 2018/05/17 23:22:21 sthen Exp $
> > @bin bin/timew
> > -@man man/man1/timew.1
> > share/doc/timewarrior/
> > share/doc/timewarrior/AUTHORS
> > -share/doc/timewarrior/COPYING
> > share/doc/timewarrior/ChangeLog
> > share/doc/timewarrior/INSTALL
> > share/doc/timewarrior/LICENSE
> > -share/doc/timewarrior/NEWS
> > share/doc/timewarrior/README.md
> > share/doc/timewarrior/doc/
> > share/doc/timewarrior/doc/holidays/
> >
> > --
> > Paco Esteban.
> > 0x5818130B8A6DBC03
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2021/11/18 03:55:25 Modified files: mail/pyzor : Makefile mail/pyzor/pkg : PLIST Added files: mail/pyzor/pkg : pyzord.rc Log message: fix pyzord server mode and add an rc script ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/18 03:23:09 Modified files: inputmethods/ibus: Makefile inputmethods/ibus/pkg: PLIST-main Log message: Fix rm(1) invocations.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/18 03:12:17 Modified files: inputmethods/ibus/pkg: PLIST-main Log message: Fix PLIST.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/18 03:11:30 Modified files: inputmethods/ibus-anthy: Makefile inputmethods/ibus-anthy/pkg: PLIST inputmethods/ibus-skk: Makefile inputmethods/ibus-skk/pkg: PLIST inputmethods/ibus-typing-booster: Makefile inputmethods/ibus-typing-booster/pkg: PLIST Log message: Add the new @tag ibus-write-cache
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/18 03:10:55 Modified files: inputmethods/ibus: Makefile inputmethods/ibus/pkg: PLIST-main Log message: Add a new tag: ibus-write-cache This runs "ibus write-cache --system" which is needed by ports installing things under LOCALBASE/share/ibus/component/
[s...@spacehopper.org: Re: Failed to install Python 3.8 through ports]
- Forwarded message from Stuart Henderson -
From: Stuart Henderson
Date: Thu, 18 Nov 2021 09:56:39 +
To: songzongquan
Cc: kmos , ports
Subject: Re: Failed to install Python 3.8 through ports
Mail-Followup-To: songzongquan , kmos
, ports
On 2021/11/18 11:38, songzongquan wrote:
> 3、My problem:
> After I execute make install under / usr / ports / Lang / Python / 3.8, the
> following error message appears in a certain link. Please help me solve this
> problem or provide
> ..
> Create /usr/packages/mips64el/all/python-3.8.12.tgz
> Creating package python-3.8.12
> checksumming|| 7%
> Error:
> /home/song/ports/Python-3.8.12/fake-mips64el/usr/local/lib/libpython3.8.so.0.0
> does not exist
It looks like you have a symlink from /usr/ports -> /home/song/ports - that
doesn't work properly.
Set PORTSDIR=/home/song/ports in /etc/mk.conf instead.
- End forwarded message -
OK to add this check?
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile.inc
--- Makefile.inc1 Nov 2021 16:56:24 - 1.141
+++ Makefile.inc18 Nov 2021 10:03:19 -
@@ -143,6 +143,8 @@ ALL_TARGET =all
post-extract:
rm -r ${WRKDIST}/Modules/expat
+ @if [ -h ${PORTSDIR} ]; then echo \
+ "PORTSDIR (${PORTSDIR}) cannot be a symbolic link. Set PORTSDIR in
/etc/mk.conf instead." >&2; exit 1; fi
do-gen:
${SUBST_CMD} ${WRKSRC}/configure.ac
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 03:00:03 Modified files: textproc/py-pykwalify: Makefile distinfo textproc/py-pykwalify/pkg: PLIST Log message: update to py3-pykwalify-1.8.0
Re: Failed to install Python 3.8 through ports
On 2021/11/18 11:38, songzongquan wrote: > 3、My problem: > After I execute make install under / usr / ports / Lang / Python / 3.8, the > following error message appears in a certain link. Please help me solve this > problem or provide > .. > Create /usr/packages/mips64el/all/python-3.8.12.tgz > Creating package python-3.8.12 > checksumming|| 7% > Error: > /home/song/ports/Python-3.8.12/fake-mips64el/usr/local/lib/libpython3.8.so.0.0 > does not exist It looks like you have a symlink from /usr/ports -> /home/song/ports - that doesn't work properly. Set PORTSDIR=/home/song/ports in /etc/mk.conf instead.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:47:15 Modified files: www/py-itsdangerous: Makefile distinfo www/py-itsdangerous/pkg: PLIST Log message: update to py3-itsdangerous-2.0.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:45:08 Modified files: graphics/py-cycler: Makefile distinfo Log message: update to py3-cycler-0.11.0, enable tests
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:42:35 Modified files: math/p5-Math-GMP: Makefile distinfo Log message: update to p5-Math-GMP-2.24
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:41:37 Modified files: graphics/py-imagesize: Makefile distinfo Log message: update to py3-imagesize-1.3.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/18 02:35:22 Modified files: sysutils/nomad : Makefile distinfo sysutils/nomad/patches: patch-command_agent_host_unix_go Added files: sysutils/nomad/patches: patch-command_agent_log_file_bsd_go Log message: Update to nomad-1.2.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:32:45 Modified files: devel/py-pathspec: Makefile distinfo devel/py-pathspec/pkg: PLIST Log message: update to py3-pathspec-0.9.0
mail/pyzor fix
Hi,
mail/pyzor has a server mode that needs some love.
Diff follows, ok ?
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/mail/pyzor/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile2 Nov 2021 00:01:17 - 1.18
+++ Makefile18 Nov 2021 09:27:14 -
@@ -9,7 +9,7 @@ GH_COMMIT = 53aceee8943c30cc28850ca76e1
MODPY_EGG_VERSION =1.1.1
DISTNAME = pyzor-1.1.1pre20210613
CATEGORIES = mail net
-REVISION = 0
+REVISION = 1
HOMEPAGE = https://www.pyzor.org/
@@ -17,6 +17,7 @@ HOMEPAGE =https://www.pyzor.org/
PERMIT_PACKAGE = Yes
MODULES = lang/python
+RUN_DEPENDS = lang/python/${MODPY_VERSION},-gdbm
# actual releases should be available on pypi, could switch back if
# there's a new release, but no tests
#MODPY_PI =Yes
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/pyzor/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 29 Oct 2021 21:50:29 - 1.5
+++ pkg/PLIST 18 Nov 2021 09:27:14 -
@@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.5 2021/10/29 21:50:29 sthen Exp $
+@rcscript ${RCDIR}/pyzord
bin/pyzor
bin/pyzor-migrate
bin/pyzord
lib/python${MODPY_VERSION}/site-packages/pyzor/
-lib/python${MODPY_VERSION}/site-packages/pyzor-1.1.1-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/pyzor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/pyzor/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyzor/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/pyzor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
Index: pkg/pyzord.rc
===
RCS file: pkg/pyzord.rc
diff -N pkg/pyzord.rc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/pyzord.rc 18 Nov 2021 09:27:14 -
@@ -0,0 +1,12 @@
+#!/bin/ksh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/bin/pyzord"
+daemon_flags="--detach=/var/log/pyzord.log"
+
+. /etc/rc.d/rc.subr
+
+pexp=".*${daemon} ${daemon_flags}"
+
+rc_cmd $1
signature.asc
Description: PGP signature
Remove databases/virtuoso?
zhuk imported this for nepomuk. nepomuk came and then left the tree again. Our version 6.1.6 is very old (2013). Nothing uses it anymore. It gets in the way of progress in libcrypto. I should note that upstream is now at version 7.2.6 which should be compatible with OpenSSL 1.1. An update is more work than I'm willing to invest in something that is unused.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:27:24 Modified files: textproc/py-spdx-lookup: Makefile distinfo textproc/py-spdx-lookup/pkg: PLIST Log message: update to py3-spdx-lookup-0.3.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:27:18 Modified files: textproc/py-spdx: Makefile distinfo textproc/py-spdx/pkg: PLIST Log message: update to py3-spdx-2.5.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2021/11/18 02:24:21 Modified files: x11/wxWidgets : Makefile x11/wxWidgets/patches: patch-configure Log message: don't list the webview library in wx-config(1) by default, should fix most of the fallout. spotted by naddy@, ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:20:51 Modified files: math/py-mpmath : Makefile distinfo math/py-mpmath/pkg: PLIST Log message: update to py3-mpmath-1.2.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:20:48 Modified files: security/py-josepy: Makefile distinfo Added files: security/py-josepy/patches: patch-pytest_ini Log message: update to py3-josepy-1.11.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:19:19 ports/security/py-josepy/patches Update of /cvs/ports/security/py-josepy/patches In directory cvs.openbsd.org:/tmp/cvs-serv99961/patches Log Message: Directory /cvs/ports/security/py-josepy/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:17:56 Modified files: graphics/pecl-imagick: Makefile distinfo Log message: update to pecl-imagick-3.6.0
Failed to install Python 3.8 through ports
--
发件人：songzongquan
发送时间：2021年11月14日(星期日) 13:47
收件人：kmos
主 题：Failed to install Python 3.8 through ports
Hello, I made a mistake when compiling and installing Python 3.8 through ports.
The relevant information is as follows：
1、OpenBSD version:
szq$ sysctl -n kern.version
OpenBSD 7.0 (GENERIC) #89: Sun Oct 3 10:09:54 MDT 2021
dera...@loongson.openbsd.org:/usr/src/sys/arch/loongson/compile/GENERIC
2、the ersion of your ports tree:
szq$ cat Tag
TOPENBSD_7_0
3、My problem:
After I execute make install under / usr / ports / Lang / Python / 3.8, the
following error message appears in a certain link. Please help me solve this
problem or provide
..
Create /usr/packages/mips64el/all/python-3.8.12.tgz
Creating package python-3.8.12
checksumming|| 7%
Error:
/home/song/ports/Python-3.8.12/fake-mips64el/usr/local/lib/libpython3.8.so.0.0
does not exist
pkg_create: can't continue
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2142
'/usr/packages/mips64el/all/python-3.8.12.tgz': @trap "cd /usr/packages/mips...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2623
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$( mktem...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2602 'package': @:;
cd /usr/ports/lang/python/3.8 && PKGPATH=lang/python/3.8 make...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2155
'/var/db/pkg/python-3.8.12/+CONTENTS': @cd /usr/ports/lang/python/3.8 && PKG...)
*** Error 2 in /usr/ports/lang/python/3.8
(/usr/ports/infrastructure/mk/bsd.port.mk:2602 'install': @lock=Python-3.8.12;
export _LOCKS_HELD...)
..
4、my /etc/mk.conf 's content:
szq# cat /etc/mk.conf
WRKOBJDIR=/home/song/ports
DISTDIR=/home/song/distfiles
PACKAGE_REPOSITORY=/usr/packages
#FETCH_PACKAGES=
5、a portlog content:
szq# cat default.log
+++ Sun Nov 14 13:43:52 CST 2021
`/home/song/ports/Python-3.8.12/fake-mips64el/.fake_done' is up to date.
--- Sun Nov 14 13:43:52 CST 2021
szq# cat python-3.8.12.log
+++ Sun Nov 14 13:43:52 CST 2021
===> Building package for python-3.8.12
Create /usr/packages/mips64el/all/python-3.8.12.tgz
Creating package python-3.8.12
checksumming| | 0%
| 1%
*| 1%
| 2% *
| 2%
| 3%
| 4%*
| 4%
| 5%
| 6% *
| 6%
| 7%
Error:
/home/song/ports/Python-3.8.12/fake-mips64el/usr/local/lib/libpython3.8.so.0.0
does not exist
pkg_create: can't continue
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2142
'/usr/packages/mips64el/all/python-3.8.12.tgz': @trap "cd /usr/packages/mips...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2623
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$( mktem...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2602 'package': @:;
cd /usr/ports/lang/python/3.8 && PKGPATH=lang/python/3.8 make...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2155
'/var/db/pkg/python-3.8.12/+CONTENTS': @cd /usr/ports/lang/python/3.8 && PKG...)
*** Error 2 in /usr/ports/lang/python/3.8
(/usr/ports/infrastructure/mk/bsd.port.mk:2602 'install': @lock=Python-3.8.12;
export _LOCKS_HELD...)
--- Sun Nov 14 13:45:09 CST 2021
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/18 02:05:08 Modified files: math/visidata : Makefile distinfo math/visidata/patches: patch-setup_py math/visidata/pkg: PLIST Log message: update to visidata-2.7.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/18 01:58:03 Modified files: sysutils/exoscale-cli: Makefile distinfo Log message: Update to exoscale-cli-1.47.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/18 01:03:36 Modified files: net/gelatod: Makefile Log message: NO_TESTS -> NO_TEST *** Parse error in /usr/ports/net/gelatod: Poisoned variable NO_TESTS is already set
