CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2020/05/19 20:12:28 Modified files: net: Makefile Log message: Hookup ruby-cbor
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2020/05/19 20:09:14 Log message: Import ruby-cbor, Concise Binary Object Representation implementation for Ruby OK lteo@ Status: Vendor Tag: jeremy Release Tags: jeremy_2020-May-19 N ports/net/ruby-cbor/Makefile N ports/net/ruby-cbor/distinfo N ports/net/ruby-cbor/pkg/DESCR N ports/net/ruby-cbor/pkg/PLIST No conflicts created by this import
Re: New: net/ruby-cbor
On Sun, May 17, 2020 at 12:37:43PM -0700, Jeremy Evans wrote: > This is a CBOR (Concise Binary Object Representation, RFC 7049) > implementation for Ruby. It's a dependency of the webauthn gem, > needed for implementing WebAuthn in Ruby. > > Tested on amd64. Looking for OKs to import. ok lteo@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2020/05/19 17:41:06 Modified files: sysutils/login_duo: Makefile distinfo sysutils/login_duo/pkg: PLIST Log message: Update login_duo to 1.11.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2020/05/19 17:30:10 Modified files: www/openradtool: Makefile distinfo Log message: Update openradtool to 0.8.14
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/19 17:14:04 Modified files: www/p5-HTML-Mason: Makefile distinfo Log message: update p5-HTML-Mason to 1.59
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/19 17:13:23 Modified files: converters/p5-JSON-MaybeXS: Makefile distinfo converters/p5-JSON-MaybeXS/pkg: DESCR Log message: update p5-JSON-MaybeXS to 1.004002
NEW: graphics/radeontop
Hi, This a port of radeontop, a nice small utility to look for bottlenecks with your GPU. It runs in the terminal and shows with bar graphs and percentages how much of e.g. Event Engine, shader technology, VRAM are being used. This is only for radeon and amdgpu cards, from R600 up (that is the Radeon HD 2xxx series and higher). It needs to be run as root her for PCI accesss. Passes make lib-port-depends-check and portcheck. I thought this might be useful for debugging radeon/amdgpu issues. I tested if amdgpu maybe runs out of VRAM when it locks up with piglit, but couldn't confirm that. Apart from that, this might be useful for people who are looking into graphics performance issues. Basic usage and a screenshot can be found at [1]. There's also a man page. comments/ok? [1] https://github.com/clbr/radeontop radeontop.tgz Description: Binary data
Re: Switching boehm-gc from sbrk to mmap
On Tue, May 19, 2020 at 08:57:55PM +0100, Stuart Henderson wrote: > FWIW pointing w3m at a selection of websites seems quite a good way to > tickle problems in boehm-gc.. Yup, w3m has been crashing on somehwere in boehm-gc for me every once in a while... never bothered to poke around in GC stuff, though - sorry.
Re: UPDATE: games/uhexen2 1.5.9
On Tue, May 19, 2020 at 07:03:23AM -0500, Paul Valencia wrote: [...] > Here is the diff to update uhexen2 to the latest version. I > adapted the patches (line positions) so that they still apply > in this version. > > Tested some levels on amd64 with the Steam assets of the game > (*.pak files) in Single Player and Co-op. I tested it in single player briefly. Runs nicely as long as I don't try to turn on Anti-Aliasing - then the menu fonts start to flicker. I don't know if that's a pre-existing or new problem. Would also defer details of all the CFLAGS etc changes to maintainer's comment.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 16:15:30 Modified files: net/wireshark : Tag: OPENBSD_6_7 Makefile distinfo Removed files: net/wireshark/patches: Tag: OPENBSD_6_7 patch-ui_qt_capture_interfaces_dialog_cpp Log message: update to wireshark-3.2.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 16:15:21 Modified files: net/wireshark : Makefile distinfo Removed files: net/wireshark/patches: patch-ui_qt_capture_interfaces_dialog_cpp Log message: update to wireshark-3.2.4
Re: update for ports-fvwm to 2.6.9
On Fri, Apr 10, 2020 at 10:54:06AM +0200, Rafael Sadowski wrote: [...] > > - upstream distfiles for fvicons are gone and can't find replacement. > > Therefore, MASTER_SITES0 set to > > https://ftp.openbsd.org/pub/OpenBSD/distfiles/. Or rather remove? > > I would remove the icons if there are gone upstream but this is my > personal opinion. ping with updated diff that removes fvicons, which makes the port much simpler. Index: Makefile === RCS file: /cvs/ports/x11/fvwm2/Makefile,v retrieving revision 1.67 diff -u -p -r1.67 Makefile --- Makefile12 Jul 2019 20:51:11 - 1.67 +++ Makefile19 May 2020 21:59:10 - @@ -1,21 +1,15 @@ # $OpenBSD: Makefile,v 1.67 2019/07/12 20:51:11 sthen Exp $ -COMMENT-main= multiple virtual desktop window manager, with icons -COMMENT-fvicons=multiple virtual desktop window manager icons -COMMENT-fvwm2= multiple virtual desktop window manager, without icons +COMMENT= multiple virtual desktop window manager -VERSION= 2.6.5 +VERSION= 2.6.9 DISTNAME= fvwm-${VERSION} -PKGNAME-main= fvwm2+fvicons-${VERSION} -FULLPKGNAME-fvicons=fvicons-${VERSION} -PKGNAME-fvwm2= fvwm2-${VERSION} -REVISION= 6 +PKGNAME= fvwm2-${VERSION} CATEGORIES= x11 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons-20070101.tar.gz - HOMEPAGE= http://www.fvwm.org/ +MAINTAINER=Thomas Frohwein # GPL/BSD-like (badly worded) PERMIT_PACKAGE=Yes @@ -25,15 +19,13 @@ WANTLIB += c cairo curses fontconfig fre WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m png WANTLIB += readline rsvg-2 z -MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ +MASTER_SITES= https://github.com/fvwmorg/fvwm/releases/download/${VERSION}/ LIB_DEPENDS+= graphics/png \ x11/gnome/librsvg BUILD_DEPENDS= textproc/libxslt -MULTI_PACKAGES=-main -fvwm2 -fvicons - FLAVORS= debug FLAVOR?= @@ -41,17 +33,13 @@ FLAVOR?= CONFIGURE_ARGS+= --enable-debug-msgs .endif -PKG_ARCH-fvicons= * -LIB_DEPENDS-fvicons= -WANTLIB-fvicons= -FULLPKGPATH-fvicons= ${PKGPATH},-fvicons - SUBST_VARS=VERSION SEPARATE_BUILD= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS += --disable-bidi \ --disable-gtk \ + --enable-mandoc \ --without-gnome \ --without-rplay-library \ --without-stroke-library @@ -59,8 +47,6 @@ CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/fvwm - ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm ${PREFIX}/share/pixmaps/fvwm/ - ${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/share/fvwm + ${INSTALL_DATA} ${WRKSRC}/default-config/config ${PREFIX}/share/fvwm .include Index: distinfo === RCS file: /cvs/ports/x11/fvwm2/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo18 Jan 2015 03:15:53 - 1.14 +++ distinfo19 May 2020 21:59:10 - @@ -1,4 +1,2 @@ -SHA256 (fvwm-2.6.5.tar.gz) = 8B+dqAdoUvjbEU+Q8rB1jCHSZeKVj84EKJ5Be866EtE= -SHA256 (fvwm_icons-20070101.tar.gz) = oL5qSSCzjVj/7+QwdYvB2QEtfHSrZWDL1udYpb3q6yw= -SIZE (fvwm-2.6.5.tar.gz) = 3449177 -SIZE (fvwm_icons-20070101.tar.gz) = 363286 +SHA256 (fvwm-2.6.9.tar.gz) = G8ZM88zQBzAIdYFoMnqCZbgFne+bI5tFHWufqyzDka4= +SIZE (fvwm-2.6.9.tar.gz) = 3942859 Index: patches/patch-bin_Makefile_in === RCS file: /cvs/ports/x11/fvwm2/patches/patch-bin_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-bin_Makefile_in --- patches/patch-bin_Makefile_in 26 Apr 2011 18:50:46 - 1.1 +++ patches/patch-bin_Makefile_in 19 May 2020 21:59:10 - @@ -1,11 +1,12 @@ $OpenBSD: patch-bin_Makefile_in,v 1.1 2011/04/26 18:50:46 shadchin Exp $ bin/Makefile.in.orig Fri Mar 4 08:47:50 2011 -+++ bin/Makefile.inFri Mar 4 08:48:13 2011 -@@ -710,14 +710,13 @@ info: info-am +Index: bin/Makefile.in +--- bin/Makefile.in.orig bin/Makefile.in +@@ -835,14 +835,13 @@ info: info-am info-am: --install-data-am: install-data-local install-man +-install-data-am: install-configDATA install-data-local install-man +install-data-am: install-man install-dvi: install-dvi-am Index: patches/patch-config_h_in === RCS file: patches/patch-config_h_in diff -N patches/patch-config_h_in --- patches/patch-config_h_in 26 Apr 2011 18:50:46 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBSD: patch-config_h_in,v 1.2 2011/04/26 18:50:46 shadchin Exp $ config.h.in.orig Mon Aug 9 18:30:50 2010 -+++ config.h.inThu Mar 3 21:36:48 2011
Re: Update lang/ecl to 20.4.24
Le Tue, 19 May 2020 13:13:06 -0400, Kurt Mosiejczuk a écrit : > On Tue, May 19, 2020 at 08:59:48AM -0700, Josh Elsasser wrote: > > Here's a quick update to the new release, minimally tested as a > > lang/sbcl build host. The patch removes files, don't forget patch > > -E > > Someone should do testing with math/maxima, net/clic, and > sysutils/reed-alert. sysutils/reed-alert still work fine with this update net/clic will build but fail to start, I'm investigating about this but I think I'll have to rework a bit the code (I'm upstream for both). I'm very happy to see this ecl update though!
NEW: devel/msbuild - build system for .NET
Hi, This is a port of MSBuild, the build system for .NET. lang/mono ships with xbuild which was an initial replacement for MSBuild, however since the more official integration of mono into .NET, xbuild has been deprecated by mono for several years now. Of note, that happened without MSBuild actually shipping with mono. At this point there is a growing list of .NET projects that only build with MSBuild. That's the raison d'etre for this port. This port is heavily inspired by FreeBSD's port which helped me simplify things and find some solutions. It bootstraps itself with a bundled MSBuild assembly that is invoked with mono, and pulls in a gargantuan (1G after extraction) amount of NuGet dependencies via a bundled NuGet assembly. I have created a separate tar.xz of those dependencies, so that it builds without internet connection. Passes make port-lib-depends-check and portcheck. I have built a few projects like the latest (upstream) version of games/openra which refuses to work with xbuild successfully. There are still a lot of projects that look for non-existant components which are likely included with Microsoft's dotnet/ corefx/coreclr distributions. Other things of note about the port: - This is not the very latest version upstream, but newer ones seem to require dotnet CLI. It's the same as in FreeBSD's tree though. - Versioning is confusing between mono's 0.06, and the MSBuild versioning. I chose 15.8pre0 based on what FreeBSD does ("15.8-preview") - The license is MIT. There are 137 NuGet packages in the build. These are a mix of MIT, Apache-2.0, and Microsoft .NET library license [1] - 'make test' doesn't work at this point, therefore is disabled (see comment in Makefile) Thanks to bcallah@ for hosting the NuGet dependencies. Comments, concerns, ok's are welcome. [1] https://dotnet.microsoft.com/en/dotnet_library_license.htm msbuild.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 14:45:49 Modified files: mail/notmuch/notmuch: Makefile Log message: move gnupg2 from TEST_DEPENDS to BUILD_DEPENDS, hopefully this really fixes it
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/19 14:41:46 Modified files: multimedia/aom : Makefile distinfo Log message: Update to aom-2.0.0. No change since rc1. from Brad (maintainer)
Re: Switching boehm-gc from sbrk to mmap
On 2020/05/19 08:55, Josh Elsasser wrote: > While testing a lang/ecl update I found that a sbrk-based heap is too > small on i386 to run large programs, like lang/sbcl's > cross-compiler. Switching to an mmap-based heap seems to work fine for > ecl 20.4.24 but I wonder if it would break any other consumers. FWIW pointing w3m at a selection of websites seems quite a good way to tickle problems in boehm-gc..
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/19 13:48:48 Modified files: devel/cutter : Makefile distinfo Log message: update to cutter-1.10.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/05/19 13:48:02 Modified files: devel/radare2 : Makefile.inc devel/radare2/main: Makefile distinfo devel/radare2/main/patches: patch-libr_Makefile devel/radare2/main/pkg: PLIST Removed files: devel/radare2/main/patches: patch-libr_io_p_io_ptrace_c Log message: - update to radare2-4.4.0 - take over maintainership as suggested by edd@ ok edd@ (previous MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/19 13:46:09 Modified files: devel/jenkins/devel: Makefile distinfo Log message: Update jenkins-devel to 2.237
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/05/19 13:36:53 Modified files: lang/hashlink : Makefile distinfo lang/hashlink/patches: patch-Makefile patch-libs_uv_uv_c patch-src_module_c patch-src_std_thread_c Log message: update to 1.11 now with the actual resolve() for uv.c from Motion Twin tested and working with Dead Cells and Northgard
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/05/19 13:34:09 Modified files: devel/nuget: Makefile distinfo Log message: update to 5.5.0.6382
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/05/19 13:32:28 Modified files: games/depotdownloader: Makefile distinfo Log message: trivial update to 2.3.4
Re: sysutils/u-boot: Various u-boot changes
On Tue, 2020-05-19 at 11:21 +1000, Jonathan Gray wrote: > On Mon, May 18, 2020 at 08:09:21PM -0400, k...@intricatesoftware.com wrote: > > > > Various u-boot changes: > > * Rockchip now outputs a single image that combines idbloader.img > > and u-boot.itb called u-boot-rockchip.bin. It gets written at > > block 64. For example: > > dd if=u-boot-rockchip.bin of=/dev/sdXc seek=64 > > * Fix rock64 gen3 SPL boot hang. Submitted upstream and awaiting > > review. Tested on both gen2 and gen3 boards. > > * Enable PCIe gen2 on rockpro64. I've been running with this > > since December and tested various PCIe boards. > > > > okay? > This looks fine, but isn't there also a PFRAG.arm change needed for > tinker-rk3288? Thank you, good catch. I have added that now. I'm going to hold off a little bit on this. The rock64 u-boot maintainer is having an issue with his gen2 board with my gen3 fix (mine works with this but his didn't). > > > > > > Index: Makefile > > === > > RCS file: /cvs/ports/sysutils/u-boot/Makefile,v > > retrieving revision 1.68 > > diff -u -p -u -r1.68 Makefile > > --- Makefile15 May 2020 12:53:13 - 1.68 > > +++ Makefile18 May 2020 22:11:35 - > > @@ -8,6 +8,7 @@ FLAVOR?=arm > > > > COMMENT= U-Boot firmware > > VERSION= 2020.04 > > +REVISION= 0 > > DISTNAME= u-boot-${VERSION} > > PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//} > > FULLPKGNAME= ${PKGNAME} > > @@ -148,6 +149,7 @@ FILES=\ > > u-boot-spl.kwb \ > > u-boot-with-spl.bin \ > > u-boot.itb \ > > + u-boot-rockchip.bin \ > > idbloader.img \ > > spl/sunxi-spl.bin \ > > > > Index: patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi > > === > > RCS file: patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi > > diff -N patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi > > --- /dev/null 1 Jan 1970 00:00:00 - > > +++ patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi18 May 2020 > > 22:11:35 - > > @@ -0,0 +1,35 @@ > > +$OpenBSD$ > > + > > +Fix gen3 SPL boot hang > > + > > +Index: arch/arm/dts/rk3328-rock64-u-boot.dtsi > > +--- arch/arm/dts/rk3328-rock64-u-boot.dtsi.orig > > arch/arm/dts/rk3328-rock64-u-boot.dtsi > > +@@ -11,6 +11,27 @@ > > + }; > > + }; > > + > > ++ { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++ { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++_gpio { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > ++_pull_up_4ma { > > ++ u-boot,dm-spl; > > ++}; > > ++ > > + _host0_xhci { > > + status = "okay"; > > ++}; > > ++ > > ++/* Need this and all the pinctrl/gpio stuff above to set pinmux */ > > ++_sd { > > ++ u-boot,dm-spl; > > + }; > > Index: patches/patch-arch_arm_dts_rk3399-rockpro64_dts > > === > > RCS file: > > /cvs/ports/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-rockpro64_dts,v > > retrieving revision 1.4 > > diff -u -p -u -r1.4 patch-arch_arm_dts_rk3399-rockpro64_dts > > --- patches/patch-arch_arm_dts_rk3399-rockpro64_dts 17 Jan 2020 14:24:42 > > - 1.4 > > +++ patches/patch-arch_arm_dts_rk3399-rockpro64_dts 18 May 2020 22:11:35 > > - > > @@ -1,5 +1,7 @@ > > $OpenBSD: patch-arch_arm_dts_rk3399-rockpro64_dts,v 1.4 2020/01/17 > > 14:24:42 kurt Exp $ > > > > +Set baud rate, enable fan control and PCIe gen2. > > + > > Index: arch/arm/dts/rk3399-rockpro64.dts > > --- arch/arm/dts/rk3399-rockpro64.dts.orig > > +++ arch/arm/dts/rk3399-rockpro64.dts > > @@ -20,7 +22,15 @@ Index: arch/arm/dts/rk3399-rockpro64.dts > > #cooling-cells = <2>; > > fan-supply = <_dcin>; > > pwms = < 0 5 0>; > > -@@ -750,4 +751,43 @@ > > +@@ -522,6 +523,7 @@ > > + > > + { > > + ep-gpios = < RK_PD4 GPIO_ACTIVE_HIGH>; > > ++ max-link-speed = <2>; > > + num-lanes = <4>; > > + pinctrl-names = "default"; > > + pinctrl-0 = <_perst>; > > +@@ -750,4 +752,43 @@ > > > > _mmu { > > status = "okay"; > > Index: patches/patch-configs_rock64-rk3328_defconfig > > === > > RCS file: > > /cvs/ports/sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig,v > > retrieving revision 1.2 > > diff -u -p -u -r1.2 patch-configs_rock64-rk3328_defconfig > > --- patches/patch-configs_rock64-rk3328_defconfig 7 Jan 2020 07:07:08 > > - 1.2 > > +++ patches/patch-configs_rock64-rk3328_defconfig 18 May 2020 22:11:35 > > - > > @@ -1,9 +1,47 @@ > > $OpenBSD: patch-configs_rock64-rk3328_defconfig,v 1.2 2020/01/07 07:07:08 > > jsg Exp $ > > > > +Fix gen3 SPL boot hang > > + > > Index: configs/rock64-rk3328_defconfig > > --- configs/rock64-rk3328_defconfig.orig > > +++ configs/rock64-rk3328_defconfig > > -@@ -73,7 +73,7 @@ CONFIG_RAM=y > > +@@ -1,6 +1,7 @@ > > + CONFIG_ARM=y > > + CONFIG_ARCH_ROCKCHIP=y > > +
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mar...@cvs.openbsd.org 2020/05/19 11:34:54 Modified files: geo/py-rasterio: Makefile distinfo Log message: Update py-rasterio to 1.1.4.
Switching boehm-gc from sbrk to mmap
While testing a lang/ecl update I found that a sbrk-based heap is too small on i386 to run large programs, like lang/sbcl's cross-compiler. Switching to an mmap-based heap seems to work fine for ecl 20.4.24 but I wonder if it would break any other consumers. diff --git a/Makefile b/Makefile index 9916ffc..5b9b9f9 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ DISTNAME= gc-${VERSION} PKGNAME-atomic=libatomic_ops-${LIBAO_VERSION} PKGNAME-main= boehm-gc-${VERSION} -REVISION= 5 +REVISION= 6 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ libatomic_ops-${LIBAO_VERSION}${EXTRACT_SUFX} @@ -47,7 +47,8 @@ MAKE_ENV= CP="cp" \ CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --with-libatomic-ops=no \ +CONFIGURE_ARGS= --enable-munmap \ + --with-libatomic-ops=no \ --enable-cplusplus \ --enable-threads=pthreads
Re: Update lang/ecl to 20.4.24
On Tue, May 19, 2020 at 08:59:48AM -0700, Josh Elsasser wrote: > Here's a quick update to the new release, minimally tested as a > lang/sbcl build host. The patch removes files, don't forget patch -E Someone should do testing with math/maxima, net/clic, and sysutils/reed-alert. --Kurt > diff -ruN --exclude .git /usr/ports/lang/ecl/Makefile ./Makefile > --- /usr/ports/lang/ecl/Makefile Tue Feb 18 15:29:40 2020 > +++ ./MakefileMon May 18 09:44:49 2020 > @@ -5,10 +5,9 @@ > > BROKEN-mips64 = ecl_min fails > > -V = 16.1.3 > +V = 20.4.24 > DISTNAME = ecl-$V > -SHARED_LIBS += ecl 6.0 > -REVISION = 3 > +SHARED_LIBS += ecl 7.0 > > HOMEPAGE = https://common-lisp.net/project/ecl/ > MAINTAINER = Timo Myyra > @@ -21,12 +20,14 @@ > > MASTER_SITES = ${HOMEPAGE}static/files/release/ > > +COMPILER = base-clang ports-gcc > USE_GMAKE = Yes > CONFIGURE_STYLE =gnu > TEST_TARGET =check > CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \ > ECLLIB_VERSION=${LIBecl_VERSION} \ > - ecldir=${LOCALBASE}/lib/ecl > + ecldir=${LOCALBASE}/lib/ecl \ > + MAKEINFO=${PREFIX}/bin/gmakeinfo > > CONFIGURE_ARGS +=--enable-boehm=system \ > --enable-libatomic=system \ > @@ -38,6 +39,8 @@ > CONFIGURE_ENV += ETAGS=/usr/bin/true > > WANTLIB += atomic_ops c ffi gc gmp m pthread > + > +BUILD_DEPENDS += print/texinfo > > LIB_DEPENDS += devel/gmp \ > devel/boehm-gc,-main \ > diff -ruN --exclude .git /usr/ports/lang/ecl/distinfo ./distinfo > --- /usr/ports/lang/ecl/distinfo Mon May 15 13:40:18 2017 > +++ ./distinfoMon May 18 09:44:49 2020 > @@ -1,2 +1,2 @@ > -SHA256 (ecl-16.1.3.tgz) = dqWFxhbo+oOmtyCTJaMJ2lvAymjgZY85b0mVVjgRElQ= > -SIZE (ecl-16.1.3.tgz) = 7459212 > +SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc= > +SIZE (ecl-20.4.24.tgz) = 7815444 > diff -ruN --exclude .git /usr/ports/lang/ecl/patches/patch-src_Makefile_in > ./patches/patch-src_Makefile_in > --- /usr/ports/lang/ecl/patches/patch-src_Makefile_in Mon May 15 13:40:18 2017 > +++ ./patches/patch-src_Makefile_in Sun Mar 22 08:45:49 2020 > @@ -1,7 +1,8 @@ > $OpenBSD: patch-src_Makefile_in,v 1.6 2016/12/20 20:12:29 juanfra Exp $ > src/Makefile.in.orig Mon Dec 19 21:24:59 2016 > -+++ src/Makefile.in Mon Dec 19 21:27:43 2016 > -@@ -296,30 +296,15 @@ install: > +Index: src/Makefile.in > +--- src/Makefile.in.orig > src/Makefile.in > +@@ -212,30 +212,15 @@ install: > for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \ > $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \ > done > @@ -18,7 +19,7 @@ > - $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \ > - fi \ > -done > --if [ "x@SONAME3@" != "x" -a -f "@SONAME3@" ]; then \ > +-if [ "x@SONAME3@" != "x" -a -f "@SONAME3@" -a "@SONAME@" != "@SONAME3@" > ]; then \ > - ( $(INSTALL_LIBRARY) @SONAME3@ $(DESTDIR)$(libdir) && \ > -cd $(DESTDIR)$(libdir) && $(RM) -f @SONAME2@ @SONAME1@ @SONAME@ && \ > -$(LN_S) @SONAME3@ @SONAME2@ && \ > @@ -27,12 +28,12 @@ > -fi > +${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES) > +cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so > - $(INSTALL_PROGRAM) $(DPP) $(DESTDIR)$(ecldir) > + $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir) > $(INSTALL_PROGRAM) $(ECL_MIN) $(DESTDIR)$(ecldir) > for i in `cat modules`; do \ > case $$i in \ > -*.fas) $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ecldir);; \ > -+*.fas) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ > ++*.fas) $(INSTALL_SCRIPT) $$i $(DESTDIR)$(ecldir);; \ > *) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ > esac \ > done > diff -ruN --exclude .git /usr/ports/lang/ecl/patches/patch-src_c_ffi_d > ./patches/patch-src_c_ffi_d > --- /usr/ports/lang/ecl/patches/patch-src_c_ffi_d Tue Feb 18 15:29:40 2020 > +++ ./patches/patch-src_c_ffi_d Wed Dec 31 16:00:00 1969 > @@ -1,26 +0,0 @@ > -$OpenBSD: patch-src_c_ffi_d,v 1.1 2020/02/12 19:42:02 jasper Exp $ > - > -libffi for x86_64 doesn't define FFI_SYSV anymore for FFI_UNIX64 should used > instead > -fixed upstream with > https://gitlab.com/embeddable-common-lisp/ecl/commit/b2f09b4809441a92d6c11a2b39d5399580e56ae7 > - > -Index: src/c/ffi.d > src/c/ffi.d.orig > -+++ src/c/ffi.d > -@@ -132,10 +132,15 @@ static struct { > - {@':stdcall', FFI_STDCALL}, > - #elif defined(X86_WIN64) > - {@':win64', FFI_WIN64}, > --#elif defined(X86_ANY) || defined(X86) || defined(X86_64) > -+#elif defined(X86_ANY) || defined(X86) > -+#if defined(X86_64) > -+ {@':cdecl', FFI_UNIX64}, > -+ {@':sysv', FFI_UNIX64}, > -+ {@':unix64', FFI_UNIX64}, > -+#else > - {@':cdecl', FFI_SYSV}, > - {@':sysv', FFI_SYSV}, > --
Update lang/ecl to 20.4.24
Here's a quick update to the new release, minimally tested as a lang/sbcl build host. The patch removes files, don't forget patch -E diff -ruN --exclude .git /usr/ports/lang/ecl/Makefile ./Makefile --- /usr/ports/lang/ecl/MakefileTue Feb 18 15:29:40 2020 +++ ./Makefile Mon May 18 09:44:49 2020 @@ -5,10 +5,9 @@ BROKEN-mips64 =ecl_min fails -V =16.1.3 +V =20.4.24 DISTNAME = ecl-$V -SHARED_LIBS += ecl 6.0 -REVISION = 3 +SHARED_LIBS += ecl 7.0 HOMEPAGE = https://common-lisp.net/project/ecl/ MAINTAINER = Timo Myyra @@ -21,12 +20,14 @@ MASTER_SITES = ${HOMEPAGE}static/files/release/ +COMPILER = base-clang ports-gcc USE_GMAKE =Yes CONFIGURE_STYLE = gnu TEST_TARGET = check CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \ ECLLIB_VERSION=${LIBecl_VERSION} \ - ecldir=${LOCALBASE}/lib/ecl + ecldir=${LOCALBASE}/lib/ecl \ + MAKEINFO=${PREFIX}/bin/gmakeinfo CONFIGURE_ARGS += --enable-boehm=system \ --enable-libatomic=system \ @@ -38,6 +39,8 @@ CONFIGURE_ENV += ETAGS=/usr/bin/true WANTLIB += atomic_ops c ffi gc gmp m pthread + +BUILD_DEPENDS += print/texinfo LIB_DEPENDS += devel/gmp \ devel/boehm-gc,-main \ diff -ruN --exclude .git /usr/ports/lang/ecl/distinfo ./distinfo --- /usr/ports/lang/ecl/distinfoMon May 15 13:40:18 2017 +++ ./distinfo Mon May 18 09:44:49 2020 @@ -1,2 +1,2 @@ -SHA256 (ecl-16.1.3.tgz) = dqWFxhbo+oOmtyCTJaMJ2lvAymjgZY85b0mVVjgRElQ= -SIZE (ecl-16.1.3.tgz) = 7459212 +SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc= +SIZE (ecl-20.4.24.tgz) = 7815444 diff -ruN --exclude .git /usr/ports/lang/ecl/patches/patch-src_Makefile_in ./patches/patch-src_Makefile_in --- /usr/ports/lang/ecl/patches/patch-src_Makefile_in Mon May 15 13:40:18 2017 +++ ./patches/patch-src_Makefile_in Sun Mar 22 08:45:49 2020 @@ -1,7 +1,8 @@ $OpenBSD: patch-src_Makefile_in,v 1.6 2016/12/20 20:12:29 juanfra Exp $ src/Makefile.in.orig Mon Dec 19 21:24:59 2016 -+++ src/Makefile.inMon Dec 19 21:27:43 2016 -@@ -296,30 +296,15 @@ install: +Index: src/Makefile.in +--- src/Makefile.in.orig src/Makefile.in +@@ -212,30 +212,15 @@ install: for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \ $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \ done @@ -18,7 +19,7 @@ - $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \ -fi \ - done -- if [ "x@SONAME3@" != "x" -a -f "@SONAME3@" ]; then \ +- if [ "x@SONAME3@" != "x" -a -f "@SONAME3@" -a "@SONAME@" != "@SONAME3@" ]; then \ -( $(INSTALL_LIBRARY) @SONAME3@ $(DESTDIR)$(libdir) && \ - cd $(DESTDIR)$(libdir) && $(RM) -f @SONAME2@ @SONAME1@ @SONAME@ && \ - $(LN_S) @SONAME3@ @SONAME2@ && \ @@ -27,12 +28,12 @@ - fi + ${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES) + cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so - $(INSTALL_PROGRAM) $(DPP) $(DESTDIR)$(ecldir) + $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir) $(INSTALL_PROGRAM) $(ECL_MIN) $(DESTDIR)$(ecldir) for i in `cat modules`; do \ case $$i in \ - *.fas) $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ecldir);; \ -+ *.fas) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ ++ *.fas) $(INSTALL_SCRIPT) $$i $(DESTDIR)$(ecldir);; \ *) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ esac \ done diff -ruN --exclude .git /usr/ports/lang/ecl/patches/patch-src_c_ffi_d ./patches/patch-src_c_ffi_d --- /usr/ports/lang/ecl/patches/patch-src_c_ffi_d Tue Feb 18 15:29:40 2020 +++ ./patches/patch-src_c_ffi_d Wed Dec 31 16:00:00 1969 @@ -1,26 +0,0 @@ -$OpenBSD: patch-src_c_ffi_d,v 1.1 2020/02/12 19:42:02 jasper Exp $ - -libffi for x86_64 doesn't define FFI_SYSV anymore for FFI_UNIX64 should used instead -fixed upstream with https://gitlab.com/embeddable-common-lisp/ecl/commit/b2f09b4809441a92d6c11a2b39d5399580e56ae7 - -Index: src/c/ffi.d src/c/ffi.d.orig -+++ src/c/ffi.d -@@ -132,10 +132,15 @@ static struct { - {@':stdcall', FFI_STDCALL}, - #elif defined(X86_WIN64) - {@':win64', FFI_WIN64}, --#elif defined(X86_ANY) || defined(X86) || defined(X86_64) -+#elif defined(X86_ANY) || defined(X86) -+#if defined(X86_64) -+ {@':cdecl', FFI_UNIX64}, -+ {@':sysv', FFI_UNIX64}, -+ {@':unix64', FFI_UNIX64}, -+#else - {@':cdecl', FFI_SYSV}, - {@':sysv', FFI_SYSV}, -- {@':unix64', FFI_UNIX64}, -+#endif - #endif - }; - diff -ruN --exclude .git /usr/ports/lang/ecl/patches/patch-src_c_numbers_atan_d ./patches/patch-src_c_numbers_atan_d --- /usr/ports/lang/ecl/patches/patch-src_c_numbers_atan_d Wed Dec 28 11:38:56 2016 +++ ./patches/patch-src_c_numbers_atan_dWed Dec 31 16:00:00 1969 @@
Re: UPDATE: devel/cmake (switch to py3, enable DEBUG_PACKAGES, new {py,ruby,lua,java} handling)
On Tue May 19, 2020 at 11:31:07AM +0200, Landry Breuil wrote: > On Mon, May 18, 2020 at 07:07:27AM +0200, Rafael Sadowski wrote: > CONFIGURE_ARGS+= always scares me, what if something else down the chain > does CONFIGURE_ARGS= and drops all the other bits ? tldr: Don't worry, port-modules(5) do the magic for us. For example: devel/catch2 $ make show=CONFIGURE_ARGS -DPYTHON_EXECUTABLE=/usr/local/bin/python3.7 -DPYTHON_LIBRARY_DIRS=/usr/local/lib/python3.7 -DPYTHON_INCLUDE_DIR=/usr/local/include/python3.7m -DCMAKE_BUILD_TYPE=Release If I add "CONFIGURE_ARGS = -DTEST=WTF" or "CONFIGURE_ARGS += -DTEST=WTF", we'll see: $ make show=CONFIGURE_ARGS -DTEST=WTF -DPYTHON_EXECUTABLE=/usr/local/bin/python3.7 -DPYTHON_LIBRARY_DIRS=/usr/local/lib/python3.7 -DPYTHON_INCLUDE_DIR=/usr/local/include/python3.7m -DCMAKE_BUILD_TYPE=Release ... even if we add "CONFIGURE_ARGS =" (empty), we'll see: $ make show=CONFIGURE_ARGS -DPYTHON_EXECUTABLE=/usr/local/bin/python3.7 -DPYTHON_LIBRARY_DIRS=/usr/local/lib/python3.7 -DPYTHON_INCLUDE_DIR=/usr/local/include/python3.7m -DCMAKE_BUILD_TYPE=Release Rafael
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2020/05/19 09:34:56 Modified files: audio : Makefile databases : Makefile devel : Makefile graphics : Makefile net: Makefile security : Makefile sysutils : Makefile textproc : Makefile www: Makefile x11: Makefile Log message: Remove building of Ruby 2.5 gem ports by default
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/05/19 09:18:46 Modified files: audio/faudio : Makefile distinfo Log message: update to 20.05 no dynamic export changes changelog: https://github.com/FNA-XNA/FAudio/releases
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/05/19 09:17:39 Modified files: devel/gobject-introspection: Makefile Log message: Fix build with ld.bfd ok ajacoutot@ (maintainer) & kmos@ (successful tests)
Re: kdenlive update
On Sun May 17, 2020 at 04:48:27PM +0200, Marc Espie wrote: > Seems I can now remove the BROKEN marker. > This does depend on rttr and the mlt fixed update Thanks for the work here. A quick test and it won't crash. Ok with the following tweaks. > > Index: Makefile > === > RCS file: /cvs/ports/x11/kde-applications/kdenlive/Makefile,v > retrieving revision 1.9 > diff -u -p -r1.9 Makefile > --- Makefile 23 Mar 2020 18:01:19 - 1.9 > +++ Makefile 17 May 2020 14:47:25 - > @@ -1,6 +1,6 @@ > # $OpenBSD $ > > -BROKEN = Crashes immediately when you add a clip to the timeline > +#BROKEN =Crashes immediately when you add a clip to the timeline Can be completely removed > > #Qt5Webkit > USE_WXNEEDED = Yes > @@ -37,6 +37,7 @@ LIB_DEPENDS += devel/kf5/attica \ > devel/kf5/kconfigwidgets \ > devel/kf5/kcoreaddons \ > devel/kf5/kcrash \ > + devel/kf5/kdeclarative \ > devel/kf5/kdbusaddons \ > devel/kf5/kfilemetadata \ > devel/kf5/kguiaddons \ > @@ -59,7 +60,21 @@ LIB_DEPENDS += devel/kf5/attica \ > x11/qt5/qtdeclarative \ > x11/qt5/qtscript \ x11/qt5/qtscript not needed for x11/kde-applications/kdenlive 19 > x11/qt5/qtsvg \ > - x11/qt5/qtwebkit > + x11/qt5/qtwebkit \ > + devel/rttr devel/rttr under devel/kf5/sonnet (keep it sorted) > + > +WANTLIB += ${COMPILER_LIBCXX} KF5Archive KF5Attica KF5Auth KF5AuthCore > +WANTLIB += KF5Bookmarks KF5Codecs KF5Completion KF5ConfigCore > +WANTLIB += KF5ConfigGui KF5ConfigWidgets KF5CoreAddons KF5Crash > +WANTLIB += KF5DBusAddons KF5Declarative KF5FileMetaData KF5GuiAddons > +WANTLIB += KF5I18n KF5IconThemes KF5ItemViews KF5JobWidgets KF5KIOCore > +WANTLIB += KF5KIOFileWidgets KF5KIOWidgets KF5NewStuff KF5NewStuffCore > +WANTLIB += KF5Notifications KF5NotifyConfig KF5Package KF5Purpose > +WANTLIB += KF5PurposeWidgets KF5Service KF5Solid KF5SonnetUi KF5TextWidgets > +WANTLIB += KF5WidgetsAddons KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus > +WANTLIB += Qt5Gui Qt5Multimedia Qt5Network Qt5Qml Qt5Quick Qt5QuickWidgets > +WANTLIB += Qt5Svg Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5Xml > +WANTLIB += c m mlt mlt++ rttr_core WANTLIB block under CATEGORIES, please. Respect Makefile.template > > CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_LibV4L2=Yes > ... > @@ -485,3 +518,4 @@ share/mime/packages/westley.xml > @tag update-desktop-database > @tag update-mime-database > @tag gtk-update-icon-cache %D/share/icons/hicolor > +share/qlogging-categories5/kdenlive.categories Put @tags last
Re: kdenlive update
On Sun, May 17, 2020 at 04:48:27PM +0200, Marc Espie wrote: > Seems I can now remove the BROKEN marker. > This does depend on rttr and the mlt fixed update Awesome. A working video editor! Compiles and runs without problems here. Thanks! Erling
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/05/19 07:27:43 Modified files: emulators/mame : Makefile distinfo Log message: Update mame to 0.221.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 07:22:57 Modified files: productivity/radicale2: Makefile distinfo productivity/radicale2/pkg: PLIST Log message: update to radicale-2.1.12
Re: UPDATE: devel/cmake (switch to py3, enable DEBUG_PACKAGES, new {py,ruby,lua,java} handling)
On Tue, May 19, 2020 at 02:25:55PM +0200, Rafael Sadowski wrote: > > which patches this allows us to remove ? > > diff --git > a/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake > b/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake > diff --git a/devel/cmake/patches/patch-Modules_FindJNI_cmake > b/devel/cmake/patches/patch-Modules_FindJNI_cmake > diff --git a/devel/cmake/patches/patch-Modules_FindJava_cmake > b/devel/cmake/patches/patch-Modules_FindJava_cmake > diff --git a/devel/cmake/patches/patch-Modules_FindLua_cmake > b/devel/cmake/patches/patch-Modules_FindLua_cmake > diff --git a/devel/cmake/patches/patch-Modules_FindOpenMP_cmake > b/devel/cmake/patches/patch-Modules_FindOpenMP_cmake > diff --git a/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake > b/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake > diff --git a/devel/cmake/patches/patch-Modules_FindRuby_cmake > b/devel/cmake/patches/patch-Modules_FindRuby_cmake > diff --git > a/devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake > b/devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake i was more expecting a list of patches to be removed in cmake consumer ports :) > > I'm scared. Now is the right time, but i expect many weird/random > > build/runtime failures later on, which might not show up in 'just > > running a bulk' ... > > > > I do not expect too much impact. ;) Famous last words..
Re: devel/autoconf/2.69, add runstatedir
On 2020/05/19 13:53, Marc Espie wrote: > On Tue, May 19, 2020 at 12:26:45PM +0100, Stuart Henderson wrote: > > This adds the runstatedir patch from autoconf git. It was added upstream > > in 2013 but there hasn't been a newer release; some Linux distros have been > > patching it in their 2.69 packages for years. > > > > I don't _really_ like doing this but it's causing a problem for people > > who want to make distfiles on OpenBSD that are usable on Linux (portable > > openbgpd etc) and it's a simple diff - the changes in the produced files > > are small so it's still easy to verify nothing malicious has been added > > for people who are verifying autoconf-generated configure files in ports > > etc. > > > > Any big objections? OKs? (if it is acceptable I'll put it through a bulk > > build before commit). > > Okay for me. > > Did we ping upstream ?... No but it does look like things maybe gradually moving forwards now: https://lists.gnu.org/archive/html/autoconf/2020-03/msg00063.html
Re: UPDATE: devel/cmake (switch to py3, enable DEBUG_PACKAGES, new {py,ruby,lua,java} handling)
On Tue May 19, 2020 at 11:31:07AM +0200, Landry Breuil wrote: > On Mon, May 18, 2020 at 07:07:27AM +0200, Rafael Sadowski wrote: > > This diff currently runs through a full amd64 bulk build. I send this > > diff in advance to discuss it. Here a list of imported port changes: > > > > - Update CMmke to 3.17.2 > > > > - Switch CMake to pyhton3 > > Makes 100% sense ... we tried before, without luck. It works with my cmake.port.mk solution. Some cmake+py ports do it wrong, this diff fixes the ports automatically) > > > - Remove all Modules under files. This should no longer be necessary. > > I like that idea, provided that doesnt cause subtle build config changes > that will result in runtime breakage... where do our modules come from ? > taken from upstream at some point, then tweaked for our needs ? were > those changes upstreamed and are not needed now, are the upstream > modules better now so that we dont need our local ones ? No idea, no comments, no useful commit msg (as I remember), it happened before I got involved. > > > - Remove our self hacked MODJAVA* MODLUA* MODPY* MODRUBY* modules. > > - Instead we help the original cmake modules, see cmake.port.mk. That > > saves and all these patches and is in my opinion more correct! > > From my understanding of the patch, the idea is to only set some module > vars if the corresponding MODULE is enabled, instead of setting the vars > in all cases ? Correct and this is the right way. > are we sure ordering of module inclusion doesnt matter then ? We are setting a cmake option, the order does not matter, if someone overwrites it, hopefully he knows what he is doing. If not we have to find this corner cases. > CONFIGURE_ARGS+= always scares me, what if something else down the chain > does CONFIGURE_ARGS= and drops all the other bits ? Use on your own risk. I'm gonna take a look around our tree. > > which patches this allows us to remove ? diff --git a/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake b/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake diff --git a/devel/cmake/patches/patch-Modules_FindJNI_cmake b/devel/cmake/patches/patch-Modules_FindJNI_cmake diff --git a/devel/cmake/patches/patch-Modules_FindJava_cmake b/devel/cmake/patches/patch-Modules_FindJava_cmake diff --git a/devel/cmake/patches/patch-Modules_FindLua_cmake b/devel/cmake/patches/patch-Modules_FindLua_cmake diff --git a/devel/cmake/patches/patch-Modules_FindOpenMP_cmake b/devel/cmake/patches/patch-Modules_FindOpenMP_cmake diff --git a/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake b/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake diff --git a/devel/cmake/patches/patch-Modules_FindRuby_cmake b/devel/cmake/patches/patch-Modules_FindRuby_cmake diff --git a/devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake b/devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake > > > - Fix cmake debug packages: > > - If DEBUG_PACKAGES set don't create install stripa rule. Idea by > > landry@ > > Long-term, i think upstream should be consulted about that. Upstreaming > that would be nice, instead of a local patch/hack. That said, > patch-Source_cmInstallTargetGenerator_cxx needs a comment :) We'll have to do more cleaning for that. The other BSDs have almost no patches. There is of course a comment in patch-Source_cmInstallTargetGenerator_cxx. > > > What do you think? I would like to commit this diff if the bulk build > > is successful. > > > > Opinions? > > I'm scared. Now is the right time, but i expect many weird/random > build/runtime failures later on, which might not show up in 'just > running a bulk' ... > I do not expect too much impact. ;)
UPDATE: games/uhexen2 1.5.9
Hi, Here is the diff to update uhexen2 to the latest version. I adapted the patches (line positions) so that they still apply in this version. Tested some levels on amd64 with the Steam assets of the game (*.pak files) in Single Player and Co-op. Index: Makefile === RCS file: /cvs/ports/games/uhexen2/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile12 Jul 2019 20:46:26 - 1.9 +++ Makefile19 May 2020 11:16:02 - @@ -2,13 +2,12 @@ COMMENT = Hexen II: Hammer of Thyrion -V =1.5.8 +V =1.5.9 DISTNAME = hexen2source-${V} PKGNAME = uhexen2-${V} EXTRACT_SUFX = .tgz DISTFILES =${DISTNAME}${EXTRACT_SUFX} \ hexen2-${V}-linux-i586.tgz -REVISION = 2 CATEGORIES = games HOMEPAGE = http://uhexen2.sourceforge.net/ Index: distinfo === RCS file: /cvs/ports/games/uhexen2/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo31 Dec 2016 10:48:00 - 1.2 +++ distinfo19 May 2020 11:16:02 - @@ -1,4 +1,4 @@ -SHA256 (hexen2-1.5.8-linux-i586.tgz) = D2aTVlfAxPPjmy8IcZ/l+Sa+K5VNxYM0pl7eslDVFgM= -SHA256 (hexen2source-1.5.8.tgz) = ++bQW0oQuC0YF/rszBiZapOybQgU/k5fbnXZSGJmBGM= -SIZE (hexen2-1.5.8-linux-i586.tgz) = 4631311 -SIZE (hexen2source-1.5.8.tgz) = 2473776 +SHA256 (hexen2-1.5.9-linux-i586.tgz) = lmvSP10gvtjKyjNG5R/m8mRf3h66sqy4htQ14504ASs= +SHA256 (hexen2source-1.5.9.tgz) = KqhMFBqCD5CHhQqs82hKX3HENEKLxXVFiZ7aG5oow+A= +SIZE (hexen2-1.5.9-linux-i586.tgz) = 4633437 +SIZE (hexen2source-1.5.9.tgz) = 2529121 Index: patches/patch-engine_hexen2_Makefile === RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexen2_Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-engine_hexen2_Makefile --- patches/patch-engine_hexen2_Makefile20 Nov 2018 21:41:00 - 1.3 +++ patches/patch-engine_hexen2_Makefile19 May 2020 11:16:02 - @@ -5,30 +5,32 @@ Use standard optimisations. Index: engine/hexen2/Makefile --- engine/hexen2/Makefile.orig +++ engine/hexen2/Makefile -@@ -133,7 +133,7 @@ USE_CODEC_MODPLUG=no +@@ -136,7 +136,7 @@ USE_CODEC_XMP=no USE_CODEC_UMX=no # either timidity (preferred) or wildmidi (both possible # but not needed nor meaningful) -USE_CODEC_TIMIDITY=yes +USE_CODEC_TIMIDITY=no USE_CODEC_WILDMIDI=no - # compile timidity with DLS instruments support? (no: - # the dls code isn't good enough and isn't used in unix -@@ -194,12 +194,7 @@ endif - # Overrides for the default CPUFLAGS + # which library to use for mp3 decoding: mad or mpg123 + MP3LIB=mad +@@ -198,15 +198,6 @@ endif CPUFLAGS=$(CPU_X86) --CFLAGS += -g -Wall + CFLAGS += -Wall -CFLAGS += $(CPUFLAGS) --ifndef DEBUG +-ifdef DEBUG +-CFLAGS += -g +-else -# optimization flags --CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer +-CFLAGS += -O2 -DNDEBUG=1 -ffast-math +-# NOTE: -fomit-frame-pointer is broken with ancient gcc versions!! +-CFLAGS += -fomit-frame-pointer -endif -+CFLAGS += -Wall CPPFLAGS= LDFLAGS = -@@ -384,6 +379,9 @@ ifeq ($(TARGET_OS),unix) +@@ -405,6 +396,9 @@ ifeq ($(TARGET_OS),unix) # common unix: NASMFLAGS=-f elf -d_NO_PREFIX Index: patches/patch-engine_hexen2_server_Makefile === RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexen2_server_Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-engine_hexen2_server_Makefile --- patches/patch-engine_hexen2_server_Makefile 31 Dec 2016 10:48:00 - 1.2 +++ patches/patch-engine_hexen2_server_Makefile 19 May 2020 11:16:02 - @@ -2,19 +2,22 @@ $OpenBSD: patch-engine_hexen2_server_Mak Use standard optimisations. engine/hexen2/server/Makefile.orig Mon Jul 25 06:35:24 2016 -+++ engine/hexen2/server/Makefile Sat Dec 31 20:44:08 2016 -@@ -66,12 +66,7 @@ endif - # Overrides for the default CPUFLAGS +Index: engine/hexen2/server/Makefile +--- engine/hexen2/server/Makefile.orig engine/hexen2/server/Makefile +@@ -67,15 +67,6 @@ endif CPUFLAGS=$(CPU_X86) --CFLAGS += -g -Wall + CFLAGS += -Wall -CFLAGS += $(CPUFLAGS) --ifndef DEBUG +-ifdef DEBUG +-CFLAGS += -g +-else -# optimization flags --CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer +-CFLAGS += -O2 -DNDEBUG=1 -ffast-math +-# NOTE: -fomit-frame-pointer is broken with ancient gcc versions!! +-CFLAGS += -fomit-frame-pointer -endif -+CFLAGS += -Wall CPPFLAGS= LDFLAGS = Index: patches/patch-engine_hexenworld_client_Makefile === RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexenworld_client_Makefile,v retrieving revision 1.3 diff -u -p -r1.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/19 06:00:40 Modified files: x11/gtk+4 : Makefile distinfo x11/gtk+4/patches: patch-gtk_gtkfilechooserwidget_c patch-gtk_gtkplacessidebar_c patch-testsuite_reftests_gtk-reftest_c x11/gtk+4/pkg : PLIST-main Log message: Update to gtk+4-3.98.4.
Re: devel/autoconf/2.69, add runstatedir
On Tue, May 19, 2020 at 12:26:45PM +0100, Stuart Henderson wrote: > This adds the runstatedir patch from autoconf git. It was added upstream > in 2013 but there hasn't been a newer release; some Linux distros have been > patching it in their 2.69 packages for years. > > I don't _really_ like doing this but it's causing a problem for people > who want to make distfiles on OpenBSD that are usable on Linux (portable > openbgpd etc) and it's a simple diff - the changes in the produced files > are small so it's still easy to verify nothing malicious has been added > for people who are verifying autoconf-generated configure files in ports > etc. > > Any big objections? OKs? (if it is acceptable I'll put it through a bulk > build before commit). Okay for me. Did we ping upstream ?... > > > Index: Makefile > === > RCS file: /cvs/ports/devel/autoconf/2.69/Makefile,v > retrieving revision 1.5 > diff -u -p -r1.5 Makefile > --- Makefile 29 Jun 2016 16:14:40 - 1.5 > +++ Makefile 19 May 2020 11:16:41 - > @@ -1,7 +1,7 @@ > # $OpenBSD: Makefile,v 1.5 2016/06/29 16:14:40 espie Exp $ > > VERSION =2.69 > -REVISION = 2 > +REVISION = 3 > > BUILD_DEPENDS = devel/help2man > > Index: patches/patch-lib_autoconf_general_m4 > === > RCS file: patches/patch-lib_autoconf_general_m4 > diff -N patches/patch-lib_autoconf_general_m4 > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-lib_autoconf_general_m4 19 May 2020 11:16:41 - > @@ -0,0 +1,51 @@ > +$OpenBSD$ > + > +From a197431414088a417b407b9b20583b2e8f7363bd Mon Sep 17 00:00:00 2001 > +From: Eric Blake > +Date: Thu, 12 Sep 2013 15:11:29 -0600 > +Subject: AC_INIT: add --runstatedir option to configure > + > +Index: lib/autoconf/general.m4 > +--- lib/autoconf/general.m4.orig > lib/autoconf/general.m4 > +@@ -586,6 +586,7 @@ AC_SUBST([datadir],['${datarootdir}'])dnl > + AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl > + AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl > + AC_SUBST([localstatedir], ['${prefix}/var'])dnl > ++AC_SUBST([runstatedir],['${localstatedir}/run'])dnl > + AC_SUBST([includedir], ['${prefix}/include'])dnl > + AC_SUBST([oldincludedir], ['/usr/include'])dnl > + AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], > +@@ -812,6 +813,15 @@ do > + | -silent | --silent | --silen | --sile | --sil) > + silent=yes ;; > + > ++ -runstatedir | --runstatedir | --runstatedi | --runstated \ > ++ | --runstate | --runstat | --runsta | --runst | --runs \ > ++ | --run | --ru | --r) > ++ac_prev=runstatedir ;; > ++ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ > ++ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ > ++ | --run=* | --ru=* | --r=*) > ++runstatedir=$ac_optarg ;; > ++ > + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) > + ac_prev=sbindir ;; > + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ > +@@ -921,7 +931,7 @@ fi > + for ac_var in exec_prefix prefix bindir sbindir libexecdir > datarootdir \ > + datadir sysconfdir sharedstatedir localstatedir includedir \ > + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ > +-libdir localedir mandir > ++libdir localedir mandir runstatedir > + do > + eval ac_val=\$$ac_var > + # Remove trailing slashes. > +@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories: > + --sysconfdir=DIRread-only single-machine data [PREFIX/etc] > + --sharedstatedir=DIRmodifiable architecture-independent data > [PREFIX/com] > + --localstatedir=DIR modifiable single-machine data [PREFIX/var] > ++ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] > + --libdir=DIRobject code libraries [EPREFIX/lib] > + --includedir=DIRC header files [PREFIX/include] > + --oldincludedir=DIR C header files for non-gcc [/usr/include] > >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 05:47:29 Modified files: mail/dovecot : Tag: OPENBSD_6_6 Makefile Added files: mail/dovecot/patches: Tag: OPENBSD_6_6 patch-src_lib-smtp_smtp-address_c patch-src_lib-smtp_smtp-address_h patch-src_lib-smtp_smtp-server-cmd-noop_c patch-src_lib-smtp_smtp-server-cmd-vrfy_c patch-src_lib-smtp_smtp-server-command_c patch-src_lib-smtp_smtp-server-connection_c patch-src_lib-smtp_smtp-server-private_h patch-src_lib-smtp_smtp-syntax_c patch-src_lmtp_lmtp-commands_c Log message: Backport the diff between Dovecot 2.3.10 and 2.3.10.1 to 2.3.9 for 6.6-stable OK Brad DOV-3784, CVE-2020-10957: Sending malformed NOOP command causes crash in submission, submission-login or lmtp service. DOV-3875, CVE-2020-10958: Sending command followed by sufficient number of newlines triggers a use-after-free bug that might crash submission-login, submission or lmtp service. DOV-1745, CVE-2020-10967: Sending mail with empty quoted localpart causes submission or lmtp component to crash.
devel/autoconf/2.69, add runstatedir
This adds the runstatedir patch from autoconf git. It was added upstream in 2013 but there hasn't been a newer release; some Linux distros have been patching it in their 2.69 packages for years. I don't _really_ like doing this but it's causing a problem for people who want to make distfiles on OpenBSD that are usable on Linux (portable openbgpd etc) and it's a simple diff - the changes in the produced files are small so it's still easy to verify nothing malicious has been added for people who are verifying autoconf-generated configure files in ports etc. Any big objections? OKs? (if it is acceptable I'll put it through a bulk build before commit). Index: Makefile === RCS file: /cvs/ports/devel/autoconf/2.69/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile29 Jun 2016 16:14:40 - 1.5 +++ Makefile19 May 2020 11:16:41 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.5 2016/06/29 16:14:40 espie Exp $ VERSION = 2.69 -REVISION = 2 +REVISION = 3 BUILD_DEPENDS =devel/help2man Index: patches/patch-lib_autoconf_general_m4 === RCS file: patches/patch-lib_autoconf_general_m4 diff -N patches/patch-lib_autoconf_general_m4 --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-lib_autoconf_general_m4 19 May 2020 11:16:41 - @@ -0,0 +1,51 @@ +$OpenBSD$ + +From a197431414088a417b407b9b20583b2e8f7363bd Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Thu, 12 Sep 2013 15:11:29 -0600 +Subject: AC_INIT: add --runstatedir option to configure + +Index: lib/autoconf/general.m4 +--- lib/autoconf/general.m4.orig lib/autoconf/general.m4 +@@ -586,6 +586,7 @@ AC_SUBST([datadir],['${datarootdir}'])dnl + AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl + AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl + AC_SUBST([localstatedir], ['${prefix}/var'])dnl ++AC_SUBST([runstatedir],['${localstatedir}/run'])dnl + AC_SUBST([includedir], ['${prefix}/include'])dnl + AC_SUBST([oldincludedir], ['/usr/include'])dnl + AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], +@@ -812,6 +813,15 @@ do + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + ++ -runstatedir | --runstatedir | --runstatedi | --runstated \ ++ | --runstate | --runstat | --runsta | --runst | --runs \ ++ | --run | --ru | --r) ++ac_prev=runstatedir ;; ++ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ ++ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ ++ | --run=* | --ru=* | --r=*) ++runstatedir=$ac_optarg ;; ++ + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +@@ -921,7 +931,7 @@ fi + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ +- libdir localedir mandir ++ libdir localedir mandir runstatedir + do + eval ac_val=\$$ac_var + # Remove trailing slashes. +@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories: + --sysconfdir=DIRread-only single-machine data [PREFIX/etc] + --sharedstatedir=DIRmodifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIRobject code libraries [EPREFIX/lib] + --includedir=DIRC header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include]
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 04:33:56 Modified files: net/powerdns_recursor/patches: patch-Makefile_in Log message: regen patch, no package change
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 04:33:25 Modified files: net/powerdns_recursor: Tag: OPENBSD_6_6 Makefile distinfo net/powerdns_recursor/patches: Tag: OPENBSD_6_6 patch-Makefile_in Log message: update PowerDNS Recursor in 6.6-stable to 4.2.2, CVE-2020-10995 CVE-2020-1224
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 04:33:09 Modified files: net/powerdns_recursor: Tag: OPENBSD_6_7 Makefile distinfo net/powerdns_recursor/patches: Tag: OPENBSD_6_7 patch-Makefile_in Log message: update PowerDNS Recursor in 6.7-stable to 4.3.1, CVE-2020-10995 CVE-2020-1224
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2020/05/19 04:13:44 Modified files: net/powerdns_recursor: Makefile distinfo Log message: Update PowerDNS Recursor to 4.3.1, fixing CVE-2020-10995 and CVE-2020-12244. See https://docs.powerdns.com/recursor/security-advisories/index.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/05/19 04:05:47 Modified files: devel/llvm : Makefile devel/llvm/patches: patch-lib_Target_Mips_AsmParser_MipsAsmParser_cpp patch-lib_Target_Sparc_SparcISelLowering_cpp Added files: devel/llvm/patches: patch-lib_CodeGen_LocalStackSlotAllocation_cpp patch-lib_Target_AArch64_AArch64TargetMachine_cpp patch-lib_Target_Sparc_SparcInstr64Bit_td patch-lib_Target_Sparc_SparcInstrInfo_td patch-tools_clang_lib_Basic_Targets_Sparc_cpp Log message: Partial sync with base-clang
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 03:33:39 Modified files: net/isc-bind : Tag: OPENBSD_6_6 Makefile distinfo Log message: update 6.6-stable to BIND 9.11.19 CVE-2020-8616: BIND does not sufficiently limit the number of fetches performed when processing referrals CVE-2020-8617: A logic error in code which checks TSIG validity can be used to trigger an assertion failure in tsig.c
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 03:32:59 Modified files: net/isc-bind : Tag: OPENBSD_6_7 Makefile distinfo net/isc-bind/patches: Tag: OPENBSD_6_7 patch-configure_ac patch-lib_dns_openssldh_link_c patch-lib_dns_opensslrsa_link_c patch-lib_isc_unix_socket_c Log message: update 6.7-stable to BIND 9.16.3 CVE-2020-8616: BIND does not sufficiently limit the number of fetches performed when processing referrals CVE-2020-8617: A logic error in code which checks TSIG validity can be used to trigger an assertion failure in tsig.c
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 03:32:38 Modified files: net/isc-bind : Makefile distinfo net/isc-bind/patches: patch-configure_ac patch-lib_dns_openssldh_link_c patch-lib_dns_opensslrsa_link_c patch-lib_isc_unix_socket_c net/isc-bind/pkg: PLIST Log message: update to BIND 9.16.3 CVE-2020-8616: BIND does not sufficiently limit the number of fetches performed when processing referrals CVE-2020-8617: A logic error in code which checks TSIG validity can be used to trigger an assertion failure in tsig.c More info on the referral problem in http://www.nxnsattack.com/dns-ns-paper.pdf
Re: UPDATE: devel/cmake (switch to py3, enable DEBUG_PACKAGES, new {py,ruby,lua,java} handling)
On Mon, May 18, 2020 at 07:07:27AM +0200, Rafael Sadowski wrote: > This diff currently runs through a full amd64 bulk build. I send this > diff in advance to discuss it. Here a list of imported port changes: > > - Update CMmke to 3.17.2 > > - Switch CMake to pyhton3 Makes 100% sense > - Remove all Modules under files. This should no longer be necessary. I like that idea, provided that doesnt cause subtle build config changes that will result in runtime breakage... where do our modules come from ? taken from upstream at some point, then tweaked for our needs ? were those changes upstreamed and are not needed now, are the upstream modules better now so that we dont need our local ones ? > - Remove our self hacked MODJAVA* MODLUA* MODPY* MODRUBY* modules. > - Instead we help the original cmake modules, see cmake.port.mk. That > saves and all these patches and is in my opinion more correct! >From my understanding of the patch, the idea is to only set some module vars if the corresponding MODULE is enabled, instead of setting the vars in all cases ? are we sure ordering of module inclusion doesnt matter then ? CONFIGURE_ARGS+= always scares me, what if something else down the chain does CONFIGURE_ARGS= and drops all the other bits ? which patches this allows us to remove ? > - Fix cmake debug packages: > - If DEBUG_PACKAGES set don't create install stripa rule. Idea by > landry@ Long-term, i think upstream should be consulted about that. Upstreaming that would be nice, instead of a local patch/hack. That said, patch-Source_cmInstallTargetGenerator_cxx needs a comment :) > What do you think? I would like to commit this diff if the bulk build > is successful. > > Opinions? I'm scared. Now is the right time, but i expect many weird/random build/runtime failures later on, which might not show up in 'just running a bulk' ... Landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/19 03:11:13 Modified files: www/youtube-dl : Makefile distinfo Log message: Update to youtube-dl 2020.05.08
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/05/19 02:50:55 Modified files: databases/sqlports: Makefile databases/sqlports/files: Info.pm Log message: handling of DEBUG_PACKAGES/DEBUG_CONFIGURE_ARGS is bogus just ignore them for now
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/05/19 02:44:44 Modified files: databases/sqlports/files: TreeWalker.pm Log message: likewise, don't try to use incomplete hash
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/05/19 02:40:21 Modified files: net/dbip : Makefile Added files: net/dbip/asn : Makefile distinfo net/dbip/asn/pkg: DESCR PLIST Log message: Add asn subpackage for net/dbip. The free DB-IP IP to ASN Lite database is a subset of the IP to ISP database with reduced coverage and accuracy distributed under the Creative Commons Attribution License. OK sthen@, jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/05/19 02:38:03 Modified files: databases/sqlports/files: TreeWalker.pm Log message: parse errors in dump-vars will lead to $h being invalid, push past that so that it properly errors out without a huge dump
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/05/19 02:37:57 ports/net/dbip/asn Update of /cvs/ports/net/dbip/asn In directory cvs.openbsd.org:/tmp/cvs-serv74513/asn Log Message: Directory /cvs/ports/net/dbip/asn added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/05/19 02:37:57 ports/net/dbip/asn/pkg Update of /cvs/ports/net/dbip/asn/pkg In directory cvs.openbsd.org:/tmp/cvs-serv74513/asn/pkg Log Message: Directory /cvs/ports/net/dbip/asn/pkg added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2020/05/19 02:33:55 Modified files: textproc/elasticsearch: Makefile textproc/elasticsearch/pkg: README Log message: Fix typo ("configuratoin").
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/19 02:28:04 Modified files: x11/gnome/builder: Makefile Log message: gnome-builder: mark BROKEN-i386, linking fails. ok aja@ non-ABS relocation R_386_GOTOFF against symbol '.LC74'
Re: gnome-builder broken on i386
On Tue, May 19, 2020 at 01:13:11AM +0100, Stuart Henderson wrote: > On 2020/05/17 12:09, Stuart Henderson wrote: > > On 2020/05/14 09:17, Antoine Jacoutot wrote: > > > Log message: > > > Update to gnome-builder-3.36.0. > > > > Final link (cc -o src/gnome-builder [...]) fails on i386: > > > > ld: error: gdbwire.c:(.debug_info+0x993E71): has non-ABS relocation > > R_386_GOTOFF against symbol '.LC74' > > > > I'll try it with ld.bfd when my next bulk build reaches the right point. > > > > That didn't help, though that failed for a different reason > > ../gnome-builder-3.36.0/src/libide/core/ide-context.c:165: undefined > reference to `peas_engine_get_default' > ../gnome-builder-3.36.0/src/libide/core/ide-context.c:165: undefined > reference to `peas_extension_set_new' > ../gnome-builder-3.36.0/src/libide/core/ide-context.c:179: undefined > reference to `peas_extension_set_foreach' Just mark it broken on that arch. -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/19 01:22:55 Modified files: devel/spidermonkey68: Makefile Added files: devel/spidermonkey68/patches: patch-js_src_jit_ProcessExecutableMemory_h Log message: Bring executable memory limit patch from firefox. ok jasper@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2020/05/19 01:20:45 Modified files: sysutils/ruby-puppet/5: Makefile Log message: Add missing dependency, fixes "puppet module generate" command ok kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/19 00:22:48 Modified files: net/megatools : Makefile distinfo Log message: Update megatools to 1.10.3 This handles new style mega links (Although apparently not all of them yet). ok kn@ bentley@ (maintainer)