CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2019/03/12 19:14:47 Modified files: lang/janet : Makefile distinfo lang/janet/patches: patch-Makefile lang/janet/pkg : PLIST Log message: Update janet to 0.4.0. Shared lib is no longer installed by default.
UPDATE: sysutils/coreutils 8.30 => 8.31
Hi ports -- Attached is an update to GNU coreutils-8.31, which was released a few days ago. Changelog is here: https://github.com/coreutils/coreutils/blob/master/NEWS All tests pass on amd64 but one, which is no change from 8.30. Please test your favorite GNU utilities. ~Brian Index: Makefile === RCS file: /cvs/ports/sysutils/coreutils/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile 11 Jul 2018 17:24:31 - 1.15 +++ Makefile 12 Mar 2019 15:31:02 - @@ -2,7 +2,7 @@ COMMENT = file, shell and text manipulation utilities -DISTNAME = coreutils-8.30 +DISTNAME = coreutils-8.31 CATEGORIES = sysutils MAINTAINER = Brian Callahan Index: distinfo === RCS file: /cvs/ports/sysutils/coreutils/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo 11 Jul 2018 17:24:31 - 1.9 +++ distinfo 12 Mar 2019 15:31:02 - @@ -1,2 +1,2 @@ -SHA256 (coreutils-8.30.tar.xz) = 6DGzqGCRSWzbpyBBH5dI3oFQd5j2Ewrervhy0gbhsFc= -SIZE (coreutils-8.30.tar.xz) = 5359532 +SHA256 (coreutils-8.31.tar.xz) = /3qckY7c5rT0snJeP5s3sMTRk1McrEmki1bE0NOp6f0= +SIZE (coreutils-8.31.tar.xz) = 5410140 Index: patches/patch-Makefile_in === RCS file: /cvs/ports/sysutils/coreutils/patches/patch-Makefile_in,v retrieving revision 1.8 diff -u -p -r1.8 patch-Makefile_in --- patches/patch-Makefile_in 11 Jul 2018 17:24:31 - 1.8 +++ patches/patch-Makefile_in 12 Mar 2019 15:31:02 - @@ -5,7 +5,7 @@ XXX: Avoid rebuilding coreutils.info; ou Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -11527,6 +11527,7 @@ doc/$(am__dirstamp): +@@ -11955,6 +11955,7 @@ doc/$(am__dirstamp): @: > doc/$(am__dirstamp) $(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi $(doc_coreutils_TEXINFOS) Index: pkg/PLIST === RCS file: /cvs/ports/sysutils/coreutils/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 25 Oct 2017 15:36:23 - 1.8 +++ pkg/PLIST 12 Mar 2019 15:31:02 - @@ -12,6 +12,7 @@ @bin bin/gbase32 @bin bin/gbase64 @bin bin/gbasename +@bin bin/gbasenc @bin bin/gcat @bin bin/gchcon @bin bin/gchgrp @@ -120,6 +121,7 @@ libexec/coreutils/libstdbuf.so @man man/man1/gbase32.1 @man man/man1/gbase64.1 @man man/man1/gbasename.1 +@man man/man1/gbasenc.1 @man man/man1/gcat.1 @man man/man1/gchcon.1 @man man/man1/gchgrp.1
Re: [NEW/WIP] Qflow porting // [5/7] magic 8.1.224
On 2019/03/08 10:41, Alessandro DE LAURENZIS wrote:
> Anthony, Stuart,
>
> thanks for taking time to look into this.
>
> On 07/03/2019 07:11, Anthony J. Bentley wrote:
>
> > No strong opinion of that but if you push patches upstream (see below)
> > it may be more practical to target the development branch for a while.
>
> I would be reluctant to switch to the development branch, even temporarily,
> since that isn't practical from user perspective.
>
> > > > Upstream configure script is a wrapper around the one actually generated
> > > > by autoconf, so I used:
> > > >
> > > > CONFIGURE_STYLE = simple
> >
> > A very thin wrapper. I'd rather set CONFIGURE_STYLE=gnu and
> > WRKCONF=${WRKSRC}/scripts instead.
>
> Done.
>
> > > > and patched it adding -std=c89 and -Wno-parentheses to CFLAGS, in order
> > > > to get rid of the huge amount of Wimplicit-function-declaration and
> > > > Wno-parentheses warnings.
> >
> > My memory of magic is that it has some truly ancient ifdefs and code
> > issues that might be worth fixing and shouldn't be too difficult.
> >
> > > > Other patches have essentially to do with termios functions; in
> > > > particular, txGetTermState is not defined is OpenBSD; please carefully
> > > > review what I made in patches/patch-textio_txInput_c, since I just tried
> > > > to adapt some code found on the Internet used for similar situations;
> > > > neither I really understand if those functions are actually needed when
> > > > the Tcl/Tk version is used (this is the case for our port).
> >
> > -#if defined(SYSV) || defined(CYGWIN)
> > +#if defined(SYSV) || defined(CYGWIN) || defined(__OpenBSD__)
> >
> > This is exactly what I'm talking about. If you check FreeBSD they have
> > similar patches. When I see ifdefs like this in a codebase this old,
> > I wonder: what systems even hit the else? I'd consider removing the
> > pre-termios case completely and pushing it upstream.
>
> That would be ideal; still, the termios code, as I said, was not there at
> all, and my additions need review. Any feedback on that?
>
> /usr/local/lib/magic/sys/scmos.tech>> post-extract:
> > > mv ${WRKSRC}/lef/lefWrite.c.orig ${WRKSRC}/lef/lefWrite.c_orig
> >
> > PATCHORIG would remove the need for this.
>
> Done.
>
>
> > Can you kill the 2>&1 as well on the Makefile patches
>
> Done.
>
>
> Testing the port more deeply, I noticed that tech files were affected by a
> bug similar to [1], but actually the clang preprocessor is behaving
> differently (newlines seem to be removed). We could try to patch the sed
> commands in scmos/Makefile and scmos/cif_template/Makefile, but this would
> make the port unusable for archs with gcc in base.
>
> I think it would be better to switch to ports-gcc as compiler, considering
> also that it doesn't report all those Wimplicit-function-declaration and
> Wparentheses messages (this isn't necessarily a good thing, I know, but
> still...)
>
> Attached an updated tarball.
>
> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698760
>
> --
> Alessandro DE LAURENZIS
> [mailto:jus...@atlantide.t28.net]
> Web: http://www.atlantide.t28.net
> LinkedIn: https://www.linkedin.com/in/delaurenzis/
A few tweaks (diff to your port below, updated tar attached),
- move WANTLIB to the standard location
- only use gcc's c compiler, this avoids a runtime dependency on libestdc++
- better comment about .tech files
With these I think it's in nearly in shape to import. One thing I noticed
when running it for a quick test though, if I use "-d OGL" I immediately get
a crash, do you see that too?
$ magic -d OGL
X Error of failed request: BadValue (integer parameter out of range for
operation)
Major opcode of failed request: 155 (GLX)
Minor opcode of failed request: 3 (X_GLXCreateContext)
Value in failed request: 0x0
Serial number of failed request: 1127
Current serial number in output stream: 1144
glXCreateContext(3) suggests this is due to this:
BadValue is generated if vis is not a valid visual (for example, if a
particular GLX implementation does not support it).
but I haven't spotted what the problem is.
I don't want to hold it up just because of that (which doesn't stop it
from working), but
- if it doesn't work anywhere then might be better to build with
CONFIGURE_ARGS=--with-opengl=no
- if it works some places but not others maybe add a quick comment
diff --git Makefile Makefile
index 61709de..fbbd829 100644
--- Makefile
+++ Makefile
@@ -11,12 +11,14 @@ MAINTAINER =Alessandro De Laurenzis
# MIT (Magic, scmos), GPLv2 only (readline)
PERMIT_PACKAGE_CDROM = Yes
+WANTLIB = ${MODTK_WANTLIB} c m GL GLU X11
+
MASTER_SITES = http://opencircuitdesign.com/magic/archive/
-# CPP newlines in .tech files
+# The cpp preprocessor is used to generate .tech files; clang's breaks
+# the newlines. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698760
COMPILER = ports-gcc
-
-WANTLIB = ${MODTK_WANTLIB} c m GL GLU X11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/03/12 16:47:02 Modified files: devel/perltidy : Makefile Log message: switch from sourceforge to cpan, no distfile change but cpan is probably a bit more reliable. zap a while there.
Re: new: x11/textsuggest
This software is in bad shape. After polishing the Makefile a bit, I
tried testing it but both textsuggest and textsuggest-server immediately
dumped core.
$ textsuggest-server &
$ textsuggest --selection # crashes server every other run
textsuggest-server(22619) in free(): chunk canary corrupted
0x1bf201fcc160 0x18@0x18
$ textsuggest-server &
$ textsuggest --auto-selection
terminating with uncaught exception of type
cxxopts::missing_argument_exception: Option ‘auto-selection’ is missing an
argument
Abort trap (core dumped)
I'll give it a new try tomorrow.
For now, here's a Makefile diff against your latest tarball that
- remove unneeded/default SEPARATE_BUILD and CONFIGURE_STYLE
- moves pre-configure to post-patch
- appends CXXFLAGS and LDFLAGS so default values incl. DEBUG stay
- uses LINK.cc
- introduces PROCESSOR for consistent use in both places
- installs missing directories before installing files
- uses WRKBUILD not WRKSRC (same with SEPARATE_BUILD=no but still)
- whitespace nits
Feel free to pick or leave any of those bits.
--- Makefile.orig Tue Mar 12 20:59:40 2019
+++ MakefileTue Mar 12 23:09:38 2019
@@ -23,46 +23,41 @@
RUN_DEPENDS = x11/xdotool
LIB_DEPENDS = x11/libdbus-c++
-CXXFLAGS = -std=c++11 \
- -I${X11BASE}/include \
+CXXFLAGS +=-I${X11BASE}/include \
-I${LOCALBASE}/include/dbus-c++-1
-LDFLAGS = -L${X11BASE}/lib -L${PREFIX}/lib -lxcb -ldbus-c++-1
+LDFLAGS += -L${X11BASE}/lib -lxcb \
+ -L${PREFIX}/lib -ldbus-c++-1
-#SEPARATE_BUILD = No
-CONFIGURE_STYLE = none
-
-pre-configure:
+post-patch:
${SUBST_CMD} ${WRKSRC}/server/Files.hpp
# Unfortunately, Makefiles shipped by upstream are useless for us.
-TEXTSUGGEST_SERVER_SRC = textsuggest-server.cpp \
- ../lib/clip/clip.cpp \
- ../lib/clip/image.cpp \
- ../lib/clip/clip_x11.cpp
+TEXTSUGGEST_SERVER_SRC =textsuggest-server.cpp \
+ ../lib/clip/clip.cpp \
+ ../lib/clip/image.cpp \
+ ../lib/clip/clip_x11.cpp
+PROCESSORS = command \
+ math_expression
do-build:
- cd ${WRKBUILD}/ui && ${SETENV} ${MAKE_ENV} ${MODQT_QMAKE} -makefile
- cd ${WRKBUILD}/ui && ${SETENV} ${MAKE_ENV} \
+ cd ${WRKBUILD}/ui && env -i ${MAKE_ENV} ${MODQT_QMAKE} -makefile
+ cd ${WRKBUILD}/ui && env -i ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET}
- cd ${WRKBUILD}/server && ${SETENV} ${MAKE_ENV} \
- ${CXX} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} \
- ${TEXTSUGGEST_SERVER_SRC} -o textsuggest-server
-.for processor in command math_expression
- cd ${WRKBUILD}/textsuggest/processors/ && \
- ${SETENV} ${MAKE_ENV} \
- ${CXX} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} \
- ${processor}.cpp -o ${processor}
+ cd ${WRKBUILD}/server && env -i ${MAKE_ENV} \
+ ${LINK.cc} -o textsuggest-server ${TEXTSUGGEST_SERVER_SRC}
+.for processor in ${PROCESSORS}
+ cd ${WRKBUILD}/textsuggest/processors/ && env -i ${MAKE_ENV} \
+ ${LINK.cc} -o ${processor} ${processor}.cpp
.endfor
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/ui/textsuggest ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/server/textsuggest-server ${PREFIX}/bin
- ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/textsuggest
-.for processor in command math_expression
- ${INSTALL_PROGRAM} ${WRKSRC}/textsuggest/processors/${processor} \
- ${PREFIX}/libexec/textsuggest/${processor}
+ ${INSTALL_PROGRAM} ${WRKBUILD}/server/textsuggest-server ${PREFIX}/bin/
+ ${INSTALL_PROGRAM} ${WRKBUILD}/ui/textsuggest ${PREFIX}/bin/
+ ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/textsuggest/
+.for processor in ${PROCESSORS}
+ ${INSTALL_PROGRAM} ${WRKBUILD}/textsuggest/processors/${processor} \
+ ${PREFIX}/libexec/textsuggest/
.endfor
- ${INSTALL_DATA_DIR} ${PREFIX}/share/textsuggest
${INSTALL_DATA_DIR} ${PREFIX}/share/textsuggest/dictionaries
ln -s /usr/share/dict/words \
${PREFIX}/share/textsuggest/dictionaries/English.txt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/03/12 16:14:17 Modified files: net/unifi/lts : Makefile Log message: remove comments, BUILD_V won't be needed in lts/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/03/12 16:13:54 Modified files: net/unifi : Makefile Log message: comment-out testing/, 5.10 moved to stable
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/03/12 16:12:59 Modified files: net/unifi/stable: Makefile distinfo net/unifi/stable/files: unifi.sh net/unifi/stable/patches: patch-unifi_sh_api net/unifi/stable/pkg: PLIST unifi.rc Log message: move unifi/stable to the 5.10 branch / update to 5.10.20
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/03/12 15:19:29 Modified files: print/texlive/base: Makefile Added files: print/texlive/base/patches: patch-texk_dvisvgm_dvisvgm-src_libs_brotli_common_platform_h patch-texk_dvisvgm_dvisvgm-src_libs_brotli_enc_fast_log_h patch-texk_dvisvgm_dvisvgm-src_libs_brotli_include_brotli_port_h Log message: texlive/base: unbreak when building with ports-gcc-4.9 The included dvisvgm contains a bundled version of brotli, that uses __has_attribute(), only available with gcc>=5. Spotted by landry@, tested successfully on sparc64 (jca@), macppc (landry@) and amd64 (me). OK jca@, edd@ (MAINTAINER)
Re: new: x11/libdbus-c++
On 2019/03/12 20:44, Klemens Nanni wrote: > WANTLIB and USE_GMAKE have a space after "=". > Please break LIB_DEPENDS into one port per line. +1 It gained a BUILD_DEPENDS on gtk2mm, but it's only actually used in one of the examples (disabled via CONFIGURE_ARGS) and they don't actually build (for another reason) if you enable them. I think I would drop the gtk2mm dependency; as-is, if it changes to being a library dependency rather than just a build dependency in the future, it wouldn't be noticed in bulk builds. > You can set SEPARATE_BUILD. > > As per the project's README, `--enable-debug' should be passed for extra > "debugging code", so you could add that to CONFIGURE_ARGS if DEBUG is > set in case anyone cares to hack on using this port. > > On Wed, Mar 06, 2019 at 11:55:17AM +0100, Stefan Sperling wrote: > > 1) Add more patches, and add comments to all patches. > Thanks, appreciated. > > >In particular, fix poll(2) event mask which resulted in unhandled > >POLLHUP events in the main event loop which made textsuggest-server > >spin on the CPU. As far as I understand, the "unlock" file descriptors > >are only interested in POLLIN events. They can be triggered to wake the > >event loop while a thread sleeps in poll(2). This feature is used by the > >library's teardown code. POLLOUT makes no sense here. > >textsuggest uses much less CPU becomes a lot more responsive with this > > fix. > Do you intend to push those upstream? > > > 2) Enable glib integration. This adds another shared library which is not > >used by textsuggest but will perhaps be useful if other consumers of > >libdbus-c++ show up. > > > > 3) Run regression test (there's just one, the others are just empty stubs). > > $ make test > ===> Regression tests for libdbus-c++-0.9.0 > > /usr/ports/pobj/libdbus-c++-0.9.0/libdbus-c++-0.9.0/test/functional/Test1/TestApp > initialize DBus... > terminating with uncaught exception of type DBus::Error: > /usr/local/bin/dbus-launch terminated abnormally with the following error: No > protocol specified > Autolaunch error: X11 initialization failed. > > *** Signal SIGABRT in . (Makefile:31 'do-test') > > > Still OK? > Assuming tests are an error on my site, OK kn. > Tests fail with PORTS_PRIVSEP but run successfully otherwise (this is common for most things using X in tests, we don't have a good way to fix that so that can be ignored in this port).
Re: Delete print/ghostview
On Mon, Mar 11, 2019 at 07:59:50PM -0600, Anthony J. Bentley wrote: > ghostview hasn't been updated since its import 21 years ago. > There's no homepage and the distfile is no longer available on the > GNU mirrors. > > DESCR proclaims its ability to parse Adobe documents, etc. Given the > generally poor quality of C code 20 years ago, and the number of > high-profile GhostScript vulnerabilities in the meantime, and the many > alternative PostScript viewers like gv, and evince, I'd like to remove > this "full function user interface for ghostscript 2.4 and later." > > ok? I wouldn't miss it. Regarding ghostscript itself: I'm aware that it's hopelessly out of date, and I really hope to find enought time to update it to the newest version, which will more or less be a complete rework of the port. But even after an update, I wouldn't trust it enough to process arbitrary input. Ciao, Kili
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/12 13:56:46 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py-boto3-1.9.113.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/12 13:57:08 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.16.123.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/12 13:56:56 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py-botocore-1.12.113.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2019/03/12 13:49:31 Modified files: converters/otf2bdf: Makefile Log message: Fix broken HOMEPAGE and MASTER_SITES.
Re: new: x11/libdbus-c++
WANTLIB and USE_GMAKE have a space after "=". Please break LIB_DEPENDS into one port per line. You can set SEPARATE_BUILD. As per the project's README, `--enable-debug' should be passed for extra "debugging code", so you could add that to CONFIGURE_ARGS if DEBUG is set in case anyone cares to hack on using this port. On Wed, Mar 06, 2019 at 11:55:17AM +0100, Stefan Sperling wrote: > 1) Add more patches, and add comments to all patches. Thanks, appreciated. >In particular, fix poll(2) event mask which resulted in unhandled >POLLHUP events in the main event loop which made textsuggest-server >spin on the CPU. As far as I understand, the "unlock" file descriptors >are only interested in POLLIN events. They can be triggered to wake the >event loop while a thread sleeps in poll(2). This feature is used by the >library's teardown code. POLLOUT makes no sense here. >textsuggest uses much less CPU becomes a lot more responsive with this fix. Do you intend to push those upstream? > 2) Enable glib integration. This adds another shared library which is not >used by textsuggest but will perhaps be useful if other consumers of >libdbus-c++ show up. > > 3) Run regression test (there's just one, the others are just empty stubs). $ make test ===> Regression tests for libdbus-c++-0.9.0 /usr/ports/pobj/libdbus-c++-0.9.0/libdbus-c++-0.9.0/test/functional/Test1/TestApp initialize DBus... terminating with uncaught exception of type DBus::Error: /usr/local/bin/dbus-launch terminated abnormally with the following error: No protocol specified Autolaunch error: X11 initialization failed. *** Signal SIGABRT in . (Makefile:31 'do-test') > Still OK? Assuming tests are an error on my site, OK kn.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/03/12 13:40:28 Modified files: net/gupnp/core : Makefile distinfo net/gupnp/core/pkg: PLIST Log message: update to gupnp-1.2.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/03/12 13:40:22 Modified files: net/gssdp : Makefile distinfo Log message: update to gssdp-1.2.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/12 13:07:27 Modified files: graphics/libgexiv2: Makefile distinfo Removed files: graphics/libgexiv2/patches: patch-gexiv2_meson_build Log message: Update to libgexiv2-0.12.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/12 13:07:46 Modified files: graphics/shotwell: Makefile Added files: graphics/shotwell/patches: patch-src_photos_PhotoMetadata_vala patch-vapi_libexif_vapi Log message: Fix build with new libgexiv2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/03/12 12:54:35 Modified files: devel/perltidy : Makefile distinfo devel/perltidy/pkg: PLIST Log message: perltidy: update to 20181120 Sync with our recent Perl update, as support for modern Perl features was missing. Changelog: http://perltidy.sourceforge.net/ChangeLog.html#pod2018-11-17 OK afresh1@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/12 12:05:22 Modified files: devel/meson/patches: patch-run_unittests_py Log message: Link to MR.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/12 11:18:32 Modified files: sysutils/terraform/terraform: Makefile distinfo Log message: Update to terraform-0.11.13.
Re: Update lang/go to 1.12
On 19-03-08 14:03:29, Stuart Henderson wrote:
> - sysutils/beats/packetbeat is also broken, not sure how to fix that,
> maybe some vendored thing is in need of an update
>
> cd
> /usr/obj/ports/packetbeat-6.4.3/go/src/github.com/elastic/beats/vendor/github.com/tsg/gopacket/pcap
> CGO_LDFLAGS='"-g" "-O2" "-lpcap"' /usr/local/go/pkg/tool/openbsd_amd64/cgo
> -objdir $WORK/b354/ -importpath
> github.com/elastic/beats/vendor/github.com/tsg/gopacket/pcap -- -I
> $WORK/b354/ -g -O2 ./pcap.go ./pcap_poll_common.go
> # github.com/elastic/beats/vendor/github.com/tsg/gopacket/pcap
> /usr/obj/ports/packetbeat-6.4.3/go/src/github.com/elastic/beats/vendor/github.com/tsg/gopacket/pcap/pcap.go:173:7:
> identifier "_Ctype_struct_bpf_program" may conflict with identifiers
> generated by cgo
> /usr/obj/ports/packetbeat-6.4.3/go/src/github.com/elastic/beats/vendor/github.com/tsg/gopacket/pcap/pcap.go:385:13:
> identifier "_Ctype_struct_pcap_stat" may conflict with identifiers generated
> by cgo
> /usr/obj/ports/packetbeat-6.4.3/go/src/github.com/elastic/beats/vendor/github.com/tsg/gopacket/pcap/pcap.go:446:10:
> identifier "_Ctype_struct_bpf_program" may conflict with identifiers
> generated by cgo
> /usr/obj/ports/packetbeat-6.4.3/go/src/github.com/elastic/beats/vendor/github.com/tsg/gopacket/pcap/pcap.go:489:21:
> identifier "_Ctype_struct_bpf_program" may conflict with identifiers
> generated by cgo
> /usr/obj/ports/packetbeat-6.4.3/go/src/github.com/elastic/beats/vendor/github.com/tsg/gopacket/pcap/pcap.go:552:34:
> identifier "_Ctype_struct_pcap_addr" may conflict with identifiers generated
> by cgo
> /usr/obj/ports/packetbeat-6.4.3/go/src/github.com/elastic/beats/vendor/github.com/tsg/gopacket/pcap/pcap.go:555:56:
> identifier "_Ctype_struct_pcap_addr" may conflict with identifiers generated
> by cgo
> /usr/obj/ports/packetbeat-6.4.3/go/src/github.com/elastic/beats/vendor/github.com/tsg/gopacket/pcap/pcap.go:821:13:
> identifier "_Ctype_struct_pcap_pkthdr" may conflict with identifiers
> generated by cgo
Yeah, they're doing it wrong (the code should be using C. rather than _Ctype_,
which is enforced in Go 1.12)...
ok?
Index: patches/patch-vendor_github_com_tsg_gopacket_pcap_pcap_go
===
RCS file: patches/patch-vendor_github_com_tsg_gopacket_pcap_pcap_go
diff -N patches/patch-vendor_github_com_tsg_gopacket_pcap_pcap_go
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-vendor_github_com_tsg_gopacket_pcap_pcap_go 12 Mar 2019
16:43:28 -
@@ -0,0 +1,65 @@
+$OpenBSD$
+
+Use cgo correctly - this is enforced by Go 1.12.
+
+Index: vendor/github.com/tsg/gopacket/pcap/pcap.go
+--- vendor/github.com/tsg/gopacket/pcap/pcap.go.orig
vendor/github.com/tsg/gopacket/pcap/pcap.go
+@@ -170,7 +170,7 @@ type InterfaceAddress struct {
+ // BPF is a compiled filter program, useful for offline packet matching.
+ type BPF struct {
+ orig string
+- bpf _Ctype_struct_bpf_program // takes a finalizer, not overriden by
outsiders
++ bpf C.struct_bpf_program // takes a finalizer, not overriden by
outsiders
+ }
+
+ // BlockForever, when passed into OpenLive/SetTimeout, causes it to block
forever
+@@ -382,7 +382,7 @@ func (p *Handle) Error() error {
+
+ // Stats returns statistics on the underlying pcap handle.
+ func (p *Handle) Stats() (stat *Stats, err error) {
+- var cstats _Ctype_struct_pcap_stat
++ var cstats C.struct_pcap_stat
+ if -1 == C.pcap_stats(p.cptr, ) {
+ return nil, p.Error()
+ }
+@@ -443,7 +443,7 @@ func (p *Handle) SetBPFFilter(expr string) (err error)
+ }
+ }
+
+- var bpf _Ctype_struct_bpf_program
++ var bpf C.struct_bpf_program
+ cexpr := C.CString(expr)
+ defer C.free(unsafe.Pointer(cexpr))
+
+@@ -486,7 +486,7 @@ func (b *BPF) String() string {
+ }
+
+ // BPF returns the compiled BPF program.
+-func (b *BPF) BPF() _Ctype_struct_bpf_program {
++func (b *BPF) BPF() C.struct_bpf_program {
+ return b.bpf
+ }
+
+@@ -549,10 +549,10 @@ func FindAllDevs() (ifs []Interface, err error) {
+ return
+ }
+
+-func findalladdresses(addresses *_Ctype_struct_pcap_addr) (retval
[]InterfaceAddress) {
++func findalladdresses(addresses *C.struct_pcap_addr) (retval
[]InterfaceAddress) {
+ // TODO - make it support more than IPv4 and IPv6?
+ retval = make([]InterfaceAddress, 0, 1)
+- for curaddr := addresses; curaddr != nil; curaddr =
(*_Ctype_struct_pcap_addr)(curaddr.next) {
++ for curaddr := addresses; curaddr != nil; curaddr =
(*C.struct_pcap_addr)(curaddr.next) {
+ var a InterfaceAddress
+ var err error
+ // In case of a tun device on Linux the link layer has no
curaddr.addr.
+@@ -818,7 +818,7 @@ func (h *Handle) NewDumper(file string) (dumper *Dumpe
+ // Writes a packet to the file. The return values of ReadPacketData
+ // can be passed to this function as
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/12 10:30:35 Added files: x11/gnome/totem/patches: patch-src_meson_build Log message: Fix for meson >=0.50.0. breakage reported by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/03/12 10:08:02 Modified files: mail/spampd: Makefile distinfo mail/spampd/patches: patch-spampd_pl mail/spampd/pkg: PLIST Log message: update to spampd-2.53, ok Henrik Friedrichsen (maintainer) includes fix for a bug may prevent multi-recipient delivery via LMTP
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/03/12 09:27:38 Modified files: www/kwebapp: Makefile distinfo Log message: Update to kwebapp to 0.6.13 also drop the maintainership, requested by Aaron OK abieber@
Re: UPDATE: www/stagit 0.8->0.9.1
On Sun, Mar 10, 2019 at 04:17:32PM +0100, Hiltjo Posthuma wrote:
> Thanks for the feedback. I changed the quotes and added a post-install target
> to move
> the example files in the proper directory.
When moving all files, why not simply adjusting the port's DOCPREFIX?
> At the moment the port does not install the LICENSE file. I wonder if this is
> neccesary?
If the port does not already install it, I usually wouldn't bother.
Other ports such editors/vis for example install a LICENSE containing
detailed information about various pieces used in the port - this makes
sense and does provide meaningful information.
> +post-install:
> + # put examples in the proper directory.
> + mkdir -p ${PREFIX}/share/examples/stagit
> + mv \
That's what INSTALL_DATA_DIR and INSTALL_DATA is for, see bsd.port.mk(5).
Here's a stab at just moving the example scripts into place. README as
well as the assets seem fine where they are and go in line with what
most other ports do.
OK?
PS: Looking at it yet again, I think it would help to document what to
with the logo and CSS sheet you're shipping. It's obviously goes along
with serving the generated HTML document root, but from a user
perspective these files are just laying around, not mentioned or picked
up anywhere else.
I'm thinking of a ports README that maybe ships an httpd.conf(5) example
using your assets, so the steps from installing the package to serving
repos is even more straight forward.
Index: Makefile
===
RCS file: /cvs/ports/www/stagit/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile10 Apr 2018 23:27:51 - 1.7
+++ Makefile10 Mar 2019 17:03:23 -
@@ -2,11 +2,11 @@
COMMENT = static git page generator
-DISTNAME = stagit-0.8
+DISTNAME = stagit-0.9.1
CATEGORIES = www
-HOMEPAGE = https://git.2f30.org/stagit/
+HOMEPAGE = https://codemadness.org/
# MIT/X Consortium License
PERMIT_PACKAGE_CDROM = Yes
@@ -16,14 +16,19 @@ WANTLIB = c git2
LIB_DEPENDS = devel/libgit2/libgit2>=0.22
-MASTER_SITES = https://dl.2f30.org/releases/
+MASTER_SITES = https://codemadness.org/releases/stagit/
-MAKE_FLAGS=CC='${CC}' \
- CFLAGS='${CFLAGS}' \
- COMPATOBJ='' \
- GITINC=${LOCALBASE}/include \
- GITLIB=${LOCALBASE}/lib
+MAKE_FLAGS = CC='${CC}' \
+ CFLAGS='${CFLAGS} -I${LOCALBASE}/include' \
+ LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -lgit2' \
+ COMPATOBJ=''
NO_TEST = Yes
+
+EXAMPLESDIR = ${PREFIX}/share/examples/stagit
+
+post-install:
+ ${INSTALL_DATA_DIR} ${EXAMPLESDIR}/
+ mv ${PREFIX}/share/doc/stagit/example_*.sh ${EXAMPLESDIR}/
.include
Index: distinfo
===
RCS file: /cvs/ports/www/stagit/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo10 Apr 2018 23:27:51 - 1.6
+++ distinfo10 Mar 2019 12:09:08 -
@@ -1,2 +1,2 @@
-SHA256 (stagit-0.8.tar.gz) = 3w0+/hopdY5BUh1Ku8cSvPv+++uDeUXylRIf9oC8KKY=
-SIZE (stagit-0.8.tar.gz) = 17378
+SHA256 (stagit-0.9.1.tar.gz) = hRDMfq5rusctjMYQkuYi0fpxkvGevJrH/lkZIwC/55A=
+SIZE (stagit-0.9.1.tar.gz) = 18426
Index: patches/patch-config_mk
===
RCS file: patches/patch-config_mk
diff -N patches/patch-config_mk
--- patches/patch-config_mk 10 Apr 2018 23:27:51 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-Index: config.mk
config.mk.orig
-+++ config.mk
-@@ -29,4 +29,4 @@ LDFLAGS = -s ${LIBS}
- CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
-
- # OpenBSD 5.9+: use pledge(2)
--#CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE -DUSE_PLEDGE
${INCS}
-+CPPFLAGS += -DUSE_PLEDGE
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/stagit/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 13 Aug 2017 18:51:53 - 1.2
+++ pkg/PLIST 10 Mar 2019 17:03:44 -
@@ -3,10 +3,11 @@
@bin bin/stagit-index
@man man/man1/stagit-index.1
@man man/man1/stagit.1
-share/stagit/
-share/stagit/README
-share/stagit/example_create.sh
-share/stagit/example_post-receive.sh
-share/stagit/favicon.png
-share/stagit/logo.png
-share/stagit/style.css
+share/doc/stagit/
+share/doc/stagit/README
+share/doc/stagit/favicon.png
+share/doc/stagit/logo.png
+share/doc/stagit/style.css
+share/examples/stagit/
+share/examples/stagit/example_create.sh
+share/examples/stagit/example_post-receive.sh
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/03/12 08:43:09 Modified files: games/openclonk: Makefile Log message: Samurai didn't fix the issue either so go back to using gmake. Reported by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/12 08:41:47 Removed files: inputmethods/uim/patches: patch-sigscheme_libgcroots_include_private_gcconfig_h Log message: Forgot to remove patch that was moved to devel/libgcroots instead. build failure noticed by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/03/12 08:00:27 Modified files: security/sqlmap: Makefile distinfo security/sqlmap/pkg: PLIST Log message: Update for SQLMap to 1.3.3: https://github.com/sqlmapproject/sqlmap/compare/1.3.3...master OK benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2019/03/12 07:56:56 Modified files: security/lynis : Makefile distinfo security/lynis/pkg: PLIST Log message: Update for Lynis to 2.7.2: https://cisofy.com/changelog/lynis/#272 OK benoit@
[UPDATE] devel/jd-gui
Hi,
attached is the diff to update jd-gui to latest release.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/jd-gui/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile 24 Apr 2017 03:55:45 - 1.3
+++ Makefile 12 Mar 2019 13:16:15 -
@@ -2,9 +2,8 @@
COMMENT = yet another fast Java decompiler
-VERSION = 1.4.0
+VERSION = 1.4.1
DISTNAME = jd-gui-${VERSION}
-REVISION = 1
CATEGORIES = devel security
Index: distinfo
===
RCS file: /cvs/ports/devel/jd-gui/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 15 Jun 2016 19:12:33 - 1.1.1.1
+++ distinfo 12 Mar 2019 13:16:15 -
@@ -1,2 +1,2 @@
-SHA256 (jd-gui-1.4.0.jar) = vdLz3IdQkQ4NaTeEgs/1fy/ynSOYPR5V0mY5BSe9a2c=
-SIZE (jd-gui-1.4.0.jar) = 8764679
+SHA256 (jd-gui-1.4.1.jar) = Yaxll1nOXiWl41+INf/XrTYgTu8NLIwi57XnaEI+Tbw=
+SIZE (jd-gui-1.4.1.jar) = 9822481
UPDATE: SQLmap-1.3.3
Hello, Update for SQLMap to 1.3.3: https://github.com/sqlmapproject/sqlmap/compare/1.3.3...master OK? Comments? Cheers.- -- Sending from my toaster. Index: Makefile === RCS file: /cvs/ports/security/sqlmap/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile13 Feb 2019 12:53:45 - 1.15 +++ Makefile12 Mar 2019 12:31:04 - @@ -4,7 +4,7 @@ COMMENT = penetration testing tool to d GH_ACCOUNT = sqlmapproject GH_PROJECT = sqlmap -GH_TAGNAME = 1.3.2 +GH_TAGNAME = 1.3.3 CATEGORIES = security Index: distinfo === RCS file: /cvs/ports/security/sqlmap/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo13 Feb 2019 12:53:45 - 1.13 +++ distinfo12 Mar 2019 12:31:04 - @@ -1,2 +1,2 @@ -SHA256 (sqlmap-1.3.2.tar.gz) = Lcz/B7kY2sFHP4MEHF3kJSFg4w7APPWAMoiRW5HPZak= -SIZE (sqlmap-1.3.2.tar.gz) = 7435538 +SHA256 (sqlmap-1.3.3.tar.gz) = eP8z31HR3rcmRYsxDjA99RBRIe1zPX7nz4ZcbINduxg= +SIZE (sqlmap-1.3.3.tar.gz) = 7436437 Index: pkg/PLIST === RCS file: /cvs/ports/security/sqlmap/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 13 Feb 2019 12:53:45 - 1.13 +++ pkg/PLIST 12 Mar 2019 12:31:04 - @@ -1076,8 +1076,12 @@ share/sqlmap/waf/watchguard.py share/sqlmap/waf/watchguard.pyc share/sqlmap/waf/webknight.py share/sqlmap/waf/webknight.pyc +share/sqlmap/waf/webseal.py +share/sqlmap/waf/webseal.pyc share/sqlmap/waf/wordfence.py share/sqlmap/waf/wordfence.pyc +share/sqlmap/waf/wts.py +share/sqlmap/waf/wts.pyc share/sqlmap/waf/yundun.py share/sqlmap/waf/yundun.pyc share/sqlmap/waf/yunsuo.py
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/03/12 06:27:18 Modified files: devel/catch2 : Makefile distinfo Log message: Update catch2 to 2.7.0
Re: NEW: audio/portmidi (unbreak audacity)
On Sun, Mar 10, 2019 at 08:06:59PM +0100, Jeremie Courreges-Anglas wrote:
> On Sun, Mar 10 2019, Raphael Graf wrote:
> > The attached portmidi.tar.gz contains a port of the newest release from
> > 2010.
> > I've added very rudimentary and incomplete support for sndio, it's just
> > enough
> > for playing a midi track via audacity. The sndio stuff is in
> > files/pm_sndio/.
> > It is extremely simple compared to the alsa version (pm_linux). :)
>
> Please comments below,
>
> > Audacity can then use the shared portmidi library instead of the bundled
> > version. The attached audacity.diff does that.
> > It seems to work ok, I've tested midi playback in audacity using fluidsynth.
>
> I'm not sure I understand the rationale for all the changes contained in
> the audacity diff, but it definitely looks like an improvement! Sadly
> it doesn't apply any more, now that audacity has been updated to 2.3.1
> by Antoine.
Attached is an new diff for audacity 2.3.1.
It works for me on amd64/i386, I couldn't test on other archs yet.
I didn't manage to make it work without the do-gen step, mainly because
some of the libs (e.g. FileDialog) where wrongly built as shared libs
instead of static libs.
Any help on improving the patches is welcome.
>
> > Any thoughts or comments?
>
> Regarding portmidi:
> - SHARED_LIBS should start at 0.0 (if only because it tends to prove
> that SHARED_LIBS is honored)
> - java is still needed even if you don't include the pm_java subdir
> and the jni lib is built unconditionally, this is bad for !(x86).
> I think the easiest way to handle it is just to force-disable all
> java-related stuff for now.
> - what is the rationale for the .pc file? Do other distros provide it
> and does audacity depend on it? Is "Version: 1.0" what the ecosystem
> expect?
The .pc file is not provided by other distros, but audacity depends on it.
Building audacity with '-with-portmidi=system' probably never worked.
(see this thread: https://sourceforge.net/p/audacity/mailman/message/36095045/)
Of course, the .pc file should be upstreamed if possible..
You are right that "Version: 1.0" doesn't make any sense. In the attached
tarball, i've changed it to "Version: 217".
portmidi.3.tgz
Description: application/tar-gz
Index: Makefile
===
RCS file: /cvs/ports/audio/audacity/Makefile,v
retrieving revision 1.58
diff -u -p -u -p -r1.58 Makefile
--- Makefile10 Mar 2019 11:45:50 - 1.58
+++ Makefile12 Mar 2019 09:56:51 -
@@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.58 2019/03/10 11:45:50 ajacoutot Exp $
-BROKEN=missing portmidi support
-
COMMENT= free audio editor
V= 2.3.1
@@ -16,35 +14,55 @@ HOMEPAGE= http://audacity.sourceforge.ne
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-# XXX WANTLIB
-
-COMPILER = base-clang ports-gcc base-gcc
-
-BUILD_DEPENDS= archivers/zip \
+WANTLIB += ${COMPILER_LIBCXX} FLAC FLAC++ ICE SDL2 SM SoundTouch
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender Xxf86vm atk-1.0 atk-bridge-2.0 c cairo
+WANTLIB += cairo-gobject epoxy expat ffi fontconfig freetype fribidi
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz iconv id3tag intl
+WANTLIB += jpeg m mad mspack notify ogg pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png16 portaudio portmidi
+WANTLIB += samplerate sndfile sndio soxr tiff usbhid vorbis vorbisenc
+WANTLIB += vorbisfile wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0
+WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0 wx_gtk3u_html-3.0
+WANTLIB += wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0 xcb xcb-render xcb-shm
+WANTLIB += z db jack
+
+COMPILER = base-clang ports-gcc base-gcc
+
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ archivers/zip \
devel/gettext-tools \
+ devel/libtool \
shells/bash
LIB_DEPENDS= x11/wxWidgets>=3.0.4 \
+ audio/jack \
audio/libsoxr \
audio/flac \
audio/libvorbis \
audio/libid3tag \
audio/libmad \
audio/portaudio-svn>=1406p1 \
- audio/soundtouch \
- audio/taglib
+ audio/portmidi \
+ audio/soundtouch
# XXX libtool/ld(1) fail to find libvamp-hostsdk.so
#LIB_DEPENDS+= audio/vamp-plugin-sdk>=2.2.1p0
RUN_DEPENDS= devel/desktop-file-utils \
- misc/shared-mime-info
+ misc/shared-mime-info \
+ x11/gtk+3,-guic
+
+SEPARATE_BUILD= No
USE_GMAKE= Yes
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.15
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" OBJCXX="${CXX}" \
- CPPFLAGS="-I${X11BASE}/include
Unbreak math/veusz on macppc (was: Re: powerpc bulk build report)
Hi ports, Brian,
> http://build-failures.rhaalovely.net//powerpc/2019-02-04/math/veusz.log
The same issue can be found in x11/kde4/marble's patches, it should
use cmath instead of using math.h, and std::.
Testing:
- macppc: The build and tests are fine [1], i did the tutorial without
issues [2]
- amd64: The build and tests are fine as well [3]
Comments (especially because TIMTOWTDI) and feedback are welcome!
Charlène.
[1] http://ix.io/1DhU
[2] https://bsd.network/@julianaito/101737076440210681
[3] http://ix.io/1DhV
Index: Makefile
===
RCS file: /cvs/ports/math/veusz/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile8 Mar 2019 20:00:47 - 1.20
+++ Makefile12 Mar 2019 10:21:51 -
@@ -4,7 +4,7 @@ COMMENT = scientific plotting and graphi
MODPY_EGG_VERSION =3.0.1
DISTNAME = veusz-${MODPY_EGG_VERSION}
CATEGORIES = math graphics
-REVISION = 0
+REVISION = 1
HOMEPAGE = https://veusz.github.io/
MAINTAINER = Brian Callahan
Index: patches/patch-veusz_helpers_src_qtloops_isnan_h
===
RCS file:
/cvs/ports/math/veusz/patches/patch-veusz_helpers_src_qtloops_isnan_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-veusz_helpers_src_qtloops_isnan_h
--- patches/patch-veusz_helpers_src_qtloops_isnan_h 24 Apr 2018 15:24:59
- 1.2
+++ patches/patch-veusz_helpers_src_qtloops_isnan_h 12 Mar 2019 10:21:51
-
@@ -2,25 +2,38 @@ $OpenBSD: patch-veusz_helpers_src_qtloop
clang is better at encapsulating C files, so we don't have a macro for isfinite
or isnan, hence the tests fail!
-
+Also, unbreak the build on ports-gcc by using cmath and std namespace.
Index: veusz/helpers/src/qtloops/isnan.h
--- veusz/helpers/src/qtloops/isnan.h.orig
+++ veusz/helpers/src/qtloops/isnan.h
-@@ -33,7 +33,7 @@
+@@ -23,7 +23,7 @@
+ */
+
+ #include
+-#include
++#include
+ /* You might try changing the above to if you have problems.
+ * Whether you use math.h or cmath, you may need to edit the .cpp file
+ * and/or other .h files to use the same header file.
+@@ -33,8 +33,8 @@
# define isNaN(_a) (__isnan(_a)) /* MacOSX/Darwin definition < 10.4 */
#elif defined(WIN32) || defined(_isnan) || defined(_MSC_VER)
# define isNaN(_a) (_isnan(_a)) /* Win32 definition */
-#elif defined(isnan) || defined(__FreeBSD__) || defined(__osf__)
+-# define isNaN(_a) (isnan(_a))/* GNU definition */
+#elif defined(isnan) || defined(__FreeBSD__) || defined(__OpenBSD__) ||
defined(__osf__)
- # define isNaN(_a) (isnan(_a))/* GNU definition */
++# define isNaN(_a) (std::isnan(_a)) /* GNU definition */
#else
# define isNaN(_a) (std::isnan(_a))
-@@ -50,7 +50,7 @@
+ #endif
+@@ -50,8 +50,8 @@
# define isFinite(_a) (_finite(_a)) /* Win32 definition */
#elif defined(__sgi)
# define isFinite(_a) (_isfinite(_a))
-#elif defined(isfinite) || defined(__FreeBSD__)
+-# define isFinite(_a) (isfinite(_a))
+#elif defined(isfinite) || defined(__FreeBSD__) || defined(__OpenBSD__)
- # define isFinite(_a) (isfinite(_a))
++# define isFinite(_a) (std::isfinite(_a))
#elif defined(__osf__)
# define isFinite(_a) (finite(_a) && !isNaN(_a))
+ #else
update py-zeroconf to 0.21.3
Hi.
Here's an update to py-zeroconf-0.21.3.
It's now py3 only and requires net/py-ifaddr which is attached to this mail.
Not really an issue since the only thing that depends on it is py-chromecast
which is also py3 only.
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/py-zeroconf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile19 Jan 2018 22:23:58 - 1.1.1.1
+++ Makefile12 Mar 2019 10:29:19 -
@@ -2,7 +2,7 @@
COMMENT = pure Python Multicast DNS Service Discovery Library
-MODPY_EGG_VERSION =0.19.1
+MODPY_EGG_VERSION =0.21.3
DISTNAME = zeroconf-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -17,17 +17,8 @@ MODULES =lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-FLAVORS = python3
-FLAVOR ?=
-
-RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
- net/py-netifaces${MODPY_FLAVOR}
-
-.if ! ${FLAVOR:Mpython3}
-RUN_DEPENDS+= devel/py-enum34
-.endif
-
-NO_TEST = Yes
+RUN_DEPENDS = net/py-ifaddr${MODPY_FLAVOR}
.include
Index: distinfo
===
RCS file: /cvs/ports/net/py-zeroconf/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo19 Jan 2018 22:23:58 - 1.1.1.1
+++ distinfo12 Mar 2019 10:29:19 -
@@ -1,2 +1,2 @@
-SHA256 (zeroconf-0.19.1.tar.gz) = Q06rjalSWucl1oQqrn5Z2exlgL3FroTzwiUkC8Z5f3o=
-SIZE (zeroconf-0.19.1.tar.gz) = 22769
+SHA256 (zeroconf-0.21.3.tar.gz) = W1Lf305mXZihe/mqUN6nqMmOJfly2cHXZg4rl4ofVxM=
+SIZE (zeroconf-0.21.3.tar.gz) = 32381
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py 19 Jan 2018 22:23:58 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2018/01/19 22:23:58 jung Exp $
-
-py-enum34 install is handled in port Makefile
-
-Index: setup.py
setup.py.orig
-+++ setup.py
-@@ -55,7 +55,7 @@ setup(
- 'mDNS',
- ],
- install_requires=[
--'enum-compat',
-+#'enum-compat',
- # netifaces 0.10.5 has a bug that results in all interfaces' netmasks
- # to be 255.255.255.255 on Windows which breaks things. See:
- # * https://github.com/jstasiak/python-zeroconf/issues/84
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/py-zeroconf/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 19 Jan 2018 22:23:58 - 1.1.1.1
+++ pkg/PLIST 12 Mar 2019 10:29:19 -
@@ -5,7 +5,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/zeroconf.py
--
Antoine
py-ifaddr.tgz
Description: Binary data
[UPDATE] graphics/p5-Image-ExifTool
Hi,
attached is the diff to update p5-Image-ExifTool to latest production
release.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/graphics/p5-Image-ExifTool/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile 1 Oct 2018 08:23:12 - 1.44
+++ Makefile 12 Mar 2019 09:47:47 -
@@ -2,7 +2,7 @@
COMMENT= read and write meta information in image/audio/video files
-DISTNAME= Image-ExifTool-11.11
+DISTNAME= Image-ExifTool-11.30
CATEGORIES= graphics
HOMEPAGE= http://owl.phy.queensu.ca/~phil/exiftool/
Index: distinfo
===
RCS file: /cvs/ports/graphics/p5-Image-ExifTool/distinfo,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 distinfo
--- distinfo 1 Oct 2018 08:23:12 - 1.37
+++ distinfo 12 Mar 2019 09:47:47 -
@@ -1,2 +1,2 @@
-SHA256 (Image-ExifTool-11.11.tar.gz) = 5k7udc28CUTqWYut5EosEA58lAzn0WPLvQh9K9AM7+s=
-SIZE (Image-ExifTool-11.11.tar.gz) = 4472132
+SHA256 (Image-ExifTool-11.30.tar.gz) = OlNzOhUyvt5M5+7nY+WrK7hxSedehp4Rpk0OFZhYcm4=
+SIZE (Image-ExifTool-11.30.tar.gz) = 4507774
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/p5-Image-ExifTool/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 PLIST
--- pkg/PLIST 13 Jun 2018 12:15:47 - 1.31
+++ pkg/PLIST 12 Mar 2019 09:47:47 -
@@ -151,6 +151,7 @@ ${P5SITE}/Image/ExifTool/Ogg.pm
${P5SITE}/Image/ExifTool/Olympus.pm
${P5SITE}/Image/ExifTool/OpenEXR.pm
${P5SITE}/Image/ExifTool/Opus.pm
+${P5SITE}/Image/ExifTool/PCX.pm
${P5SITE}/Image/ExifTool/PDF.pm
${P5SITE}/Image/ExifTool/PGF.pm
${P5SITE}/Image/ExifTool/PICT.pm
@@ -330,6 +331,7 @@ ${P5SITE}/Image/ExifTool/iWork.pm
@man man/man3p/Image::ExifTool::Olympus.3p
@man man/man3p/Image::ExifTool::OpenEXR.3p
@man man/man3p/Image::ExifTool::Opus.3p
+@man man/man3p/Image::ExifTool::PCX.3p
@man man/man3p/Image::ExifTool::PDF.3p
@man man/man3p/Image::ExifTool::PGF.3p
@man man/man3p/Image::ExifTool::PICT.3p
UPDATE: Lynis-2.7.2
Hello, Update for Lynis to 2.7.2: https://cisofy.com/changelog/lynis/#272 OK? Comments? Cheers.- -- Sending from my toaster. Index: Makefile === RCS file: /cvs/ports/security/lynis/Makefile,v retrieving revision 1.32 diff -u -p -r1.32 Makefile --- Makefile1 Nov 2018 14:22:42 - 1.32 +++ Makefile12 Mar 2019 08:39:57 - @@ -2,7 +2,7 @@ COMMENT= security auditing tool -DISTNAME = lynis-2.7.0 +DISTNAME = lynis-2.7.2 CATEGORIES=security @@ -13,7 +13,7 @@ MAINTAINER= Gonzalo L. R. https://downloads.cisofy.com/lynis/ +MASTER_SITES= https://downloads.cisofy.com/lynis/ PKG_ARCH= * Index: distinfo === RCS file: /cvs/ports/security/lynis/distinfo,v retrieving revision 1.29 diff -u -p -r1.29 distinfo --- distinfo1 Nov 2018 14:22:42 - 1.29 +++ distinfo12 Mar 2019 08:39:57 - @@ -1,2 +1,2 @@ -SHA256 (lynis-2.7.0.tar.gz) = ycubd9zceC3svwbdyjDA6FNgW5kCnY6GrehEmglZvjs= -SIZE (lynis-2.7.0.tar.gz) = 276959 +SHA256 (lynis-2.7.2.tar.gz) = /ebM+NbsCuHpyfSm1kDN3N5L96kvhDfUfRalR34hv9o= +SIZE (lynis-2.7.2.tar.gz) = 281447 Index: pkg/PLIST === RCS file: /cvs/ports/security/lynis/pkg/PLIST,v retrieving revision 1.17 diff -u -p -r1.17 PLIST --- pkg/PLIST 8 Jul 2018 20:57:55 - 1.17 +++ pkg/PLIST 12 Mar 2019 08:39:57 - @@ -34,6 +34,7 @@ share/lynis/db/languages/he share/lynis/db/languages/hu share/lynis/db/languages/it share/lynis/db/languages/ja +share/lynis/db/languages/ko share/lynis/db/languages/nb-NO share/lynis/db/languages/nl share/lynis/db/languages/nl-BE @@ -42,10 +43,12 @@ share/lynis/db/languages/pl share/lynis/db/languages/pt share/lynis/db/languages/ru share/lynis/db/languages/se +share/lynis/db/languages/sk share/lynis/db/languages/tr share/lynis/db/malware-susp.db share/lynis/db/malware.db share/lynis/db/sbl.db +share/lynis/db/software-eol.db share/lynis/db/tests.db @mode 0755 share/lynis/include/
