Re: [new] graphics/yacreader + deps: qt comics reader
Dimitri Karamazov writes:
> Some changes
>
> * Missing upstream library version (unarr).
> * Wantlib was somewhat different in my case - No Qt5OpenGL,Qt5Script
> but Qt5Svg is required (must recheck).
> * Changed the file distribution to be more like release.
> * PLIST was missing some files.
>
> Otherwise works fine for me on amd64.
Thanks for testing!
I don't know how I messed up with the wantlib (probably they changed
with the 9.8.0 update and I forgot to recheck), apologies; rebuilt and
re-checked, and now it's OK.
Thanks also for tidying the do-install target, and making me discover
pax(1)!
> Unarr--
>
> -DISTNAME = unarr-1.0.1
> +V = 1.0.1
> +DISTNAME = unarr-${V}
>
> -SHARED_LIBS =unarr 0.0
> +SHARED_LIBS =unarr 0.0 # 1.0.0
>
> -HOMEPAGE = https://github.com/selmf/unarr
> +HOMEPAGE = https://github.com/selmf/unarr/
>
> -WANTLIB = bz2 lzma z
> +WANTLIB += bz2 lzma z
>
> -MASTER_SITES =
> https://github.com/selmf/unarr/releases/download/v1.0.1/
> +MASTER_SITES = ${HOMEPAGE:=releases/download/v${V}/}
>
> Yacreader--
> -COMMENT =comics reader
> +COMMENT =read and manage your digital comic collection
>
> -DISTNAME = yacreader-9.8.0.2105165-src
> -PKGNAME =yacreader-9.8.0
> +V = 9.8.0
> +DISTNAME = yacreader-${V}.2105165-src
> +PKGNAME =yacreader-${V}
>
> -WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Multimedia
> -WANTLIB += Qt5OpenGL Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets Qt5Script
> -WANTLIB += Qt5Sql Qt5Widgets c m poppler-qt5 unarr
> +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Multimedia
> +WANTLIB += Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets
> +WANTLIB += Qt5Sql Qt5Svg Qt5Widgets c m poppler-qt5 unarr
>
> -MASTER_SITES =
> https://github.com/YACReader/yacreader/releases/download/9.8.0/
> +MASTER_SITES = https://github.com/YACReader/yacreader/releases/download/${V}/
>
> - x11/qt5/qtscript
> + x11/qt5/qtsvg
>
> -WRKDIST =${WRKDIR}/yacreader-9.8.0.2105165
> +WRKDIST =${WRKDIR}/${DISTNAME:S/-src//}
>
> do-install:
> - ${INSTALL_PROGRAM} ${WRKBUILD}/YACReader/YACReader \
> - ${PREFIX}/bin/YACReader
> - ${INSTALL_PROGRAM} ${WRKBUILD}/YACReaderLibrary/YACReaderLibrary \
> - ${PREFIX}/bin/YACReaderLibrary
> - ${INSTALL_PROGRAM} \
> - ${WRKBUILD}/YACReaderLibraryServer/YACReaderLibraryServer \
> - ${PREFIX}/bin/YACReaderLibraryServer
> - ${INSTALL_MAN} ${WRKSRC}/YACReader{,Library}.1 \
> - ${PREFIX}/man/man1
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> +.for bin in YACReader YACReaderLibrary YACReaderLibraryServer
> + ${INSTALL_PROGRAM} ${WRKBUILD}/${bin}/${bin} ${PREFIX}/bin
> +.endfor
> + ${INSTALL_MAN} ${WRKSRC}/YACReader{,Library}.1 ${PREFIX}/man/man1
> +.for dir in applications icons/hicolor/scalable/apps yacreader
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/${dir}
> +.endfor
> ${INSTALL_DATA} ${WRKSRC}/YACReader{,Library}.desktop \
> ${PREFIX}/share/applications
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/scalable/apps
> ${INSTALL_DATA} ${WRKSRC}/YACReader{,Library}.svg \
> ${PREFIX}/share/icons/hicolor/scalable/apps
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/yacreader/languages
> - ${INSTALL_DATA} ${WRKSRC}/release/languages/*.qm \
> - ${PREFIX}/share/yacreader/languages/
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/yacreader/server
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/yacreader/server/{docroot,templates}
> - ${INSTALL_DATA} \
> - ${WRKSRC}/release/server/docroot/{css/*,images/*,*.html} \
> - ${PREFIX}/share/yacreader/server/docroot
> - ${INSTALL_DATA} ${WRKSRC}/release/server/templates/*.tpl \
> - ${PREFIX}/share/yacreader/server/templates
> + cd ${WRKSRC}/release && pax -rw . ${PREFIX}/share/yacreader
Re: mail/py-authres, mail/py-spf, mail/py-policyd-spf - Remove?
On 5/26/21 4:59 AM, J Doe wrote: > On 2021-05-25 10:44 p.m., Daniel Jakots wrote: >> On Wed, 27 Nov 2019 11:00:07 +, Stuart Henderson >> wrote: >> >>> On 2019/11/26 19:08, Kurt Mosiejczuk wrote: These 3 are python2-only, and the only consumers are in a chain from one to the next. (py-policyd-spf needs py-spf which needs py-authres). Is anyone using these? Any objections to removing them? --Kurt >>> >>> I don't use them (I don't think SPF is really useful) but >>> py-policyd-spf is the main recommended "standalone" implementation of >>> SPF for Postfix (as opposed to being part of a much more complex >>> system like rspamd). So if anybody is using them there's not much >>> alternative (there is a similarly named perl program but it's not >>> very good). >>> >> >> In 2017 Giovanni (added in Cc:) sent a wip diff for mail/py-policyd-spf. >> This never went in and then in January 2019 he imported >> mail/postfix-policyd-spf-perl. Is that the perl program you had in mind >> Stuart? >> >> I assume since Giovanni imported the perl thing, he doesn't use the >> python one anymore. >> >> Given there's been a WIP diff to update py-policyd-spf since 2017 and >> it never went in, it seems there's not much interest for it. The >> proposal from kmos to remove it didn't seem to have shocked anyone into >> maintaining it either. >> >> What do you think about the situation Giovanni? >> >> (I looked at it because I recently added spf support to my postfix >> setup, and I did it through postfix-policyd-spf-perl). >> >> >> Cheers, >> Daniel > > Hello, > > Does the postfix-policyd-spf-perl version provide identical functionality to > the Python one ? > No, the Python version can be configured with several options, the Perl one can just accept/reject/tempfail. Last commit of the Perl code is from 3 years ago, I do not think anyone will improve that code. Giovanni OpenPGP_signature Description: OpenPGP digital signature
Re: [new] graphics/yacreader + deps: qt comics reader
On 2021/05/26 06:35, Dimitri Karamazov wrote:
> Some changes
>
> * Missing upstream library version (unarr).
> * Wantlib was somewhat different in my case - No Qt5OpenGL,Qt5Script
> but Qt5Svg is required (must recheck).
> * Changed the file distribution to be more like release.
> * PLIST was missing some files.
>
> Otherwise works fine for me on amd64.
ok sthen to import, or alternatively with this which is a tiny bit neater imo
--- Makefile.orig Wed May 26 09:43:43 2021
+++ MakefileWed May 26 09:44:34 2021
@@ -3,7 +3,7 @@
COMMENT = read and manage your digital comic collection
V =9.8.0
-DISTNAME = yacreader-${V}.2105165-src
+DISTNAME = yacreader-${V}.2105165
PKGNAME = yacreader-${V}
CATEGORIES = graphics
@@ -21,7 +21,7 @@ WANTLIB += Qt5Sql Qt5Svg Qt5Widgets c m poppler-qt5 un
MASTER_SITES = https://github.com/YACReader/yacreader/releases/download/${V}/
-EXTRACT_SUFX = .tar.xz
+EXTRACT_SUFX = -src.tar.xz
# C++11
COMPILER = base-clang ports-gcc
@@ -35,8 +35,6 @@ LIB_DEPENDS = archivers/unarr \
x11/qt5/qtsvg
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-
-WRKDIST = ${WRKDIR}/${DISTNAME:S/-src//}
do-install:
.for bin in YACReader YACReaderLibrary YACReaderLibraryServer
Re: [NEW] www/py-adblock
On 2021/05/25 02:59, Dimitri Karamazov wrote: > On Mon, May 24, 2021 at 09:54:48PM +0100, Stuart Henderson wrote: > > ok for maturin > > > > py-adblock; tests fail for me like this. not necessarily a blocker, > > do you want to send the qutebrowser diff to go with it to give a better > > way to test? > > > > > The tests are working fine upon a recheck, maybe something was wrong with > the tarball so I've attached a new one with proper TEST_DEPENDS. That doesn't change anything, TEST_DEPENDS isn't needed as they're already in BUILD_DEPENDS and you can't test without building. Anyway; tests still fail but runtime works. These are OK sthen@ to import py-adblock.tar.gz Description: application/tar-gz maturin.tar.gz Description: application/tar-gz
Re: [new] graphics/yacreader + deps: qt comics reader
Stuart Henderson writes:
> On 2021/05/26 06:35, Dimitri Karamazov wrote:
>> Some changes
>>
>> * Missing upstream library version (unarr).
>> * Wantlib was somewhat different in my case - No Qt5OpenGL,Qt5Script
>> but Qt5Svg is required (must recheck).
>> * Changed the file distribution to be more like release.
>> * PLIST was missing some files.
>>
>> Otherwise works fine for me on amd64.
>
> ok sthen to import, or alternatively with this which is a tiny bit neater imo
It never crossed my mind tha EXTRACT_SUFX could have something more than
the actual file extension.
Attaching an updated tarball with this improvement, thanks!
> --- Makefile.orig Wed May 26 09:43:43 2021
> +++ Makefile Wed May 26 09:44:34 2021
> @@ -3,7 +3,7 @@
> COMMENT =read and manage your digital comic collection
>
> V = 9.8.0
> -DISTNAME = yacreader-${V}.2105165-src
> +DISTNAME = yacreader-${V}.2105165
> PKGNAME =yacreader-${V}
>
> CATEGORIES = graphics
> @@ -21,7 +21,7 @@ WANTLIB += Qt5Sql Qt5Svg Qt5Widgets c m poppler-qt5 un
>
> MASTER_SITES = https://github.com/YACReader/yacreader/releases/download/${V}/
>
> -EXTRACT_SUFX = .tar.xz
> +EXTRACT_SUFX = -src.tar.xz
>
> # C++11
> COMPILER = base-clang ports-gcc
> @@ -35,8 +35,6 @@ LIB_DEPENDS = archivers/unarr \
> x11/qt5/qtsvg
> RUN_DEPENDS =devel/desktop-file-utils \
> x11/gtk+3,-guic
> -
> -WRKDIST =${WRKDIR}/${DISTNAME:S/-src//}
>
> do-install:
> .for bin in YACReader YACReaderLibrary YACReaderLibraryServer
unarr.tar.gz
Description: Binary data
yacreader.tar.gz
Description: Binary data
[new] graphics/yacreader + deps: qt comics reader
Some changes
* Missing upstream library version (unarr).
* Wantlib was somewhat different in my case - No Qt5OpenGL,Qt5Script
but Qt5Svg is required (must recheck).
* Changed the file distribution to be more like release.
* PLIST was missing some files.
Otherwise works fine for me on amd64.
Unarr--
-DISTNAME = unarr-1.0.1
+V =1.0.1
+DISTNAME = unarr-${V}
-SHARED_LIBS = unarr 0.0
+SHARED_LIBS = unarr 0.0 # 1.0.0
-HOMEPAGE = https://github.com/selmf/unarr
+HOMEPAGE = https://github.com/selmf/unarr/
-WANTLIB = bz2 lzma z
+WANTLIB += bz2 lzma z
-MASTER_SITES = https://github.com/selmf/unarr/releases/download/v1.0.1/
+MASTER_SITES = ${HOMEPAGE:=releases/download/v${V}/}
Yacreader--
-COMMENT = comics reader
+COMMENT = read and manage your digital comic collection
-DISTNAME = yacreader-9.8.0.2105165-src
-PKGNAME = yacreader-9.8.0
+V =9.8.0
+DISTNAME = yacreader-${V}.2105165-src
+PKGNAME = yacreader-${V}
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Multimedia
-WANTLIB += Qt5OpenGL Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets Qt5Script
-WANTLIB += Qt5Sql Qt5Widgets c m poppler-qt5 unarr
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Multimedia
+WANTLIB += Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets
+WANTLIB += Qt5Sql Qt5Svg Qt5Widgets c m poppler-qt5 unarr
-MASTER_SITES = https://github.com/YACReader/yacreader/releases/download/9.8.0/
+MASTER_SITES = https://github.com/YACReader/yacreader/releases/download/${V}/
- x11/qt5/qtscript
+ x11/qt5/qtsvg
-WRKDIST = ${WRKDIR}/yacreader-9.8.0.2105165
+WRKDIST = ${WRKDIR}/${DISTNAME:S/-src//}
do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/YACReader/YACReader \
- ${PREFIX}/bin/YACReader
- ${INSTALL_PROGRAM} ${WRKBUILD}/YACReaderLibrary/YACReaderLibrary \
- ${PREFIX}/bin/YACReaderLibrary
- ${INSTALL_PROGRAM} \
- ${WRKBUILD}/YACReaderLibraryServer/YACReaderLibraryServer \
- ${PREFIX}/bin/YACReaderLibraryServer
- ${INSTALL_MAN} ${WRKSRC}/YACReader{,Library}.1 \
- ${PREFIX}/man/man1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+.for bin in YACReader YACReaderLibrary YACReaderLibraryServer
+ ${INSTALL_PROGRAM} ${WRKBUILD}/${bin}/${bin} ${PREFIX}/bin
+.endfor
+ ${INSTALL_MAN} ${WRKSRC}/YACReader{,Library}.1 ${PREFIX}/man/man1
+.for dir in applications icons/hicolor/scalable/apps yacreader
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/${dir}
+.endfor
${INSTALL_DATA} ${WRKSRC}/YACReader{,Library}.desktop \
${PREFIX}/share/applications
- ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/scalable/apps
${INSTALL_DATA} ${WRKSRC}/YACReader{,Library}.svg \
${PREFIX}/share/icons/hicolor/scalable/apps
- ${INSTALL_DATA_DIR} ${PREFIX}/share/yacreader/languages
- ${INSTALL_DATA} ${WRKSRC}/release/languages/*.qm \
- ${PREFIX}/share/yacreader/languages/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/yacreader/server
- ${INSTALL_DATA_DIR} ${PREFIX}/share/yacreader/server/{docroot,templates}
- ${INSTALL_DATA} \
- ${WRKSRC}/release/server/docroot/{css/*,images/*,*.html} \
- ${PREFIX}/share/yacreader/server/docroot
- ${INSTALL_DATA} ${WRKSRC}/release/server/templates/*.tpl \
- ${PREFIX}/share/yacreader/server/templates
+ cd ${WRKSRC}/release && pax -rw . ${PREFIX}/share/yacreader
yacreader.tar.gz
Description: Binary data
unarr.tar.gz
Description: Binary data
Re: rebar3 update
On Mon, May 24, 2021 at 05:07:12PM +0100, Stuart Henderson wrote:
> danj pointed out https://ferd.ca/you-ve-got-to-upgrade-rebar3.html;
> here's an update for the port to a version which both has a fix for this,
> and still supports erlang 21 (3.15.x support OTP 19 to 23; 3.16.x
> supports 22 to 24).
Thanks for looking at this.
>
> while there I fixed the distfile name from the current bare version
> number, and got tests to work.
>
> i think the existing patches to change these ...
>
> -"$BINDIR/erl" -boot start_clean \
> +"$BINDIR/erl${ERL_VERSION}" -boot start_clean \
>
> in relx_get_nodename() etc are incorrect, BINDIR refers to
> /usr/local/lib/erlang21/erts-10.2/bin where the files have no version
> suffix, so i've dropped those. (of course I've kept the patches for
> filenames searched in the default PATH).
I'm a bit confused about this. BINDIR can also be the erts/bin
directory of a release generated by rebar3/relx, and in those, the erl
binary does have the version suffix. I'm not sure how it gets there.
I'll look into this more.
>
> the test suite passes, but i'm not really a user of this, so a
> real-world test is probably a good idea.
My main use for rebar3 is building current versions of databases/riak
(not yet in the ports tree), and last time I tried, it didn't work with
newer versions of rebar3. I may be able to find something else.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/rebar3/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 19 Feb 2021 03:58:34 - 1.4
> +++ Makefile 24 May 2021 15:43:55 -
> @@ -2,24 +2,21 @@
>
> COMMENT =Erlang build tool
>
> -V= 3.13.2
> -PKGNAME= rebar3-${V}
> -DISTNAME=${V}
> -CATEGORIES= devel
> -HOMEPAGE=https://www.rebar3.org
> +GH_ACCOUNT = erlang
> +GH_PROJECT = rebar3
> +GH_TAGNAME = 3.15.2
> +CATEGORIES = devel
> +HOMEPAGE = https://www.rebar3.org
> MAINTAINER = Jonathan Matthew
>
> # APLv2
> -PERMIT_PACKAGE= Yes
> +PERMIT_PACKAGE = Yes
>
> FLAVORS =erlang21
> FLAVOR ?=erlang21
>
> -MASTER_SITES = https://github.com/erlang/rebar3/archive/
> MASTER_SITES1 = https://repo.hex.pm/tarballs/
>
> -WRKDIST =${WRKDIR}/rebar3-${V}
> -
> .if ${FLAVOR:Merlang21}
> _EV = ${FLAVOR:C/.*([0-9][0-9]+\$)/\1/}
> RUN_DEPENDS = lang/erlang/${_EV}
> @@ -28,22 +25,26 @@ ERL_VERSION = ${_EV}
> ERRORS += "Invalid FLAVOR set: ${FLAVOR}"
> .endif
>
> -EXTRACT_ONLY = ${V}.tar.gz
> +EXTRACT_ONLY = rebar3-${GH_TAGNAME}.tar.gz
>
> +# certifi held back; >=2.6.0 -> "undefined parse transform 'certifi_pt'"
> HEX_MODULES = \
> - bbmustache 1.8.0 \
> - certifi 2.5.1 \
> - cf 0.2.2 \
> - cth_readable1.4.6 \
> - erlware_commons 1.3.1 \
> + bbmustache 1.12.1 \
> + certifi 2.5.3 \
> + cf 0.3.1 \
> + cth_readable1.5.1 \
> + erlware_commons 1.5.0 \
> eunit_formatters0.5.0 \
> - getopt 1.0.1 \
> - parse_trans 3.3.0 \
> + getopt 1.0.2 \
> + parse_trans 3.4.0 \
> providers 1.8.1 \
> - relx3.33.0 \
> - ssl_verify_fun 1.1.5
> + relx4.4.0 \
> + ssl_verify_fun 1.1.6
> +# for tests
> +HEX_MODULES += \
> + meck0.8.13
>
> -DISTFILES = ${V}.tar.gz
> +DISTFILES = rebar3-{}${GH_TAGNAME}.tar.gz
> .for _m _v in ${HEX_MODULES}
> DISTFILES += ${_m}-${_v}.tar:1
> .endfor
> @@ -75,5 +76,11 @@ do-build:
>
> do-install:
> ${INSTALL_SCRIPT} ${WRKSRC}/rebar3 ${PREFIX}/bin/rebar3-${ERL_VERSION}
> +
> +PORTHOME=${WRKDIR}
> +do-test:
> + cd ${WRKSRC} && \
> + ${SETENV} ${ALL_TEST_ENV} ./rebar3 escriptize && \
> + ${SETENV} ${ALL_TEST_ENV} ./rebar3 ct
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/rebar3/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 26 Nov 2020 03:31:56 - 1.1.1.1
> +++ distinfo 24 May 2021 15:43:55 -
> @@ -1,24 +1,26 @@
> -SHA256 (3.13.2.tar.gz) = 4UzcH1t9Njojip9VX4noeLxPyDbJcFcbQbkO6Uf5FQU=
> -SHA256 (bbmustache-1.8.0.tar) = GQ6iIGEovfq/XZIAuN+X9lEdnGKVNlWCjijCvHkWElI=
> -SHA256 (certifi-2.5.1.tar) = gFq9l1Ocr4nsbUcyyR5iup2gzaUaxGI4C70o7ml6jEI=
> -SHA256 (cf-0.2.2.tar) = SCg7MBm8f61W57IwKKXaTT5s1ZilU6sqmaIVO/XxmyE=
> -SHA256 (cth_readable-1.4.6.tar) =
> j3mde/1ESr/itMB8yzHFboAEMzXh7Tkzot+6NfjZdSM=
>
Re: update irssi to 1.2.3
ping? On Thu, May 13 2021 18:30:51 +0300, Lauri Tirkkonen wrote: > Hi, > > simple update to irssi. The glib >= 2.63 patch is no longer needed; see > https://irssi.org/2021/04/11/irssi-1.2.3-released/ > > diff --git a/net/irssi/Makefile b/net/irssi/Makefile > index a98011cbc4f..5bfeea4dcc2 100644 > --- a/net/irssi/Makefile > +++ b/net/irssi/Makefile > @@ -8,15 +8,11 @@ MULTI_PACKAGES = -main -otr > COMMENT-main = modular IRC client with many features > COMMENT-otr =OTR (off-the-record) plugin for irssi > > -V = 1.2.2 > +V = 1.2.3 > DISTNAME = irssi-$V > PKGSPEC-main = irssi-=$V > PKGNAME-main = irssi-$V > PKGNAME-otr =irssi-otr-$V > -REVISION = 5 > - > -PATCHFILES = glib-2-63.patch > -PATCH_DIST_STRIP = -p1 > > CATEGORIES = net > > diff --git a/net/irssi/distinfo b/net/irssi/distinfo > index 9e030855e3c..aa1143d89ff 100644 > --- a/net/irssi/distinfo > +++ b/net/irssi/distinfo > @@ -1,4 +1,2 @@ > -SHA256 (glib-2-63.patch) = aomQgwWNg/Si0TSXcgKv6+qEVkGzRjA/3lY79iBc744= > -SHA256 (irssi-1.2.2.tar.gz) = UxgoYdTSvm2zX6fj8FJKZNKlSjdDB1dNq19TYr/qVjw= > -SIZE (glib-2-63.patch) = 1498 > -SIZE (irssi-1.2.2.tar.gz) = 1843879 > +SHA256 (irssi-1.2.3.tar.gz) = Kcu3RtfldZHY/PeZQG+yjLfC1zS8QojLuLTE4Fz5nCU= > +SIZE (irssi-1.2.3.tar.gz) = 1824077 > > -- > Lauri Tirkkonen | lotheac @ IRCnet -- Lauri Tirkkonen | lotheac @ IRCnet
Re: [NEW] www/py-adblock
On Wed, May 26, 2021 at 10:26:20AM +0100, Stuart Henderson wrote:
> On 2021/05/25 02:59, Dimitri Karamazov wrote:
> > On Mon, May 24, 2021 at 09:54:48PM +0100, Stuart Henderson wrote:
> > > ok for maturin
> > >
> > > py-adblock; tests fail for me like this. not necessarily a blocker,
> > > do you want to send the qutebrowser diff to go with it to give a better
> > > way to test?
> > >
> > >
> > The tests are working fine upon a recheck, maybe something was wrong with
> > the tarball so I've attached a new one with proper TEST_DEPENDS.
>
> That doesn't change anything, TEST_DEPENDS isn't needed as they're
> already in BUILD_DEPENDS and you can't test without building.
> Anyway; tests still fail but runtime works.
>
> These are OK sthen@ to import
>
Changed the test cmd so it directly calls the pytest module.
This should work. PYTHONPATH not required anymore since the module will
be installed in the tests dir itself during do-test.
All tests pass.
-TEST_ENV = PYTHONPATH=${WRKSRC}${MODPY_SITEPKG}:${MODPY_SITEPKG}
-
do-build:
${MODCARGO_CARGO_RUN} build \
--manifest-path ${MODCARGO_CARGOTOML} \
@@ -108,10 +106,10 @@ do-build:
do-test:
pip${MODPY_VERSION} install --isolated \
- --root=${WRKSRC} \
+ --target=${WRKSRC}/tests \
--ignore-installed \
--no-deps ${WRKSRC}/target/wheels/*.whl
- cd ${MODPY_TEST_DIR} && ${SETENV} ${ALL_TEST_ENV} py.test -v
+ cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} ${MODPY_BIN} -m pytest -v
py-adblock.tar.gz
Description: Binary data
maturin.tar.gz
Description: Binary data
Re: libexecinfo-0.3p2v0 fails to build on loongson
On 5/25/21 6:07 PM, George Koehler wrote:
On Sun, 23 May 2021 07:08:38 -0700
manp...@gmail.com wrote:
cc -O2 -pipe -D__BUILTIN_HACK -Wall -ggdb3 -I/usr/local/include -MD -MP
-nostdinc -idirafter /usr/include -c backtrace.c -o backtrace.o
error: return address can be determined only for current frame
error: return address can be determined only for current frame
2 errors generated.
Does this diff help? It avoids _builtin_frame_address(1), but I don't
know if it would fix your compiler error.
We pass -D__BUILTIN_HACK on mips64* | hppa | sh to disable most of the
backtrace code. I don't have the hardware to check.
--George
Index: Makefile
===
RCS file: /cvs/ports/devel/libexecinfo/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile3 Jan 2020 15:16:59 - 1.26
+++ Makefile26 May 2021 00:46:48 -
@@ -9,7 +9,7 @@ GH_PROJECT= backtrace
DISTNAME =${GH_PROJECT}-${V}
PKGNAME = libexecinfo-$V
EPOCH = 0
-REVISION = 2
+REVISION = 3
CATEGORIES = devel
SHARED_LIBS = execinfo 2.0
Index: patches/patch-libbacktrace_backtrace_c
===
RCS file: /cvs/ports/devel/libexecinfo/patches/patch-libbacktrace_backtrace_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libbacktrace_backtrace_c
--- patches/patch-libbacktrace_backtrace_c 11 Mar 2016 19:46:13 -
1.4
+++ patches/patch-libbacktrace_backtrace_c 26 May 2021 00:46:48 -
@@ -3,17 +3,22 @@ $OpenBSD: patch-libbacktrace_backtrace_c
- __builtin_return_address() and __builtin_frame_address()
may not always have a !0 argument.
libbacktrace/backtrace.c.orig Thu Mar 3 10:15:09 2016
-+++ libbacktrace/backtrace.c Thu Mar 3 10:15:38 2016
-@@ -65,6 +65,7 @@ bt_create_backtrace(void **buffer, int depth, int flag
+Index: libbacktrace/backtrace.c
+--- libbacktrace/backtrace.c.orig
libbacktrace/backtrace.c
+@@ -64,7 +64,10 @@ bt_create_backtrace(void **buffer, int depth, int flag
+ do {
/* number of HANDLE_FRAME must match BT_MAX_DEPTH */
switch (i) {
- HANDLE_FRAME(0, i, addr);
+- HANDLE_FRAME(0, i, addr);
++ case 0:
++ addr = __builtin_return_address(0);
++ break;
+#ifndef __BUILTIN_HACK
HANDLE_FRAME(1, i, addr);
HANDLE_FRAME(2, i, addr);
HANDLE_FRAME(3, i, addr);
-@@ -192,6 +193,7 @@ bt_create_backtrace(void **buffer, int depth, int flag
+@@ -192,6 +195,7 @@ bt_create_backtrace(void **buffer, int depth, int flag
HANDLE_FRAME(125, i, addr);
HANDLE_FRAME(126, i, addr);
HANDLE_FRAME(127, i, addr);
Hi George,
You patch works and I have a successfully built libexecinfo now. Would
be great to have the patch committed so that we can all benefit from it
(both HEAD and 6.9 branch)! Thanks!
OpenPGP_signature
Description: OpenPGP digital signature
Re: emulators/mame use system pugixml
On Tue, May 25, 2021 at 05:52:31AM +0200, Rafael Sadowski wrote: > On Tue May 25, 2021 at 05:50:06AM +0200, Rafael Sadowski wrote: > > Simple diff to enable pugixml usage in mame. OK? > > > > of course, with REVISION bump: Looks good to me. Brad also sent me the same diff privately, so please mention it in the commit message as we usually do. OK fcambus@
Re: HylaFax Port - Broken since OpenBSD 5.7
On 23/05/2021 11:52 pm, Greg Steuck wrote: Larry Moore writes: I've installed release of 6.9 and the problem still exists. I've attached a patch created on OpenBSD 6.9 which appears to overcome the high CPU utilisation, also included is a change which configures HylaFAX to use ASCII lock files, seeing as this is what OpenBSD uses. Thank you Larry for sending the patch. I changed it into a patch below applicable to the ports tree. I only tested that this builds as I don't run hylafax. Anybody can test this or we go with Larry's verification? OK? From d283f25d7843c8a50faabfd4b44b553e28ef2e39 Mon Sep 17 00:00:00 2001 From: Greg Steuck Date: Sun, 23 May 2021 08:45:58 -0700 Subject: [PATCH] comms/hylafax: avoid CPU spinning (wrong fifo mode) Patch from Larry Moore lmoore at starwon dot com dot au --- comms/hylafax/Makefile| 2 +- comms/hylafax/patches/patch-configure | 27 --- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index 1c0f40dfe8b..a6569328459 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -2,7 +2,7 @@ COMMENT= send/receive faxes and share modems DISTNAME= hylafax-6.0.6 -REVISION= 14 +REVISION= 15 CATEGORIES= comms HOMEPAGE= https://www.HylaFAX.org/ diff --git a/comms/hylafax/patches/patch-configure b/comms/hylafax/patches/patch-configure index acd5e9ae620..1499a9a423d 100644 --- a/comms/hylafax/patches/patch-configure +++ b/comms/hylafax/patches/patch-configure @@ -45,7 +45,20 @@ Index: configure } if [ "$SGI2FAX" = auto ]; then -@@ -2563,12 +2562,11 @@ EOF +@@ -1959,6 +1958,12 @@ EmitConfigurationDefinitions() + CONFIG_OPENFIFO=O_RDONLY; + fi + ;; ++ *-openbsd*) if releaseAtLeast 5.7; then ++ CONFIG_OPENFIFO=O_RDWR; ++ else ++ CONFIG_OPENFIFO=O_RDONLY; ++ fi ++ ;; + *sysv4.2uw2.1.3)CONFIG_OPENFIFO=O_RDWR;;# UnixWare 2.1.3 + *-sysv5UnixWare*) CONFIG_OPENFIFO=O_RDWR;;# UnixWare 7 + *-sysv5OpenUNIX*) CONFIG_OPENFIFO=O_RDWR;;# OpenUNIX 8 +@@ -2563,12 +2568,11 @@ EOF tiff_offset_t="uint32" tiff_bytecount_t="uint32" ;; @@ -59,7 +72,7 @@ Index: configure ;; esac fi -@@ -3405,19 +3403,8 @@ fi +@@ -3405,19 +3409,8 @@ fi HAVE_JBIGTIFF="/*#define HAVE_JBIGTIFF 1*/" if [ "$DISABLE_JBIG" != "yes" ]; then Note "Checking JBIG-in-TIFF conversion support." @@ -81,7 +94,15 @@ Index: configure fi Note "Done checking TIFF support." -@@ -4681,10 +4668,10 @@ case $MANSCHEME in +@@ -3957,6 +3950,7 @@ if [ "$LOCKS" = auto ]; then + *-solaris*) LOCKS="+ascii";; + *-freebsd*) LOCKS=ascii;; + *-netbsd*)LOCKS=ascii;; ++*-openbsd*) LOCKS=ascii;; + *bsd*)LOCKS=binary;; + *)LOCKS=ascii;; + esac +@@ -4681,10 +4675,10 @@ case $MANSCHEME in *-0|*-0.gz|*-0.Z|*-gz|*-Z|*-z) suf=`echo $MANSCHEME | $SED 's/.*-/./'` A='`echo $$i | sed' B='`'# workaround shell bugs I'll test it over the weekend. Regards, Larry.
devel/p5-List-Compare : Update to 0.55
Hi, Here is a patch for devel/p5-List-Compare to update to 0.55 and update TEST_DEPENDS as per upstream change. It build well and pass all tests on amd64-6.9 system. wenIndex: Makefile === RCS file: /cvs/ports/devel/p5-List-Compare/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile3 Jul 2020 21:44:58 - 1.3 +++ Makefile27 May 2021 00:55:43 - @@ -1,9 +1,8 @@ # $OpenBSD: Makefile,v 1.3 2020/07/03 21:44:58 sthen Exp $ COMMENT = compare elements of two or more lists -DISTNAME = List-Compare-0.53 +DISTNAME = List-Compare-0.55 CATEGORIES = devel -REVISION = 0 MAINTAINER = James E Keenan @@ -12,7 +11,7 @@ PERMIT_PACKAGE = Yes MODULES = cpan -TEST_DEPENDS = devel/p5-IO-CaptureOutput +TEST_DEPENDS = sysutils/p5-Capture-Tiny PKG_ARCH = * Index: distinfo === RCS file: /cvs/ports/devel/p5-List-Compare/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo5 Feb 2018 14:37:13 - 1.1.1.1 +++ distinfo27 May 2021 00:55:43 - @@ -1,2 +1,2 @@ -SHA256 (List-Compare-0.53.tar.gz) = /b9P9nsxNdREdf73/KwM1HBkB9VyDSbcqRSGDrEPhVA= -SIZE (List-Compare-0.53.tar.gz) = 88437 +SHA256 (List-Compare-0.55.tar.gz) = zHGUeYNledUrArwyjtgKmPZ53wQ6mbVxCrLBkWaeuDc= +SIZE (List-Compare-0.55.tar.gz) = 84975
net/iperf3 : Update to 3.9
Hi,
Here is a simple patch for net/iperf3 to update to 3.9,
it build well and pass all tests on amd64-6.9 system.
wenIndex: Makefile
===
RCS file: /cvs/ports/net/iperf3/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile21 Jul 2020 02:04:23 - 1.6
+++ Makefile27 May 2021 01:08:31 -
@@ -2,7 +2,7 @@
COMMENT= tool to measure maximum achievable bandwidth on IP networks
-V= 3.8.1
+V= 3.9
PKGNAME= iperf3-${V}
DISTNAME= iperf-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/iperf3/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo21 Jul 2020 02:04:23 - 1.4
+++ distinfo27 May 2021 01:08:31 -
@@ -1,2 +1,2 @@
-SHA256 (iperf-3.8.1.tar.gz) = 5bCA8yc6inFaQQDxOCasLKMcx7ExWSVjGy7PZJV97ZY=
-SIZE (iperf-3.8.1.tar.gz) = 618098
+SHA256 (iperf-3.9.tar.gz) = JLY6JjgjJfdZ8R1CF3mpN7Y8obwXxEWH0vz+2rYKwDg=
+SIZE (iperf-3.9.tar.gz) = 622459
devel/p5-File-Listing: Update to 6.14
Hi,
Here is a patch for devel/p5-File-Listing:
i) Update to 6.14
ii) Remove the line CPAN_AUTHOR
iii) Remove BUILD_DEPENDS = ${RUN_DEPENDS}
It build well and pass all tests on amd64-6.9.
Only 1 port depends on it, www/p5-libwww, It build well and pass
all tests on amd64-6.9 too.
wenIndex: Makefile
===
RCS file: /cvs/ports/devel/p5-File-Listing/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile3 Jul 2020 21:44:53 - 1.4
+++ Makefile27 May 2021 01:19:46 -
@@ -2,10 +2,8 @@
COMMENT = parse directory listing
-DISTNAME = File-Listing-6.04
-CPAN_AUTHOR = GAAS
+DISTNAME = File-Listing-6.14
CATEGORIES = devel
-REVISION = 0
MAINTAINER = Nigel Taylor
@@ -16,6 +14,5 @@ MODULES = cpan
PKG_ARCH = *
RUN_DEPENDS = www/p5-HTTP-Date>=6.00
-BUILD_DEPENDS =${RUN_DEPENDS}
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-File-Listing/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo23 Oct 2014 19:17:59 - 1.1.1.1
+++ distinfo27 May 2021 01:19:46 -
@@ -1,2 +1,2 @@
-SHA256 (File-Listing-6.04.tar.gz) =
HgBQ/NZ4miF57A2ygr8ekPuSvjXRFxWIvZxH1S2VnPU=
-SIZE (File-Listing-6.04.tar.gz) = 51536
+SHA256 (File-Listing-6.14.tar.gz) =
FbOkhx4jFko28iY4G3TUUK9B8SzJSYX1kqZp/Kx7SP8=
+SIZE (File-Listing-6.14.tar.gz) = 80562
Re: rebar3 update
On Wed, May 26, 2021 at 10:13:44PM +1000, Jonathan Matthew wrote:
> On Mon, May 24, 2021 at 05:07:12PM +0100, Stuart Henderson wrote:
> > danj pointed out https://ferd.ca/you-ve-got-to-upgrade-rebar3.html;
> > here's an update for the port to a version which both has a fix for this,
> > and still supports erlang 21 (3.15.x support OTP 19 to 23; 3.16.x
> > supports 22 to 24).
>
> Thanks for looking at this.
>
> >
> > while there I fixed the distfile name from the current bare version
> > number, and got tests to work.
> >
> > i think the existing patches to change these ...
> >
> > -"$BINDIR/erl" -boot start_clean \
> > +"$BINDIR/erl${ERL_VERSION}" -boot start_clean \
> >
> > in relx_get_nodename() etc are incorrect, BINDIR refers to
> > /usr/local/lib/erlang21/erts-10.2/bin where the files have no version
> > suffix, so i've dropped those. (of course I've kept the patches for
> > filenames searched in the default PATH).
>
> I'm a bit confused about this. BINDIR can also be the erts/bin
> directory of a release generated by rebar3/relx, and in those, the erl
> binary does have the version suffix. I'm not sure how it gets there.
> I'll look into this more.
Turns out I did this myself, which of course indicates the patches are
wrong and should be dropped.
>
> >
> > the test suite passes, but i'm not really a user of this, so a
> > real-world test is probably a good idea.
>
> My main use for rebar3 is building current versions of databases/riak
> (not yet in the ports tree), and last time I tried, it didn't work with
> newer versions of rebar3. I may be able to find something else.
I've compiled some other stuff with this update and it all works ok.
ok jmatthew@
