UPDATE: www/netsurf
Hi, This updates netsurf and netsurf-fb to 3.9. NetSurf 3.9 features support for CSS Media Queries (level 4) and improvements to JavaScript handling. Also included are many bug fixes and improvements. We recommend all users upgrade to NetSurf 3.9. Other changes visible in the diff: - Upstream has (re-)added webp support. - netsurf-fb's makefile patches go away. - Library bumps follow the usual pattern (libcss gets a major bump, libdom and libnsfb get minor bumps). As always, tests are greatly appreciated, especially on non-amd64 platforms. ok? Index: browser/Makefile === RCS file: /cvs/ports/www/netsurf/browser/Makefile,v retrieving revision 1.35 diff -u -p -r1.35 Makefile --- browser/Makefile25 Sep 2018 08:48:58 - 1.35 +++ browser/Makefile9 Aug 2019 04:16:20 - @@ -3,14 +3,15 @@ COMMENT = lightweight web browser, with GTK interface NETSURF_PROJECT = netsurf -NETSURF_VERSION = 3.8 +NETSURF_VERSION = 3.9 HOMEPAGE = https://www.netsurf-browser.org/ MASTER_SITES = https://download.netsurf-browser.org/netsurf/releases/source/ BUILD_DEPENDS =www/netsurf/nsgenbind>=0.5 \ www/p5-HTML-Parser -LIB_DEPENDS = www/netsurf/hubbub>=0.3.4 \ +LIB_DEPENDS = graphics/libwebp \ + www/netsurf/hubbub>=0.3.4 \ www/netsurf/libcss>=0.7.0 \ www/netsurf/libnsgif>=0.2.0 \ www/netsurf/libnsbmp>=0.1.4 \ @@ -31,7 +32,7 @@ WANTLIB += freetype gdk-x11-2.0 gdk_pixb WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 hubbub iconv WANTLIB += intl jpeg m nsbmp nsgif nslog nspsl nsutils pango-1.0 WANTLIB += pangocairo-1.0 pangoft2-1.0 parserutils png pthread rsvg-2 -WANTLIB += ssl utf8proc wapcaplet z +WANTLIB += ssl utf8proc wapcaplet webp z MAKE_FLAGS += NETSURF_USE_HARU_PDF=NO \ NETSURF_USE_LIBICONV_PLUG=NO \ Index: browser/distinfo === RCS file: /cvs/ports/www/netsurf/browser/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- browser/distinfo25 Sep 2018 08:48:58 - 1.14 +++ browser/distinfo9 Aug 2019 04:16:20 - @@ -1,2 +1,2 @@ -SHA256 (netsurf-3.8-src.tar.gz) = oA7m8+fqeuUMbB+VyB04E1kXG/aHTliJHyHFUAkMVUI= -SIZE (netsurf-3.8-src.tar.gz) = 3945752 +SHA256 (netsurf-3.9-src.tar.gz) = 1y8cb2EToB5UH4R2qTw0cjUGh3kUAJDfVbpALrSo7MM= +SIZE (netsurf-3.9-src.tar.gz) = 3989742 Index: hubbub/Makefile === RCS file: /cvs/ports/www/netsurf/hubbub/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- hubbub/Makefile 25 Sep 2018 08:48:59 - 1.20 +++ hubbub/Makefile 9 Aug 2019 04:16:20 - @@ -3,7 +3,7 @@ COMMENT = HTML parser NETSURF_PROJECT = libhubbub -NETSURF_VERSION = 0.3.5 +NETSURF_VERSION = 0.3.6 PKGNAME = hubbub-${NETSURF_VERSION} HOMEPAGE = https://www.netsurf-browser.org/projects/hubbub/ Index: hubbub/distinfo === RCS file: /cvs/ports/www/netsurf/hubbub/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- hubbub/distinfo 25 Sep 2018 08:48:59 - 1.10 +++ hubbub/distinfo 9 Aug 2019 04:16:20 - @@ -1,2 +1,2 @@ -SHA256 (libhubbub-0.3.5-src.tar.gz) = qoLja+Ek5YLjB5Ke7oGkL/r0NVsphpNJFycdZdIM2I8= -SIZE (libhubbub-0.3.5-src.tar.gz) = 784526 +SHA256 (libhubbub-0.3.6-src.tar.gz) = 11bHlcGg4IvuxKzWg2SsRHeWDWL/+jtg2gX1p3Y/e/Q= +SIZE (libhubbub-0.3.6-src.tar.gz) = 784692 Index: libcss/Makefile === RCS file: /cvs/ports/www/netsurf/libcss/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- libcss/Makefile 25 Sep 2018 08:48:59 - 1.21 +++ libcss/Makefile 9 Aug 2019 04:16:20 - @@ -3,9 +3,9 @@ COMMENT = CSS parser and selection engine NETSURF_PROJECT = libcss -NETSURF_VERSION = 0.8.0 +NETSURF_VERSION = 0.9.0 -SHARED_LIBS = css 5.1 #0.8.0 +SHARED_LIBS = css 6.0 #0.9.0 LIB_DEPENDS = converters/libiconv \ www/netsurf/libparserutils>=0.2.1 \ Index: libcss/distinfo === RCS file: /cvs/ports/www/netsurf/libcss/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- libcss/distinfo 25 Sep 2018 08:48:59 - 1.13 +++ libcss/distinfo 9 Aug 2019 04:16:20 - @@ -1,2 +1,2 @@ -SHA256 (libcss-0.8.0-src.tar.gz) = NaBJDZjCPgm40rXkYZkmExxbmNp6nbLtADIvY/vCrV8= -SIZE (libcss-0.8.0-src.tar.gz) = 516474 +SHA256 (libcss-0.9.0-src.tar.gz) = uY+6dmS9UwfLOaYQEJjadvY1qX4Ve4f0XpzkKtqQie8= +SIZE
NEW: productivity/novprog
Hi ports -- Attached is a new port, productivity/novprog. NovProg is a graphical wordcount grapher. --- pkg/DESCR: NovProg is a tool to graph your progress in writing a NaNoWriMo style novel. You enter your wordcount and it updates a graph showing you how much progress you have made. It also shows you how far you are through your daily goal, and your total goal. Mousing over a bar in the graph will show a tooltip with that day's wordcount. --- It's a simple tool but it works well for me on amd64; I wish I had found this much sooner. OK? ~Brian novprog.tgz Description: application/compressed-tar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 18:05:55 Modified files: lang/kona : Makefile distinfo Log message: Update to kona-3.2.0.20190719
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 18:00:40 Modified files: devel/bpython : Makefile distinfo devel/bpython/pkg: PLIST Log message: Update to bpython-0.18 Changelog: https://github.com/bpython/bpython/compare/0.17-release...0.18-release
devel/boost,-md: simplify conditional
I took a look at enabling -md on sparc64, to no avail, and stumbled upon this double negative. afaik ONLY_FOR_ARCHS-subpackage should do the same but is more readable. ok? Index: Makefile === RCS file: /cvs/ports/devel/boost/Makefile,v retrieving revision 1.88 diff -u -p -r1.88 Makefile --- Makefile18 Jul 2019 20:27:25 - 1.88 +++ Makefile8 Aug 2019 14:48:40 - @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.88 2019/07/18 20:27:25 sthen Exp $ +ONLY_FOR_ARCHS-md = aarch64 amd64 arm i386 powerpc + COMMENT-main= free peer-reviewed portable C++ source libraries COMMENT-md=machine-dependent libraries for boost @@ -95,12 +97,6 @@ WANTLIB-md+= boost_chrono-mt boost_files WANTLIB-md+= boost_system boost_thread-mt .include - -.if !(${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ - ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_ARCH} == "powerpc") -BUILD_PACKAGES=${MULTI_PACKAGES:N-md} -.endif .if ${PROPERTIES:Mclang} TOOLSET= clang -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
回复: [NEW] devel/py-tblib
Revised patch based on kmos@ comments. wen 发件人: Kurt Mosiejczuk 发送时间: 2019年8月9日 0:23 收件人: wen heping 抄送: ports@openbsd.org 主题: Re: [NEW] devel/py-tblib On Thu, Aug 08, 2019 at 02:15:50PM +, wen heping wrote: > Hi, ports@: > Here is a patch to create new port devel/py-tblib. > With this new port, www/py-django could do more tests. > It build and run well on amd64-head system. > Comments? OK? > wen I made several changes. First I moved MODPY_EGG_VERSION, MODPY_PI, and MODPY_SETUPTOOLS to their usual positions in a python port. I then lined up the indentation in my usual fussy way. :) I changed the "YES" to "Yes" for PERMIT_PACKAGE. Then I looked at getting the regression tests. I added MODPY_PYTEST. Then I added py-twisted as a TEST_DEPENDS since it is required for the tests. I added PYTHONPATH=${WRKSRC}/lib so it can find itself before install when testing. All that work and it runs one regression test. There seem to be a couple more but upstream has not set them up right to be run. With these changes, ok kmos@ Anyone else? --Kurt py-tblib.p0.tar.gz Description: py-tblib.p0.tar.gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 17:34:09 Modified files: games/gottcode/tetzle: Makefile distinfo games/gottcode/tetzle/patches: patch-tetzle_pro Log message: Update to tetzle-2.1.5 Changelog: https://gottcode.org/tetzle/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 17:30:51 Modified files: games/gottcode/tanglet: Makefile distinfo games/gottcode/tanglet/pkg: PLIST Log message: Update to tanglet-1.5.4 Changelog: https://gottcode.org/tanglet/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 17:26:10 Modified files: games/gottcode/simsu: Makefile distinfo Log message: Update to simsu-1.3.8 Changelog: https://gottcode.org/simsu/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 17:23:51 Modified files: games/gottcode/peg-e: Makefile distinfo games/gottcode/peg-e/patches: patch-peg-e_pro Log message: Update to peg-e-1.2.7 Changelog: https://gottcode.org/peg-e/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 17:21:19 Modified files: games/gottcode/hexalate: Makefile distinfo games/gottcode/hexalate/patches: patch-hexalate_pro Log message: Update to hexalate-1.1.5 Changelog: https://gottcode.org/hexalate/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 17:18:56 Modified files: games/gottcode/gottet: Makefile distinfo Log message: Update to gottet-1.1.8 Changelog: https://gottcode.org/gottet/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 17:16:18 Modified files: games/gottcode/cutemaze: Makefile distinfo games/gottcode/cutemaze/patches: patch-cutemaze_pro Log message: Update to cutemaze-1.2.5 Changelog: https://gottcode.org/cutemaze/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 17:13:27 Modified files: games/gottcode/connectagram: Makefile distinfo games/gottcode/connectagram/patches: patch-connectagram_pro Log message: Update to connectagram-1.2.10 Changelog: https://gottcode.org/connectagram/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 17:08:43 Modified files: games : Makefile Log message: +openjazz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 17:08:26 Log message: Import games/openjazz, an open-source version of the classic Jazz Jackrabbit games. macppc testing and ok cwen@ OpenJazz is a free, open-source version of the classic Jazz Jackrabbit games. Jazz Jackrabbit is a platforming game in which the player controls an anthropomorphic rabbit against an invading tortoise army. While this package and the game engine are open source, one still needs to provide the original game assets from Jazz Jackrabbit, which is not open source. You will need to purchase the original game to use this package. Status: Vendor Tag: bcallah Release Tags: bcallah_20190808 N ports/games/openjazz/Makefile N ports/games/openjazz/distinfo N ports/games/openjazz/patches/patch-src_io_network_cpp N ports/games/openjazz/patches/patch-src_menu_mainmenu_cpp N ports/games/openjazz/patches/patch-ext_psmplug_stdafx_h N ports/games/openjazz/pkg/DESCR N ports/games/openjazz/pkg/PLIST N ports/games/openjazz/pkg/README No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/08/08 17:04:22 Modified files: infrastructure/templates: Makefile.template Log message: Add MODPY_EGG_VERSION, MODPY_PI, MODPY_SETUPTOOLS, and MODPY_VERSION to /usr/ports/infrastructure/templates/Makefile.template. These are the most common entries that portgen(1) will throw at the bottom of a generated python port because it doesn't know where it would go. Adding these will have portgen(1) put them in the appropriate place. Comment tweaks and ok sthen@
Re: lang/gerbil build failures on i386
On 2019/08/05 19:49, Juan Francisco Cantero Hurtado wrote: > On Mon, Aug 05, 2019 at 06:23:00PM +0100, Stuart Henderson wrote: > > On 2019/08/05 18:58, Jeremie Courreges-Anglas wrote: > > > On Mon, Aug 05 2019, Stuart Henderson wrote: > > > > On 2019/08/05 17:25, Timo Myyrä wrote: > > > >> Juan Francisco Cantero Hurtado writes: > > > > > > [...] > > > > > > >> > Could you test this patch?. > > > >> > > > > >> > > > > >> > diff --git Makefile Makefile > > > >> > index 88a777f7c30..7547cf59c6c 100644 > > > >> > --- Makefile > > > >> > +++ Makefile > > > >> > @@ -39,7 +39,8 @@ NO_TEST = Yes > > > >> > GERBIL_ROOT = ${PREFIX}/gerbil > > > >> > > > > >> > do-build: > > > >> > -cd ${WRKSRC}/src && ulimit -n 1024 && ${SETENV} ${MAKE_ENV} > > > >> > ./build.sh > > > >> > +cd ${WRKSRC}/src && ulimit -n 1024 -s 16384 && \ > > > >> > +${SETENV} ${MAKE_ENV} ./build.sh > > > >> > > > > >> > do-install: > > > >> > ${INSTALL_DATA_DIR} ${GERBIL_ROOT} > > > > > > > > Trying that in my next build (though it would seem odd for it to require > > > > more stack on one machine than another?) > > > > Unsurprisingly it didn't help. > > > > > Or maybe amd64.p and exopi don't use the same limits (login.conf)? > > > naddy, ajacoutot? > > > > On i386 I did copy login.conf to the new machines. > > > > Same results building lang/gerbil with ports-gcc. > > Build gambit with this patch and then try to build gerbil: > > > diff --git Makefile Makefile > index 9202dbfc8db..e6184545f60 100644 > --- Makefile > +++ Makefile > @@ -3,6 +3,7 @@ > COMMENT= complete, efficient and reliable implementation of Scheme > > V= 4.9.3 > +REVISION=0 > DISTNAME=gambit-v${V:S/./_/g} > PKGNAME= gambit-$V > API_V= ${V:R:S/./0/}00${V:E} > @@ -20,8 +21,13 @@ PERMIT_PACKAGE=Yes > MASTER_SITES= > http://www.iro.umontreal.ca/~gambit/download/gambit/v${V:R}/source/ > EXTRACT_SUFX=.tgz > > +COMPILER=ports-gcc > +COMPILER_LANGS= c > + > WANTLIB += c crypto m ssl util > > +RUN_DEPENDS= lang/gcc/${MODGCC4_VERSION} > + > CONFIGURE_STYLE=gnu > CONFIGURE_ARGS+=--disable-cplusplus \ > --disable-absolute-shared-libs \ > @@ -42,6 +48,10 @@ do-build: > ulimit -s 12288 && cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ > ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET} > > +post-build: > + sed -i 's/C_COMPILER=\"cc\"/C_COMPILER=\"egcc\"/' > ${WRKSRC}/bin/gambcomp-C.unix > + sed -i 's/C_PREPROC=\"cc -E\"/C_PREPROC=\"egcc -E\"/' > ${WRKSRC}/bin/gambcomp-C.unix > + > do-test: > cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} ${MAKE_PROGRAM} \ > ${TEST_FLAGS} -f makefile ${TEST_TARGET} > Same problem. I've tried all combinations: gambit gerbil -- -- clang gcc gcc clang gcc gcc
Re: [ports-gcc] Unbreak productivity/ledger
ok On 2019/08/08 19:05, Charlene Wendling wrote: > ping. > > On Sat, 27 Jul 2019 23:17:26 +0200 > Charlene Wendling wrote: > > > > > > http://build-failures.rhaalovely.net/powerpc/2019-07-14/productivity/ledger.log > > > http://build-failures.rhaalovely.net/sparc64/2019-07-11/productivity/ledger.log > > > > There is some namespace issues when built with gcc, upstream fixed it > > already. > > > > This allows building on macppc [0], and amd64 is still fine. > > > > Comments/feedback are welcome! > > > > Charlène. > > > > > > [0] https://bin.charlenew.xyz/ledger.log > > Index: Makefile > === > RCS file: /cvs/ports/productivity/ledger/Makefile,v > retrieving revision 1.26 > diff -u -p -u -p -r1.26 Makefile > --- Makefile 12 Jul 2019 20:48:58 - 1.26 > +++ Makefile 27 Jul 2019 21:05:16 - > @@ -5,7 +5,7 @@ COMMENT = command line double-entry acc > GH_TAGNAME = v3.1.1 > GH_ACCOUNT = ledger > GH_PROJECT = ledger > -REVISION = 3 > +REVISION = 4 > > SHARED_LIBS += ledger0.0 # 3.0 > > Index: patches/patch-src_item_h > === > RCS file: patches/patch-src_item_h > diff -N patches/patch-src_item_h > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-src_item_h 27 Jul 2019 21:05:16 - > @@ -0,0 +1,17 @@ > +$OpenBSD$ > + > +Fix the build with ports-gcc, from upstream: > +https://github.com/ledger/ledger/commit/258cab91ab702e82d477b41bb1c6a026c848bda5 > + > +Index: src/item.h > +--- src/item.h.orig > src/item.h > +@@ -92,7 +92,7 @@ class item_t : public supports_flags, > + > + typedef std::pair, bool> tag_data_t; > + typedef std::map +- function > string_map; > ++ std::function > string_map; > + > + state_t _state; > + optional _date; >
Re: [fix] biology/p5-Bio-ASN1-EntrezGene: fix unescaped left braces
On 2019/08/08 19:03, Charlene Wendling wrote: > Ping. ok. > > > > On Wed, 17 Jul 2019 19:11:59 +0200 > > Charlene Wendling wrote: > > > > > > > > This version of this module contains unescaped left braces that, > > > while not fatal until Perl 5.32, mark the tests as failing when it > > > should not. > > > > > > > > > I'm proposing a patch to fix that. There are no consumers. Indeed > > > now 'make test' passes. > > > > > > OK? > > > > > > Charlène. > > > > Index: Makefile > === > RCS file: /cvs/ports/biology/p5-Bio-ASN1-EntrezGene/Makefile,v > retrieving revision 1.12 > diff -u -p -u -p -r1.12 Makefile > --- Makefile 12 Jul 2019 20:43:44 - 1.12 > +++ Makefile 17 Jul 2019 17:08:19 - > @@ -5,7 +5,7 @@ COMMENT = regular expression-based pars > M = 1.10-withoutworldwriteables > DISTNAME = Bio-ASN1-EntrezGene-${M} > PKGNAME =p5-Bio-ASN1-EntrezGene-${M:S/-withoutworldwriteables//} > -REVISION = 2 > +REVISION = 3 > EPOCH = 0 > CATEGORIES = biology > > Index: patches/patch-lib_Bio_ASN1_EntrezGene_pm > === > RCS file: patches/patch-lib_Bio_ASN1_EntrezGene_pm > diff -N patches/patch-lib_Bio_ASN1_EntrezGene_pm > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-lib_Bio_ASN1_EntrezGene_pm 17 Jul 2019 17:08:19 - > @@ -0,0 +1,25 @@ > +$OpenBSD$ > + > +Fix unescaped left braces so it does not generate warnings with Perl 5.28 > + > +Index: lib/Bio/ASN1/EntrezGene.pm > +--- lib/Bio/ASN1/EntrezGene.pm.orig > lib/Bio/ASN1/EntrezGene.pm > +@@ -270,7 +270,7 @@ sub next_seq > + { > + chomp; > + next unless /\S/; > +-my $tmp = (/^\s*Entrezgene ::= ({.*)/si)? $1 : "{" . $_; # get rid of > the 'Entrezgene ::= ' at the beginning of Entrez Gene record > ++my $tmp = (/^\s*Entrezgene ::= (\{.*)/si)? $1 : "{" . $_; # get rid of > the 'Entrezgene ::= ' at the beginning of Entrez Gene record > + return $self->parse($tmp, $compact, 1); # 1 species no resetting line > number > + } > + } > +@@ -324,7 +324,7 @@ sub _parse > + elsif($data->{$id}) { $data->{$id} = [$data->{$id}, $value] } # > hash value has a second terminal value now! > + else { $data->{$id} = $value } # the first terminal value > + } > +- elsif($self->{input} =~ /\G{/cg) > ++ elsif($self->{input} =~ /\G\{/cg) > + { > + $self->{depth}++; > + push(@{$data->{$id}}, $self->_parse()); > Index: patches/patch-lib_Bio_ASN1_Sequence_pm > === > RCS file: patches/patch-lib_Bio_ASN1_Sequence_pm > diff -N patches/patch-lib_Bio_ASN1_Sequence_pm > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-lib_Bio_ASN1_Sequence_pm17 Jul 2019 17:08:19 - > @@ -0,0 +1,25 @@ > +$OpenBSD$ > + > +Fix unescaped braces as it triggers a warning with Perl 5.28 > + > +Index: lib/Bio/ASN1/Sequence.pm > +--- lib/Bio/ASN1/Sequence.pm.orig > lib/Bio/ASN1/Sequence.pm > +@@ -256,7 +256,7 @@ sub next_seq > + { > + chomp; > + next unless /\S/; > +-my $tmp = (/^\s*Seq-entry ::= set ({.*)/si)? $1 : "{" . $_; # get rid > of the 'Seq-entry ::= set ' at the beginning of Sequence record > ++my $tmp = (/^\s*Seq-entry ::= set (\{.*)/si)? $1 : "{" . $_; # get rid > of the 'Seq-entry ::= set ' at the beginning of Sequence record > + return $self->parse($tmp, $compact, 1); # 1 species no resetting line > number > + } > + } > +@@ -317,7 +317,7 @@ sub _parse > + elsif($data->{$id}) { $data->{$id} = [$data->{$id}, $value] } # > hash value has a second terminal value now! > + else { $data->{$id} = $value } # the first terminal value > + } > +- elsif($self->{input} =~ /\G{/cg) > ++ elsif($self->{input} =~ /\G\{/cg) > + { > + $self->{depth}++; > + push(@{$data->{$id}}, $self->_parse()); >
Re: [macppc] Unbreak emulators/retroarch
On 2019/08/08 19:02, Charlene Wendling wrote: > ping. OK. Though the bump isn't really needed, it didn't build on ppc before, and can't affect !ppc. > On Sat, 27 Jul 2019 21:32:53 +0200 > Charlene Wendling wrote: > > > Hi! > > > > > http://build-failures.rhaalovely.net/powerpc/2019-07-14/emulators/retroarch.log > > > > It's simply a missing header with the asm code that goes with it. > > > > Once added it builds [0] and (surprisingly) runs fine on macppc. While > > pretty useless to do in such a case, i've tested on amd64 as well, and > > met no issues indeed. > > > > Comments/feedback are welcome, > > > > Charlène. > > > > > > [0] https://bin.charlenew.xyz/retroarch.log.gz > > Index: Makefile > === > RCS file: /cvs/ports/emulators/retroarch/Makefile,v > retrieving revision 1.18 > diff -u -p -u -p -r1.18 Makefile > --- Makefile 12 Jul 2019 20:46:09 - 1.18 > +++ Makefile 27 Jul 2019 15:15:30 - > @@ -5,7 +5,7 @@ COMMENT = generic multi-emulator fronte > V = 1.7.6 > DISTNAME = RetroArch-$V > PKGNAME =retroarch-$V > -REVISION = 1 > +REVISION = 2 > > CATEGORIES = emulators > > Index: patches/patch-libretro-common_features_features_cpu_c > === > RCS file: patches/patch-libretro-common_features_features_cpu_c > diff -N patches/patch-libretro-common_features_features_cpu_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-libretro-common_features_features_cpu_c 27 Jul 2019 > 15:15:30 - > @@ -0,0 +1,17 @@ > +$OpenBSD$ > + > +ppc fix for: > +features_cpu.c:(.text+0x20): undefined reference to `__mftb' > + > +Index: libretro-common/features/features_cpu.c > +--- libretro-common/features/features_cpu.c.orig > libretro-common/features/features_cpu.c > +@@ -39,7 +39,7 @@ > + #include > + #endif > + > +-#if defined(__CELLOS_LV2__) > ++#if defined(__CELLOS_LV2__) || ( defined(__OpenBSD__) && > defined(__powerpc__) ) > + #ifndef _PPU_INTRINSICS_H > + #include > + #endif >
Re: Adding a few MODPY entries to Makefile.template
On 2019/08/08 12:08, Kurt Mosiejczuk wrote: > This adds MODPY_EGG_VERSION, MODPY_PI, MODPY_SETUPTOOLS, and > MODPY_VERSION to /usr/ports/infrastructure/templates/Makefile.template. > > These are the most common entries that portgen(1) will throw at the > bottom of a generated python port because it doesn't know where it would > go. Adding these lines should put them in the appropriate place. Good additions, one nit: > --Kurt > > Index: Makefile.template > === > RCS file: /cvs/ports/infrastructure/templates/Makefile.template,v > retrieving revision 1.83 > diff -u -p -r1.83 Makefile.template > --- Makefile.template 2 Jul 2019 12:03:14 - 1.83 > +++ Makefile.template 8 Aug 2019 16:05:48 - > @@ -18,6 +18,11 @@ COMMENT = ??? > # COMMENT-foo = ??? for multi packages > > # > +# Version of port if using lang/python module > +# > +#MODPY_EGG_VERSION = ??? > + > +# > # What port/package will be created > # > DISTNAME = ??? > @@ -102,8 +107,17 @@ MASTER_SITES = ??? > # Ports that require a non-default compiler that do *not* use C++ should set > this: > #COMPILER_LANGS =c > > -# Dependencies > +# Any modules we may be using > #MODULES = ??? > + > +# > +# MODPY_ settings for when using lang/python module > +# > +#MODPY_PI = Yes # Get source from pypi.org > +#MODPY_SETUPTOOLS = Yes > +#MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} # If port is python3 only I'd prefer to have the comments on a separate line. If you want to uncomment the line to enable it it's easier to just delete a line, rather than move to the correct column and delete to end of line. Otherwise I just know someone is going to /#[enter]C[esc] and leave the trailing whitespace which make(1) doesn't strip from the variable :-) > + > +# Dependencies > #BUILD_DEPENDS = ??? > #RUN_DEPENDS = ??? > #LIB_DEPENDS = ??? >
Re: [Update] protobuf to 3.9.0
> So here is the "weasel out" diff below ... I've also run "make update-patches" > to update the line numbers. > > "make test" fails following the update though: > > = > c++ -DHAVE_CONFIG_H -I. -I/usr/obj/ports/protobuf-3.9.0/protobuf-3.9.0/src > -I.. -I/usr/local/include -I/usr/local/include -pthread -DHAVE_PTHREAD=1 > -DHAVE_ZLIB=1 -Wall -Wno-sign-compare -O2 -pipe -MT > google/protobuf/protobuf_test-descriptor_unittest.o -MD -MP -MF > google/protobuf/.deps/protobuf_test-descriptor_unittest.Tpo -c -o > google/protobuf/protobuf_test-descriptor_unittest.o `test -f > 'google/protobuf/descriptor_unittest.cc' || echo > '/usr/obj/ports/protobuf-3.9.0/protobuf-3.9.0/src/'`google/protobuf/descriptor_unittest.cc > /usr/obj/ports/protobuf-3.9.0/protobuf-3.9.0/src/google/protobuf/descriptor_unittest.cc:2972:26: > error: C++ requires a type specifier for all declarations > INSTANTIATE_TEST_SUITE_P(DatabaseSource, AllowUnknownDependenciesTest, > ^ This is due to patches/patch-src_Makefile_in forcing the use of the devel/gtest port instead of using the bundled gtest modules. Our port ships a gtest.h that doesn't support INSTANTIATE_TEST_SUITE_P while the bundled version has what looks like a compatibility #define. If I remove that patch (which was carried forward since import) and remove TEST_DEPENDS=devel/gtest, the tests compile and I obtain the results below. The protobuf-test seems to hang indefinitely, so I eventually lost patience and killed it. PASS: protobuf-lite-test PASS: protobuf-lazy-descriptor-test PASS: google/protobuf/compiler/zip_output_unittest.sh PASS: protobuf-lite-arena-test PASS: google/protobuf/io/gzip_stream_unittest.sh PASS: no-warning-test FAIL: protobuf-test Testsuite summary for Protocol Buffers 3.9.0 # TOTAL: 7 # PASS: 6 # SKIP: 0 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 It seems plausible that the REVISION bump is not needed, but since I haven't checked, I included it: Index: Makefile === RCS file: /var/cvs/ports/devel/protobuf/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- Makefile31 Jul 2019 20:58:10 - 1.25 +++ Makefile8 Aug 2019 21:16:13 - @@ -5,6 +5,7 @@ COMMENT = c++ protocol buffers V =3.9.0 DISTNAME = protobuf-cpp-$V PKGNAME = protobuf-$V +REVISION = 0 WRKDIST = ${WRKDIR}/protobuf-${V} @@ -22,8 +23,6 @@ PERMIT_PACKAGE = Yes WANTLIB += c m pthread ${COMPILER_LIBCXX} z MASTER_SITES = https://github.com/google/protobuf/releases/download/v$V/ - -TEST_DEPENDS = devel/gtest COMPILER = base-clang ports-gcc Index: patches/patch-src_Makefile_in === RCS file: patches/patch-src_Makefile_in diff -N patches/patch-src_Makefile_in --- patches/patch-src_Makefile_in 31 Jul 2019 20:58:10 - 1.6 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,140 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.6 2019/07/31 20:58:10 sthen Exp $ - -Index: src/Makefile.in src/Makefile.in.orig -+++ src/Makefile.in -@@ -483,10 +483,7 @@ protobuf_lazy_descriptor_test_OBJECTS = \ - $(am_protobuf_lazy_descriptor_test_OBJECTS) \ - $(nodist_protobuf_lazy_descriptor_test_OBJECTS) - protobuf_lazy_descriptor_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- libprotobuf.la libprotoc.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la -+ libprotobuf.la libprotoc.la - protobuf_lazy_descriptor_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) \ -@@ -506,9 +503,7 @@ protobuf_lite_arena_test_OBJECTS = \ - $(am_protobuf_lite_arena_test_OBJECTS) \ - $(nodist_protobuf_lite_arena_test_OBJECTS) - protobuf_lite_arena_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- libprotobuf-lite.la $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la -+ libprotobuf-lite.la - protobuf_lite_arena_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(protobuf_lite_arena_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -@@ -529,9 +524,7 @@ nodist_protobuf_lite_test_OBJECTS = $(am__objects_10) - protobuf_lite_test_OBJECTS = $(am_protobuf_lite_test_OBJECTS) \ - $(nodist_protobuf_lite_test_OBJECTS) - protobuf_lite_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- libprotobuf-lite.la
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: juan...@cvs.openbsd.org 2019/08/08 15:21:17 Modified files: graphics/pdf2djvu: Makefile Added files: graphics/pdf2djvu/patches: patch-sys-uuid_cc Log message: Unbreak pdf2djvu on sparc64.
Re: NEW: games/openjazz
Oops, i forgot the tarball! On Thu, 8 Aug 2019 18:54:54 +0200 Charlene Wendling wrote: > On Fri, 2 Aug 2019 19:48:58 -0400 > Brian Callahan wrote: > > > Hi ports -- > > > > Attached is a new part, games/openjazz. OpenJazz is an open-source > > version of the classic Jazz Jackrabbit games. > > > > --- > > pkg/DESCR: > > OpenJazz is a free, open-source version of the classic Jazz > > Jackrabbit games. Jazz Jackrabbit is a platforming game in which > > the player controls an anthropomorphic rabbit against an invading > > tortoise army. > > > > While this package and the game engine are open source, one still > > needs to provide the original game assets from Jazz Jackrabbit, > > which is not open source. You will need to purchase the original > > game to use this package. > > --- > > > > Works well on amd64. macppc testing appreciated (cwen?). > > > > OK? > > It works fine on macppc, colors aren't off and the sound works. > > I'm sending a tarball with a move to SUBST_CMD instead of sed. > > OK cwen@ either way > > > ~Brian > > > openjazz.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/08/08 15:03:16 Modified files: www/tomcat : Makefile.inc Log message: fix find...-delete invocation
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/08/08 15:03:02 Modified files: www/tomcat/v7 : Makefile distinfo www/tomcat/v7/pkg: PLIST-examples Log message: update to tomcat-7.0.96
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/08/08 15:01:49 Modified files: www/tomcat/v8 : Makefile distinfo www/tomcat/v8/pkg: PLIST-examples PLIST-main Log message: update to tomcat-8.5.43
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/08/08 14:59:24 Modified files: www/tomcat/v9 : Makefile distinfo www/tomcat/v9/pkg: PLIST-examples PLIST-main Log message: update to tomcat-9.0.22
Re: CVS: cvs.openbsd.org: ports
If you have no idea then I think there’s no reason to change upstream defaults in this case. — Antoine > On 8 Aug 2019, at 17:27, Landry Breuil wrote: > >> On Thu, Aug 08, 2019 at 09:06:37AM +0200, Antoine Jacoutot wrote: >>> On Tue, Aug 06, 2019 at 11:28:12AM -0600, Landry Breuil wrote: >>> CVSROOT:/cvs >>> Module name:ports >>> Changes by:lan...@cvs.openbsd.org2019/08/06 11:28:12 >>> >>> Modified files: >>>audio/mpd : Makefile distinfo >>>audio/mpd/patches: patch-doc_mpdconf_example >>>audio/mpd/pkg : PLIST >>> Added files: >>>audio/mpd/patches: patch-doc_meson_build >>> patch-src_net_meson_build >>> Removed files: >>>audio/mpd/patches: patch-Makefile_in patch-src_Main_cxx >>> patch-src_command_CommandError_cxx >>> >>> Log message: >>> Update to mpd 0.21.11. >>> >>> Long awaited update to 0.21.x branch, been using it on 6.5/amd64 since >>> months without issues. >>> Upstream switched CONFIGURE_STYLE to to meson, so adapt CONFIGURE_ARGS >>> but try to keep the same enable/disable flags list for now (there are >>> waay too many options in there). >>> Macppc build fixes/tweaks from cwen@, thanks! >>> General apathy from ports@, so users will get to test it now... >> >> Why use '--bindir ${PREFIX}/sbin'? >> I usually run mpd as my user. > > No idea, i think i kept it as it was with gnu configure. >
[Update] PostgreSQL 11.5
Hello, Small diff to update PostgreSQL to it's latest release. Annoucement is here: https://www.postgresql.org/about/news/1960/ 2 CVE fixed (and 2 another on Windows systems). Tested on @amd64. Same diff apply for -stable too. Comments, ok ? Regards, Index: Makefile === RCS file: /cvs/ports/databases/postgresql/Makefile,v retrieving revision 1.254 diff -u -p -u -p -r1.254 Makefile --- Makefile 12 Jul 2019 20:43:59 - 1.254 +++ Makefile 8 Aug 2019 18:21:07 - @@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib COMMENT-plpython=Python procedural language for PostgreSQL COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version -VERSION= 11.4 +VERSION= 11.5 PREV_MAJOR= 10 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} Index: distinfo === RCS file: /cvs/ports/databases/postgresql/distinfo,v retrieving revision 1.79 diff -u -p -u -p -r1.79 distinfo --- distinfo 21 Jun 2019 21:05:36 - 1.79 +++ distinfo 8 Aug 2019 18:21:07 - @@ -1,2 +1,2 @@ -SHA256 (postgresql-11.4.tar.gz) = IEOrcfKkNanne0QZ+ARSWguewe830ZwcLkAT3ByuAac= -SIZE (postgresql-11.4.tar.gz) = 25915738 +SHA256 (postgresql-11.5.tar.gz) = 9jmvD4w/HkcOQcgQjL2upYNrJzjK3UIhNaoqD+vIrng= +SIZE (postgresql-11.5.tar.gz) = 25940612 Index: pkg/PLIST-docs === RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v retrieving revision 1.91 diff -u -p -u -p -r1.91 PLIST-docs --- pkg/PLIST-docs 21 Jun 2019 21:05:36 - 1.91 +++ pkg/PLIST-docs 8 Aug 2019 18:21:07 - @@ -674,6 +674,7 @@ share/doc/postgresql/html/release-11-1.h share/doc/postgresql/html/release-11-2.html share/doc/postgresql/html/release-11-3.html share/doc/postgresql/html/release-11-4.html +share/doc/postgresql/html/release-11-5.html share/doc/postgresql/html/release-11.html share/doc/postgresql/html/release-prior.html share/doc/postgresql/html/release.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/08/08 11:11:24 Modified files: emulators/desmume: Makefile Added files: emulators/desmume/patches: patch-src_MMU_timing_h patch-src_ctrlssdl_cpp Log message: desmume: fix with ports-gcc by adding some additional type casting. While here, move HOMEPAGE to https. tweaks and OK sthen@, maintainer timeout
Re: Samba and fruit question
08.08.2019 16:53, kasak пишет: 08.08.2019 10:47, kasak пишет: Hello. The samba port has vfs module fruit, that must be used with streams_xattr module. But documentation about streams_xattr says that the file system of the share must support extended attributes. And OpenBSD doesn't support ea. So, in this way, i cannot use fruit on OpenBSD? In case if anybody will have such question, I'll repost here answer from samba mailing lists. I can use experimental streams_depot vfs module instead of streams_xattr. I am afraid something's wrong with this method. I have very simple setup: [global] map to guest = bad user interfaces = 192.168.0.1 bind interfaces only = yes load printers = no printing = bsd printcap name = /dev/null disable spoolss = yes vfs objects = fruit streams_depot [tm] path = /mnt/hdd/tm read only = no guest ok = yes guest only = yes fruit:time machine = yes and it just doesn't allow me to see shares. I think, while netatalk can do the job, i'll stop there.
Re: [ports-gcc] Unbreak productivity/ledger
ping. On Sat, 27 Jul 2019 23:17:26 +0200 Charlene Wendling wrote: > > > http://build-failures.rhaalovely.net/powerpc/2019-07-14/productivity/ledger.log > > http://build-failures.rhaalovely.net/sparc64/2019-07-11/productivity/ledger.log > > There is some namespace issues when built with gcc, upstream fixed it > already. > > This allows building on macppc [0], and amd64 is still fine. > > Comments/feedback are welcome! > > Charlène. > > > [0] https://bin.charlenew.xyz/ledger.log Index: Makefile === RCS file: /cvs/ports/productivity/ledger/Makefile,v retrieving revision 1.26 diff -u -p -u -p -r1.26 Makefile --- Makefile12 Jul 2019 20:48:58 - 1.26 +++ Makefile27 Jul 2019 21:05:16 - @@ -5,7 +5,7 @@ COMMENT = command line double-entry acc GH_TAGNAME = v3.1.1 GH_ACCOUNT = ledger GH_PROJECT = ledger -REVISION = 3 +REVISION = 4 SHARED_LIBS += ledger0.0 # 3.0 Index: patches/patch-src_item_h === RCS file: patches/patch-src_item_h diff -N patches/patch-src_item_h --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_item_h27 Jul 2019 21:05:16 - @@ -0,0 +1,17 @@ +$OpenBSD$ + +Fix the build with ports-gcc, from upstream: +https://github.com/ledger/ledger/commit/258cab91ab702e82d477b41bb1c6a026c848bda5 + +Index: src/item.h +--- src/item.h.orig src/item.h +@@ -92,7 +92,7 @@ class item_t : public supports_flags, + + typedef std::pair, bool> tag_data_t; + typedef std::map > string_map; ++ std::function > string_map; + + state_t _state; + optional _date;
Re: [fix] biology/p5-Bio-ASN1-EntrezGene: fix unescaped left braces
Ping. > > On Wed, 17 Jul 2019 19:11:59 +0200 > Charlene Wendling wrote: > > > > > This version of this module contains unescaped left braces that, > > while not fatal until Perl 5.32, mark the tests as failing when it > > should not. > > > > > > I'm proposing a patch to fix that. There are no consumers. Indeed > > now 'make test' passes. > > > > OK? > > > > Charlène. > Index: Makefile === RCS file: /cvs/ports/biology/p5-Bio-ASN1-EntrezGene/Makefile,v retrieving revision 1.12 diff -u -p -u -p -r1.12 Makefile --- Makefile12 Jul 2019 20:43:44 - 1.12 +++ Makefile17 Jul 2019 17:08:19 - @@ -5,7 +5,7 @@ COMMENT = regular expression-based pars M =1.10-withoutworldwriteables DISTNAME = Bio-ASN1-EntrezGene-${M} PKGNAME = p5-Bio-ASN1-EntrezGene-${M:S/-withoutworldwriteables//} -REVISION = 2 +REVISION = 3 EPOCH =0 CATEGORIES = biology Index: patches/patch-lib_Bio_ASN1_EntrezGene_pm === RCS file: patches/patch-lib_Bio_ASN1_EntrezGene_pm diff -N patches/patch-lib_Bio_ASN1_EntrezGene_pm --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-lib_Bio_ASN1_EntrezGene_pm17 Jul 2019 17:08:19 - @@ -0,0 +1,25 @@ +$OpenBSD$ + +Fix unescaped left braces so it does not generate warnings with Perl 5.28 + +Index: lib/Bio/ASN1/EntrezGene.pm +--- lib/Bio/ASN1/EntrezGene.pm.orig lib/Bio/ASN1/EntrezGene.pm +@@ -270,7 +270,7 @@ sub next_seq + { + chomp; + next unless /\S/; +-my $tmp = (/^\s*Entrezgene ::= ({.*)/si)? $1 : "{" . $_; # get rid of the 'Entrezgene ::= ' at the beginning of Entrez Gene record ++my $tmp = (/^\s*Entrezgene ::= (\{.*)/si)? $1 : "{" . $_; # get rid of the 'Entrezgene ::= ' at the beginning of Entrez Gene record + return $self->parse($tmp, $compact, 1); # 1 species no resetting line number + } + } +@@ -324,7 +324,7 @@ sub _parse + elsif($data->{$id}) { $data->{$id} = [$data->{$id}, $value] } # hash value has a second terminal value now! + else { $data->{$id} = $value } # the first terminal value + } +- elsif($self->{input} =~ /\G{/cg) ++ elsif($self->{input} =~ /\G\{/cg) + { + $self->{depth}++; + push(@{$data->{$id}}, $self->_parse()); Index: patches/patch-lib_Bio_ASN1_Sequence_pm === RCS file: patches/patch-lib_Bio_ASN1_Sequence_pm diff -N patches/patch-lib_Bio_ASN1_Sequence_pm --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-lib_Bio_ASN1_Sequence_pm 17 Jul 2019 17:08:19 - @@ -0,0 +1,25 @@ +$OpenBSD$ + +Fix unescaped braces as it triggers a warning with Perl 5.28 + +Index: lib/Bio/ASN1/Sequence.pm +--- lib/Bio/ASN1/Sequence.pm.orig lib/Bio/ASN1/Sequence.pm +@@ -256,7 +256,7 @@ sub next_seq + { + chomp; + next unless /\S/; +-my $tmp = (/^\s*Seq-entry ::= set ({.*)/si)? $1 : "{" . $_; # get rid of the 'Seq-entry ::= set ' at the beginning of Sequence record ++my $tmp = (/^\s*Seq-entry ::= set (\{.*)/si)? $1 : "{" . $_; # get rid of the 'Seq-entry ::= set ' at the beginning of Sequence record + return $self->parse($tmp, $compact, 1); # 1 species no resetting line number + } + } +@@ -317,7 +317,7 @@ sub _parse + elsif($data->{$id}) { $data->{$id} = [$data->{$id}, $value] } # hash value has a second terminal value now! + else { $data->{$id} = $value } # the first terminal value + } +- elsif($self->{input} =~ /\G{/cg) ++ elsif($self->{input} =~ /\G\{/cg) + { + $self->{depth}++; + push(@{$data->{$id}}, $self->_parse());
Re: [macppc] Unbreak emulators/retroarch
ping. On Sat, 27 Jul 2019 21:32:53 +0200 Charlene Wendling wrote: > Hi! > > > http://build-failures.rhaalovely.net/powerpc/2019-07-14/emulators/retroarch.log > > It's simply a missing header with the asm code that goes with it. > > Once added it builds [0] and (surprisingly) runs fine on macppc. While > pretty useless to do in such a case, i've tested on amd64 as well, and > met no issues indeed. > > Comments/feedback are welcome, > > Charlène. > > > [0] https://bin.charlenew.xyz/retroarch.log.gz Index: Makefile === RCS file: /cvs/ports/emulators/retroarch/Makefile,v retrieving revision 1.18 diff -u -p -u -p -r1.18 Makefile --- Makefile12 Jul 2019 20:46:09 - 1.18 +++ Makefile27 Jul 2019 15:15:30 - @@ -5,7 +5,7 @@ COMMENT = generic multi-emulator fronte V =1.7.6 DISTNAME = RetroArch-$V PKGNAME = retroarch-$V -REVISION = 1 +REVISION = 2 CATEGORIES = emulators Index: patches/patch-libretro-common_features_features_cpu_c === RCS file: patches/patch-libretro-common_features_features_cpu_c diff -N patches/patch-libretro-common_features_features_cpu_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-libretro-common_features_features_cpu_c 27 Jul 2019 15:15:30 - @@ -0,0 +1,17 @@ +$OpenBSD$ + +ppc fix for: +features_cpu.c:(.text+0x20): undefined reference to `__mftb' + +Index: libretro-common/features/features_cpu.c +--- libretro-common/features/features_cpu.c.orig libretro-common/features/features_cpu.c +@@ -39,7 +39,7 @@ + #include + #endif + +-#if defined(__CELLOS_LV2__) ++#if defined(__CELLOS_LV2__) || ( defined(__OpenBSD__) && defined(__powerpc__) ) + #ifndef _PPU_INTRINSICS_H + #include + #endif
Re: NEW: games/openjazz
On Fri, 2 Aug 2019 19:48:58 -0400 Brian Callahan wrote: > Hi ports -- > > Attached is a new part, games/openjazz. OpenJazz is an open-source > version of the classic Jazz Jackrabbit games. > > --- > pkg/DESCR: > OpenJazz is a free, open-source version of the classic Jazz Jackrabbit > games. Jazz Jackrabbit is a platforming game in which the player > controls an anthropomorphic rabbit against an invading tortoise army. > > While this package and the game engine are open source, one still > needs to provide the original game assets from Jazz Jackrabbit, which > is not open source. You will need to purchase the original game to > use this package. > --- > > Works well on amd64. macppc testing appreciated (cwen?). > > OK? It works fine on macppc, colors aren't off and the sound works. I'm sending a tarball with a move to SUBST_CMD instead of sed. OK cwen@ either way > ~Brian >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/08/08 10:34:02 Modified files: editors/focuswriter: Makefile distinfo Log message: Bugfix update to focuswriter-1.7.3
Re: CVS: cvs.openbsd.org: ports
On Thu, Aug 08, 2019 at 09:06:37AM +0200, Antoine Jacoutot wrote: > On Tue, Aug 06, 2019 at 11:28:12AM -0600, Landry Breuil wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: lan...@cvs.openbsd.org 2019/08/06 11:28:12 > > > > Modified files: > > audio/mpd : Makefile distinfo > > audio/mpd/patches: patch-doc_mpdconf_example > > audio/mpd/pkg : PLIST > > Added files: > > audio/mpd/patches: patch-doc_meson_build > >patch-src_net_meson_build > > Removed files: > > audio/mpd/patches: patch-Makefile_in patch-src_Main_cxx > >patch-src_command_CommandError_cxx > > > > Log message: > > Update to mpd 0.21.11. > > > > Long awaited update to 0.21.x branch, been using it on 6.5/amd64 since > > months without issues. > > Upstream switched CONFIGURE_STYLE to to meson, so adapt CONFIGURE_ARGS > > but try to keep the same enable/disable flags list for now (there are > > waay too many options in there). > > Macppc build fixes/tweaks from cwen@, thanks! > > General apathy from ports@, so users will get to test it now... > > Why use '--bindir ${PREFIX}/sbin'? > I usually run mpd as my user. No idea, i think i kept it as it was with gnu configure.
[Update] editors/le : Update to 1.16.6
Hi, Here is a patch for editors/le to update to 1.16.6. It build and run well on amd64-head system. Comments? OK? wen Index: Makefile === RCS file: /cvs/ports/editors/le/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile12 Jul 2019 20:46:05 - 1.14 +++ Makefile8 Aug 2019 14:47:34 - @@ -1,9 +1,8 @@ # $OpenBSD: Makefile,v 1.14 2019/07/12 20:46:05 sthen Exp $ COMMENT = text editor inspired by Norton Commander -DISTNAME = le-1.16.5 +DISTNAME = le-1.16.6 CATEGORIES = editors -REVISION = 1 HOMEPAGE = http://lav.yar.ru/programs.html MAINTAINER = Ivan Ivanov Index: distinfo === RCS file: /cvs/ports/editors/le/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo20 Oct 2017 23:05:31 - 1.5 +++ distinfo8 Aug 2019 14:47:34 - @@ -1,2 +1,2 @@ -SHA256 (le-1.16.5.tar.gz) = 2kRJw36PP3nq/kWVtEvKRm9zAOW+r1RMUcKtxrv3ZOU= -SIZE (le-1.16.5.tar.gz) = 1012934 +SHA256 (le-1.16.6.tar.gz) = //v37eXXNtQu8tGY+msUmDyohSHQo7cIhlxHxItD5s0= +SIZE (le-1.16.6.tar.gz) = 1010854 Index: pkg/PLIST === RCS file: /cvs/ports/editors/le/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 24 Oct 2016 08:10:46 - 1.3 +++ pkg/PLIST 8 Aug 2019 14:47:34 - @@ -19,6 +19,8 @@ share/le/syntax.d/ share/le/syntax.d/ada share/le/syntax.d/as share/le/syntax.d/awk +share/le/syntax.d/c +share/le/syntax.d/c++ share/le/syntax.d/c++-comment share/le/syntax.d/c-comment share/le/syntax.d/c-literal @@ -44,6 +46,7 @@ share/le/syntax.d/pascal share/le/syntax.d/perl share/le/syntax.d/php share/le/syntax.d/pod +share/le/syntax.d/puppet share/le/syntax.d/python share/le/syntax.d/sather share/le/syntax.d/shell
[security update] www/py-django : Update django to 2.2.4 and 1.11.23
Hi, ports@: Here is a patch for www/py-django: i) Update stable to 2.2.4 and lts to 1.11.23, which fixed CVE-2019-14232 CVE-2019-14233 CVE-2019-14234 CVE-2019-14235 ii) Add devel/py-tblib as TEST_DEPENDS, which will enable django do mre tests. py-tblib is a new port which I submitted just now. It build well and run well on amd64-head system. Three(total over 1) tests failed, but it was not caused by this update. Comments? OK? wen Index: py-django/Makefile.inc === RCS file: /cvs/ports/www/py-django/Makefile.inc,v retrieving revision 1.4 diff -u -p -r1.4 Makefile.inc --- py-django/Makefile.inc 3 Jul 2019 09:41:45 - 1.4 +++ py-django/Makefile.inc 8 Aug 2019 14:16:46 - @@ -20,6 +20,8 @@ SUBST_VARS += LNAME RUN_DEPENDS += devel/py-tz,python3 +TEST_DEPENDS +=devel/py-tblib,python3 + do-test: cd ${WRKSRC} && env LC_CTYPE=en_US.UTF-8 PYTHONPATH=. \ ${MODPY_BIN} tests/runtests.py --settings=test_sqlite Index: py-django/lts/Makefile === RCS file: /cvs/ports/www/py-django/lts/Makefile,v retrieving revision 1.38 diff -u -p -r1.38 Makefile --- py-django/lts/Makefile 3 Jul 2019 09:41:45 - 1.38 +++ py-django/lts/Makefile 8 Aug 2019 14:16:46 - @@ -4,7 +4,7 @@ PORTROACH = limit:^1\.11 COMMENT = high-level Python web framework (LTS version) -MODPY_EGG_VERSION =1.11.22 +MODPY_EGG_VERSION =1.11.23 LNAME =django-lts post-install: Index: py-django/lts/distinfo === RCS file: /cvs/ports/www/py-django/lts/distinfo,v retrieving revision 1.32 diff -u -p -r1.32 distinfo --- py-django/lts/distinfo 3 Jul 2019 09:41:45 - 1.32 +++ py-django/lts/distinfo 8 Aug 2019 14:16:46 - @@ -1,2 +1,2 @@ -SHA256 (Django-1.11.22.tar.gz) = gw1dQKFwUIlQK7pwYFqzJGgxRA/8FtFQHf7u9fS5yEU= -SIZE (Django-1.11.22.tar.gz) = 7972885 +SHA256 (Django-1.11.23.tar.gz) = UqZtf4sDbQLaCkRyNZ6L4XJ0JPweS09caE75fee1aeE= +SIZE (Django-1.11.23.tar.gz) = 7849738 Index: py-django/lts/pkg/PLIST === RCS file: /cvs/ports/www/py-django/lts/pkg/PLIST,v retrieving revision 1.35 diff -u -p -r1.35 PLIST --- py-django/lts/pkg/PLIST 3 Jul 2019 09:41:46 - 1.35 +++ py-django/lts/pkg/PLIST 8 Aug 2019 14:16:55 - @@ -6830,6 +6830,7 @@ share/doc/${MODPY_PY_PREFIX}-${LNAME}-${ share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.19.txt share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.20.txt share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.21.txt +share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.22.txt share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.2.txt share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/${MODPY_EGG_VERSION}.txt share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.3.txt Index: py-django/stable/Makefile === RCS file: /cvs/ports/www/py-django/stable/Makefile,v retrieving revision 1.28 diff -u -p -r1.28 Makefile --- py-django/stable/Makefile 3 Jul 2019 09:41:46 - 1.28 +++ py-django/stable/Makefile 8 Aug 2019 14:16:55 - @@ -2,7 +2,7 @@ COMMENT = high-level Python web framework -MODPY_EGG_VERSION =2.2.3 +MODPY_EGG_VERSION =2.2.4 LNAME =django Index: py-django/stable/distinfo === RCS file: /cvs/ports/www/py-django/stable/distinfo,v retrieving revision 1.24 diff -u -p -r1.24 distinfo --- py-django/stable/distinfo 3 Jul 2019 09:41:46 - 1.24 +++ py-django/stable/distinfo 8 Aug 2019 14:16:55 - @@ -1,2 +1,2 @@ -SHA256 (Django-2.2.3.tar.gz) = TSP2GyaJK6x4XwdAG8OMv4+kzsmT9ADpzZ3fKP1RwOo= -SIZE (Django-2.2.3.tar.gz) = 8992109 +SHA256 (Django-2.2.4.tar.gz) = FqXVRBFZl4Csnf47mzj5D3hcUSWaWE4LJLbxSn9pqug= +SIZE (Django-2.2.4.tar.gz) = 8856979 Index: py-django/stable/pkg/PLIST === RCS file: /cvs/ports/www/py-django/stable/pkg/PLIST,v retrieving revision 1.25 diff -u -p -r1.25 PLIST --- py-django/stable/pkg/PLIST 3 Jul 2019 09:41:46 - 1.25 +++ py-django/stable/pkg/PLIST 8 Aug 2019 14:16:58 - @@ -6977,6 +6977,7 @@ share/doc/${MODPY_PY_PREFIX}-${LNAME}-${ share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.20.txt share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.21.txt share/doc/${MODPY_PY_PREFIX}-${LNAME}-${MODPY_EGG_VERSION}/releases/1.11.22.txt
[NEW] devel/py-tblib
Hi, ports@: Here is a patch to create new port devel/py-tblib. With this new port, www/py-django could do more tests. It build and run well on amd64-head system. Comments? OK? wen py-tblib.tar.gz Description: py-tblib.tar.gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/08/08 07:56:35 Modified files: devel : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: devel/py-extremes: Makefile distinfo devel/py-extremes/pkg: DESCR PLIST devel/py-kid : Makefile distinfo devel/py-kid/pkg: DESCR PLIST Log message: Remove devel/py-kid and devel/py-extremes devel/py-extremes - only consumer was py-peak-rules, which we just removed. Its last release was Feburary 2009 devel/py-kid - only consumer was devel/py-turbokid, which we just removed. Its last release was July 2007 OK sthen@
Re: Samba and fruit question
08.08.2019 10:47, kasak пишет: Hello. The samba port has vfs module fruit, that must be used with streams_xattr module. But documentation about streams_xattr says that the file system of the share must support extended attributes. And OpenBSD doesn't support ea. So, in this way, i cannot use fruit on OpenBSD? In case if anybody will have such question, I'll repost here answer from samba mailing lists. I can use experimental streams_depot vfs module instead of streams_xattr.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2019/08/08 06:54:33 Modified files: audio/schismtracker: Makefile distinfo audio/schismtracker/patches: patch-configure_ac Log message: Update schismtracker to 20190805.
sparc64 bulk build report
bulk build on sparc64-0.ports.openbsd.org started on Tue Aug 6 00:55:05 MDT 2019 finished at Thu Aug 8 05:55:57 MDT 2019 lasted 02D22h00m done with kern.version=OpenBSD 6.5-current (GENERIC.MP) #8: Fri Aug 2 21:14:44 MDT 2019 built packages:9587 Aug 6:7925 Aug 7:1637 Aug 8:24 critical path missing pkgs: http://build-failures.rhaalovely.net//sparc64/2019-08-06/summary.log build failures: 93 http://build-failures.rhaalovely.net//sparc64/2019-08-06/audio/clementine.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/audio/gradio.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/cad/gnucap.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/cad/magic.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/cad/netgen.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/cad/qucs.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/chinese/libpinyin.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/comms/xastir.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/devel/angr/py-z3-solver.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/devel/avr32/gcc.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/devel/kf5/kactivities-stats.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/devel/kf5/kjobwidgets.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/devel/ocaml-biniou.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/devel/ocaml-configurator.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/devel/py-unicorn.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/devel/woboq_codebrowser.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/emulators/BasiliskII.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/emulators/citra.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/emulators/desmume.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/emulators/fs-uae.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/emulators/gambatte,-main.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/emulators/nestopia,-libretro.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/emulators/ppsspp.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/emulators/vbam.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/emulators/xnp2.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/games/devilutionx.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/games/dxx-rebirth.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/games/godot.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/games/love.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/games/mvdsv.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/games/pokerth.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/games/xevil.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/geo/spatialite/gis.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/graphics/colord-gtk.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/graphics/dibuja.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/graphics/makehuman.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/graphics/openimageio.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/graphics/pdf2djvu.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/graphics/vulkan-tools.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/graphics/vulkan-validation-layers.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/inputmethods/scim-fcitx.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/inputmethods/scim-hangul.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/inputmethods/scim-pinyin.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/inputmethods/scim-tables.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/lang/apl.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/lang/erlang/16.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/lang/erlang/17,-main.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/lang/erlang/18,-main.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/lang/erlang/19.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/lang/erlang/21.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/lang/janet.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/mail/kopano/core.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/math/kst.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/multimedia/mkvtoolnix,no_x11.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/multimedia/phonon-backend/gstreamer,qt5.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/multimedia/synfig.log http://build-failures.rhaalovely.net//sparc64/2019-08-06/net/bitcoin.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/08/08 05:00:21 Modified files: multimedia/handbrake: Makefile Log message: libtoolize is also required
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: chr...@cvs.openbsd.org 2019/08/08 04:32:02 Modified files: devel/ocaml-configurator/patches: patch-src_configurator_ml Log message: fix building with OCaml 4.07 (missing Int module). "not qualified for OK, but please commit" sthen@
Samba and fruit question
Hello. The samba port has vfs module fruit, that must be used with streams_xattr module. But documentation about streams_xattr says that the file system of the share must support extended attributes. And OpenBSD doesn't support ea. So, in this way, i cannot use fruit on OpenBSD?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/08/08 02:26:28 Modified files: x11/chbg : Makefile Log message: use standard "lowercase for start of COMMENT"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2019/08/08 01:57:48 Modified files: misc/dialog: Makefile distinfo Log message: Update dialog to 1.3-20190806.
Re: CVS: cvs.openbsd.org: ports
On Tue, Aug 06, 2019 at 11:28:12AM -0600, Landry Breuil wrote: > CVSROOT: /cvs > Module name: ports > Changes by: lan...@cvs.openbsd.org 2019/08/06 11:28:12 > > Modified files: > audio/mpd : Makefile distinfo > audio/mpd/patches: patch-doc_mpdconf_example > audio/mpd/pkg : PLIST > Added files: > audio/mpd/patches: patch-doc_meson_build > patch-src_net_meson_build > Removed files: > audio/mpd/patches: patch-Makefile_in patch-src_Main_cxx > patch-src_command_CommandError_cxx > > Log message: > Update to mpd 0.21.11. > > Long awaited update to 0.21.x branch, been using it on 6.5/amd64 since > months without issues. > Upstream switched CONFIGURE_STYLE to to meson, so adapt CONFIGURE_ARGS > but try to keep the same enable/disable flags list for now (there are > waay too many options in there). > Macppc build fixes/tweaks from cwen@, thanks! > General apathy from ports@, so users will get to test it now... Why use '--bindir ${PREFIX}/sbin'? I usually run mpd as my user. -- Antoine