CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2021/01/06 00:37:16 Modified files: misc/ytree : Makefile distinfo Log message: Update to ytree-2.03 from wen heping
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/01/05 22:13:28 Modified files: devel/ninja: Makefile Log message: switch ninja over to python3 ok sthen@
Re: update yquake2 to 7.45
On Tue, Jan 05, 2021 at 09:22:46PM +1100, Jonathan Gray wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/yquake2/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile 9 Jul 2020 21:10:21 - 1.22
> +++ Makefile 5 Jan 2021 08:08:59 -
> @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
>
> COMMENT= Yamagi Quake II
> N= yquake2
> -V= 7.43
> +V= 7.45
> PKGNAME= ${N}-${V}
> DISTNAME=quake2-${V}
> CATEGORIES= games
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/yquake2/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo 24 Mar 2020 17:58:12 - 1.9
> +++ distinfo 5 Jan 2021 08:09:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (quake2-7.43.tar.xz) = kncKVwye61DtMF2DqHKeezTOv3Fm8bijXSPXSicXPxY=
> -SIZE (quake2-7.43.tar.xz) = 1989812
> +SHA256 (quake2-7.45.tar.xz) = x1JFZ78apgRfJWGb6m5P2QZihLP7gYY7WB+0T09H/2U=
> +SIZE (quake2-7.45.tar.xz) = 1997816
>
Need to remove REVISION line.
$ make port-lib-depends-check
yquake2-7.45(games/yquake2):
Missing lib: execinfo.2 (/usr/local/share/yquake2/quake2) (NOT REACHABLE)
Extra: curl.26 openal.4 pthread.26
*** Error 1 in target 'port-lib-depends-check' (ignored)
As far as I can tell from grepping through the files of both 7.43 and
7.45, the "Extra" libs were already present in 7.43. Not sure if those
are dlopen(3)'d. The missing execinfo lib is new compared to
'make port-lib-depends-check' on 7.43. So maybe add devel/libexecinfo
to LDEPs and execinfo to WANTLIB?
Here a diff with these adjustments. Played a little singleplayer with
it for a few minutes without issues.
ok?
Index: Makefile
===
RCS file: /cvs/ports/games/yquake2/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile9 Jul 2020 21:10:21 - 1.22
+++ Makefile6 Jan 2021 04:33:36 -
@@ -4,11 +4,10 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
COMMENT= Yamagi Quake II
N= yquake2
-V= 7.43
+V= 7.45
PKGNAME= ${N}-${V}
DISTNAME= quake2-${V}
CATEGORIES=games
-REVISION= 1
HOMEPAGE= https://www.yamagi.org/quake2/
MAINTAINER=Adam Wolk
@@ -18,9 +17,10 @@ EXTRACT_SUFX=.tar.xz
# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += GL SDL2 c curl m openal pthread
+WANTLIB += GL SDL2 c curl execinfo m openal pthread
LIB_DEPENDS= audio/openal \
+ devel/libexecinfo \
devel/sdl2 \
net/curl
Index: distinfo
===
RCS file: /cvs/ports/games/yquake2/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo24 Mar 2020 17:58:12 - 1.9
+++ distinfo6 Jan 2021 04:33:36 -
@@ -1,2 +1,2 @@
-SHA256 (quake2-7.43.tar.xz) = kncKVwye61DtMF2DqHKeezTOv3Fm8bijXSPXSicXPxY=
-SIZE (quake2-7.43.tar.xz) = 1989812
+SHA256 (quake2-7.45.tar.xz) = x1JFZ78apgRfJWGb6m5P2QZihLP7gYY7WB+0T09H/2U=
+SIZE (quake2-7.45.tar.xz) = 1997816
[new] sysutils/obsdpkgup - tools for creating and using a package index
Hi, Here is a portgen'd port of obsdpkgup. You might remember it from previous threads on misc@[1]. I have been using it for some time now. Basically one can use genpkgup to create a package index, this index can be used by end users to create a "slim" list of packages that need upgrading. You can check your packages (amd64/snapshots only) with the following command: PKGUP_URL="https://deftly.net/pkgup; obsdpkgup This will produce a list of only the out of date packages. This list can later be used with pkg_add to only fetch what is needed. OK to import? [1] https://marc.info/?l=openbsd-misc=159234132018626=2 obsdpkgup.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/01/05 20:26:04 Modified files: games/nblood : Makefile distinfo games/nblood/patches: patch-Common_mak patch-GNUmakefile patch-source_audiolib_src_multivoc_cpp patch-source_audiolib_src_xmp_cpp patch-source_blood_src_blood_cpp patch-source_exhumed_src_exhumed_cpp patch-source_rr_src_game_cpp Log message: update nblood to a newer snapshot
[Update] net/wget : Update to 1.21
Hi,
Here is a patch for net/wget to update to 1.21, it build
well and run well on amd64-6.8 system.
wen
Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile24 Jan 2020 04:53:37 - 1.85
+++ Makefile6 Jan 2021 02:52:50 -
@@ -2,9 +2,8 @@
COMMENT = retrieve files from the web via HTTP, HTTPS and FTP
-DISTNAME = wget-1.20.3
+DISTNAME = wget-1.21
CATEGORIES = net
-REVISION = 3
HOMEPAGE = https://www.gnu.org/software/wget/
MAINTAINER = Nam Nguyen
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo23 Apr 2019 20:15:08 - 1.25
+++ distinfo6 Jan 2021 02:52:50 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.20.3.tar.gz) = MczPxmMFKNscjjoG9t7PKjcAYLmChBz6srhndAClCS4=
-SIZE (wget-1.20.3.tar.gz) = 4489249
+SHA256 (wget-1.21.tar.gz) = s7wam9DBmDbJcJwxjUHBnBEhWgdRT0n4m0C51Qq0kyU=
+SIZE (wget-1.21.tar.gz) = 4866788
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 4 Apr 2019 10:36:45 - 1.2
+++ patches/patch-Makefile_in 6 Jan 2021 02:52:50 -
@@ -1,14 +1,14 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2019/04/04 10:36:45 sthen Exp $
+$OpenBSD$
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -1469,7 +1469,7 @@ distuninstallcheck_listfiles = find . -type f | \
+@@ -1637,7 +1637,7 @@ distuninstallcheck_listfiles = find . -type f | \
ACLOCAL_AMFLAGS = -I m4
# subdirectories in the distribution
--SUBDIRS = lib src doc po util fuzz tests testenv
-+SUBDIRS = lib src doc po util tests testenv
+-SUBDIRS = lib src doc po gnulib_po util fuzz tests testenv
++SUBDIRS = lib src doc po gnulib_po util tests testenv
EXTRA_DIST = MAILING-LIST \
msdos/config.h msdos/Makefile.DJ \
msdos/Makefile.WC ABOUT-NLS \
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/wget/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -r1.26 PLIST
--- pkg/PLIST 29 Jan 2014 06:08:42 - 1.26
+++ pkg/PLIST 6 Jan 2021 02:52:50 -
@@ -6,46 +6,90 @@
share/examples/wget/
share/examples/wget/wgetrc
@sample ${SYSCONFDIR}/wgetrc
+share/locale/af/
+share/locale/af/LC_MESSAGES/
+share/locale/af/LC_MESSAGES/wget-gnulib.mo
+share/locale/be/LC_MESSAGES/wget-gnulib.mo
share/locale/be/LC_MESSAGES/wget.mo
+share/locale/bg/LC_MESSAGES/wget-gnulib.mo
share/locale/bg/LC_MESSAGES/wget.mo
+share/locale/ca/LC_MESSAGES/wget-gnulib.mo
share/locale/ca/LC_MESSAGES/wget.mo
+share/locale/cs/LC_MESSAGES/wget-gnulib.mo
share/locale/cs/LC_MESSAGES/wget.mo
+share/locale/da/LC_MESSAGES/wget-gnulib.mo
share/locale/da/LC_MESSAGES/wget.mo
+share/locale/de/LC_MESSAGES/wget-gnulib.mo
share/locale/de/LC_MESSAGES/wget.mo
+share/locale/el/LC_MESSAGES/wget-gnulib.mo
share/locale/el/LC_MESSAGES/wget.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/wget.mo
+share/locale/eo/LC_MESSAGES/wget-gnulib.mo
share/locale/eo/LC_MESSAGES/wget.mo
+share/locale/es/LC_MESSAGES/wget-gnulib.mo
share/locale/es/LC_MESSAGES/wget.mo
+share/locale/et/LC_MESSAGES/wget-gnulib.mo
share/locale/et/LC_MESSAGES/wget.mo
+share/locale/eu/LC_MESSAGES/wget-gnulib.mo
share/locale/eu/LC_MESSAGES/wget.mo
+share/locale/fi/LC_MESSAGES/wget-gnulib.mo
share/locale/fi/LC_MESSAGES/wget.mo
+share/locale/fr/LC_MESSAGES/wget-gnulib.mo
share/locale/fr/LC_MESSAGES/wget.mo
+share/locale/ga/LC_MESSAGES/wget-gnulib.mo
share/locale/ga/LC_MESSAGES/wget.mo
+share/locale/gl/LC_MESSAGES/wget-gnulib.mo
share/locale/gl/LC_MESSAGES/wget.mo
share/locale/he/LC_MESSAGES/wget.mo
share/locale/hr/LC_MESSAGES/wget.mo
+share/locale/hu/LC_MESSAGES/wget-gnulib.mo
share/locale/hu/LC_MESSAGES/wget.mo
share/locale/id/LC_MESSAGES/wget.mo
+share/locale/it/LC_MESSAGES/wget-gnulib.mo
share/locale/it/LC_MESSAGES/wget.mo
+share/locale/ja/LC_MESSAGES/wget-gnulib.mo
share/locale/ja/LC_MESSAGES/wget.mo
+share/locale/ko/LC_MESSAGES/wget-gnulib.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/wget.mo
+share/locale/ms/
+share/locale/ms/LC_MESSAGES/
+share/locale/ms/LC_MESSAGES/wget-gnulib.mo
+share/locale/nb/LC_MESSAGES/wget-gnulib.mo
share/locale/nb/LC_MESSAGES/wget.mo
+share/locale/nl/LC_MESSAGES/wget-gnulib.mo
share/locale/nl/LC_MESSAGES/wget.mo
+share/locale/pl/LC_MESSAGES/wget-gnulib.mo
share/locale/pl/LC_MESSAGES/wget.mo
+share/locale/pt/LC_MESSAGES/wget-gnulib.mo
share/locale/pt/LC_MESSAGES/wget.mo
+share/locale/pt_BR/LC_MESSAGES/wget-gnulib.mo
share/locale/pt_BR/LC_MESSAGES/wget.mo
[Update] misc/ytree : Update to 2.03
Hi, ports@: Here is a simple patch for misc/ytree to update to 2.03, It build well and run well on amd64-6.8 system. No other ports depends on it. wen Index: Makefile === RCS file: /cvs/ports/misc/ytree/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile24 Mar 2020 13:45:40 - 1.23 +++ Makefile5 Jan 2021 12:32:26 - @@ -2,7 +2,7 @@ COMMENT= DOS-XTREE(tm) look-a-like file manager -DISTNAME = ytree-2.02 +DISTNAME = ytree-2.03 CATEGORIES=misc HOMEPAGE= https://www.han.de/~werner/ytree.html Index: distinfo === RCS file: /cvs/ports/misc/ytree/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo24 Mar 2020 13:45:40 - 1.13 +++ distinfo5 Jan 2021 12:32:26 - @@ -1,2 +1,2 @@ -SHA256 (ytree-2.02.tar.gz) = 5b9Bq2vuWc8ej8DKQp6aGOaqg4I/MPWAcEKwTIig4Ow= -SIZE (ytree-2.02.tar.gz) = 124868 +SHA256 (ytree-2.03.tar.gz) = WDqnFVLRNH4Oq+OaI2+loXS/Z93piHGFO5/iojO8rvE= +SIZE (ytree-2.03.tar.gz) = 124768
Re: pylint-3: AttributeError: module '_ast' has no attribute 'Str'
On Tue, Jan 5, 2021 at 6:24 AM Stuart Henderson wrote: > > The @conflict weren't quite right, no harm but there were never any > pylint-main-$VER/pylint3-main-$VER packages so they aren't needed > (it's good to avoid "not needed" things in ports even if they don't > cause an actual problem because crib from existing ports for examples > all the time so they tend to get copied around). looks great! > > There's no need to rename with MODPY_BIN_SUFFIX any more now it is > py3-only and there's no conflict. Only users are totem (which detects > any of pylint/pylint3/pylint-3) and spyder (imports rather than running > the script). agree. i had the same in my diff as well. > > ok? ok
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/01/05 17:11:39 Modified files: net/gomuks : Makefile distinfo Log message: Bump gomuks to 0.2.2 Tested against synapse homeserver with no issues.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/01/05 17:05:50 Modified files: net/dendrite : Makefile distinfo net/dendrite/pkg: PLIST Log message: Update dendrite to 0.3.4 Tested and running on my "test" homeserver for some time now.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/01/05 17:03:19 Modified files: mail/mu: Makefile distinfo Log message: Update mu to 1.4.14 >From Stefan Hagen (MAINTAINER). Ty!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/01/05 16:45:12 Modified files: devel/cppcheck : Makefile distinfo Log message: update cppcheck to 2.3 ok gsoares@
Re: [UPDATE] graphics/openimageio
On Mon, Jan 04 2021, Dimitri Karamazov wrote: > On Sun, Jan 03, 2021 at 07:46:29PM +0100, Jeremie Courreges-Anglas wrote: >> On Sun, Jan 03 2021, Dimitri Karamazov wrote: >> > Update graphics/openimageio to 2.2.10.0 >> > >> > Build & run tested blender with it. >> > 14 out of 54 tests fail. >> > Atleast 3 of them fail because of some >> > optional dependencies not being turned on. >> > Like OpenVDB,libheif and ptex. >> >> > Removed the USE_DICOM option since it >> > is optional now. >> >> It may be optional, but it is still used if available: >> >> (after a make configure) >> --8<-- >> russell /usr/ports/graphics/openimageio$ doas pkg_delete dcmtk >> dcmtk-3.6.3p0: ok >> Read shared items: ok >> russell /usr/ports/graphics/openimageio$ make all MAKE_JOBS=2 2>&1 | tee log2 >> ===> Building for openimageio-2.2.10.0 >> ninja: error: '/usr/local/lib/libdcmimage.so.0.0', needed by >> 'lib/libOpenImageIO.so.8.0', missing and no known rule to make it >> -->8-- >> >> Optional deps for which we have ports should be explicitely enabled or >> disabled, to avoid problems during bulk builds. See the commit log: >> > > Oh, I should use a better method to search across ports. > Couldn't find DICOM when I tried to. pkglocate dicom does list dcmtk. If that didn't help, looking at cvs blame and then the relevant commit log usually does. > Hi pascal, I wonder if I can take maintainership of this port. > It is only required by blender and the update to this are very > frequent which I intend to take care of. > > Let me know what you think. Was there a particular reason for bringing robin-map as a separate distfile? Did you consider making a new port? I'm not saying you should, it doesn't seem to be widely used, I'm just being curious. > Any comments,OK's? Committed. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/01/05 13:53:18 Modified files: graphics/openimageio: Makefile distinfo graphics/openimageio/patches: patch-src_include_OpenImageIO_strutil_h patch-src_libtexture_texture_pvt_h patch-src_libutil_sysutil_cpp patch-src_make_detectplatform_mk graphics/openimageio/pkg: PLIST Removed files: graphics/openimageio/patches: patch-src_cmake_platform_cmake patch-src_doc_CMakeLists_txt patch-src_ffmpeg_imageio_ffmpeginput_cpp patch-src_python_CMakeLists_txt Log message: Update to openimageio-2.2.10.0 >From new maintainer Dimitri Karamazov
Re: libc++ 10.0: games/dangerdeep
Am Tue, Jan 05, 2021 at 09:07:44PM +0100 schrieb Christian Weisgerber:
> games/dangerdeep fails to build with libc++ 10.0.
>
> Here's a build fix, adapted from FreeBSD (which has since removed
> the port because of the scons -> python2 dependency).
>
> OK?
I'm not very versed in C++, but this looks good to me, ok patrick@
> Index: patches/patch-src_coastmap_h
> ===
> RCS file: /cvs/ports/games/dangerdeep/patches/patch-src_coastmap_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_coastmap_h
> --- patches/patch-src_coastmap_h 30 Apr 2017 08:24:33 - 1.1
> +++ patches/patch-src_coastmap_h 5 Jan 2021 20:03:40 -
> @@ -1,4 +1,5 @@
> $OpenBSD: patch-src_coastmap_h,v 1.1 2017/04/30 08:24:33 espie Exp $
> +Index: src/coastmap.h
> --- src/coastmap.h.orig
> +++ src/coastmap.h
> @@ -90,7 +90,7 @@ class coastsegment (public)
> @@ -10,3 +11,21 @@ $OpenBSD: patch-src_coastmap_h,v 1.1 201
>
> // some attributes used for map reading/processing
> std::vector themap; // pixel data of map file, y
> points up, like in OpenGL
> +@@ -148,7 +148,7 @@ class coastmap
> + void process_coastline(int x, int y);
> + void process_segment(int x, int y);
> +
> +-class worker : public thread
> ++class worker : public ::thread
> + {
> + coastmap& cm;
> + public:
> +@@ -160,7 +160,7 @@ class coastmap
> + }
> + };
> +
> +-thread::auto_ptr myworker;
> ++::thread::auto_ptr myworker;
> + void construction_threaded();
> +
> + public:
> Index: patches/patch-src_game_h
> ===
> RCS file: /cvs/ports/games/dangerdeep/patches/patch-src_game_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_game_h
> --- patches/patch-src_game_h 30 Apr 2017 08:56:45 - 1.1
> +++ patches/patch-src_game_h 5 Jan 2021 20:03:40 -
> @@ -1,12 +1,25 @@
> $OpenBSD: patch-src_game_h,v 1.1 2017/04/30 08:56:45 espie Exp $
> +Index: src/game.h
> --- src/game.h.orig
> +++ src/game.h
> -@@ -212,7 +212,7 @@ class game (protected)
> +@@ -210,9 +210,9 @@ class game (protected)
> + void simulate_objects_mt(double delta_t, unsigned idxoff, unsigned
> idxmod, bool record,
> + double& nearest_contact);
>
> - class simulate_worker : public thread
> +-class simulate_worker : public thread
> ++class simulate_worker : public ::thread
> {
> -mutex mtx;
> +dd::mutex mtx;
> condvar cond;
> condvar condfini;
> game& gm;
> +@@ -230,7 +230,7 @@ class game (protected)
> + double sync();
> + };
> +
> +-thread::auto_ptr myworker;
> ++::thread::auto_ptr myworker;
> +
> + player_info playerinfo;
> +
> --
> Christian "naddy" Weisgerber na...@mips.inka.de
>
libc++ 10.0: games/dangerdeep
games/dangerdeep fails to build with libc++ 10.0.
Here's a build fix, adapted from FreeBSD (which has since removed
the port because of the scons -> python2 dependency).
OK?
Index: patches/patch-src_coastmap_h
===
RCS file: /cvs/ports/games/dangerdeep/patches/patch-src_coastmap_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_coastmap_h
--- patches/patch-src_coastmap_h30 Apr 2017 08:24:33 - 1.1
+++ patches/patch-src_coastmap_h5 Jan 2021 20:03:40 -
@@ -1,4 +1,5 @@
$OpenBSD: patch-src_coastmap_h,v 1.1 2017/04/30 08:24:33 espie Exp $
+Index: src/coastmap.h
--- src/coastmap.h.orig
+++ src/coastmap.h
@@ -90,7 +90,7 @@ class coastsegment (public)
@@ -10,3 +11,21 @@ $OpenBSD: patch-src_coastmap_h,v 1.1 201
// some attributes used for map reading/processing
std::vector themap; // pixel data of map file, y
points up, like in OpenGL
+@@ -148,7 +148,7 @@ class coastmap
+ void process_coastline(int x, int y);
+ void process_segment(int x, int y);
+
+- class worker : public thread
++ class worker : public ::thread
+ {
+ coastmap& cm;
+ public:
+@@ -160,7 +160,7 @@ class coastmap
+ }
+ };
+
+- thread::auto_ptr myworker;
++ ::thread::auto_ptr myworker;
+ void construction_threaded();
+
+ public:
Index: patches/patch-src_game_h
===
RCS file: /cvs/ports/games/dangerdeep/patches/patch-src_game_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_game_h
--- patches/patch-src_game_h30 Apr 2017 08:56:45 - 1.1
+++ patches/patch-src_game_h5 Jan 2021 20:03:40 -
@@ -1,12 +1,25 @@
$OpenBSD: patch-src_game_h,v 1.1 2017/04/30 08:56:45 espie Exp $
+Index: src/game.h
--- src/game.h.orig
+++ src/game.h
-@@ -212,7 +212,7 @@ class game (protected)
+@@ -210,9 +210,9 @@ class game (protected)
+ void simulate_objects_mt(double delta_t, unsigned idxoff, unsigned
idxmod, bool record,
+double& nearest_contact);
- class simulate_worker : public thread
+- class simulate_worker : public thread
++ class simulate_worker : public ::thread
{
- mutex mtx;
+ dd::mutex mtx;
condvar cond;
condvar condfini;
game& gm;
+@@ -230,7 +230,7 @@ class game (protected)
+ double sync();
+ };
+
+- thread::auto_ptr myworker;
++ ::thread::auto_ptr myworker;
+
+ player_info playerinfo;
+
--
Christian "naddy" Weisgerber na...@mips.inka.de
Re: UPDATE mail/s-nail
Steffen Nurpmeso wrote in <20201229162620.gwx_7%stef...@sdaoden.eu>: |Steffen Nurpmeso wrote in | <20201214225721.xskzo%stef...@sdaoden.eu>: ||Update to v14.9.20, TLS over *socks-proxy*/$SOCKS5_PROXY, EXTERNAL ||auth for POP3S? and IMAPS?, stuff. | |-Wformat-security, truly OPENSSL_NO_DEPRECATED_3_0 clean, etc., |what-there-is should just-work-neatless finally (now for real). | |Thanks in advance. |"A good slide" (that is happy new year) and keep the virus away, |that rhyme surely a crime, |bye bye my love, bye bye. Thank you for committing it, Stuart! A happy and healthy 2021 from Germany i wish, --steffen | |Der Kragenbaer,The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2021/01/05 11:29:20 Modified files: net/filezilla : Makefile distinfo net/filezilla/patches: patch-src_engine_Makefile_am net/filezilla/pkg: PLIST Log message: Update to filezilla-3.52.0.1 Changes: https://filezilla-project.org/versions.php
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2021/01/05 11:28:44 Modified files: net/libfilezilla: Makefile distinfo net/libfilezilla/pkg: PLIST Log message: Update to libfilezilla-0.26.0 Note the major bump to the shared lib due to a removed symbol. Changes: https://lib.filezilla-project.org/
Re: [update][maintainer] mail/mu 1.4.13 -> 1.4.14
Stefan Hagen writes: > Hello, > > Simple update of mail/mu. > It's a bugfix release without a change in functionality. > > Port changes: > - removed revision > - bumped version > > portcheck, port-lib-depends-check: ok > make test (amd64): ok > > Best Regards, > Stefan Working fine for me, OK abieber if someone wants to commit - if not I'll try to get it in later this evening. > > Index: Makefile > === > RCS file: /cvs/ports/mail/mu/Makefile,v > retrieving revision 1.22 > diff -u -p -u -p -r1.22 Makefile > --- Makefile 21 Dec 2020 15:00:34 - 1.22 > +++ Makefile 5 Jan 2021 15:39:57 - > @@ -2,9 +2,8 @@ > > COMMENT= maildir indexer and searcher with emacs frontend > > -V= 1.4.13 > +V= 1.4.14 > GUILE_V= 2.2 > -REVISION=0 > > DISTNAME=mu-$V > > Index: distinfo > === > RCS file: /cvs/ports/mail/mu/distinfo,v > retrieving revision 1.9 > diff -u -p -u -p -r1.9 distinfo > --- distinfo 1 Sep 2020 13:57:39 - 1.9 > +++ distinfo 5 Jan 2021 15:39:57 - > @@ -1,2 +1,2 @@ > -SHA256 (mu-1.4.13.tar.xz) = smpQT4ZgtjdOAoXa9+JubrTsBmi/LItLHNdmfE6+bo4= > -SIZE (mu-1.4.13.tar.xz) = 873288 > +SHA256 (mu-1.4.14.tar.xz) = 32QQ2+TL508UlamWpVjhQp+D8arxWI9cuN9zqbr/YLo= > +SIZE (mu-1.4.14.tar.xz) = 845996
[update][maintainer] mail/mu 1.4.13 -> 1.4.14
Hello, Simple update of mail/mu. It's a bugfix release without a change in functionality. Port changes: - removed revision - bumped version portcheck, port-lib-depends-check: ok make test (amd64): ok Best Regards, Stefan Index: Makefile === RCS file: /cvs/ports/mail/mu/Makefile,v retrieving revision 1.22 diff -u -p -u -p -r1.22 Makefile --- Makefile21 Dec 2020 15:00:34 - 1.22 +++ Makefile5 Jan 2021 15:39:57 - @@ -2,9 +2,8 @@ COMMENT= maildir indexer and searcher with emacs frontend -V= 1.4.13 +V= 1.4.14 GUILE_V= 2.2 -REVISION= 0 DISTNAME= mu-$V Index: distinfo === RCS file: /cvs/ports/mail/mu/distinfo,v retrieving revision 1.9 diff -u -p -u -p -r1.9 distinfo --- distinfo1 Sep 2020 13:57:39 - 1.9 +++ distinfo5 Jan 2021 15:39:57 - @@ -1,2 +1,2 @@ -SHA256 (mu-1.4.13.tar.xz) = smpQT4ZgtjdOAoXa9+JubrTsBmi/LItLHNdmfE6+bo4= -SIZE (mu-1.4.13.tar.xz) = 873288 +SHA256 (mu-1.4.14.tar.xz) = 32QQ2+TL508UlamWpVjhQp+D8arxWI9cuN9zqbr/YLo= +SIZE (mu-1.4.14.tar.xz) = 845996
[go.port.mk / portgen] Teach everyone how to handle Go's unique escaping
Hi,
This teaches portgen and go.port.mk how to handle module URLs that
contain uppercase characters.
Go has chosen to translate module names like
'github.com/poolpOrg/filter-rspamd' to
'github.com/ploop!org/filter-rspamd'.
They had reasons:
> To avoid ambiguity when serving from case-insensitive file systems,
> the $module and $version elements are case-encoded by replacing
> every uppercase letter with an exclamation mark followed by the
> corresponding lower-case letter. This allows modules example.com/M
> and example.com/m to both be stored on disk, since the former is
> encoded as example.com/!m.
Because of the need for escaping, a port like that looks like the one
below would not work:
MODGO_MODNAME =github.com/poolpOrg/filter-rspamd
MODGO_VERSION =v0.1.7
Same goes for `portgen go github.com/poolpOrg/filter-rspamd` - this
errors because it can't find the distfile.
The make magic is from espie@ / naddy@ - I am not clever enough to come
up with such voodoo myself! :D
I have tested a handful of existing MODGO_ ports with this diff, as well
as existing and new ports that were built with 'portgen go'.
OK?
Cheers,
Aaron
diff 7e3d98f862f0227602e41951ba307f467353d929 /usr/ports
blob - 16116f9b0525e89d7f4b115e7517cb913f107760
file + infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
--- infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
+++ infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
@@ -31,6 +31,8 @@ use Carp;
use Cwd;
use File::Temp qw/ tempdir /;
+use Data::Dumper;
+
use OpenBSD::PortGen::Dependency;
my $license_map = {
@@ -67,7 +69,7 @@ sub _go_determine_name
# Some modules end in "v1" or "v2", if we find one of these, we need
# to set PKGNAME to something up a level
my ( $self, $module ) = @_;
- my $json = $self->get_json( $module . '/@latest' );
+ my $json = $self->get_json( $self->_go_mod_normalize($module) . '/@latest' );
if ($json->{Version} =~ m/incompatible/) {
my $msg = "${module} $json->{Version} is incompatible with Go modules.";
@@ -131,7 +133,7 @@ sub _go_mod_info
my ($self, $json) = @_;
my $dir = tempdir(CLEANUP => 0);
- my $mod = $self->get("$json->{Module}/\@v/$json->{Version}.mod");
+ my $mod = $self->get($self->_go_mod_normalize($json->{Module}) . "/\@v/$json->{Version}.mod");
my ($module) = $mod =~ /\bmodule\s+(.*?)\s/;
unless ( $json->{Module} eq $module ) {
@@ -169,9 +171,10 @@ sub _go_mod_info
foreach my $mod (@raw_mods) {
foreach my $m (split(/ /, $mod)) {
$m =~ s/@/ /;
+ next if $m eq $json->{Module};
$m = $self->_go_mod_normalize($m);
if (! defined $all_deps->{$m}) {
-push @mods, $m unless $m eq $json->{Module};
+push @mods, $m;
$all_deps->{$m} = 1;
}
}
@@ -220,7 +223,7 @@ sub get_ver_info
# semver, this means we will have to fallback to @latest to get the
# version information.
if ($version_list eq "") {
- $ret = $self->get_json( $module . '/@latest' );
+ $ret = $self->get_json( $self->_go_mod_normalize($module) . '/@latest' );
} else {
my @parts = split("\n", $version_list);
for my $v ( @parts ) {
blob - 865c52df510ac8cc64f8f455ecbb8862e001f6d8
file + lang/go/go.port.mk
--- lang/go/go.port.mk
+++ lang/go/go.port.mk
@@ -14,6 +14,10 @@ MASTER_SITES${MODGO_MASTER_SITESN} ?= ${MASTER_SITE_AT
MODGO_RUN_DEPENDS = lang/go
MODGO_BUILD_DEPENDS = lang/go
+.for l in a b c d e f g h i j k l m n o p q r s t u v w x y z
+_subst := ${_subst}:S/${l:U}/!$l/g
+.endfor
+
.if ${NO_BUILD:L} == "no" && ${MODGO_BUILDDEP:L} == "yes"
BUILD_DEPENDS += ${MODGO_BUILD_DEPENDS}
.endif
@@ -57,13 +61,18 @@ MODGO_TEST_CMD += -ldflags="${MODGO_LDFLAGS}"
.endif
.if defined(MODGO_MODNAME)
+.for _s in ${_subst}
+MODGO_MODNAME_ESC = ${MODGO_MODNAME${_s}}
+DISTNAME_ESC = ${DISTNAME${_s}}
+.endfor
+
EXTRACT_SUFX ?= .zip
-PKGNAME ?= ${DISTNAME:S/-v/-/}
+PKGNAME ?= ${DISTNAME_ESC:S/-v/-/}
ALL_TARGET ?= ${MODGO_MODNAME}
MODGO_FLAGS += -modcacherw
-DISTFILES = ${DISTNAME}${EXTRACT_SUFX}{${MODGO_VERSION}${EXTRACT_SUFX}}
-EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
-MASTER_SITES ?= ${MASTER_SITE_ATHENS}${MODGO_MODNAME}/@v/
+DISTFILES = ${DISTNAME_ESC}${EXTRACT_SUFX}{${MODGO_VERSION}${EXTRACT_SUFX}}
+EXTRACT_ONLY = ${DISTNAME_ESC}${EXTRACT_SUFX}
+MASTER_SITES ?= ${MASTER_SITE_ATHENS}${MODGO_MODNAME_ESC}/@v/
. for _modpath _modver in ${MODGO_MODULES}
DISTFILES += ${MODGO_DIST_SUBDIR}/${_modpath}/@v/${_modver}.zip{${_modpath}/@v/${_modver}.zip}:${MODGO_MASTER_SITESN}
DISTFILES += ${MODGO_DIST_SUBDIR}/${_modpath}/@v/${_modver}.mod{${_modpath}/@v/${_modver}.mod}:${MODGO_MASTER_SITESN}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/01/05 06:53:33 Modified files: devel/spyder/spyder: Makefile Log message: Missed bump after recent devel/pylint change. prodded by sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/05 06:48:16 Modified files: security/libssh: Makefile Log message: missing a word in COMMENT
Re: CVS: cvs.openbsd.org: ports
On 2021/01/05 14:43, Antoine Jacoutot wrote: > On Mon, Jan 04, 2021 at 09:37:20PM -0700, Klemens Nanni wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: k...@cvs.openbsd.org2021/01/04 21:37:20 > > > > Modified files: > > devel/quirks : Makefile > > devel/quirks/files: Quirks.pm > > devel/pylint : Makefile distinfo > > Added files: > > devel/pylint/patches: patch-tests-lint-unittest_lint_py > > devel/pylint/pkg: DESCR PLIST > > Removed files: > > devel/pylint/patches: patch-pylint_test_unittest_lint_py > > devel/pylint/pkg: DESCR-gui DESCR-main PLIST-gui PLIST-main > > > > Log message: > > Update to pylint 2.6.0 > > > > First the package was broken due to too recent dependent packages, then it > > was broken due to beeing too old itself. > > > > Upstream dropped the GUI years ago, so remove it. > > > > With daniel > > Seems to have broken devel/spyder/spyder : > > --- /exopi-cvs/ports/plist/amd64/spyder3-3.3.3p4 > +++ /exopi-cvs/ports/plist/amd64/spyder3-3.3.3p4-new > @@ -16,13 +16,13 @@ > @depend devel/py-rope,python3:py3-rope->=0.10.5:py3-rope-0.18.0 > @depend > devel/py-setuptools,python3:py3-setuptools->=39.0.1v0:py3-setuptools-44.1.1v0 > @depend devel/pyflakes,python3:pyflakes3-*:pyflakes3-2.1.1p1 > -@depend devel/pylint,-main,python3:pylint3-*:pylint3-1.6.5p3 > +@depend devel/pylint,python3:pylint3-*:pylint3-2.6.0 yep, spyder needs a bump for ^^. totem is OK as it is BUILD_DEPENDS only.
Re: CVS: cvs.openbsd.org: ports
On Mon, Jan 04, 2021 at 09:37:20PM -0700, Klemens Nanni wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: k...@cvs.openbsd.org2021/01/04 21:37:20
>
> Modified files:
> devel/quirks : Makefile
> devel/quirks/files: Quirks.pm
> devel/pylint : Makefile distinfo
> Added files:
> devel/pylint/patches: patch-tests-lint-unittest_lint_py
> devel/pylint/pkg: DESCR PLIST
> Removed files:
> devel/pylint/patches: patch-pylint_test_unittest_lint_py
> devel/pylint/pkg: DESCR-gui DESCR-main PLIST-gui PLIST-main
>
> Log message:
> Update to pylint 2.6.0
>
> First the package was broken due to too recent dependent packages, then it
> was broken due to beeing too old itself.
>
> Upstream dropped the GUI years ago, so remove it.
>
> With daniel
Seems to have broken devel/spyder/spyder :
--- /exopi-cvs/ports/plist/amd64/spyder3-3.3.3p4
+++ /exopi-cvs/ports/plist/amd64/spyder3-3.3.3p4-new
@@ -16,13 +16,13 @@
@depend devel/py-rope,python3:py3-rope->=0.10.5:py3-rope-0.18.0
@depend
devel/py-setuptools,python3:py3-setuptools->=39.0.1v0:py3-setuptools-44.1.1v0
@depend devel/pyflakes,python3:pyflakes3-*:pyflakes3-2.1.1p1
-@depend devel/pylint,-main,python3:pylint3-*:pylint3-1.6.5p3
+@depend devel/pylint,python3:pylint3-*:pylint3-2.6.0
@depend
devel/spyder/py-spyder-kernels,python3:py3-spyder-kernels-<1.0:py3-spyder-kernels-0.4.2p3
-@depend lang/python/3.8,-main:python->=3.8,<3.9:python-3.8.6p1
-@depend net/py-zmq,python3:py3-zmq-*:py3-zmq-18.0.1p1v0
+@depend lang/python/3.8,-main:python->=3.8,<3.9:python-3.8.7
+@depend net/py-zmq,python3:py3-zmq-*:py3-zmq-18.0.1p2v0
@depend security/py-keyring,python3:py3-keyring-*:py3-keyring-9.3.1p5
@depend shells/py-qtconsole,python3:py3-qtconsole->=4.2.0:py3-qtconsole-4.3.0p4
-@depend sysutils/py-psutil,python3:py3-psutil-*:py3-psutil-5.4.3p3
+@depend sysutils/py-psutil,python3:py3-psutil-*:py3-psutil-5.4.3p4
@depend textproc/py-chardet,python3:py3-chardet->=2.0.0:py3-chardet-3.0.4p2
@depend textproc/py-numpydoc,python3:py3-numpydoc-*:py3-numpydoc-0.7.0p3
@depend textproc/py-pygments,python3:py3-pygments->=2.0:py3-pygments-2.5.2p0
*** Error 1 in devel/spyder/spyder
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2124
'/exopi-cvs/ports/packages/amd64/all/spyder3-3.3.3p4.tgz')
*** Error 2 in devel/spyder/spyder
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2605 '_internal-package': @case
X${_DEPENDS_CACHE} in X)...)
*** Error 2 in devel/spyder/spyder
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2584 'package':
@lock=spyder3-3.3.3p4; export _LOCKS_HEL...)
--
Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/01/05 06:24:09 Modified files: geo/gdal : Makefile distinfo Log message: geo/gdal: update to 3.2.1. See https://github.com/OSGeo/gdal/blob/v3.2.1/gdal/NEWS
Re: [UPDATE] graphics/openimageio
On Mon, Jan 04 2021, Dimitri Karamazov wrote: > On Sun, Jan 03, 2021 at 07:46:29PM +0100, Jeremie Courreges-Anglas wrote: >> On Sun, Jan 03 2021, Dimitri Karamazov wrote: >> > Update graphics/openimageio to 2.2.10.0 >> > >> > Build & run tested blender with it. >> > 14 out of 54 tests fail. >> > Atleast 3 of them fail because of some >> > optional dependencies not being turned on. >> > Like OpenVDB,libheif and ptex. >> >> > Removed the USE_DICOM option since it >> > is optional now. >> >> It may be optional, but it is still used if available: >> >> (after a make configure) >> --8<-- >> russell /usr/ports/graphics/openimageio$ doas pkg_delete dcmtk >> dcmtk-3.6.3p0: ok >> Read shared items: ok >> russell /usr/ports/graphics/openimageio$ make all MAKE_JOBS=2 2>&1 | tee log2 >> ===> Building for openimageio-2.2.10.0 >> ninja: error: '/usr/local/lib/libdcmimage.so.0.0', needed by >> 'lib/libOpenImageIO.so.8.0', missing and no known rule to make it >> -->8-- >> >> Optional deps for which we have ports should be explicitely enabled or >> disabled, to avoid problems during bulk builds. See the commit log: >> > > Oh, I should use a better method to search across ports. > Couldn't find DICOM when I tried to. > > Hi pascal, I wonder if I can take maintainership of this port. > It is only required by blender and the update to this are very > frequent which I intend to take care of. > > Let me know what you think. > > Any comments,OK's? LGTM ports-wise, I'll commit that later today unless someone objects or beats me to it (ok jca@). -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/05 06:03:15 Modified files: math/visidata : Makefile math/visidata/pkg: README Log message: visidata: add openpyxl to README as optional dep
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/05 06:01:46 Modified files: textproc : Makefile misc : Makefile Log message: +textproc/py-openpyxl +textproc/py-et_xmlfile +misc/py-jdcal
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org 2021/01/05 06:01:12
Modified files:
textproc/py-openpyxl: Makefile
Log message:
oops, openpyxl should be FLAVOR=python3 not
MODPY_VERSION=${MODPY_DEFAULT_VERSION_3}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/05 05:58:23 Log message: import textproc/py-openpyxl and dependencies py-et_xmlfile py-jdcal, benoit@ py-et_xmlfile: low memory library for creating large XML files py-jdcal: convert between Julian and calendar dates py-openpyxl: Python library to read/write Excel 2010 xlsx/xlsm files Status: Vendor Tag: sthen Release Tags: sthen_20210105 N ports/textproc/py-et_xmlfile/Makefile N ports/textproc/py-et_xmlfile/distinfo N ports/textproc/py-et_xmlfile/pkg/DESCR N ports/textproc/py-et_xmlfile/pkg/PLIST N ports/textproc/py-openpyxl/Makefile N ports/textproc/py-openpyxl/distinfo N ports/textproc/py-openpyxl/pkg/DESCR N ports/textproc/py-openpyxl/pkg/PLIST N ports/misc/py-jdcal/Makefile N ports/misc/py-jdcal/distinfo N ports/misc/py-jdcal/pkg/DESCR N ports/misc/py-jdcal/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/05 05:45:58 Modified files: net/utox : Makefile Log message: utox: disable static-linking of some libraries, which was hiding a dbus dependency
Re: make ninja use python3
On 2021/01/05 01:06, Daniel Dickman wrote:
> cmake uses python3, but ninja is still on python2.
>
> Below diff switches ninja to python3 which should mean that 700+ ports
> won't have python2 as an indirect BDEP anymore.
>
> ok?
Build works and the scripts in /usr/local/share/ninja seem py3-clean. OK.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/ninja/Makefile,v
> retrieving revision 1.32
> diff -u -p -u -r1.32 Makefile
> --- Makefile 2 Dec 2020 20:24:22 - 1.32
> +++ Makefile 5 Jan 2021 05:50:54 -
> @@ -10,6 +10,7 @@ COMMENT = small build system with a foc
> GH_ACCOUNT = ninja-build
> GH_PROJECT = ninja
> GH_TAGNAME = v1.10.2
> +REVISION = 0
>
> CATEGORIES = devel
>
> @@ -30,6 +31,7 @@ MODPY_ADJ_FILES = bootstrap.py \
> configure.py \
> misc/ninja_syntax.py \
> src/browse.py
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> # Not strictly required, but will be used if available. Included as a build
> # dependency to ensure consistent builds.
>
Re: pylint-3: AttributeError: module '_ast' has no attribute 'Str'
On 2021/01/05 05:37, Klemens Nanni wrote:
> On Mon, Jan 04, 2021 at 10:33:37PM -0500, Daniel Dickman wrote:
> > Updates work ok for me with my latest diff below. Maybe take a look if it
> > helps?
> >
> > Note I haven't checked the pkgpath and conflict markers carefully enough.
> > And I haven't tested the pylint consumers, but this has been working for
> > me otherwise.
> Yup, I failed to apply @pkgpath for the -gui package because I simply
> misunderstood its meaning and quirks.
>
> I thought pkgpath is really just for packages which continue to provide
> files/features of previous ones, hence why I didn't add a marker;
> I also thought quirks would properly remove obsolete reasons (I made
> that mistake in the past already)...
@pkgpath X means "this package may be considered as a match for
replacing a previously installed package with path X"
other checks are still done, so:
- there still needs to be a reason for picking up a package with this
name, that may be because the name is the same as previously, or because
there's a quirks entry handling the rename (version number checks are
still done in that case), or because some other port depends on it
- if the files conflict, there must be a valid @conflict marker so that
pkg_add knows which order to remove/install files
> Your new diff has correct PLIST bits and upgrade works for me as well.
> Thanks a lot, I committed the update.
>
The @conflict weren't quite right, no harm but there were never any
pylint-main-$VER/pylint3-main-$VER packages so they aren't needed
(it's good to avoid "not needed" things in ports even if they don't
cause an actual problem because crib from existing ports for examples
all the time so they tend to get copied around).
There's no need to rename with MODPY_BIN_SUFFIX any more now it is
py3-only and there's no conflict. Only users are totem (which detects
any of pylint/pylint3/pylint-3) and spyder (imports rather than running
the script).
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/pylint/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile5 Jan 2021 04:37:20 - 1.34
+++ Makefile5 Jan 2021 10:36:01 -
@@ -4,6 +4,8 @@ COMMENT = lint-like code checker for Py
MODPY_EGG_VERSION =2.6.0
DISTNAME= pylint-${MODPY_EGG_VERSION}
+REVISION= 0
+
CATEGORIES=devel
HOMEPAGE= https://www.pylint.org/
@@ -29,10 +31,5 @@ FLAVORS =python3
FLAVOR = python3
FULLPKGNAME = ${PKGNAME:S/pylint/pylint3/}
-
-post-install:
-.for i in epylint pylint pyreverse symilar
- mv ${PREFIX}/bin/$i{,${MODPY_BIN_SUFFIX}}
-.endfor
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/pylint/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- pkg/PLIST 5 Jan 2021 04:37:20 - 1.1
+++ pkg/PLIST 5 Jan 2021 10:36:01 -
@@ -1,17 +1,15 @@
@comment $OpenBSD: PLIST,v 1.1 2021/01/05 04:37:20 kn Exp $
@conflict pylint-*
-@conflict pylint-main-*
@conflict pylint-gui-*
-@conflict pylint3-main-*
@conflict pylint3-gui-*
@pkgpath devel/pylint,-main
@pkgpath devel/pylint,-gui
@pkgpath devel/pylint,-main,python3
@pkgpath devel/pylint,-gui,python3
-bin/epylint${MODPY_BIN_SUFFIX}
-bin/pylint${MODPY_BIN_SUFFIX}
-bin/pyreverse${MODPY_BIN_SUFFIX}
-bin/symilar${MODPY_BIN_SUFFIX}
+bin/epylint
+bin/pylint
+bin/pyreverse
+bin/symilar
lib/python${MODPY_VERSION}/site-packages/pylint/
lib/python${MODPY_VERSION}/site-packages/pylint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pylint-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Re: update eduke32 to 9297-2bb6cbcae
Hi,
I had a diff with the commit hash on a separate variable, but this is
way more elegant and also works for me.
OK mestre@
On 21:21 Tue 05 Jan , Jonathan Gray wrote:
> Tested with Duke3D and Ion Fury.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/eduke32/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile 10 Apr 2020 14:59:48 - 1.26
> +++ Makefile 5 Jan 2021 08:36:16 -
> @@ -1,11 +1,10 @@
> # $OpenBSD: Makefile,v 1.26 2020/04/10 14:59:48 cwen Exp $
>
> COMMENT =Enhanced Duke Nukem 3D engine
> -RDATE = 20191222
> -RTAG = 8494
> +RDATE = 20201221
> +RTAG = 9297-2bb6cbcae
> DISTNAME = eduke32_src_${RDATE}-${RTAG}
> -PKGNAME =eduke32-2.0.0.${RTAG}
> -REVISION = 0
> +PKGNAME =eduke32-2.0.0.${RTAG:C/-.*$//}
> EXTRACT_SUFX = .tar.xz
> CATEGORIES = games x11
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/eduke32/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 30 Dec 2019 08:32:46 - 1.5
> +++ distinfo 5 Jan 2021 08:36:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (eduke32_src_20191222-8494.tar.xz) =
> RaI1M725fVdITdOus9lSZQQspn1R/PfxFpUugWTOcww=
> -SIZE (eduke32_src_20191222-8494.tar.xz) = 15951736
> +SHA256 (eduke32_src_20201221-9297-2bb6cbcae.tar.xz) =
> QkVw0E3G1pdUymv9y1OeAUh/Hci308htJQFATOOvUpQ=
> +SIZE (eduke32_src_20201221-9297-2bb6cbcae.tar.xz) = 19943652
> Index: patches/patch-Common_mak
> ===
> RCS file: /cvs/ports/games/eduke32/patches/patch-Common_mak,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Common_mak
> --- patches/patch-Common_mak 30 Dec 2019 08:32:46 - 1.2
> +++ patches/patch-Common_mak 5 Jan 2021 08:36:16 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Common_mak,v 1.2 2019/12
> Index: Common.mak
> --- Common.mak.orig
> +++ Common.mak
> -@@ -710,7 +710,7 @@ ifeq (0,$(RELEASE))
> +@@ -693,7 +693,7 @@ ifeq (0,$(RELEASE))
> F_NO_STACK_PROTECTOR :=
> else
> ifeq (0,$(CLANG))
> @@ -12,3 +12,13 @@ Index: Common.mak
> endif
>
> ifeq (0,$(FORCEDEBUG))
> +@@ -1017,7 +1017,8 @@ ifeq (,$(VC_HASH))
> + VC_HASH := $(shell git rev-parse --short=9 HEAD 2>&1)
> + endif
> + ifeq (,$(VC_BRANCH))
> +-VC_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>&1)
> ++#VC_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>&1)
> ++VC_BRANCH := master
> + ifneq (master,$(VC_BRANCH))
> + VC_REV := $(VC_REV)[$(VC_BRANCH)]
> + endif
> Index: patches/patch-GNUmakefile
> ===
> RCS file: /cvs/ports/games/eduke32/patches/patch-GNUmakefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-GNUmakefile
> --- patches/patch-GNUmakefile 30 Dec 2019 08:32:46 - 1.3
> +++ patches/patch-GNUmakefile 5 Jan 2021 08:36:16 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-GNUmakefile,v 1.3 2019/1
> Index: GNUmakefile
> --- GNUmakefile.orig
> +++ GNUmakefile
> -@@ -240,7 +240,6 @@ engine_objs := \
> +@@ -222,7 +222,6 @@ engine_objs := \
> hightile.cpp \
> klzw.cpp \
> kplib.cpp \
> @@ -11,7 +11,7 @@ Index: GNUmakefile
> md4.cpp \
> mhk.cpp \
> miniz.c \
> -@@ -403,8 +402,8 @@ ifeq ($(RENDERTYPE),SDL)
> +@@ -387,8 +386,8 @@ ifeq ($(RENDERTYPE),SDL)
> endif
>
> ifneq (0,$(HAVE_XMP))
> @@ -22,7 +22,7 @@ Index: GNUmakefile
> endif
>
>
> -@@ -684,7 +683,7 @@ ifeq ($(SUBPLATFORM),LINUX)
> +@@ -587,7 +586,7 @@ ifeq ($(SUBPLATFORM),LINUX)
> endif
>
> ifeq ($(PLATFORM),BSD)
> @@ -31,7 +31,7 @@ Index: GNUmakefile
> endif
>
> ifeq ($(PLATFORM),DARWIN)
> -@@ -851,13 +850,14 @@ endif
> +@@ -760,13 +759,14 @@ endif
>
> Final setup
>
> @@ -47,11 +47,3 @@ Index: GNUmakefile
>
> ifneq (0,$(USE_PHYSFS))
> COMPILERFLAGS += -I$(physfs_inc) -DUSE_PHYSFS
> -@@ -875,7 +875,6 @@ libraries := \
> - audiolib \
> - engine \
> - glad \
> --libxmplite \
> - lpeg \
> - mact \
> - voidwrap \
> Index: patches/patch-source_audiolib_src_multivoc_cpp
> ===
> RCS file:
> /cvs/ports/games/eduke32/patches/patch-source_audiolib_src_multivoc_cpp,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-source_audiolib_src_multivoc_cpp
> --- patches/patch-source_audiolib_src_multivoc_cpp30 Dec 2019 08:32:46
> - 1.1
> +++ patches/patch-source_audiolib_src_multivoc_cpp5 Jan 2021 08:36:16
> -
> @@ -13,5 +13,5 @@ Index: source/audiolib/src/multivoc.cpp
> -# include "libxmp-lite/xmp.h"
> +# include
>
> - int MV_XMPInterpolation = XMP_INTERP_SPLINE;
> + int MV_XMPInterpolation = XMP_INTERP_NEAREST;
> #endif
> Index: patches/patch-source_audiolib_src_xmp_cpp
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/05 04:11:43 Modified files: sysutils/moreutils: Makefile distinfo Log message: update to moreutils-0.65
[s...@spacehopper.org: NEW: openpyxl plus deps]
anyone? - Forwarded message from Stuart Henderson - From: Stuart Henderson Date: Sun, 6 Dec 2020 14:09:06 + To: ports Subject: NEW: openpyxl plus deps Mail-Followup-To: ports This includes the following: textproc/py-openpyxl textproc/py-et_xmlfile misc/py-jdcal OK to import? tested with visidata. Information for inst:py3-et_xmlfile-1.0.1 Comment: low memory library for creating large XML files Required by: py3-openpyxl-3.0.5 Description: et_xmlfile is a low memory library for creating large XML files. It is based upon the xmlfile module from lxml with the aim of allowing code to be developed that will work with both libraries. It was developed initially for the openpyxl project but is now a standalone module. Maintainer: The OpenBSD ports mailing-list WWW: https://pypi.python.org/pypi/et_xmlfile Information for inst:py3-jdcal-1.4.1 Comment: convert between Julian and calendar dates Required by: py3-openpyxl-3.0.5 Description: This module contains functions for converting between Julian dates and calendar dates. A function for converting Gregorian calendar dates to Julian dates, and another function for converting Julian calendar dates to Julian dates are defined. Two functions for the reverse calculations are also defined. Different regions of the world switched to Gregorian calendar from Julian calendar on different dates. Having separate functions for Julian and Gregorian calendars allow maximum flexibility in choosing the relevant calendar. Maintainer: The OpenBSD ports mailing-list WWW: https://github.com/phn/jdcal Information for inst:py3-openpyxl-3.0.5 Comment: Python library to read/write Excel 2010 xlsx/xlsm files Description: openpyxl is a Python library to read/write Excel 2010 files (xlsx, xlsm, xltx, xltm). Maintainer: The OpenBSD ports mailing-list WWW: https://openpyxl.readthedocs.io/ - End forwarded message - - Forwarded message from Stuart Henderson - From: Stuart Henderson Date: Tue, 8 Dec 2020 10:40:36 + To: ports Subject: Re: NEW: openpyxl plus deps Mail-Followup-To: ports On 2020/12/06 14:09, Stuart Henderson wrote: > This includes the following: > > textproc/py-openpyxl > textproc/py-et_xmlfile > misc/py-jdcal > > OK to import? tested with visidata. btw, to test, install this + math/visidata, ftp https://download.microsoft.com/download/1/4/E/14EDED28-6C58-4055-A65C-23B4DA81C4DE/Financial%20Sample.xlsx vd Financial%20Sample.xlsx press enter to open sheet1 - End forwarded message - openpyxl-and-deps.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/01/05 03:29:44 Added files: www/tor-browser/browser/patches: patch-dom_webgpu_ipc_WebGPUParent_cpp www/firefox-esr/patches: patch-dom_webgpu_ipc_WebGPUParent_cpp mail/mozilla-thunderbird/patches: patch-dom_webgpu_ipc_WebGPUParent_cpp Log message: fix build with cbindgen 0.16.0 backports https://hg.mozilla.org/releases/mozilla-esr78/rev/a1f99bfc3ee5 from bug #1684180
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/01/05 03:27:06 Modified files: devel/cbindgen : Makefile distinfo devel/cbindgen/patches: patch-tests_tests_rs Log message: devel/cbindgen: update to 0.16.0.
update yquake2 to 7.45
Index: Makefile
===
RCS file: /cvs/ports/games/yquake2/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile9 Jul 2020 21:10:21 - 1.22
+++ Makefile5 Jan 2021 08:08:59 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
COMMENT= Yamagi Quake II
N= yquake2
-V= 7.43
+V= 7.45
PKGNAME= ${N}-${V}
DISTNAME= quake2-${V}
CATEGORIES=games
Index: distinfo
===
RCS file: /cvs/ports/games/yquake2/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo24 Mar 2020 17:58:12 - 1.9
+++ distinfo5 Jan 2021 08:09:32 -
@@ -1,2 +1,2 @@
-SHA256 (quake2-7.43.tar.xz) = kncKVwye61DtMF2DqHKeezTOv3Fm8bijXSPXSicXPxY=
-SIZE (quake2-7.43.tar.xz) = 1989812
+SHA256 (quake2-7.45.tar.xz) = x1JFZ78apgRfJWGb6m5P2QZihLP7gYY7WB+0T09H/2U=
+SIZE (quake2-7.45.tar.xz) = 1997816
update eduke32 to 9297-2bb6cbcae
Tested with Duke3D and Ion Fury.
Index: Makefile
===
RCS file: /cvs/ports/games/eduke32/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile10 Apr 2020 14:59:48 - 1.26
+++ Makefile5 Jan 2021 08:36:16 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.26 2020/04/10 14:59:48 cwen Exp $
COMMENT = Enhanced Duke Nukem 3D engine
-RDATE =20191222
-RTAG = 8494
+RDATE =20201221
+RTAG = 9297-2bb6cbcae
DISTNAME = eduke32_src_${RDATE}-${RTAG}
-PKGNAME = eduke32-2.0.0.${RTAG}
-REVISION = 0
+PKGNAME = eduke32-2.0.0.${RTAG:C/-.*$//}
EXTRACT_SUFX = .tar.xz
CATEGORIES = games x11
Index: distinfo
===
RCS file: /cvs/ports/games/eduke32/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo30 Dec 2019 08:32:46 - 1.5
+++ distinfo5 Jan 2021 08:36:16 -
@@ -1,2 +1,2 @@
-SHA256 (eduke32_src_20191222-8494.tar.xz) =
RaI1M725fVdITdOus9lSZQQspn1R/PfxFpUugWTOcww=
-SIZE (eduke32_src_20191222-8494.tar.xz) = 15951736
+SHA256 (eduke32_src_20201221-9297-2bb6cbcae.tar.xz) =
QkVw0E3G1pdUymv9y1OeAUh/Hci308htJQFATOOvUpQ=
+SIZE (eduke32_src_20201221-9297-2bb6cbcae.tar.xz) = 19943652
Index: patches/patch-Common_mak
===
RCS file: /cvs/ports/games/eduke32/patches/patch-Common_mak,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Common_mak
--- patches/patch-Common_mak30 Dec 2019 08:32:46 - 1.2
+++ patches/patch-Common_mak5 Jan 2021 08:36:16 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-Common_mak,v 1.2 2019/12
Index: Common.mak
--- Common.mak.orig
+++ Common.mak
-@@ -710,7 +710,7 @@ ifeq (0,$(RELEASE))
+@@ -693,7 +693,7 @@ ifeq (0,$(RELEASE))
F_NO_STACK_PROTECTOR :=
else
ifeq (0,$(CLANG))
@@ -12,3 +12,13 @@ Index: Common.mak
endif
ifeq (0,$(FORCEDEBUG))
+@@ -1017,7 +1017,8 @@ ifeq (,$(VC_HASH))
+ VC_HASH := $(shell git rev-parse --short=9 HEAD 2>&1)
+ endif
+ ifeq (,$(VC_BRANCH))
+-VC_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>&1)
++#VC_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>&1)
++VC_BRANCH := master
+ ifneq (master,$(VC_BRANCH))
+ VC_REV := $(VC_REV)[$(VC_BRANCH)]
+ endif
Index: patches/patch-GNUmakefile
===
RCS file: /cvs/ports/games/eduke32/patches/patch-GNUmakefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-GNUmakefile
--- patches/patch-GNUmakefile 30 Dec 2019 08:32:46 - 1.3
+++ patches/patch-GNUmakefile 5 Jan 2021 08:36:16 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-GNUmakefile,v 1.3 2019/1
Index: GNUmakefile
--- GNUmakefile.orig
+++ GNUmakefile
-@@ -240,7 +240,6 @@ engine_objs := \
+@@ -222,7 +222,6 @@ engine_objs := \
hightile.cpp \
klzw.cpp \
kplib.cpp \
@@ -11,7 +11,7 @@ Index: GNUmakefile
md4.cpp \
mhk.cpp \
miniz.c \
-@@ -403,8 +402,8 @@ ifeq ($(RENDERTYPE),SDL)
+@@ -387,8 +386,8 @@ ifeq ($(RENDERTYPE),SDL)
endif
ifneq (0,$(HAVE_XMP))
@@ -22,7 +22,7 @@ Index: GNUmakefile
endif
-@@ -684,7 +683,7 @@ ifeq ($(SUBPLATFORM),LINUX)
+@@ -587,7 +586,7 @@ ifeq ($(SUBPLATFORM),LINUX)
endif
ifeq ($(PLATFORM),BSD)
@@ -31,7 +31,7 @@ Index: GNUmakefile
endif
ifeq ($(PLATFORM),DARWIN)
-@@ -851,13 +850,14 @@ endif
+@@ -760,13 +759,14 @@ endif
Final setup
@@ -47,11 +47,3 @@ Index: GNUmakefile
ifneq (0,$(USE_PHYSFS))
COMPILERFLAGS += -I$(physfs_inc) -DUSE_PHYSFS
-@@ -875,7 +875,6 @@ libraries := \
- audiolib \
- engine \
- glad \
--libxmplite \
- lpeg \
- mact \
- voidwrap \
Index: patches/patch-source_audiolib_src_multivoc_cpp
===
RCS file:
/cvs/ports/games/eduke32/patches/patch-source_audiolib_src_multivoc_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-source_audiolib_src_multivoc_cpp
--- patches/patch-source_audiolib_src_multivoc_cpp 30 Dec 2019 08:32:46
- 1.1
+++ patches/patch-source_audiolib_src_multivoc_cpp 5 Jan 2021 08:36:16
-
@@ -13,5 +13,5 @@ Index: source/audiolib/src/multivoc.cpp
-# include "libxmp-lite/xmp.h"
+# include
- int MV_XMPInterpolation = XMP_INTERP_SPLINE;
+ int MV_XMPInterpolation = XMP_INTERP_NEAREST;
#endif
Index: patches/patch-source_audiolib_src_xmp_cpp
===
RCS file: /cvs/ports/games/eduke32/patches/patch-source_audiolib_src_xmp_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-source_audiolib_src_xmp_cpp
--- patches/patch-source_audiolib_src_xmp_cpp 30 Dec 2019 08:32:46 -
1.1
+++ patches/patch-source_audiolib_src_xmp_cpp 5 Jan 2021 08:36:16 -
@@ -13,5 +13,5 @@ Index: source/audiolib/src/xmp.cpp
-#include
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2021/01/05 01:19:25 Modified files: graphics/pho : Makefile distinfo graphics/pho/patches: patch-Makefile Log message: Update to pho-1.0 from wen heping
