Re: UPDATE: php revamp
On 11/02/17 22:59, Antoine Jacoutot wrote: > On Thu, Nov 02, 2017 at 09:30:34PM +, Stuart Henderson wrote: >> On 2017/11/02 21:41, Tom Van Looy wrote: >>> Hi >>> >>> Martijn did a very good job with this. This makes OpenBSD's PHP setup >>> incredibly better. I >>> tested yesterdays patch and it works fine (I had trouble with the other >>> ones). I built >>> everything and tested 7.1, 7.0, 5.6 with cli and fpm + extensions (opcache, >>> curl, intl, etc.). >>> >>> So, looks good. I hope it gets committed soon. Thanks Marijn! >>> >>> Tom Van Looy >>> >>> >> >> It's a matter of opinion. I will cope but I really don't like the >> FreeBSD-style >> micro splitting. > > +1 > As I stated in my original email I'm not against moving some components back into the main compared to my version, but keeping e.g. WDDX and readline compiled in doesn't seem logical at all. I went for splitting everything out because that's my preferred way and it's the clearest and cleanest base to start from. If people want components kept in the main package they can just speak up, but so far nobody did. martijn@
Re: add python2 and python3 links
No fallout in a bulk... looking for OKs now :-)
On Thu, Nov 02, 2017 at 02:41:24PM +, Antoine Jacoutot wrote:
> On Thu, Nov 02, 2017 at 01:51:09PM +, Antoine Jacoutot wrote:
> > Hi.
> >
> > We have never provided a default 'python' utility with our packages and for
> > good reasons. That said, I would really like if we could provide a default
> > symlink to the default major versions of python. That is: python2 and
> > python3.
> > The rational behind this is that a lot of upstreams have "fixed" their
> > hardcoded
> > shebangs from #!/usr/bin/python... to #!/usr/bin/env python2 or
> > #!/usr/bin/env python3.
> > This would allow us to drop lots of patches, substitutions and
> > MODPY_ADJ_FILES
> > from our ports tree and make things easier for us in general.
> >
> > People willing to use another version as the default major are pretty much
> > on
> > their own but that's already the case today since we have substituting
> > everything anyway.
> >
> > I am putting this into a bulk right now...
> > What do you guys think?
>
> Better diff after rpointel's feedback.
> Uncomment a few more things to be consistent with what everyone else does.
> Going into a bulk soonish.
>
>
> Index: Makefile.inc
> ===
> RCS file: /cvs/ports/lang/python/Makefile.inc,v
> retrieving revision 1.123
> diff -u -p -r1.123 Makefile.inc
> --- Makefile.inc 16 Jul 2017 19:18:59 - 1.123
> +++ Makefile.inc 2 Nov 2017 14:40:13 -
> @@ -158,6 +158,8 @@ post-install:
> @sed -e "s,@VERSION@,${VERSION},g" -e "s,@LOCALBASE@,${LOCALBASE},g" \
> ${FILESDIR}/idle > ${WRKSRC}/idle
> ${INSTALL_SCRIPT} ${WRKSRC}/idle ${PREFIX}/bin/idle${VERSION}
> + cd ${PREFIX}/bin && ln -sf idle${VERSION} idle${VERSION:R}
> + mv ${PREFIX}/bin/pydoc ${PREFIX}/bin/pydoc2
> @cd ${WRKSRC}; tar -cf - Tools | (cd ${PREFIX}/lib/python${VERSION}; \
> tar -xf -)
> ${INSTALL_SCRIPT} ${WRKSRC}/Tools/scripts/2to3 \
> Index: 2.7/Makefile
> ===
> RCS file: /cvs/ports/lang/python/2.7/Makefile,v
> retrieving revision 1.53
> diff -u -p -r1.53 Makefile
> --- 2.7/Makefile 20 Sep 2017 18:44:48 - 1.53
> +++ 2.7/Makefile 2 Nov 2017 14:40:13 -
> @@ -9,6 +9,8 @@ VERSION = 2.7
> PATCHLEVEL = .14
> SHARED_LIBS =python2.7 0.0
> VERSION_SPEC = >=2.7,<2.8
> +REVISION-main = 0
> +REVISION-idle = 0
>
> CONFIGURE_ARGS += --with-ensurepip=no
>
> Index: 2.7/pkg/PLIST-idle
> ===
> RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-idle,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST-idle
> --- 2.7/pkg/PLIST-idle3 Jul 2016 18:16:00 - 1.8
> +++ 2.7/pkg/PLIST-idle2 Nov 2017 14:40:13 -
> @@ -3,6 +3,7 @@
> @option is-branch
> @conflict python-idle->=2.7,<2.8
> @comment bin/idle
> +bin/idle2
> bin/idle2.7
> lib/python2.7/idlelib/
> lib/python2.7/idlelib/AutoComplete.py
> Index: 2.7/pkg/PLIST-main
> ===
> RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-main,v
> retrieving revision 1.20
> diff -u -p -r1.20 PLIST-main
> --- 2.7/pkg/PLIST-main20 Sep 2017 18:44:48 - 1.20
> +++ 2.7/pkg/PLIST-main2 Nov 2017 14:40:13 -
> @@ -7,13 +7,14 @@
> @pkgpath lang/python/2.7,-bz2
> @pkgpath lang/python/2.7,-sqlite
> @pkgpath lang/python/2.7,-expat
> -@comment bin/2to3
> @comment bin/pydoc
> +@comment bin/2to3
> +bin/pydoc2
> bin/pydoc2.7
> @comment bin/python
> @comment bin/python-config
> -@comment bin/python2
> -@comment bin/python2-config
> +bin/python2
> +bin/python2-config
> @bin bin/python2.7
> bin/python2.7-2to3
> bin/python2.7-config
> @@ -2497,7 +2498,7 @@ lib/python2.7/zipfile.py
> lib/python2.7/zipfile.pyc
> lib/python2.7/zipfile.pyo
> @comment man/man1/python.1
> -@comment man/man1/python2.1
> +@man man/man1/python2.1
> @man man/man1/python2.7.1
> share/doc/python2.7/
> share/doc/python2.7/CHANGES.OpenBSD
> Index: 3.6/Makefile
> ===
> RCS file: /cvs/ports/lang/python/3.6/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- 3.6/Makefile 15 Oct 2017 16:31:45 - 1.6
> +++ 3.6/Makefile 2 Nov 2017 14:40:13 -
> @@ -9,6 +9,8 @@ VERSION = 3.6
> PATCHLEVEL = .3
> SHARED_LIBS =python3.6m 0.0
> VERSION_SPEC = >=3.6,<3.7
> +REVISION-main = 0
> +REVISION-idle = 0
>
> CONFIGURE_ARGS +=--with-ensurepip=no
>
> Index: 3.6/pkg/PLIST-idle
> ===
> RCS file: /cvs/ports/lang/python/3.6/pkg/PLIST-idle,v
> retrieving revision 1.2
> diff -u -p -r1.
Re: UPDATE: php revamp
On Thu, Nov 2, 2017 at 10:59 PM, Antoine Jacoutot wrote: > On Thu, Nov 02, 2017 at 09:30:34PM +, Stuart Henderson wrote: > > It's a matter of opinion. I will cope but I really don't like the > FreeBSD-style > > micro splitting. > > +1 > I don't see that as a problem but I get the point. I don't mind having all extensions installed by default, like opcache, curl, readline, intl, etc. are often used. The thing I like about the new approach is that they are loadable modules and disabled by default. Like Martijn says, it doesn't make sense to have WDDX, readline etc. compiled in. I do like the fact that you have to pick an SAPI now.
Re: UPDATE: php revamp
On Fri, Nov 03, 2017 at 08:31:24AM +, Martijn van Duren wrote: > On 11/02/17 22:59, Antoine Jacoutot wrote: > > On Thu, Nov 02, 2017 at 09:30:34PM +, Stuart Henderson wrote: > >> On 2017/11/02 21:41, Tom Van Looy wrote: > >>> Hi > >>> > >>> Martijn did a very good job with this. This makes OpenBSD's PHP setup > >>> incredibly better. I > >>> tested yesterdays patch and it works fine (I had trouble with the other > >>> ones). I built > >>> everything and tested 7.1, 7.0, 5.6 with cli and fpm + extensions > >>> (opcache, curl, intl, etc.). > >>> > >>> So, looks good. I hope it gets committed soon. Thanks Marijn! > >>> > >>> Tom Van Looy > >>> > >>> > >> > >> It's a matter of opinion. I will cope but I really don't like the > >> FreeBSD-style > >> micro splitting. > > > > +1 > > > As I stated in my original email I'm not against moving some components > back into the main compared to my version, but keeping e.g. WDDX and > readline compiled in doesn't seem logical at all. > I went for splitting everything out because that's my preferred way and > it's the clearest and cleanest base to start from. If people want > components kept in the main package they can just speak up, but so far > nobody did. Let's get this in and see how it flows. We can always put some components back to -main if needed later. I did like the fact that -main used to bundle the most used stuff, it made handling php dependencies very easy. But as mentioned, let's go with your diff and we shall see :-) -- Antoine
Update www/ruby-passenger 5.0.30 -> 5.1.11
Passenger is usually the most difficult ruby port to update, but
thankfully this update wasn't nearly as bad as previous ones. Very
few patches didn't apply automatically, and the ones that didn't
were easy to fix manually.
While getting passenger to compile was easier than previous years,
there were more runtime issues, but those boiled down to specifying
the path for the ruby version in use in a couple places, and
disabling their security update check.
I'll probably be committing this in a day or so unless I hear
objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/www/ruby-passenger/Makefile,v
retrieving revision 1.53
diff -u -p -u -p -r1.53 Makefile
--- Makefile26 Jul 2017 22:45:31 - 1.53
+++ Makefile3 Nov 2017 08:53:21 -
@@ -3,13 +3,12 @@
COMMENT = ruby web application server/nginx module
BROKEN-alpha = .got subsegment exceeds 64K (size 83312)
BROKEN-arm = .../libuv/src/unix/atomic-ops.h:46: undefined reference
to __sync_val_compare_and_swap_4
-BROKEN-hppa = rake fails when linking PassengerHelperAgent
+BROKEN-hppa = rake fails when linking PassengerHelperAgent
BROKEN-sparc64 = rake fails when linking PassengerHelperAgent
-PASS_VERSION = 5.0.30
-NGINX_VERSION =1.10.2
+PASS_VERSION = 5.1.11
+NGINX_VERSION =1.12.1
DISTNAME = passenger-${PASS_VERSION}
-REVISION = 0
CATEGORIES = www
DISTFILES =${DISTNAME}.gem \
@@ -50,7 +49,9 @@ pre-configure:
-DPASSENGER_ROOT='${PREFIX}/lib/phusion-passenger${GEM_MAN_SUFFIX}' \
${WRKSRC}/src/nginx_module/config \
${WRKSRC}/src/ruby_supportlib/phusion_passenger.rb \
-
${WRKSRC}/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb
+ ${WRKSRC}/src/ruby_supportlib/phusion_passenger/constants.rb \
+
${WRKSRC}/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb \
+ ${WRKSRC}/src/cxx_supportlib/Constants.h
${MODRUBY_RUBY_ADJ} ${WRKSRC}/bin/passenger* \
${WRKSRC}/dev/*.rb \
${WRKSRC}/src/helper-scripts/p* \
Index: distinfo
===
RCS file: /cvs/ports/www/ruby-passenger/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo4 Nov 2016 22:08:18 - 1.10
+++ distinfo2 Nov 2017 21:54:26 -
@@ -1,4 +1,4 @@
-SHA256 (nginx-1.10.2.tar.gz) = EEWsSYejluL6XQAR2viYe2Et0vBRgbZ1B9poy+fXZcI=
-SHA256 (passenger-5.0.30.gem) = kXTmpdiHuh7xLUzmrUYJM/tKsvEebpoagO40rw3y48w=
-SIZE (nginx-1.10.2.tar.gz) = 910812
-SIZE (passenger-5.0.30.gem) = 5595136
+SHA256 (nginx-1.12.1.tar.gz) = h5O/QmSFow+RAhtrlFqf2KhNh9F7VmViw3l6uo+sdvs=
+SHA256 (passenger-5.1.11.gem) = EPtLaFo7Hq5kReSaKqb53rZ845FDxb03cc5ZkGPboVk=
+SIZE (nginx-1.12.1.tar.gz) = 981093
+SIZE (passenger-5.1.11.gem) = 4160512
Index: patches/patch-src_agent_Core_CoreMain_cpp
===
RCS file: patches/patch-src_agent_Core_CoreMain_cpp
diff -N patches/patch-src_agent_Core_CoreMain_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_agent_Core_CoreMain_cpp 2 Nov 2017 22:33:07 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Remove checking for newer versions.
+
+Index: src/agent/Core/CoreMain.cpp
+--- src/agent/Core/CoreMain.cpp.orig
src/agent/Core/CoreMain.cpp
+@@ -788,9 +788,7 @@ initializeSecurityUpdateChecker() {
+ TRACE_POINT();
+
+ VariantMap &options = *agentsOptions;
+- if (options.getBool("disable_security_update_check", false, false)) {
+- P_NOTICE("Security update check disabled.");
+- } else {
++ if (false) {
+ string proxy = options.get("security_update_check_proxy",
false);
+
+ string serverIntegration = options.get("integration_mode"); //
nginx / apache / standalone
Index: patches/patch-src_cxx_supportlib_Constants_h
===
RCS file: patches/patch-src_cxx_supportlib_Constants_h
diff -N patches/patch-src_cxx_supportlib_Constants_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_cxx_supportlib_Constants_h2 Nov 2017 22:52:53
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/cxx_supportlib/Constants.h
+--- src/cxx_supportlib/Constants.h.orig
src/cxx_supportlib/Constants.h
+@@ -63,7 +63,7 @@
+ #define DEFAULT_POOL_IDLE_TIME 300
+ #define DEFAULT_PYTHON "python"
+ #define DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK 134217728
+-#define DEFAULT_RUBY "ruby"
++#define DEFAULT_RUBY "${RUBY}"
+ #define DEFAULT_SOCKET_BACKLOG 2048
+ #define DEFAULT_SPAWN_METHOD "smart"
+ #define DEFAULT_START_TIMEOUT 9
Index:
patches/patch-src_cxx_supportlib_vendor-modified_boost_smart_ptr_detail_sp_has_sync_hpp
==
Update libv8, renable therubyracer
This updates libv8 from 3.12.19 to 3.16.14.11, and updates
therubyracer from 0.11.0 to 0.12.3, renabling it.
Tests for therubyracer pass, and postgresql-plv8 (the only other
libv8 dependency) still builds fine.
Updating therubyracer requiring importing a new ruby-libv8
dependency. This dependency is set to use the system v8, so it
isn't compiling a second one. If system v8 wants to upgrade
past a version supported by therubyracer, we can just stop using
the system v8 in ruby-libv8 and switch to building a copy that
therubyracer supports.
Tested on amd64. OKs?
Thanks,
Jeremy
Index: lang/libv8/Makefile
===
RCS file: /cvs/ports/lang/libv8/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- lang/libv8/Makefile 26 Jul 2017 22:45:25 - 1.15
+++ lang/libv8/Makefile 3 Nov 2017 10:10:43 -
@@ -4,8 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT= V8 JavaScript for clients and servers
-V8_VERSION=3.12.19
-REVISION= 6
+V8_VERSION=3.16.14.11
EPOCH= 0
V8_ARCH= ${MACHINE_ARCH:S/amd64/x64/:S/i386/ia32/}
V8_RELEASE=release
@@ -13,6 +12,8 @@ V8_RELEASE= release
DISTNAME= v8-${V8_VERSION}
PKGNAME= lib${DISTNAME}
+DISTFILES= v8-${V8_VERSION}.tar.gz{${V8_VERSION}.tar.gz}
+
CATEGORIES=lang
SHARED_LIBS=v80.0
@@ -24,7 +25,7 @@ MAINTAINER= David Carlier http://deftly.net/
+MASTER_SITES= https://github.com/v8/v8/archive/
BUILD_DEPENDS= devel/gyp
Index: lang/libv8/distinfo
===
RCS file: /cvs/ports/lang/libv8/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- lang/libv8/distinfo 5 Dec 2012 00:34:03 - 1.2
+++ lang/libv8/distinfo 3 Nov 2017 10:11:16 -
@@ -1,2 +1,2 @@
-SHA256 (v8-3.12.19.tar.gz) = uNgaqSiFhmpwtdwbWMRSPUoYbeH/qS2HU4zOrgLVklM=
-SIZE (v8-3.12.19.tar.gz) = 11617055
+SHA256 (v8-3.16.14.11.tar.gz) = oMEGp2LXGcVjTvFHtSBwHQ27LQ6eDt5m0HlRjkbCixQ=
+SIZE (v8-3.16.14.11.tar.gz) = 11849064
Index: lang/libv8/patches/patch-Makefile
===
RCS file: /cvs/ports/lang/libv8/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile
--- lang/libv8/patches/patch-Makefile 13 Oct 2012 15:09:58 - 1.1.1.1
+++ lang/libv8/patches/patch-Makefile 3 Nov 2017 10:13:44 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2012/10/13 15:09:58 abieber Exp $
Makefile.orig Tue Oct 9 07:14:31 2012
-+++ Makefile Tue Oct 9 17:41:07 2012
-@@ -250,14 +250,14 @@ clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES)
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -266,14 +266,14 @@ clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES)
OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ARCHES))
$(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
GYP_GENERATORS=make \
Index: lang/libv8/patches/patch-build_common_gypi
===
RCS file: /cvs/ports/lang/libv8/patches/patch-build_common_gypi,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-build_common_gypi
--- lang/libv8/patches/patch-build_common_gypi 13 Oct 2012 15:09:58 -
1.1.1.1
+++ lang/libv8/patches/patch-build_common_gypi 3 Nov 2017 10:13:44 -
@@ -1,16 +1,17 @@
$OpenBSD: patch-build_common_gypi,v 1.1.1.1 2012/10/13 15:09:58 abieber Exp $
build/common.gypi.orig Tue Oct 9 07:14:31 2012
-+++ build/common.gypi Tue Oct 9 15:51:53 2012
-@@ -90,7 +90,7 @@
+Index: build/common.gypi
+--- build/common.gypi.orig
build/common.gypi
+@@ -100,7 +100,7 @@
+
'v8_use_snapshot%': 'true',
'host_os%': '<(OS)',
- 'v8_use_liveobjectlist%': 'false',
-'werror%': '-Werror',
+'werror%': '',
# With post mortem support enabled, metadata is embedded into libv8 that
# describes various parameters of the VM for use by debuggers. See
-@@ -313,6 +313,9 @@
+@@ -338,6 +338,9 @@
}],
['OS=="freebsd" or OS=="openbsd"', {
'cflags': [ '-I/usr/local/include' ],
Index: lang/libv8/patches/patch-src_atomicops_h
===
RCS file: lang/libv8/patches/patch-src_atomicops_h
diff -N lang/libv8/patches/patch-src_atomicops_h
--- lang/libv8/patches/patch-src_atomicops_h5 Dec 2012 01:07:45 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_atomicops_h,v 1.1 2012/12/05 01:07:45 abieber Exp $
src/atomicops.h.orig Tue Dec 4 18:00:55 2012
-+++ src/atomicops.hTue Dec 4 18:01:52 2012
-@@ -69,7 +69,11 @@ typedef intptr_t Atomic64;
-
- // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
- // Atomic64 routines below, depending on your architecture.
-+#if defined(__OpenBSD__) && defined(__i386__)
-+typedef Atomic32 AtomicWord;
-+#
Re: Update libv8, renable therubyracer
Hi I sent a diff a while ago to @bieber but the blocker was therubyracer
indeed (and apparently still very needed) but if it s not a problem anymore
I m happy with this update :-)
Kind regards.
On 3 November 2017 at 10:44, Jeremy Evans wrote:
> This updates libv8 from 3.12.19 to 3.16.14.11, and updates
> therubyracer from 0.11.0 to 0.12.3, renabling it.
>
> Tests for therubyracer pass, and postgresql-plv8 (the only other
> libv8 dependency) still builds fine.
>
> Updating therubyracer requiring importing a new ruby-libv8
> dependency. This dependency is set to use the system v8, so it
> isn't compiling a second one. If system v8 wants to upgrade
> past a version supported by therubyracer, we can just stop using
> the system v8 in ruby-libv8 and switch to building a copy that
> therubyracer supports.
>
> Tested on amd64. OKs?
>
> Thanks,
> Jeremy
>
> Index: lang/libv8/Makefile
> ===
> RCS file: /cvs/ports/lang/libv8/Makefile,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 Makefile
> --- lang/libv8/Makefile 26 Jul 2017 22:45:25 - 1.15
> +++ lang/libv8/Makefile 3 Nov 2017 10:10:43 -
> @@ -4,8 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386
>
> COMMENT= V8 JavaScript for clients and servers
>
> -V8_VERSION=3.12.19
> -REVISION= 6
> +V8_VERSION=3.16.14.11
> EPOCH= 0
> V8_ARCH= ${MACHINE_ARCH:S/amd64/x64/:S/i386/ia32/}
> V8_RELEASE=release
> @@ -13,6 +12,8 @@ V8_RELEASE= release
> DISTNAME= v8-${V8_VERSION}
> PKGNAME= lib${DISTNAME}
>
> +DISTFILES= v8-${V8_VERSION}.tar.gz{${V8_VERSION}.tar.gz}
> +
> CATEGORIES=lang
>
> SHARED_LIBS=v80.0
> @@ -24,7 +25,7 @@ MAINTAINER= David Carlier # BSD
> PERMIT_PACKAGE_CDROM= Yes
>
> -MASTER_SITES= http://deftly.net/
> +MASTER_SITES= https://github.com/v8/v8/archive/
>
> BUILD_DEPENDS= devel/gyp
>
> Index: lang/libv8/distinfo
> ===
> RCS file: /cvs/ports/lang/libv8/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- lang/libv8/distinfo 5 Dec 2012 00:34:03 - 1.2
> +++ lang/libv8/distinfo 3 Nov 2017 10:11:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (v8-3.12.19.tar.gz) = uNgaqSiFhmpwtdwbWMRSPUoYbeH/qS2HU4zOrgLVklM=
> -SIZE (v8-3.12.19.tar.gz) = 11617055
> +SHA256 (v8-3.16.14.11.tar.gz) = oMEGp2LXGcVjTvFHtSBwHQ27LQ6eDt
> 5m0HlRjkbCixQ=
> +SIZE (v8-3.16.14.11.tar.gz) = 11849064
> Index: lang/libv8/patches/patch-Makefile
> ===
> RCS file: /cvs/ports/lang/libv8/patches/patch-Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-Makefile
> --- lang/libv8/patches/patch-Makefile 13 Oct 2012 15:09:58 -
> 1.1.1.1
> +++ lang/libv8/patches/patch-Makefile 3 Nov 2017 10:13:44 -
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-Makefile,v 1.1.1.1 2012/10/13 15:09:58 abieber Exp $
> Makefile.orig Tue Oct 9 07:14:31 2012
> -+++ Makefile Tue Oct 9 17:41:07 2012
> -@@ -250,14 +250,14 @@ clean: $(addsuffix .clean, $(ARCHES)
> $(ANDROID_ARCHES)
> +Index: Makefile
> +--- Makefile.orig
> Makefile
> +@@ -266,14 +266,14 @@ clean: $(addsuffix .clean, $(ARCHES)
> $(ANDROID_ARCHES)
> OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ARCHES))
> $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
> GYP_GENERATORS=make \
> Index: lang/libv8/patches/patch-build_common_gypi
> ===
> RCS file: /cvs/ports/lang/libv8/patches/patch-build_common_gypi,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-build_common_gypi
> --- lang/libv8/patches/patch-build_common_gypi 13 Oct 2012 15:09:58
> - 1.1.1.1
> +++ lang/libv8/patches/patch-build_common_gypi 3 Nov 2017 10:13:44 -
> @@ -1,16 +1,17 @@
> $OpenBSD: patch-build_common_gypi,v 1.1.1.1 2012/10/13 15:09:58 abieber
> Exp $
> build/common.gypi.orig Tue Oct 9 07:14:31 2012
> -+++ build/common.gypi Tue Oct 9 15:51:53 2012
> -@@ -90,7 +90,7 @@
> +Index: build/common.gypi
> +--- build/common.gypi.orig
> build/common.gypi
> +@@ -100,7 +100,7 @@
> +
> 'v8_use_snapshot%': 'true',
> 'host_os%': '<(OS)',
> - 'v8_use_liveobjectlist%': 'false',
> -'werror%': '-Werror',
> +'werror%': '',
>
> # With post mortem support enabled, metadata is embedded into libv8
> that
> # describes various parameters of the VM for use by debuggers. See
> -@@ -313,6 +313,9 @@
> +@@ -338,6 +338,9 @@
> }],
> ['OS=="freebsd" or OS=="openbsd"', {
> 'cflags': [ '-I/usr/local/include' ],
> Index: lang/libv8/patches/patch-src_atomicops_h
> ===
> RCS file: lang/libv8/patches/patch-src_atomicops_h
> diff -N lang/libv8/patches/patch-src_atomicops_h
> --- lang/libv8/patches/patch-src_atomicops_h5 Dec 2012 01:07:45
> -0
Update ruby-eventmachine to 1.2.5
This wasn't included with the previous update diff because one of the
tests crashes. Doing more research, the same code also crashes the
current version in ports. The crashing test is new and is already
tracked on upstream's bugtracker. This diff includes a patch to
skip the crashing test so the test suite can complete.
Tested on amd64. Will be committing in a day or so unless I hear
objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/net/ruby-eventmachine/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile26 Jul 2017 22:45:28 - 1.26
+++ Makefile2 Nov 2017 17:22:37 -
@@ -2,9 +2,8 @@
COMMENT= event-driven I/O for Ruby using the Reactor pattern
-DISTNAME= eventmachine-1.2.0.1
+DISTNAME= eventmachine-1.2.5
CATEGORIES=net devel
-REVISION= 0
HOMEPAGE= http://rubyeventmachine.com/
Index: distinfo
===
RCS file: /cvs/ports/net/ruby-eventmachine/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo4 Nov 2016 21:39:12 - 1.6
+++ distinfo2 Nov 2017 17:22:42 -
@@ -1,2 +1,2 @@
-SHA256 (eventmachine-1.2.0.1.gem) =
oj1lvjSStehplpnFSXmenQ+/+qx7+fXA/Zr9I+KH+/E=
-SIZE (eventmachine-1.2.0.1.gem) = 241152
+SHA256 (eventmachine-1.2.5.gem) = H+0A/aTt6eDWry7szeA04xRSZhMVqz60fo3+5wBvsBw=
+SIZE (eventmachine-1.2.5.gem) = 246272
Index: patches/patch-ext_ed_cpp
===
RCS file: /cvs/ports/net/ruby-eventmachine/patches/patch-ext_ed_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-ext_ed_cpp
--- patches/patch-ext_ed_cpp10 Jan 2015 17:29:14 - 1.2
+++ patches/patch-ext_ed_cpp3 Nov 2017 11:07:01 -
@@ -1,7 +1,9 @@
$OpenBSD: patch-ext_ed_cpp,v 1.2 2015/01/10 17:29:14 jeremy Exp $
ext/ed.cpp.origWed Dec 31 16:00:00 1969
-+++ ext/ed.cpp Fri Nov 28 18:16:12 2014
-@@ -1018,11 +1018,8 @@ void ConnectionDescriptor::_WriteOutboundData()
+
+Index: ext/ed.cpp
+--- ext/ed.cpp.orig
ext/ed.cpp
+@@ -1115,11 +1115,8 @@ void ConnectionDescriptor::_WriteOutboundData()
}
#endif
@@ -15,8 +17,8 @@ $OpenBSD: patch-ext_ed_cpp,v 1.2 2015/01
assert (GetSocket() != INVALID_SOCKET);
#ifdef HAVE_WRITEV
-@@ -1687,6 +1684,9 @@ void DatagramDescriptor::Write()
- EpollEvent.events = (EPOLLIN | (SelectForWrite() ? EPOLLOUT : 0));
+@@ -1862,6 +1859,9 @@ void DatagramDescriptor::Write()
+ EpollEvent.events |= EPOLLOUT;
assert (MyEventMachine);
MyEventMachine->Modify (this);
+ #endif
@@ -24,4 +26,4 @@ $OpenBSD: patch-ext_ed_cpp,v 1.2 2015/01
+ MyEventMachine->ArmKqueueWriter (this);
#endif
#ifdef HAVE_KQUEUE
- if (SelectForWrite())
+ bKqueueArmWrite = SelectForWrite();
Index: patches/patch-ext_extconf_rb
===
RCS file: /cvs/ports/net/ruby-eventmachine/patches/patch-ext_extconf_rb,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-ext_extconf_rb
--- patches/patch-ext_extconf_rb10 Jan 2015 17:29:14 - 1.2
+++ patches/patch-ext_extconf_rb3 Nov 2017 11:06:51 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-ext_extconf_rb,v 1.2 2015/01/10 17:29:14 jeremy Exp $
ext/extconf.rb.origWed Dec 31 16:00:00 1969
-+++ ext/extconf.rb Fri Nov 28 18:16:12 2014
-@@ -98,7 +98,7 @@ if RbConfig::CONFIG["host_os"] =~ /mingw/
+Index: ext/extconf.rb
+--- ext/extconf.rb.orig
ext/extconf.rb
+@@ -147,7 +147,7 @@ if RbConfig::CONFIG["host_os"] =~ /mingw/
add_define "FD_SETSIZE=32767" unless found
end
Index: patches/patch-tests_test_exc_rb
===
RCS file: patches/patch-tests_test_exc_rb
diff -N patches/patch-tests_test_exc_rb
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tests_test_exc_rb 3 Nov 2017 11:08:18 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Skip test that crashes with SIGILL. This same code also crashes
+previous versions, so it is not a regression, just a newly added
+test. Details at:
+
+https://github.com/eventmachine/eventmachine/issues/777
+
+Index: tests/test_exc.rb
+--- tests/test_exc.rb.orig
tests/test_exc.rb
+@@ -32,7 +32,7 @@ class TestSomeExceptions < Test::Unit::TestCase
+ }
+ end
+
+- def test_exception_on_unbind
++ def skip_test_exception_on_unbind
+ assert_raises(DoomedConnectionError) {
+ EM.run {
+ EM.connect("localhost", , DoomedConnection)
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/ruby-eventmachine/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 4 Nov 2016 21:39:12 - 1.10
+++ pkg/PLIST 2 Nov 2017 17:24:58 -
@@ -88,6 +88,7 @@ ${GEM_LIB}/g
Re: net/zabbix SSH flavor?
On Sat, Oct 21 2017, Jeremie Courreges-Anglas wrote:
> +cc maintainer
>
> On Fri, Oct 20 2017, William Leuschner wrote:
>> I discovered an issue with my patch for compiling net/zabbix with SSH by
>> default. Namely, I didn't bump the REVISION, so openup automatically
>> reinstalled it. Below is an updated version of the patch, with a
>> REVISION bump. Also, portcheck reported an absolute path in
>> pkg/README-server, so I rectified that as well.
>
> Looks good and seems to build properly (but REVISION starts at 0).
Committed, thanks.
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/net/zabbix/Makefile,v
>> retrieving revision 1.128
>> diff -u -p -r1.128 Makefile
>> --- Makefile 26 Jul 2017 17:54:44 - 1.128
>> +++ Makefile 20 Oct 2017 18:31:00 -
>> @@ -5,6 +5,7 @@ COMMENT-server = network and application
>> COMMENT-web = network and application monitoring - web
>> frontend
>>
>> VERSION = 3.2.7
>> +REVISION = 1
>> DISTNAME = zabbix-${VERSION}
>> FULLPKGNAME-main = zabbix-agent-${VERSION}
>> FULLPKGPATH-main = net/zabbix,-main
>> @@ -46,12 +47,13 @@ RUN_DEPENDS-main =
>> LIB_DEPENDS-server =${LIB_DEPENDS} \
>> textproc/libxml \
>> net/net-snmp \
>> -textproc/iksemel
>> +textproc/iksemel \
>> +security/libssh2
>> RUN_DEPENDS-server =net/fping
>> # we want the _zabbix user&group as well as README-main
>> RUN_DEPENDS-server += net/zabbix,-main>=${VERSION}
>> WANTLIB-server =${WANTLIB} crypto ssl z netsnmp iksemel pthread \
>> -xml2
>> +xml2 ssh2
>>
>> CONFIGURE_STYLE = gnu
>> CONFIGURE_ARGS =--enable-server \
>> @@ -62,7 +64,8 @@ CONFIGURE_ARGS = --enable-server \
>> --with-libxml2 \
>> --with-net-snmp \
>> --with-ldap \
>> ---with-jabber="${LOCALBASE}"
>> +--with-jabber="${LOCALBASE}" \
>> +--with-ssh2
>> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
>> LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" \
>> ac_cv_search___res_query=no
>> Index: pkg/README-server
>> ===
>> RCS file: /cvs/ports/net/zabbix/pkg/README-server,v
>> retrieving revision 1.11
>> diff -u -p -r1.11 README-server
>> --- pkg/README-server17 Jul 2015 20:38:43 - 1.11
>> +++ pkg/README-server20 Oct 2017 18:31:00 -
>> @@ -98,7 +98,7 @@ automatically created and initialized if
>> for obvious performance reasons, it is NOT encouraged to use the SQLite
>> backend for a server.
>>
>> -# cd /usr/local/share/zabbix/schema/sqlite3
>> +# cd ${TRUEPREFIX}/share/zabbix/schema/sqlite3
>> # su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < schema.sql"
>> The following steps are not required for setting up a Zabbix Proxy.
>> # su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < images.sql"
>>
>>
>> ───
>> William Leuschner
>> wel2...@rit.edu
>>
>> On 10/6/2017 1:57 PM, William Leuschner wrote:
>>> ping
>>>
>>> ─
>>> William Leuschner
>>> wel2...@rit.edu
>>>
>>> On 9/25/2017 1:17 PM, William Leuschner wrote:
Ah, that did it! Thank you for the pointers. The now-fixed patch is
below. Comments?
───
William Leuschner
wel2...@rit.edu
Index: Makefile
===
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile
--- Makefile 7 Jul 2016 18:47:32 - 1.122
+++ Makefile 22 Sep 2017 18:29:39 -
@@ -29,7 +29,7 @@ MODPHP_BUILDDEP =No
MULTI_PACKAGES = -main -web
PSEUDO_FLAVORS = no_server
-FLAVORS = mysql pgsql sqlite3
+FLAVORS = mysql pgsql sqlite3 ssh
SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV
@@ -77,7 +77,7 @@ FLAVOR = sqlite3
#if non-backend-related flavors are added, add them to
#the following line as ":L:Nflavor1:Nflavor2" so that
#they don't trigger a "Conflicting flavors" error.
-BACKEND = ${FLAVOR}
+BACKEND = ${FLAVOR:L:Nssh}
.if ${BACKEND} == "mysql"
MULTI_PACKAGES += -server
LIB_DEPENDS-server += databases/mariadb,-main
@@ -97,6 +97,13 @@ CONFIGURE_ARGS += --disable-server \
--disable-proxy
.else
ERRORS += "Fatal: Conflicting flavors: ${FLAVOR}";
+.endif
+
+# Include libssh if the ssh flavor is requested
+.if ${FLAVOR:Mssh}
+LIB_DEPENDS-server += security/libssh2
+WANTLIB
Re: UPDATE: php revamp
On Fri, Nov 03, 2017 at 10:07:33AM +0100, Antoine Jacoutot wrote: > Let's get this in and see how it flows. We can always put some components back > to -main if needed later. > I did like the fact that -main used to bundle the most used stuff, it made > handling php dependencies very easy. But as mentioned, let's go with your diff > and we shall see :-) Small caveat: when we want to move back to the way things were later, this will mean some @pkgpath annotations for updates... so it's slightly simpler if there are a few part we can merge now. trick question: ports that depend on php components, how hard are they to tweak with this patch ? assuming some components are no longer part of the main php package...
[UPDATE] sysutils/liblnk
Hi,
this is the diff to update liblnk to latest release.
Ok?
Cheers,
Remi.Index: Makefile
===
RCS file: /cvs/ports/sysutils/liblnk/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 13 Feb 2017 19:38:21 - 1.1.1.1
+++ Makefile 3 Nov 2017 09:34:37 -
@@ -2,11 +2,11 @@
COMMENT = library and tools to access the Windows Shortcut File
-VERSION = 20170111
+VERSION = 20171101
DISTNAME = liblnk-alpha-${VERSION}
PKGNAME = ${DISTNAME:S/-alpha//}
-SHARED_LIBS += lnk 0.0 # 1.0
+SHARED_LIBS += lnk 0.1 # 1.0
CATEGORIES = sysutils security
Index: distinfo
===
RCS file: /cvs/ports/sysutils/liblnk/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 13 Feb 2017 19:38:21 - 1.1.1.1
+++ distinfo 3 Nov 2017 09:34:37 -
@@ -1,2 +1,2 @@
-SHA256 (liblnk-alpha-20170111.tar.gz) = QE87Pbn3yD5UC+3hyJsvDKHG6koxVl0x0WbKZTXr/jI=
-SIZE (liblnk-alpha-20170111.tar.gz) = 1474193
+SHA256 (liblnk-alpha-20171101.tar.gz) = eY2rtvjinXCtqoQEFuP862aKaRD4YUwFl1w1XVu9LtA=
+SIZE (liblnk-alpha-20171101.tar.gz) = 1479690
new textproc/p5-Pod-Markdown
Hi, ok to import p5-Pod-Markdown 3.005 ? Comment: convert POD to Markdown Description: This module uses Pod::Simple to convert POD to Markdown. bluhm p5-Pod-Markdown.tgz Description: application/tar-gz
[UPDATE] sysutils/libolecf
Hi,
this is the diff to update libolecf to latest release.
Ok?
Cheers,
Remi.Index: Makefile
===
RCS file: /cvs/ports/sysutils/libolecf/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile 8 Apr 2017 04:25:48 - 1.2
+++ Makefile 3 Nov 2017 13:06:03 -
@@ -2,11 +2,11 @@
COMMENT = library and tools to access the OLE 2 Compound File
-VERSION = 20170129
+VERSION = 20170825
DISTNAME = libolecf-alpha-${VERSION}
PKGNAME = ${DISTNAME:S/-alpha//}
-SHARED_LIBS += olecf 0.0 # 1.0
+SHARED_LIBS += olecf 0.1 # 1.0
CATEGORIES = sysutils security
Index: distinfo
===
RCS file: /cvs/ports/sysutils/libolecf/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 8 Apr 2017 04:25:48 - 1.2
+++ distinfo 3 Nov 2017 13:06:03 -
@@ -1,2 +1,2 @@
-SHA256 (libolecf-alpha-20170129.tar.gz) = NNwUqceLmMe1XREYpUfV3B99vE5I0oew1KfbJQQS+PE=
-SIZE (libolecf-alpha-20170129.tar.gz) = 1533776
+SHA256 (libolecf-alpha-20170825.tar.gz) = bs3iehilY8oztKPCzpABvJIes/EBXs9bSRuMxW5LCGc=
+SIZE (libolecf-alpha-20170825.tar.gz) = 1534747
NEW: additional apertium dictionaries (cat-srd, srd-ita, rus-ukr, crh-tur)
Hi, Straightforward ports of new dictionaries and language pairs. ok? -- Anthony J. Bentley cat-srd.tar.gz Description: GNU Zip compressed data crh.tar.gz Description: GNU Zip compressed data crh-tur.tar.gz Description: GNU Zip compressed data rus-ukr.tar.gz Description: GNU Zip compressed data srd.tar.gz Description: GNU Zip compressed data srd-ita.tar.gz Description: GNU Zip compressed data tur.tar.gz Description: GNU Zip compressed data ukr.tar.gz Description: GNU Zip compressed data
[UPDATE] sysutils/libsmraw
Hi,
this is the diff to update libsmraw to latest release.
Ok?
Cheers,
Remi.Index: Makefile
===
RCS file: /cvs/ports/sysutils/libsmraw/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 14 Feb 2017 20:23:09 - 1.1.1.1
+++ Makefile 3 Nov 2017 13:24:20 -
@@ -2,11 +2,11 @@
COMMENT = library and tools to access the (split) RAW image format
-VERSION = 20160424
+VERSION = 20170803
DISTNAME = libsmraw-alpha-${VERSION}
PKGNAME = ${DISTNAME:S/-alpha//}
-SHARED_LIBS += smraw 0.0 # 1.0
+SHARED_LIBS += smraw 0.1 # 1.0
CATEGORIES = sysutils security
Index: distinfo
===
RCS file: /cvs/ports/sysutils/libsmraw/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 14 Feb 2017 20:23:09 - 1.1.1.1
+++ distinfo 3 Nov 2017 13:24:20 -
@@ -1,2 +1,2 @@
-SHA256 (libsmraw-alpha-20160424.tar.gz) = SL8ebqO5WUBS0GmPB7OeSkBXZnXOknd2GpK2P9gbIQ4=
-SIZE (libsmraw-alpha-20160424.tar.gz) = 1554105
+SHA256 (libsmraw-alpha-20170803.tar.gz) = LFB7n9ZiLLrYtl7z6HldUcKTl5dXNUp0fHaUJpRTwKo=
+SIZE (libsmraw-alpha-20170803.tar.gz) = 1549204
[UPDATE] sysutils/libvshadow
Hi,
this is the diff to update libvshadow to latest release.
Ok?
Cheers,
Remi.Index: Makefile
===
RCS file: /cvs/ports/sysutils/libvshadow/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 21 Feb 2017 12:24:36 - 1.1.1.1
+++ Makefile 3 Nov 2017 13:36:45 -
@@ -2,11 +2,11 @@
COMMENT = library and tools to access the VSSformat
-VERSION = 2016
+VERSION = 20170902
DISTNAME = libvshadow-alpha-${VERSION}
PKGNAME = ${DISTNAME:S/-alpha//}
-SHARED_LIBS += vshadow 0.0 # 1.0
+SHARED_LIBS += vshadow 0.1 # 1.0
CATEGORIES = sysutils security
Index: distinfo
===
RCS file: /cvs/ports/sysutils/libvshadow/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 21 Feb 2017 12:24:36 - 1.1.1.1
+++ distinfo 3 Nov 2017 13:36:45 -
@@ -1,2 +1,2 @@
-SHA256 (libvshadow-alpha-2016.tar.gz) = TSUX47m5OpQQ7a8WjsN/OZfdlRb9zSP6wSrUxNx6fuQ=
-SIZE (libvshadow-alpha-2016.tar.gz) = 1411908
+SHA256 (libvshadow-alpha-20170902.tar.gz) = niOhTuCK1MwhjGPsjKNQtJUeNHzPMEDDZYYKOZcw8mE=
+SIZE (libvshadow-alpha-20170902.tar.gz) = 1395385
[UPDATE] math/fftw3
minor update. comments/ok?
Index: Makefile
===
RCS file: /cvs/ports/math/fftw3/Makefile,v
retrieving revision 1.32
diff -u -p -u -r1.32 Makefile
--- Makefile23 Mar 2016 21:14:58 - 1.32
+++ Makefile3 Nov 2017 14:26:09 -
@@ -3,18 +3,17 @@
COMMENT-main= C routines for computing the Discrete Fourier Transform
COMMENT-common=common files for the fftw3 packages
-V= 3.3.4
+V= 3.3.7
DISTNAME= fftw-${V}
PKGNAME= fftw3-${V}
-REVISION= 0
FULLPKGNAME-main= fftw3-${V}
# XXX set it to its default value so that bsd.port.mk won't whine
FULLPKGPATH-main= math/fftw3,-main${FLAVOR_EXT:S/-/,/g}
FULLPKGNAME-common=fftw3-common-${V}
-SHARED_LIBS= fftw3 7.0 \
- fftw3f 7.0 \
- fftw3_threads 1.0 \
- fftw3f_threads 1.0
+SHARED_LIBS= fftw3 7.1 \
+ fftw3f 7.1 \
+ fftw3_threads 1.1 \
+ fftw3f_threads 1.1
CATEGORIES=math
HOMEPAGE= http://www.fftw.org/
@@ -35,8 +34,7 @@ FLAVOR?= double
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--enable-portable-binary \
- --enable-threads
+CONFIGURE_ARGS=--enable-threads
.if ${FLAVOR} == "float"
CONFIGURE_ARGS+=--enable-float
Index: distinfo
===
RCS file: /cvs/ports/math/fftw3/distinfo,v
retrieving revision 1.9
diff -u -p -u -r1.9 distinfo
--- distinfo14 Aug 2015 19:51:26 - 1.9
+++ distinfo3 Nov 2017 14:26:09 -
@@ -1,2 +1,2 @@
-SHA256 (fftw-3.3.4.tar.gz) = jwzekJKbwFWHwzaNLxXNBTCmC4qZEqjil5py2+WvCYI=
-SIZE (fftw-3.3.4.tar.gz) = 3940427
+SHA256 (fftw-3.3.7.tar.gz) = O2Cbf+ulIw6PbdjSRd2++sMkxaauQYaUdnDZrCzSVXM=
+SIZE (fftw-3.3.7.tar.gz) = 4105807
[UPDATE] security/libewf
Hi,
this is the diff to update libewf to latest release.
Ok?
Cheers,
Remi.Index: Makefile
===
RCS file: /cvs/ports/security/libewf/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile 29 May 2017 16:44:57 - 1.4
+++ Makefile 3 Nov 2017 14:21:35 -
@@ -2,12 +2,11 @@
COMMENT = access the Expert Witness Compression Format
-VERSION = 20160424
-REVISION = 0
+VERSION = 20170703
DISTNAME = libewf-experimental-${VERSION}
PKGNAME = libewf-${VERSION}
-SHARED_LIBS += ewf 0.0 # 3.0
+SHARED_LIBS += ewf 0.1 # 3.0
CATEGORIES = security
@@ -18,14 +17,17 @@ MAINTAINER = Remi Pointel https://github.com/libyal/libewf/releases/download/${VERSION}/
MODULES = devel/gettext \
lang/python
LIB_DEPENDS += devel/libbfio \
- archivers/bzip2
+ archivers/bzip2 \
+ sysutils/libsmdev \
+ sysutils/libsmraw
CONFIGURE_STYLE = simple
CONFIGURE_ARGS += --mandir=${PREFIX}/man \
Index: distinfo
===
RCS file: /cvs/ports/security/libewf/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 26 Oct 2016 05:45:26 - 1.1.1.1
+++ distinfo 3 Nov 2017 14:21:35 -
@@ -1,2 +1,2 @@
-SHA256 (libewf-experimental-20160424.tar.gz) = YTRnES9S/pYM4BId0a3o63iH0/z8dhqnKNLxqp8TURY=
-SIZE (libewf-experimental-20160424.tar.gz) = 2219626
+SHA256 (libewf-experimental-20170703.tar.gz) = hP4SOJq6z2PeotkhtjYiC7f9oyYtHEZ/bURaXjH1Ot4=
+SIZE (libewf-experimental-20170703.tar.gz) = 2230913
Re: quagga 1.2.2: tests wanted with mcast-based protos (OSPF/RIP)
On 2017/10/31 12:01, Stuart Henderson wrote:
> Does anyone have quagga setup with ripd and/or ospfd that's in a
> position to test this update?
I've committed this so it's easier to test. If you're using these and run
into new problems, please let me know.
> Background: OpenBSD multicast code wants the interface IP address passed
> when joining/leaving groups.
>
> Old quagga code passed this up e.g. from ripd/ospfd but this was changed
> c.2012 and now only uses ifindex-based APIs (either RFC3678 MCAST_JOIN_GROUP
> etc, struct ip_mreqn on some OS, or a hack allowed in some OS of passing
> the ifindex in as the source address).
>
> The current port version reverts to the old quagga code for this (and
> has done so since 2013 - https://marc.info/?t=13570613121&r=1&w=2),
> but it's becoming harder to maintain as upstream diverges (quagga 1.2 is
> a bit different; the frrouter fork is different again).
>
> So this takes a different and less intrusive approach to handling the
> changes needed - borrowing some code used for SunOS in another function
> in the file, given an ifindex from the calling function, it does a
> lookup for the interface address, and uses that instead. This avoids
> scattering the changes through 4 files, and reduces the main patch
> scope (the current one is guaranteed to conflict when anything is
> changed in the relevant functions upstream).
>
> Any tests/comments welcome...
>
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/quagga/Makefile,v
> retrieving revision 1.53
> diff -u -p -r1.53 Makefile
> --- Makefile 31 Oct 2017 09:37:18 - 1.53
> +++ Makefile 31 Oct 2017 11:42:44 -
> @@ -2,13 +2,13 @@
>
> COMMENT= multi-threaded routing daemon
>
> -DISTNAME=quagga-1.0.20161017
> +DISTNAME=quagga-1.2.2
> CATEGORIES= net
> MASTER_SITES=http://download.savannah.gnu.org/releases/quagga/
>
> -SHARED_LIBS= ospf0.1 \
> - ospfapiclient 0.0 \
> - zebra 1.0
> +.for i in ospf ospfapiclient zebra fpm_pb quagga_pb
> +SHARED_LIBS+=$i 1.0
> +.endfor
>
> HOMEPAGE=http://www.quagga.net/
>
> @@ -37,10 +37,10 @@ CONFIGURE_ARGS+= --disable-pie
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib" \
> LIBS=-lcurses
> -
> MAKE_FLAGS= MAKEINFO="makeinfo --no-split"
> FAKE_FLAGS= exampledir='${PREFIX}/share/examples/quagga' \
> ${MAKE_FLAGS}
> +LIBTOOL_FLAGS= --tag=disable-static
>
> FLAVORS= snmp
> FLAVOR?=
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/quagga/distinfo,v
> retrieving revision 1.21
> diff -u -p -r1.21 distinfo
> --- distinfo 31 Oct 2017 09:37:18 - 1.21
> +++ distinfo 31 Oct 2017 11:42:44 -
> @@ -1,2 +1,2 @@
> -SHA256 (quagga-1.0.20161017.tar.gz) =
> jyZyTdt0GfORL4DOjxNokZAongAizwmSHQpAP9dxSRg=
> -SIZE (quagga-1.0.20161017.tar.gz) = 2758494
> +SHA256 (quagga-1.2.2.tar.gz) = Ui4i8r7uZOPwws3j0BVfO4ED9Pb8ir75LLQLw6TMKTE=
> +SIZE (quagga-1.2.2.tar.gz) = 2986142
> Index: patches/patch-bgpd_bgp_aspath_c
> ===
> RCS file: patches/patch-bgpd_bgp_aspath_c
> diff -N patches/patch-bgpd_bgp_aspath_c
> --- patches/patch-bgpd_bgp_aspath_c 31 Oct 2017 09:37:18 - 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,26 +0,0 @@
> -$OpenBSD: patch-bgpd_bgp_aspath_c,v 1.3 2017/10/31 09:37:18 sthen Exp $
> -
> -From 7a42b78be9a4108d98833069a88e6fddb9285008 Mon Sep 17 00:00:00 2001
> -From: Andreas Jaggi
> -Date: Mon, 2 Oct 2017 19:38:43 +0530
> -Subject: bgpd: Fix AS_PATH size calculation for long paths
> -
> -If you have an AS_PATH with more entries than
> -what can be written into a single AS_SEGMENT_MAX
> -it needs to be broken up. The code that noticed
> -that the AS_PATH needs to be broken up was not
> -correctly calculating the size of the resulting
> -message. This patch addresses this issue.
> -
> -Index: bgpd/bgp_aspath.c
> bgpd/bgp_aspath.c.orig
> -+++ bgpd/bgp_aspath.c
> -@@ -904,7 +904,7 @@ aspath_put (struct stream *s, struct aspath *as, int u
> - assegment_header_put (s, seg->type, AS_SEGMENT_MAX);
> - assegment_data_put (s, seg->as, AS_SEGMENT_MAX, use32bit);
> - written += AS_SEGMENT_MAX;
> -- bytes += ASSEGMENT_SIZE (written, use32bit);
> -+ bytes += ASSEGMENT_SIZE (AS_SEGMENT_MAX, use32bit);
> - }
> -
> - /* write the final segment, probably is also the first */
> Index: patches/patch-configure_ac
> ===
> RCS file: /cvs/ports/net/quagga/patches/patch-configure_ac,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-configure_ac
> --- patches/patch-configure_ac31 Mar 2016 22:42:00 -0
update devel/p5-Module-Install
Hi,
ok to update p5-Module-Install to 1.18?
- added myself as maintainer
- copied warning that this should not used for new modules into DESCR
- added recomended modules to run dependencies so that we always
operate on a fixed set of modules
- will sort according to Makefile.template later to keep diff small
bluhm
Index: devel/p5-Module-Install/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- devel/p5-Module-Install/Makefile9 Jan 2017 11:06:45 - 1.25
+++ devel/p5-Module-Install/Makefile3 Nov 2017 14:33:57 -
@@ -4,29 +4,31 @@ COMMENT= standalone extensible Perl modu
MODULES= cpan
PKG_ARCH= *
-DISTNAME= Module-Install-1.08
-REVISION= 3
+DISTNAME = Module-Install-1.18
CATEGORIES=devel
+MAINTAINER = Alexander Bluhm
+
# perl
PERMIT_PACKAGE_CDROM= Yes
-RUN_DEPENDS+= devel/p5-Module-ScanDeps>=1.13 \
- devel/p5-File-Remove \
- devel/p5-PAR-Dist \
- devel/p5-YAML-Tiny>=1.38 \
- converters/p5-JSON
+BUILD_DEPENDS =devel/p5-YAML-Tiny>=1.33
+RUN_DEPENDS = archivers/p5-Archive-Zip>=1.37 \
+ converters/p5-JSON>=2.9 \
+ devel/p5-File-HomeDir>=1 \
+ devel/p5-File-Remove>=1.42 \
+ devel/p5-Module-Build>=0.29 \
+ devel/p5-Module-ScanDeps>=1.09 \
+ devel/p5-PAR-Dist>=0.29 \
+ devel/p5-YAML-Tiny>=1.38 \
+ www/p5-libwww>=6.05
# special case; this is *not* a CONFIGURE_STYLE=modbuild port
-RUN_DEPENDS+= devel/p5-Module-Build
-
-CONFIGURE_ARGS=--skipdeps
# for the CPAN regression test
pre-test:
mkdir -p ${WRKDIR}/home
PORTHOME= ${WRKDIR}/home
-MAKE_ENV= TEST_POD=Yes
.include
Index: devel/p5-Module-Install/distinfo
===
RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- devel/p5-Module-Install/distinfo19 Mar 2014 09:07:26 - 1.7
+++ devel/p5-Module-Install/distinfo3 Nov 2017 14:24:49 -
@@ -1,2 +1,2 @@
-SHA256 (Module-Install-1.08.tar.gz) =
7YZ4KSkgjmOjVwmtb1Pt054QX8G8t9z8P7c2KvZ7tRQ=
-SIZE (Module-Install-1.08.tar.gz) = 126800
+SHA256 (Module-Install-1.18.tar.gz) =
KQaKwzUCzslZhEwgZRbAnMSoR8tXMn1BAV9gUVPKZF4=
+SIZE (Module-Install-1.18.tar.gz) = 114751
Index: devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
===
RCS file:
/data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_Module_Install_Admin_Include_pm
--- devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
9 Jan 2017 11:06:45 - 1.3
+++ devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
3 Nov 2017 14:32:14 -
@@ -1,10 +1,11 @@
$OpenBSD: patch-lib_Module_Install_Admin_Include_pm,v 1.3 2017/01/09 11:06:45
zhuk Exp $
Fix whatis information.
lib/Module/Install/Admin/Include.pm.orig Mon Jan 9 13:52:24 2017
-+++ lib/Module/Install/Admin/Include.pmMon Jan 9 13:52:44 2017
+Index: lib/Module/Install/Admin/Include.pm
+--- lib/Module/Install/Admin/Include.pm.orig
lib/Module/Install/Admin/Include.pm
@@ -61,6 +61,8 @@ sub auto_include_deps {
- Module::Install::Admin::Include
+ Module::Install::Admin::Include - include methods for Module::Install
+=head1 DESCRIPTION
+
Index: devel/p5-Module-Install/pkg/DESCR
===
RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- devel/p5-Module-Install/pkg/DESCR 4 Nov 2006 23:50:21 - 1.1.1.1
+++ devel/p5-Module-Install/pkg/DESCR 3 Nov 2017 14:19:51 -
@@ -1,4 +1,16 @@
Module::Install is a package for writing installers for CPAN (or
-CPAN-like) distributions that are clean, simple, minimalist, act in a
-strictly correct manner with both the ExtUtils::MakeMaker and
+CPAN-like) distributions that are clean, simple, minimalist, act
+in a strictly correct manner with both the ExtUtils::MakeMaker and
Module::Build build systems.
+
+Please note that while Module::Install pioneered many great ideas
+in its time, its primary benefits have been better achieved by the
+authoring tool Dist::Zilla, and its spinoffs Dist::Milla and Minilla.
+These tools allow the author to build and maintain distributions
+with DWIM convenience, while the distribution is installed directly
+by ExtUtils::MakeMaker or similar installation tools,
Re: [UPDATE] math/fftw3
On Fri, Nov 03, 2017 at 03:27:03PM +0100, Steven Mestdagh wrote:
> minor update. comments/ok?
What happened to the portable binary bit? Otherwise OK.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/fftw3/Makefile,v
> retrieving revision 1.32
> diff -u -p -u -r1.32 Makefile
> --- Makefile 23 Mar 2016 21:14:58 - 1.32
> +++ Makefile 3 Nov 2017 14:26:09 -
> @@ -3,18 +3,17 @@
> COMMENT-main=C routines for computing the Discrete Fourier Transform
> COMMENT-common= common files for the fftw3 packages
>
> -V= 3.3.4
> +V= 3.3.7
> DISTNAME=fftw-${V}
> PKGNAME= fftw3-${V}
> -REVISION=0
> FULLPKGNAME-main=fftw3-${V}
> # XXX set it to its default value so that bsd.port.mk won't whine
> FULLPKGPATH-main=math/fftw3,-main${FLAVOR_EXT:S/-/,/g}
> FULLPKGNAME-common= fftw3-common-${V}
> -SHARED_LIBS= fftw3 7.0 \
> - fftw3f 7.0 \
> - fftw3_threads 1.0 \
> - fftw3f_threads 1.0
> +SHARED_LIBS= fftw3 7.1 \
> + fftw3f 7.1 \
> + fftw3_threads 1.1 \
> + fftw3f_threads 1.1
> CATEGORIES= math
>
> HOMEPAGE=http://www.fftw.org/
> @@ -35,8 +34,7 @@ FLAVOR?=double
>
> USE_GMAKE= Yes
> CONFIGURE_STYLE=gnu
> -CONFIGURE_ARGS= --enable-portable-binary \
> - --enable-threads
> +CONFIGURE_ARGS= --enable-threads
>
> .if ${FLAVOR} == "float"
> CONFIGURE_ARGS+=--enable-float
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/fftw3/distinfo,v
> retrieving revision 1.9
> diff -u -p -u -r1.9 distinfo
> --- distinfo 14 Aug 2015 19:51:26 - 1.9
> +++ distinfo 3 Nov 2017 14:26:09 -
> @@ -1,2 +1,2 @@
> -SHA256 (fftw-3.3.4.tar.gz) = jwzekJKbwFWHwzaNLxXNBTCmC4qZEqjil5py2+WvCYI=
> -SIZE (fftw-3.3.4.tar.gz) = 3940427
> +SHA256 (fftw-3.3.7.tar.gz) = O2Cbf+ulIw6PbdjSRd2++sMkxaauQYaUdnDZrCzSVXM=
> +SIZE (fftw-3.3.7.tar.gz) = 4105807
Re: UPDATE: math/octave
On Thu, Nov 02, 2017 at 10:56:22AM +0100, Steven Mestdagh wrote:
> comments welcome.
Had a similar diff in openbsd-wip on github that did not work when gcc
was around. Looks like clang fixed that, OK!
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/octave/Makefile,v
> retrieving revision 1.97
> diff -u -p -u -r1.97 Makefile
> --- Makefile 30 Oct 2017 13:55:10 - 1.97
> +++ Makefile 2 Nov 2017 09:30:57 -
> @@ -2,14 +2,13 @@
>
> COMMENT =high-level language for numerical computations
>
> -VERSION =4.0.2
> +VERSION =4.2.1
> DISTNAME = octave-${VERSION}
> -REVISION = 6
> CATEGORIES = math
>
> -SHARED_LIBS += octave 7.0 # 3.0
> -SHARED_LIBS += octgui 1.0 # 1.0
> -SHARED_LIBS += octinterp 6.0 # 3.0
> +SHARED_LIBS += octave 8.0
> +SHARED_LIBS += octgui 2.0
> +SHARED_LIBS += octinterp 7.0
>
> HOMEPAGE = https://www.gnu.org/software/octave/
>
> @@ -19,22 +18,26 @@ MAINTAINER = Steven Mestdagh PERMIT_PACKAGE_CDROM = Yes
>
> WANTLIB += ${MODFORTRAN_WANTLIB}
> -WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE OSMesa QtGui
> -WANTLIB += QtNetwork QtOpenGL SM X11 X11-xcb Xau Xcursor Xdamage Xdmcp
> +WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE OSMesa
> +WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
> +WANTLIB += qscintilla2_qt5
> +WANTLIB += SM X11 X11-xcb Xau Xcursor Xdamage Xdmcp
> WANTLIB += Xext Xfixes Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm amd
> WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
> WANTLIB += cxsparse drm ereadline expat fftw3 fftw3_threads fftw3f
> WANTLIB += fftw3f_threads fltk fltk_gl fontconfig freetype gl2ps glapi
> WANTLIB += glpk glut gmp hdf5 lapack lcms2 ltdl lzma m ncurses nghttp2
> WANTLIB += ogg pcre png portaudio pthread qhull qrupdate
> -WANTLIB += qscintilla2_qt4 sndfile sndio ssl ${COMPILER_LIBCXX}
> suitesparseconfig
> -WANTLIB += umfpack usbhid util vorbis vorbisenc xcb xcb-dri2 xcb-glx z
> +WANTLIB += sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
> +WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-glx z
> +WANTLIB += execinfo glib-2.0 graphite2 gthread-2.0 harfbuzz icudata
> +WANTLIB += icui18n icuuc pcre2-16
>
> MASTER_SITES = ${MASTER_SITE_GNU:=octave/}
>
> MODULES =devel/gettext \
> fortran \
> - x11/qt4
> + x11/qt5
>
> BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS} \
> print/texinfo \
> @@ -52,7 +55,7 @@ LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS}
> devel/glpk \
> devel/pcre \
> devel/readline \
> - editors/qscintilla \
> + editors/qscintilla,qt5 \
> graphics/GraphicsMagick \
> math/arpack \
> math/fftw3 \
> @@ -69,12 +72,14 @@ SEPARATE_BUILD = Yes
> USE_GMAKE = Yes
> CONFIGURE_STYLE =gnu
> # --disable-readline: needs GNU readline
> -CONFIGURE_ARGS = --disable-java
> +CONFIGURE_ARGS = --disable-java \
> + octave_cv_version_2_6_0=yes
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
> -I${LOCALBASE}/include/ereadline" \
> LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
> LRELEASE="${MODQT_LRELEASE}" \
> - F77=${FC}
> + F77=${FC} CXXFLAGS="${CXXFLAGS} -std=gnu++11"
> +
>
> # needed to build on amd64
> GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/octave/distinfo,v
> retrieving revision 1.17
> diff -u -p -u -r1.17 distinfo
> --- distinfo 23 Apr 2016 12:44:14 - 1.17
> +++ distinfo 2 Nov 2017 09:30:57 -
> @@ -1,2 +1,2 @@
> -SHA256 (octave-4.0.2.tar.gz) = Oc2P02whj8AK2s4o10psfJxvqrcROlujxDcjJMdVvcE=
> -SIZE (octave-4.0.2.tar.gz) = 22175922
> +SHA256 (octave-4.2.1.tar.gz) = gMKPY5hXa1D6yg5gLe+5WY1vcwiwkDckRCwqNaYFMzs=
> +SIZE (octave-4.2.1.tar.gz) = 25409651
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/math/octave/patches/patch-configure,v
> retrieving revision 1.9
> diff -u -p -u -r1.9 patch-configure
> --- patches/patch-configure 23 Apr 2016 12:44:14 - 1.9
> +++ patches/patch-configure 2 Nov 2017 09:30:57 -
> @@ -2,9 +2,19 @@ $OpenBSD: patch-configure,v 1.9 2016/04/
>
> Use GNU readline as our base readline lacks rl_prefer_env_winsize.
>
> configure.orig Wed Apr 20 21:02:19 2016
> -+++ configureFri Apr 22 23:52:05 2016
> -@@ -39759,13 +39759,13 @@ fi
> +Index: configure
> +--- configure.orig
> configure
> +@@ -34701,7 +34701,7 @@ $as_echo_n "checking Qt version $ver...
[UPDATE] libxml
could someone put this in a bulk build?
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.171
diff -u -p -u -r1.171 Makefile
--- Makefile14 Sep 2017 14:56:41 - 1.171
+++ Makefile3 Nov 2017 15:00:19 -
@@ -3,7 +3,7 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.5
+VERSION= 2.9.7
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py-libxml-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.53
diff -u -p -u -r1.53 distinfo
--- distinfo14 Sep 2017 14:56:41 - 1.53
+++ distinfo3 Nov 2017 15:00:19 -
@@ -1,2 +1,2 @@
-SHA256 (libxml2-2.9.5.tar.gz) = QDHB7O6c57pPMT6R72KEFkiFzbaZN6Ej9qg7tqctzTg=
-SIZE (libxml2-2.9.5.tar.gz) = 5466888
+SHA256 (libxml2-2.9.7.tar.gz) = 9jxefTA2LtKLOL+hrGMT+agCMHILf7bIBXXuqz/1kAw=
+SIZE (libxml2-2.9.7.tar.gz) = 5467389
Index: patches/patch-timsort_h
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-timsort_h,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-timsort_h
--- patches/patch-timsort_h 25 Sep 2013 12:32:24 - 1.4
+++ patches/patch-timsort_h 3 Nov 2017 15:00:19 -
@@ -1,12 +1,13 @@
$OpenBSD: patch-timsort_h,v 1.4 2013/09/25 12:32:24 jasper Exp $
timsort.h.orig Tue Sep 24 10:50:59 2013
-+++ timsort.h Tue Sep 24 10:51:40 2013
-@@ -48,7 +48,7 @@ typedef unsigned __int64 uint64_t;
- int compute_minrun(uint64_t);
+Index: timsort.h
+--- timsort.h.orig
timsort.h
+@@ -74,7 +74,7 @@ typedef unsigned __int64 uint64_t;
+ static int compute_minrun(const uint64_t);
#ifndef CLZ
--#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__
> 3))
-+#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >=
4))
+-#ifdef __GNUC__
++#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__
>= 4))
#define CLZ __builtin_clzll
#else
Index: patches/patch-xmllint_c
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-xmllint_c,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-xmllint_c
--- patches/patch-xmllint_c 5 Jul 2007 16:05:09 - 1.4
+++ patches/patch-xmllint_c 3 Nov 2017 15:00:19 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-xmllint_c,v 1.4 2007/07/05 16:05:09 steven Exp $
xmllint.c.orig Tue Apr 17 14:28:16 2007
-+++ xmllint.c Mon Jul 2 12:50:32 2007
-@@ -103,7 +103,7 @@
+Index: xmllint.c
+--- xmllint.c.orig
xmllint.c
+@@ -87,7 +87,7 @@
#endif
#ifndef XML_XML_DEFAULT_CATALOG
NEW: devel/ruby-mini_portile2
This new port is a dependency for the new port security/ruby-gpgme, providing a simplistic port-like solution for developers. comments, and/or OKs? ruby-mini_portile2.tar.gz Description: application/gzip
Re: [UPDATE] math/fftw3
Paul Irofti [2017-11-03, 16:49:33]: > On Fri, Nov 03, 2017 at 03:27:03PM +0100, Steven Mestdagh wrote: > > minor update. comments/ok? > > What happened to the portable binary bit? Otherwise OK. they removed this config arg as it is now default.
NEW: security/ruby-gpgme
this new port is a dependency of new port databases/ruby-hiera-eyaml-gpg, provding Ruby language bindings for gpgme. comments and/or OKs? ruby-gpgme.tar.gz Description: application/gzip
Re: update devel/p5-Module-Install
Can't respond quickly to this, this is my version, and has been run
through earlier version 1.16 etc, the full update requires complex
p5-Module-Install- updates
Index: Makefile
===
RCS file: /home/cvs/ports/devel/p5-Module-Install/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile9 Jan 2017 11:06:45 - 1.25
+++ Makefile16 Aug 2017 00:14:44 -
@@ -4,29 +4,36 @@ COMMENT= standalone extensible Perl modu
MODULES= cpan
PKG_ARCH= *
-DISTNAME= Module-Install-1.08
-REVISION= 3
-CATEGORIES=devel
+DISTNAME= Module-Install-1.18
+CATEGORIES= devel
# perl
PERMIT_PACKAGE_CDROM= Yes
-RUN_DEPENDS+= devel/p5-Module-ScanDeps>=1.13 \
- devel/p5-File-Remove \
- devel/p5-PAR-Dist \
- devel/p5-YAML-Tiny>=1.38 \
- converters/p5-JSON
+RUN_DEPENDS= devel/p5-File-Remove>=1.42 \
+ devel/p5-Module-ScanDeps>=1.13 \
+ devel/p5-YAML-Tiny>=1.38
+
+# recommendations only...
+# archivers/p5-Archive-Zip>=1.37 \
+# converters/p5-JSON>=2.90 \
+# devel/p5-PAR-Dist>=0.29 \
+# www/p5-libwww>=6.05
# special case; this is *not* a CONFIGURE_STYLE=modbuild port
RUN_DEPENDS+= devel/p5-Module-Build
+BUILD_DEPENDS += ${RUN_DEPENDS}
-CONFIGURE_ARGS=--skipdeps
+# Needs building as package first so these can be built...
+TEST_DEPENDS +=devel/p5-Module-Install-AuthorTests \
+ devel/p5-Module-Install-ExtraTests
-# for the CPAN regression test
-pre-test:
- mkdir -p ${WRKDIR}/home
+# No autoinstall from CPAN...
+CONFIGURE_ARGS=--skipdeps
-PORTHOME= ${WRKDIR}/home
MAKE_ENV= TEST_POD=Yes
+
+post-patch:
+ find ${WRKSRC} -type f -name "*.orig" -exec rm {} +
.include
Index: distinfo
===
On 11/03/17 14:47, Alexander Bluhm wrote:
> Hi,
>
> ok to update p5-Module-Install to 1.18?
>
> - added myself as maintainer
> - copied warning that this should not used for new modules into DESCR
> - added recomended modules to run dependencies so that we always
> operate on a fixed set of modules
> - will sort according to Makefile.template later to keep diff small
>
> bluhm
>
> Index: devel/p5-Module-Install/Makefile
> ===
> RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- devel/p5-Module-Install/Makefile 9 Jan 2017 11:06:45 - 1.25
> +++ devel/p5-Module-Install/Makefile 3 Nov 2017 14:33:57 -
> @@ -4,29 +4,31 @@ COMMENT=standalone extensible Perl modu
>
> MODULES= cpan
> PKG_ARCH=*
> -DISTNAME=Module-Install-1.08
> -REVISION=3
> +DISTNAME = Module-Install-1.18
> CATEGORIES= devel
>
> +MAINTAINER = Alexander Bluhm
> +
> # perl
> PERMIT_PACKAGE_CDROM=Yes
>
> -RUN_DEPENDS+=devel/p5-Module-ScanDeps>=1.13 \
> - devel/p5-File-Remove \
> - devel/p5-PAR-Dist \
> - devel/p5-YAML-Tiny>=1.38 \
> - converters/p5-JSON
> +BUILD_DEPENDS = devel/p5-YAML-Tiny>=1.33
> +RUN_DEPENDS =archivers/p5-Archive-Zip>=1.37 \
> + converters/p5-JSON>=2.9 \
> + devel/p5-File-HomeDir>=1 \
> + devel/p5-File-Remove>=1.42 \
> + devel/p5-Module-Build>=0.29 \
> + devel/p5-Module-ScanDeps>=1.09 \
> + devel/p5-PAR-Dist>=0.29 \
> + devel/p5-YAML-Tiny>=1.38 \
> + www/p5-libwww>=6.05
>
> # special case; this is *not* a CONFIGURE_STYLE=modbuild port
> -RUN_DEPENDS+=devel/p5-Module-Build
> -
> -CONFIGURE_ARGS= --skipdeps
>
> # for the CPAN regression test
> pre-test:
> mkdir -p ${WRKDIR}/home
>
> PORTHOME=${WRKDIR}/home
> -MAKE_ENV=TEST_POD=Yes
>
> .include
> Index: devel/p5-Module-Install/distinfo
> ===
> RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- devel/p5-Module-Install/distinfo 19 Mar 2014 09:07:26 - 1.7
> +++ devel/p5-Module-Install/distinfo 3 Nov 2017 14:24:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (Module-Install-1.08.tar.gz) =
> 7YZ4KSkgjmOjVwmtb1Pt054QX8G8t9z8P7c2KvZ7tRQ=
> -SIZE (Module-Install-1.08.tar.gz) = 126800
> +SHA256 (Module-Install-1.18.tar.gz) =
> KQaKwzUCzslZhEwgZRbAnMSoR8tXMn1BAV9gUVPKZF4=
> +SIZE (Module-Install-1.18.tar.gz) = 114751
> Index:
> devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
> ===
> RCS file:
>
NEW: databases/ruby-hiera-eyaml-gpg
this port provides a GPG backend for the Hiera eyaml backend, allows to use GPG keys to encrypt your secrets. comments and/or OKs? ruby-hiera-eyaml-gpg.tar.gz Description: application/gzip
Re: UPDATE: borgbackup 1.1.1
On Wed, Nov 01, 2017 at 12:53:50PM +0100, Björn Ketelaars wrote: > On Thu 26/10/2017 15:13, Björn Ketelaars wrote: > > As of yet a diff for bringing borgbackup to 1.1.0 [0] has not been picked > > up. > > In the meantime borgbackup 1.1.1 has been released, which fixes some bugs. > > I've been running this version on amd64 for a couple of days without any > > issues. Restoring an (old) backup works as advertised. > > > > make test outputs: > > > > 1142 passed, 185 skipped, 2 xfailed in 1392.05 seconds > > > > OK? > > > > Any comments / OK's? works fine for me on amd64. I tested borg create and extract. ok remi@
unbreak lang/freebasic on i386
Hi ports -- The attached works for me to re-enable lang/freebasic on i386. Can anyone else give this a spin? ~Brian Index: Makefile === RCS file: /cvs/ports/lang/freebasic/Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 Makefile --- Makefile 27 Oct 2017 20:41:47 - 1.2 +++ Makefile 28 Oct 2017 23:52:28 - @@ -1,8 +1,6 @@ # $OpenBSD: Makefile,v 1.2 2017/10/27 20:41:47 bcallah Exp $ -BROKEN-i386 = bad bootstrap - -# All they seem to support. +# May also support aarch64 and arm? ONLY_FOR_ARCHS = amd64 i386 V = 1.05.0 Index: patches/patch-makefile === RCS file: /cvs/ports/lang/freebasic/patches/patch-makefile,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-makefile --- patches/patch-makefile 23 Oct 2017 21:46:58 - 1.1.1.1 +++ patches/patch-makefile 28 Oct 2017 23:52:28 - @@ -6,7 +6,17 @@ Keep tendrils here to make generating fu Index: makefile --- makefile.orig +++ makefile -@@ -393,7 +393,8 @@ endif +@@ -295,9 +295,7 @@ endif + # ENABLE_PIC for non-x86 Linux etc. (for every system where we need separate + # -fPIC versions of FB libs besides the normal ones) + ifneq ($(filter freebsd linux netbsd openbsd solaris,$(TARGET_OS)),) +- ifneq ($(TARGET_ARCH),x86) + ENABLE_PIC := YesPlease +- endif + endif + + ifneq ($(filter cygwin dos win32,$(TARGET_OS)),) +@@ -393,7 +391,8 @@ endif ALLFBCFLAGS += -e -m fbc -w pedantic ALLFBLFLAGS += -e -m fbc -w pedantic @@ -16,7 +26,7 @@ Index: makefile ifeq ($(TARGET_OS),xbox) ifeq ($(OPENXDK),) -@@ -1050,32 +1051,16 @@ FBBOOTSTRAPTITLE := $(FBSOURCETITLE)-bootstrap +@@ -1050,32 +1049,16 @@ FBBOOTSTRAPTITLE := $(FBSOURCETITLE)-bootstrap bootstrap-dist: # Precompile fbc sources for various targets rm -rf bootstrap @@ -55,7 +65,19 @@ Index: makefile # # Build the fbc[.exe] binary from the precompiled sources in the bootstrap/ # directory. -@@ -1098,6 +1083,7 @@ else +@@ -1086,22 +1069,16 @@ bootstrap: rtlib gfxlib2 $(BOOTSTRAP_FBC) + mkdir -p bin + cp $(BOOTSTRAP_FBC) $(FBC_EXE) + +-ifeq ($(TARGET_ARCH),x86) +- # x86: .asm => .o (using the same assembler options as fbc) +- BOOTSTRAP_OBJ = $(patsubst %.asm,%.o,$(sort $(wildcard bootstrap/$(FBTARGET)/*.asm))) +- $(BOOTSTRAP_OBJ): %.o: %.asm +- $(QUIET_AS)$(AS) --strip-local-absolute $< -o $@ +-else + # x86_64 etc.: .c => .o (using the same gcc options as fbc -gen gcc) + BOOTSTRAP_CFLAGS := -nostdinc + BOOTSTRAP_CFLAGS += -Wall -Wno-unused-label -Wno-unused-function -Wno-unused-variable BOOTSTRAP_CFLAGS += -Wno-unused-but-set-variable -Wno-main BOOTSTRAP_CFLAGS += -fno-strict-aliasing -frounding-math BOOTSTRAP_CFLAGS += -Wfatal-errors @@ -63,3 +85,7 @@ Index: makefile BOOTSTRAP_OBJ := $(patsubst %.c,%.o,$(sort $(wildcard bootstrap/$(FBTARGET)/*.c))) $(BOOTSTRAP_OBJ): %.o: %.c $(QUIET_CC)$(CC) -c $(BOOTSTRAP_CFLAGS) $< -o $@ +-endif + + # Use gcc to link fbc from the bootstrap .o's + # (assuming the rtlib was built already)
Re: security/gpgme (needs help)
On Thu, Nov 02 2017, Nigel Taylor wrote: > Should you promote gpgme-qt to be the default flavor over others It's a subpackage, not a flavor. > FLAVOR ?= > > should default to no_qt no_python2 no_python3, that is the default as > before. Building with qt should be an extra, in fact use of this sort of > complex PSEUDO_FLAVOR causes problems especially with something as large > as qt5, which means dpb can't be used for build a subset of packages. > > I dpb tries to build security/gpgme,no_qt,no_py2,no_py3,-main as > effectively used by all current ports using gpgme which would have to be > changed in the ports tree. > > The existing dpb xxx/yyy or list that built a subset of packages, this > change on seeing reference to security/gpgme will build not only the > packages as before, but all the packages for the included modules, that > is python2 and sub packages, python3 and sub packages, and the whole of qt5. > > This is enforcing qt5 on those who don't want and don't need qt5. > > python2 / python3 I can live with. qt5 I can live without. > > For those wanting a small light weight system, qt5 - everywhere - > everything just isn't what they want. This is not about qt5 everywhere, this about qt5 on the build machine; remember that the ports tree is optimized for bulk builds. I'm *much more* concerned about introducing a hard dep on a C++11 compiler (and Qt5?) on such an important library. > Just why should if we want a small light weight system should we need to > go around adding in no_qt,no_py2,no_py3,-main to everything? Maybe here > also there would be less objections on my part if dpb didn't try to > build every possible flavor, until it does. I suggest using a separate > security/qt-gpgme and security/gpgme This may be a good idea. > also strictly python2 and python3 flavor should default to no_qt rather > than with qt5. The main choice for python isn't qt5 it's Tk, and a Tk > flavor of gpgme would tie in with the use of python2/3. I don't understand the link between the possible -python* *subpackages* and qt5. Of course those subpackages shouldn't depend on Qt. We're talking about optional subpackages here, not package flavors. > Littering qt5 around just about everything is bad as is the whole qt > mind set of having to put anything and everything into it's own wrappers. > > On 11/01/17 16:53, Rafael Sadowski wrote: >> Hi porters, >> >> I need help with the gpgme update. Special thing here, I need the Qt >> bindings because kde-applications/gpgmepp is dead and all dependent >> programs work with gpgme-qt now. >> >> But I always trap into the following link issue: >> >> libtool: link: cc -shared -fPIC -DPIC -o >> .libs/libgpgme.so.20.0 -I/usr/local/include -O2 -pipe -Wall -Wcast-align >> -Wshadow -Wstrict-prototypes >> .libs/conversion.o .libs/b64dec.o .libs/get-env.o .libs/parsetlv.o >> .libs/mbox-util.o .libs/data.o .libs/data-fd.o .libs/data-stream.o >> .libs/data-mem.o .libs/data-user.o .libs/data-compat.o >> .libs/data-identify.o .libs/signers.o .libs/sig-notation.o >> .libs/wait.o .libs/wait-global.o .libs/wait-private.o >> .libs/wait-user.o .libs/op-support.o .libs/encrypt.o >> .libs/encrypt-sign.o .libs/decrypt.o .libs/decrypt-verify.o >> .libs/verify.o .libs/sign.o .libs/passphrase.o .libs/progress.o >> .libs/key.o .libs/keylist.o .libs/keysign.o .libs/trust-item.o >> .libs/trustlist.o .libs/tofupolicy.o .libs/import.o .libs/export.o >> .libs/genkey.o .libs/delete.o .libs/edit.o .libs/getauditlog.o >> .libs/opassuan.o .libs/passwd.o .libs/spawn.o .libs/assuan-support.o >> .libs/engine.o .libs/engine-gpg.o .libs/status-table.o >> .libs/engine-gpgsm.o .libs/engine-assuan.o .libs/engine-gpgconf.o >> .libs/engine-uiserver.o .libs/engine-g13.o .libs/vfs-mount.o >> .libs/vfs-create.o .libs/engine-spawn.o .libs/gpgconf.o >> .libs/queryswdb.o .libs/posix-util.o .libs/posix-io.o .libs/dirinfo.o >> .libs/debug.o .libs/gpgme.o .libs/version.o .libs/error.o >> .libs/ath.o -L.libs -lassuan -lgpg-error -lintl -liconv >> libtool: link: ar cru .libs/libgpgme.a conversion.o b64dec.o get-env.o >> parsetlv.o mbox-util.o data.o data-fd.o data-stream.o data-mem.o >> data-user.o data-compat.o data-identify.o signers.o sig-notation.o >> wait.o wait-global.o wait-private.o wait-user.o op-support.o encrypt.o >> encrypt-sign.o decrypt.o decrypt-verify.o verify.o sign.o passphrase.o >> progress.o key.o keylist.o keysign.o trust-item.o trustlist.o >> tofupolicy.o import.o export.o genkey.o delete.o edit.o getauditlog.o >> opassuan.o passwd.o spawn.o assuan-support.o engine.o engine-gpg.o >> status-table.o engine-gpgsm.o engine-assuan.o engine-gpgconf.o >> engine-uiserver.o engine-g13.o vfs-mount.o vfs-create.o engine-spawn.o >> gpgconf.o queryswdb.o posix-util.o posix-io.o dirinfo.o debug.o >> gpgme.o version.o error.o ath.o >> libtool: link: ranlib .libs/libgpgme.a >> cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I/usr/local/include -O2 >> -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT >
Re: security/gpgme (needs help)
As you say it's not a FLAVOR what's this in the Makefile for -CONFIGURE_STYLE= gnu +MULTI_PACKAGES = -main -qt -py2 -py3 +PSEUDO_FLAVORS = no_qt no_py2 no_py3 +FLAVOR ?= As subpackage is even worse so even the simplest ports using gpgme needs Qt5 built to build. On 11/03/17 15:39, Jeremie Courreges-Anglas wrote: > On Thu, Nov 02 2017, Nigel Taylor wrote: >> Should you promote gpgme-qt to be the default flavor over others > > It's a subpackage, not a flavor. > >> FLAVOR ?= >> >> should default to no_qt no_python2 no_python3, that is the default as >> before. Building with qt should be an extra, in fact use of this sort of >> complex PSEUDO_FLAVOR causes problems especially with something as large >> as qt5, which means dpb can't be used for build a subset of packages. >> >> I dpb tries to build security/gpgme,no_qt,no_py2,no_py3,-main as >> effectively used by all current ports using gpgme which would have to be >> changed in the ports tree. >> >> The existing dpb xxx/yyy or list that built a subset of packages, this >> change on seeing reference to security/gpgme will build not only the >> packages as before, but all the packages for the included modules, that >> is python2 and sub packages, python3 and sub packages, and the whole of qt5. >> >> This is enforcing qt5 on those who don't want and don't need qt5. >> >> python2 / python3 I can live with. qt5 I can live without. >> >> For those wanting a small light weight system, qt5 - everywhere - >> everything just isn't what they want. > > This is not about qt5 everywhere, this about qt5 on the build machine; > remember that the ports tree is optimized for bulk builds. > > I'm *much more* concerned about introducing a hard dep on a C++11 > compiler (and Qt5?) on such an important library. > >> Just why should if we want a small light weight system should we need to >> go around adding in no_qt,no_py2,no_py3,-main to everything? Maybe here >> also there would be less objections on my part if dpb didn't try to >> build every possible flavor, until it does. I suggest using a separate >> security/qt-gpgme and security/gpgme > > This may be a good idea. > >> also strictly python2 and python3 flavor should default to no_qt rather >> than with qt5. The main choice for python isn't qt5 it's Tk, and a Tk >> flavor of gpgme would tie in with the use of python2/3. > > I don't understand the link between the possible -python* *subpackages* > and qt5. Of course those subpackages shouldn't depend on Qt. We're > talking about optional subpackages here, not package flavors. > >> Littering qt5 around just about everything is bad as is the whole qt >> mind set of having to put anything and everything into it's own wrappers. >> >> On 11/01/17 16:53, Rafael Sadowski wrote: >>> Hi porters, >>> >>> I need help with the gpgme update. Special thing here, I need the Qt >>> bindings because kde-applications/gpgmepp is dead and all dependent >>> programs work with gpgme-qt now. >>> >>> But I always trap into the following link issue: >>> >>> libtool: link: cc -shared -fPIC -DPIC -o >>> .libs/libgpgme.so.20.0 -I/usr/local/include -O2 -pipe -Wall -Wcast-align >>> -Wshadow -Wstrict-prototypes >>> .libs/conversion.o .libs/b64dec.o .libs/get-env.o .libs/parsetlv.o >>> .libs/mbox-util.o .libs/data.o .libs/data-fd.o .libs/data-stream.o >>> .libs/data-mem.o .libs/data-user.o .libs/data-compat.o >>> .libs/data-identify.o .libs/signers.o .libs/sig-notation.o >>> .libs/wait.o .libs/wait-global.o .libs/wait-private.o >>> .libs/wait-user.o .libs/op-support.o .libs/encrypt.o >>> .libs/encrypt-sign.o .libs/decrypt.o .libs/decrypt-verify.o >>> .libs/verify.o .libs/sign.o .libs/passphrase.o .libs/progress.o >>> .libs/key.o .libs/keylist.o .libs/keysign.o .libs/trust-item.o >>> .libs/trustlist.o .libs/tofupolicy.o .libs/import.o .libs/export.o >>> .libs/genkey.o .libs/delete.o .libs/edit.o .libs/getauditlog.o >>> .libs/opassuan.o .libs/passwd.o .libs/spawn.o .libs/assuan-support.o >>> .libs/engine.o .libs/engine-gpg.o .libs/status-table.o >>> .libs/engine-gpgsm.o .libs/engine-assuan.o .libs/engine-gpgconf.o >>> .libs/engine-uiserver.o .libs/engine-g13.o .libs/vfs-mount.o >>> .libs/vfs-create.o .libs/engine-spawn.o .libs/gpgconf.o >>> .libs/queryswdb.o .libs/posix-util.o .libs/posix-io.o .libs/dirinfo.o >>> .libs/debug.o .libs/gpgme.o .libs/version.o .libs/error.o >>> .libs/ath.o -L.libs -lassuan -lgpg-error -lintl -liconv >>> libtool: link: ar cru .libs/libgpgme.a conversion.o b64dec.o get-env.o >>> parsetlv.o mbox-util.o data.o data-fd.o data-stream.o data-mem.o >>> data-user.o data-compat.o data-identify.o signers.o sig-notation.o >>> wait.o wait-global.o wait-private.o wait-user.o op-support.o encrypt.o >>> encrypt-sign.o decrypt.o decrypt-verify.o verify.o sign.o passphrase.o >>> progress.o key.o keylist.o keysign.o trust-item.o trustlist.o >>> tofupolicy.o import.o export.o genkey.o delete.o edit.o getauditlog.o >>> opassuan.o passwd.o spawn.o assuan-support.o eng
Re: NEW: lang/a60
On 10/23/17 15:04, Brian Callahan wrote: Hi ports -- On 08/16/17 20:19, Brian Callahan wrote: On 07/13/17 01:07, Brian Callahan wrote: Hi ports -- Back again from the historical languages department: here's a port of a60, an Algol 60 interpreter (and IDE). --- pkg/DESCR: a60 is the Algol 60 interpreter NASE A60. Made for fun and call-by-name. NASE A60 is based on the Revised Report on the Algorithmic Language Algol 60. Additionally there is the xa60 frontend: a simple edit-and-go X11 IDE. --- Two tests "fail" on amd64 because the test check file assumes 32-bit longs. OK? ~Brian Ping. Tarball reattached for convenience. ~Brian And apologies for flooding ports@ with a whole lot of stuff--I have more in the pipeline so I'm trying to clear out old stuff from my queue. I never got any feedback on this. New tarball attached. I decided to break out a no_x11 FLAVOR, for all 1 person that would be useful for. OK? ~Brian Ping hopefully for the last time. Tarball attached. Yes, it's an old language. But the implementation of it is modern and maintained :) ~Brian a60.tgz Description: Binary data
Re: update devel/p5-Module-Install
On Fri, Nov 03, 2017 at 03:08:11PM +, Nigel Taylor wrote:
> Can't respond quickly to this, this is my version, and has been run
> through earlier version 1.16 etc,
Does that mean that you want to take care of the update?
> the full update requires complex
> p5-Module-Install- updates
I have not seen any fallout with the existing p5-Module-Install-
modules. Do you have anything that got broken? Can we update
p5-Module-Install and fix everything afterwards?
> +TEST_DEPENDS +=devel/p5-Module-Install-AuthorTests \
I have added p5-Module-Install-AuthorTests so that the test is not
skipped.
> + devel/p5-Module-Install-ExtraTests
This port p5-Module-Install-ExtraTests does not exist yet. I ignore
the dependency, it just means that a test is skipped.
> -# for the CPAN regression test
> -pre-test:
> - mkdir -p ${WRKDIR}/home
> -PORTHOME= ${WRKDIR}/home
I did not find why this is needed so I removed it.
> +# No autoinstall from CPAN...
> +CONFIGURE_ARGS=--skipdeps
I see that lib/Module/AutoInstall.pm checks it, so I put it back.
> MAKE_ENV= TEST_POD=Yes
I do not see why this is needed, so I removed it.
> +post-patch:
> + find ${WRKSRC} -type f -name "*.orig" -exec rm {} +
This prevents make update-patches, so I do not include it.
New diff, ok?
bluhm
Index: devel/p5-Module-Install/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- devel/p5-Module-Install/Makefile9 Jan 2017 11:06:45 - 1.25
+++ devel/p5-Module-Install/Makefile3 Nov 2017 15:54:58 -
@@ -4,29 +4,29 @@ COMMENT= standalone extensible Perl modu
MODULES= cpan
PKG_ARCH= *
-DISTNAME= Module-Install-1.08
-REVISION= 3
+DISTNAME = Module-Install-1.18
CATEGORIES=devel
+MAINTAINER = Alexander Bluhm
+
# perl
PERMIT_PACKAGE_CDROM= Yes
-RUN_DEPENDS+= devel/p5-Module-ScanDeps>=1.13 \
- devel/p5-File-Remove \
- devel/p5-PAR-Dist \
- devel/p5-YAML-Tiny>=1.38 \
- converters/p5-JSON
+BUILD_DEPENDS =devel/p5-YAML-Tiny>=1.33
+RUN_DEPENDS = archivers/p5-Archive-Zip>=1.37 \
+ converters/p5-JSON>=2.9 \
+ devel/p5-File-HomeDir>=1 \
+ devel/p5-File-Remove>=1.42 \
+ devel/p5-Module-Build>=0.29 \
+ devel/p5-Module-ScanDeps>=1.09 \
+ devel/p5-PAR-Dist>=0.29 \
+ devel/p5-YAML-Tiny>=1.38 \
+ www/p5-libwww>=6.05
+TEST_DEPENDS = devel/p5-Module-Install-AuthorTests
# special case; this is *not* a CONFIGURE_STYLE=modbuild port
-RUN_DEPENDS+= devel/p5-Module-Build
+# no autoinstall from CPAN
CONFIGURE_ARGS=--skipdeps
-
-# for the CPAN regression test
-pre-test:
- mkdir -p ${WRKDIR}/home
-
-PORTHOME= ${WRKDIR}/home
-MAKE_ENV= TEST_POD=Yes
.include
Index: devel/p5-Module-Install/distinfo
===
RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- devel/p5-Module-Install/distinfo19 Mar 2014 09:07:26 - 1.7
+++ devel/p5-Module-Install/distinfo3 Nov 2017 14:24:49 -
@@ -1,2 +1,2 @@
-SHA256 (Module-Install-1.08.tar.gz) =
7YZ4KSkgjmOjVwmtb1Pt054QX8G8t9z8P7c2KvZ7tRQ=
-SIZE (Module-Install-1.08.tar.gz) = 126800
+SHA256 (Module-Install-1.18.tar.gz) =
KQaKwzUCzslZhEwgZRbAnMSoR8tXMn1BAV9gUVPKZF4=
+SIZE (Module-Install-1.18.tar.gz) = 114751
Index: devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
===
RCS file:
/data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_Module_Install_Admin_Include_pm
--- devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
9 Jan 2017 11:06:45 - 1.3
+++ devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
3 Nov 2017 14:32:14 -
@@ -1,10 +1,11 @@
$OpenBSD: patch-lib_Module_Install_Admin_Include_pm,v 1.3 2017/01/09 11:06:45
zhuk Exp $
Fix whatis information.
lib/Module/Install/Admin/Include.pm.orig Mon Jan 9 13:52:24 2017
-+++ lib/Module/Install/Admin/Include.pmMon Jan 9 13:52:44 2017
+Index: lib/Module/Install/Admin/Include.pm
+--- lib/Module/Install/Admin/Include.pm.orig
lib/Module/Install/Admin/Include.pm
@@ -61,6 +61,8 @@ sub auto_include_deps {
- Module::Install::Admin::Include
+ Module::Install::Admin::Include - include methods for Module::Install
+=head1 DESCRIPTION
+
Index: devel/p5-Module-Install/pkg/DESCR
=
[UPDATE] databases/py-redis
Hi, this is the diff to update py-redis to latest release. Ok? Cheers, Remi.Index: Makefile === RCS file: /cvs/ports/databases/py-redis/Makefile,v retrieving revision 1.31 diff -u -p -u -p -r1.31 Makefile --- Makefile 15 Nov 2015 15:28:26 - 1.31 +++ Makefile 3 Nov 2017 16:07:26 - @@ -2,7 +2,7 @@ COMMENT = Python interface to Redis -MODPY_EGG_VERSION = 2.10.5 +MODPY_EGG_VERSION = 2.10.6 GH_ACCOUNT = andymccurdy GH_PROJECT = redis-py Index: distinfo === RCS file: /cvs/ports/databases/py-redis/distinfo,v retrieving revision 1.22 diff -u -p -u -p -r1.22 distinfo --- distinfo 15 Nov 2015 15:28:26 - 1.22 +++ distinfo 3 Nov 2017 16:07:26 - @@ -1,2 +1,2 @@ -SHA256 (redis-py-2.10.5.tar.gz) = FZg1rF8JgiuzxXi9+Ei50TemfC5K5LeqBTkNrDMIfe8= -SIZE (redis-py-2.10.5.tar.gz) = 86029 +SHA256 (redis-py-2.10.6.tar.gz) = 4o4kU51lkKi4hJjy0w9/4+K+EXHXqR/h+mxbaYJRkBU= +SIZE (redis-py-2.10.6.tar.gz) = 94869
[UPDATE] devel/apktool
Hi,
this is the diff to update apktool to latest release.
Ok?
Cheers,
Remi.Index: Makefile
===
RCS file: /cvs/ports/devel/apktool/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile 28 May 2017 18:16:24 - 1.12
+++ Makefile 3 Nov 2017 16:04:36 -
@@ -2,7 +2,7 @@
COMMENT = tool for reverse engineering Android apk files
-DISTNAME = apktool_2.2.2
+DISTNAME = apktool_2.3.0
PKGNAME = ${DISTNAME:S/_/-/}
CATEGORIES = devel security java
Index: distinfo
===
RCS file: /cvs/ports/devel/apktool/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo 28 May 2017 18:16:24 - 1.9
+++ distinfo 3 Nov 2017 16:04:36 -
@@ -1,2 +1,2 @@
-SHA256 (apktool_2.2.2.jar) = IRDNvf0Isl2qhcz7L/jKuEz1wy074aApbx0BWgGXJKk=
-SIZE (apktool_2.2.2.jar) = 8488199
+SHA256 (apktool_2.3.0.jar) = tyTBWOyZ261yMCTiWf1z5RNcQNZSo8WZzsat6SZKVo4=
+SIZE (apktool_2.3.0.jar) = 5882586
Re: security/gpgme (needs help)
On Fri, Nov 03 2017, Nigel Taylor wrote: > As you say it's not a FLAVOR what's this in the Makefile for What I meant is that PSEUDO_FLAVORS are meant to disable subpackages, they are not proper flavors. > -CONFIGURE_STYLE= gnu > +MULTI_PACKAGES = -main -qt -py2 -py3 > +PSEUDO_FLAVORS = no_qt no_py2 no_py3 > +FLAVOR ?= > > As subpackage is even worse so even the simplest ports using gpgme needs > Qt5 built to build. And I agree with you that requiring Qt5 to build gpgme in bulk builds is not reasonable, as said in my previous mail. Availability of a C++11 compiler, portability problems on low-powered/"just different" architectures, build times (gpgme is on the path of important ports). Maybe even circular deps? (I did not check.). All those are hard problems. I also agree with you that forcing Qt5 on people who just need gpgme is not good. FLAVOR ?= no_qt bootstrap could be a way to avoid Qt5 except when explicitely needed. But qt5.port.mk changes the C (and ofc C++) compiler used for the whole build, if base doesn't provide clang; and this is not acceptable for a PSEUDO_FLAVOR. So we need something smarter. Thoughts? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Remove some old pure ruby gem ports
I would like to remove the pure ruby gem ports listed below. I reviewed all of our pure ruby gem ports and used the following criteria: 1) No significant updates in the last few years 2) Gem version we are using was released over 7 years ago 3) No other port depends on it Here's a list of the ports and the year the gem version we are using was released: databases/ruby-validatable # 2008 devel/ruby-bacon # 2008 devel/ruby-clio # 2008 devel/ruby-color-tools # 2005 devel/ruby-ffi-inliner # 2010 devel/ruby-gem_plugin # 2007 devel/ruby-mspec # 2010 devel/ruby-needle # 2005 devel/ruby-stringex # 2009 net/ruby-nmap-parser # 2009 net/ruby-xmpp4r # 2008 security/ruby-ezcrypto # 2009 security/ruby-yadis # 2007 textproc/ruby-ascii85 # 2009 textproc/ruby-classifier # 2010 textproc/ruby-htmlentities # 2007 textproc/ruby-markaby # 2006 textproc/ruby-pdf-reader # 2009 textproc/ruby-rtex # 2009 textproc/ruby-templater # 2009 www/ruby-thin_http # 2008 OKs? Thanks, Jeremy
Re: UPDATE: php revamp
On 11/03/17 12:53, Marc Espie wrote:
> On Fri, Nov 03, 2017 at 10:07:33AM +0100, Antoine Jacoutot wrote:
>> Let's get this in and see how it flows. We can always put some components
>> back
>> to -main if needed later.
>> I did like the fact that -main used to bundle the most used stuff, it made
>> handling php dependencies very easy. But as mentioned, let's go with your
>> diff
>> and we shall see :-)
>
> Small caveat: when we want to move back to the way things were later, this
> will mean some @pkgpath annotations for updates...
>
> so it's slightly simpler if there are a few part we can merge now.
That's up to opponents of the new layout to propose. I'm open to some parts
to be merged back in, but I'm not going to suggest any.
>
> trick question: ports that depend on php components, how hard are
> they to tweak with this patch ? assuming some components are no longer
> part of the main php package...
>
That's no harder than the current situation. E.g. mail/roundcubemail
currently has (extreme example):
RUN_DEPENDS=lang/php/${MODPHP_VERSION},-pspell \
lang/php/${MODPHP_VERSION},-zip
While the new version just moves to:
RUN_DEPENDS=lang/php/${MODPHP_VERSION},-ctype \
lang/php/${MODPHP_VERSION},-dom \
lang/php/${MODPHP_VERSION},-exif \
lang/php/${MODPHP_VERSION},-fileinfo \
lang/php/${MODPHP_VERSION},-iconv \
lang/php/${MODPHP_VERSION},-json \
lang/php/${MODPHP_VERSION},-mbstring \
lang/php/${MODPHP_VERSION},-pdo \
lang/php/${MODPHP_VERSION},-posix \
lang/php/${MODPHP_VERSION},-pspell \
lang/php/${MODPHP_VERSION},-sockets \
lang/php/${MODPHP_VERSION},-simplexml \
lang/php/${MODPHP_VERSION},-tokenizer \
lang/php/${MODPHP_VERSION},-zip
So the dependencies are pulled in at install-time, but the admin
will have to enable these manually.
Same goes for the few pecl packages, although these require
the other modules at compile-time as well.
E.g. pecl-http goes from from:
RUN_DEPENDS+= www/pecl-raphf \
www/pecl-propro
BUILD_DEPENDS+= ${RUN_DEPENDS}
To:
RUN_DEPENDS+= www/pecl-raphf \
www/pecl-propro \
lang/php/${MODPHP_VERSION},-iconv
BUILD_DEPENDS+= ${RUN_DEPENDS}
PHP usually complains in an understandable way if it can't find a
certain module that it requires at runtime.
In short: the requirements for packages get a little bigger, but the
semantics don't change compared to the current situation. Also note
that I would like to look into something like a phpctl tool that could
automate the change of (some) ini-settings, including en-/disabling
modules. But I intent to not bent my mind over that before this gets in.
martijn@
fix misc/p5-File-MMagic-XS
Hi,
I would like to fix this segmentation fault in p5-File-MMagic-XS.
ok?
bluhm
Index: misc/p5-File-MMagic-XS/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/misc/p5-File-MMagic-XS/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- misc/p5-File-MMagic-XS/Makefile 4 Aug 2017 09:27:03 - 1.13
+++ misc/p5-File-MMagic-XS/Makefile 3 Nov 2017 18:15:32 -
@@ -5,7 +5,7 @@ COMMENT = guess file type with XS (a la
MODULES = cpan
DISTNAME = File-MMagic-XS-0.09008
CATEGORIES = misc
-REVISION = 1
+REVISION = 2
# Perl
PERMIT_PACKAGE_CDROM = Yes
Index: misc/p5-File-MMagic-XS/patches/patch-src_perl-mmagic-xs_c
===
RCS file: misc/p5-File-MMagic-XS/patches/patch-src_perl-mmagic-xs_c
diff -N misc/p5-File-MMagic-XS/patches/patch-src_perl-mmagic-xs_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ misc/p5-File-MMagic-XS/patches/patch-src_perl-mmagic-xs_c 3 Nov 2017
18:15:13 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+https://rt.cpan.org/Public/Bug/Display.html?id=123503
+https://github.com/lestrrat/File-MMagic-XS/pull/6
+
+Index: src/perl-mmagic-xs.c
+--- src/perl-mmagic-xs.c.orig
src/perl-mmagic-xs.c
+@@ -1616,10 +1616,10 @@ PerlFMM_bufmagic(PerlFMM *self, SV *buf)
+
+ /* rt #28040, allow RV to SVs to be passed here */
+ if (SvROK(buf) && SvTYPE(SvRV(buf)) == SVt_PV) {
+-buffer = (unsigned char *) SvPV_nolen( SvRV( buf ) );
+-} else {
+-buffer = (unsigned char *) SvPV_nolen(buf);
++buf = SvRV(buf);
+ }
++SvGROW(buf, HOWMANY + 1);
++buffer = (unsigned char *) SvPV_nolen(buf);
+
+ FMM_SET_ERROR(self, NULL);
+
Re: fix misc/p5-File-MMagic-XS
On 11/03/17 19:20, Alexander Bluhm wrote:
> Hi,
>
> I would like to fix this segmentation fault in p5-File-MMagic-XS.
>
> ok?
>
Sure ok for me.
Cheers
Giovanni
> bluhm
>
> Index: misc/p5-File-MMagic-XS/Makefile
> ===
> RCS file: /data/mirror/openbsd/cvs/ports/misc/p5-File-MMagic-XS/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- misc/p5-File-MMagic-XS/Makefile 4 Aug 2017 09:27:03 - 1.13
> +++ misc/p5-File-MMagic-XS/Makefile 3 Nov 2017 18:15:32 -
> @@ -5,7 +5,7 @@ COMMENT = guess file type with XS (a la
> MODULES =cpan
> DISTNAME = File-MMagic-XS-0.09008
> CATEGORIES = misc
> -REVISION = 1
> +REVISION = 2
>
> # Perl
> PERMIT_PACKAGE_CDROM = Yes
> Index: misc/p5-File-MMagic-XS/patches/patch-src_perl-mmagic-xs_c
> ===
> RCS file: misc/p5-File-MMagic-XS/patches/patch-src_perl-mmagic-xs_c
> diff -N misc/p5-File-MMagic-XS/patches/patch-src_perl-mmagic-xs_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ misc/p5-File-MMagic-XS/patches/patch-src_perl-mmagic-xs_c 3 Nov 2017
> 18:15:13 -
> @@ -0,0 +1,22 @@
> +$OpenBSD$
> +
> +https://rt.cpan.org/Public/Bug/Display.html?id=123503
> +https://github.com/lestrrat/File-MMagic-XS/pull/6
> +
> +Index: src/perl-mmagic-xs.c
> +--- src/perl-mmagic-xs.c.orig
> src/perl-mmagic-xs.c
> +@@ -1616,10 +1616,10 @@ PerlFMM_bufmagic(PerlFMM *self, SV *buf)
> +
> + /* rt #28040, allow RV to SVs to be passed here */
> + if (SvROK(buf) && SvTYPE(SvRV(buf)) == SVt_PV) {
> +-buffer = (unsigned char *) SvPV_nolen( SvRV( buf ) );
> +-} else {
> +-buffer = (unsigned char *) SvPV_nolen(buf);
> ++buf = SvRV(buf);
> + }
> ++SvGROW(buf, HOWMANY + 1);
> ++buffer = (unsigned char *) SvPV_nolen(buf);
> +
> + FMM_SET_ERROR(self, NULL);
> +
>
Re: NEW: telephony/resiprocate
Ping^2 (https://marc.info/?l=openbsd-ports&m=150730631104191&w=2) Still using it without problems. Anyone willing to review? Thanks! Best regards, Ingo On Fri, Oct 06, 2017 at 06:11:01PM +0200, Ingo Feinerer wrote: > Ping. > > Slightly modified .tar.gz attached. > > Best regards, > Ingo > > - Forwarded message from Ingo Feinerer - > > Date: Wed, 20 Sep 2017 21:24:57 +0200 > From: Ingo Feinerer > To: ports@openbsd.org > Subject: NEW: telephony/resiprocate > > Hi, > > please find attached a port for the reSIProcate > (https://www.resiprocate.org/) SIP stack with STUN/TURN server and SIP > proxy/registrar server. > > $ cat pkg/DESCR-main > The reSIProcate components, particularly the SIP stack, are in use in both > commercial and open-source products. The project is dedicated to maintaining a > complete, correct, and commercially usable implementation of SIP and a few > related protocols. > > $ cat pkg/DESCR-repro > repro is an open-source, free SIP server which provides SIP proxy, registrar, > redirect, and identity services. > > I am using repro as SIP registrar since a few days without any problems. > Moreover, it seems a lot easier to configure than Kamailio (for me) ... :-) > > OK to import? > > - End forwarded message -
UPDATE: x11/x2goclient
Update x2goclient to 4.1.1.0. Tested on amd64.
Best regards,
Rafael
Index: Makefile
===
RCS file: /cvs/ports/x11/x2goclient/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile21 Sep 2017 17:09:02 - 1.4
+++ Makefile3 Nov 2017 20:25:14 -
@@ -2,11 +2,11 @@
COMMENT = Qt4 client for the X2Go system
-DISTNAME = x2goclient-4.1.0.1
+DISTNAME = x2goclient-4.1.1.0
CATEGORIES = x11
-HOMEPAGE = http://www.x2go.org
+HOMEPAGE = https://www.x2go.org
MAINTAINER = Rafael Sadowski
@@ -15,9 +15,9 @@ PERMIT_PACKAGE_CDROM =Yes
WANTLIB += ${COMPILER_LIBCXX} ICE QtGui QtNetwork QtSvg SM X11
WANTLIB += Xext Xi Xinerama Xpm Xrender c cups fontconfig freetype
-WANTLIB += ldap m ssh
+WANTLIB += ldap m ssh ssh_threads
-MASTER_SITES = http://code.x2go.org/releases/source/x2goclient/
+MASTER_SITES = https://code.x2go.org/releases/source/x2goclient/
MODULES += x11/qt4
Index: distinfo
===
RCS file: /cvs/ports/x11/x2goclient/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo21 Sep 2017 17:09:02 - 1.2
+++ distinfo3 Nov 2017 20:25:14 -
@@ -1,2 +1,2 @@
-SHA256 (x2goclient-4.1.0.1.tar.gz) =
BoG4oRsCZSZDzxRRp12BLDzp8+4zw0izQXjBMNz3dIQ=
-SIZE (x2goclient-4.1.0.1.tar.gz) = 1891484
+SHA256 (x2goclient-4.1.1.0.tar.gz) =
vhU1KfZ+NISbHYBxcL8d4cLT4bvmxaJa1FfIipgbY8o=
+SIZE (x2goclient-4.1.1.0.tar.gz) = 2745227
Index: patches/patch-x2goclient_pro
===
RCS file: /cvs/ports/x11/x2goclient/patches/patch-x2goclient_pro,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-x2goclient_pro
--- patches/patch-x2goclient_pro8 Jun 2017 18:05:04 - 1.1.1.1
+++ patches/patch-x2goclient_pro3 Nov 2017 20:25:14 -
@@ -1,17 +1,8 @@
$OpenBSD: patch-x2goclient_pro,v 1.1.1.1 2017/06/08 18:05:04 rsadowski Exp $
x2goclient.pro.origWed Feb 22 05:11:35 2017
-+++ x2goclient.pro Wed Feb 22 22:18:23 2017
-@@ -130,7 +130,8 @@ SOURCES += src/sharewidget.cpp \
-src/compat.cpp \
-src/pulsemanager.cpp
-
--LIBS += -lssh
-+LIBS += -lssh -lldap -lcups -lX11 -lXpm
-+
- win32:LIBS += -lAdvAPI32 -lshell32 -lUser32
-
- plugin {
-@@ -172,7 +173,7 @@ else:message("No translation files in project")
+Index: x2goclient.pro
+--- x2goclient.pro.orig
x2goclient.pro
+@@ -174,7 +174,7 @@ else:message("No translation files in project")
TEMPLATE = app
DEPENDPATH += .
@@ -20,3 +11,15 @@ $OpenBSD: patch-x2goclient_pro,v 1.1.1.1
RESOURCES += res/resources.qrc
exists(res/txt/git-info) {
+@@ -193,6 +193,11 @@ linux-g++ {
+ DEFINES += __linux__
+ }
+ linux-g++-64 {
++ message("building $$TARGET with ldap and cups")
++ LIBS += -lldap -lcups -lX11 -lXpm
++ DEFINES += __linux__
++}
++openbsd-* {
+ message("building $$TARGET with ldap and cups")
+ LIBS += -lldap -lcups -lX11 -lXpm
+ DEFINES += __linux__
Re: update devel/p5-Module-Install
Sorry was in a rush, still not really free.
I was going to do the update, just it's not one update as you spotted,
and still have to go back through my old things on ports@ not ok'd yet,
put on hold while ports locked.
p5-Module-Install-ExtraTests
I have that update to go with this, along with updates and other new
p5-Module-Install- packages.
This goes with a modification to perl.bsd.mk
$ cvs -R -q diff -uNp perl.port.mk
Index: perl.port.mk
===
RCS file: /home/cvs/ports/infrastructure/mk/perl.port.mk,v
retrieving revision 1.29
diff -u -p -r1.29 perl.port.mk
--- perl.port.mk26 Apr 2016 10:56:59 - 1.29
+++ perl.port.mk26 Apr 2016 13:20:04 -
@@ -66,7 +66,7 @@ MODPERL_configure = ${_MODPERL_preconfig
. if ${CONFIGURE_STYLE:L:Mmodinst}
BUILD_DEPENDS += devel/p5-Module-Install
CONFIGURE_ARGS += --skipdeps
-_MODPERL_preconfig = rm -rf ${WRKSRC}/inc/Module/*Install*
+_MODPERL_preconfig = rm -rf ${WRKSRC}/inc/*
. else
_MODPERL_preconfig = :
. endif
Then that needs going back over ports and adding in missing
p5-Module-Install-x to replace old untested bundled versions in the
dist files. Have all the updates to go with that.
The other thing to note, is the smaller set of ports runtime/buildtime
required. Because they are only recommendations and not used.
I check over things, and I did mine months ago, and based on an update
to 1.16 long before that. Might have missed some things, and need will
recheck. But I have been running all my dpb runs with the changes in
place, what I have works with dpb, also works with last build tests I
did - for each perl package with just build packages installed, and
ensure it builds.
On 11/03/17 16:05, Alexander Bluhm wrote:
> On Fri, Nov 03, 2017 at 03:08:11PM +, Nigel Taylor wrote:
>> Can't respond quickly to this, this is my version, and has been run
>> through earlier version 1.16 etc,
>
> Does that mean that you want to take care of the update?
>
>> the full update requires complex
>> p5-Module-Install- updates
>
> I have not seen any fallout with the existing p5-Module-Install-
> modules. Do you have anything that got broken? Can we update
> p5-Module-Install and fix everything afterwards?
>
>> +TEST_DEPENDS +=devel/p5-Module-Install-AuthorTests \
>
> I have added p5-Module-Install-AuthorTests so that the test is not
> skipped.
>
>> + devel/p5-Module-Install-ExtraTests
>
> This port p5-Module-Install-ExtraTests does not exist yet. I ignore
> the dependency, it just means that a test is skipped.
>
>> -# for the CPAN regression test
>> -pre-test:
>> - mkdir -p ${WRKDIR}/home
>> -PORTHOME= ${WRKDIR}/home
>
> I did not find why this is needed so I removed it.
>
>> +# No autoinstall from CPAN...
>> +CONFIGURE_ARGS=--skipdeps
>
> I see that lib/Module/AutoInstall.pm checks it, so I put it back.
>
>> MAKE_ENV= TEST_POD=Yes
>
> I do not see why this is needed, so I removed it.
>
>> +post-patch:
>> + find ${WRKSRC} -type f -name "*.orig" -exec rm {} +
>
> This prevents make update-patches, so I do not include it.
>
> New diff, ok?
>
> bluhm
>
> Index: devel/p5-Module-Install/Makefile
> ===
> RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- devel/p5-Module-Install/Makefile 9 Jan 2017 11:06:45 - 1.25
> +++ devel/p5-Module-Install/Makefile 3 Nov 2017 15:54:58 -
> @@ -4,29 +4,29 @@ COMMENT=standalone extensible Perl modu
>
> MODULES= cpan
> PKG_ARCH=*
> -DISTNAME=Module-Install-1.08
> -REVISION=3
> +DISTNAME = Module-Install-1.18
> CATEGORIES= devel
>
> +MAINTAINER = Alexander Bluhm
> +
> # perl
> PERMIT_PACKAGE_CDROM=Yes
>
> -RUN_DEPENDS+=devel/p5-Module-ScanDeps>=1.13 \
> - devel/p5-File-Remove \
> - devel/p5-PAR-Dist \
> - devel/p5-YAML-Tiny>=1.38 \
> - converters/p5-JSON
> +BUILD_DEPENDS = devel/p5-YAML-Tiny>=1.33
> +RUN_DEPENDS =archivers/p5-Archive-Zip>=1.37 \
> + converters/p5-JSON>=2.9 \
> + devel/p5-File-HomeDir>=1 \
> + devel/p5-File-Remove>=1.42 \
> + devel/p5-Module-Build>=0.29 \
> + devel/p5-Module-ScanDeps>=1.09 \
> + devel/p5-PAR-Dist>=0.29 \
> + devel/p5-YAML-Tiny>=1.38 \
> + www/p5-libwww>=6.05
> +TEST_DEPENDS = devel/p5-Module-Install-AuthorTests
>
> # special case; this is *not* a CONFIGURE_STYLE=modbuild port
> -RUN_DEPENDS+=devel/p5-Module-Build
>
> +# no autoinstall from CPAN
> CONFIGURE_ARGS= --skipdeps
> -
> -# for the CPAN regression test
> -pre-test:
> - mkdir -
Re: UPDATE: php revamp
On Fri, Nov 03, 2017 at 07:07:14PM +0100, Martijn van Duren wrote:
> That's no harder than the current situation. E.g. mail/roundcubemail
> currently has (extreme example):
> RUN_DEPENDS=lang/php/${MODPHP_VERSION},-pspell \
> lang/php/${MODPHP_VERSION},-zip
> While the new version just moves to:
> RUN_DEPENDS=lang/php/${MODPHP_VERSION},-ctype \
> lang/php/${MODPHP_VERSION},-dom \
> lang/php/${MODPHP_VERSION},-exif \
> lang/php/${MODPHP_VERSION},-fileinfo \
> lang/php/${MODPHP_VERSION},-iconv \
> lang/php/${MODPHP_VERSION},-json \
> lang/php/${MODPHP_VERSION},-mbstring \
> lang/php/${MODPHP_VERSION},-pdo \
> lang/php/${MODPHP_VERSION},-posix \
> lang/php/${MODPHP_VERSION},-pspell \
> lang/php/${MODPHP_VERSION},-sockets \
> lang/php/${MODPHP_VERSION},-simplexml \
> lang/php/${MODPHP_VERSION},-tokenizer \
> lang/php/${MODPHP_VERSION},-zip
> So the dependencies are pulled in at install-time, but the admin
> will have to enable these manually.
> Same goes for the few pecl packages, although these require
> the other modules at compile-time as well.
> E.g. pecl-http goes from from:
> RUN_DEPENDS+= www/pecl-raphf \
> www/pecl-propro
> BUILD_DEPENDS+= ${RUN_DEPENDS}
> To:
> RUN_DEPENDS+= www/pecl-raphf \
> www/pecl-propro \
> lang/php/${MODPHP_VERSION},-iconv
> BUILD_DEPENDS+= ${RUN_DEPENDS}
>
> PHP usually complains in an understandable way if it can't find a
> certain module that it requires at runtime.
>
> In short: the requirements for packages get a little bigger, but the
> semantics don't change compared to the current situation. Also note
> that I would like to look into something like a phpctl tool that could
> automate the change of (some) ini-settings, including en-/disabling
> modules. But I intent to not bent my mind over that before this gets in.
See, this is exactly what I'm afraid of.
run-time depends can be a bitch. The stuff still packages, and stays that
way until somebody notices an issue... which often happens a few months
after the commits, and sometimes even after release.
Does php complain as soon as you try to start the offending package, or
only when you activate some functionality that depends on the extra
plugin ?
I'm seriously way more happy with things breaking straight away during
compilation than with these kinds of ticking time bombs.
Invariably leads to breakage being noticed at the most inconvenient
times.
In the past, we've always cut up php according to two criteria:
- modules that actually use more libraries (as in: pulling in more
external stuff)
- modules that actually have security aspects.
Getting more fine-grained is not really that useful, and will only
lead to further issues down the road.
We already went that way for other things like gstreamer plugins,
invariably cutting back to FEWER coarse grained modules sooner or
later.
I would rather this be done sooner rather than later.
UPDATE: games/scorched3d
Hi,
Here's a straightforward update to scorched3d-44.
The minor issues that needed patching (libpng compatibility, openal
detection) have been fixed (differently) upstream.
ok?
--
Anthony J. Bentley
Index: Makefile
===
RCS file: /cvs/ports/games/scorched3d/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile26 Jul 2017 22:45:22 - 1.10
+++ Makefile3 Nov 2017 22:01:21 -
@@ -2,9 +2,8 @@
COMMENT = modernization of the classic DOS game Scorched Earth
-DISTNAME = Scorched3D-43.1c-src
+DISTNAME = Scorched3D-44-src
PKGNAME = ${DISTNAME:L:S/-src//}
-REVISION = 3
CATEGORIES = games x11
@@ -18,6 +17,7 @@ WANTLIB +=SDL SDL_net alut fftw3f jpeg
WANTLIB += wx_base wx_base_net wx_base_odbc wx_base_xml vorbis
WANTLIB += wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc
+WANTLIB += GLEW
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=scorched3d/}
@@ -26,10 +26,10 @@ BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPEN
LIB_DEPENDS = audio/openal \
audio/libvorbis \
audio/freealut \
+ graphics/glew \
x11/wxWidgets \
math/fftw3,float \
- devel/sdl-net \
- devel/sdl-mixer
+ devel/sdl-net
RUN_DEPENDS = devel/xdg-utils
CONFIGURE_STYLE = gnu
Index: distinfo
===
RCS file: /cvs/ports/games/scorched3d/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:01 - 1.2
+++ distinfo3 Nov 2017 22:01:21 -
@@ -1,2 +1,2 @@
-SHA256 (Scorched3D-43.1c-src.tar.gz) =
rVzpHkBPWgKGSC/uykqlsXX7UanR8VomvTd5sgWShbs=
-SIZE (Scorched3D-43.1c-src.tar.gz) = 64826904
+SHA256 (Scorched3D-44-src.tar.gz) =
HIMguyIQAwvnHdcTwhT70y991mPqggMTg+azY2+Kjbo=
+SIZE (Scorched3D-44-src.tar.gz) = 41689613
Index: patches/patch-configure-al_m4
===
RCS file: patches/patch-configure-al_m4
diff -N patches/patch-configure-al_m4
--- patches/patch-configure-al_m4 25 Jun 2011 18:43:07 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,32 +0,0 @@
-$OpenBSD: patch-configure-al_m4,v 1.1 2011/06/25 18:43:07 jasper Exp $
configure-al.m4.orig Fri Oct 2 01:22:31 2009
-+++ configure-al.m4Thu Jun 23 00:00:52 2011
-@@ -7,25 +7,9 @@ AC_ARG_ENABLE(openaltest,
- [ --disable-openaltestDo not try to compile and run a test OpenAL
program],
- , enable_openaltest=yes)
- AC_MSG_CHECKING(for OpenAL support)
--AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
--if test x$OPENAL_CONFIG = xno; then
-- echo "*** The openal-config script installed by OpenAL could not be
found"
-- echo "*** Make sure openal-config is in your path, or set the
OPENAL_CONFIG"
-- echo "*** environment variable to the full path to openal-config."
--
-- AC_MSG_ERROR([*** Can't find the openal library. Try:
http://www.openal.org/])
--else
--
-- if test x"$use_static_openal" = x"yes"; then
-- AL_LIBS="/usr/local/lib/libopenal.a"
-- else
-- AL_LIBS="`$OPENAL_CONFIG --libs`"
-- fi
--
-- AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
--
-- AC_MSG_RESULT(yes)
--fi
-+AL_LIBS="`pkg-config --libs openal`"
-+AL_CFLAGS="`pkg-config --cflags openal`"
-+AC_MSG_RESULT(yes)
-
- AC_MSG_CHECKING(for Freealut support)
- AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
Index: patches/patch-src_common_image_ImagePng_cpp
===
RCS file: patches/patch-src_common_image_ImagePng_cpp
diff -N patches/patch-src_common_image_ImagePng_cpp
--- patches/patch-src_common_image_ImagePng_cpp 8 Jul 2011 20:38:01 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,51 +0,0 @@
-$OpenBSD: patch-src_common_image_ImagePng_cpp,v 1.1 2011/07/08 20:38:01 naddy
Exp $
-
-Fix build with png-1.5.
-
src/common/image/ImagePng.cpp.orig Wed Jul 6 17:27:07 2011
-+++ src/common/image/ImagePng.cpp Wed Jul 6 17:28:23 2011
-@@ -150,7 +150,7 @@ struct user_read_struct
-
- static void user_png_error(png_structp png_ptr, png_const_charp msg)
- {
-- longjmp(png_ptr->jmpbuf,1);
-+ png_longjmp(png_ptr,1);
- }
-
- static void user_png_warning(png_structp png_ptr, png_const_charp msg)
-@@ -189,7 +189,7 @@ bool ImagePng::loadFromBuffer(NetBuffer &buffer, bool
- info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL)
- {
--png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-+png_des
Re: unbreak lang/freebasic on i386
On Fri, Nov 03, 2017 at 11:25:46AM -0400, Brian Callahan wrote: > Hi ports -- > > The attached works for me to re-enable lang/freebasic on i386. Can anyone > else give this a spin? > > ~Brian > I think you already committed this, but to close the loop, I tested this on an i386 vmm(4) VM and it works fine. It needs some machinations around paths to find -lgcc and cc1 but if you do all that it seems to do what is expected. -ml > Index: Makefile > === > RCS file: /cvs/ports/lang/freebasic/Makefile,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 Makefile > --- Makefile 27 Oct 2017 20:41:47 - 1.2 > +++ Makefile 28 Oct 2017 23:52:28 - > @@ -1,8 +1,6 @@ > # $OpenBSD: Makefile,v 1.2 2017/10/27 20:41:47 bcallah Exp $ > > -BROKEN-i386 =bad bootstrap > - > -# All they seem to support. > +# May also support aarch64 and arm? > ONLY_FOR_ARCHS = amd64 i386 > > V = 1.05.0 > Index: patches/patch-makefile > === > RCS file: /cvs/ports/lang/freebasic/patches/patch-makefile,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 patch-makefile > --- patches/patch-makefile23 Oct 2017 21:46:58 - 1.1.1.1 > +++ patches/patch-makefile28 Oct 2017 23:52:28 - > @@ -6,7 +6,17 @@ Keep tendrils here to make generating fu > Index: makefile > --- makefile.orig > +++ makefile > -@@ -393,7 +393,8 @@ endif > +@@ -295,9 +295,7 @@ endif > + # ENABLE_PIC for non-x86 Linux etc. (for every system where we need separate > + # -fPIC versions of FB libs besides the normal ones) > + ifneq ($(filter freebsd linux netbsd openbsd solaris,$(TARGET_OS)),) > +- ifneq ($(TARGET_ARCH),x86) > + ENABLE_PIC := YesPlease > +- endif > + endif > + > + ifneq ($(filter cygwin dos win32,$(TARGET_OS)),) > +@@ -393,7 +391,8 @@ endif > > ALLFBCFLAGS += -e -m fbc -w pedantic > ALLFBLFLAGS += -e -m fbc -w pedantic > @@ -16,7 +26,7 @@ Index: makefile > > ifeq ($(TARGET_OS),xbox) > ifeq ($(OPENXDK),) > -@@ -1050,32 +1051,16 @@ FBBOOTSTRAPTITLE := $(FBSOURCETITLE)-bootstrap > +@@ -1050,32 +1049,16 @@ FBBOOTSTRAPTITLE := $(FBSOURCETITLE)-bootstrap > bootstrap-dist: > # Precompile fbc sources for various targets > rm -rf bootstrap > @@ -55,7 +65,19 @@ Index: makefile > # > # Build the fbc[.exe] binary from the precompiled sources in the bootstrap/ > # directory. > -@@ -1098,6 +1083,7 @@ else > +@@ -1086,22 +1069,16 @@ bootstrap: rtlib gfxlib2 $(BOOTSTRAP_FBC) > + mkdir -p bin > + cp $(BOOTSTRAP_FBC) $(FBC_EXE) > + > +-ifeq ($(TARGET_ARCH),x86) > +- # x86: .asm => .o (using the same assembler options as fbc) > +- BOOTSTRAP_OBJ = $(patsubst %.asm,%.o,$(sort $(wildcard > bootstrap/$(FBTARGET)/*.asm))) > +- $(BOOTSTRAP_OBJ): %.o: %.asm > +-$(QUIET_AS)$(AS) --strip-local-absolute $< -o $@ > +-else > + # x86_64 etc.: .c => .o (using the same gcc options as fbc -gen gcc) > + BOOTSTRAP_CFLAGS := -nostdinc > + BOOTSTRAP_CFLAGS += -Wall -Wno-unused-label -Wno-unused-function > -Wno-unused-variable > BOOTSTRAP_CFLAGS += -Wno-unused-but-set-variable -Wno-main > BOOTSTRAP_CFLAGS += -fno-strict-aliasing -frounding-math > BOOTSTRAP_CFLAGS += -Wfatal-errors > @@ -63,3 +85,7 @@ Index: makefile > BOOTSTRAP_OBJ := $(patsubst %.c,%.o,$(sort $(wildcard > bootstrap/$(FBTARGET)/*.c))) > $(BOOTSTRAP_OBJ): %.o: %.c > $(QUIET_CC)$(CC) -c $(BOOTSTRAP_CFLAGS) $< -o $@ > +-endif > + > + # Use gcc to link fbc from the bootstrap .o's > + # (assuming the rtlib was built already)
NEW: textproc/hfst
Hi, HFST, the Helsinki Finite State Transducer, is a bridging library for multiple FST libraries and toolkits and set of tools for processing of finite-state automata especially for linguistic systems. This is needed to generate some of the apertium dictionaries I sent to the list earlier. ok? -- Anthony J. Bentley hfst.tar.gz Description: GNU Zip compressed data
Re: unbreak lang/freebasic on i386
Hi Mike -- On 11/3/2017 7:14 PM, Mike Larkin wrote: > On Fri, Nov 03, 2017 at 11:25:46AM -0400, Brian Callahan wrote: >> Hi ports -- >> >> The attached works for me to re-enable lang/freebasic on i386. Can anyone >> else give this a spin? >> >> ~Brian >> > I think you already committed this, but to close the loop, I tested this on > an i386 vmm(4) VM and it works fine. It needs some machinations around paths > to find -lgcc and cc1 but if you do all that it seems to do what is expected. Thanks for this. Are you using lld for the linker? I tried to get the machinations to just work(TM) and thought I caught them all but happy to test out things to make it better, of course. ~Brian > -ml > > >> Index: Makefile >> === >> RCS file: /cvs/ports/lang/freebasic/Makefile,v >> retrieving revision 1.2 >> diff -u -p -u -p -r1.2 Makefile >> --- Makefile 27 Oct 2017 20:41:47 - 1.2 >> +++ Makefile 28 Oct 2017 23:52:28 - >> @@ -1,8 +1,6 @@ >> # $OpenBSD: Makefile,v 1.2 2017/10/27 20:41:47 bcallah Exp $ >> >> -BROKEN-i386 = bad bootstrap >> - >> -# All they seem to support. >> +# May also support aarch64 and arm? >> ONLY_FOR_ARCHS =amd64 i386 >> >> V = 1.05.0 >> Index: patches/patch-makefile >> === >> RCS file: /cvs/ports/lang/freebasic/patches/patch-makefile,v >> retrieving revision 1.1.1.1 >> diff -u -p -u -p -r1.1.1.1 patch-makefile >> --- patches/patch-makefile 23 Oct 2017 21:46:58 - 1.1.1.1 >> +++ patches/patch-makefile 28 Oct 2017 23:52:28 - >> @@ -6,7 +6,17 @@ Keep tendrils here to make generating fu >> Index: makefile >> --- makefile.orig >> +++ makefile >> -@@ -393,7 +393,8 @@ endif >> +@@ -295,9 +295,7 @@ endif >> + # ENABLE_PIC for non-x86 Linux etc. (for every system where we need >> separate >> + # -fPIC versions of FB libs besides the normal ones) >> + ifneq ($(filter freebsd linux netbsd openbsd solaris,$(TARGET_OS)),) >> +- ifneq ($(TARGET_ARCH),x86) >> + ENABLE_PIC := YesPlease >> +- endif >> + endif >> + >> + ifneq ($(filter cygwin dos win32,$(TARGET_OS)),) >> +@@ -393,7 +391,8 @@ endif >> >> ALLFBCFLAGS += -e -m fbc -w pedantic >> ALLFBLFLAGS += -e -m fbc -w pedantic >> @@ -16,7 +26,7 @@ Index: makefile >> >> ifeq ($(TARGET_OS),xbox) >> ifeq ($(OPENXDK),) >> -@@ -1050,32 +1051,16 @@ FBBOOTSTRAPTITLE := $(FBSOURCETITLE)-bootstrap >> +@@ -1050,32 +1049,16 @@ FBBOOTSTRAPTITLE := $(FBSOURCETITLE)-bootstrap >> bootstrap-dist: >> # Precompile fbc sources for various targets >> rm -rf bootstrap >> @@ -55,7 +65,19 @@ Index: makefile >> # >> # Build the fbc[.exe] binary from the precompiled sources in the bootstrap/ >> # directory. >> -@@ -1098,6 +1083,7 @@ else >> +@@ -1086,22 +1069,16 @@ bootstrap: rtlib gfxlib2 $(BOOTSTRAP_FBC) >> +mkdir -p bin >> +cp $(BOOTSTRAP_FBC) $(FBC_EXE) >> + >> +-ifeq ($(TARGET_ARCH),x86) >> +- # x86: .asm => .o (using the same assembler options as fbc) >> +- BOOTSTRAP_OBJ = $(patsubst %.asm,%.o,$(sort $(wildcard >> bootstrap/$(FBTARGET)/*.asm))) >> +- $(BOOTSTRAP_OBJ): %.o: %.asm >> +- $(QUIET_AS)$(AS) --strip-local-absolute $< -o $@ >> +-else >> + # x86_64 etc.: .c => .o (using the same gcc options as fbc -gen gcc) >> + BOOTSTRAP_CFLAGS := -nostdinc >> + BOOTSTRAP_CFLAGS += -Wall -Wno-unused-label -Wno-unused-function >> -Wno-unused-variable >> BOOTSTRAP_CFLAGS += -Wno-unused-but-set-variable -Wno-main >> BOOTSTRAP_CFLAGS += -fno-strict-aliasing -frounding-math >> BOOTSTRAP_CFLAGS += -Wfatal-errors >> @@ -63,3 +85,7 @@ Index: makefile >> BOOTSTRAP_OBJ := $(patsubst %.c,%.o,$(sort $(wildcard >> bootstrap/$(FBTARGET)/*.c))) >> $(BOOTSTRAP_OBJ): %.o: %.c >> $(QUIET_CC)$(CC) -c $(BOOTSTRAP_CFLAGS) $< -o $@ >> +-endif >> + >> + # Use gcc to link fbc from the bootstrap .o's >> + # (assuming the rtlib was built already)
Re: unbreak lang/freebasic on i386
On Fri, Nov 03, 2017 at 08:59:51PM -0400, Brian Callahan wrote: > Hi Mike -- > > On 11/3/2017 7:14 PM, Mike Larkin wrote: > > On Fri, Nov 03, 2017 at 11:25:46AM -0400, Brian Callahan wrote: > >> Hi ports -- > >> > >> The attached works for me to re-enable lang/freebasic on i386. Can anyone > >> else give this a spin? > >> > >> ~Brian > >> > > I think you already committed this, but to close the loop, I tested this on > > an i386 vmm(4) VM and it works fine. It needs some machinations around paths > > to find -lgcc and cc1 but if you do all that it seems to do what is > > expected. > > Thanks for this. Are you using lld for the linker? I tried to get the > machinations to just work(TM) and thought I caught them all but happy to > test out things to make it better, of course. > > ~Brian > It built fine, but then complained at run about not being able to find cc1. I added that to $PATH manually, and then it complained about not being able to find -lgcc. I fixed that by copying it to the same directory as I was running from. Then it worked. (Tried LDFLAGS with -L/path/to/libgcc but that didn't work). I just built a lame 2 line basic program, but after doing those things above, it did work. -ml > > -ml > > > > > >> Index: Makefile > >> === > >> RCS file: /cvs/ports/lang/freebasic/Makefile,v > >> retrieving revision 1.2 > >> diff -u -p -u -p -r1.2 Makefile > >> --- Makefile 27 Oct 2017 20:41:47 - 1.2 > >> +++ Makefile 28 Oct 2017 23:52:28 - > >> @@ -1,8 +1,6 @@ > >> # $OpenBSD: Makefile,v 1.2 2017/10/27 20:41:47 bcallah Exp $ > >> > >> -BROKEN-i386 = bad bootstrap > >> - > >> -# All they seem to support. > >> +# May also support aarch64 and arm? > >> ONLY_FOR_ARCHS = amd64 i386 > >> > >> V = 1.05.0 > >> Index: patches/patch-makefile > >> === > >> RCS file: /cvs/ports/lang/freebasic/patches/patch-makefile,v > >> retrieving revision 1.1.1.1 > >> diff -u -p -u -p -r1.1.1.1 patch-makefile > >> --- patches/patch-makefile 23 Oct 2017 21:46:58 - 1.1.1.1 > >> +++ patches/patch-makefile 28 Oct 2017 23:52:28 - > >> @@ -6,7 +6,17 @@ Keep tendrils here to make generating fu > >> Index: makefile > >> --- makefile.orig > >> +++ makefile > >> -@@ -393,7 +393,8 @@ endif > >> +@@ -295,9 +295,7 @@ endif > >> + # ENABLE_PIC for non-x86 Linux etc. (for every system where we need > >> separate > >> + # -fPIC versions of FB libs besides the normal ones) > >> + ifneq ($(filter freebsd linux netbsd openbsd solaris,$(TARGET_OS)),) > >> +- ifneq ($(TARGET_ARCH),x86) > >> + ENABLE_PIC := YesPlease > >> +- endif > >> + endif > >> + > >> + ifneq ($(filter cygwin dos win32,$(TARGET_OS)),) > >> +@@ -393,7 +391,8 @@ endif > >> > >> ALLFBCFLAGS += -e -m fbc -w pedantic > >> ALLFBLFLAGS += -e -m fbc -w pedantic > >> @@ -16,7 +26,7 @@ Index: makefile > >> > >> ifeq ($(TARGET_OS),xbox) > >> ifeq ($(OPENXDK),) > >> -@@ -1050,32 +1051,16 @@ FBBOOTSTRAPTITLE := $(FBSOURCETITLE)-bootstrap > >> +@@ -1050,32 +1049,16 @@ FBBOOTSTRAPTITLE := $(FBSOURCETITLE)-bootstrap > >> bootstrap-dist: > >># Precompile fbc sources for various targets > >>rm -rf bootstrap > >> @@ -55,7 +65,19 @@ Index: makefile > >> # > >> # Build the fbc[.exe] binary from the precompiled sources in the > >> bootstrap/ > >> # directory. > >> -@@ -1098,6 +1083,7 @@ else > >> +@@ -1086,22 +1069,16 @@ bootstrap: rtlib gfxlib2 $(BOOTSTRAP_FBC) > >> + mkdir -p bin > >> + cp $(BOOTSTRAP_FBC) $(FBC_EXE) > >> + > >> +-ifeq ($(TARGET_ARCH),x86) > >> +- # x86: .asm => .o (using the same assembler options as fbc) > >> +- BOOTSTRAP_OBJ = $(patsubst %.asm,%.o,$(sort $(wildcard > >> bootstrap/$(FBTARGET)/*.asm))) > >> +- $(BOOTSTRAP_OBJ): %.o: %.asm > >> +- $(QUIET_AS)$(AS) --strip-local-absolute $< -o $@ > >> +-else > >> + # x86_64 etc.: .c => .o (using the same gcc options as fbc -gen gcc) > >> + BOOTSTRAP_CFLAGS := -nostdinc > >> + BOOTSTRAP_CFLAGS += -Wall -Wno-unused-label -Wno-unused-function > >> -Wno-unused-variable > >> BOOTSTRAP_CFLAGS += -Wno-unused-but-set-variable -Wno-main > >> BOOTSTRAP_CFLAGS += -fno-strict-aliasing -frounding-math > >> BOOTSTRAP_CFLAGS += -Wfatal-errors > >> @@ -63,3 +85,7 @@ Index: makefile > >> BOOTSTRAP_OBJ := $(patsubst %.c,%.o,$(sort $(wildcard > >> bootstrap/$(FBTARGET)/*.c))) > >> $(BOOTSTRAP_OBJ): %.o: %.c > >>$(QUIET_CC)$(CC) -c $(BOOTSTRAP_CFLAGS) $< -o $@ > >> +-endif > >> + > >> + # Use gcc to link fbc from the bootstrap .o's > >> + # (assuming the rtlib was built already) >
Re: UPDATE: php revamp
On Fri, Nov 3, 2017 at 9:56 PM, Marc Espie wrote: > run-time depends can be a bitch. The stuff still packages, and stays that > way until somebody notices an issue... which often happens a few months > after the commits, and sometimes even after release. > > Does php complain as soon as you try to start the offending package, or > only when you activate some functionality that depends on the extra > plugin ? > It only starts complaining when you use a function that isn't there. So yeah that would lead to possible trouble. What if we enable the extensions by default when you install them? Given that you install them, you probably want them enabled anyway. And that would be a solution for this problem.
