FIX sysutils/syslog-ng build with json-c 0.13
Diff below fixes sysutils/syslog-ng build with json-c 0.13. Build tested
OK with both json-c 0.12 and json-c 0.13.
Maintainer responded with "That looks fine, but I did not test it."
OK?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile11 Jan 2018 19:27:11 - 1.62
+++ Makefile12 Feb 2018 06:32:00 -
@@ -6,7 +6,7 @@ V = 3.12.1
REL = 3.12
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
-REVISION = 3
+REVISION = 4
MAINTAINER = Steven Mestdagh
Index: patches/patch-modules_json_json-parser_c
===
RCS file: patches/patch-modules_json_json-parser_c
diff -N patches/patch-modules_json_json-parser_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-modules_json_json-parser_c12 Feb 2018 06:32:00 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+Fix build with json-c 0.13.
+https://github.com/balabit/syslog-ng/pull/1810
+
+Index: modules/json/json-parser.c
+--- modules/json/json-parser.c.orig
modules/json/json-parser.c
+@@ -20,6 +20,8 @@
+ * COPYING for details.
+ */
+
++#define JSON_C_VER_013 (13 << 8)
++
+ #include "json-parser.h"
+ #include "dot-notation.h"
+ #include "scratch-buffers.h"
+@@ -28,7 +30,10 @@
+ #include
+
+ #include
++
++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+ #include
++#endif
+
+ typedef struct _JSONParser
+ {
Re: removal www/newsbeuter
On Sun, Feb 11, 2018 at 09:16:47PM GMT, Remi Locherer wrote: > On Sun, Feb 11, 2018 at 07:46:19PM +0100, Björn Ketelaars wrote: > > newsbeuter has been abandoned almost 6 months ago. There is however an > > active maintained fork available (https://newsboat.org), which is in > > ports: www/newsboat. > > > > Any objections to sending www/newsbeuter to the attic? > > I switched to newsboat after it was imported and that was very smooth. FWIW, I've done the same - also, without any issues. > ok remi@ for the removal of www/newsbeuter. > > I think we also want a quirks entry so that people running newsbeuter > get newsboat with the next pkg_add -u. IMVHO, good idea. Raf > > > > -- > > Björn Ketelaars > > GPG key: 0x4F0E5F21 >
Re: removal www/newsbeuter
Sun, 11 Feb 2018 19:46:19 +0100 Björn Ketelaars > newsbeuter has been abandoned almost 6 months ago. There is however an > active maintained fork available (https://newsboat.org), which is in > ports: www/newsboat. > > Any objections to sending www/newsbeuter to the attic? > no, bin it
Re: new www/py-yarl [hass: #11]
On Wed, Jan 17, 2018 at 09:57:03PM +0100, Joerg Jung wrote: > On Wed, Jan 17, 2018 at 09:14:57PM +0100, Klemens Nanni wrote: > > On Wed, Jan 17, 2018 at 08:34:28PM +0100, Joerg Jung wrote: > > > On Wed, Jan 17, 2018 at 12:12:06AM +0100, Joerg Jung wrote: > > > > Hi, > > > > > > > > please find attached a new port for www/py-yarl. > > > > > > > >$ cat pkg/DESCR > > > >Yet another URL library. > > > > > > > > This port is a dependency for the upcoming homeassistant port. > > > > > > Meanwhile yarl-1.0.0 was release. Newer version is attached. > > > > > > > Please test and comment. OK to import? > > > > In addition I'd like to add minimal version requirements to its RDEPS, > > see diff below ontop of your tarball. > > Thanks, added. New tarball attached. As discussed off-list, I'm helping Joerg with his hass collection. Upstream's new release does work fine here but as it bumps minimal dependency requirements this is best to be dealt with in a separate update. 1.1.0 (2018-01-21) Make pure Python quoter consistent with Cython version (#162) OK to import jung's 1.0.0 tarball with his OK?
Re: removal www/newsbeuter
On Sun, Feb 11, 2018 at 07:46:19PM +0100, Björn Ketelaars wrote: > newsbeuter has been abandoned almost 6 months ago. There is however an > active maintained fork available (https://newsboat.org), which is in > ports: www/newsboat. > > Any objections to sending www/newsbeuter to the attic? I switched to newsboat after it was imported and that was very smooth. ok remi@ for the removal of www/newsbeuter. I think we also want a quirks entry so that people running newsbeuter get newsboat with the next pkg_add -u. > > -- > Björn Ketelaars > GPG key: 0x4F0E5F21
[PATCH] sysutils/ansible
It looks like the contents of DESCR-main and DESCR-html is mixed in sysutils/ansibl. Regards Holger Index: DESCR-html === RCS file: /cvs/ports/sysutils/ansible/pkg/DESCR-html,v retrieving revision 1.1 diff -u -p -u -r1.1 DESCR-html --- DESCR-html 29 Jul 2017 18:33:18 - 1.1 +++ DESCR-html 11 Feb 2018 20:17:56 - @@ -3,4 +3,5 @@ management, deployment, and ad-hoc task core areas of focus include multi-node deployment, rolling updates, and parallel orchestration. -This package contains Ansible itself. +This package contains Ansible HTML documentation, also available +online at http://docs.ansible.com/ansible/ Index: DESCR-main === RCS file: /cvs/ports/sysutils/ansible/pkg/DESCR-main,v retrieving revision 1.1 diff -u -p -u -r1.1 DESCR-main --- DESCR-main 29 Jul 2017 18:33:18 - 1.1 +++ DESCR-main 11 Feb 2018 20:17:56 - @@ -3,5 +3,4 @@ management, deployment, and ad-hoc task core areas of focus include multi-node deployment, rolling updates, and parallel orchestration. -This package contains Ansible HTML documentation, also available -online at http://docs.ansible.com/ansible/ +This package contains Ansible itself.
Re: removal www/newsbeuter
On 2018/02/11 19:46, Björn Ketelaars wrote: > newsbeuter has been abandoned almost 6 months ago. There is however an > active maintained fork available (https://newsboat.org), which is in > ports: www/newsboat. > > Any objections to sending www/newsbeuter to the attic? No objections here, please send a diff before committing though just so we can check everything's ok. What do you think is best for quirks? Are the two compatible enough that it would be sane to auto update from newsbeuter to newsboat, or would it be better to add to $obsolete_reason as "no longer maintained upstream", maybe with an faq/current.html mention about it?
[NEW] www/tidy-html5
Hello @ports, Here is a port for tidy-html5 (5.6.0) - http://www.html-tidy.org >From pkg/DESCR: Tidy is a console application and C library that corrects and cleans up HTML and XML documents by fixing markup errors and upgrading legacy code to modern standards. This is the the updated 2015 successor to the W3C's original html-tidy, now maintained and updated by the HTACG (HTML Tidy Advocacy Community Group). This is my first port submission, so any feedback would be appreciated. I read the OpenBSD Porting Guide and enjoyed learning about how these tools work, but expect to have made some mistakes. I hope to be able to learn from them and contribute more over time. Thank you, Adam tidy-html5.tar.gz Description: GNU Zip compressed data
removal www/newsbeuter
newsbeuter has been abandoned almost 6 months ago. There is however an active maintained fork available (https://newsboat.org), which is in ports: www/newsboat. Any objections to sending www/newsbeuter to the attic? -- Björn Ketelaars GPG key: 0x4F0E5F21
[new] geo/py-fiona and deps
Hi, a new port for http://toblerity.org/fiona/ which is a commandline and a python library around gdal/ogr (not using the gdal python bindings) to query/manipulate/build pipelines around geodata. The tarball also includes py-munch, py-cligj and py-click-plugins as dependencies. All of them have a python3 flavor. Feedback welcome. Landry fiona-and-deps.tgz Description: application/tar-gz
fix sysutils/rsyslog when building with jsonc 0.13
The diff below fixes building with jsonc 0.13, while building with 0.12 still works. Comments? -- Björn Ketelaars GPG key: 0x4F0E5F21 diff --git Makefile Makefile index a1a2ba1c783..117f2f3ab84 100644 --- Makefile +++ Makefile @@ -14,7 +14,7 @@ PKGNAME-main =rsyslog-$V PKGNAME-mysql =rsyslog-mysql-$V PKGNAME-pgsql =rsyslog-pgsql-$V CATEGORIES = sysutils -REVISION-main =3 +REVISION-main =4 REVISION-mysql = 1 REVISION-pgsql = 1 diff --git patches/patch-runtime_msg_c patches/patch-runtime_msg_c new file mode 100644 index 000..e785fbdf27c --- /dev/null +++ patches/patch-runtime_msg_c @@ -0,0 +1,24 @@ +$OpenBSD$ + +Index: runtime/msg.c +--- runtime/msg.c.orig runtime/msg.c +@@ -27,6 +27,8 @@ + * A copy of the GPL can be found in the file "COPYING" in this distribution. + * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution. + */ ++#define JSON_C_VER_013 (13 << 8) ++ + #include "config.h" + #include + #include +@@ -43,7 +45,9 @@ + #include + #include + /* For struct json_object_iter, should not be necessary in future versions */ ++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013) + #include ++#endif + #if HAVE_MALLOC_H + # include + #endif
Re: UPDATE: lang/go 1.9.2 -> 1.9.3
On Sun, Feb 04, 2018 at 03:06:47PM -0500, David Hill wrote:
> Should probably just wait until 1.9.4..
>
> https://groups.google.com/forum/#!topic/golang-announce/lGkem2e5WyQ
>
> On Sun, Feb 04, 2018 at 07:50:06PM +0100, Klemens Nanni wrote:
> > Straight forward update working fine with all tests passing on amd64:
> >
> > go1.9.3 (released 2018/01/22) includes fixes to the compiler,
> > runtime, and the database/sql, math/big, net/http, and net/url
> > packages. See the Go 1.9.3 milestone[0] on our issue tracker for
> > details.
> >
> > 0: https://github.com/golang/go/issues?q=milestone%3AGo1.9.3
> >
> > Can anyone test this on i386, please?
> >
> > I also took the liberty and changed do-install so that it's shorter and
> > a bit easier to read. find(1) walks have been merged, GOCFG used where
> > appropiate and one level of indentation removed from the .for loop.
Here's 1.9.4:
go1.9.4 (released 2018/02/07) includes a security fix to “go get”.
See the Go 1.9.4 milestone[1] on our issue tracker for details.
1: https://github.com/golang/go/issues?q=milestone%3AGo1.9.4
Here's the issue: https://github.com/golang/go/issues/23672
This probably hits 1.9 in stable as well, Joel?
Feedback?
Index: Makefile
===
RCS file: /cvs/ports/lang/go/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile28 Nov 2017 16:27:21 - 1.48
+++ Makefile11 Feb 2018 16:06:31 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS =${GO_ARCHS}
COMMENT = Go programming language
-VERSION = 1.9.2
+VERSION = 1.9.4
EXTRACT_SUFX = .src.tar.gz
DISTNAME = go${VERSION}
PKGNAME = go-${VERSION}
@@ -22,7 +22,8 @@ WANTLIB = c pthread
MASTER_SITES = https://golang.org/dl/
-BUILD_DEPENDS =lang/go-bootstrap shells/bash
+BUILD_DEPENDS =lang/go-bootstrap \
+ shells/bash
SEPARATE_BUILD = simple
CONFIGURE_STYLE = None
@@ -47,11 +48,10 @@ GOARCH =386
GOCFG =/${GOOS}_${GOARCH}
do-configure:
-. if ${GOARCH} == "unknown"
- @echo "Unable to determine GOARCH for ${MACHINE_ARCH}."
- @exit 1
-. endif
-
+.if ${GOARCH} == "unknown"
+ @echo "Unable to determine GOARCH for ${MACHINE_ARCH}."
+ @exit 1
+.endif
do-build:
@cd ${WRKSRC} && \
@@ -69,34 +69,26 @@ do-test:
PATH=${WRKDIST}/bin:${PATH} GOROOT=${WRKDIST} ./run.bash
do-install:
- ${INSTALL_PROGRAM_DIR} ${GOROOT}
-
- ${INSTALL_PROGRAM_DIR} ${GOROOT}/bin
- ${INSTALL_PROGRAM} -p ${WRKDIST}/bin/go{,fmt} ${GOROOT}/bin
+ ${INSTALL_PROGRAM_DIR} ${GOROOT}{,/bin}
- @cd ${PREFIX}/bin && \
- ln -sf ../go/bin/go go
- @cd ${PREFIX}/bin && \
- ln -sf ../go/bin/gofmt gofmt
-
- @cd ${WRKDIST} && \
- find . -type f -maxdepth 1 \
- -exec ${INSTALL_DATA} -p {} \
- ${GOROOT} \;
-
-. for dir in api doc lib misc src pkg/include pkg/obj pkg/${GOCFG} test
- @cd ${WRKDIST} && \
- find ${dir} -type d \
- -exec ${INSTALL_DATA_DIR} \
- ${GOROOT}/{} \;
- @cd ${WRKDIST} && \
- find ${dir} ! -name \*.orig -type f \
- -exec ${INSTALL_DATA} -p {} \
- ${GOROOT}/{} \;
-. endfor
-
- ${INSTALL_PROGRAM_DIR} ${GOROOT}/pkg/tool/${GOOS}_${GOARCH}
- ${INSTALL_PROGRAM} -p ${WRKDIST}/pkg/tool/${GOOS}_${GOARCH}/* \
- ${GOROOT}/pkg/tool/${GOOS}_${GOARCH}
+.for prog in go gofmt
+ ${INSTALL_PROGRAM} -p ${WRKDIST}/bin/${prog} ${GOROOT}/bin
+ @ln -s ../go/bin/${prog} ${PREFIX}/bin/${prog}
+.endfor
+
+ find ${WRKDIST} -maxdepth 1 -type f \
+ -exec ${INSTALL_DATA} -p {} ${GOROOT} \;
+
+.for dir in api doc lib misc src pkg/include pkg/obj pkg/${GOCFG} test
+ cd ${WRKDIST} && \
+ find ${dir} -type d \
+ -exec ${INSTALL_DATA_DIR} ${GOROOT}/{} \; \
+ -o -type f ! -name \*.orig \
+ -exec ${INSTALL_DATA} -p {} ${GOROOT}/{} \;
+.endfor
+
+ ${INSTALL_PROGRAM_DIR} ${GOROOT}/pkg/tool/${GOCFG}
+ ${INSTALL_PROGRAM} -p ${WRKDIST}/pkg/tool/${GOCFG}/* \
+ ${GOROOT}/pkg/tool/${GOCFG}
.include
Index: distinfo
===
RCS file: /cvs/ports/lang/go/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo28 Nov 2017 16:27:21 - 1.28
+++ distinfo11 Feb 2018 16:06:31 -
@@ -1,2 +1,2 @@
-SHA256 (go1.9.2.src.tar.gz) = Zl8YS/isiZhs/VpEYHNpdvYLV99rMgrXGtTO9TuxQ9w=
-SIZE (go1.9.2.src.ta
Re: UPDATE: graphics/feh 2.20 -> 2.23.1
On Fri, Feb 02, 2018 at 02:36:33PM +0100, Klemens Nanni wrote:
> On Wed, Jan 31, 2018 at 08:06:54PM +, Stuart Henderson wrote:
> > On 2018/01/31 20:54, Klemens Nanni wrote:
> > > * The Makefile no longer honors CPPFLAGS and instead consistently uses
> > > CFLAGS for user-provided include paths
> >
> > CPPFLAGS would usually be the better place for include paths ...
> Same goes for `-D_VAR=1' but you'll find inconsistent usage in nearly
> all projects.
>
> Is this a blocker for you? I'd like to get this update in.
>
Now with devel/p5-Test-Command in tree:
All tests successful.
Files=2, Tests=74, 1 wallclock secs ( 0.04 usr 0.06 sys + 0.20 cusr
0.43 csys = 0.73 CPU)
Result: PASS
Haven't heard from MAINTAINER so far since 29.01.2018.
OK?
Index: Makefile
===
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile7 Dec 2017 13:12:44 - 1.88
+++ Makefile11 Feb 2018 15:30:24 -
@@ -2,12 +2,12 @@
COMMENT= lightweight image viewer
-DISTNAME= feh-2.20
+DISTNAME= feh-2.23.1
EXTRACT_SUFX= .tar.bz2
CATEGORIES=graphics
FIX_EXTRACT_PERMISSIONS=Yes
-HOMEPAGE= http://feh.finalrewind.org/
+HOMEPAGE= https://feh.finalrewind.org/
MAINTAINER=David Coppa
@@ -24,21 +24,21 @@ LIB_DEPENDS=graphics/imlib2 \
RUN_DEPENDS+= devel/desktop-file-utils \
x11/gtk+3,-guic
+TEST_DEPENDS= devel/p5-Test-Command
CFLAGS+= -I${LOCALBASE}/include \
-I${X11BASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
-MAKE_FLAGS=LDFLAGS="${LDFLAGS}" man_dir="${DESTDIR}${PREFIX}/man" \
- example_dir="${DESTDIR}${PREFIX}/share/examples/feh"
+MAKE_FLAGS=LDFLAGS="${LDFLAGS}" \
+ man_dir="${DESTDIR}${PREFIX}/man" \
+ example_dir="${DESTDIR}${PREFIX}/share/examples/feh" \
+ exif=1
FAKE_FLAGS=PREFIX="${PREFIX}"
USE_GMAKE= Yes
-NO_TEST= Yes
-
-post-configure:
+pre-configure:
${SUBST_CMD} ${WRKSRC}/examples/themes ${WRKSRC}/man/feh.pre \
- ${WRKSRC}/src/events.c ${WRKSRC}/src/keyevents.c \
- ${WRKSRC}/src/options.c
+ ${WRKSRC}/src/{events,keyevents,options}.c
.include
Index: distinfo
===
RCS file: /cvs/ports/graphics/feh/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- distinfo8 Sep 2017 08:19:20 - 1.55
+++ distinfo11 Feb 2018 15:30:24 -
@@ -1,2 +1,2 @@
-SHA256 (feh-2.20.tar.bz2) = S1BDAgmext0JnITdfihcgNwxiXfr2kiUlZM4a8JucAs=
-SIZE (feh-2.20.tar.bz2) = 2129466
+SHA256 (feh-2.23.1.tar.bz2) = m8Fk0IY9QSAb0lOiZS3O5YBqnGqLWRi7i6CfzubX6b4=
+SIZE (feh-2.23.1.tar.bz2) = 2130373
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/graphics/feh/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile
--- patches/patch-Makefile 9 Jun 2017 10:20:22 - 1.6
+++ patches/patch-Makefile 11 Feb 2018 15:30:24 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.6 2017/06/0
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -90,6 +90,7 @@ install-examples:
+@@ -91,6 +91,7 @@ install-examples:
@echo installing examples to ${example_dir}
@mkdir -p ${example_dir}
@cp examples/* ${example_dir}
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/graphics/feh/patches/patch-config_mk,v
retrieving revision 1.8
diff -u -p -r1.8 patch-config_mk
--- patches/patch-config_mk 30 Aug 2016 14:44:37 - 1.8
+++ patches/patch-config_mk 11 Feb 2018 15:30:24 -
@@ -2,24 +2,19 @@ $OpenBSD: patch-config_mk,v 1.8 2016/08/
zap redundant CFLAGS
-enable builtin EXIF support
+fix "filelist.c:253:45: error: use of undeclared identifier 'alphasort'"
config.mk.orig Sun Aug 28 22:25:42 2016
-+++ config.mk Tue Aug 30 16:29:18 2016
-@@ -7,7 +7,7 @@ curl ?= 1
- debug ?= 0
- help ?= 0
- xinerama ?= 1
--exif ?= 0
-+exif ?= 1
-
- # Prefix for all installed files
- PREFIX ?= /usr/local
-@@ -32,7 +32,6 @@ scalable_icon_dir = ${icon_dir}/scalable/apps
+Index: config.mk
+--- config.mk.orig
config.mk
+@@ -35,10 +35,6 @@ scalable_icon_dir = ${icon_dir}/scalable/apps
# default CFLAGS
CFLAGS ?= -g -O2
-CFLAGS += -Wall -Wextra -pedantic
+-
+-# Settings for glibc >= 2.19 - may need to be adjusted for other systems
+-CFLAGS += -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
ifeq (${curl},1)
CFLAGS += -DHAVE_LIBCURL
Index: patches/patch-man_feh_pre
===
RCS file: /cvs/ports/graphics/feh/patches/patch-man_feh_pre,v
retrieving revision 1.40
diff -u -p -r1.40 patch-man_feh_p
Re: UPDATE devel/json-c
On Sun, Feb 11, 2018 at 04:06:22PM +0100, Björn Ketelaars wrote: > On Sun 11/02/2018 11:17, Landry Breuil wrote: > > On Sun, Feb 11, 2018 at 10:47:16AM +0100, Landry Breuil wrote: > > > On Sun, Feb 11, 2018 at 10:17:40AM +0100, Jeremie Courreges-Anglas wrote: > > > > On Sun, Feb 11 2018, Landry Breuil wrote: > > > > >> > > Of the 23 victims of devel/json-c I only tested net/isc-bind > > > > >> > > (rndc-confgen to be more precise), which seems to work ok. It > > > > >> > > would be > > > > >> > > great if more people could check if this update works for them. > > > > >> > > > > > >> > I suppose that means "i've built all of them but only > > > > >> > runtime-tested > > > > >> > bind", right ? :) > > > > >> > > > > >> ...not exactly. Let me rephrase the last bit: > > > > >> > > > > >> I only built tested 2 victims, and runtime tested isc-bind. > > > > > > > > > > Right. In the past json-c has proven itself "interesting" when > > > > > upgrading > > > > > it, so i'll put this diff in my next bulk along cmake stuff. > > > > > > > > I have tried an upgrade to the 0.13 release, some of the structures are > > > > made opaque, which either breaks consumers or forces them to implement > > > > ugly hacks. So unless I missed something, upgrading to 0.13 is not > > > > possible. > > > > > > It is definitely possible, json-c fucks up headers/structs at every > > > upgrade, we're used to it. > > > > > > FreeBSD upgraded it already, cf > > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224675 & > > > https://svnweb.freebsd.org/ports?view=revision&revision=457965 > > > so the way is paved. Just need to cherrypick fixes/hacks there and > > > there. Locally, i already know gdal and postgis fail to build with > > > json-c 0.13. > > > > > > > FreeBSD decided to keep installing the private header to fix things, > > Cf > > https://svnweb.freebsd.org/ports/head/devel/json-c/Makefile?r1=457965&r2=457964&pathrev=457965 > > > > An option is to do the same - Granted, this is not the clean way to go, > > and hopefully over time consumers will stop including it directly. The > > other options is to look at consumers and backport/cherrypick fixes. > > > > For example gdal was properly fixed in > > https://github.com/OSGeo/gdal/pull/277, postgis in > > https://github.com/postgis/postgis/pull/173 and both stopped poking at > > internal struct members. > > > > Landry > > I prefer fixing the consumers, as their upcoming releases support > building with json-c 0.13. I have created diffs for: > > geo/gdal https://arcfour.nl/H8QhDVZ6Kv > geo/postgis https://arcfour.nl/v2J0dq9V68 I've already done those and was about to commit them (tested with json-c 0.12 and 0.13), sorry for duplicating work. > sysutils/syslog-nghttps://arcfour.nl/hZGVidSDhy That one looks okay to me.
Re: UPDATE devel/json-c
On Sun 11/02/2018 11:17, Landry Breuil wrote: > On Sun, Feb 11, 2018 at 10:47:16AM +0100, Landry Breuil wrote: > > On Sun, Feb 11, 2018 at 10:17:40AM +0100, Jeremie Courreges-Anglas wrote: > > > On Sun, Feb 11 2018, Landry Breuil wrote: > > > >> > > Of the 23 victims of devel/json-c I only tested net/isc-bind > > > >> > > (rndc-confgen to be more precise), which seems to work ok. It > > > >> > > would be > > > >> > > great if more people could check if this update works for them. > > > >> > > > > >> > I suppose that means "i've built all of them but only runtime-tested > > > >> > bind", right ? :) > > > >> > > > >> ...not exactly. Let me rephrase the last bit: > > > >> > > > >> I only built tested 2 victims, and runtime tested isc-bind. > > > > > > > > Right. In the past json-c has proven itself "interesting" when upgrading > > > > it, so i'll put this diff in my next bulk along cmake stuff. > > > > > > I have tried an upgrade to the 0.13 release, some of the structures are > > > made opaque, which either breaks consumers or forces them to implement > > > ugly hacks. So unless I missed something, upgrading to 0.13 is not > > > possible. > > > > It is definitely possible, json-c fucks up headers/structs at every > > upgrade, we're used to it. > > > > FreeBSD upgraded it already, cf > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224675 & > > https://svnweb.freebsd.org/ports?view=revision&revision=457965 > > so the way is paved. Just need to cherrypick fixes/hacks there and > > there. Locally, i already know gdal and postgis fail to build with > > json-c 0.13. > > > > FreeBSD decided to keep installing the private header to fix things, > Cf > https://svnweb.freebsd.org/ports/head/devel/json-c/Makefile?r1=457965&r2=457964&pathrev=457965 > > An option is to do the same - Granted, this is not the clean way to go, > and hopefully over time consumers will stop including it directly. The > other options is to look at consumers and backport/cherrypick fixes. > > For example gdal was properly fixed in > https://github.com/OSGeo/gdal/pull/277, postgis in > https://github.com/postgis/postgis/pull/173 and both stopped poking at > internal struct members. > > Landry I prefer fixing the consumers, as their upcoming releases support building with json-c 0.13. I have created diffs for: geo/gdalhttps://arcfour.nl/H8QhDVZ6Kv geo/postgis https://arcfour.nl/v2J0dq9V68 sysutils/syslog-ng https://arcfour.nl/hZGVidSDhy Actually, other people created diffs. I only applied, and build tested them. My intention is to mail the maintainers of the above and explain what I want to do. -- Björn Ketelaars GPG key: 0x4F0E5F21
UPDATE: devel/intellij 2017.3.4
Hi ports@,
Below is a diff that updates devel/intellij to 2017.3.4. Tested on
amd64.
Thanks,
Caspar Schutijser
Index: Makefile
===
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile31 Dec 2017 13:48:24 - 1.47
+++ Makefile11 Feb 2018 13:35:41 -
@@ -2,7 +2,7 @@
COMMENT= IntelliJ IDEA Java IDE
-V= 2017.3.2
+V= 2017.3.4
DISTNAME= ideaIC-${V}
PKGNAME= intellij-${V}
CATEGORIES=devel
@@ -26,7 +26,7 @@ NO_TEST= Yes
SUBST_VARS+= JAVA_HOME
-WRKDIST= ${WRKDIR}/idea-IC-173.4127.27
+WRKDIST= ${WRKDIR}/idea-IC-173.4548.28
IJ=${PREFIX}/intellij
# If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
Index: distinfo
===
RCS file: /cvs/ports/devel/intellij/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo31 Dec 2017 13:48:24 - 1.28
+++ distinfo11 Feb 2018 13:35:41 -
@@ -1,2 +1,2 @@
-SHA256 (ideaIC-2017.3.2.tar.gz) = cMxPNqZRfHr5gEVnWCFEFOp0xcTzFOzzDdJkBgC63WI=
-SIZE (ideaIC-2017.3.2.tar.gz) = 456748591
+SHA256 (ideaIC-2017.3.4.tar.gz) = iT6Sq09gvABq5MMKGwTQkJYPLMnfjA7n51DW+nN0Gpc=
+SIZE (ideaIC-2017.3.4.tar.gz) = 457068423
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/intellij/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST
--- pkg/PLIST 22 Dec 2017 22:49:38 - 1.29
+++ pkg/PLIST 11 Feb 2018 13:35:42 -
@@ -111,7 +111,7 @@ intellij/lib/coverage-instrumenter.jar
intellij/lib/coverage-util.jar
intellij/lib/cucumber-core-1.2.4.jar
intellij/lib/cucumber-groovy-1.2.4.jar
-intellij/lib/ecj-4.6.2.jar
+intellij/lib/ecj-4.7.2.jar
intellij/lib/emma.jar
intellij/lib/extensions.jar
intellij/lib/external-system-rt.jar
@@ -145,7 +145,7 @@ intellij/lib/jayatana-1.2.4.jar
intellij/lib/jcip-annotations.jar
intellij/lib/jdkAnnotations.jar
intellij/lib/jdom.jar
-intellij/lib/jediterm-pty-2.5.jar
+intellij/lib/jediterm-pty-2.6.jar
intellij/lib/jgoodies-common-1.2.1.jar
intellij/lib/jgoodies-forms.jar
intellij/lib/jgoodies-looks-2.4.2.jar
Re: NEW: devel/p5-Test-Command
On Mon, Feb 05, 2018 at 07:03:16PM +0100, Alexander Bluhm wrote: > On Sun, Jan 28, 2018 at 04:34:59AM +0100, Klemens Nanni wrote: > > Test::Command is a TEST_DEPENDS for the upcoming graphics/feh-2.23 > > update, all tests (for this port) pass. > > OK bluhm@ > Imported, thanks.
Re: [NEW] devel/p5-System-Info
On 02/09/2018 02:32 PM, James E Keenan wrote:
On 02/09/2018 02:22 PM, Alexander Bluhm wrote:
On Wed, Feb 07, 2018 at 12:45:23PM -0500, James E Keenan wrote:
Here is a new port, for Perl extension System-Info (version 0.56)
(http://search.cpan.org/dist/System-Info/).
OK bluhm@, someone may import it
You have p5-Test-NoWarnings in TEST_DEPENDS which is correct as it
is only used in t/sysinfo.t. But Makefile.PL lists it as PREREQ_PM
and I think it should be TEST_REQUIRES there. This is not relevant
for OpenBSD as the port relies only on its Makefile, but you may
want to report it upstream.
Thanks. I will take that up with the upstream maintainer.
I've filed a pull request with upstream. However, I don't think that we
need to wait around for them to act on the p.r. to proceed with this
port. This is a situation where the number of keystrokes I had to
change in the Makefile.PL is greater than the number of characters
changed in the files built!
The kind of elements that one can provide to
ExtUtil::MakeMaker::WriteMakefile() have evolved over time. In the past
decade, that evolution has mainly been in the direction of writing
better *metadata files* (META.json and META.yml) rather than a better
*Makefile*. The TEST_REQUIRES element only became available in
MakeMaker version 6.64. To take advantage of this element, I have to
patch System-Build's Makefile.PL as follows:
#
$ git diff -w HEAD^.. -- Makefile.PL
diff --git a/Makefile.PL b/Makefile.PL
index 8d283eb..75ea273 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -12,13 +12,17 @@ my %wm = (
AUTHOR => [ "H.Merijn Brand ",
"Abe Timmerman " ],
VERSION_FROM => "lib/System/Info.pm",
-PREREQ_PM => { "Test::More" => 0.88,
- "Test::NoWarnings" => 0,
- },
macro=> { TARFLAGS => "--format=ustar -c -v -f",
},
);
$ExtUtils::MakeMaker::VERSION > 6.30 and $wm{LICENSE} = "perl";
+my $test_requires = {
+"Test::More" => 0.88,
+"Test::NoWarnings" => 0,
+};
+($ExtUtils::MakeMaker::VERSION >= 6.64)
+? $wm{TEST_REQUIRES}= $test_requires
+: $wm{PREREQ_PM}= $test_requires;
my $rv = WriteMakefile (%wm);
#
This has no impact at all on the operation of 'make' or 'make test'.
It's only when one comes to 'make dist' (or 'make distdir') that one can
see the impact on the META.json file generated by the latter command.
#
$ diff -w ~/learn/perl/system-info-0.057-meta.json
./System-Info-0.057/META.json
34c34
< "runtime" : {
---
> "test" : {
#
Thank you very much.
Jim Keenan
The distinction between 'runtime' and 'test' there is one that has no
impact on the users of CPAN distributions. It only matters to people
who are working on the CPAN toolchain.
Since ExtUtil::MakeMaker's 'make dist' command is only relevant when a
module producer is preparing a module for CPAN upload or other
distribution, I suspect that an OpenBSD package or ports user -- a
module user -- is never going to run it.
Hence, I suspect that the System-Info maintainers will only accept my
p.r. if they want to roll it in as they are doing other work on the
distribution. So we shouldn't wait for them to change their Makefile.PL
before we port the current version to OpenBSD.
Re: UPDATE devel/json-c
On Sun, Feb 11, 2018 at 10:47:16AM +0100, Landry Breuil wrote: > On Sun, Feb 11, 2018 at 10:17:40AM +0100, Jeremie Courreges-Anglas wrote: > > On Sun, Feb 11 2018, Landry Breuil wrote: > > >> > > Of the 23 victims of devel/json-c I only tested net/isc-bind > > >> > > (rndc-confgen to be more precise), which seems to work ok. It would > > >> > > be > > >> > > great if more people could check if this update works for them. > > >> > > > >> > I suppose that means "i've built all of them but only runtime-tested > > >> > bind", right ? :) > > >> > > >> ...not exactly. Let me rephrase the last bit: > > >> > > >> I only built tested 2 victims, and runtime tested isc-bind. > > > > > > Right. In the past json-c has proven itself "interesting" when upgrading > > > it, so i'll put this diff in my next bulk along cmake stuff. > > > > I have tried an upgrade to the 0.13 release, some of the structures are > > made opaque, which either breaks consumers or forces them to implement > > ugly hacks. So unless I missed something, upgrading to 0.13 is not > > possible. > > It is definitely possible, json-c fucks up headers/structs at every > upgrade, we're used to it. > > FreeBSD upgraded it already, cf > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224675 & > https://svnweb.freebsd.org/ports?view=revision&revision=457965 > so the way is paved. Just need to cherrypick fixes/hacks there and > there. Locally, i already know gdal and postgis fail to build with > json-c 0.13. > FreeBSD decided to keep installing the private header to fix things, Cf https://svnweb.freebsd.org/ports/head/devel/json-c/Makefile?r1=457965&r2=457964&pathrev=457965 An option is to do the same - Granted, this is not the clean way to go, and hopefully over time consumers will stop including it directly. The other options is to look at consumers and backport/cherrypick fixes. For example gdal was properly fixed in https://github.com/OSGeo/gdal/pull/277, postgis in https://github.com/postgis/postgis/pull/173 and both stopped poking at internal struct members. Landry
Re: UPDATE devel/json-c
On Sun, Feb 11, 2018 at 10:17:40AM +0100, Jeremie Courreges-Anglas wrote: > On Sun, Feb 11 2018, Landry Breuil wrote: > >> > > Of the 23 victims of devel/json-c I only tested net/isc-bind > >> > > (rndc-confgen to be more precise), which seems to work ok. It would be > >> > > great if more people could check if this update works for them. > >> > > >> > I suppose that means "i've built all of them but only runtime-tested > >> > bind", right ? :) > >> > >> ...not exactly. Let me rephrase the last bit: > >> > >> I only built tested 2 victims, and runtime tested isc-bind. > > > > Right. In the past json-c has proven itself "interesting" when upgrading > > it, so i'll put this diff in my next bulk along cmake stuff. > > I have tried an upgrade to the 0.13 release, some of the structures are > made opaque, which either breaks consumers or forces them to implement > ugly hacks. So unless I missed something, upgrading to 0.13 is not > possible. It is definitely possible, json-c fucks up headers/structs at every upgrade, we're used to it. FreeBSD upgraded it already, cf https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224675 & https://svnweb.freebsd.org/ports?view=revision&revision=457965 so the way is paved. Just need to cherrypick fixes/hacks there and there. Locally, i already know gdal and postgis fail to build with json-c 0.13.
Re: UPDATE devel/json-c
On Sun, Feb 11 2018, Landry Breuil wrote: > On Sun, Feb 11, 2018 at 09:20:08AM +0100, Björn Ketelaars wrote: >> On Sun 11/02/2018 09:11, Landry Breuil wrote: >> > On Sun, Feb 11, 2018 at 08:56:18AM +0100, Björn Ketelaars wrote: >> > > After more than 2 years json-c received an update, which fixes quite >> > > some issues. Most noticeable changes have been listed in >> > > https://github.com/json-c/json-c/blob/master/ChangeLog >> > > >> > > I bumped the major number of SHARED_LIB as functions have been added, >> > > and removed. HOMEPAGE has been updated as the original one is not >> > > reachable. >> > > >> > > There is no need for patching in detection of >> > > __sync_val_compare_and_swap as this has been resolved upstream: >> > > >> > > https://github.com/json-c/json-c/commit/0539191d187050faad0ed2657cddfd411e4c7900#diff-b1c3915d42e849f17e1ddf2d95111063 >> > > >> > > Output 'make test': >> > > >> > > # TOTAL: 21 >> > > # # PASS: 21 >> > > # # SKIP: 0 >> > > # # XFAIL: 0 >> > > # # FAIL: 0 >> > > # # XPASS: 0 >> > > # # ERROR: 0 >> > > >> > > Of the 23 victims of devel/json-c I only tested net/isc-bind >> > > (rndc-confgen to be more precise), which seems to work ok. It would be >> > > great if more people could check if this update works for them. >> > >> > I suppose that means "i've built all of them but only runtime-tested >> > bind", right ? :) >> >> ...not exactly. Let me rephrase the last bit: >> >> I only built tested 2 victims, and runtime tested isc-bind. > > Right. In the past json-c has proven itself "interesting" when upgrading > it, so i'll put this diff in my next bulk along cmake stuff. I have tried an upgrade to the 0.13 release, some of the structures are made opaque, which either breaks consumers or forces them to implement ugly hacks. So unless I missed something, upgrading to 0.13 is not possible. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE devel/json-c
On Sun, Feb 11, 2018 at 09:20:08AM +0100, Björn Ketelaars wrote: > On Sun 11/02/2018 09:11, Landry Breuil wrote: > > On Sun, Feb 11, 2018 at 08:56:18AM +0100, Björn Ketelaars wrote: > > > After more than 2 years json-c received an update, which fixes quite > > > some issues. Most noticeable changes have been listed in > > > https://github.com/json-c/json-c/blob/master/ChangeLog > > > > > > I bumped the major number of SHARED_LIB as functions have been added, > > > and removed. HOMEPAGE has been updated as the original one is not > > > reachable. > > > > > > There is no need for patching in detection of > > > __sync_val_compare_and_swap as this has been resolved upstream: > > > > > > https://github.com/json-c/json-c/commit/0539191d187050faad0ed2657cddfd411e4c7900#diff-b1c3915d42e849f17e1ddf2d95111063 > > > > > > Output 'make test': > > > > > > # TOTAL: 21 > > > # # PASS: 21 > > > # # SKIP: 0 > > > # # XFAIL: 0 > > > # # FAIL: 0 > > > # # XPASS: 0 > > > # # ERROR: 0 > > > > > > Of the 23 victims of devel/json-c I only tested net/isc-bind > > > (rndc-confgen to be more precise), which seems to work ok. It would be > > > great if more people could check if this update works for them. > > > > I suppose that means "i've built all of them but only runtime-tested > > bind", right ? :) > > ...not exactly. Let me rephrase the last bit: > > I only built tested 2 victims, and runtime tested isc-bind. Right. In the past json-c has proven itself "interesting" when upgrading it, so i'll put this diff in my next bulk along cmake stuff.
Re: UPDATE devel/json-c
On Sun 11/02/2018 09:11, Landry Breuil wrote: > On Sun, Feb 11, 2018 at 08:56:18AM +0100, Björn Ketelaars wrote: > > After more than 2 years json-c received an update, which fixes quite > > some issues. Most noticeable changes have been listed in > > https://github.com/json-c/json-c/blob/master/ChangeLog > > > > I bumped the major number of SHARED_LIB as functions have been added, > > and removed. HOMEPAGE has been updated as the original one is not > > reachable. > > > > There is no need for patching in detection of > > __sync_val_compare_and_swap as this has been resolved upstream: > > > > https://github.com/json-c/json-c/commit/0539191d187050faad0ed2657cddfd411e4c7900#diff-b1c3915d42e849f17e1ddf2d95111063 > > > > Output 'make test': > > > > # TOTAL: 21 > > # # PASS: 21 > > # # SKIP: 0 > > # # XFAIL: 0 > > # # FAIL: 0 > > # # XPASS: 0 > > # # ERROR: 0 > > > > Of the 23 victims of devel/json-c I only tested net/isc-bind > > (rndc-confgen to be more precise), which seems to work ok. It would be > > great if more people could check if this update works for them. > > I suppose that means "i've built all of them but only runtime-tested > bind", right ? :) ...not exactly. Let me rephrase the last bit: I only built tested 2 victims, and runtime tested isc-bind.
Re: UPDATE devel/json-c
On Sun, Feb 11, 2018 at 08:56:18AM +0100, Björn Ketelaars wrote: > After more than 2 years json-c received an update, which fixes quite > some issues. Most noticeable changes have been listed in > https://github.com/json-c/json-c/blob/master/ChangeLog > > I bumped the major number of SHARED_LIB as functions have been added, > and removed. HOMEPAGE has been updated as the original one is not > reachable. > > There is no need for patching in detection of > __sync_val_compare_and_swap as this has been resolved upstream: > > https://github.com/json-c/json-c/commit/0539191d187050faad0ed2657cddfd411e4c7900#diff-b1c3915d42e849f17e1ddf2d95111063 > > Output 'make test': > > # TOTAL: 21 > # # PASS: 21 > # # SKIP: 0 > # # XFAIL: 0 > # # FAIL: 0 > # # XPASS: 0 > # # ERROR: 0 > > Of the 23 victims of devel/json-c I only tested net/isc-bind > (rndc-confgen to be more precise), which seems to work ok. It would be > great if more people could check if this update works for them. I suppose that means "i've built all of them but only runtime-tested bind", right ? :)
