Re: UPDATE: R-4.2.3
Am 2023-08-28 23:04, schrieb Rafael Sadowski:
Simple update R to 4.2.3. Lightly tested on amd64. OK?
OK feinerer@
Thanks a lot for the diff! Please sync
math/rstudio/patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp as
well
(see comment above SO_VERSION).
Best regards,
Ingo
Cheers Rafael
Index: Makefile
===
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.127
diff -u -p -u -p -r1.127 Makefile
--- Makefile3 Aug 2022 15:13:25 - 1.127
+++ Makefile29 Aug 2023 05:54:53 -
@@ -1,9 +1,9 @@
COMMENT= powerful math/statistics/graphics language
-DISTNAME= R-4.2.1
+DISTNAME= R-4.2.3
# When bumping SO_VERSION, adjust
# math/rstudio/patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp
-SO_VERSION=39.0
+SO_VERSION=39.1
.for _lib in R Rblas Rlapack
SHARED_LIBS += ${_lib} ${SO_VERSION}
.endfor
@@ -17,9 +17,10 @@ MAINTAINER= Ingo Feinerer -WANTLIB += glib-2.0 gobject-2.0 harfbuzz iconv icui18n icuuc intl jpeg
lzma m
-WANTLIB += pango-1.0 pangocairo-1.0 pcre2-8 png readline tiff z
+WANTLIB += ICE SM X11 Xext Xmu Xss Xt bz2 c cairo curl glib-2.0
+WANTLIB += gobject-2.0 harfbuzz iconv icui18n icuuc intl jpeg
+WANTLIB += lzma m pango-1.0 pangocairo-1.0 pcre2-8 png pthread
+WANTLIB += readline tiff z
COMPILER = base-clang ports-gcc base-gcc
Index: distinfo
===
RCS file: /cvs/ports/math/R/distinfo,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 distinfo
--- distinfo3 Aug 2022 15:13:25 - 1.56
+++ distinfo29 Aug 2023 05:54:53 -
@@ -1,2 +1,2 @@
-SHA256 (R-4.2.1.tar.gz) = TVLbSG0nhI5UYT1O6XetlS7AjOF4B+G1JbEM1ENsZD8=
-SIZE (R-4.2.1.tar.gz) = 37601544
+SHA256 (R-4.2.3.tar.gz) = VeSpptQ74xTiwD0CZqb6VESv3OULMDv8O4Kzl5UW4HQ=
+SIZE (R-4.2.3.tar.gz) = 34010655
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/R/patches/patch-configure,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 patch-configure
--- patches/patch-configure 21 Mar 2023 15:40:24 - 1.46
+++ patches/patch-configure 29 Aug 2023 05:54:53 -
@@ -1,7 +1,7 @@
Index: configure
--- configure.orig
+++ configure
-@@ -47586,7 +47586,7 @@ int main()
+@@ -47606,7 +47606,7 @@ int main(int argc, const char * argv[])
{
#ifdef LIBCURL_VERSION_MAJOR
#if LIBCURL_VERSION_MAJOR > 7
Re: security/pcsc-cyberjack: update to SP15
Am 2023-07-02 10:32, schrieb Klemens Nanni:
Minimal diff without to the latest version from 2021.
Works fine with the 'cyberJack RFID standard' reader.
I think we can polish this port a bit, but that's a separate diff.
Feedback? OK?
OK feinerer@
Can you remove me as maintainer as well please? Thank you.
Best regards,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/security/pcsc-cyberjack/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile11 Mar 2022 19:53:49 - 1.13
+++ Makefile2 Jul 2023 08:29:32 -
@@ -1,9 +1,11 @@
COMMENT = REINER SCT cyberJack chipcard reader driver
-DISTNAME = pcsc-cyberjack_3.99.5final.SP13
+V =3.99.5
+SP = 15
+DISTNAME = pcsc-cyberjack_${V}final.SP${SP}
PKGNAME = ${DISTNAME:S/_/-/}
-SHARED_LIBS = ifd-cyberjack 0.0 # 6.0
+SHARED_LIBS = ifd-cyberjack 0.1 # 6.0
CATEGORIES = security
@@ -16,7 +18,8 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} m usb-1.0
-MASTER_SITES
= https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP13/
+MASTER_SITES
= https://support.reiner-sct.de/downloads/LINUX/V${V}_SP${SP}/
+EXTRACT_SUFX = .tar.bz2
# -std=c++11
COMPILER = base-clang ports-clang ports-gcc
Index: distinfo
===
RCS file: /cvs/ports/security/pcsc-cyberjack/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo4 May 2019 09:10:10 - 1.3
+++ distinfo2 Jul 2023 08:22:09 -
@@ -1,2 +1,2 @@
-SHA256 (pcsc-cyberjack_3.99.5final.SP13.tar.gz) =
azS0qYw3ZDvLWYEBPkx9HnD+u5+qGKrPkefHTL5bpNM=
-SIZE (pcsc-cyberjack_3.99.5final.SP13.tar.gz) = 1617714
+SHA256 (pcsc-cyberjack_3.99.5final.SP15.tar.bz2) =
rLfCgyRQcYdWcTdnxLPvUAgy1lLtUbNRELkQsR69Rno=
+SIZE (pcsc-cyberjack_3.99.5final.SP15.tar.bz2) = 1681827
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/pcsc-cyberjack/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 11 Mar 2022 19:53:49 - 1.2
+++ pkg/PLIST 2 Jul 2023 08:24:15 -
@@ -4,7 +4,7 @@ lib/pcsc/drivers/libifd-cyberjack.bundle
lib/pcsc/drivers/libifd-cyberjack.bundle/Contents/
lib/pcsc/drivers/libifd-cyberjack.bundle/Contents/Info.plist
lib/pcsc/drivers/libifd-cyberjack.bundle/Contents/OpenBSD/
-lib/pcsc/drivers/libifd-cyberjack.bundle/Contents/OpenBSD/libifd-cyberjack.a
+@static-lib
lib/pcsc/drivers/libifd-cyberjack.bundle/Contents/OpenBSD/libifd-cyberjack.a
lib/pcsc/drivers/libifd-cyberjack.bundle/Contents/OpenBSD/libifd-cyberjack.la
@lib
lib/pcsc/drivers/libifd-cyberjack.bundle/Contents/OpenBSD/libifd-cyberjack.so.${LIBifd-cyberjack_VERSION}
lib/pcsc/drivers/libifd-cyberjack.bundle/Contents/PkgInfo
Re: Problems updating math/maxima
Am 2023-05-30 03:13, schrieb George Koehler:
For the update to maxima 5.46.0, I'm happy with Stuart's diff (from
May 25), after fixing the MODPY_BIN_SUFFIX in PLIST. I rarely use
maxima, but I can run simple commands like "diff(5 * x**2, x);".
ok gkoehler@ (with the PLIST fix)
Also OK from my side (feinerer@). Thank you all for your efforts.
I do not use Maxima any longer, so I would like to drop MAINTAINER.
https://marc.info/?l=openbsd-ports=168501263910495=2 has the diff.
After I applied the diff, I edited pkg/PLIST to change
"${MODPY_BIN_SUFFIX}" back to "-2".
On Thu, 25 May 2023 11:32:44 -0600
Jonathan Drews wrote:
Stuart and Theo:
I compiled maxima with the Python entries removed and it
installed and runs ok. Here is the Makefile based on Suarts diff. I
did retain the references to tcl8.6.
...
MODTCL_VERSION= 8.6
...
pre-build:
${MODTCL_WISH_ADJ} ${WRKSRC}/interfaces/xmaxima/xmaxima
I didn't need the MODTCL_VERSION line nor the pre-build target, so
I didn't add them to my Makefile.
If your ports tree is from cvs (https://www.openbsd.org/anoncvs.html)
then you can create a diff like,
$ cd /usr/ports/math/maxima
$ cvs -q diff > ~/my.diff
This works if the update doesn't add or remove any files. After the
update to 5.46.0 is in cvs, we will be able to create diffs to
add the sbcl flavor.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2022/08/03 10:14:48 Modified files: www/buku : Makefile distinfo www/buku/pkg : PLIST Log message: Update to buku 4.7.1 Remove myself as maintainer.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2022/08/03 09:13:25 Modified files: math/R : Makefile distinfo math/R/pkg : PLIST math/rstudio : Makefile math/rstudio/patches: patch-src_cpp_core_r_util_REnvironmentPosix_cpp Log message: Update to R 4.2.1 ok tb@
UPDATE: math/R
Dear useRs,
Dear Brian,
update math/R 4.1.2 -> 4.2.1
- Sync math/rstudio patch as SO_VERSION is bumped (symbols added and removed)
- There is now a (multiple) warning in the build:
Warning message:
In normalizePath("~") :
path[1]="/R-4.2.1_writes_to_HOME": No such file or directory
The cause is likely that the _pbuild user has its home directory set
to /nonexistent. It tried to manually set HOME="$WRKDIR" in
CONFIGURE_ENV and MAKE_ENV but without success (either not picked up
or makes no difference).
However, R runs fine for me and I could not identify any problems
later on. So I did not investigate further.
OK?
Best regards,
Ingo
Index: R/Makefile
===
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.126
diff -u -p -r1.126 Makefile
--- R/Makefile 25 Jul 2022 06:11:05 - 1.126
+++ R/Makefile 3 Aug 2022 11:49:55 -
@@ -1,9 +1,9 @@
COMMENT= powerful math/statistics/graphics language
-DISTNAME= R-4.1.2
+DISTNAME= R-4.2.1
# When bumping SO_VERSION, adjust
# math/rstudio/patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp
-SO_VERSION=38.0
+SO_VERSION=39.0
.for _lib in R Rblas Rlapack
SHARED_LIBS += ${_lib} ${SO_VERSION}
.endfor
Index: R/distinfo
===
RCS file: /cvs/ports/math/R/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- R/distinfo 4 Nov 2021 07:57:06 - 1.55
+++ R/distinfo 3 Aug 2022 11:49:55 -
@@ -1,2 +1,2 @@
-SHA256 (R-4.1.2.tar.gz) = IDYiXp9yB9TOCX5Ulyrs2qi0DX2ZEc0mSR+sWg+rOK8=
-SIZE (R-4.1.2.tar.gz) = 34009074
+SHA256 (R-4.2.1.tar.gz) = TVLbSG0nhI5UYT1O6XetlS7AjOF4B+G1JbEM1ENsZD8=
+SIZE (R-4.2.1.tar.gz) = 37601544
Index: R/pkg/PLIST
===
RCS file: /cvs/ports/math/R/pkg/PLIST,v
retrieving revision 1.50
diff -u -p -r1.50 PLIST
--- R/pkg/PLIST 11 Mar 2022 19:36:11 - 1.50
+++ R/pkg/PLIST 3 Aug 2022 11:49:56 -
@@ -62,7 +62,6 @@ lib/R/include/R_ext/Parse.h
lib/R/include/R_ext/Print.h
lib/R/include/R_ext/PrtUtil.h
lib/R/include/R_ext/QuartzDevice.h
-lib/R/include/R_ext/R-ftp-http.h
lib/R/include/R_ext/RS.h
lib/R/include/R_ext/RStartup.h
lib/R/include/R_ext/Rallocators.h
@@ -82,7 +81,6 @@ lib/R/include/Rinterface.h
lib/R/include/Rinternals.h
lib/R/include/Rmath.h
lib/R/include/Rversion.h
-lib/R/include/S.h
lib/R/lib/
@lib lib/R/lib/libR.so.${LIBR_VERSION}
@lib lib/R/lib/libRblas.so.${LIBRblas_VERSION}
@@ -1023,10 +1021,6 @@ lib/R/library/mgcv/po/fr/
lib/R/library/mgcv/po/fr/LC_MESSAGES/
lib/R/library/mgcv/po/fr/LC_MESSAGES/R-mgcv.mo
lib/R/library/mgcv/po/fr/LC_MESSAGES/mgcv.mo
-lib/R/library/mgcv/po/it/
-lib/R/library/mgcv/po/it/LC_MESSAGES/
-lib/R/library/mgcv/po/it/LC_MESSAGES/R-mgcv.mo
-lib/R/library/mgcv/po/it/LC_MESSAGES/mgcv.mo
lib/R/library/mgcv/po/ko/
lib/R/library/mgcv/po/ko/LC_MESSAGES/
lib/R/library/mgcv/po/ko/LC_MESSAGES/R-mgcv.mo
@@ -1039,7 +1033,6 @@ lib/R/library/nlme/
lib/R/library/nlme/CITATION
lib/R/library/nlme/DESCRIPTION
lib/R/library/nlme/INDEX
-lib/R/library/nlme/LICENCE
lib/R/library/nlme/Meta/
lib/R/library/nlme/Meta/Rd.rds
lib/R/library/nlme/Meta/data.rds
@@ -1774,9 +1767,13 @@ lib/R/library/translations/lt/LC_MESSAGE
lib/R/library/translations/lt/LC_MESSAGES/R-grDevices.mo
lib/R/library/translations/lt/LC_MESSAGES/R-graphics.mo
lib/R/library/translations/lt/LC_MESSAGES/R-grid.mo
+lib/R/library/translations/lt/LC_MESSAGES/R-methods.mo
lib/R/library/translations/lt/LC_MESSAGES/R-parallel.mo
+lib/R/library/translations/lt/LC_MESSAGES/R-splines.mo
+lib/R/library/translations/lt/LC_MESSAGES/R-stats.mo
lib/R/library/translations/lt/LC_MESSAGES/R-stats4.mo
lib/R/library/translations/lt/LC_MESSAGES/R-tcltk.mo
+lib/R/library/translations/lt/LC_MESSAGES/R-tools.mo
lib/R/library/translations/lt/LC_MESSAGES/R-utils.mo
lib/R/library/translations/lt/LC_MESSAGES/R.mo
lib/R/library/translations/lt/LC_MESSAGES/RGui.mo
@@ -1788,6 +1785,7 @@ lib/R/library/translations/lt/LC_MESSAGE
lib/R/library/translations/lt/LC_MESSAGES/splines.mo
lib/R/library/translations/lt/LC_MESSAGES/stats.mo
lib/R/library/translations/lt/LC_MESSAGES/tcltk.mo
+lib/R/library/translations/lt/LC_MESSAGES/tools.mo
lib/R/library/translations/lt/LC_MESSAGES/utils.mo
lib/R/library/translations/nn/
lib/R/library/translations/nn/LC_MESSAGES/
@@ -1916,11 +1914,13 @@ lib/R/library/translations/zh_TW/LC_MESS
lib/R/library/translations/zh_TW/LC_MESSAGES/R-grDevices.mo
lib/R/library/translations/zh_TW/LC_MESSAGES/R-graphics.mo
lib/R/library/translations/zh_TW/LC_MESSAGES/R-grid.mo
+lib/R/library/translations/zh_TW/LC_MESSAGES/R-methods.mo
lib/R/library/translations/zh_TW/LC_MESSAGES/R-parallel.mo
lib/R/library/translations/zh_TW/LC_MESSAGES/R-splines.mo
lib/R/library/translations/zh_TW/LC_MESSAGES/R-stats.mo
lib/R/library/translations/zh_TW/LC_MESSAGES/R-stats4.mo
Xorg modules installation
Hi, I am working on xrdpxorg (http://xrdp.org) which builds a few Xorg modules. `make plist` does not seem to able to process them: Can't put into any plist (no applicable prefix): /usr/X11R6/lib/modules/libxorgxrdp.so ... Is there a proper way to install them? (so that pkg_add puts them into the right location) Thank you! Best regards, Ingo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/11/08 06:20:52 Modified files: textproc/py-pdfminer: Makefile distinfo textproc/py-pdfminer/pkg: PLIST Log message: Update to Pdfminer.six 20211012
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/11/04 01:57:06 Modified files: math/R : Makefile distinfo math/R/pkg : PLIST Log message: Update to R 4.1.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/11/01 03:47:08 Modified files: graphics/py-qrcode: Makefile distinfo Log message: Update to qrcode 7.3.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/08/23 01:47:41 Modified files: graphics/py-qrcode: Makefile distinfo Log message: Update to qrcode 7.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/08/10 05:00:39 Modified files: databases/py-pg_activity: Makefile distinfo databases/py-pg_activity/pkg: PLIST Added files: databases/py-pg_activity/patches: patch-setup_py Log message: Update to pg_activity 2.2.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/08/10 04:58:42 ports/databases/py-pg_activity/patches Update of /cvs/ports/databases/py-pg_activity/patches In directory cvs.openbsd.org:/tmp/cvs-serv53093/patches Log Message: Directory /cvs/ports/databases/py-pg_activity/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/08/10 04:34:02 Modified files: math/R : Makefile distinfo Removed files: math/R/patches : patch-configure patch-src_main_printutils_c Log message: Update to R 4.1.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/07/23 00:01:37 Modified files: graphics/py-qrcode: Makefile distinfo graphics/py-qrcode/pkg: PLIST Log message: Update to qrcode 7.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/07/14 04:36:41 Modified files: graphics/py-qrcode: Makefile distinfo graphics/py-qrcode/pkg: PLIST Log message: Update to qrcode 7.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/06/29 00:33:45 Modified files: www/buku : Makefile distinfo Log message: Update to buku 4.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/06/04 04:11:43 Modified files: math/R : Makefile distinfo math/R/patches : patch-configure math/R/pkg : PLIST Added files: math/R/patches : patch-src_main_printutils_c Removed files: math/R/patches : patch-src_library_parallel_R_detectCores_R Log message: Update to R 4.1.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/04/30 01:52:33 Modified files: telephony/coturn: Makefile distinfo Removed files: telephony/coturn/patches: patch-src_apps_relay_dtls_listener_c patch-src_client_ns_turn_msg_c Log message: Update to coturn 4.5.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/04/27 00:02:16 Modified files: databases/py-pg_activity: Makefile distinfo Log message: Update to pg_activity 2.1.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/04/04 01:50:23 Modified files: databases/py-pg_activity: Makefile distinfo databases/py-pg_activity/pkg: PLIST Log message: Update to pg_activity 2.1.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/04/01 05:52:25 Modified files: math/R : Makefile distinfo math/R/pkg : PLIST Log message: Update to R 4.0.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/02/15 03:43:19 Modified files: math/R : Makefile distinfo math/R/patches : patch-configure math/R/pkg : PLIST Log message: Update to R 4.0.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/02/09 09:43:59 Modified files: security/fwknop: Makefile Added files: security/fwknop/patches: patch-client_log_msg_h Log message: Fix build with -fno-common
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/01/25 05:32:15 Modified files: x11/enlightenment: Makefile distinfo Removed files: x11/enlightenment/patches: patch-configure_ac patch-eesh_main_c patch-src_Makefile_am patch-src_sound_c Log message: Update to Enlightenment E16 1.0.22
UPDATE: x11/enlightenment (E16)
Hi,
this updates x11/enlightenment to 1.0.22. All patches are now included
in upstream, so delete them and simplify the Makefile.
OK?
Best regards,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/x11/enlightenment/Makefile,v
retrieving revision 1.75
diff -u -p -r1.75 Makefile
--- Makefile10 Aug 2019 08:39:48 - 1.75
+++ Makefile20 Jan 2021 13:32:27 -
@@ -2,7 +2,7 @@
COMMENT= themed window manager
-V= 1.0.20
+V= 1.0.22
DISTNAME= e16-$V
PKGNAME= enlightenment-$V
DOCS= e16-docs-0.16.8.0.2
@@ -17,9 +17,9 @@ PERMIT_PACKAGE= Yes
WANTLIB = FLAC ICE Imlib2 SM X11 Xcomposite Xdamage Xext Xfixes Xft
WANTLIB += Xinerama Xrandr Xrender audiofile c expat ffi fontconfig
-WANTLIB += freetype fribidi glib-2.0 gobject-2.0 graphite2
-WANTLIB += gthread-2.0 harfbuzz iconv intl m ogg pango-1.0 pangoft2-1.0
-WANTLIB += pangoxft-1.0 pcre pthread sndio xcb z
+WANTLIB += freetype fribidi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
+WANTLIB += harfbuzz iconv intl m ogg pango-1.0 pangoft2-1.0
+WANTLIB += pangoxft-1.0 pcre pthread sndio xcb z ${COMPILER_LIBCXX}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
@@ -27,11 +27,6 @@ DISTFILES= ${DISTNAME}.tar.gz \
${DOCS}.tar.gz \
${THEMES}.tar.gz
-AUTOCONF_VERSION= 2.69
-AUTOMAKE_VERSION= 1.15
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
LIB_DEPENDS= devel/glib2 \
devel/libaudiofile \
devel/pango \
@@ -48,15 +43,6 @@ CONFIGURE_ARGS+= --enable-sound=sndio \
--with-sndldr=audiofile
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
-
-post-extract:
- cp -f ${FILESDIR}/sound_sndio.c ${WRKSRC}/src
-
-do-gen:
- cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} aclocal -I m4
- cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} autoconf
- cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} autoheader
- cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} automake
post-configure:
@cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} \
Index: distinfo
===
RCS file: /cvs/ports/x11/enlightenment/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo10 Aug 2019 08:39:48 - 1.12
+++ distinfo20 Jan 2021 13:32:27 -
@@ -1,6 +1,6 @@
-SHA256 (e16-1.0.20.tar.gz) = lkX5kpSxBnhjzhFoOKZ0gGoXdwY8V3YTVsCDkijK3f8=
+SHA256 (e16-1.0.22.tar.gz) = sH0wGgpnrAIJdK/L53nh1Is3bqsuR3+xiSd8E7dtSmc=
SHA256 (e16-docs-0.16.8.0.2.tar.gz) =
uNjgyvRZMc5nL6UIipY2hVM6Zamoz+7hUjnZbzuRWT8=
SHA256 (e16-themes-1.0.2.tar.gz) = f/3/XB+koTxwcVNWyVIlZIfQ1k8OpRPnVhHKbmE+coU=
-SIZE (e16-1.0.20.tar.gz) = 2469250
+SIZE (e16-1.0.22.tar.gz) = 2476849
SIZE (e16-docs-0.16.8.0.2.tar.gz) = 1655229
SIZE (e16-themes-1.0.2.tar.gz) = 8220355
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 24 Feb 2019 07:42:16 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,41 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2019/02/24 07:42:16 feinerer Exp $
-Index: configure.ac
configure.ac.orig
-+++ configure.ac
-@@ -91,12 +91,12 @@ AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_hints_gnom
-
- AC_ARG_ENABLE(sound,
- AC_HELP_STRING([--enable-sound],
-- [compile with sound support
(pulseaudio/esound/no)@<:@default=pulseaudio@:>@]),,
-+ [compile with sound support
(pulseaudio/esound/sndio/no)@<:@default=pulseaudio@:>@]),,
- enable_sound=pulseaudio)
- case x$enable_sound in
- xyes)
- enable_sound=pulseaudio;;
--xpulseaudio|xesound)
-+xpulseaudio|xesound|xsndio)
- ;;
- *)
- enable_sound=no;;
-@@ -137,6 +137,21 @@ if test "x$enable_sound" = "xesound"; then
- fi
- fi
- AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound" = "xesound")
-+
-+if test "x$enable_sound" = "xsndio"; then
-+ AC_CHECK_HEADERS(sndio.h,, enable_sound=no
-+AC_MSG_WARN([sndio sound support was requested but not found.]))
-+ AC_CHECK_LIB(sndio, sio_open, SNDIO_LIBS="-lsndio", enable_sound=no)
-+ AC_SUBST(SNDIO_LIBS)
-+ if test "x$enable_sound" = "xsndio"; then
-+AC_DEFINE(HAVE_SOUND, 1, [Sound support])
-+AC_DEFINE(HAVE_SOUND_SNDIO, 1, [Sndio sound support])
-+AC_DEFINE(USE_SOUND_LOADER_AUDIOFILE, 1, [Use audiofile sound loader])
-+PKG_CHECK_MODULES(AUDIOFILE, audiofile,,)
-+enable_sound=sndio
-+ fi
-+fi
-+AM_CONDITIONAL(USE_LIBSNDIO, test "x$enable_sound" = "xsndio")
-
- if test "x$enable_sound" != "xno" -a "x$with_sndldr" = "xnone"; then
- AC_MSG_ERROR([Sound support requires a sound loader])
Index: patches/patch-eesh_main_c
Re: consumers of py-psycopg2
On Tue, Dec 15, 2020 at 08:55:48PM -0600, Lucas Raab wrote:
> Hello,
Hi,
> Following up on the call for testers on barman, I am wondering if there
> are users of:
>
> ...
> * databases/py-pg_activity
Your diff works for me. Some remarks:
- Although the GH_ACCOUNT switched the distinfo checksum is identical.
But as the version number is identical as well we must keep REVISION
(and increase it).
- I wonder if choosing the py/py3 prefix when importing this port was
not a (my) mistake. It is just a tool.
Best regards,
Ingo
> diff ac63388973a9c760bf2bfa5932322058d777e170 /usr/ports
> blob - 4de6c4a46ad301c093c021305f7567f9918c81b1
> file + databases/py-pg_activity/Makefile
> --- databases/py-pg_activity/Makefile
> +++ databases/py-pg_activity/Makefile
> @@ -5,8 +5,9 @@ COMMENT = command line tool for PostgreSQL server
> act
> MODPY_EGG_VERSION = 1.5.0
> DISTNAME = pg_activity-${MODPY_EGG_VERSION}
> PKGNAME =py-${DISTNAME}
> +REVISION = 0
>
> -GH_ACCOUNT = julmon
> +GH_ACCOUNT = dalibo
> GH_PROJECT = pg_activity
> GH_TAGNAME = v${MODPY_EGG_VERSION}
>
> @@ -18,10 +19,11 @@ MAINTAINER = Ingo Feinerer
>
> PERMIT_PACKAGE = Yes
>
> MODULES =lang/python
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> MODPY_SETUPTOOLS = Yes
> MODPY_SETUP_ARGS = --with-man
> -RUN_DEPENDS =databases/py-psycopg2 \
> - sysutils/py-psutil
> +RUN_DEPENDS =databases/py-psycopg2${MODPY_FLAVOR} \
> + sysutils/py-psutil${MODPY_FLAVOR}
>
> post-patch:
> sed -i 's|/usr/share|${LOCALBASE}|' ${WRKSRC}/setup.py
> blob - 1e9bb6e287d5f79ee260ea9a9c089cb0e7be0c3f
> file + databases/py-pg_activity/pkg/PLIST
> --- databases/py-pg_activity/pkg/PLIST
> +++ databases/py-pg_activity/pkg/PLIST
> @@ -8,13 +8,14 @@ lib/python${MODPY_VERSION}/site-packages/pg_activity-$
>
> lib/python${MODPY_VERSION}/site-packages/pg_activity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/pgactivity/
> lib/python${MODPY_VERSION}/site-packages/pgactivity/Data.py
> -lib/python${MODPY_VERSION}/site-packages/pgactivity/Data.pyc
> lib/python${MODPY_VERSION}/site-packages/pgactivity/Process.py
> -lib/python${MODPY_VERSION}/site-packages/pgactivity/Process.pyc
> lib/python${MODPY_VERSION}/site-packages/pgactivity/UI.py
> -lib/python${MODPY_VERSION}/site-packages/pgactivity/UI.pyc
> lib/python${MODPY_VERSION}/site-packages/pgactivity/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/pgactivity/__init__.pyc
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pgactivity/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/pgactivity/${MODPY_PYCACHE}Data.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pgactivity/${MODPY_PYCACHE}Process.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pgactivity/${MODPY_PYCACHE}UI.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/pgactivity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> @man man/man1/pg_activity.1
> -share/doc/${MODPY_PY_PREFIX}pg_activity/
> -share/doc/${MODPY_PY_PREFIX}pg_activity/LICENSE.txt
> +share/doc/py-pg_activity/
> +share/doc/py-pg_activity/LICENSE.txt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/01/02 15:31:45 Modified files: databases/pgmodeler: Makefile distinfo databases/pgmodeler/patches: patch-main_main_pro patch-pgmodeler_pri databases/pgmodeler/pkg: PLIST Log message: Update to pgModeler 0.9.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/12/31 03:17:31 Modified files: www/buku : Makefile distinfo Log message: Update to buku 4.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/12/15 07:16:08 Modified files: x11/lemonbar : Makefile distinfo Added files: x11/lemonbar/patches: patch-lemonbar_c Log message: Update to lemonbar 1.4 Add pledge support (sync with x11/lemonbar-xft).
UPDATE: x11/lemonbar
Hi,
this diff updates x11/lemonbar to 1.4 and adds pledge support.
OK?
Best regards,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/x11/lemonbar/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:51:15 - 1.6
+++ Makefile24 Nov 2020 10:41:22 -
@@ -2,7 +2,7 @@
COMMENT = featherweight lemon-scented bar
-VERSION = 1.3
+VERSION = 1.4
PKGNAME = lemonbar-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/x11/lemonbar/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo21 Nov 2017 06:08:37 - 1.2
+++ distinfo24 Nov 2020 10:41:22 -
@@ -1,2 +1,2 @@
-SHA256 (bar-1.3.tar.gz) = 6ueExeN1stCxITi+GpkCvrS17rgH81EvMPFLoj3ao30=
-SIZE (bar-1.3.tar.gz) = 14930
+SHA256 (bar-1.4.tar.gz) = e/0216SpUPYe0NMsfSGWeOd4elRtnvS8M/Ajk9YOSTk=
+SIZE (bar-1.4.tar.gz) = 16810
Index: patches/patch-lemonbar_c
===
RCS file: patches/patch-lemonbar_c
diff -N patches/patch-lemonbar_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lemonbar_c24 Nov 2020 10:41:22 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: lemonbar.c
+--- lemonbar.c.orig
lemonbar.c
+@@ -1,5 +1,4 @@
+ // vim:sw=4:ts=4:et:
+-#define _POSIX_C_SOURCE 200809L
+ #include
+ #include
+ #include
+@@ -1503,6 +1502,11 @@ main (int argc, char **argv)
+ free(wm_name);
+ // Get the fd to Xserver
+ pollin[1].fd = xcb_get_file_descriptor(c);
++
++if (pledge("stdio", NULL) == -1) {
++fprintf(stderr, "pledge: %s\n", strerror(errno));
++return EXIT_FAILURE;
++}
+
+ for (;;) {
+ bool redraw = false;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/11/24 03:40:44 ports/x11/lemonbar/patches Update of /cvs/ports/x11/lemonbar/patches In directory cvs.openbsd.org:/tmp/cvs-serv2182/patches Log Message: Directory /cvs/ports/x11/lemonbar/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/10/21 23:15:38 Modified files: net/kdeconnect-kde: Makefile distinfo net/kdeconnect-kde/patches: patch-data_org_kde_kdeconnect_open_desktop net/kdeconnect-kde/pkg: PLIST Log message: Update to KDE Connect 1.4.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/10/12 00:56:07 Modified files: math/hdf5 : Makefile distinfo math/hdf5/pkg : PLIST Log message: Update to HDF5 1.10.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/10/10 03:52:52 Modified files: math/R : Makefile distinfo math/R/patches : patch-configure Log message: Update to R 4.0.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/09/25 07:53:53 Modified files: x11/dunst : Makefile distinfo x11/dunst/patches: patch-dunstrc x11/dunst/pkg : PLIST Added files: x11/dunst/patches: patch-src_notification_c Log message: Update to Dunst 1.5.0 >From Timo Myyrä (MAINTAINER)
Re: [maintainer update] x11/dunst
On Mon, Sep 21, 2020 at 06:22:44PM +, Timo Myyrä wrote:
> Here's a bump for x11/dunst. Dbus doesn't seem to be needed during build
> so move to run_depends.
>
> works for me on amd64.
Works for me on amd64 as well.
Two nits:
1)
$ make port-lib-depends-check
dunst-1.5.0(x11/dunst):
Missing lib: notify.4 (/usr/local/bin/dunstify) (NOT REACHABLE)
So add
devel/libnotify \
to LIB_DEPENDS and add
notify
to WANTLIB.
2)
@bin/dunstctl in pkg/PLIST
Drop the @ at the beginning as it is a shell script.
Besides that OK feinerer@
Best regards,
Ingo
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/dunst/Makefile,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 Makefile
> --- Makefile 2 Aug 2019 13:49:29 - 1.9
> +++ Makefile 20 Sep 2020 05:51:11 -
> @@ -4,7 +4,7 @@ COMMENT = customizable and lightweight n
>
> GH_ACCOUNT = dunst-project
> GH_PROJECT = dunst
> -GH_TAGNAME = v1.4.1
> +GH_TAGNAME = v1.5.0
>
> CATEGORIES = x11
>
> @@ -15,9 +15,9 @@ MAINTAINER =Timo Myyra # BSD
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += X11 Xext Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
> -WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0 pangocairo-1.0
> -WANTLIB += pthread
> +WANTLIB += X11 Xext Xinerama Xrandr Xss c cairo gdk_pixbuf-2.0
> +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 harfbuzz intl m
> +WANTLIB += pango-1.0 pangocairo-1.0 pthread
>
> USE_GMAKE = Yes
>
> @@ -25,8 +25,9 @@ LIB_DEPENDS += devel/gettext,-runtime \
> devel/glib2 \
> devel/pango \
> graphics/cairo \
> - graphics/gdk-pixbuf2 \
> - x11/dbus
> + graphics/gdk-pixbuf2
> +
> +RUN_DEPENDS += x11/dbus
>
> FAKE_FLAGS = PREFIX="${PREFIX}" \
> MANPREFIX="${PREFIX}/man" \
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/dunst/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- distinfo 2 Aug 2019 13:49:29 - 1.5
> +++ distinfo 20 Sep 2020 05:51:11 -
> @@ -1,2 +1,2 @@
> -SHA256 (dunst-1.4.1.tar.gz) = FWP+jJ6vMwej19vtJAUh956EFfE2SXAwUSxpcTEYvf4=
> -SIZE (dunst-1.4.1.tar.gz) = 160124
> +SHA256 (dunst-1.5.0.tar.gz) = LDkK3xRLX6D/AH6jYWyQ8btTffaoBCGWmT9VhdG8jJo=
> +SIZE (dunst-1.5.0.tar.gz) = 169272
> Index: patches/patch-dunstrc
> ===
> RCS file: /cvs/ports/x11/dunst/patches/patch-dunstrc,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-dunstrc
> --- patches/patch-dunstrc 2 Aug 2019 13:49:29 - 1.2
> +++ patches/patch-dunstrc 20 Sep 2020 05:51:11 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-dunstrc,v 1.2 2019/08/02
> Index: dunstrc
> --- dunstrc.orig
> +++ dunstrc
> -@@ -166,7 +166,7 @@
> +@@ -175,7 +175,7 @@
> max_icon_size = 32
>
> # Paths to default icons.
> @@ -12,7 +12,7 @@ Index: dunstrc
>
> ### History ###
>
> -@@ -180,10 +180,10 @@
> +@@ -189,10 +189,10 @@
> ### Misc/Advanced ###
>
> # dmenu path.
> Index: patches/patch-src_notification_c
> ===
> RCS file: patches/patch-src_notification_c
> diff -N patches/patch-src_notification_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_notification_c 20 Sep 2020 05:51:11 -
> @@ -0,0 +1,34 @@
> +$OpenBSD$
> +
> +Index: src/notification.c
> +--- src/notification.c.orig
> src/notification.c
> +@@ -58,7 +58,7 @@ void notification_print(const struct notification *n)
> + printf("\ticon_id: '%s'\n", n->icon_id);
> + printf("\tdesktop_entry: '%s'\n", n->desktop_entry ?
> n->desktop_entry : "");
> + printf("\tcategory: %s\n", n->category);
> +-printf("\ttimeout: %ld\n", n->timeout/1000);
> ++printf("\ttimeout: %lld\n", (long long)n->timeout/1000);
> + printf("\turgency: %s\n",
> notification_urgency_to_string(n->urgency));
> + printf("\ttransient: %d\n", n->transient);
> + printf("\tformatted: '%s'\n", n->msg);
> +@@ -574,14 +574,14 @@ void notification_update_text_to_render(struct notific
> + char *new_buf;
> + if (hours > 0) {
> + new_buf =
> +-g_strdup_printf("%s (%ldh %ldm %lds old)", buf,
> hours,
> +-minutes, seconds);
> ++g_strdup_printf("%s (%lldh %lldm %llds old)",
> buf, (long long)hours,
> ++(long long)minutes, (long
> long)seconds);
> + } else if (minutes > 0) {
> + new_buf =
> +-g_strdup_printf("%s (%ldm %lds old)", buf,
> minutes,
> +-seconds);
> ++
x11/freerdp sndio backend
Hi,
please find attached a sndio backend for FreeRDP which implements
- Audio Output Virtual Channel
(= sound on remote desktop is redirected to local sndiod) and
- Audio Input Redirection Virtual Channel
(= local microphone is redirected to remote desktop).
This allows me to use MS Teams on a remote desktop via FreeRDP. The audio
quality is very good in my test setup; sometimes Windows chimes crackle a bit;
the same behavior is observed with a recent FreeRDP on a Linux machine
(with a pulseaudio/alsa backend).
The backend is based on the oss backend with inspiration from alsa und
pulseaudio. Neither of those three work on OpenBSD. At the moment I do not
plan to submit this upstream as the implementation uses a slightly outdated
API. I am willing to do this once (whether?) our FreeRDP ports gets updated
(which is blocked to due missing timer_create()) as I cannot test
against newer versions easily at the moment.
If a developer thinks this is a useful contribution (and gives an OK) we can
add it to our FreeRDP port locally for the moment.
I attached a .tar.gz to make it easier to review as I did not dare to
cvs add a new "files" directory (as CVS won't forget?). The following diff
shows everything besides the "files" directory.
You need to add /sound:sys:sndio /microphone:sys:sndio to activate the
new features. (x11/remmina cannot handle it; I did not investigate in
depth as we have an outdated version in ports). E.g.:
xfreerdp /d:yourdomain /u:yourusername /v:yourservername.com /sound:sys:sndio
/microphone:sys:sndio
OK?
Best regards,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile4 Nov 2019 10:30:20 - 1.39
+++ Makefile10 Sep 2020 14:17:31 -
@@ -6,7 +6,7 @@ BROKEN-hppa = undefined reference to __
COMMENT = client for Microsoft RDP (remote desktop protocol)
DISTNAME = freerdp-2.0.0-rc1
PKGNAME = freerdp-2.0.0rc1
-REVISION = 4
+REVISION = 5
CATEGORIES = x11 net
# XXX This version has known security issues.
@@ -26,7 +26,7 @@ MASTER_SITES =https://pub.freerdp.com/
PERMIT_PACKAGE = Yes
WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrender Xv avcodec
-WANTLIB += avutil c crypto cups execinfo m pthread ssl xkbfile
+WANTLIB += avutil c crypto cups execinfo m pthread sndio ssl xkbfile
# thread-local storage
COMPILER = base-clang ports-gcc
@@ -50,9 +50,15 @@ CONFIGURE_ARGS +=-DBUILD_TESTING=ON \
-DWITH_OPENSLES=OFF \
-DWITH_PCSC=ON \
-DWITH_LIBSYSTEMD=OFF \
- -DWITH_OSS=OFF
+ -DWITH_OSS=OFF \
+ -DWITH_SNDIO=ON
pre-configure:
+ mkdir ${WRKSRC}/channels/{audin,rdpsnd}/client/sndio
+ cp ${FILESDIR}/audin/{CMakeLists.txt,audin_sndio.c} \
+ ${WRKSRC}/channels/audin/client/sndio
+ cp ${FILESDIR}/rdpsnd/{CMakeLists.txt,rdpsnd_sndio.c} \
+ ${WRKSRC}/channels/rdpsnd/client/sndio
${SUBST_CMD}${WRKSRC}/winpr/libwinpr/CMakeLists.txt
${SUBST_CMD}${WRKSRC}/CMakeLists.txt
Index: patches/patch-channels_audin_client_CMakeLists_txt
===
RCS file: patches/patch-channels_audin_client_CMakeLists_txt
diff -N patches/patch-channels_audin_client_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-channels_audin_client_CMakeLists_txt 10 Sep 2020 14:17:31
-
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: channels/audin/client/CMakeLists.txt
+--- channels/audin/client/CMakeLists.txt.orig
channels/audin/client/CMakeLists.txt
+@@ -56,3 +56,7 @@ endif()
+ if(WITH_MACAUDIO)
+ add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "mac" "")
+ endif()
++
++if(WITH_SNDIO)
++ add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "sndio"
"")
++endif()
Index: patches/patch-channels_audin_client_audin_main_c
===
RCS file: patches/patch-channels_audin_client_audin_main_c
diff -N patches/patch-channels_audin_client_audin_main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-channels_audin_client_audin_main_c10 Sep 2020 14:17:31
-
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Index: channels/audin/client/audin_main.c
+--- channels/audin/client/audin_main.c.orig
channels/audin/client/audin_main.c
+@@ -670,8 +670,11 @@ static UINT audin_load_device_plugin(IWTSPlugin* pPlug
+ AUDIN_PLUGIN* audin = (AUDIN_PLUGIN*)pPlugin;
+ UINT error;
+
++ /*
++ * Causes invalid memory access. Ignore as we do not have arguments.
+ if (!audin_process_addin_args(audin, args))
+ return CHANNEL_RC_INITIALIZATION_ERROR;
++
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/08/14 23:11:03 Modified files: telephony/coturn: Makefile distinfo telephony/coturn/patches: patch-src_client_ns_turn_msg_c Log message: Update to coturn 4.5.1.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/06/26 04:11:41 Modified files: devel/colordiff: Makefile distinfo Log message: Update to colordiff 1.0.19 OK edd@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/06/23 12:54:24 Modified files: math/R : Makefile distinfo Log message: Update to R 4.0.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/06/19 00:45:08 Modified files: www/buku : Makefile distinfo Log message: Update to buku 4.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/06/09 13:56:59 Modified files: math/maxima: Makefile distinfo math/maxima/pkg: PLIST Removed files: math/maxima/patches: patch-lisp-utils_defsystem_lisp patch-src_maxima_system Log message: Update to Maxima 5.44.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/06/08 12:36:28 Modified files: math/R : Makefile Added files: math/R/patches : patch-src_library_parallel_R_detectCores_R Log message: Use hw.ncpuonline to report the number of cores
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/06/06 15:57:17 Modified files: math/R : Makefile distinfo math/R/pkg : PLIST Log message: Update to R 4.0.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/06/02 10:33:09 Modified files: sysutils/udfclient: Makefile distinfo Log message: Update to UDFclient 0.8.11 >From Josh Grosse (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/06/02 06:48:47 Modified files: net/kdeconnect-kde: Makefile Added files: net/kdeconnect-kde/patches: patch-data_org_kde_kdeconnect_open_desktop Log message: Update home page and fix invalid */* MIME type
Re: Update lang/ecl to 20.4.24
On Tue, Jun 02, 2020 at 07:01:57AM +0300, Timo Myyrä wrote: > Did you get the maxima tests to run as well? I didn't have success yet > with those although the compilation worked. How did you run the tests? `make test` runs a test suite but the results are only written to a log file (pobj/maxima-5.43.2/maxima-5.43.2/tests/ecl-test.sh.log). As the tests take some time the test suite might appear to hang. The same test suite can be triggered manually if you start xmaxima and click on the `Maxima->Run Tests` menu entry. The output is immediately shown in the input/output window. Best regards, Ingo
Re: Update lang/ecl to 20.4.24
On Sat, May 30, 2020 at 08:32:23AM -0700, Josh Elsasser wrote: > Maxima needs an upstream patch to build with ecl 20.4.24. This should > be safe to commit now, before updating ecl. > > diff --git a/math/maxima/patches/patch-lisp-utils_defsystem_lisp > b/math/maxima/patches/patch-lisp-utils_defsystem_lisp > new file mode 100644 > index 000..b3fd1683402 > --- /dev/null > +++ b/math/maxima/patches/patch-lisp-utils_defsystem_lisp > @@ -0,0 +1,17 @@ > +$OpenBSD$ > + > +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 > +Fix for Bug #3629, to compile with ECL 20.4.24 > + > +Index: lisp-utils/defsystem.lisp > +--- lisp-utils/defsystem.lisp.orig > lisp-utils/defsystem.lisp > +@@ -4152,7 +4152,7 @@ the system definition, if provided." > + #+:ecl > + (progn > + (ext:package-lock "CL" nil) > +-(setf (symbol-function 'lisp:require) > ++(setf (symbol-function 'cl:require) > + (symbol-function 'new-require)) > + (ext:package-lock "CL" t)) > + #+:lispworks > diff --git a/math/maxima/patches/patch-src_maxima_system > b/math/maxima/patches/patch-src_maxima_system > new file mode 100644 > index 000..5d651aa002e > --- /dev/null > +++ b/math/maxima/patches/patch-src_maxima_system > @@ -0,0 +1,18 @@ > +$OpenBSD$ > + > +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 > +Fix for Bug #3629, to compile with ECL 20.4.24 > + > +Index: src/maxima.system > +--- src/maxima.system.orig > src/maxima.system > +@@ -80,8 +80,7 @@ > + (let ((x (symbol-value (find-symbol > "*AUTOCONF-LD-FLAGS*" > + (find-package > "MAXIMA") > + (if (and x (not (string= x ""))) (list x))) > +- :epilogue-code '(progn (require :defsystem) > +- (cl-user::run))) > ++ :epilogue-code '(progn (cl-user::run))) > + > + (defun maxima-binary-pathname () > + #+clisp Committed. Thanks for the patch! Best regards, Ingo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/31 01:41:13 Modified files: math/maxima: Makefile Added files: math/maxima/patches: patch-lisp-utils_defsystem_lisp patch-src_maxima_system Log message: Fix compilation with ECL 20.4.24 >From Josh Elsasser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/29 15:59:46 Modified files: telephony : Makefile Log message: +resiprocate
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/29 15:41:23 Log message: Import reSIProcate stack, repro, and reTurn 1.12.0 The reSIProcate components, particularly the SIP stack, are in use in both commercial and open-source products. The project is dedicated to maintaining a complete, correct, and commercially usable implementation of SIP and a few related protocols. repro is an open-source, free SIP server which provides SIP proxy, registrar, redirect, and identity services. reTurn is a highly efficient C++ open-source STUN/TURN server and client library. It is an implementation of the latest STUN/TURN RFCs: RFC5389 (STUN), and RFC5766 (TURN). OK sthen@ Status: Vendor Tag: feinerer Release Tags: feinerer_20200529 N ports/telephony/resiprocate/Makefile N ports/telephony/resiprocate/distinfo N ports/telephony/resiprocate/pkg/repro.rc N ports/telephony/resiprocate/pkg/reTurnServer.rc N ports/telephony/resiprocate/pkg/PLIST-main N ports/telephony/resiprocate/pkg/PLIST-repro N ports/telephony/resiprocate/pkg/DESCR-main N ports/telephony/resiprocate/pkg/DESCR-repro N ports/telephony/resiprocate/pkg/DESCR-return N ports/telephony/resiprocate/pkg/PLIST-return N ports/telephony/resiprocate/patches/patch-configure N ports/telephony/resiprocate/patches/patch-reTurn_reTurnServer_config N ports/telephony/resiprocate/patches/patch-repro_users_txt N ports/telephony/resiprocate/patches/patch-repro_repro_config N ports/telephony/resiprocate/patches/patch-reTurn_users_txt No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/29 14:52:28 Modified files: infrastructure/db: user.list Log message: Reserve uid/gid 855 for _repro and 856 for _return OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/26 03:54:56 Modified files: multimedia/libv4l: Makefile distinfo multimedia/libv4l/patches: patch-lib_libv4lconvert_Makefile_in Log message: Update to libv4l 1.20.0
Re: NEW: telephony/resiprocate
On Mon, May 18, 2020 at 02:19:20PM +0100, Stuart Henderson wrote: > Looking pretty good, just a few comments: > > - those user.list entries should just say telephony/resiprocate. Fixed. > - I'm not sure we really need two readmes just telling people how to > generate a self-signed X.509 cert? We don't do that for webservers, > mailservers or other voip software). Good point. Generating the Diffie-Hellman parameters file is documented (as a comment) in each configuration file. With Let's Encrypt proper certificates can easily obtained and generating self-signed certificates is not different here compared to other software. So I just deleted both READMEs. > - I would prefer to lowercase reTurn (resiprocate is already lower-cased > so it then matches that, and matches other ports). I agree as it makes the naming more consistent (the file paths still use reTurn as they come directly from upstream). Thanks for your comments. Best regards, Ingo resiprocate.tar.gz Description: application/tar-gz
NEW: telephony/resiprocate
Hi, please find attached a port for the reSIProcate (https://www.resiprocate.org/) SIP stack with STUN/TURN server and SIP proxy/registrar server. It is an alternative to the Kamailio SIP server. $ cat pkg/DESCR-main The reSIProcate components, particularly the SIP stack, are in use in both commercial and open-source products. The project is dedicated to maintaining a complete, correct, and commercially usable implementation of SIP and a few related protocols. $ cat pkg/DESCR-repro repro is an open-source, free SIP server which provides SIP proxy, registrar, redirect, and identity services. $ cat pkg/DESCR-reTurn reTurn is a highly efficient C++ open-source STUN/TURN server and client library. It is an implementation of the latest STUN/TURN RFCs: RFC5389 (STUN), and RFC5766 (TURN). I am using repro as SIP registrar for over 2 years now on amd64 without problems (initial submission: https://marc.info/?l=openbsd-ports=150593554912043=2). OK to import? Note: I am using 855 _return _return telephony/resiprocate/reTurn 856 _repro _repro telephony/resiprocate/repro for the moment (infrastructure/db/user.list). Best regards, Ingo resiprocate.tar.gz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/17 23:26:13 Modified files: math/R : Makefile distinfo math/R/patches : patch-configure math/R/pkg : PLIST README Log message: Update to R 4.0.0 OK pirofti@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/17 04:21:44 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Update CVE quirk for telephony/coturn Fixes CVE-2020-6061 and CVE-2020-6062.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/17 04:14:53 Modified files: telephony/coturn: Makefile distinfo telephony/coturn/pkg: PLIST Added files: telephony/coturn/patches: patch-src_apps_relay_dtls_listener_c patch-src_client_ns_turn_msg_c Log message: Update to coturn 4.5.1.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/17 04:13:09 ports/telephony/coturn/patches Update of /cvs/ports/telephony/coturn/patches In directory cvs.openbsd.org:/tmp/cvs-serv77468/patches Log Message: Directory /cvs/ports/telephony/coturn/patches added to the repository
UPDATE: math/R
Dear useRs,
update math/R 3.6.3 -> 4.0.0
- SHARED_LIBS: increase major version number due to removals in dynamic
export changes in libR.so.
- Sync WANTLIB as PCRE2 is now preferred (see
https://stat.ethz.ch/pipermail/r-announce/2020/000653.html for details).
- Clean up MASTER_SITES as a few sites time out (for details see
https://cran.r-project.org/mirmon_report.html). Use the main site and the new
cloud CDN site as backup instead.
- Update line numbers in patch.
- Recommend to use (optional) Java 11 instead of 1.8 in README.
Works for me on amd64 since a few weeks (released on 24 April).
(Note: you need to reinstall your R packages as this is a major R update.)
OK?
Best regards,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.114
diff -u -p -r1.114 Makefile
--- Makefile2 Mar 2020 14:07:05 - 1.114
+++ Makefile17 May 2020 07:33:04 -
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.114 2020/03/02 14:07:05 feinerer Exp $
COMMENT= powerful math/statistics/graphics language
-DISTNAME= R-3.6.3
+DISTNAME= R-4.0.0
-SO_VERSION=36.1
+SO_VERSION=37.0
.for _lib in R Rblas Rlapack
SHARED_LIBS += ${_lib} ${SO_VERSION}
.endfor
@@ -19,20 +19,12 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} ${MODTK_WANTLIB} ${MODFORTRAN_WANTLIB}
WANTLIB += ICE SM X11 Xext Xmu Xss Xt bz2 c cairo crypto curl
WANTLIB += glib-2.0 gobject-2.0 harfbuzz iconv icui18n icuuc intl jpeg lzma m
-WANTLIB += nghttp2 pango-1.0 pangocairo-1.0 pcre pcre2-8 png readline ssl tiff
z
+WANTLIB += nghttp2 pango-1.0 pangocairo-1.0 pcre2-8 png readline ssl tiff z
COMPILER = base-clang ports-gcc base-gcc
-MASTER_SITES= https://cran.r-project.org/src/base/R-3/ \
- http://cran.at.r-project.org/src/base/R-3/ \
- http://cran.br.r-project.org/src/base/R-3/ \
- http://cran.ch.r-project.org/src/base/R-3/ \
- http://cran.dk.r-project.org/src/base/R-3/ \
- http://cran.es.r-project.org/src/base/R-3/ \
- http://cran.stat.ucla.edu/src/base/R-3/ \
- http://cran.uk.r-project.org/src/base/R-3/ \
- http://cran.us.r-project.org/src/base/R-3/ \
- http://probability.ca/cran/src/base/R-3/
+MASTER_SITES= https://cran.r-project.org/src/base/R-4/ \
+ https://cloud.r-project.org/src/base/R-4/
MODULES= fortran \
x11/tk
Index: distinfo
===
RCS file: /cvs/ports/math/R/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo2 Mar 2020 14:07:05 - 1.46
+++ distinfo17 May 2020 07:33:04 -
@@ -1,2 +1,2 @@
-SHA256 (R-3.6.3.tar.gz) = iTApkNjordU24SEl7FkdaVECLPhHWGGzaQvIvxzvqo8=
-SIZE (R-3.6.3.tar.gz) = 33308185
+SHA256 (R-4.0.0.tar.gz) = Br6wKRtWmXhITrDctdIzlmXsdFc3vftOhz56WnVJKUA=
+SIZE (R-4.0.0.tar.gz) = 33173947
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/R/patches/patch-configure,v
retrieving revision 1.40
diff -u -p -r1.40 patch-configure
--- patches/patch-configure 18 Dec 2019 13:05:48 - 1.40
+++ patches/patch-configure 17 May 2020 07:33:04 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.40 2019/12
Index: configure
--- configure.orig
+++ configure
-@@ -42057,8 +42057,8 @@ fi
+@@ -45219,8 +45219,8 @@ fi
fi
if test "${have_zlib}" = yes; then
@@ -14,7 +14,7 @@ Index: configure
if ${r_cv_header_zlib_h+:} false; then :
$as_echo_n "(cached) " >&6
else
-@@ -42073,7 +42073,7 @@ else
+@@ -45235,7 +45235,7 @@ else
#include
int main() {
#ifdef ZLIB_VERNUM
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/R/pkg/PLIST,v
retrieving revision 1.43
diff -u -p -r1.43 PLIST
--- pkg/PLIST 18 Dec 2019 13:05:48 - 1.43
+++ pkg/PLIST 17 May 2020 07:33:05 -
@@ -415,6 +415,9 @@ lib/R/library/class/po/en@quot/LC_MESSAG
lib/R/library/class/po/fr/
lib/R/library/class/po/fr/LC_MESSAGES/
lib/R/library/class/po/fr/LC_MESSAGES/R-class.mo
+lib/R/library/class/po/it/
+lib/R/library/class/po/it/LC_MESSAGES/
+lib/R/library/class/po/it/LC_MESSAGES/R-class.mo
lib/R/library/class/po/ko/
lib/R/library/class/po/ko/LC_MESSAGES/
lib/R/library/class/po/ko/LC_MESSAGES/R-class.mo
@@ -1923,12 +1926,16 @@ share/doc/R/NEWS
share/doc/R/NEWS.0
share/doc/R/NEWS.1
share/doc/R/NEWS.2
+share/doc/R/NEWS.2.rds
+share/doc/R/NEWS.3
+share/doc/R/NEWS.3.rds
share/doc/R/NEWS.pdf
share/doc/R/NEWS.rds
share/doc/R/RESOURCES
share/doc/R/THANKS
share/doc/R/html/
share/doc/R/html/NEWS.2.html
+share/doc/R/html/NEWS.3.html
share/doc/R/html/NEWS.html
share/doc/R/html/R.css
share/doc/R/html/Rlogo.pdf
Index: pkg/README
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/05/15 03:55:55 Modified files: multimedia/libv4l: Makefile distinfo multimedia/libv4l/pkg: PLIST Log message: Update to libv4l 1.18.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/04/16 01:01:17 Modified files: databases/pgmodeler: Makefile distinfo databases/pgmodeler/patches: patch-pgmodeler_pri databases/pgmodeler/pkg: PLIST Log message: Update to pgModeler 0.9.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/04/10 22:44:38 Modified files: print/gl2ps: Makefile distinfo Log message: Update to GL2PS 1.4.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/04/05 01:26:59 Modified files: print/gl2ps: Makefile distinfo print/gl2ps/pkg: PLIST Log message: Update to GL2PS 1.4.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/03/27 15:27:09 Modified files: net/kdeconnect-kde: Makefile distinfo net/kdeconnect-kde/patches: patch-core_backends_lan_lanlinkprovider_cpp patch-plugins_sftp_mounter_cpp net/kdeconnect-kde/pkg: PLIST README Added files: net/kdeconnect-kde/patches: patch-core_backends_lan_compositeuploadjob_cpp Removed files: net/kdeconnect-kde/patches: patch-core_backends_lan_uploadjob_cpp patch-plugins_mousepad_CMakeLists_txt Log message: Update to KDE Connect 1.4 OK rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/03/02 07:07:05 Modified files: math/R : Makefile distinfo Log message: Update to R 3.6.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/02/07 05:36:26 Modified files: math/maxima: Makefile distinfo math/maxima/pkg: PLIST Log message: Update to Maxima 5.43.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/02/07 04:42:09 Modified files: sysutils/ioping: Makefile distinfo Log message: Update to ioping 1.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/02/07 04:31:55 Modified files: www/buku : Makefile distinfo www/buku/pkg : PLIST Log message: Update to buku 4.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/01/09 05:00:58 Modified files: math/hdf5 : Makefile distinfo math/hdf5/pkg : PLIST Log message: Update to HDF5 1.10.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/12/19 00:03:56 Modified files: archivers : Makefile Log message: +blosc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/12/19 00:00:24 Log message: Import Blosc 1.17.1 Blosc is a high performance compressor optimized for binary data. It has been designed to transmit data to the processor cache faster than the traditional, non-compressed, direct memory fetch approach via a memcpy() OS call. Blosc is meant not only to reduce the size of large datasets on-disk or in-memory, but also to accelerate memory-bound computations. It uses the blocking technique so as to reduce activity in the memory bus as much as possible. In short, this technique works by dividing datasets in blocks that are small enough to fit in caches of modern processors and perform compression/decompression there. It also leverages, if available, SIMD instructions (SSE2, AVX2) and multi-threading capabilities of CPUs, in order to accelerate the compression/decompression process to a maximum. From martin@; input and OK from bcallah@, feinerer@, and sthen@ Status: Vendor Tag: feinerer Release Tags: feinerer_20191219 N ports/archivers/blosc/distinfo N ports/archivers/blosc/Makefile N ports/archivers/blosc/patches/patch-tests_test_common_h N ports/archivers/blosc/patches/patch-bench_CMakeLists_txt N ports/archivers/blosc/pkg/PLIST N ports/archivers/blosc/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/12/18 06:05:49 Modified files: math/R : Makefile distinfo math/R/patches : patch-configure math/R/pkg : PLIST Log message: Update to R 3.6.2 Tests and feedback on arm64 from martin@ and bcallah@
Re: UPDATE: math/R
On Fri, Dec 13, 2019 at 11:28:50AM +0100, Martin Reindl wrote:
> On Thu, Dec 12, 2019 at 02:16:24PM +0100, Ingo Feinerer wrote:
> > update math/R 3.6.1 -> 3.6.2
> [...]
> > Works for me on amd64.
>
> +1 on arm64 with my Rscripts.
>
> But does this need extra WANTLIBs?
>
> R-3.6.2(math/R):
> Missing: flang.2 from flang-8.0.1.20191107
> (/usr/local/lib/R/modules/lapack.so)
> Missing: flangrti.5 from flang-8.0.1.20191107
> (/usr/local/lib/R/modules/lapack.so)
> Missing: pgmath.4 from libpgmath-8.0.1.20191107
> (/usr/local/lib/R/modules/lapack.so)
> Extra: c++.3 c++abi.1
> WANTLIB += flang flangrti pgmath
> *** Error 1 in target 'port-lib-depends-check' (ignored)
R uses flang on arm64 (changed in math/R by bcallah@ on 2019-05-08):
MODULES = fortran
.if ${MACHINE_ARCH:Maarch64}
MODFORTRAN_COMPILER = flang
.else
MODFORTRAN_COMPILER = gfortran
.endif
Fortunately, infrastructure/mk/fortran.port.mk sets MODFORTRAN_WANTLIB
according to the value of MODFORTRAN_COMPILER (either gfortran or flang).
So I just added MODFORTRAN_WANTLIB to WANTLIB. amd64 is still happy with this
and I think it addresses your observation on arm64 (I don't have an arm64
system to test).
@martin or @bcallah: could you please confirm this?
Best regards,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.112
diff -u -p -r1.112 Makefile
--- Makefile5 Jul 2019 19:27:30 - 1.112
+++ Makefile17 Dec 2019 15:48:33 -
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.112 2019/07/05 19:27:30 feinerer Exp $
COMMENT= powerful math/statistics/graphics language
-DISTNAME= R-3.6.1
+DISTNAME= R-3.6.2
-SO_VERSION=35.1
+SO_VERSION=36.0
.for _lib in R Rblas Rlapack
SHARED_LIBS += ${_lib} ${SO_VERSION}
.endfor
@@ -16,7 +16,7 @@ MAINTAINER= Ingo Feinerer &6
else
-@@ -41847,7 +41847,7 @@ else
+@@ -42073,7 +42073,7 @@ else
#include
int main() {
#ifdef ZLIB_VERNUM
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/R/pkg/PLIST,v
retrieving revision 1.42
diff -u -p -r1.42 PLIST
--- pkg/PLIST 29 Apr 2019 08:52:48 - 1.42
+++ pkg/PLIST 17 Dec 2019 15:48:33 -
@@ -114,7 +114,7 @@ lib/R/library/KernSmooth/html/
lib/R/library/KernSmooth/html/00Index.html
lib/R/library/KernSmooth/html/R.css
lib/R/library/KernSmooth/libs/
-lib/R/library/KernSmooth/libs/KernSmooth.so
+@so lib/R/library/KernSmooth/libs/KernSmooth.so
lib/R/library/KernSmooth/po/
lib/R/library/KernSmooth/po/de/
lib/R/library/KernSmooth/po/de/LC_MESSAGES/
@@ -163,7 +163,7 @@ lib/R/library/MASS/html/
lib/R/library/MASS/html/00Index.html
lib/R/library/MASS/html/R.css
lib/R/library/MASS/libs/
-lib/R/library/MASS/libs/MASS.so
+@so lib/R/library/MASS/libs/MASS.so
lib/R/library/MASS/po/
lib/R/library/MASS/po/de/
lib/R/library/MASS/po/de/LC_MESSAGES/
@@ -273,7 +273,7 @@ lib/R/library/Matrix/include/Matrix.h
lib/R/library/Matrix/include/Matrix_stubs.c
lib/R/library/Matrix/include/cholmod.h
lib/R/library/Matrix/libs/
-lib/R/library/Matrix/libs/Matrix.so
+@so lib/R/library/Matrix/libs/Matrix.so
lib/R/library/Matrix/po/
lib/R/library/Matrix/po/de/
lib/R/library/Matrix/po/de/LC_MESSAGES/
@@ -404,7 +404,7 @@ lib/R/library/class/html/
lib/R/library/class/html/00Index.html
lib/R/library/class/html/R.css
lib/R/library/class/libs/
-lib/R/library/class/libs/class.so
+@so lib/R/library/class/libs/class.so
lib/R/library/class/po/
lib/R/library/class/po/de/
lib/R/library/class/po/de/LC_MESSAGES/
@@ -453,7 +453,7 @@ lib/R/library/cluster/html/
lib/R/library/cluster/html/00Index.html
lib/R/library/cluster/html/R.css
lib/R/library/cluster/libs/
-lib/R/library/cluster/libs/cluster.so
+@so lib/R/library/cluster/libs/cluster.so
lib/R/library/cluster/po/
lib/R/library/cluster/po/de/
lib/R/library/cluster/po/de/LC_MESSAGES/
@@ -580,7 +580,7 @@ lib/R/library/foreign/html/
lib/R/library/foreign/html/00Index.html
lib/R/library/foreign/html/R.css
lib/R/library/foreign/libs/
-lib/R/library/foreign/libs/foreign.so
+@so lib/R/library/foreign/libs/foreign.so
lib/R/library/foreign/po/
lib/R/library/foreign/po/de/
lib/R/library/foreign/po/de/LC_MESSAGES/
@@ -743,8 +743,8 @@ lib/R/library/grDevices/icc/
lib/R/library/grDevices/icc/srgb
lib/R/library/grDevices/icc/srgb.flate
lib/R/library/grDevices/libs/
-lib/R/library/grDevices/libs/cairo.so
-lib/R/library/grDevices/libs/grDevices.so
+@so lib/R/library/grDevices/libs/cairo.so
+@so lib/R/library/grDevices/libs/grDevices.so
lib/R/library/graphics/
lib/R/library/graphics/DESCRIPTION
lib/R/library/graphics/INDEX
@@ -786,7 +786,7 @@ lib/R/library/graphics/html/
lib/R/library/graphics/html/00Index.html
lib/R/library/graphics/html/R.css
lib/R/library/graphics/libs/
-lib/R/library/graphics/libs/graphics.so
+@so lib/R/library/graphics/libs/graphics.so
l
UPDATE: math/R
Dear useRs,
update math/R 3.6.1 -> 3.6.2
- SHARED_LIBS: increase major version number due to removals in dynamic
export changes
$ /usr/src/lib/check_sym libR.so.35.1 libR.so.36.0
libR.so.35.1 --> libR.so.36.0
Dynamic export changes:
removed:
dummy_ii
dummy_ii_ptr
PLT removed:
intpr_
- Update line numbers in patch
- Several lines in PLIST are now marked with "@so" but these files are
no longer in the installed package. Is this expected (i.e., ignored by
the pkg_* machinery or just coincidence)?
All tested packages seems to work without problems; I did not notice
any errors due to the missing .so files.
Works for me on amd64.
OK?
Best regards,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.112
diff -u -p -r1.112 Makefile
--- Makefile5 Jul 2019 19:27:30 - 1.112
+++ Makefile12 Dec 2019 13:01:49 -
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.112 2019/07/05 19:27:30 feinerer Exp $
COMMENT= powerful math/statistics/graphics language
-DISTNAME= R-3.6.1
+DISTNAME= R-3.6.2
-SO_VERSION=35.1
+SO_VERSION=36.0
.for _lib in R Rblas Rlapack
SHARED_LIBS += ${_lib} ${SO_VERSION}
.endfor
Index: distinfo
===
RCS file: /cvs/ports/math/R/distinfo,v
retrieving revision 1.44
diff -u -p -r1.44 distinfo
--- distinfo5 Jul 2019 19:27:30 - 1.44
+++ distinfo12 Dec 2019 13:01:49 -
@@ -1,2 +1,2 @@
-SHA256 (R-3.6.1.tar.gz) = W6qevT5xrOzcw9ox2QQvsXTVWkKCn4MV8kVwgJeLE4k=
-SIZE (R-3.6.1.tar.gz) = 30463021
+SHA256 (R-3.6.2.tar.gz) = vWWkXN37iPNzcPvO5KyN0/GuvuvkfC+Wj9l3C6K7yVQ=
+SIZE (R-3.6.2.tar.gz) = 33311930
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/R/patches/patch-configure,v
retrieving revision 1.39
diff -u -p -r1.39 patch-configure
--- patches/patch-configure 5 Jul 2019 19:27:30 - 1.39
+++ patches/patch-configure 12 Dec 2019 13:01:49 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.39 2019/07
Index: configure
--- configure.orig
+++ configure
-@@ -41831,8 +41831,8 @@ fi
+@@ -42057,8 +42057,8 @@ fi
fi
if test "${have_zlib}" = yes; then
@@ -14,7 +14,7 @@ Index: configure
if ${r_cv_header_zlib_h+:} false; then :
$as_echo_n "(cached) " >&6
else
-@@ -41847,7 +41847,7 @@ else
+@@ -42073,7 +42073,7 @@ else
#include
int main() {
#ifdef ZLIB_VERNUM
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/R/pkg/PLIST,v
retrieving revision 1.42
diff -u -p -r1.42 PLIST
--- pkg/PLIST 29 Apr 2019 08:52:48 - 1.42
+++ pkg/PLIST 12 Dec 2019 13:01:49 -
@@ -114,7 +114,7 @@ lib/R/library/KernSmooth/html/
lib/R/library/KernSmooth/html/00Index.html
lib/R/library/KernSmooth/html/R.css
lib/R/library/KernSmooth/libs/
-lib/R/library/KernSmooth/libs/KernSmooth.so
+@so lib/R/library/KernSmooth/libs/KernSmooth.so
lib/R/library/KernSmooth/po/
lib/R/library/KernSmooth/po/de/
lib/R/library/KernSmooth/po/de/LC_MESSAGES/
@@ -163,7 +163,7 @@ lib/R/library/MASS/html/
lib/R/library/MASS/html/00Index.html
lib/R/library/MASS/html/R.css
lib/R/library/MASS/libs/
-lib/R/library/MASS/libs/MASS.so
+@so lib/R/library/MASS/libs/MASS.so
lib/R/library/MASS/po/
lib/R/library/MASS/po/de/
lib/R/library/MASS/po/de/LC_MESSAGES/
@@ -273,7 +273,7 @@ lib/R/library/Matrix/include/Matrix.h
lib/R/library/Matrix/include/Matrix_stubs.c
lib/R/library/Matrix/include/cholmod.h
lib/R/library/Matrix/libs/
-lib/R/library/Matrix/libs/Matrix.so
+@so lib/R/library/Matrix/libs/Matrix.so
lib/R/library/Matrix/po/
lib/R/library/Matrix/po/de/
lib/R/library/Matrix/po/de/LC_MESSAGES/
@@ -404,7 +404,7 @@ lib/R/library/class/html/
lib/R/library/class/html/00Index.html
lib/R/library/class/html/R.css
lib/R/library/class/libs/
-lib/R/library/class/libs/class.so
+@so lib/R/library/class/libs/class.so
lib/R/library/class/po/
lib/R/library/class/po/de/
lib/R/library/class/po/de/LC_MESSAGES/
@@ -453,7 +453,7 @@ lib/R/library/cluster/html/
lib/R/library/cluster/html/00Index.html
lib/R/library/cluster/html/R.css
lib/R/library/cluster/libs/
-lib/R/library/cluster/libs/cluster.so
+@so lib/R/library/cluster/libs/cluster.so
lib/R/library/cluster/po/
lib/R/library/cluster/po/de/
lib/R/library/cluster/po/de/LC_MESSAGES/
@@ -580,7 +580,7 @@ lib/R/library/foreign/html/
lib/R/library/foreign/html/00Index.html
lib/R/library/foreign/html/R.css
lib/R/library/foreign/libs/
-lib/R/library/foreign/libs/foreign.so
+@so lib/R/library/foreign/libs/foreign.so
lib/R/library/foreign/po/
lib/R/library/foreign/po/de/
lib/R/library/foreign/po/de/LC_MESSAGES/
@@ -743,8 +743,8 @@ lib/R/library/grDevices/icc/
lib/R/library/grDevices/icc/srgb
lib/R/library/grDevices/icc/srgb.flate
lib/R/library/grDevices/libs/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/12/10 14:38:15 Modified files: math/netcdf: Makefile Log message: Increase NetCDF shared libs version number Symbols added and removed between 4.7.0 and 4.7.3, so major bump. OK martin@ (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/12/10 10:27:20 Modified files: math/netcdf: Makefile distinfo math/netcdf/pkg: PLIST Log message: Update to NetCDF 4.7.3 >From martin@ (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/12/03 10:14:54 Modified files: textproc/py-pdfminer: Makefile distinfo Log message: Update to PDFMiner 20191125
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/11/11 22:24:13 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: PDFMiner is Python 3 only starting from version 20191010 (and was Python 2 only before).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/11/04 03:00:48 Modified files: print/texinfo : Makefile Log message: Drop MAINTAINER
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/11/04 02:55:46 Modified files: textproc/py-pdfminer: Makefile distinfo Log message: Update to PDFMiner 20191103
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/11/04 02:43:31 Modified files: multimedia/libv4l: Makefile distinfo multimedia/libv4l/patches: patch-lib_libv4lconvert_Makefile_in Removed files: multimedia/libv4l/patches: patch-lib_libv4lconvert_control_libv4lcontrol_c Log message: Update to libv4l 1.18.0
UPDATE: multimedia/libv4l
Hi,
this diff updates multimedia/libv4l to 1.18.0.
There are no dynamic export changes for the shared libraries, so no version
bumps.
One patch is removed as it is included upstream now.
Builds fine on amd64.
Unfortuately, I was not able to test it as I could not get my (external)
webcam attached via USB working anymore. It is now possible to use the
USB2 webcam at a USB3 port but even graphics/luvcview (which does not
use libv4l but worked with my webcam) fails (terminates after a few
seconds with no or just black screen).
I only see
uvideo0: could not SET commit request: TIMEOUT
uvideo0: could not SET probe request: STALLED
in dmesg.
(/usr/X11R6/bin/video has never worked for me because my webcam only supports
MJPEG.)
As libv4l is used by a few popular multimedia ports (ffmpeg, xine-lib,
gstreamer1/plugins-good, vlc) I would really appreciate if someone could test
this (and give an OK).
Best regards,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/multimedia/libv4l/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile5 Sep 2019 10:49:05 - 1.22
+++ Makefile30 Oct 2019 18:51:21 -
@@ -2,7 +2,7 @@
COMMENT = libv4l userspace library
-VERSION = 1.16.7
+VERSION = 1.18.0
DISTNAME = v4l-utils-${VERSION}
PKGNAME = libv4l-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/multimedia/libv4l/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo5 Sep 2019 10:49:05 - 1.16
+++ distinfo30 Oct 2019 18:51:21 -
@@ -1,2 +1,2 @@
-SHA256 (v4l-utils-1.16.7.tar.bz2) =
7pF6fhr3LGDAUy2f255IuvZB1CeqewCamyyoIfno4Nk=
-SIZE (v4l-utils-1.16.7.tar.bz2) = 1893418
+SHA256 (v4l-utils-1.18.0.tar.bz2) =
bLYNgi7u0gSGoDzCPg/GWVb7weheDBp0d/aLvZgCiA0=
+SIZE (v4l-utils-1.18.0.tar.bz2) = 1995506
Index: patches/patch-lib_libv4lconvert_Makefile_in
===
RCS file:
/cvs/ports/multimedia/libv4l/patches/patch-lib_libv4lconvert_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-lib_libv4lconvert_Makefile_in
--- patches/patch-lib_libv4lconvert_Makefile_in 23 Mar 2019 05:40:03 -
1.7
+++ patches/patch-lib_libv4lconvert_Makefile_in 30 Oct 2019 18:51:21 -
@@ -5,7 +5,7 @@ OpenBSD does not have an rt library.
Index: lib/libv4lconvert/Makefile.in
--- lib/libv4lconvert/Makefile.in.orig
+++ lib/libv4lconvert/Makefile.in
-@@ -539,7 +539,7 @@ libv4lconvert_la_SOURCES = libv4lconvert.c tinyjpeg.c
+@@ -544,7 +544,7 @@ libv4lconvert_la_SOURCES = libv4lconvert.c tinyjpeg.c
libv4lconvert-priv.h libv4lsyscall-priv.h tinyjpeg.h \
tinyjpeg-internal.h $(am__append_1) $(am__append_2)
libv4lconvert_la_CPPFLAGS = $(CFLAG_VISIBILITY) $(ENFORCE_LIBV4L_STATIC)
Index: patches/patch-lib_libv4lconvert_control_libv4lcontrol_c
===
RCS file: patches/patch-lib_libv4lconvert_control_libv4lcontrol_c
diff -N patches/patch-lib_libv4lconvert_control_libv4lcontrol_c
--- patches/patch-lib_libv4lconvert_control_libv4lcontrol_c 2 Nov 2018
10:10:06 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-lib_libv4lconvert_control_libv4lcontrol_c,v 1.4 2018/11/02
10:10:06 feinerer Exp $
-
-Index: lib/libv4lconvert/control/libv4lcontrol.c
lib/libv4lconvert/control/libv4lcontrol.c.orig
-+++ lib/libv4lconvert/control/libv4lcontrol.c
-@@ -20,7 +20,6 @@
- */
-
- #include
--#include
- #include
- #include
- #include
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/10/25 01:25:39 Modified files: textproc/py-pdfminer: Makefile distinfo textproc/py-pdfminer/pkg: PLIST Log message: Update to PDFMiner 20191020
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/09/05 04:49:05 Modified files: multimedia/libv4l: Makefile distinfo Log message: Update to libv4l 1.16.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/08/23 23:11:26 Modified files: cad/qcad : Makefile Added files: cad/qcad/patches: patch-src_3rdparty_opennurbs_opennurbs_zlib_cpp patch-src_3rdparty_opennurbs_opennurbs_zlib_h patch-src_scripting_ecmaapi_ecmaapi_pro Log message: Fix build on sparc64 OK kmos@
Re: Potential cad/qcad sparc64 fix
On Thu, Aug 22, 2019 at 06:41:46PM -0400, Kurt Mosiejczuk wrote:
> On Thu, Aug 22, 2019 at 12:35:28PM +0200, Ingo Feinerer wrote:
> > according to
> > http://build-failures.rhaalovely.net//sparc64/2019-08-18/cad/qcad.log
> > cad/qcad compilation fails on sparc64 with
>
> > cc1plus: error: one or more PCH files were found, but they were invalid
> > cc1plus: error: use -Winvalid-pch for more information
> > cc1plus: fatal error: qcadecmaapi: No such file or directory
>
> > My guess (I do not have a sparc64 system for testing) is that following
> > diff (see below) might fix this.
>
> > PCH files are PreCompiled Headers in Qt-land
> > (https://doc.qt.io/qt-5/qmake-precompiledheaders.html) which work only
> > "on some platforms and build environments". As NetBSD and FreeBSD ports
> > have a similar patch I hope this is the right fix.
>
> > Anyone willing with a sparc64 to test this?
>
> It took all day on my sparc64, but unfortunately, it died at the end.
>
> Can be seen at http://www.se.rit.edu/~kurt/qcad-error.txt
Thanks a lot! This confirms that the first diff fixes the original
problem.
Below is a new diff that (hopefully) addresses all problems.
OK?
Index: Makefile
===
RCS file: /cvs/ports/cad/qcad/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile14 Aug 2019 06:56:50 - 1.34
+++ Makefile23 Aug 2019 11:46:06 -
@@ -5,6 +5,7 @@ COMMENT = Qt-based 2D CAD system
GH_ACCOUNT = qcad
GH_PROJECT = qcad
GH_TAGNAME = v3.23.0.0
+REVISION = 0
SO_VERSION = 0.0
QCAD_LIBS =qcadcore \
Index: patches/patch-src_3rdparty_opennurbs_opennurbs_zlib_cpp
===
RCS file: patches/patch-src_3rdparty_opennurbs_opennurbs_zlib_cpp
diff -N patches/patch-src_3rdparty_opennurbs_opennurbs_zlib_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_3rdparty_opennurbs_opennurbs_zlib_cpp 23 Aug 2019
11:46:06 -
@@ -0,0 +1,61 @@
+$OpenBSD$
+
+Index: src/3rdparty/opennurbs/opennurbs_zlib.cpp
+--- src/3rdparty/opennurbs/opennurbs_zlib.cpp.orig
src/3rdparty/opennurbs/opennurbs_zlib.cpp
+@@ -293,11 +293,11 @@ size_t ON_BinaryArchive::WriteDeflate( // returns numb
+ // no uncompressed input is left - switch to finish mode
+ flush = Z_FINISH;
+ }
+-zrc = z_deflate( _zlib.strm, flush );
++zrc = deflate( _zlib.strm, flush );
+ if ( zrc < 0 )
+ {
+ // Something went haywire - bail out.
+- ON_ERROR("ON_BinaryArchive::WriteDeflate - z_deflate failure");
++ ON_ERROR("ON_BinaryArchive::WriteDeflate - deflate failure");
+ rc = false;
+ break;
+ }
+@@ -491,11 +491,11 @@ bool ON_BinaryArchive::ReadInflate(
+ // no compressed input is left - switch to finish mode
+ flush = Z_FINISH;
+ }
+-zrc = z_inflate( _zlib.strm, flush );
++zrc = inflate( _zlib.strm, flush );
+ if ( zrc < 0 )
+ {
+ // Something went haywire - bail out.
+- ON_ERROR("ON_BinaryArchive::ReadInflate - z_inflate failure");
++ ON_ERROR("ON_BinaryArchive::ReadInflate - inflate failure");
+ rc = false;
+ break;
+ }
+@@ -1151,11 +1151,11 @@ size_t ON_CompressedBuffer::DeflateHelper( // returns
+ // no uncompressed input is left - switch to finish mode
+ flush = Z_FINISH;
+ }
+-zrc = z_deflate( _zlib.strm, flush );
++zrc = deflate( _zlib.strm, flush );
+ if ( zrc < 0 )
+ {
+ // Something went haywire - bail out.
+- ON_ERROR("ON_CompressedBuffer::DeflateHelper - z_deflate failure");
++ ON_ERROR("ON_CompressedBuffer::DeflateHelper - deflate failure");
+ rc = false;
+ break;
+ }
+@@ -1284,11 +1284,11 @@ bool ON_CompressedBuffer::InflateHelper(
+ // no compressed input is left - switch to finish mode
+ flush = Z_FINISH;
+ }
+-zrc = z_inflate( _zlib.strm, flush );
++zrc = inflate( _zlib.strm, flush );
+ if ( zrc < 0 )
+ {
+ // Something went haywire - bail out.
+- ON_ERROR("ON_CompressedBuffer::InflateHelper - z_inflate failure");
++ ON_ERROR("ON_CompressedBuffer::InflateHelper - inflate failure");
+ rc = false;
+ break;
+ }
Index: patches/patch-src_3rdparty_opennurbs_opennurbs_zlib_h
===
RCS file: patches/patch-src_3rdparty_opennurbs_opennurbs_zlib_h
diff -N patches/patch-src_3rdparty_opennurbs_opennurbs_zlib_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_3rdparty_opennurbs_opennurbs_zlib_h 23 Aug 2019
11:46:06 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/3rdparty/opennurbs/opennurbs_zlib.h
+--- src/3rdparty/opennur
Potential cad/qcad sparc64 fix
Hi,
according to
http://build-failures.rhaalovely.net//sparc64/2019-08-18/cad/qcad.log
cad/qcad compilation fails on sparc64 with
cc1plus: error: one or more PCH files were found, but they were invalid
cc1plus: error: use -Winvalid-pch for more information
cc1plus: fatal error: qcadecmaapi: No such file or directory
My guess (I do not have a sparc64 system for testing) is that following
diff (see below) might fix this.
PCH files are PreCompiled Headers in Qt-land
(https://doc.qt.io/qt-5/qmake-precompiledheaders.html) which work only
"on some platforms and build environments". As NetBSD and FreeBSD ports
have a similar patch I hope this is the right fix.
Anyone willing with a sparc64 to test this?
Best regards,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/cad/qcad/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile14 Aug 2019 06:56:50 - 1.34
+++ Makefile22 Aug 2019 10:27:47 -
@@ -5,6 +5,7 @@ COMMENT = Qt-based 2D CAD system
GH_ACCOUNT = qcad
GH_PROJECT = qcad
GH_TAGNAME = v3.23.0.0
+REVISION = 0
SO_VERSION = 0.0
QCAD_LIBS =qcadcore \
Index: patches/patch-src_scripting_ecmaapi_ecmaapi_pro
===
RCS file: patches/patch-src_scripting_ecmaapi_ecmaapi_pro
diff -N patches/patch-src_scripting_ecmaapi_ecmaapi_pro
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_scripting_ecmaapi_ecmaapi_pro 22 Aug 2019 10:27:47
-
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/scripting/ecmaapi/ecmaapi.pro
+--- src/scripting/ecmaapi/ecmaapi.pro.orig
src/scripting/ecmaapi/ecmaapi.pro
+@@ -4,7 +4,6 @@ CONFIG += plugin
+ TARGET = $${RLIBNAME}ecmaapi
+ CONFIG -= warn_on
+ CONFIG += warn_off
+-CONFIG += precompile_header
+ PRECOMPILED_HEADER = stable.h
+ OTHER_FILES += ecmaapi.dox
+ DEFINES += QCADECMAAPI_LIBRARY
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/08/20 02:51:21 Modified files: net: Makefile Log message: +kdeconnect-kde
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/08/20 02:48:30 Log message: Import KDE Connect 1.3.5 KDE Connect is a multi-platform app that allows your devices to communicate (eg: your phone and your computer). * Shared clipboard: Copy and paste between your phone and your computer. * Notification sync: Read and reply to your Android notifications from the PC. * Share files and URLs instantly from one device to another. * Multimedia remote control: Use your phone as a remote for media players. * Virtual touchpad: Use your phone screen as your PC's touchpad and keyboard. * Presentation remote: Advance your presentation slides from your phone. All this is done completely wirelessly, utilising TLS encryption. OK rsadowski@ Status: Vendor Tag: feinerer Release Tags: feinerer_20190820 N ports/net/kdeconnect-kde/Makefile N ports/net/kdeconnect-kde/distinfo N ports/net/kdeconnect-kde/patches/patch-plugins_mousepad_CMakeLists_txt N ports/net/kdeconnect-kde/patches/patch-core_backends_lan_lanlinkprovider_cpp N ports/net/kdeconnect-kde/patches/patch-plugins_sftp_mounter_cpp N ports/net/kdeconnect-kde/patches/patch-core_backends_lan_uploadjob_cpp N ports/net/kdeconnect-kde/pkg/PLIST N ports/net/kdeconnect-kde/pkg/DESCR N ports/net/kdeconnect-kde/pkg/README No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/08/20 02:37:39 Modified files: x11: Makefile Log message: +libfakekey
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/08/20 02:34:08 Log message: Import libfakekey 0.1 libfakekey is a simple library for converting UTF-8 characters into 'fake' X key-presses. OK rsadowski@ Status: Vendor Tag: feinerer Release Tags: feinerer_20190820 N ports/x11/libfakekey/Makefile N ports/x11/libfakekey/distinfo N ports/x11/libfakekey/pkg/PLIST N ports/x11/libfakekey/pkg/DESCR No conflicts created by this import
NEW: net/kdeconnect-kde and x11/libfakekey
Hi, attached is a port for KDE Connect [1][2], a tool that allows your devices (phone, PC) to communicate, and for libfakekey, an optional dependency for KDE Connect. [1] https://invent.kde.org/kde/kdeconnect-kde [2] https://community.kde.org/KDEConnect --- net/kdeconnect-kde/pkg/DESCR: KDE Connect is a multi-platform app that allows your devices to communicate (eg: your phone and your computer). * Shared clipboard: Copy and paste between your phone and your computer (or any other device). * Notification sync: Read and reply to your Android notifications from the desktop. * Share files and URLs instantly from one device to another including some filesystem integration. * Multimedia remote control: Use your phone as a remote for Linux media players. * Virtual touchpad: Use your phone screen as your computer's touchpad and keyboard. * Presentation remote: Advance your presentation slides straight from your phone. All this is done completely wirelessly, utilising TLS encryption. --- --- x11/libfakekey/pkg/DESCR: libfakekey is a simple library for converting UTF-8 characters into 'fake' X key-presses. --- On your (Android) phone you need the KDE connect app (e.g., https://f-droid.org/packages/org.kde.kdeconnect_tp/). On your PC simply start `kdeconnect-indicator` (which in turn starts `kdeconnectd`). Despite the name you do not need a full KDE environment (works for me with cwm and stalonetray). I patched two files to use QHostAddress::AnyIPv4 instead of QHostAddress::Any (https://doc.qt.io/qt-5/qhostaddress.html#SpecialAddress-enum). The latter is intended for the dual stack any-address but on OpenBSD this binds just to IPv6. So the patch enables IPv4 (but disables IPv6). The patch to enable browsing the phone's file system is taken from the FreeBSD port (which uses `sshpass -p` :-( ... but this is a random password generated within the TLS session). Comments and reviews are appreciated. OK to import? Best regards, Ingo kdeconnect-kde.tar.gz Description: application/tar-gz libfakekey.tar.gz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/08/14 06:13:36 Modified files: cad: Makefile Log message: +librecad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/08/14 06:09:41 Log message: Import LibreCAD 2.2.0-rc1 LibreCAD is a cross-platform 2D CAD program written in C++11 using the Qt framework. It can read DXF and DWG files and can write DXF, PDF and SVG files. The user interface is highly customizable, and has dozens of translations. ok bentley@ Status: Vendor Tag: feinerer Release Tags: feinerer_20190814 N ports/cad/librecad/Makefile N ports/cad/librecad/distinfo N ports/cad/librecad/pkg/DESCR N ports/cad/librecad/pkg/PLIST N ports/cad/librecad/patches/patch-common_pri N ports/cad/librecad/patches/patch-scripts_postprocess-unix_sh N ports/cad/librecad/patches/patch-librecad_src_lib_engine_rs_system_cpp No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/08/14 06:03:33 Modified files: math : Makefile Log message: +muparser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/08/14 06:01:38 Log message: Import muparser 2.2.6.1 muParser is an extensible high performance math expression parser library written in C++. It works by transforming a mathematical expression into bytecode and precalculating constant parts of the expression. ok bentley@ Status: Vendor Tag: feinerer Release Tags: feinerer_20190814 N ports/math/muparser/Makefile N ports/math/muparser/distinfo N ports/math/muparser/pkg/PLIST N ports/math/muparser/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2019/08/14 00:56:51 Modified files: cad/qcad : Makefile distinfo cad/qcad/pkg : PLIST Added files: cad/qcad/patches: patch-scripts_Help_About_About_js patch-scripts_Widgets_CommandLine_CommandLine_js patch-shared_app_pri patch-shared_pri patch-src_3rdparty_opennurbs_opennurbs_opennurbs_pro patch-src_3rdparty_opennurbs_opennurbs_pro patch-src_3rdparty_qt-labs-qtscriptgenerator-5_5_0_qtbindings_qtbindingsbase_pri patch-src_core_RSPlatform_cpp patch-src_core_RS_cpp patch-src_core_RSettings_cpp patch-src_core_core_pro patch-src_run_run_pri Removed files: cad/qcad/patches: patch-dxflib_Makefile_in patch-dxflib_src_dl_writer_h patch-fparser_Makefile_in patch-mkspecs_defs_pro patch-qcad_src_qc_applicationwindow_cpp patch-qcad_src_qcad_pro patch-qcadactions_src_rs_actionzoompan_cpp patch-qcadguiqt_src_qg_dialogfactory_cpp patch-qcadlib_src_engine_rs_arc_cpp patch-qcadlib_src_engine_rs_circle_cpp patch-qcadlib_src_engine_rs_ellipse_cpp patch-qcadlib_src_engine_rs_entity_cpp patch-qcadlib_src_engine_rs_layer_cpp patch-qcadlib_src_engine_rs_line_cpp patch-qcadlib_src_engine_rs_system_cpp patch-qcadlib_src_engine_rs_system_h patch-qcadlib_src_gui_rs_graphicview_cpp patch-qcadlib_src_gui_rs_linetypepattern_h patch-qcadlib_src_information_rs_information_cpp patch-scripts_build_qcad_sh patch-scripts_release_translations_sh Log message: Update to QCAD 3.23.0.0 Tweak and OK by bentley@
Installing a tree of files
Hi, to all experienced porters: is there a best practice for installing a whole tree of files in do-install? I have encountered following patterns: cp -Rp tar -czf - -C ... | tar xzf - -C ... pax -rw INSTALL_DATA in a for loop (works only if you list all subdirectories (with their subdirs etc.)) FreeBSD has the COPYTREE* macros for this purpose (https://www.freebsd.org/doc/en/books/porters-handbook/book.html#install-copytree). If there is such a recommended procedure would it make sense to provide a similar macro in bsd.port.mk? Best regards, Ingo
