Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 05:51:56AM +0100, David CARLIER wrote: > Hi > > What do you mean ? > I mean it doesn't support sndio input, plus when I updated audio/openal to 1.18.2 with sndio backend, the apps depending on this port started segfaulting (reminds me days when it was updated to 1.17.2). I had a hope commits made to 1.18.x made sndio support better, but apps depending on openal keep crashing, that's why I tried portaudio which has sndio support I need. > Beyond that, there is a need to test build against softwares dependant on > this package. > Hm, when I sent this diff, I already tested it at net/toxic and net/utox , didn't notice any problems (finally). Also I have x11/qt5/qtmultimedia installed, again I didn't notice any problems.
Re: NEW: x11/kde-applications/kcalc
I would say so. (really I touch everything on a blank Xsession with nothing but xterm). A small side note: Testing of konsole is next, but it seems it lacks the kf5/kinit dependency to build and run. Probably passed the original build because kinit was already installed. Cheers. Elias. 2018-06-04 2:48 GMT-03:00 Rafael Sadowski : > On Sun Jun 03, 2018 at 09:45:07PM -0300, Elias M. Mariani wrote: >> I think I pushed all the button on this calc... >> No problems. >> Only error on the console is: >> 'failed to compute left/right minimum bearings for "Newspaper"' >> (Newspaper is an example) >> I happens when selecting some fonts for the buttons or the display. >> If you select one of those the console gets filled with the error >> message, but the application doesn't complain or fails. >> I think its Qt related. >> >> OK by me. >> >> Cheers. >> Elias. >> > > Nice detailed test, thanks! I only added @conflict kde-l10n-* to PLIST, found > by > pkglocatedb. > > Port wise ok to import and / replace?
Re: git update to 2.16.4
On 06/03/18 00:41, Stuart Henderson wrote:
diff below updates to git-2.16.4, ok? I deliberately skipped regen'ing
plist so that it can be backported directly to 6.3-stable.
ok benoit@
(someone who actually likes git can update to 2.17.x if appropriate :)
2.16.4 fixes these:
* Submodule "names" come from the untrusted .gitmodules file, but we
blindly append them to $GIT_DIR/modules to create our on-disk repo
paths. This means you can do bad things by putting "../" into the
name. We now enforce some rules for submodule names which will cause
Git to ignore these malicious names (CVE-2018-11235).
Credit for finding this vulnerability and the proof of concept from
which the test script was adapted goes to Etienne Stalmans.
* It was possible to trick the code that sanity-checks paths on NTFS
into reading random piece of memory (CVE-2018-11233).
and 2.16.3 fixed these:
* "git status" after moving a path in the working tree (hence making
it appear "removed") and then adding with the -N option (hence
making that appear "added") detected it as a rename, but did not
report the old and new pathnames correctly.
* "git commit --fixup" did not allow "-m" option to be used
at the same time; allow it to annotate resulting commit with more
text.
* When resetting the working tree files recursively, the working tree
of submodules are now also reset to match.
* Fix for a commented-out code to adjust it to a rather old API change
around object ID.
* When there are too many changed paths, "git diff" showed a warning
message but in the middle of a line.
* The http tracing code, often used to debug connection issues,
learned to redact potentially sensitive information from its output
so that it can be more safely sharable.
* Crash fix for a corner case where an error codepath tried to unlock
what it did not acquire lock on.
* The split-index mode had a few corner case bugs fixed.
* Assorted fixes to "git daemon".
* Completion of "git merge -s" (in contrib/) did not work
well in non-C locale.
* Workaround for segfault with more recent versions of SVN.
* Recently introduced leaks in fsck have been plugged.
* Travis CI integration now builds the executable in 'script' phase
to follow the established practice, rather than during
'before_script' phase. This allows the CI categorize the failures
better ('failed' is project's fault, 'errored' is build
environment's).
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile
--- Makefile15 May 2018 15:15:58 - 1.188
+++ Makefile2 Jun 2018 22:40:51 -
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 2.16.2
+V =2.16.4
DISTNAME =git-${V}
PKGNAME-main =${DISTNAME}
PKGNAME-svn = git-svn-${V}
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.142
diff -u -p -r1.142 distinfo
--- distinfo4 Mar 2018 10:31:58 - 1.142
+++ distinfo2 Jun 2018 22:40:51 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.16.2.tar.gz) = msxDObeiq0hO6mnXBZIycWgrcFgBUhnPWn5u2N7ltfs=
-SHA256 (git-manpages-2.16.2.tar.gz) =
b+KA0G24cunG9DWinTBcDRxtaKb6an9aZrSAAT9IP5M=
-SIZE (git-2.16.2.tar.gz) = 7282111
-SIZE (git-manpages-2.16.2.tar.gz) = 677458
+SHA256 (git-2.16.4.tar.gz) = 6HCevNo9eTzZM8pVAEgUlZu45vpRi1s39gLZiB5InS4=
+SHA256 (git-manpages-2.16.4.tar.gz) =
bO4IVtt53t2uRTHG3ibJwJD7PT0OMS/WlX4eH4PJxmI=
+SIZE (git-2.16.4.tar.gz) = 7290813
+SIZE (git-manpages-2.16.4.tar.gz) = 678200
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 patch-Makefile
--- patches/patch-Makefile 20 Jan 2018 09:24:57 - 1.76
+++ patches/patch-Makefile 2 Jun 2018 22:40:51 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.76 2018/01/
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -2461,7 +2461,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2463,7 +2463,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
Index: patches/patch-config_mak_uname
===
RCS file: /cvs/ports/devel/git/patches/patch-config_mak_uname,v
retrieving revision 1.4
diff -u -p -r1.4 patch-config_mak_uname
--- patches/patch-config_mak_uname 2 Dec 2017 15:24:31 - 1.4
+++ patches/patch-config_mak_uname 2 Jun 2018 22:40:51 -
@@ -5,7 +5,7 @@ OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTIC
Index: config.mak.uname
--- config.mak.uname.orig
+++ config.mak.uname
-@@ -212,6 +212,7 @@ endif
+@@ -211,6 +211,7
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 08:07:36AM +0100, David CARLIER wrote: > Ok ... My approach with openal has always been not rushing to update to the > newest version especially so many softwares depends on it. > Is the portaudio support of the actual version not working ? > By actual you mean the current version of this port? It works (I tested it at 1.17.2 first), but I thought why not to try to update to 1.18.2? Well, if to stay at current version, I provide new diff below. > You should take a look at infrastructure/bin/dpb. > Processing... Index: Makefile === RCS file: /cvs/ports/audio/openal/Makefile,v retrieving revision 1.50 diff -u -p -u -p -r1.50 Makefile --- Makefile31 Dec 2017 18:46:26 - 1.50 +++ Makefile4 Jun 2018 07:29:18 - @@ -10,7 +10,7 @@ DISTNAME =openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio SHARED_LIBS = openal 3.0 -REVISION = 0 +REVISION = 1 HOMEPAGE = http://kcat.strangesoft.net/openal.html @@ -19,7 +19,7 @@ MAINTAINER = David Carlier
Re: [patch] audio/openal: ugly update to 1.18.2
About infrastracture/bin/dpb, should I send any output?
Re: [patch] audio/openal: ugly update to 1.18.2
Yes the final one please. If it is as expected I would not be against updating to the 1.18 branch though. On Mon, 4 Jun 2018 at 08:38, Leonid Bobrov wrote: > About infrastracture/bin/dpb, should I send any output? >
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 08:44:49AM +0100, David CARLIER wrote: > Yes the final one please. If it is as expected I would not be against > updating to the 1.18 branch though. > I didn't read dpb's man page yet (I'm not fast at reading), so: mazocomp$ doas infrastructure/bin/dpb audio/openal doas (mazoc...@mazocomp.lan) password: Started as: root Port user: root Build user: _pbuild Fetch user: _pfetch Log user: _pbuild Unpriv user: _dpb Reading build stats...zapping old stuff...Done zap duplicates...Done Waiting for hosts to finish STARTUP...ready on localhost 4 Jun 10:28:35 [46648] running for 00:08:27 Hosts: localhost I=0 B=0 Q=0 T=52 F=0 !=0 E=devel/gettext:gettext-0.19.8.1.tar.xz lang/python/3.6,-tkinter:Python-3.6.5.tg z lang/python/2.7,-tests:Python-2.7.15.tgz databases/db/v4,bootstrap,no_java,no_ tcl,-main:db-4.6.21.tar.gz devel/cmake:cmake-3.10.2.tar.gz devel/libtool:libtool -2.4.2.tar.gz devel/py-babel:Babel-2.4.0.tar.gz archivers/libarchive:libarchive- 3.3.2.tar.gz textproc/py-sphinx:Sphinx-1.4.8.tar.gz x11/tk/8.5:tk8.5.19-src.tar. gz devel/autoconf/2.69:autoconf-2.69.tar.gz net/curl:curl-7.60.0.tar.xz textproc /py-pygments:Pygments-2.1.3.tar.gz devel/autoconf/2.67:autoconf-2.67.tar.gz deve l/automake/1.14:automake-1.14.1.tar.xz textproc/py-docutils:docutils-0.12.tar.gz audio/portaudio-svn:pa_stable_v19_20140130.tgz devel/gmake:make-4.2.1.tar.bz2 d evel/meson:meson-0.46.1.tar.gz databases/gdbm:gdbm-1.14.1.tar.gz textproc/py-sph inx_rtd_theme:sphinx_rtd_theme-0.2.4.tar.gz devel/libuv:libuv-v1.19.1.tar.gz dev el/help2man:help2man-1.47.6.tar.xz devel/py-setuptools:setuptools-39.0.1.zip tex tproc/py-stemmer:PyStemmer-1.3.0.tar.gz archivers/lz4:lz4-1.8.2.tar.gz devel/py- tz:pytz-2018.3.tar.gz www/py-jinja2:Jinja2-2.10.tar.gz devel/jsoncpp:jsoncpp-1.8 .4.tar.gz converters/libiconv:libiconv-1.14.tar.gz devel/ninja:ninja-1.8.2.tar.g z textproc/py-snowballstemmer:snowballstemmer-1.2.1.tar.gz databases/db/v4,boots trap,no_java,no_tcl,-main:patch.4.6.21.4 devel/py-six:six-1.11.0.tar.gz textproc /py-MarkupSafe:MarkupSafe-1.0.tar.gz textproc/py-alabaster:alabaster-0.7.10.tar. Elapsed time=00:08:27 I=0 B=0 Q=0 T=52 F=0 !=0 E=devel/gettext:gettext-0.19.8.1.tar.xz lang/python/3.6,-tkinter:Python-3.6.5.tgz lang/python/2.7,-tests:Python-2.7.15.tgz databases/db/v4,bootstrap,no_java,no_tcl,-main:db-4.6.21.tar.gz devel/cmake:cmake-3.10.2.tar.gz devel/libtool:libtool-2.4.2.tar.gz devel/py-babel:Babel-2.4.0.tar.gz archivers/libarchive:libarchive-3.3.2.tar.gz textproc/py-sphinx:Sphinx-1.4.8.tar.gz x11/tk/8.5:tk8.5.19-src.tar.gz devel/autoconf/2.69:autoconf-2.69.tar.gz net/curl:curl-7.60.0.tar.xz textproc/py-pygments:Pygments-2.1.3.tar.gz devel/autoconf/2.67:autoconf-2.67.tar.gz devel/automake/1.14:automake-1.14.1.tar.xz textproc/py-docutils:docutils-0.12.tar.gz audio/portaudio-svn:pa_stable_v19_20140130.tgz devel/gmake:make-4.2.1.tar.bz2 devel/meson:meson-0.46.1.tar.gz databases/gdbm:gdbm-1.14.1.tar.gz textproc/py-sphinx_rtd_theme:sphinx_rtd_theme-0.2.4.tar.gz devel/libuv:libuv-v1.19.1.tar.gz devel/help2man:help2man-1.47.6.tar.xz devel/py-setuptools:setuptools-39.0.1.zip textproc/py-stemmer:PyStemmer-1.3.0.tar.gz archivers/lz4:lz4-1.8.2.tar.gz devel/py-tz:pytz-2018.3.tar.gz www/py-jinja2:Jinja2-2.10.tar.gz devel/jsoncpp:jsoncpp-1.8.4.tar.gz converters/libiconv:libiconv-1.14.tar.gz devel/ninja:ninja-1.8.2.tar.gz textproc/py-snowballstemmer:snowballstemmer-1.2.1.tar.gz databases/db/v4,bootstrap,no_java,no_tcl,-main:patch.4.6.21.4 devel/py-six:six-1.11.0.tar.gz textproc/py-MarkupSafe:MarkupSafe-1.0.tar.gz textproc/py-alabaster:alabaster-0.7.10.tar.gz graphics/py-imagesize:imagesize-0.7.1.tar.gz databases/db/v4,bootstrap,no_java,no_tcl,-main:patch.4.6.21.1 databases/db/v4,bootstrap,no_java,no_tcl,-main:patch.4.6.21.3 databases/db/v4,bootstrap,no_java,no_tcl,-main:patch.4.6.21.2.fixed devel/re2c:re2c-1.0.3.tar.gz lang/tcl/8.5:tcl8.5.19-src.tar.gz www/nghttp2:nghttp2-1.32.0.tar.gz databases/sqlite3:sqlite-autoconf-3230100.tar.gz devel/metaauto:pkg-config-0.27.1.tar.gz archivers/unzip:unzip60.tar.gz archivers/xz:xz-5.2.4.tar.gz security/rhash:rhash-1.3.5-src.tar.gz devel/libffi:libffi-3.2.1.tar.gz archivers/bzip2:bzip2-1.0.6.tar.gz audio/openal:openal-soft-1.18.2.tar.bz2 mazocomp$
Re: [patch] audio/openal: ugly update to 1.18.2
It is more building ports using openal in fact. On Mon, 4 Jun 2018 at 08:48, Leonid Bobrov wrote: > On Mon, Jun 04, 2018 at 08:44:49AM +0100, David CARLIER wrote: > > Yes the final one please. If it is as expected I would not be against > > updating to the 1.18 branch though. > > > > I didn't read dpb's man page yet (I'm not fast at reading), so: > > mazocomp$ doas infrastructure/bin/dpb audio/openal > doas (mazoc...@mazocomp.lan) password: > Started as: root > Port user: root > Build user: _pbuild > Fetch user: _pfetch > Log user: _pbuild > Unpriv user: _dpb > Reading build stats...zapping old stuff...Done > zap duplicates...Done > Waiting for hosts to finish STARTUP...ready on localhost > 4 Jun 10:28:35 [46648] running for 00:08:27 > > Hosts: localhost > I=0 B=0 Q=0 T=52 F=0 !=0 > E=devel/gettext:gettext-0.19.8.1.tar.xz lang/python/3.6,-tkinter: > Python-3.6.5.tg > z lang/python/2.7,-tests:Python-2.7.15.tgz > databases/db/v4,bootstrap,no_java,no_ > tcl,-main:db-4.6.21.tar.gz devel/cmake:cmake-3.10.2.tar.gz > devel/libtool:libtool > -2.4.2.tar.gz devel/py-babel:Babel-2.4.0.tar.gz > archivers/libarchive:libarchive- > 3.3.2.tar.gz textproc/py-sphinx:Sphinx-1.4.8.tar.gz > x11/tk/8.5:tk8.5.19-src.tar. > gz devel/autoconf/2.69:autoconf-2.69.tar.gz net/curl:curl-7.60.0.tar.xz > textproc > /py-pygments:Pygments-2.1.3.tar.gz > devel/autoconf/2.67:autoconf-2.67.tar.gz deve > l/automake/1.14:automake-1.14.1.tar.xz > textproc/py-docutils:docutils-0.12.tar.gz > audio/portaudio-svn:pa_stable_v19_20140130.tgz > devel/gmake:make-4.2.1.tar.bz2 d > evel/meson:meson-0.46.1.tar.gz databases/gdbm:gdbm-1.14.1.tar.gz > textproc/py-sph > inx_rtd_theme:sphinx_rtd_theme-0.2.4.tar.gz > devel/libuv:libuv-v1.19.1.tar.gz dev > el/help2man:help2man-1.47.6.tar.xz > devel/py-setuptools:setuptools-39.0.1.zip tex > tproc/py-stemmer:PyStemmer-1.3.0.tar.gz archivers/lz4:lz4-1.8.2.tar.gz > devel/py- > tz:pytz-2018.3.tar.gz www/py-jinja2:Jinja2-2.10.tar.gz > devel/jsoncpp:jsoncpp-1.8 > .4.tar.gz converters/libiconv:libiconv-1.14.tar.gz > devel/ninja:ninja-1.8.2.tar.g > z textproc/py-snowballstemmer:snowballstemmer-1.2.1.tar.gz > databases/db/v4,boots > trap,no_java,no_tcl,-main:patch.4.6.21.4 devel/py-six:six-1.11.0.tar.gz > textproc > /py-MarkupSafe:MarkupSafe-1.0.tar.gz > textproc/py-alabaster:alabaster-0.7.10.tar. > Elapsed time=00:08:27 > I=0 B=0 Q=0 T=52 F=0 !=0 > E=devel/gettext:gettext-0.19.8.1.tar.xz > lang/python/3.6,-tkinter:Python-3.6.5.tgz > lang/python/2.7,-tests:Python-2.7.15.tgz > databases/db/v4,bootstrap,no_java,no_tcl,-main:db-4.6.21.tar.gz > devel/cmake:cmake-3.10.2.tar.gz devel/libtool:libtool-2.4.2.tar.gz > devel/py-babel:Babel-2.4.0.tar.gz > archivers/libarchive:libarchive-3.3.2.tar.gz > textproc/py-sphinx:Sphinx-1.4.8.tar.gz x11/tk/8.5:tk8.5.19-src.tar.gz > devel/autoconf/2.69:autoconf-2.69.tar.gz net/curl:curl-7.60.0.tar.xz > textproc/py-pygments:Pygments-2.1.3.tar.gz > devel/autoconf/2.67:autoconf-2.67.tar.gz > devel/automake/1.14:automake-1.14.1.tar.xz > textproc/py-docutils:docutils-0.12.tar.gz > audio/portaudio-svn:pa_stable_v19_20140130.tgz > devel/gmake:make-4.2.1.tar.bz2 devel/meson:meson-0.46.1.tar.gz > databases/gdbm:gdbm-1.14.1.tar.gz > textproc/py-sphinx_rtd_theme:sphinx_rtd_theme-0.2.4.tar.gz > devel/libuv:libuv-v1.19.1.tar.gz devel/help2man:help2man-1.47.6.tar.xz > devel/py-setuptools:setuptools-39.0.1.zip > textproc/py-stemmer:PyStemmer-1.3.0.tar.gz > archivers/lz4:lz4-1.8.2.tar.gz devel/py-tz:pytz-2018.3.tar.gz > www/py-jinja2:Jinja2-2.10.tar.gz devel/jsoncpp:jsoncpp-1.8.4.tar.gz > converters/libiconv:libiconv-1.14.tar.gz devel/ninja:ninja-1.8.2.tar.gz > textproc/py-snowballstemmer:snowballstemmer-1.2.1.tar.gz > databases/db/v4,bootstrap,no_java,no_tcl,-main:patch.4.6.21.4 > devel/py-six:six-1.11.0.tar.gz > textproc/py-MarkupSafe:MarkupSafe-1.0.tar.gz > textproc/py-alabaster:alabaster-0.7.10.tar.gz > graphics/py-imagesize:imagesize-0.7.1.tar.gz > databases/db/v4,bootstrap,no_java,no_tcl,-main:patch.4.6.21.1 > databases/db/v4,bootstrap,no_java,no_tcl,-main:patch.4.6.21.3 > databases/db/v4,bootstrap,no_java,no_tcl,-main:patch.4.6.21.2.fixed > devel/re2c:re2c-1.0.3.tar.gz lang/tcl/8.5:tcl8.5.19-src.tar.gz > www/nghttp2:nghttp2-1.32.0.tar.gz > databases/sqlite3:sqlite-autoconf-3230100.tar.gz > devel/metaauto:pkg-config-0.27.1.tar.gz archivers/unzip:unzip60.tar.gz > archivers/xz:xz-5.2.4.tar.gz security/rhash:rhash-1.3.5-src.tar.gz > devel/libffi:libffi-3.2.1.tar.gz archivers/bzip2:bzip2-1.0.6.tar.gz > audio/openal:openal-soft-1.18.2.tar.bz2 > mazocomp$ >
Re: NEW: x11/kde-applications/kcalc
On Mon Jun 04, 2018 at 04:03:27AM -0300, Elias M. Mariani wrote: > I would say so. > (really I touch everything on a blank Xsession with nothing but xterm). > > A small side note: > Testing of konsole is next, but it seems it lacks the kf5/kinit > dependency to build and run. > Probably passed the original build because kinit was already installed. > Nice catch, correct konsole needs kinit as BUILD_ and RUN_DEPENDS and also "@conflict kde-l10n-*" to PLIST. Thanks!
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 08:55:41AM +0100, David CARLIER wrote: > It is more building ports using openal in fact. > Should I compile all ports using openal or just several ones and test them? If all, that may take days :) Ok, I'll compile few ports.
Re: [patch] audio/openal: ugly update to 1.18.2
1/ Finding out the list of packages dependent on openal 2/ Putting it on the file to give to dpb Does not take days :) I did exactly that for the last significant update of openal months ago. Just to make sure no package is broken because of api made obsolete for example ... etc ... Regards. On Mon, 4 Jun 2018 at 09:22, Leonid Bobrov wrote: > On Mon, Jun 04, 2018 at 08:55:41AM +0100, David CARLIER wrote: > > It is more building ports using openal in fact. > > > > Should I compile all ports using openal or just several ones and test > them? If all, that may take days :) > > Ok, I'll compile few ports. >
Re: [PATCH] ntfs-3g needs OpenBSD specific groupmember() function
On 04/06/18(Mon) 14:26, Helg wrote:
> Hi Ports,
>
> I have an upcoming patch to FUSE that passes the current process tid,
> uid, gid and umask to the file system. This has highlighted a bug in the
> port where the groupmember() function in libntfs-3g/security.c assumes
> it's runing on Linux where thread information is available in /proc.
>
> This diff adds an OpenBSD specific implementation of this function.
We should refrain linking to libkvm. In this particular case you should
be able to call the KERN_PROC sysctl(2) directly.
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/ntfs-3g/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 22 Jun 2016 09:51:33 - 1.9
> +++ Makefile 4 Jun 2018 06:20:59 -
> @@ -15,7 +15,7 @@ MAINTAINER =Paul Irofti # GPLv2
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += c uuid fuse
> +WANTLIB += c uuid fuse kvm
>
> MASTER_SITES = ${HOMEPAGE}/opensource/
> EXTRACT_SUFX = .tgz
> @@ -24,7 +24,7 @@ LIB_DEPENDS = sysutils/e2fsprogs
>
> CONFIGURE_STYLE =gnu
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib"
> + LDFLAGS="-L${LOCALBASE}/lib -lkvm"
> CONFIGURE_ARGS = --disable-ldconfig \
> --disable-mtab \
> --enable-extras \
> Index: patches/patch-libntfs-3g_security_c
> ===
> RCS file: patches/patch-libntfs-3g_security_c
> diff -N patches/patch-libntfs-3g_security_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-libntfs-3g_security_c 4 Jun 2018 06:20:59 -
> @@ -0,0 +1,78 @@
> +$OpenBSD$
> +
> +Index: libntfs-3g/security.c
> +--- libntfs-3g/security.c.orig
> libntfs-3g/security.c
> +@@ -47,6 +47,11 @@
> + #ifdef HAVE_SYS_STAT_H
> + #include
> + #endif
> ++#ifdef __OpenBSD__
> ++#include
> ++#include
> ++#include
> ++#endif
> +
> + #include
> + #include
> +@@ -1228,6 +1233,60 @@ static BOOL groupmember(struct SECURITY_CONTEXT *scx,
> + close(fd);
> + }
> + }
> ++return (ismember);
> ++}
> ++
> ++#elif defined(__OpenBSD__)
> ++
> ++static BOOL groupmember(struct SECURITY_CONTEXT *scx, uid_t uid, gid_t gid)
> ++{
> ++kvm_t *kd;
> ++int k;
> ++int pcnt;
> ++gid_t *p;
> ++BOOL ismember;
> ++pid_t tid;
> ++static char errbuf[_POSIX2_LINE_MAX];
> ++struct kinfo_proc *kp;
> ++
> ++if (scx->vol->secure_flags & (1 << SECURITY_STATICGRPS))
> ++ismember = staticgroupmember(scx, uid, gid);
> ++else {
> ++ismember = FALSE; /* default return */
> ++tid = scx->tid;
> ++kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
> ++if (kd == NULL)
> ++ntfs_log_error("%s\n", errbuf);
> ++else {
> ++kp = kvm_getprocs(kd, KERN_PROC_ALL |
> ++KERN_PROC_SHOW_THREADS, NULL, sizeof(*kp), &pcnt);
> ++if (kp == NULL)
> ++ntfs_log_error("%s\n", kvm_geterr(kd));
> ++else if (pcnt > 0) {
> ++k = 0;
> ++while ((kp->p_tid != tid) && (k < pcnt)) {
> ++k++;
> ++kp++;
> ++}
> ++if (k < pcnt) {
> ++if (kp->p_gid == gid)
> ++ismember = TRUE;
> ++p = kp->p_groups;
> ++k = 0;
> ++while (!ismember
> ++&& (k < kp->p_ngroups)
> ++&& (*p != gid)) {
> ++k++;
> ++p++;
> ++}
> ++if (k < kp->p_ngroups)
> ++ismember = TRUE;
> ++}
> ++}
> ++kvm_close(kd);
> ++}
> ++}
> ++
> + return (ismember);
> + }
> +
>
bugfix update: lang/rust 1.26.2
Hi,
Second bugfix update for lang/rust:
https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1262-2018-06-05
Thanks.
--
Sebastien Marie
Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile1 Jun 2018 06:02:10 - 1.69
+++ Makefile4 Jun 2018 09:30:45 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.69 2018/06/01 06:02:10 landry Exp $
-# snapshots are only available for amd64 and i386, for now
+# snapshots are only available these archs
ONLY_FOR_ARCHS = aarch64 amd64 i386
.if "${MACHINE_ARCH}" == "i386"
@@ -12,7 +12,7 @@ DPB_PROPERTIES = parallel
COMMENT-main = compiler for Rust Language
COMMENT-doc = html documentation for rustc
-V =1.26.1
+V =1.26.2
CARGO_V = 0.27.0
DISTNAME = rustc-${V}-src
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo1 Jun 2018 06:02:10 - 1.36
+++ distinfo4 Jun 2018 09:30:45 -
@@ -1,8 +1,8 @@
-SHA256 (rust/rustc-1.26.1-src.tar.xz) =
XtIeTC+5LCTPJw5qA4KwAZflsgWdOZ6VKNSLkkVTq2k=
+SHA256 (rust/rustc-1.26.2-src.tar.xz) =
oSAoAL1WIfXKwCcXeQTaC5ZOtDuTYG0+THs0Kp90c7Q=
SHA256 (rust/rustc-bootstrap-aarch64-1.26.0-20180518.tar.xz) =
zakj9bWFnY6WTfUaov5nz4y3k/6nW5W/mY7Mpd1cNRc=
SHA256 (rust/rustc-bootstrap-amd64-1.26.0-20180508.tar.xz) =
zLG8iaYTVbN/7chCkUC+pCuNl6u0YVNd5XEchVOMKYQ=
SHA256 (rust/rustc-bootstrap-i386-1.26.0-20180509.tar.xz) =
AFGnEZ5KRPiJFPWPrx8JIb84PHXqISOUQHe959ErYzc=
-SIZE (rust/rustc-1.26.1-src.tar.xz) = 54604108
+SIZE (rust/rustc-1.26.2-src.tar.xz) = 54613640
SIZE (rust/rustc-bootstrap-aarch64-1.26.0-20180518.tar.xz) = 61904032
SIZE (rust/rustc-bootstrap-amd64-1.26.0-20180508.tar.xz) = 6671
SIZE (rust/rustc-bootstrap-i386-1.26.0-20180509.tar.xz) = 67845872
Index: pkg/PFRAG.aarch64-main
===
RCS file: /cvs/ports/lang/rust/pkg/PFRAG.aarch64-main,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.aarch64-main
--- pkg/PFRAG.aarch64-main 1 Jun 2018 06:02:10 - 1.2
+++ pkg/PFRAG.aarch64-main 4 Jun 2018 09:30:45 -
@@ -1,117 +1,117 @@
@comment $OpenBSD: PFRAG.aarch64-main,v 1.2 2018/06/01 06:02:10 landry Exp $
-lib/libarena-a05d32ee855a0f48.so
-lib/libfmt_macros-845ea9e348fd239e.so
-lib/libgraphviz-6add5380c35bd69f.so
-lib/libproc_macro-edb2bb543516e8dd.so
-lib/librustc-1468eae8f8156ca1.so
-lib/librustc_allocator-6fead7c0ee66b6ec.so
-lib/librustc_back-e754f35d5246908c.so
-lib/librustc_borrowck-fdbf60aa39cb343e.so
-lib/librustc_const_math-ec40b79e0938056c.so
-lib/librustc_cratesio_shim-298443c0050df0b5.so
-lib/librustc_data_structures-f41f54d543ca0c6c.so
-lib/librustc_driver-1e2d8fea70295af8.so
-lib/librustc_errors-27526f31cf70db34.so
-lib/librustc_incremental-df58371ff4b398c2.so
-lib/librustc_lint-1a6334774d9218c9.so
-lib/librustc_metadata-845a78129669dacd.so
-lib/librustc_mir-55878739bb08f0cb.so
-lib/librustc_passes-ebd1b64d312d54c8.so
-lib/librustc_platform_intrinsics-3239fa70c7515a0e.so
-lib/librustc_plugin-3fb93b9057e93b1c.so
-lib/librustc_privacy-c72cdb22e5a935bb.so
-lib/librustc_resolve-b969dbe22b5f07e2.so
-lib/librustc_save_analysis-a4ef8babb83c12df.so
-lib/librustc_traits-263ae7756e01b7a0.so
-lib/librustc_trans_utils-bd2dada968da129a.so
-lib/librustc_typeck-cf9148d140a73356.so
-lib/libserialize-530f1e558062578e.so
-lib/libstd-0b30fd8530287a87.so
-lib/libsyntax-32fc1fbbddff27e7.so
-lib/libsyntax_ext-9f89425456ee79cf.so
-lib/libsyntax_pos-c960f651ca9da17e.so
-lib/libterm-b56c3d40677efb8f.so
-lib/libtest-cbcf18684e884afc.so
+lib/libarena-c3ccf29aa07197bc.so
+lib/libfmt_macros-d66e74b9e56f810e.so
+lib/libgraphviz-b29a5a34ecd7b122.so
+lib/libproc_macro-07dabf758608655a.so
+lib/librustc-f3117160ee100cae.so
+lib/librustc_allocator-d8bc91191cc09d70.so
+lib/librustc_back-faf4c6c46537dae4.so
+lib/librustc_borrowck-8ff1c6ab1b96ab15.so
+lib/librustc_const_math-c3dd06a52ffe27fd.so
+lib/librustc_cratesio_shim-9bdfed84cb839ace.so
+lib/librustc_data_structures-04815abdd54aecd2.so
+lib/librustc_driver-34ee207fceee92d6.so
+lib/librustc_errors-516074552369a1b0.so
+lib/librustc_incremental-0c8e41927195e475.so
+lib/librustc_lint-47147187fb74a6c2.so
+lib/librustc_metadata-a0667633dd8e784e.so
+lib/librustc_mir-f7e2846841f2458a.so
+lib/librustc_passes-9816c4d425e0aac4.so
+lib/librustc_platform_intrinsics-0ed6984b6b45c2fd.so
+lib/librustc_plugin-73ec41beedd88b88.so
+lib/librustc_privacy-00f66df7b0207daf.so
+lib/librustc_resolve-cb034d04f3e43571.so
+lib/librustc_save_analysis-c77dd8f1646c39a2.so
+lib/librustc_traits-f17e9e7b09c08e2d.so
+lib/librustc_trans_utils-3ba8b5ebd68a0186.so
+lib/librustc_typeck-ced454652990ce65.so
+lib/libserialize-5be0bb10e42b0aa2.so
+lib/libstd-
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 09:25:36AM +0100, David CARLIER wrote:
> 1/ Finding out the list of packages dependent on openal
> 2/ Putting it on the file to give to dpb
>
> Does not take days :) I did exactly that for the last significant update of
> openal months ago.
> Just to make sure no package is broken because of api made obsolete for
> example ... etc ...
>
Argh, I ran out of space at /usr/local, there is no way I can grow it.
Is there a way I can correctly setup LOCALBASE variable?
mazocomp$ make extract
Fatal: /home/mazocomp/local/lib/X11/app-defaults should exist and be a symlink
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2449
'/home/mazocomp/pobj/minetest-0.4.14/.extract_started': @appdefaults=/home/m...)
*** Error 1 in /usr/ports/games/minetest
(/usr/ports/infrastructure/mk/bsd.port.mk:2383 'extract')
mazocomp$ cat /etc/mk.conf
BULK_COOKIES_DIR=/home/mazocomp/bulk
DISTDIR=/home/mazocomp/distfiles
LOCALBASE=/home/mazocomp/local
PACKAGE_REPOSITORY=/home/mazocomp/packages
PORTSDIR_PATH=${PORTSDIR}:${PORTSDIR}/openbsd-wip:${PORTSDIR}/mystuff
PLIST_REPOSITORY=/home/mazocomp/plist
SUDO=/usr/bin/doas
UPDATE_COOKIES_DIR=/home/mazocomp/update
WRKOBJDIR=/home/mazocomp/pobj
mazocomp$
UPDATE: emulators/ppsspp
Hi,
Here's an update to ppsspp-1.6.2.
Tests? ok?
If you find problems be sure to test with the current package also to
ensure it's not a driver issue.
Index: Makefile
===
RCS file: /cvs/ports/emulators/ppsspp/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile4 Jan 2018 05:09:32 - 1.3
+++ Makefile4 Jun 2018 10:32:39 -
@@ -4,10 +4,10 @@ COMMENT = Sony PlayStation Portable emul
GH_ACCOUNT = hrydgard
GH_PROJECT = ppsspp
-GH_TAGNAME = v1.5.4
+GH_TAGNAME = v1.6.2
GLSLANG = 2edde6665d9a56ead5ea0e55b4e64d9a803e6164
-PPSSPP_LANG = 6537fc1bf38d0787a1d86375e5b3cb267349d2d5
+PPSSPP_LANG = c2c4ad9c38c5f5e97ff022a703c470fcd53da249
SPIRV_CROSS = 90966d50f57608587bafd95b4e345b02b814754a
ARMIPS = 0.9
TINYFORMAT = b7f5a22753c81d834ab5133d655f1fd525280765
@@ -38,11 +38,10 @@ DIST_SUBDIR = ppsspp
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += GL GLEW GLU SDL2 avcodec avformat avutil c m snappy
-WANTLIB += swresample swscale z zip
+WANTLIB += swresample swscale z
MODULES = devel/cmake
LIB_DEPENDS = archivers/snappy \
- archivers/libzip \
devel/sdl2 \
graphics/ffmpeg \
graphics/glew
Index: distinfo
===
RCS file: /cvs/ports/emulators/ppsspp/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo4 Jan 2018 05:09:32 - 1.2
+++ distinfo4 Jun 2018 10:32:39 -
@@ -1,12 +1,12 @@
SHA256 (ppsspp/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz) =
XiCldYwTzDlnosMecBf+TYE1wAVzNmK+RYXZ0ZtdjzQ=
-SHA256 (ppsspp/6537fc1bf38d0787a1d86375e5b3cb267349d2d5.tar.gz) =
uSmCAnMisURzE8D8GVCpO/gMD9nrMiZuv+zR6AD7tyM=
SHA256 (ppsspp/90966d50f57608587bafd95b4e345b02b814754a.tar.gz) =
KC0fF70wAxYt2UW4ulxaEMtXOKd1CUmoIA/2VV8Q/yg=
SHA256 (ppsspp/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz) =
nbm8Fun6/t5JO1iQuTWlfubl4oSp1uj6bZMpeQqWuMY=
-SHA256 (ppsspp/ppsspp-1.5.4.tar.gz) =
5zkVXxNfmz4uXOhdDMEQKMStcaAHhnOr4/kIrGh1KEo=
+SHA256 (ppsspp/c2c4ad9c38c5f5e97ff022a703c470fcd53da249.tar.gz) =
WpfRopSUgggrtOff93BMsP6CY6gozGZ3Ph1wx7zkctw=
+SHA256 (ppsspp/ppsspp-1.6.2.tar.gz) =
oqM2kzJOeYxoxnOJlIlvqjaPO7PBR/Fwwp9mT0h2o5A=
SHA256 (ppsspp/v0.9.tar.gz) = x1boXdcRpBjzO3IOGSb3gOCxZMhIpOdPtyWOGMMvzZQ=
SIZE (ppsspp/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz) = 1944927
-SIZE (ppsspp/6537fc1bf38d0787a1d86375e5b3cb267349d2d5.tar.gz) = 362410
SIZE (ppsspp/90966d50f57608587bafd95b4e345b02b814754a.tar.gz) = 228943
SIZE (ppsspp/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz) = 22284
-SIZE (ppsspp/ppsspp-1.5.4.tar.gz) = 19008538
+SIZE (ppsspp/c2c4ad9c38c5f5e97ff022a703c470fcd53da249.tar.gz) = 478373
+SIZE (ppsspp/ppsspp-1.6.2.tar.gz) = 19477075
SIZE (ppsspp/v0.9.tar.gz) = 154427
Index: pkg/PLIST
===
RCS file: /cvs/ports/emulators/ppsspp/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 4 Jan 2018 05:09:32 - 1.2
+++ pkg/PLIST 4 Jun 2018 10:32:39 -
@@ -80,6 +80,7 @@ share/ppsspp/assets/shaders/4xhqglsl.vsh
share/ppsspp/assets/shaders/5xBR-lv2.fsh
share/ppsspp/assets/shaders/5xBR.fsh
share/ppsspp/assets/shaders/5xBR.vsh
+share/ppsspp/assets/shaders/GaussianDownscale.fsh
share/ppsspp/assets/shaders/aacolor.fsh
share/ppsspp/assets/shaders/aacolor.vsh
share/ppsspp/assets/shaders/bloom.fsh
@@ -93,6 +94,7 @@ share/ppsspp/assets/shaders/grayscale.fs
share/ppsspp/assets/shaders/inversecolors.fsh
share/ppsspp/assets/shaders/natural.fsh
share/ppsspp/assets/shaders/natural.vsh
+share/ppsspp/assets/shaders/naturalA.fsh
share/ppsspp/assets/shaders/scanlines.fsh
share/ppsspp/assets/shaders/sharpen.fsh
share/ppsspp/assets/shaders/upscale_spline36.fsh
Re: [patch] audio/openal: ugly update to 1.18.2
On 2018/06/04 10:31, Leonid Bobrov wrote: > On Mon, Jun 04, 2018 at 08:07:36AM +0100, David CARLIER wrote: > > Ok ... My approach with openal has always been not rushing to update to the > > newest version especially so many softwares depends on it. > > Is the portaudio support of the actual version not working ? > > > > By actual you mean the current version of this port? It works (I tested > it at 1.17.2 first), but I thought why not to try to update to 1.18.2? In many languages the words like actual/current are the same, in this case a native speaker would say "current" but the words are often mixed up. (see 'get it right' tab on http://www.macmillandictionary.com/dictionary/british/actual) > Well, if to stay at current version, I provide new diff below. Wouldn't it be better to add record support to the sndio backend?
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, 4 Jun 2018 at 12:05, Stuart Henderson wrote: > On 2018/06/04 10:31, Leonid Bobrov wrote: > > Wouldn't it be better to add record support to the sndio backend? > > I remember the previous maintainer have tried unsuccessfully. But opener's architecture has changed since maybe it s more doable now.
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 12:05:58PM +0100, Stuart Henderson wrote: > In many languages the words like actual/current are the same, in this > case a native speaker would say "current" but the words are often mixed up. > (see 'get it right' tab on > http://www.macmillandictionary.com/dictionary/british/actual) > Oh, ok. Thanks. > Wouldn't it be better to add record support to the sndio backend? > Sure it would. As I said at first message: portaudio backend is a temporary solution. There is a dirty hack to use sndio output and portaudio input. to...@freebsd.org recommended to use OSS input while openal is not fixed: https://marc.info/?l=freebsd-ports&m=152810378407236&w=2 But I didn't try to use ossaudio emulation at OpenBSD.
Re: [patch] audio/openal: ugly update to 1.18.2
I'm not sure this is correct, but here is output: mazocomp$ cat openal.packages emulators/fs-uae emulators/higan emulators/retroarch games/0ad/base games/arx-libertatis games/astromenace games/barony games/dhewm3 games/dustrac games/fifengine games/fs2open games/gemrb games/ioquake3 games/irrlamb games/love games/lugaru games/lwjgl games/megaglest/base games/minetest games/openmw games/scorched3d games/solarus/solarus games/spacezero games/supertux games/supertuxkart games/taisei games/tome4 games/ufoai/base,-editor games/valyriatear games/vegastrike/engine games/warzone2100 games/yquake2 graphics/blender graphics/simgear multimedia/sfml x11/kde4/libkdegames mazocomp$ doas dpb openal.packages Started as: root Port user: root Build user: _pbuild Fetch user: _pfetch Log user: _pbuild Unpriv user: _dpb Reading build stats...zapping old stuff...Done zap duplicates...Done Waiting for hosts to finish STARTUP...ready on localhost 4 Jun 14:17:59 [74151] running for 01:01:58 Hosts: localhost I=0 B=0 Q=0 T=475 F=0 !=0 L=backtrace-0.3.tar.gz.dist E=games/ufoai/data:ufoai-2.5-data.tar games/supertuxkart:supertuxkart-0.9.3-src.tar.xz games/vegastrike/data:vegastrike-data-0.5.1.r1.tar.bz2 games/tome4,-data:t-engine4-src-1.5.10.tar.bz2 games/megaglest/data:megaglest-data-3. 13.0.tar.gz x11/qt4,-sqlite2:qt-everywhere-opensource-src-4.8.7.tar.gz devel/spidermonkey52:firefox-52.7.3esr.source.tar.xz x11/ogre,-samples:ogre-1.9.0.tar.gz games/valyriatear:ValyriaTear-1.0.0.tar.gz games/taisei:taisei-1.0a .tar.gz games/supertux:SuperTux-v0.5.1-Source.tar.gz devel/boost:boost_1_66_0.tar.bz2 games/warzone2100:warzone2100-3.2.3.tar.xz databases/mariadb,-main:mariadb-10.0.34.tar.gz print/foomatic-db:foomatic-db-4.0-20180228.tar.gz d evel/bullet:bullet-2.87.tar.gz games/astromenace:astromenace-src-1.3.2.tar.bz2 games/barony:Barony-3.1.4.tar.gz textproc/mupdf:mupdf-1.13.0-source.tar.gz graphics/blender:blender-2.79.tar.gz databases/postgresql:postgresql-10.4 .tar.gz games/scorched3d:Scorched3D-44-src.tar.gz graphics/cairo:cairo-1.14.12.tar.xz games/lugaru:lugaru-1.2.tar.xz print/ghostscript/gnu:ghostscript-9.07.tar.gz games/0ad/base:0ad-0.0.22-alpha-unix-build.tar.gz geo/gdal,-pyth on:gdalautotest-2.3.0.tar.gz x11/irrlicht:irrlicht-1.8.4.zip graphics/openimageio:openimageio-1.8.6.tar.gz databases/postgresql-previous:postgresql-9.6.6.tar.gz multimedia/sfml:SFML-2.4.0-sources.zip games/ufoai/base:ufoai-2.5- source.tar.bz2 archivers/brotli:brotli-1.0.4.tar.gz textproc/icu4c,-main:icu4c-58_2-src.tgz textproc/texi2html:texi2html-5.0.tar.gz lang/python/3.6,-idle:Python-3.6.5.tgz x11/vlc:vlc-2.2.8.tar.xz devel/mygui:mygui-3.2.2.tar.gz x11/gtk+3,-guic:gtk+-3.22.30.tar.xz emulators/retroarch:retroarch-1.7.2.tar.gz x11/wxWidgets:wxWidgets-2.8.12.tar.gz games/dustrac:DustRacing2D-1.13.0.tar.gz graphics/openexr,-main:openexr-2.2.1.tar.gz lang/php/7.0,-pdo_sqlite: php-7.0.30.tar.bz2 lang/python/2.7,-tkinter:Python-2.7.15.tgz games/fifengine:fifengine-0.4.1.tar.gz games/lwjgl:lwjgl2.9.3.tar.gz geo/gdal,-python:gdal-2.3.0.tar.gz lang/ruby/2.4,-gdbm:ruby-2.4.4.tar.gz graphics/opencolorio:Op enColorIO-20140911.tar.gz x11/gtk+2:gtk+-2.24.32.tar.xz games/gemrb:gemrb-0.8.5.tar.gz databases/db/v4,bootstrap,no_java,no_tcl,-tcl:db-4.6.21.tar.gz games/ioquake3:ioquake3-2018.04.13-3377f998.tar.gz graphics/lcms2:lcms2-2.9.t ar.gz games/vegastrike/engine:vegastrike-src-0.5.1.r1.tar.bz2 print/cups,-main:cups-2.2.7.tar.gz devel/gettext-tools:gettext-0.19.8.1.tar.xz www/apache-httpd:httpd-2.4.33.tar.gz games/fs2open:fs2_open_3_8_0-source-Unix_1.tar.gz devel/sdl2-image:SDL2_image-2.0.3.tar.gz games/minetest:minetest-0.4.14.tar.gz devel/swig:swig-3.0.12.tar.gz devel/glib2:glib-2.56.1.tar.xz print/qpdf:qpdf-8.0.2.tar.gz devel/cmake:cmake-3.10.2.tar.gz security/gnutls:gnutls-3. 5.18.tar.xz security/py-cryptodome,python3:pycryptodome-3.6.1.tar.gz x11/p5-Tk:Tk-804.033.tar.gz graphics/ffmpeg:ffmpeg-git-20180219.tar.xz devel/py-babel:Babel-2.4.0.tar.gz security/gnupg2:gnupg-2.2.6.tar.bz2 devel/proj:proj-d atumgrid-1.7.tar.gz lang/gawk:gawk-4.2.1.tar.gz net/net-snmp,-tkmib:net-snmp-5.8.rc3.tar.gz sysutils/e2fsprogs:e2fsprogs-1.42.12.tar.gz archivers/libarchive:libarchive-3.3.2.tar.gz databases/openldap:openldap-2.4.46.tgz graphic s/openscenegraph:openscenegraph-3.4.1.tar.gz graphics/exiv2:exiv2-0.26-trunk.tar.gz graphics/gdk-pixbuf2:gdk-pixbuf-2.36.12.tar.xz devel/apache-ant:apache-ant-1.10.3-bin.tar.bz2 textproc/libxml,-main:libxml2-2.9.8.tar.gz games/ dhewm3:dhewm3-1.4.1.tar.gz security/gnupg:gnupg-1.4.22.tar.gz games/openmw:openmw-0.43.0.tar.gz devel/sdl2:SDL2-2.0.8.tar.gz mail/alpine,-mailutil:alpine-2.21.tar.xz devel/libidn:libidn-1.35.tar.gz graphics/freeimage:FreeImage3 152.zip databases/freetds:freetds-0.95.95.tar.gz textproc/py-sphinx:Sphinx-1.4.8.tar.gz geo/spatialite/libspatialite:libspatialite-4.3.0a.tar.gz audio/libsamplerate:libsamplerate-0.1.9.tar.gz graphics/graphite2:graphite2-1.3.11 .tgz lang/guile:guile-1.8.8.tar.gz devel/sdl2-ttf:SDL2_ttf-2.0.
PHP link libpcre instead of using internal
Hello ports@,
This diff links the PHP SAPIs to libpcre instead of embedding pcre 8.38.
Since the pcre extension can't be build as a module (at least not
without patching the config0.m4) keep it in the SAPI itself.
OK?
martijn@
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.115
diff -u -p -r1.115 Makefile.inc
--- Makefile.inc1 Jun 2018 11:27:18 - 1.115
+++ Makefile.inc4 Jun 2018 11:47:06 -
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+= --with-gettext=${LOCALB
--with-iconv=${LOCALBASE} \
--with-onig=${LOCALBASE} \
--with-openssl \
- --with-pcre-regex \
+ --with-pcre-regex=${LOCALBASE} \
--with-zlib \
--enable-bcmath \
--enable-calendar \
@@ -146,9 +146,10 @@ COMMENT-dbg= interactive php debugger
CONFIGURE_ARGS+= --enable-phpdbg
.for i in ${SAPI}
-WANTLIB$i += c crypto curses iconv intl lzma m onig
+WANTLIB$i += c crypto curses iconv intl lzma m onig pcre
WANTLIB$i += pthread readline ssl xml2 z
LIB_DEPENDS$i += devel/gettext \
+ devel/pcre \
textproc/libxml \
textproc/oniguruma
.endfor
Index: 5.6/Makefile
===
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile
--- 5.6/Makefile1 Jun 2018 18:01:13 - 1.74
+++ 5.6/Makefile4 Jun 2018 11:47:06 -
@@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
PV=5.6
V= ${PV}.36
-REVISION= 6
+REVISION= 7
MASTER_SITES0= https://download.suhosin.org/
Index: 5.6/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-main,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST-main
--- 5.6/pkg/PLIST-main 27 May 2018 20:23:19 - 1.17
+++ 5.6/pkg/PLIST-main 4 Jun 2018 11:47:06 -
@@ -241,12 +241,6 @@ share/php-${PV}/include/ext/mysqlnd/mysq
share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h
share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h
share/php-${PV}/include/ext/pcre/
-share/php-${PV}/include/ext/pcre/pcrelib/
-share/php-${PV}/include/ext/pcre/pcrelib/config.h
-share/php-${PV}/include/ext/pcre/pcrelib/pcre.h
-share/php-${PV}/include/ext/pcre/pcrelib/pcre_internal.h
-share/php-${PV}/include/ext/pcre/pcrelib/pcreposix.h
-share/php-${PV}/include/ext/pcre/pcrelib/ucp.h
share/php-${PV}/include/ext/pcre/php_pcre.h
share/php-${PV}/include/ext/pdo/
share/php-${PV}/include/ext/pdo/php_pdo.h
Index: 7.0/Makefile
===
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- 7.0/Makefile1 Jun 2018 18:01:13 - 1.57
+++ 7.0/Makefile4 Jun 2018 11:47:06 -
@@ -2,7 +2,7 @@
PV=7.0
V= ${PV}.30
-REVISION= 6
+REVISION= 7
BUILD_DEPENDS+=devel/bison
Index: 7.0/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-main
--- 7.0/pkg/PLIST-main 27 May 2018 20:23:19 - 1.13
+++ 7.0/pkg/PLIST-main 4 Jun 2018 11:47:06 -
@@ -238,12 +238,6 @@ share/php-${PV}/include/ext/mysqlnd/mysq
share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h
share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h
share/php-${PV}/include/ext/pcre/
-share/php-${PV}/include/ext/pcre/pcrelib/
-share/php-${PV}/include/ext/pcre/pcrelib/config.h
-share/php-${PV}/include/ext/pcre/pcrelib/pcre.h
-share/php-${PV}/include/ext/pcre/pcrelib/pcre_internal.h
-share/php-${PV}/include/ext/pcre/pcrelib/pcreposix.h
-share/php-${PV}/include/ext/pcre/pcrelib/ucp.h
share/php-${PV}/include/ext/pcre/php_pcre.h
share/php-${PV}/include/ext/pdo/
share/php-${PV}/include/ext/pdo/php_pdo.h
Re: [patch] audio/openal: ugly update to 1.18.2
Looks ok to me. On Mon, 4 Jun 2018 at 12:41, Leonid Bobrov wrote: > I'm not sure this is correct, but here is output: > > mazocomp$ cat openal.packages > emulators/fs-uae > emulators/higan > emulators/retroarch > games/0ad/base > games/arx-libertatis > games/astromenace > games/barony > games/dhewm3 > games/dustrac > games/fifengine > games/fs2open > games/gemrb > games/ioquake3 > games/irrlamb > games/love > games/lugaru > games/lwjgl > games/megaglest/base > games/minetest > games/openmw > games/scorched3d > games/solarus/solarus > games/spacezero > games/supertux > games/supertuxkart > games/taisei > games/tome4 > games/ufoai/base,-editor > games/valyriatear > games/vegastrike/engine > games/warzone2100 > games/yquake2 > graphics/blender > graphics/simgear > multimedia/sfml > x11/kde4/libkdegames > mazocomp$ doas dpb openal.packages > Started as: root > Port user: root > Build user: _pbuild > Fetch user: _pfetch > Log user: _pbuild > Unpriv user: _dpb > Reading build stats...zapping old stuff...Done > zap duplicates...Done > Waiting for hosts to finish STARTUP...ready on localhost > 4 Jun 14:17:59 [74151] running for 01:01:58 > > Hosts: localhost > I=0 B=0 Q=0 T=475 F=0 !=0 > L=backtrace-0.3.tar.gz.dist > E=games/ufoai/data:ufoai-2.5-data.tar > games/supertuxkart:supertuxkart-0.9.3-src.tar.xz > games/vegastrike/data:vegastrike-data-0.5.1.r1.tar.bz2 > games/tome4,-data:t-engine4-src-1.5.10.tar.bz2 > games/megaglest/data:megaglest-data-3. > 13.0.tar.gz x11/qt4,-sqlite2:qt-everywhere-opensource-src-4.8.7.tar.gz > devel/spidermonkey52:firefox-52.7.3esr.source.tar.xz > x11/ogre,-samples:ogre-1.9.0.tar.gz > games/valyriatear:ValyriaTear-1.0.0.tar.gz games/taisei:taisei-1.0a > .tar.gz games/supertux:SuperTux-v0.5.1-Source.tar.gz > devel/boost:boost_1_66_0.tar.bz2 > games/warzone2100:warzone2100-3.2.3.tar.xz > databases/mariadb,-main:mariadb-10.0.34.tar.gz > print/foomatic-db:foomatic-db-4.0-20180228.tar.gz d > evel/bullet:bullet-2.87.tar.gz > games/astromenace:astromenace-src-1.3.2.tar.bz2 > games/barony:Barony-3.1.4.tar.gz > textproc/mupdf:mupdf-1.13.0-source.tar.gz > graphics/blender:blender-2.79.tar.gz databases/postgresql:postgresql-10.4 > .tar.gz games/scorched3d:Scorched3D-44-src.tar.gz > graphics/cairo:cairo-1.14.12.tar.xz games/lugaru:lugaru-1.2.tar.xz > print/ghostscript/gnu:ghostscript-9.07.tar.gz > games/0ad/base:0ad-0.0.22-alpha-unix-build.tar.gz geo/gdal,-pyth > on:gdalautotest-2.3.0.tar.gz x11/irrlicht:irrlicht-1.8.4.zip > graphics/openimageio:openimageio-1.8.6.tar.gz > databases/postgresql-previous:postgresql-9.6.6.tar.gz > multimedia/sfml:SFML-2.4.0-sources.zip games/ufoai/base:ufoai-2.5- > source.tar.bz2 archivers/brotli:brotli-1.0.4.tar.gz > textproc/icu4c,-main:icu4c-58_2-src.tgz > textproc/texi2html:texi2html-5.0.tar.gz > lang/python/3.6,-idle:Python-3.6.5.tgz x11/vlc:vlc-2.2.8.tar.xz > devel/mygui:mygui-3.2.2.tar.gz > x11/gtk+3,-guic:gtk+-3.22.30.tar.xz > emulators/retroarch:retroarch-1.7.2.tar.gz > x11/wxWidgets:wxWidgets-2.8.12.tar.gz > games/dustrac:DustRacing2D-1.13.0.tar.gz > graphics/openexr,-main:openexr-2.2.1.tar.gz lang/php/7.0,-pdo_sqlite: > php-7.0.30.tar.bz2 lang/python/2.7,-tkinter:Python-2.7.15.tgz > games/fifengine:fifengine-0.4.1.tar.gz games/lwjgl:lwjgl2.9.3.tar.gz > geo/gdal,-python:gdal-2.3.0.tar.gz lang/ruby/2.4,-gdbm:ruby-2.4.4.tar.gz > graphics/opencolorio:Op > enColorIO-20140911.tar.gz x11/gtk+2:gtk+-2.24.32.tar.xz > games/gemrb:gemrb-0.8.5.tar.gz > databases/db/v4,bootstrap,no_java,no_tcl,-tcl:db-4.6.21.tar.gz > games/ioquake3:ioquake3-2018.04.13-3377f998.tar.gz > graphics/lcms2:lcms2-2.9.t > ar.gz games/vegastrike/engine:vegastrike-src-0.5.1.r1.tar.bz2 > print/cups,-main:cups-2.2.7.tar.gz > devel/gettext-tools:gettext-0.19.8.1.tar.xz > www/apache-httpd:httpd-2.4.33.tar.gz > games/fs2open:fs2_open_3_8_0-source-Unix_1.tar.gz > devel/sdl2-image:SDL2_image-2.0.3.tar.gz > games/minetest:minetest-0.4.14.tar.gz devel/swig:swig-3.0.12.tar.gz > devel/glib2:glib-2.56.1.tar.xz print/qpdf:qpdf-8.0.2.tar.gz > devel/cmake:cmake-3.10.2.tar.gz security/gnutls:gnutls-3. > 5.18.tar.xz security/py-cryptodome,python3:pycryptodome-3.6.1.tar.gz > x11/p5-Tk:Tk-804.033.tar.gz graphics/ffmpeg:ffmpeg-git-20180219.tar.xz > devel/py-babel:Babel-2.4.0.tar.gz security/gnupg2:gnupg-2.2.6.tar.bz2 > devel/proj:proj-d > atumgrid-1.7.tar.gz lang/gawk:gawk-4.2.1.tar.gz > net/net-snmp,-tkmib:net-snmp-5.8.rc3.tar.gz > sysutils/e2fsprogs:e2fsprogs-1.42.12.tar.gz > archivers/libarchive:libarchive-3.3.2.tar.gz > databases/openldap:openldap-2.4.46.tgz graphic > s/openscenegraph:openscenegraph-3.4.1.tar.gz > graphics/exiv2:exiv2-0.26-trunk.tar.gz > graphics/gdk-pixbuf2:gdk-pixbuf-2.36.12.tar.xz > devel/apache-ant:apache-ant-1.10.3-bin.tar.bz2 > textproc/libxml,-main:libxml2-2.9.8.tar.gz games/ > dhewm3:dhewm3-1.4.1.tar.gz security/gnupg:gnupg-1.4.22.tar.gz > games/openmw:openmw-0.43.0.tar.gz devel/sdl2:SDL2-2.0.8.tar.gz > mail/alpine,-mailutil:alpine-2.21.tar.xz devel/libidn:libidn-1.35.tar.gz > graphic
Re: Python port module documentation question
I was not too sure how to summarize what you guys mentioned about those variables. Would it be possible to get assistance clearing up the wording in the man page? I get reading the module itself but the man page was my first stop. Wondering if this is clear to others, since I am still new to OpenBSD and porting. -- Sent from my mobile device. Please excuse my brevity and formatting issues. On June 4, 2018 1:25:37 AM UTC, Stuart Henderson wrote: >On 2018/06/03 17:16, Edward Lopez-Acosta wrote: >> Thanks Landry and Stuart, >> >> With that information I tried to add a little bit of clarity to the >man page >> using my understanding of those options. Never written a man page >before so >> it was an interesting experience. >> >> If this looks good would it be possible to get this merged for future >> releases? >> >> --- port-modules.5.orig Sun Jun 3 16:12:15 2018 >> +++ port-modules.5 Sun Jun 3 17:07:11 2018 >> @@ -1339,19 +1339,29 @@ >> .Ev MODPY_RUN_DEPENDS , >> .Ev MODPY_BUILD_DEPENDS >> and >> -.Ev MODPY_ADJ_FILES . >> -Appends to >> +.Ev MODPY_ADJ_FILES. > >that space should be there, and the other .Ev you've added with >punctuation immediately >at the end should have spaces added > >> +.Ev MODPY_RUN_DEPENDS, >> +and >> +.Ev MODPY_BUILD_DEPENDS >> +append to >> .Ev RUN_DEPENDS >> -unless >> -.Ev MODPY_RUNDEP >> -is set to No. >> -Appends to >> +and >> .Ev BUILD_DEPENDS >> unless >> +.Ev MODPY_RUNDEP >> +or >> .Ev MODPY_BUILDDEP >> is set to No or >> .Ev NO_BUILD >> -is set to Yes. >> +is set to Yes. The depends options are primarily >> +used with port submodules, otherwise >> +.Ev RUN_DEPENDS >> +or >> +.Ev BUILD_DEPENDS >> +should be used. > >new sentence -> new line > >there's no such thing as "port submodules" > >what you've added is pretty unclear, it makes it sound like the user >should >add something to MODPY_RUN_DEPENDS. it's not for that at all, it >provides >a string which can be added to "RUN_DEPENDS-subpackage". > >> +.Ev MODPY_RUN_DEPENDS, >> +is set automatically to the required versions of Python and >> +py-setuptools as applicable. >> .Ev MODPY_VERSION >> is the default version used by all python modules. >> Ports which use the setuptools module should set > >I don't think this really adds anything. Really I feel if you're using >a port module you should read the .mk file in conjunction with >port-modules(5), the latter can talk about things which need a bit >of extra explanation, but the problems you're running into can better >be sorted out with reference to a few existing python ports..
[update] games/minetest to 0.4.17 release!
Hello!
Finally it is released. I tested this game's snapshots to make sure
it won't crash like 0.4.16 release did.
Index: Makefile
===
RCS file: /cvs/ports/games/minetest/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile21 Nov 2017 00:13:00 - 1.22
+++ Makefile4 Jun 2018 13:00:58 -
@@ -1,20 +1,19 @@
# $OpenBSD: Makefile,v 1.22 2017/11/21 00:13:00 naddy Exp $
COMMENT = infinite-world block sandbox game
-V =0.4.14
+V =0.4.17
DISTNAME = minetest-${V}
CATEGORIES = games x11
-REVISION = 2
HOMEPAGE = http://www.minetest.net/
# source LGPLv2.1/ datas CC BY-SA 3.0
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL GLU ICE Irrlicht SM X11 Xext Xxf86vm bz2 c curl freetype
-WANTLIB += iconv intl jpeg m ogg openal png pthread spatialindex sqlite3
-WANTLIB += ${COMPILER_LIBCXX} vorbis vorbisfile z
-WANTLIB += luajit-${MODLUA_VERSION}
+WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE Irrlicht SM X11 Xext
+WANTLIB += Xxf86vm bz2 c curl curses form freetype iconv intl
+WANTLIB += jpeg luajit-5.1 m ogg openal png spatialindex sqlite3
+WANTLIB += vorbis vorbisfile z
MASTER_SITES = https://github.com/minetest/
Index: distinfo
===
RCS file: /cvs/ports/games/minetest/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo27 Jun 2016 05:26:13 - 1.8
+++ distinfo4 Jun 2018 13:00:58 -
@@ -1,4 +1,4 @@
-SHA256 (minetest-0.4.14.tar.gz) = ID3k1BpgRmEmq5LKhfcm2I0AhPLng5PaI550FsuEcFQ=
-SHA256 (minetest-game-0.4.14.tar.gz) =
7rwoMNDi9DH2SGkaAHL7t3PQAMVt6vCd3F50Fgls34U=
-SIZE (minetest-0.4.14.tar.gz) = 8637454
-SIZE (minetest-game-0.4.14.tar.gz) = 772370
+SHA256 (minetest-0.4.17.tar.gz) = hmTNgAzgoUbG19VDO4rMk8FFMIQDs/aufmtpvUpT63I=
+SHA256 (minetest-game-0.4.17.tar.gz) =
8KsHy0fBVAsgFr92o24u7Ciw6ngnv2b8VEfgxeXUSV0=
+SIZE (minetest-0.4.17.tar.gz) = 7757149
+SIZE (minetest-game-0.4.17.tar.gz) = 1356784
Index: patches/patch-src_CMakeLists_txt
===
RCS file: /cvs/ports/games/minetest/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt28 Jun 2016 13:56:58 - 1.12
+++ patches/patch-src_CMakeLists_txt4 Jun 2018 13:00:58 -
@@ -1,58 +1,18 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.12 2016/06/28 13:56:58 landry Exp $
src/CMakeLists.txt.origSun May 15 14:49:15 2016
-+++ src/CMakeLists.txt Tue Jun 28 15:56:19 2016
-@@ -61,6 +61,8 @@ set(USE_GETTEXT FALSE)
-
- if(ENABLE_GETTEXT)
- find_package(GettextLib)
-+ find_package(Iconv)
-+ find_package(Intl)
- if(GETTEXT_FOUND)
- if(WIN32)
- message(STATUS "GetText library: ${GETTEXT_LIBRARY}")
-@@ -306,7 +308,10 @@ else()
- if(APPLE)
- set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
- else()
-- set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
-+ check_library_exists(rt clock_gettime "" HAVE_LIBRT)
-+ if (HAVE_LIBRT)
-+ set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
-+ endif()
- endif(APPLE)
-
- # This way Xxf86vm is found on OpenBSD too
-@@ -550,7 +555,8 @@ if(BUILD_CLIENT)
- ${BZIP2_LIBRARIES}
- ${PNG_LIBRARIES}
- ${X11_LIBRARIES}
-- ${GETTEXT_LIBRARY}
-+ ${ICONV_LIBRARIES}
-+ ${Intl_LIBRARIES}
- ${SOUND_LIBRARIES}
- ${SQLITE3_LIBRARY}
- ${LUA_LIBRARY}
-@@ -612,7 +618,8 @@ if(BUILD_SERVER)
- ${ZLIB_LIBRARIES}
- ${SQLITE3_LIBRARY}
- ${JSON_LIBRARY}
-- ${GETTEXT_LIBRARY}
-+ ${ICONV_LIBRARIES}
-+ ${Intl_LIBRARIES}
- ${LUA_LIBRARY}
- ${GMP_LIBRARY}
- ${PLATFORM_LIBS}
-@@ -682,14 +689,12 @@ else()
- set(OTHER_FLAGS "-mthreads -fexceptions")
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
src/CMakeLists.txt
+@@ -756,14 +756,12 @@ else()
+ set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
endif()
-- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS}
${WARNING_FLAGS} ${OTHER_FLAGS} -ffast-math -Wall -pipe -funroll-loops")
-+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS}
${WARNING_FLAGS} ${OTHER_FLAGS}")
- if(APPLE)
+- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS}
${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
++ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS}
${WARNING_FLAGS} ${OTHER_FLAGS} -Wall")
+ if(CMAKE_SYSTEM_NAME
Re: [update] games/minetest to 0.4.17 release!
On Mon, Jun 04, 2018 at 04:16:04PM +0300, Leonid Bobrov wrote:
> Hello!
>
> Finally it is released. I tested this game's snapshots to make sure
> it won't crash like 0.4.16 release did.
>
Oups, I forgot to build server, attempt #2:
Index: Makefile
===
RCS file: /cvs/ports/games/minetest/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile21 Nov 2017 00:13:00 - 1.22
+++ Makefile4 Jun 2018 14:00:34 -
@@ -1,20 +1,19 @@
# $OpenBSD: Makefile,v 1.22 2017/11/21 00:13:00 naddy Exp $
COMMENT = infinite-world block sandbox game
-V =0.4.14
+V =0.4.17
DISTNAME = minetest-${V}
CATEGORIES = games x11
-REVISION = 2
HOMEPAGE = http://www.minetest.net/
# source LGPLv2.1/ datas CC BY-SA 3.0
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL GLU ICE Irrlicht SM X11 Xext Xxf86vm bz2 c curl freetype
-WANTLIB += iconv intl jpeg m ogg openal png pthread spatialindex sqlite3
-WANTLIB += ${COMPILER_LIBCXX} vorbis vorbisfile z
-WANTLIB += luajit-${MODLUA_VERSION}
+WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE Irrlicht SM X11 Xext
+WANTLIB += Xxf86vm bz2 c curl curses form freetype iconv intl
+WANTLIB += jpeg luajit-5.1 m ogg openal png spatialindex sqlite3
+WANTLIB += vorbis vorbisfile z
MASTER_SITES = https://github.com/minetest/
@@ -26,6 +25,7 @@ MODULES = devel/cmake \
CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
+CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE
CONFIGURE_ENV += CXXFLAGS="-I${X11BASE}/include"
BUILD_DEPENDS =devel/gettext-tools
Index: distinfo
===
RCS file: /cvs/ports/games/minetest/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo27 Jun 2016 05:26:13 - 1.8
+++ distinfo4 Jun 2018 14:00:34 -
@@ -1,4 +1,4 @@
-SHA256 (minetest-0.4.14.tar.gz) = ID3k1BpgRmEmq5LKhfcm2I0AhPLng5PaI550FsuEcFQ=
-SHA256 (minetest-game-0.4.14.tar.gz) =
7rwoMNDi9DH2SGkaAHL7t3PQAMVt6vCd3F50Fgls34U=
-SIZE (minetest-0.4.14.tar.gz) = 8637454
-SIZE (minetest-game-0.4.14.tar.gz) = 772370
+SHA256 (minetest-0.4.17.tar.gz) = hmTNgAzgoUbG19VDO4rMk8FFMIQDs/aufmtpvUpT63I=
+SHA256 (minetest-game-0.4.17.tar.gz) =
8KsHy0fBVAsgFr92o24u7Ciw6ngnv2b8VEfgxeXUSV0=
+SIZE (minetest-0.4.17.tar.gz) = 7757149
+SIZE (minetest-game-0.4.17.tar.gz) = 1356784
Index: patches/patch-src_CMakeLists_txt
===
RCS file: /cvs/ports/games/minetest/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt28 Jun 2016 13:56:58 - 1.12
+++ patches/patch-src_CMakeLists_txt4 Jun 2018 14:00:34 -
@@ -1,58 +1,18 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.12 2016/06/28 13:56:58 landry Exp $
src/CMakeLists.txt.origSun May 15 14:49:15 2016
-+++ src/CMakeLists.txt Tue Jun 28 15:56:19 2016
-@@ -61,6 +61,8 @@ set(USE_GETTEXT FALSE)
-
- if(ENABLE_GETTEXT)
- find_package(GettextLib)
-+ find_package(Iconv)
-+ find_package(Intl)
- if(GETTEXT_FOUND)
- if(WIN32)
- message(STATUS "GetText library: ${GETTEXT_LIBRARY}")
-@@ -306,7 +308,10 @@ else()
- if(APPLE)
- set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
- else()
-- set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
-+ check_library_exists(rt clock_gettime "" HAVE_LIBRT)
-+ if (HAVE_LIBRT)
-+ set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
-+ endif()
- endif(APPLE)
-
- # This way Xxf86vm is found on OpenBSD too
-@@ -550,7 +555,8 @@ if(BUILD_CLIENT)
- ${BZIP2_LIBRARIES}
- ${PNG_LIBRARIES}
- ${X11_LIBRARIES}
-- ${GETTEXT_LIBRARY}
-+ ${ICONV_LIBRARIES}
-+ ${Intl_LIBRARIES}
- ${SOUND_LIBRARIES}
- ${SQLITE3_LIBRARY}
- ${LUA_LIBRARY}
-@@ -612,7 +618,8 @@ if(BUILD_SERVER)
- ${ZLIB_LIBRARIES}
- ${SQLITE3_LIBRARY}
- ${JSON_LIBRARY}
-- ${GETTEXT_LIBRARY}
-+ ${ICONV_LIBRARIES}
-+ ${Intl_LIBRARIES}
- ${LUA_LIBRARY}
- ${GMP_LIBRARY}
- ${PLATFORM_LIBS}
-@@ -682,14 +689,12 @@ else()
- set(OTHER_FLAGS "-mthreads -fexceptions")
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
src/CMakeLists.txt
+@@ -756,14 +756,12 @@ else()
+ set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
endif()
-- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS}
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 01:18:05PM +0100, David CARLIER wrote: > Looks ok to me. > Good, waiting for commit :)
Re: [patch] audio/openal: ugly update to 1.18.2
On 2018/06/04 14:41, Leonid Bobrov wrote: > I'm not sure this is correct, but here is output: It's not, you have some problem with the dpb setup - it's not able to download any of the distfiles. > mazocomp$ cat openal.packages > emulators/fs-uae > emulators/higan > emulators/retroarch > games/0ad/base > games/arx-libertatis > games/astromenace > games/barony > games/dhewm3 > games/dustrac > games/fifengine > games/fs2open > games/gemrb > games/ioquake3 > games/irrlamb > games/love > games/lugaru > games/lwjgl > games/megaglest/base > games/minetest > games/openmw > games/scorched3d > games/solarus/solarus > games/spacezero > games/supertux > games/supertuxkart > games/taisei > games/tome4 > games/ufoai/base,-editor > games/valyriatear > games/vegastrike/engine > games/warzone2100 > games/yquake2 > graphics/blender > graphics/simgear > multimedia/sfml > x11/kde4/libkdegames > mazocomp$ doas dpb openal.packages dpb setup guide is in bulk(8). But if you have trouble getting dpb running, you can try: cd /usr/ports make SUBDIRLIST=/path/to/openal.packages clean make SUBDIRLIST=/path/to/openal.packages repackage
Re: [patch] audio/openal: ugly update to 1.18.2
On 2018/06/04 14:37, Leonid Bobrov wrote: > On Mon, Jun 04, 2018 at 12:05:58PM +0100, Stuart Henderson wrote: > > In many languages the words like actual/current are the same, in this > > case a native speaker would say "current" but the words are often mixed up. > > (see 'get it right' tab on > > http://www.macmillandictionary.com/dictionary/british/actual) > > > > Oh, ok. Thanks. > > > Wouldn't it be better to add record support to the sndio backend? > > > > Sure it would. As I said at first message: portaudio backend is a > temporary solution. There is a dirty hack to use sndio output and > portaudio input. to...@freebsd.org recommended to use OSS input > while openal is not fixed: > https://marc.info/?l=freebsd-ports&m=152810378407236&w=2 > > But I didn't try to use ossaudio emulation at OpenBSD. It looks like you can build openal with support for both output types, then the choice can be made via config file. That might be a better option for the ports tree.
Re: [update] games/minetest to 0.4.17 release!
On 2018/06/04 17:02, Leonid Bobrov wrote:
> -WANTLIB += GL GLU ICE Irrlicht SM X11 Xext Xxf86vm bz2 c curl freetype
> -WANTLIB += iconv intl jpeg m ogg openal png pthread spatialindex sqlite3
> -WANTLIB += ${COMPILER_LIBCXX} vorbis vorbisfile z
> -WANTLIB += luajit-${MODLUA_VERSION}
> +WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE Irrlicht SM X11 Xext
> +WANTLIB += Xxf86vm bz2 c curl curses form freetype iconv intl
> +WANTLIB += jpeg luajit-5.1 m ogg openal png spatialindex sqlite3
luajit-${MODLUA_VERSION} should stay and not be replaced with luajit-5.1
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 03:12:31PM +0100, Stuart Henderson wrote: > On 2018/06/04 14:41, Leonid Bobrov wrote: > It's not, you have some problem with the dpb setup - it's not able to > download any of the distfiles. > > dpb setup guide is in bulk(8). But if you have trouble getting dpb > running, you can try: > > cd /usr/ports > make SUBDIRLIST=/path/to/openal.packages clean > make SUBDIRLIST=/path/to/openal.packages repackage > Oh, in that case I have to reallocate my disk space first, these data files are so fat that default 10 GB for /usr/local are simply not enough to fit that stuff.
Re: [update] games/minetest to 0.4.17 release!
On Mon, Jun 04, 2018 at 03:16:36PM +0100, Stuart Henderson wrote:
> luajit-${MODLUA_VERSION} should stay and not be replaced with luajit-5.1
>
Oh, I blindly copied output of `make port-lib-depends-check` and
didn't notice that :/
Here we go again:
Index: Makefile
===
RCS file: /cvs/ports/games/minetest/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile21 Nov 2017 00:13:00 - 1.22
+++ Makefile4 Jun 2018 14:28:10 -
@@ -1,20 +1,19 @@
# $OpenBSD: Makefile,v 1.22 2017/11/21 00:13:00 naddy Exp $
COMMENT = infinite-world block sandbox game
-V =0.4.14
+V =0.4.17
DISTNAME = minetest-${V}
CATEGORIES = games x11
-REVISION = 2
HOMEPAGE = http://www.minetest.net/
# source LGPLv2.1/ datas CC BY-SA 3.0
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL GLU ICE Irrlicht SM X11 Xext Xxf86vm bz2 c curl freetype
-WANTLIB += iconv intl jpeg m ogg openal png pthread spatialindex sqlite3
-WANTLIB += ${COMPILER_LIBCXX} vorbis vorbisfile z
-WANTLIB += luajit-${MODLUA_VERSION}
+WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE Irrlicht SM X11 Xext
+WANTLIB += Xxf86vm bz2 c curl curses form freetype iconv intl
+WANTLIB += jpeg luajit-${MODLUA_VERSION} m ogg openal png
+WANTLIB += spatialindex sqlite3 vorbis vorbisfile z
MASTER_SITES = https://github.com/minetest/
@@ -26,6 +25,7 @@ MODULES = devel/cmake \
CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
+CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE
CONFIGURE_ENV += CXXFLAGS="-I${X11BASE}/include"
BUILD_DEPENDS =devel/gettext-tools
Index: distinfo
===
RCS file: /cvs/ports/games/minetest/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo27 Jun 2016 05:26:13 - 1.8
+++ distinfo4 Jun 2018 14:28:10 -
@@ -1,4 +1,4 @@
-SHA256 (minetest-0.4.14.tar.gz) = ID3k1BpgRmEmq5LKhfcm2I0AhPLng5PaI550FsuEcFQ=
-SHA256 (minetest-game-0.4.14.tar.gz) =
7rwoMNDi9DH2SGkaAHL7t3PQAMVt6vCd3F50Fgls34U=
-SIZE (minetest-0.4.14.tar.gz) = 8637454
-SIZE (minetest-game-0.4.14.tar.gz) = 772370
+SHA256 (minetest-0.4.17.tar.gz) = hmTNgAzgoUbG19VDO4rMk8FFMIQDs/aufmtpvUpT63I=
+SHA256 (minetest-game-0.4.17.tar.gz) =
8KsHy0fBVAsgFr92o24u7Ciw6ngnv2b8VEfgxeXUSV0=
+SIZE (minetest-0.4.17.tar.gz) = 7757149
+SIZE (minetest-game-0.4.17.tar.gz) = 1356784
Index: patches/patch-src_CMakeLists_txt
===
RCS file: /cvs/ports/games/minetest/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt28 Jun 2016 13:56:58 - 1.12
+++ patches/patch-src_CMakeLists_txt4 Jun 2018 14:28:10 -
@@ -1,58 +1,18 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.12 2016/06/28 13:56:58 landry Exp $
src/CMakeLists.txt.origSun May 15 14:49:15 2016
-+++ src/CMakeLists.txt Tue Jun 28 15:56:19 2016
-@@ -61,6 +61,8 @@ set(USE_GETTEXT FALSE)
-
- if(ENABLE_GETTEXT)
- find_package(GettextLib)
-+ find_package(Iconv)
-+ find_package(Intl)
- if(GETTEXT_FOUND)
- if(WIN32)
- message(STATUS "GetText library: ${GETTEXT_LIBRARY}")
-@@ -306,7 +308,10 @@ else()
- if(APPLE)
- set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
- else()
-- set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
-+ check_library_exists(rt clock_gettime "" HAVE_LIBRT)
-+ if (HAVE_LIBRT)
-+ set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
-+ endif()
- endif(APPLE)
-
- # This way Xxf86vm is found on OpenBSD too
-@@ -550,7 +555,8 @@ if(BUILD_CLIENT)
- ${BZIP2_LIBRARIES}
- ${PNG_LIBRARIES}
- ${X11_LIBRARIES}
-- ${GETTEXT_LIBRARY}
-+ ${ICONV_LIBRARIES}
-+ ${Intl_LIBRARIES}
- ${SOUND_LIBRARIES}
- ${SQLITE3_LIBRARY}
- ${LUA_LIBRARY}
-@@ -612,7 +618,8 @@ if(BUILD_SERVER)
- ${ZLIB_LIBRARIES}
- ${SQLITE3_LIBRARY}
- ${JSON_LIBRARY}
-- ${GETTEXT_LIBRARY}
-+ ${ICONV_LIBRARIES}
-+ ${Intl_LIBRARIES}
- ${LUA_LIBRARY}
- ${GMP_LIBRARY}
- ${PLATFORM_LIBS}
-@@ -682,14 +689,12 @@ else()
- set(OTHER_FLAGS "-mthreads -fexceptions")
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
src/CMakeLists.txt
+@@ -756,14 +756,12 @@ else()
+ set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
endif()
-- set(CMAKE_CXX_FLAGS_RELEASE "-DND
Re: PHP link libpcre instead of using internal
On 2018/06/04 13:47, Martijn van Duren wrote:
> Hello ports@,
>
> This diff links the PHP SAPIs to libpcre instead of embedding pcre 8.38.
> Since the pcre extension can't be build as a module (at least not
> without patching the config0.m4) keep it in the SAPI itself.
>
> OK?
>
> martijn@
>
> Index: Makefile.inc
> ===
> RCS file: /cvs/ports/lang/php/Makefile.inc,v
> retrieving revision 1.115
> diff -u -p -r1.115 Makefile.inc
> --- Makefile.inc 1 Jun 2018 11:27:18 - 1.115
> +++ Makefile.inc 4 Jun 2018 11:47:06 -
> @@ -82,7 +82,7 @@ CONFIGURE_ARGS+=--with-gettext=${LOCALB
> --with-iconv=${LOCALBASE} \
> --with-onig=${LOCALBASE} \
> --with-openssl \
> - --with-pcre-regex \
> + --with-pcre-regex=${LOCALBASE} \
> --with-zlib \
> --enable-bcmath \
> --enable-calendar \
> @@ -146,9 +146,10 @@ COMMENT-dbg= interactive php debugger
> CONFIGURE_ARGS+= --enable-phpdbg
>
> .for i in ${SAPI}
> -WANTLIB$i += c crypto curses iconv intl lzma m onig
> +WANTLIB$i += c crypto curses iconv intl lzma m onig pcre
> WANTLIB$i += pthread readline ssl xml2 z
> LIB_DEPENDS$i += devel/gettext \
> + devel/pcre \
> textproc/libxml \
> textproc/oniguruma
> .endfor
> Index: 5.6/Makefile
> ===
> RCS file: /cvs/ports/lang/php/5.6/Makefile,v
> retrieving revision 1.74
> diff -u -p -r1.74 Makefile
> --- 5.6/Makefile 1 Jun 2018 18:01:13 - 1.74
> +++ 5.6/Makefile 4 Jun 2018 11:47:06 -
> @@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
> PV= 5.6
> V= ${PV}.36
> -REVISION=6
> +REVISION=7
It just needs REVISION-main bumped rather than all the sub's.
Please kill the BROKEN-alpha line while there. Then it's OK.
>
> MASTER_SITES0= https://download.suhosin.org/
>
> Index: 5.6/pkg/PLIST-main
> ===
> RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-main,v
> retrieving revision 1.17
> diff -u -p -r1.17 PLIST-main
> --- 5.6/pkg/PLIST-main27 May 2018 20:23:19 - 1.17
> +++ 5.6/pkg/PLIST-main4 Jun 2018 11:47:06 -
> @@ -241,12 +241,6 @@ share/php-${PV}/include/ext/mysqlnd/mysq
> share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h
> share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h
> share/php-${PV}/include/ext/pcre/
> -share/php-${PV}/include/ext/pcre/pcrelib/
> -share/php-${PV}/include/ext/pcre/pcrelib/config.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcre.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcre_internal.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcreposix.h
> -share/php-${PV}/include/ext/pcre/pcrelib/ucp.h
> share/php-${PV}/include/ext/pcre/php_pcre.h
> share/php-${PV}/include/ext/pdo/
> share/php-${PV}/include/ext/pdo/php_pdo.h
> Index: 7.0/Makefile
> ===
> RCS file: /cvs/ports/lang/php/7.0/Makefile,v
> retrieving revision 1.57
> diff -u -p -r1.57 Makefile
> --- 7.0/Makefile 1 Jun 2018 18:01:13 - 1.57
> +++ 7.0/Makefile 4 Jun 2018 11:47:06 -
> @@ -2,7 +2,7 @@
>
> PV= 7.0
> V= ${PV}.30
> -REVISION=6
> +REVISION=7
>
> BUILD_DEPENDS+= devel/bison
>
> Index: 7.0/pkg/PLIST-main
> ===
> RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-main,v
> retrieving revision 1.13
> diff -u -p -r1.13 PLIST-main
> --- 7.0/pkg/PLIST-main27 May 2018 20:23:19 - 1.13
> +++ 7.0/pkg/PLIST-main4 Jun 2018 11:47:06 -
> @@ -238,12 +238,6 @@ share/php-${PV}/include/ext/mysqlnd/mysq
> share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h
> share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h
> share/php-${PV}/include/ext/pcre/
> -share/php-${PV}/include/ext/pcre/pcrelib/
> -share/php-${PV}/include/ext/pcre/pcrelib/config.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcre.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcre_internal.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcreposix.h
> -share/php-${PV}/include/ext/pcre/pcrelib/ucp.h
> share/php-${PV}/include/ext/pcre/php_pcre.h
> share/php-${PV}/include/ext/pdo/
> share/php-${PV}/include/ext/pdo/php_pdo.h
>
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 03:15:05PM +0100, Stuart Henderson wrote: > It looks like you can build openal with support for both output types, > then the choice can be made via config file. That might be a better option > for the ports tree. > Argh, it crashes no matter how I change ~/.alsoftrc
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 05:42:38PM +0300, Leonid Bobrov wrote: > On Mon, Jun 04, 2018 at 03:15:05PM +0100, Stuart Henderson wrote: > > It looks like you can build openal with support for both output types, > > then the choice can be made via config file. That might be a better option > > for the ports tree. > > > > Argh, it crashes no matter how I change ~/.alsoftrc > Ok, 1.17.2 doesn't crash, how about this? Index: Makefile === RCS file: /cvs/ports/audio/openal/Makefile,v retrieving revision 1.50 diff -u -p -u -p -r1.50 Makefile --- Makefile31 Dec 2017 18:46:26 - 1.50 +++ Makefile4 Jun 2018 14:58:57 - @@ -10,7 +10,7 @@ DISTNAME =openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio SHARED_LIBS = openal 3.0 -REVISION = 0 +REVISION = 1 HOMEPAGE = http://kcat.strangesoft.net/openal.html @@ -19,7 +19,7 @@ MAINTAINER = David Carlier
Re: [New] citra - 3DS emulator
On 2018/06/03 20:23, Thomas Frohwein wrote:
> ping
OK sthen@ to import.
Not necessary for import, but maybe some of the patches could be removed
by adding -I${LOCALBASE}/include/catch somewhere?
> - now from self-hosted distfile to avoid github's risk of unstability with
> their auto-tarballs (also conveniently includes all submodules)
Mirrored at https://spacehopper.org/mirrors/
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 12:05:58PM +0100, Stuart Henderson wrote:
> On 2018/06/04 10:31, Leonid Bobrov wrote:
> > On Mon, Jun 04, 2018 at 08:07:36AM +0100, David CARLIER wrote:
> > > Ok ... My approach with openal has always been not rushing to update to
> > > the
> > > newest version especially so many softwares depends on it.
> > > Is the portaudio support of the actual version not working ?
> > >
> >
> > By actual you mean the current version of this port? It works (I tested
> > it at 1.17.2 first), but I thought why not to try to update to 1.18.2?
>
> In many languages the words like actual/current are the same, in this
> case a native speaker would say "current" but the words are often mixed up.
> (see 'get it right' tab on
> http://www.macmillandictionary.com/dictionary/british/actual)
>
> > Well, if to stay at current version, I provide new diff below.
>
> Wouldn't it be better to add record support to the sndio backend?
>
Here's a WIP recording backend. I couldn't quickly find simple tools
to test and debug it, so I never finished it.
If you've simple tools to quickly test recording, I'm very interested.
Index: Makefile
===
RCS file: /cvs/ports/audio/openal/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile31 Dec 2017 18:46:26 - 1.50
+++ Makefile4 Jun 2018 16:40:48 -
@@ -10,7 +10,7 @@ DISTNAME =openal-soft-$V
PKGNAME = openal-$V
CATEGORIES = audio
SHARED_LIBS = openal 3.0
-REVISION = 0
+REVISION = 1
HOMEPAGE = http://kcat.strangesoft.net/openal.html
Index: patches/patch-Alc_backends_sndio_c
===
RCS file: patches/patch-Alc_backends_sndio_c
diff -N patches/patch-Alc_backends_sndio_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Alc_backends_sndio_c 4 Jun 2018 16:40:48 -
@@ -0,0 +1,362 @@
+$OpenBSD$
+
+Index: Alc/backends/sndio.c
+--- Alc/backends/sndio.c.orig
Alc/backends/sndio.c
+@@ -42,16 +42,18 @@ static ALCboolean sndio_load(void)
+
+ typedef struct {
+ struct sio_hdl *sndHandle;
++int mode;
+
+ ALvoid *mix_data;
+ ALsizei data_size;
+
++ll_ringbuffer_t *ring;
++
+ volatile int killNow;
+ althrd_t thread;
+ } sndio_data;
+
+-
+-static int sndio_proc(void *ptr)
++static int sndio_proc_playback(void *ptr)
+ {
+ ALCdevice *device = ptr;
+ sndio_data *data = device->ExtraData;
+@@ -89,53 +91,22 @@ static int sndio_proc(void *ptr)
+ return 0;
+ }
+
+-
+-
+-static ALCenum sndio_open_playback(ALCdevice *device, const ALCchar
*deviceName)
++static ALCboolean sndio_setparams(ALCdevice *device)
+ {
+-sndio_data *data;
+-
+-if(!deviceName)
+-deviceName = sndio_device;
+-else if(strcmp(deviceName, sndio_device) != 0)
+-return ALC_INVALID_VALUE;
+-
+-data = calloc(1, sizeof(*data));
+-data->killNow = 0;
+-
+-data->sndHandle = sio_open(NULL, SIO_PLAY, 0);
+-if(data->sndHandle == NULL)
+-{
+-free(data);
+-ERR("Could not open device\n");
+-return ALC_INVALID_VALUE;
+-}
+-
+-al_string_copy_cstr(&device->DeviceName, deviceName);
+-device->ExtraData = data;
+-
+-return ALC_NO_ERROR;
+-}
+-
+-static void sndio_close_playback(ALCdevice *device)
+-{
+ sndio_data *data = device->ExtraData;
+-
+-sio_close(data->sndHandle);
+-free(data);
+-device->ExtraData = NULL;
+-}
+-
+-static ALCboolean sndio_reset_playback(ALCdevice *device)
+-{
+-sndio_data *data = device->ExtraData;
+ struct sio_par par;
++unsigned int nch;
+
+ sio_initpar(&par);
+
+ par.rate = device->Frequency;
+-par.pchan = ((device->FmtChans != DevFmtMono) ? 2 : 1);
++nch = ((device->FmtChans != DevFmtMono) ? 2 : 1);
+
++if (data->mode & SIO_PLAY)
++ par.pchan = nch;
++else if (data->mode & SIO_REC)
++ par.rchan = nch;
++
+ switch(device->FmtType)
+ {
+ case DevFmtByte:
+@@ -182,8 +153,10 @@ static ALCboolean sndio_reset_playback(ALCdevice *devi
+ return ALC_FALSE;
+ }
+
++nch = (data->mode & SIO_PLAY) ? par.pchan : par.rchan;
++
+ device->Frequency = par.rate;
+-device->FmtChans = ((par.pchan==1) ? DevFmtMono : DevFmtStereo);
++device->FmtChans = ((nch == 1) ? DevFmtMono : DevFmtStereo);
+
+ if(par.bits == 8 && par.sig == 1)
+ device->FmtType = DevFmtByte;
+@@ -211,6 +184,47 @@ static ALCboolean sndio_reset_playback(ALCdevice *devi
+ return ALC_TRUE;
+ }
+
++static ALCenum sndio_open_playback(ALCdevice *device, const ALCchar
*deviceName)
++{
++sndio_data *data;
++
++if(!deviceName)
++deviceName = sndio_device;
++else if(strcmp(deviceName, sndio_device) != 0)
++return ALC_INVALID_VALUE;
++
++data = calloc(1, sizeof(*data));
++data->killNow = 0;
++
++data->mode = SIO_PLAY;
++data->sndHandle = sio_open(NULL, data->mode, 0);
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 02:37:28PM +0300, Leonid Bobrov wrote: > On Mon, Jun 04, 2018 at 12:05:58PM +0100, Stuart Henderson wrote: > > In many languages the words like actual/current are the same, in this > > case a native speaker would say "current" but the words are often mixed up. > > (see 'get it right' tab on > > http://www.macmillandictionary.com/dictionary/british/actual) > > > > Oh, ok. Thanks. > > > Wouldn't it be better to add record support to the sndio backend? > > > > Sure it would. As I said at first message: portaudio backend is a > temporary solution. There is a dirty hack to use sndio output and > portaudio input. to...@freebsd.org recommended to use OSS input > while openal is not fixed: > https://marc.info/?l=freebsd-ports&m=152810378407236&w=2 > > But I didn't try to use ossaudio emulation at OpenBSD. > we've no OSS emulation
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 06:01:51PM +0300, Leonid Bobrov wrote:
> On Mon, Jun 04, 2018 at 05:42:38PM +0300, Leonid Bobrov wrote:
> > On Mon, Jun 04, 2018 at 03:15:05PM +0100, Stuart Henderson wrote:
> > > It looks like you can build openal with support for both output types,
> > > then the choice can be made via config file. That might be a better option
> > > for the ports tree.
> > >
> >
> > Argh, it crashes no matter how I change ~/.alsoftrc
> >
>
> Ok, 1.17.2 doesn't crash, how about this?
>
>
> -WANTLIB += c m pthread sndio ${COMPILER_LIBCXX}
> +WANTLIB += c m pthread portaudio sndio
>
stacking many layers of audio frameworks is unlikely do give the most
stable audio.
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 06:48:02PM +0200, Alexandre Ratchov wrote: > we've no OSS emulation > https://www.openbsd.org/faq/ports/specialtopics.html#Audio Please update that page. About tools, I already told I'm using Tox. I'll test you diff right now.
Re: [update] emacs-26.1
On Mon, Jun 04 2018, Leonid Bobrov wrote:
> Hi!
Hi,
> I'm not sure you know, but gtk3 flavor can use Webkit2GTK as web browser
> engine, plist doesn't change, here is a diff for 26.1 port Makefile:
thanks for the proposal, but emacs is already bloated, complex and
unportable enough; I don't want to add more insanity.
> --- Makefile.orig Sun Jun 3 23:29:36 2018
> +++ MakefileMon Jun 4 00:13:09 2018
> @@ -79,14 +79,17 @@ WANTLIB += freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0
> WANTLIB += glib-2.0 gobject-2.0 gtk-x11-2.0 intl jpeg lcms2 pango-1.0
> WANTLIB += pangocairo-1.0 pangoft2-1.0 png rsvg-2 tiff xcb
> . elif ${FLAVOR} == "gtk3"
> -CONFIGURE_ARGS+= --with-x-toolkit=gtk3
> -LIB_DEPENDS+= x11/gtk+3
> +CONFIGURE_ARGS+= --with-x-toolkit=gtk3 \
> + --with-xwidgets
> +LIB_DEPENDS+= www/webkitgtk4 \
> + x11/gtk+3
> WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> -WANTLIB += Xext Xfixes Xft Xinerama Xpm Xrandr Xrender atk-1.0
> -WANTLIB += cairo cairo-gobject dbus-1 fontconfig freetype fribidi
> -WANTLIB += gdk-3 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
> -WANTLIB += gtk-3 intl jpeg lcms2 pango-1.0 pangocairo-1.0 png
> -WANTLIB += rsvg-2 tiff xcb
> +WANTLIB += Xcomposite Xext Xfixes Xft Xinerama Xpm Xrandr Xrender
> +WANTLIB += atk-1.0 cairo cairo-gobject dbus-1 fontconfig freetype
> +WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
> +WANTLIB += gtk-3 intl javascriptcoregtk-4.0 jpeg lcms2 pango-1.0
> +WANTLIB += pangocairo-1.0 png rsvg-2 soup-2.4 tiff webkit2gtk-4.0
> +WANTLIB += xcb
> . else
> ERRORS+= "Fatal: Conflicting flavor: ${FLAVOR}"
> . endif
>
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[patch] sysutils/truncate uses pledge(2)
ports/infrastructure/templates/Makefile.template says: # If pledge is used, annotate with `uses pledge()' in a comment Index: Makefile === RCS file: /cvs/ports/sysutils/truncate/Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 Makefile --- Makefile3 Jun 2018 15:55:16 - 1.1.1.1 +++ Makefile4 Jun 2018 16:55:46 - @@ -10,6 +10,7 @@ MAINTAINER = Brian Callahan https://mirrors.nycbug.org/pub/distfiles/
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 08:23:23PM +0300, Leonid Bobrov wrote: > On Mon, Jun 04, 2018 at 06:48:02PM +0200, Alexandre Ratchov wrote: > > we've no OSS emulation > > > > https://www.openbsd.org/faq/ports/specialtopics.html#Audio > Please update that page. > > About tools, I already told I'm using Tox. I'll test you diff right now. > (gdb) bt full #0 0x1789a46c591e in sndio_setparams () from /usr/local/lib/libopenal.so.3.0 No symbol table info available. #1 0x1789a46c5648 in sndio_open_capture () from /usr/local/lib/libopenal.so.3.0 No symbol table info available. #2 0x1789a46a7ac2 in alcCaptureOpenDevice () from /usr/local/lib/libopenal.so.3.0 No symbol table info available. #3 0x17875e67e404 in audio_in_listen () from /usr/local/bin/utox No symbol table info available. #4 0x17875e67d75d in utox_audio_thread () from /usr/local/bin/utox No symbol table info available. #5 0x1789dcf1c52e in _rthread_start (v=Variable "v" is not available. ) at /usr/src/lib/librthread/rthread.c:96 thread = Variable "thread" is not available.
Re: [patch] audio/openal: ugly update to 1.18.2
But input device is detected, I get crash when trying to record my voice.
Re: [update] emacs-26.1
On Mon, Jun 04, 2018 at 07:28:32PM +0200, Jeremie Courreges-Anglas wrote: > Hi, > > thanks for the proposal, but emacs is already bloated, complex and > unportable enough; I don't want to add more insanity. > Agree, but what did you say about providing full-featured emacs? :D
Re: [update] emacs-26.1
On Mon, Jun 04 2018, Leonid Bobrov wrote: > On Mon, Jun 04, 2018 at 07:28:32PM +0200, Jeremie Courreges-Anglas wrote: >> Hi, >> >> thanks for the proposal, but emacs is already bloated, complex and >> unportable enough; I don't want to add more insanity. >> > > Agree, but what did you say about providing full-featured emacs? :D --with-xwidgets is not on by default. Can you please move on to another subject? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[MAINTAINER] security update net/prosody to 0.10.2
Hi,
attached diff updates prosody to 0.10.2 which fixes CVE-2018-10847[1].
Also included in 0.10.2 and 0.10.1 (which was omitted) are several
other bugfixes [2][3].
[1]: https://prosody.im/security/advisory_20180531/
[2]: https://blog.prosody.im/prosody-0-10-1-released/
[3]: https://blog.prosody.im/prosody-0-10-2-security-release/
Index: Makefile
===
RCS file: /cvs/ports/net/prosody/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile18 Jan 2018 03:22:34 - 1.48
+++ Makefile4 Jun 2018 18:33:43 -
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.48 2018/01/18 03:22:34 danj Exp $
COMMENT= communications server for Jabber/XMPP written in Lua
-DISTNAME= prosody-0.10.0
-REVISION= 2
+DISTNAME= prosody-0.10.2
CATEGORIES=net
MASTER_SITES= http://prosody.im/downloads/source/
Index: distinfo
===
RCS file: /cvs/ports/net/prosody/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo5 Nov 2017 16:52:07 - 1.14
+++ distinfo4 Jun 2018 18:33:43 -
@@ -1,2 +1,2 @@
-SHA256 (prosody-0.10.0.tar.gz) = dBTkRyVsYLJkVXjEpZExE810tBnKWgMrVNuQ2YqXhJg=
-SIZE (prosody-0.10.0.tar.gz) = 330461
+SHA256 (prosody-0.10.2.tar.gz) = dbXwNeenTV8gju6vhBm5SoXQm0AlLURM/4Az/ePJdo4=
+SIZE (prosody-0.10.2.tar.gz) = 331874
Index: patches/patch-core_certmanager_lua
===
RCS file: patches/patch-core_certmanager_lua
diff -N patches/patch-core_certmanager_lua
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-core_certmanager_lua 4 Jun 2018 18:33:43 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: core/certmanager.lua
+--- core/certmanager.lua.orig
core/certmanager.lua
+@@ -102,7 +102,7 @@ end
+
+ -- Built-in defaults
+ local core_defaults = {
+- capath = "/etc/ssl/certs";
++ cafile = "/etc/ssl/cert.pem";
+ depth = 9;
+ protocol = "tlsv1+";
+ verify = (ssl_x509 and { "peer", "client_once", }) or "none";
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/prosody/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 5 Nov 2017 16:52:07 - 1.11
+++ pkg/PLIST 4 Jun 2018 18:33:43 -
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.11 2017/11/05 16:52:07 landry Exp $
@newgroup _prosody:638
@newuser _prosody:638:_prosody:daemon:prosody user:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/prosody
lib/prosody/
lib/prosody/core/
lib/prosody/core/certmanager.lua
@@ -72,6 +73,7 @@ lib/prosody/modules/mod_s2s/s2sout.lib.l
lib/prosody/modules/mod_s2s_auth_certs.lua
lib/prosody/modules/mod_saslauth.lua
lib/prosody/modules/mod_server_contact_info.lua
+lib/prosody/modules/mod_stanza_debug.lua
lib/prosody/modules/mod_storage_internal.lua
lib/prosody/modules/mod_storage_none.lua
lib/prosody/modules/mod_storage_sql.lua
@@ -208,11 +210,8 @@ share/examples/prosody/prosody.cfg.lua
@mode 770
@owner _prosody
@group _prosody
-@sample /var/prosody/
share/examples/prosody/prosody.log
@mode 660
@sample /var/prosody/prosody.log
-@owner
-@group
-@mode
-@rcscript ${RCDIR}/prosody
+@mode 770
+@sample /var/prosody/
[update] mpd/mpc/ncmpc/ncmpcpp
Hi,
here are four diffs to update the mpd/mpc gang, works fine here. thx
rsadowski@ for the c++ voodoo. ncmpc was rewritten to use c++14.
fixed WANTLIB here and there to use the correct curses lib, as curses is
the one reported in the end by ldd/objdump -p, i don't see any specific
reason to use ncursesw there.
Feedback from other mpd users welcome.
Landry
Index: Makefile
===
RCS file: /cvs/ports/audio/mpc/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile23 Apr 2018 17:11:49 - 1.26
+++ Makefile4 Jun 2018 19:41:49 -
@@ -2,7 +2,7 @@
COMMENT= command line client for mpd
-VER= 0.29
+VER= 0.30
DISTNAME= mpc-${VER}
CATEGORIES=audio
EXTRACT_SUFX= .tar.xz
Index: distinfo
===
RCS file: /cvs/ports/audio/mpc/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo23 Apr 2018 16:51:50 - 1.15
+++ distinfo4 Jun 2018 19:41:49 -
@@ -1,2 +1,2 @@
-SHA256 (mpc-0.29.tar.xz) = AvHa7JAstI+M2qb+Icchn2IxsJHd2+Q3o6T7EssHudM=
-SIZE (mpc-0.29.tar.xz) = 41872
+SHA256 (mpc-0.30.tar.xz) = ZfxbCoQw7+msvm4mESeWBoJ2SyCrmUZ2NxvceX2Gf84=
+SIZE (mpc-0.30.tar.xz) = 41968
Index: patches/patch-doc_meson_build
===
RCS file: /cvs/ports/audio/mpc/patches/patch-doc_meson_build,v
retrieving revision 1.1
diff -u -r1.1 patch-doc_meson_build
--- patches/patch-doc_meson_build 23 Apr 2018 16:51:50 - 1.1
+++ patches/patch-doc_meson_build 4 Jun 2018 19:41:49 -
@@ -24,10 +24,11 @@
-output: 'man',
+output: 'man1',
input: ['index.rst', 'conf.py'],
- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
+-command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@/man1'],
++command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
build_by_default: true,
install: true,
--install_dir: join_paths(get_option('datadir'), 'man', 'man1'),
-+install_dir: get_option('mandir')
+-install_dir: get_option('datadir'),
++install_dir: get_option('mandir'),
)
endif
Index: Makefile
===
RCS file: /cvs/ports/audio/mpd/Makefile,v
retrieving revision 1.116
diff -u -r1.116 Makefile
--- Makefile23 Apr 2018 16:58:40 - 1.116
+++ Makefile4 Jun 2018 19:42:11 -
@@ -2,7 +2,7 @@
BROKEN-hppa = no atomic ops
COMMENT = Music Player Daemon
-VER = 0.20.18
+VER = 0.20.20
DISTNAME = mpd-${VER}
CATEGORIES = audio
HOMEPAGE = https://www.musicpd.org/
Index: distinfo
===
RCS file: /cvs/ports/audio/mpd/distinfo,v
retrieving revision 1.48
diff -u -r1.48 distinfo
--- distinfo23 Apr 2018 16:58:40 - 1.48
+++ distinfo4 Jun 2018 19:42:11 -
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.20.18.tar.gz) = pODRR/fRL/dg3DCSiFLj+klBqClSQ0kZGYugQJ7IrTw=
-SIZE (mpd-0.20.18.tar.gz) = 1137008
+SHA256 (mpd-0.20.20.tar.gz) = KZQHeiWVJIaHynj+EsYdxrHk55EzMMayCjmGJLyolZA=
+SIZE (mpd-0.20.20.tar.gz) = 1139145
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/audio/mpd/patches/patch-Makefile_in,v
retrieving revision 1.23
diff -u -r1.23 patch-Makefile_in
--- patches/patch-Makefile_in 25 Aug 2017 10:06:59 - 1.23
+++ patches/patch-Makefile_in 4 Jun 2018 19:42:11 -
@@ -2,7 +2,7 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -4652,7 +4652,7 @@ FILTER_LIBS = \
+@@ -4680,7 +4680,7 @@ FILTER_LIBS = \
# Documentation
#
man_MANS = doc/mpd.1 doc/mpd.conf.5
Index: patches/patch-src_Main_cxx
===
RCS file: /cvs/ports/audio/mpd/patches/patch-src_Main_cxx,v
retrieving revision 1.4
diff -u -r1.4 patch-src_Main_cxx
--- patches/patch-src_Main_cxx 30 May 2017 12:31:54 - 1.4
+++ patches/patch-src_Main_cxx 4 Jun 2018 19:42:11 -
@@ -5,7 +5,7 @@
Index: src/Main.cxx
--- src/Main.cxx.orig
+++ src/Main.cxx
-@@ -123,7 +123,7 @@ static constexpr size_t MEGABYTE = 1024 * KILOBYTE;
+@@ -115,7 +115,7 @@ static constexpr size_t MEGABYTE = 1024 * KILOBYTE;
static constexpr size_t DEFAULT_BUFFER_SIZE = 4 * MEGABYTE;
static
Index: Makefile
===
RCS file: /cvs/ports/audio/ncmpc/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile24 Nov 2017 13:31:39 - 1.37
+++ Makefile4 Jun 2018 19:41:42 -
@@ -2,7 +2,7 @@
COMMENT=
Re: [MAINTAINER] security update net/prosody to 0.10.2
On Mon, Jun 04, 2018 at 08:38:39PM +0200, Henrik Friedrichsen wrote: > Hi, > > attached diff updates prosody to 0.10.2 which fixes CVE-2018-10847[1]. > > Also included in 0.10.2 and 0.10.1 (which was omitted) are several > other bugfixes [2][3]. I'm commiting your diff, but patches/patch-core_certmanager_lua was already commited in january. Update your tree before generating diffs.. Landry
Re: [MAINTAINER] security update net/prosody to 0.10.2
On Mon, Jun 04, 2018 at 09:52:10PM +0200, Landry Breuil wrote: > I'm commiting your diff, but patches/patch-core_certmanager_lua was > already commited in january. Update your tree before generating diffs.. Odd, I did run cvs up on the tree before working on it. Will make sure it's recent next time.
Re: UPDATE: games/prboom-plus
On Thu, May 10, 2018 at 12:15:56AM -0700, Ryan Freeman wrote:
> Hey,
>
> I sent this in back in 2016, totally forgot about it:
> https://marc.info/?l=openbsd-ports&m=145953130908490&w=2
>
> Apologies to naddy@ who recently modified this and likely wouldn't have
> had to if i had stayed on top of getting this update in...
>
> Anyway, this updates prboom-plus to 2.5.1.4.
>
> - strip away need for dos2unix conversions
> - strip away need for autotools dance
> - removes autotools fix, as this actually prevents the
> bundled configure from working, or rather the generated Makefile
> detects the modified file in ${WRKSRC}/autotools and tries to
> run aclocal-1.15 and...everything breaks
> - still needs manual patch to remove $(LIBS) from being added to
> the data directory Makefile, I couldn't figure out how to stop it
> any other way :/
> - stopped using --without-cpu-opt, it is OK with ports like this(games)
> using -O2 now if i recall correctly?
> - passes portcheck
> - builds and runs great on amd64
>
> Thanks to lea.chescotta _at_ tutanota [dot] com for the reminder that this
> port was a version behind.
>
> Comments? OK?
Ping.
> Cheers,
> -ryan
>
>
> ? prboom-plus.diff
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/prboom-plus/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 28 Sep 2017 22:40:01 - 1.3
> +++ Makefile 10 May 2018 07:14:56 -
> @@ -1,8 +1,7 @@
> # $OpenBSD: Makefile,v 1.3 2017/09/28 22:40:01 naddy Exp $
>
> COMMENT =enhanced version the PrBoom Doom engine
> -DISTNAME = prboom-plus-2.5.1.3
> -REVISION = 1
> +DISTNAME = prboom-plus-2.5.1.4
> CATEGORIES = games x11
>
> HOMEPAGE = http://prboom-plus.sourceforge.net/
> @@ -12,9 +11,7 @@ MAINTAINER =Ryan Freeman # GPLv2+
> PERMIT_PACKAGE_CDROM = Yes
>
> -BUILD_DEPENDS = archivers/unzip \
> - ${MODGNU_AUTOCONF_DEPENDS} \
> - ${MODGNU_AUTOMAKE_DEPENDS}
> +BUILD_DEPENDS = archivers/unzip
>
> WANTLIB += SDL c m pthread GL GLU SDL_mixer SDL_net
>
> @@ -24,23 +21,10 @@ LIB_DEPENDS = devel/sdl-mixer \
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=prboom-plus/}
>
> CONFIGURE_STYLE =gnu
> -AUTOCONF_VERSION = 2.65
> -AUTOMAKE_VERSION = 1.9
> -CONFIGURE_ARGS +=--disable-cpu-opt \
> - --with-waddir=${TRUEPREFIX}/share/doom
> +CONFIGURE_ARGS +=--with-waddir=${TRUEPREFIX}/share/doom
> CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
> -MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
>
> FAKE_FLAGS +=gamesdir=${PREFIX}/bin \
> docdir=${PREFIX}/share/doc/prboom-plus
> -
> -post-extract:
> - @perl -MExtUtils::Command -e dos2unix ${WRKSRC}/*
> -
> -pre-configure:
> - @cd ${WRKSRC} && \
> - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
> - AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> - sh bootstrap && chmod 0755 ./configure
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/prboom-plus/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 18 Jan 2015 03:14:01 - 1.2
> +++ distinfo 10 May 2018 07:14:56 -
> @@ -1,2 +1,2 @@
> -SHA256 (prboom-plus-2.5.1.3.tar.gz) =
> CkBvqdJ1+96Ur89ybL/206Ai+DtBPb+20TGHLkZCZo8=
> -SIZE (prboom-plus-2.5.1.3.tar.gz) = 1465003
> +SHA256 (prboom-plus-2.5.1.4.tar.gz) =
> 4OIkHRdIObEH8aQrGRqpiV3GdJ5HfLyFCtUg+6I1O5Q=
> +SIZE (prboom-plus-2.5.1.4.tar.gz) = 1627558
> Index: patches/patch-autotools_ac_c_compile_flags_m4
> ===
> RCS file: patches/patch-autotools_ac_c_compile_flags_m4
> diff -N patches/patch-autotools_ac_c_compile_flags_m4
> --- patches/patch-autotools_ac_c_compile_flags_m4 28 Sep 2017 22:40:01
> - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-autotools_ac_c_compile_flags_m4,v 1.1 2017/09/28 22:40:01
> naddy Exp $
> -
> -Index: autotools/ac_c_compile_flags.m4
> autotools/ac_c_compile_flags.m4.orig
> -+++ autotools/ac_c_compile_flags.m4
> -@@ -5,7 +5,6 @@ do
> - AC_MSG_CHECKING(whether compiler supports $ac_flag)
> - CFLAGS="$NEW_CFLAGS $ac_flag"
> - AC_TRY_COMPILE(,[
> -- void f() {};
> - ],[
> - NEW_CFLAGS="$CFLAGS"
> - AC_MSG_RESULT(yes)
> Index: patches/patch-data_Makefile_am
> ===
> RCS file: patches/patch-data_Makefile_am
> diff -N patches/patch-data_Makefile_am
> --- patches/patch-data_Makefile_am28 Sep 2017 22:40:01 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-data_Makefile_am,v 1.2 2017/09/28 22:40:01 naddy Exp $
> -Index: data/Makefile.am
> data/Makefile.am.orig
> -+++ data/Makefile.am
> -@@ -7,6 +7,6 @@ wad_DATA=prboom-plus.w
Re: NEW: databases/lmdb
On Wed May 30, 2018 at 03:56:59PM +0100, Stuart Henderson wrote:
> On 2018/05/30 16:25, Rafael Sadowski wrote:
> > On Wed May 30, 2018 at 03:55:10PM +0200, Rafael Sadowski wrote:
> > > Please find attached an new tarball with following changes:
> > >
> > > - Use MDB_WRITEMAP (hint from jca@ and sthen@.
> > > -- All tests runs fine now
> > > - replace OpenLDAP with Symas in COMMENT by Raf Czlonka
> > >
> > > After import we can patch net/knot to use databases/lmdb.
> >
> > Okay knot automatically picks lmdb if it's installed. Patch below.
>
> 2 sumbols are removed from libknot if built against external lmdb.
>
Thanks for pointing that out.
New diff to update both consumers knot and baloo. Baloo needs EPOCH to
update from 15.04.26 to 5.46.0.
knot tests still green and baloo doesn't have any consumers right now.
Index: devel/kf5/Makefile
===
RCS file: /cvs/ports/devel/kf5/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- devel/kf5/Makefile 4 Jun 2018 20:25:31 - 1.12
+++ devel/kf5/Makefile 4 Jun 2018 20:39:13 -
@@ -69,7 +69,7 @@ SUBDIR += kxmlrpcclient # 100% tests pa
SUBDIR += kdeclarative # 100% tests passed, 0 tests failed out of 2
SUBDIR += kcmutils # NO_TEST
SUBDIR += kdewebkit# NO_TEST
-SUBDIR += baloo# 68% tests passed, 6 tests failed out
of 19
+SUBDIR += baloo# NO_TEST
SUBDIR += kdesignerplugin # 100% tests passed, 0 tests failed out of 2
SUBDIR += knotifyconfig# NO_TEST
SUBDIR += ktexteditor # 98% tests passed, 1 tests failed out of 66
Index: devel/kf5/baloo/Makefile
===
RCS file: /cvs/ports/devel/kf5/baloo/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- devel/kf5/baloo/Makefile14 Feb 2018 20:22:01 - 1.11
+++ devel/kf5/baloo/Makefile4 Jun 2018 20:39:13 -
@@ -1,64 +1,34 @@
# $OpenBSD: Makefile,v 1.11 2018/02/14 20:22:01 rsadowski Exp $
COMMENT = KDE file search and metadata handling framework
-VERSION = 15.04.26
DISTNAME = baloo-${VERSION}
PKGNAME = kf5-${DISTNAME}
-REVISION = 5
+EPOCH =0
-SHARED_LIBS = KF5Baloo1.0
-SHARED_LIBS += KF5BalooXapian 1.0
+SHARED_LIBS = KF5Baloo 2.0
+SHARED_LIBS += KF5BalooXapian2.0
+SHARED_LIBS += KF5BalooEngine0.0 # 5.46
-#
-# Modern version requires LMDB, see databases/openldap/Makefile,
-# so we create our own tarball with sources for repository revision
-# cc72568cb2262355fd53745ea61ba8554bc87466
-#
-# Warning: if other frameworks will start to depend on baloo,
-# kf5.port.mk auto-kf5-dep-versioning will need adjusting.
-#
+WANTLIB += ${COMPILER_LIBCXX} KF5ConfigCore KF5CoreAddons KF5FileMetaData
+WANTLIB += KF5I18n KF5Solid Qt5Core Qt5DBus Qt5Network Qt5Qml
+WANTLIB += lmdb m
-MASTER_SITES = http://www.ohvost.ru/dnl/
-EXTRACT_SUFX = .tar.gz
-
-WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5Bookmarks KF5Codecs KF5Completion
-WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons
-WANTLIB += KF5Crash KF5DBusAddons KF5FileMetaData KF5GuiAddons
-WANTLIB += KF5I18n KF5IconThemes KF5IdleTime KF5ItemViews KF5JobWidgets
-WANTLIB += KF5KDELibs4Support KF5KIOCore KF5KIOFileWidgets KF5KIOWidgets
-WANTLIB += KF5Notifications KF5Parts KF5Service KF5Solid KF5SonnetUi
-WANTLIB += KF5TextWidgets KF5UnitConversion KF5WidgetsAddons KF5WindowSystem
-WANTLIB += KF5XmlGui Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Qml Qt5Sql Qt5Widgets Qt5Xml c m xapian
-
-BUILD_DEPENDS =devel/gettext-tools
+BUILD_DEPENDS =devel/gettext-tools \
+ devel/kf5/kidletime \
+ devel/kf5/kio \
+ devel/kf5/kcrash
-RUN_DEPENDS = x11/dbus,-suid \
+RUN_DEPENDS = devel/kf5/kidletime \
+ devel/kf5/kio \
+ devel/kf5/kcrash \
x11/gtk+3,-guic
-LIB_DEPENDS = databases/xapian-core \
- devel/kf5/kauth \
+LIB_DEPENDS = databases/lmdb \
devel/kf5/kconfig \
- devel/kf5/kcrash \
- devel/kf5/kdbusaddons \
- devel/kf5/kdelibs4support \
devel/kf5/kfilemetadata \
devel/kf5/ki18n \
- devel/kf5/kidletime \
- devel/kf5/kio \
devel/kf5/solid \
+ devel/kf5/kcoreaddons \
x11/qt5/qtdeclarative
-
-CONFIGURE_ARGS += -DCMAKE_POLICY_DEFAULT_CMP0063=OLD
-
-# TODO: The following tests FAILED:
-# 11 - filewatchtest (Failed)
-# 18 - schedulertest (Failed)
-# 19 - extractortest (Failed)
-#
-# TODO: implement filewatch.cpp using QFileSystemWatcher
-
-PORTHOME = ${WRKDIR}
-TEST_IS_INTERACTIVE = X11
.include
Index: devel/kf5/ba
Re: NEW: devel/py-progressbar2 and devel/py-python_utils
The changes have been made as requested.
I also updated my vimrc to prevent the spacing issue going forward.
On 2018-06-03 20:41, Stuart Henderson wrote:
On 2018/06/03 17:19, Edward Lopez-Acosta wrote:
Hello,
Had a previous thread on this but the packages had some errors. Sorry if I
should have replied to that thread, still getting used to the mailing list.
py-progressbar is a separate port unrelated to this one. They are not
compatible nor does this one upgrade it.
I have attached the latest tarballs for these ports.
Would it be possible to please get some testing and a dev to merge this into
the ports tree if all is well?
Thank you in advance.
Just commenting on progressbar2, but the same things apply to python-utils:
:: # $OpenBSD$
::
:: COMMENT = Python library to provide visual progress
line up after the = with tabs not spaces (here and on other lines)
(8 column tab width)
::
:: DISTNAME = progressbar2-${MODPY_EGG_VERSION}
:: PKGNAME =${MODPY_PY_PREFIX}${DISTNAME}
no need to use ${MODPY_PY_PREFIX}, this is handled automatically. just set
PKGNAME = py-${DISTNAME}
::
:: CATEGORIES = devel
::
:: # BSD 3-clause
:: PERMIT_PACKAGE_CDROM = Yes
::
:: MODULES =lang/python
:: TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}, \
shouldn't have the trailing , (same in RUN_DEPENDS)
:: devel/py-six${MODPY_FLAVOR}
similar to "=", at the start of a line just use tabs
::
:: FLAVORS += python3
:: FLAVOR ?=
::
:: NO_BUILD = Yes
::
:: PKG_ARCH = *
for standard python ports don't use NO_BUILD (they do usually do something
in the "build" stage which just gets pushed out to the "install" stage if you
skip build), or PKG_ARCH=*.
::
:: MODPY_EGG_VERSION = 3.37.1
please put this up the top with DISTNAME
:: MODPY_SETUPTOOLS = Yes
:: MODPY_PI = Yes
:: RUN_DEPENDS = devel/py-python_utils${MODPY_FLAVOR}, \
::devel/py-six${MODPY_FLAVOR}
try to line columns up a bit more, you won't get it to be
perfect without wasting a lot of horizontal space, but as you'll see
in other ports they're generally consistent within a block of lines
next to each other
::
:: .include
In pkg/PLIST ${MODPY_COMMENT} should only be on the line for the
directory i.e.
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/progressbar/${MODPY_PYCACHE}
Basically ${MODPY_PYCACHE} expands to nothing in py2 (because the .pyc files
are right alongside the .py files in the same directory), and something in py3
(a subdirectory is used). ${MODPY_COMMENT} is used to knock out that
subdirectory
line for py2 packages to avoid a duplicate entry in PLIST.
So with the extra lines with ${MODPY_COMMENT} in your port, you're
removing the pyc files from the py2 package, but those files should be
installed.
py-progressbar2.tar.gz
Description: GNU Zip compressed data
py-python_utils.tar.gz
Description: GNU Zip compressed data
Re: update openldap to use modules
Any more thoughts on this? Other changes you'd like to see or concerns
addressed before considering incorporating it?
Thanks...
On Thu, May 24, 2018 at 03:39:38PM -0700, Paul B. Henson wrote:
> So it doesn't look like upstream is going to bite on removing the
> version numbers from the dynamically loadable modules, so here is an
> updated diff that includes a patch to do so and also installs the
> sample config file. It doesn't look like we can get rid of the aci
> flavor after all, if you try to build that as a module rather than
> bundled it fails and says that functionality does not support being a
> dynamically loaded module at this time.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/openldap/Makefile,v
> retrieving revision 1.161
> diff -u -p -r1.161 Makefile
> --- Makefile12 Jan 2018 00:36:28 - 1.161
> +++ Makefile24 May 2018 22:38:07 -
> @@ -9,7 +9,7 @@ DISTNAME = openldap-2.4.45
> PKGNAME-main = ${DISTNAME:S/-/-client-/}
> PKGNAME-server = ${DISTNAME:S/-/-server-/}
> REVISION = 4
> -REVISION-server = 5
> +REVISION-server = 6
>
> # overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
> FULLPKGNAME-main = ${DISTNAME:S/-/-client-/}${FLAVOR_EXT:S/-aci//}
> @@ -32,7 +32,7 @@ MAINTAINER = Stuart Henderson # OpenLDAP Public License
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += c crypto ssl
> +WANTLIB += c crypto ltdl ssl
>
> MASTER_SITES = http://mirror.switch.ch/ftp/mirror/OpenLDAP/openldap-release/
> \
>
> http://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
> @@ -58,6 +58,7 @@ CONFIGURE_ARGS += --enable-ipv6 \
>
> # slapd options
> CONFIGURE_ARGS += --enable-slapd \
> + --enable-modules \
> --enable-cleartext \
> --enable-crypt \
> --enable-rewrite \
> @@ -65,17 +66,19 @@ CONFIGURE_ARGS += --enable-slapd \
> --enable-spasswd
>
> # slapd modules
> -CONFIGURE_ARGS += --enable-bdb \
> - --enable-dnssrv \
> - --enable-hdb \
> - --enable-ldap \
> - --enable-meta \
> - --enable-monitor \
> - --enable-null \
> - --enable-overlays \
> - --enable-passwd \
> - --enable-perl \
> - --enable-shell
> +CONFIGURE_ARGS += --enable-bdb=mod \
> + --enable-dnssrv=mod \
> + --enable-hdb=mod \
> + --enable-ldap=mod \
> + --enable-meta=mod \
> + --enable-monitor=mod \
> + --enable-null=mod \
> + --enable-overlays=mod \
> + --enable-passwd=mod \
> + --enable-perl=mod \
> + --enable-relay=mod \
> + --enable-shell=mod \
> + --enable-sock=mod
>
> # Enable MDB support, however note patch-servers_slapd_back-mdb_init_c.
> #
> @@ -90,7 +93,7 @@ CONFIGURE_ARGS += --enable-bdb \
> # Therefore, the patch rejects an MDB configuration in which writemap
> # has not been set.
> #
> -CONFIGURE_ARGS += --enable-mdb
> +CONFIGURE_ARGS += --enable-mdb=mod
>
> .if ${FLAVOR:Maci}
> CONFIGURE_ARGS += --enable-aci
> @@ -113,7 +116,8 @@ MULTI_PACKAGES =-main -server
>
> # formatting is ok with mandoc, but soelim is used at build time
> BUILD_DEPENDS += textproc/groff
> -LIB_DEPENDS += security/cyrus-sasl2
> +LIB_DEPENDS += security/cyrus-sasl2 \
> + devel/libtool,-ltdl
> WANTLIB += pthread sasl2
> CPPFLAGS +=-I${LOCALBASE}/include/sasl
>
> @@ -123,7 +127,7 @@ LIB_DEPENDS-server =${LIB_DEPENDS-main}
> databases/db/v4,no_java,no_tcl
>
> CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include/sasl
> -I${LOCALBASE}/include/db4 -I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib/db4 -L${LOCALBASE}/lib"
> + LDFLAGS="-L${LOCALBASE}/lib/db4 -L${LOCALBASE}/lib
> -Wl,--export-dynamic"
>
> RUN_DEPENDS-server = databases/openldap,-main
> WANTLIB-server += ${WANTLIB} perl m icudata icuuc uuid
> Index: patches/patch-build_top_mk
> ===
> RCS file: /cvs/ports/databases/openldap/patches/patch-build_top_mk,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-build_top_mk
> --- patches/patch-build_top_mk 7 Jan 2011 10:24:30 - 1.6
> +++ patches/patch-build_top_mk 24 May 2018 22:38:07 -
> @@ -1,7 +1,16 @@
> $OpenBSD: patch-build_top_mk,v 1.6 201
[update] lang/node to 8.11.2
Hi,
Here is an update that brings node to the latest. Tests have been merged
upstream (still 4 failures in 'make test').
- Regen patches.
- Update PLIST to remove .orig entries (pointed out by espie@).
- Add a new patch to remove this workaround[1] until the API is exposed
(9.x already has it).
All my tests run fine.
OK?
diff --git a/lang/node/Makefile b/lang/node/Makefile
index 2d7bc75396b..d40b29ab10c 100644
--- a/lang/node/Makefile
+++ b/lang/node/Makefile
@@ -10,14 +10,13 @@ USE_WXNEEDED = Yes
COMMENT = V8 JavaScript for clients and servers
-NODE_VERSION = v8.11.1
+NODE_VERSION = v8.11.2
PLEDGE_VER = 1.1.0
DISTFILES =node-pledge-{}${PLEDGE_VER}.tar.gz:0 ${DISTNAME}.tar.gz
DISTNAME = node-${NODE_VERSION}
PKGNAME = ${DISTNAME:S/v//g}
-REVISION = 0
MASTER_SITES0 =https://github.com/qbit/node-pledge/archive/
diff --git a/lang/node/distinfo b/lang/node/distinfo
index a7419d536f9..9e3d0608f1e 100644
--- a/lang/node/distinfo
+++ b/lang/node/distinfo
@@ -1,4 +1,4 @@
SHA256 (node-pledge-1.1.0.tar.gz) =
BuKnrXSkqpTb5Tfap1AHk+l7ucTJLEWbMFNbgQkNBsw=
-SHA256 (node-v8.11.1.tar.gz) = hmeAKPE7Js7tCO/EuDiSHKG/UUwLfoFRv+yLoVxeZq0=
+SHA256 (node-v8.11.2.tar.gz) = CsLE3icMqgi1rc2zxry4quNlGjfQNdOFvIGfusrzUOY=
SIZE (node-pledge-1.1.0.tar.gz) = 2560
-SIZE (node-v8.11.1.tar.gz) = 31030225
+SIZE (node-v8.11.2.tar.gz) = 3468
diff --git a/lang/node/patches/patch-Makefile b/lang/node/patches/patch-Makefile
index 2f76660236f..ab82d70ed61 100644
--- a/lang/node/patches/patch-Makefile
+++ b/lang/node/patches/patch-Makefile
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.5 2018/02/10 14:50:35 abieber Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -100,7 +100,7 @@ out/Makefile: common.gypi deps/uv/uv.gyp deps/http_par
+@@ -101,7 +101,7 @@ out/Makefile: common.gypi deps/uv/uv.gyp deps/http_par
config.gypi: configure
$(error Missing or stale $@, please run ./$<)
@@ -11,7 +11,7 @@ Index: Makefile
$(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)'
uninstall: ## Uninstalls node from $PREFIX (default=/usr/local).
-@@ -247,7 +247,6 @@ test-cov: all
+@@ -248,7 +248,6 @@ test-cov: all
$(PYTHON) tools/test.py --mode=release -J \
$(CI_JS_SUITES) \
$(CI_NATIVE_SUITES)
@@ -19,7 +19,7 @@ Index: Makefile
test-parallel: all
$(PYTHON) tools/test.py --mode=release parallel -J
-@@ -326,6 +325,12 @@ test/addons/.buildstamp: config.gypi \
+@@ -327,6 +326,12 @@ test/addons/.buildstamp: config.gypi \
# Just goes to show that recursive make really is harmful...
# TODO(bnoordhuis) Force rebuild after gyp update.
build-addons: | $(NODE_EXE) test/addons/.buildstamp
diff --git a/lang/node/patches/patch-common_gypi
b/lang/node/patches/patch-common_gypi
index e5ee1065543..459281bf4cb 100644
--- a/lang/node/patches/patch-common_gypi
+++ b/lang/node/patches/patch-common_gypi
@@ -2,7 +2,7 @@ $OpenBSD: patch-common_gypi,v 1.9 2018/02/10 14:50:35 abieber
Exp $
Index: common.gypi
--- common.gypi.orig
+++ common.gypi
-@@ -425,6 +425,10 @@
+@@ -426,6 +426,10 @@
'ldflags': [
'-Wl,--export-dynamic',
],
diff --git a/lang/node/patches/patch-deps_uv_src_unix_openbsd_c
b/lang/node/patches/patch-deps_uv_src_unix_openbsd_c
index 7fad2140cba..ed5c8b4c61a 100644
--- a/lang/node/patches/patch-deps_uv_src_unix_openbsd_c
+++ b/lang/node/patches/patch-deps_uv_src_unix_openbsd_c
@@ -20,7 +20,7 @@ Index: deps/uv/src/unix/openbsd.c
#include
#include
#include
-@@ -61,12 +63,53 @@ void uv_loadavg(double avg[3]) {
+@@ -68,12 +70,53 @@ void uv_loadavg(double avg[3]) {
}
@@ -75,7 +75,7 @@ Index: deps/uv/src/unix/openbsd.c
pid_t mypid;
int err;
-@@ -94,18 +137,11 @@ int uv_exepath(char* buffer, size_t* size) {
+@@ -101,18 +144,11 @@ int uv_exepath(char* buffer, size_t* size) {
argsbuf_size *= 2U;
}
diff --git a/lang/node/patches/patch-deps_v8_Makefile
b/lang/node/patches/patch-deps_v8_Makefile
index 59ce4d0e43f..4d7f24ba9a2 100644
--- a/lang/node/patches/patch-deps_v8_Makefile
+++ b/lang/node/patches/patch-deps_v8_Makefile
@@ -2,7 +2,7 @@ $OpenBSD: patch-deps_v8_Makefile,v 1.4 2018/02/10 14:50:35
abieber Exp $
Index: deps/v8/Makefile
--- deps/v8/Makefile.orig
+++ deps/v8/Makefile
-@@ -432,7 +432,7 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
+@@ -436,7 +436,7 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
$(eval V8_TARGET_ARCH:=$(subst .,,$(suffix $(basename $@
PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell
pwd)/gypfiles:$(PYTHONPATH):$(shell pwd)/tools/gyp/pylib:$(PYTHONPATH)" \
GYP_GENERATORS=make \
@@ -11,7 +11,7 @@ Index: deps/v8/Makefile
-Igypfiles/standalone.gypi --depth=. \
-Dv8_target_arch=$(V8_TARGET_ARCH) \
$(if $(findstring $(CXX_TARGET_ARCH),$(V8_TARGET
NEW: sysutils/cpdup
Hi ports -- Attached is a new port, sysutils/cpdup. cpdup is a utility to mirror filesystems, directories, and files. --- pkg/DESCR: The cpdup utility makes an exact mirror copy of the source in the destination, creating and deleting files and directories as necessary. UTimes, hardlinks, softlinks, devices, permissions, and flags are mirrored. By default, cpdup asks for confirmation if any file or directory needs to be removed from the destination and does not copy files which it believes to have already been synchronized (by observing that the source and destination files' sizes and mtimes match). cpdup does not cross mount points in either the source or the destination. As a safety measure, cpdup refuses to replace a destination directory with a file. It is a port of the cpdup utility from DragonFly BSD. --- Tested with local copying only on amd64 and armv7, which worked fine. Network tests would be appreciated if that's your thing. OK? ~Brian cpdup.tgz Description: Binary data
NEW: sysutils/tabs
Hi ports -- Attached is a new port, sysutils/tabs. tabs is a utility to set terminal tabs. --- pkg/DESCR: The tabs utility displays a series of characters that clear the hardware terminal tab settings then initialises tab stops at specified positions, and optionally adjusts the margin. It is a port of the tabs utility from DragonFly BSD. --- This one is pretty blind; I don't use the utility and didn't bother to try it so I can only confirm that it builds ok. I saw it posted tech@ a few days ago and thought it was silly the original uploader couldn't be bothered to make an actual port. OK? ~Brian tabs.tgz Description: Binary data
[update] sysutils/tarsnap-gui
Update to v1.0.1 - "This is a small release which fixes build problems with Qt 5.10 and 5.11." Index: Makefile === RCS file: /systems/cvs/ports/sysutils/tarsnap-gui/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile5 Aug 2017 13:54:19 - 1.11 +++ Makefile5 Jun 2018 03:26:22 - @@ -4,7 +4,7 @@ COMMENT = frontend to the popular Tarsn GH_ACCOUNT = Tarsnap GH_PROJECT = tarsnap-gui -GH_TAGNAME = v1.0 +GH_TAGNAME = v1.0.1 CATEGORIES = sysutils Index: distinfo === RCS file: /systems/cvs/ports/sysutils/tarsnap-gui/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo5 Aug 2017 13:54:19 - 1.5 +++ distinfo5 Jun 2018 03:33:17 - @@ -1,2 +1,2 @@ -SHA256 (tarsnap-gui-1.0.tar.gz) = zSHSqF8HPnLxCQBjL9y0mVaYUlWlcR+09tQ0QzsJ2sk= -SIZE (tarsnap-gui-1.0.tar.gz) = 582190 +SHA256 (tarsnap-gui-1.0.1.tar.gz) = UC5TpOrLJ5W/vmK55u8jbM5v20PLFRU8D8StYcFh65c= +SIZE (tarsnap-gui-1.0.1.tar.gz) = 582263
Re: [update] sysutils/tarsnap-gui
On Mon, Jun 04, 2018 at 11:46:01PM -0400, Josh Grosse wrote: > Update to v1.0.1 - "This is a small release which > fixes build problems with Qt 5.10 and 5.11." Neglected to mention: tested on amd64.
Re: [MAINTAINER] security update net/prosody to 0.10.2
On Mon, Jun 04, 2018 at 10:50:46PM +0200, Henrik Friedrichsen wrote: > On Mon, Jun 04, 2018 at 09:52:10PM +0200, Landry Breuil wrote: > > I'm commiting your diff, but patches/patch-core_certmanager_lua was > > already commited in january. Update your tree before generating diffs.. > > Odd, I did run cvs up on the tree before working on it. Will make sure it's > recent next time. In that case, cvs up has probably complained that a file was already present or something..
Re: [patch] audio/openal: ugly update to 1.18.2
On Mon, Jun 04, 2018 at 08:37:15PM +0300, Leonid Bobrov wrote:
> But input device is detected, I get crash when trying to
> record my voice.
I installed utox, it doesn't crash with the diff below anymore. The
"Preview" button in the "Audio & Video" settings records my voice.
AFAICS, the interface didn't change, so the recording bits should work
with newer versions of openal as well (I didn't test).
While working on this, I noticed the playback bits need some polishing
as well, but that's for later. You mentioned there are
playback-related crashes, do you have a simple reproducer?
Index: Makefile
===
RCS file: /cvs/ports/audio/openal/Makefile,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 Makefile
--- Makefile31 Dec 2017 18:46:26 - 1.50
+++ Makefile5 Jun 2018 05:38:16 -
@@ -10,7 +10,7 @@ DISTNAME =openal-soft-$V
PKGNAME = openal-$V
CATEGORIES = audio
SHARED_LIBS = openal 3.0
-REVISION = 0
+REVISION = 1
HOMEPAGE = http://kcat.strangesoft.net/openal.html
Index: patches/patch-Alc_backends_sndio_c
===
RCS file: patches/patch-Alc_backends_sndio_c
diff -N patches/patch-Alc_backends_sndio_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Alc_backends_sndio_c 5 Jun 2018 05:38:16 -
@@ -0,0 +1,362 @@
+$OpenBSD$
+
+Index: Alc/backends/sndio.c
+--- Alc/backends/sndio.c.orig
Alc/backends/sndio.c
+@@ -42,16 +42,18 @@ static ALCboolean sndio_load(void)
+
+ typedef struct {
+ struct sio_hdl *sndHandle;
++int mode;
+
+ ALvoid *mix_data;
+ ALsizei data_size;
+
++ll_ringbuffer_t *ring;
++
+ volatile int killNow;
+ althrd_t thread;
+ } sndio_data;
+
+-
+-static int sndio_proc(void *ptr)
++static int sndio_proc_playback(void *ptr)
+ {
+ ALCdevice *device = ptr;
+ sndio_data *data = device->ExtraData;
+@@ -89,53 +91,22 @@ static int sndio_proc(void *ptr)
+ return 0;
+ }
+
+-
+-
+-static ALCenum sndio_open_playback(ALCdevice *device, const ALCchar
*deviceName)
++static ALCboolean sndio_setparams(ALCdevice *device)
+ {
+-sndio_data *data;
+-
+-if(!deviceName)
+-deviceName = sndio_device;
+-else if(strcmp(deviceName, sndio_device) != 0)
+-return ALC_INVALID_VALUE;
+-
+-data = calloc(1, sizeof(*data));
+-data->killNow = 0;
+-
+-data->sndHandle = sio_open(NULL, SIO_PLAY, 0);
+-if(data->sndHandle == NULL)
+-{
+-free(data);
+-ERR("Could not open device\n");
+-return ALC_INVALID_VALUE;
+-}
+-
+-al_string_copy_cstr(&device->DeviceName, deviceName);
+-device->ExtraData = data;
+-
+-return ALC_NO_ERROR;
+-}
+-
+-static void sndio_close_playback(ALCdevice *device)
+-{
+ sndio_data *data = device->ExtraData;
+-
+-sio_close(data->sndHandle);
+-free(data);
+-device->ExtraData = NULL;
+-}
+-
+-static ALCboolean sndio_reset_playback(ALCdevice *device)
+-{
+-sndio_data *data = device->ExtraData;
+ struct sio_par par;
++unsigned int nch;
+
+ sio_initpar(&par);
+
+ par.rate = device->Frequency;
+-par.pchan = ((device->FmtChans != DevFmtMono) ? 2 : 1);
++nch = ((device->FmtChans != DevFmtMono) ? 2 : 1);
+
++if (data->mode & SIO_PLAY)
++ par.pchan = nch;
++else if (data->mode & SIO_REC)
++ par.rchan = nch;
++
+ switch(device->FmtType)
+ {
+ case DevFmtByte:
+@@ -182,8 +153,10 @@ static ALCboolean sndio_reset_playback(ALCdevice *devi
+ return ALC_FALSE;
+ }
+
++nch = (data->mode & SIO_PLAY) ? par.pchan : par.rchan;
++
+ device->Frequency = par.rate;
+-device->FmtChans = ((par.pchan==1) ? DevFmtMono : DevFmtStereo);
++device->FmtChans = ((nch == 1) ? DevFmtMono : DevFmtStereo);
+
+ if(par.bits == 8 && par.sig == 1)
+ device->FmtType = DevFmtByte;
+@@ -211,6 +184,47 @@ static ALCboolean sndio_reset_playback(ALCdevice *devi
+ return ALC_TRUE;
+ }
+
++static ALCenum sndio_open_playback(ALCdevice *device, const ALCchar
*deviceName)
++{
++sndio_data *data;
++
++if(!deviceName)
++deviceName = sndio_device;
++else if(strcmp(deviceName, sndio_device) != 0)
++return ALC_INVALID_VALUE;
++
++data = calloc(1, sizeof(*data));
++data->killNow = 0;
++
++data->mode = SIO_PLAY;
++data->sndHandle = sio_open(NULL, data->mode, 0);
++if(data->sndHandle == NULL)
++{
++free(data);
++ERR("Could not open device\n");
++return ALC_INVALID_VALUE;
++}
++
++al_string_copy_cstr(&device->DeviceName, deviceName);
++device->ExtraData = data;
++
++return ALC_NO_ERROR;
++}
++
++static void sndio_close_playback(ALCdevice *device)
++{
++sndio_data *data = device->ExtraData;
++
++sio_close(data->sndHandle);
++free(data);
++device->ExtraData = NULL;
++}
++
++static ALCboolean sndio_reset_playback(ALCdevice *device)
++{
devel/cvsweb: add mkdir /var/www/dev to README script
Hi, cvsweb touts that: "You can run this README directly with sh(1)", but /var/www/dev isn't present on systems by default. This (admittedly trivial) diff adds dev to the mkdir command. Then passing the README to sh(1) succeeds. Interest in adding this? Index: pkg/README === RCS file: /cvs/ports/devel/cvsweb/pkg/README,v retrieving revision 1.14 diff -u -p -r1.14 README --- pkg/README 1 Mar 2017 11:56:05 - 1.14 +++ pkg/README 5 Jun 2018 06:13:25 - @@ -15,7 +15,7 @@ # First, create the basic directory structure: cd /var/www -mkdir -p tmp usr +mkdir -p tmp usr dev chown www:www tmp # needs to be writeable for the www user cd /var/www/usr
