Re: update dnscrypt-proxy 2.0.19 -> 2.0.22
Stuart Henderson writes:
> Too late for 6.5 but this looks good for post unlock.
Björn Ketelaars writes:
> On Sat 06/04/2019 02:19, Nam Nguyen wrote:
>> Here is an update for dnscrypt-proxy 2.0.22 (released April 1, 2019).
>
> I have a similar diff in my tree, and contacted ${MAINTAINER} two weeks
> ago. Unfortunately I did not receive a reply.
>
> OK bket@
>
> I will commit your diff later today...unless someone beats me to it.
Thank you for reviewing it. May I also take maintainership of
dnscrypt-proxy? The current maintainer, who is also the upstream
developer, has not been that responsive and has not provided diffs for
several updates.
Re: update dnscrypt-proxy 2.0.19 -> 2.0.22
On Sat 06/04/2019 02:19, Nam Nguyen wrote:
> Here is an update for dnscrypt-proxy 2.0.22 (released April 1, 2019).
I have a similar diff in my tree, and contacted ${MAINTAINER} two weeks
ago. Unfortunately I did not receive a reply.
OK bket@
I will commit your diff later today...unless someone beats me to it.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 21:52:47 Modified files: archivers/zstd : Makefile Log message: Link with -latomic on hppa. Doesn't affect any other archs. ok bket@
Re: archivers/zstd: Enable on hppa
On Mon 15/04/2019 15:23, Brian Callahan wrote: > Hi ports -- > > hppa needs -latomic from ports-gcc in order to successfully build. The > attached patch does this. > This allows libarchive to build successfully on hppa. > > Built on hppa with gcc-8.3.0. > > OK? Diff looks good, and does not interfere with !hppa. OK bket@
net/py-aiodns - Drop useless py3-typing dependency
py-typing is only useful for providing typing support to versions
of Python < 3.5.x. We currently have 3.6.8 and will probably move to
3.7.x before long. Thus, dropping py-typing for the python3 flavor
of py-aiodns.
The two consumers of py-aiodns are net/py-slixmpp and net/poezio.
Both test all of their tests before and after this change.
This is the start of work looking to remove the python3 flavor
of py-typing since it does nothing for us anyway.
While here, I'm adding a comment to note that we can't move to
version >= 2.0.0 while we wish to have python 2 support.
I'm actually maintainer on this and py-slixmpp.
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/net/py-aiodns/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile19 Jan 2019 14:26:34 - 1.5
+++ Makefile16 Apr 2019 02:34:37 -
@@ -2,12 +2,14 @@
COMMENT = simple DNS resolver for asyncio
+# Cannot go to >=2.0.0 if we need python 2.x support
MODPY_EGG_VERSION =1.2.0
DISTNAME = aiodns-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = net
+REVISION = 0
-MAINTAINER = Kurt Mosiejczuk
+MAINTAINER = Kurt Mosiejczuk
# MIT
PERMIT_PACKAGE_CDROM = Yes
@@ -20,10 +22,10 @@ MODPY_SETUPTOOLS = Yes
FLAVORS = python3
FLAVOR ?=
-RUN_DEPENDS = devel/py-typing${MODPY_FLAVOR} \
- net/py-cares${MODPY_FLAVOR}
+RUN_DEPENDS = net/py-cares${MODPY_FLAVOR}
.if !${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-trollius
+RUN_DEPENDS += devel/py-trollius \
+ devel/py-typing
.endif
TEST_DEPENDS = ${RUN_DEPENDS}
Re: UPDATE: multimedia/mkvtoolnix (multimedia/libmatroska, textproc/libebml)
On 4/15/2019 4:00 PM, Rafael Sadowski wrote: Please find attached update diffs for the following ports: - multimedia/libmatroska - textproc/libebml Simple updates to the latest stable versions. Both projects switched to cmake as build-system. - multimedia/mkvtoolnix As always nothing special but depends on the new libmatroska and libebml versions. Comments? OK? I have had updates for libmatroska and libebml sitting in my tree for awhile now. I'm a little annoyed at the half baked CMake conversion. https://github.com/Matroska-Org/libmatroska/issues/17 Is there anyone that knows CMake well that might be able to take a look at what is there and fix the CMake bits so both shared and static libs are built?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 19:56:16 Modified files: lang/janet : Makefile Log message: Janet requires TLS, so set COMPILER = base-clang ports-gcc COMPILER_LANGS = c Noticed when building janet on hppa. ok jturner@
[hppa] security/gnutls: build with -latomic
Hi ports --
GnuTLS will find atomics through libatomic on hppa (at least). So we
need to link -latomic on hppa.
Diff does this, makes a successful build.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/security/gnutls/Makefile,v
retrieving revision 1.153
diff -u -p -r1.153 Makefile
--- Makefile 28 Mar 2019 14:53:10 - 1.153
+++ Makefile 16 Apr 2019 01:24:03 -
@@ -57,7 +57,13 @@ CONFIGURE_ARGS += --without-tpm
CONFIGURE_ARGS += --enable-local-libopts
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+
+# hppa (at least) needs libatomic
+.if ${MACHINE_ARCH:Mhppa}
+WANTLIB += atomic
+LDFLAGS += -latomic
+.endif
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnutls
FIX: lang/secularize package name
Hi Mike and ports --
lang/secularize has a stray } in its PKGNAME. Attached diff fixes things.
Had to set EPOCH=0 because when I tried to just bump I got:
===> Building package for secularize-0.0.1.7p0
Create /usr/ports/packages/amd64/all/secularize-0.0.1.7p0.tgz
Creating package secularize-0.0.1.7p0
Found newer package secularize-0.0.1.7} in /usr/ports/plist/amd64
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/lang/secularize/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 5 Sep 2018 19:38:25 - 1.1.1.1
+++ Makefile 16 Apr 2019 01:06:46 -
@@ -4,7 +4,8 @@ COMMENT = HolyC transcompiler
MODPY_EGG_VERSION = 0.0.1.post7
DISTNAME = secularize-${MODPY_EGG_VERSION}
-PKGNAME = ${DISTNAME:S/post//}}
+PKGNAME = ${DISTNAME:S/post//}
+EPOCH = 0
CATEGORIES = lang
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2019/04/15 18:29:26 Modified files: lang/janet : Makefile distinfo lang/janet/pkg : PLIST Log message: Update janet to 0.4.1
[hppa] lang/clisp: Enable hppa support
Hi ports --
The following unobtrusive diff allows lang/clisp to build and work on hppa.
Does not affect other archs.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/lang/clisp/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile 21 Nov 2017 00:13:01 - 1.49
+++ Makefile 16 Apr 2019 00:23:18 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.49 2017/11/21 00:13:01 naddy Exp $
-ONLY_FOR_ARCHS = amd64 i386 powerpc sparc64
+ONLY_FOR_ARCHS = amd64 hppa i386 powerpc sparc64
COMMENT = ANSI Common Lisp implementation
@@ -50,6 +50,11 @@ CFLAGS += -fno-pie -nopie
LDFLAGS += -nopie
.else
CONFIGURE_ARGS += --without-gmalloc
+.endif
+
+.if ${MACHINE_ARCH} == "hppa"
+CFLAGS += -DSAFETY=3 -DNO_ASM
+CONFIGURE_ARGS += --with-gmalloc
.endif
pre-build:
[hppa] lang/clisp: Enable hppa support
Hi ports --
The following unobtrusive diff allows lang/clips to build and work on hppa.
Does not affect other archs.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/lang/clisp/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile 21 Nov 2017 00:13:01 - 1.49
+++ Makefile 16 Apr 2019 00:23:18 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.49 2017/11/21 00:13:01 naddy Exp $
-ONLY_FOR_ARCHS = amd64 i386 powerpc sparc64
+ONLY_FOR_ARCHS = amd64 hppa i386 powerpc sparc64
COMMENT = ANSI Common Lisp implementation
@@ -50,6 +50,11 @@ CFLAGS += -fno-pie -nopie
LDFLAGS += -nopie
.else
CONFIGURE_ARGS += --without-gmalloc
+.endif
+
+.if ${MACHINE_ARCH} == "hppa"
+CFLAGS += -DSAFETY=3 -DNO_ASM
+CONFIGURE_ARGS += --with-gmalloc
.endif
pre-build:
Re: Update: devel/py-pip 9.0.3 -> 19.0.3
On Tue, Apr 16, 2019 at 01:34:40AM +0200, Antoine Jacoutot wrote:
> No. Comment shouldn't start with uppercase.
I hadn't known that one before. Thank you.
Here's an updated version.
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/devel/py-pip/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile4 Apr 2018 20:04:56 - 1.31
+++ Makefile16 Apr 2019 00:10:37 -
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.31 2018/04/04 20:04:56 danj Exp $
-COMMENT = Python easy_install replacement
+COMMENT = tool for installing Python packages
-MODPY_EGG_VERSION =9.0.3
+MODPY_EGG_VERSION =19.0.3
DISTNAME = pip-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
@@ -17,23 +17,10 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-BUILD_DEPENDS =textproc/py-sphinx${MODPY_FLAVOR}
-
FLAVORS = python3
FLAVOR ?=
# No test suites in pypi tarball
NO_TEST = Yes
-
-DOCSRC = ${WRKSRC}/docs
-post-build:
- cd ${DOCSRC} && PYTHONPATH=${WRKSRC} \
- ${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N .
_build/html
-
-DOCS = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pip
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCS}
- cd ${DOCSRC}/_build/html && pax -rw * ${DOCS}
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/py-pip/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo4 Apr 2018 20:04:56 - 1.16
+++ distinfo16 Apr 2019 00:10:37 -
@@ -1,2 +1,2 @@
-SHA256 (pip-9.0.3.tar.gz) = e/SPmmk74dWPSfevfgrp/in9ZxzeilXm7co1gcTvV5Y=
-SIZE (pip-9.0.3.tar.gz) = 1343076
+SHA256 (pip-19.0.3.tar.gz) = bm8Zehq/tFEY27h4tchZoO290z/SUBALwBW2f97UufI=
+SIZE (pip-19.0.3.tar.gz) = 1324617
Index: patches/patch-docs_conf_py
===
RCS file: patches/patch-docs_conf_py
diff -N patches/patch-docs_conf_py
--- patches/patch-docs_conf_py 16 Apr 2016 19:06:26 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-docs_conf_py,v 1.1 2016/04/16 19:06:26 shadchin Exp $
-
-Prevent build from calling out to the internet.
-
docs/conf.py.orig Fri Apr 15 21:02:46 2016
-+++ docs/conf.py Fri Apr 15 21:02:54 2016
-@@ -27,7 +27,7 @@ sys.path.insert(0, os.path.abspath(os.pardir))
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- # extensions = ['sphinx.ext.autodoc']
--extensions = ['sphinx.ext.extlinks', 'docs.pipext', 'sphinx.ext.intersphinx']
-+extensions = ['sphinx.ext.extlinks', 'docs.pipext']
-
- # intersphinx
- intersphinx_cache_limit = 0
Index: patches/patch-docs_html_conf_py
===
RCS file: patches/patch-docs_html_conf_py
diff -N patches/patch-docs_html_conf_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-docs_html_conf_py 16 Apr 2019 00:10:37 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Prevent build from calling out to the internet.
+
+Index: docs/html/conf.py
+--- docs/html/conf.py.orig
docs/html/conf.py
+@@ -30,7 +30,7 @@ sys.path.insert(0, docs_dir)
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ # extensions = ['sphinx.ext.autodoc']
+-extensions = ['sphinx.ext.extlinks', 'pip_sphinxext',
'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.extlinks', 'pip_sphinxext']
+
+ # intersphinx
+ intersphinx_cache_limit = 0
Index: pkg/DESCR
===
RCS file: /cvs/ports/devel/py-pip/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 12 Apr 2011 19:30:55 - 1.2
+++ pkg/DESCR 16 Apr 2019 00:10:37 -
@@ -1,3 +1,2 @@
-pip is a replacement for easy_install. It uses mostly the same
-techniques for finding packages, so packages that were made
-easy_installable should be pip-installable as well.
+pip is the package installer for Python. You can use pip to install
+packages from the Python Package Index and other indexes.
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-pip/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 4 Apr 2018 20:04:56 - 1.13
+++ pkg/PLIST 16 Apr 2019 00:10:37 -
@@ -10,23 +10,170 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pip-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
Re: Update: devel/py-pip 9.0.3 -> 19.0.3
On Mon, Apr 15, 2019 at 06:44:57PM +0200, Peter Hessler wrote:
> On 2019 Mar 31 (Sun) at 15:10:47 -0400 (-0400), Kurt Mosiejczuk wrote:
> :On Tue, Mar 19, 2019 at 09:01:53PM -0400, Kurt Mosiejczuk wrote:
> :> This updates devel/py-pip from 9.0.3 all the way up to the current
> :> 19.0.3.
> :
> :> I saw on a previous attempt it was suggested by danj@ to skip bundling
> :> the documentation, so I did that. The decision was helped by the fact
> :> that making the documentation as it was meant needing a pip more
> :> current than we had to build the new pip. This also means the py-sphinx
> :> BUILD_DEPENDS can go away.
> :
> :> I did a couple installs and uninstalls and it seems to behave fine.
> :> I worked through building devel/py-wbem (both 2 and 3 flavors) and
> :> net/napalm/py-napalm. All built fine.
> :
> :> I ran tests for devel/py-setuptools_scm (both flavors). There is one
> :> additional failure test for py-setuptools_scm that seems to be due to
> :> our ancient version of py-setuptools_scm calling pip in an obsolete way.
> :> (a newer version changes how the test is done. Doing the newer version
> :> of the test by hand works. I'd patch it, but I'll probably try tackling
> :> the new version of py-setuptools_SCM soon).
> :
> :> I tried repeatedly to run tests for sysutils/salt. It kept trying to
> :> build things rather than install the packages. I finally got it to
> :> try and run the tests, and they don't work. But, those tests don't
> :> work with the old version of pip either.
> :
> :ping
> :
> :--Kurt
> :
>
> OK
No. Comment shouldn't start with uppercase.
> :Index: Makefile
> :===
> :RCS file: /cvs/ports/devel/py-pip/Makefile,v
> :retrieving revision 1.31
> :diff -u -p -r1.31 Makefile
> :--- Makefile 4 Apr 2018 20:04:56 - 1.31
> :+++ Makefile 20 Mar 2019 00:57:10 -
> :@@ -1,8 +1,8 @@
> : # $OpenBSD: Makefile,v 1.31 2018/04/04 20:04:56 danj Exp $
> :
> :-COMMENT = Python easy_install replacement
> :+COMMENT = Tool for installing Python packages
> :
> :-MODPY_EGG_VERSION = 9.0.3
> :+MODPY_EGG_VERSION = 19.0.3
> : DISTNAME = pip-${MODPY_EGG_VERSION}
> : PKGNAME = py-${DISTNAME}
> : CATEGORIES =devel
> :@@ -17,23 +17,10 @@ MODULES =lang/python
> : MODPY_PI = Yes
> : MODPY_SETUPTOOLS = Yes
> :
> :-BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
> :-
> : FLAVORS = python3
> : FLAVOR ?=
> :
> : # No test suites in pypi tarball
> : NO_TEST = Yes
> :-
> :-DOCSRC =${WRKSRC}/docs
> :-post-build:
> :-cd ${DOCSRC} && PYTHONPATH=${WRKSRC} \
> :-${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N .
> _build/html
> :-
> :-DOCS = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pip
> :-
> :-post-install:
> :-${INSTALL_DATA_DIR} ${DOCS}
> :-cd ${DOCSRC}/_build/html && pax -rw * ${DOCS}
> :
> : .include
> :Index: distinfo
> :===
> :RCS file: /cvs/ports/devel/py-pip/distinfo,v
> :retrieving revision 1.16
> :diff -u -p -r1.16 distinfo
> :--- distinfo 4 Apr 2018 20:04:56 - 1.16
> :+++ distinfo 20 Mar 2019 00:57:10 -
> :@@ -1,2 +1,2 @@
> :-SHA256 (pip-9.0.3.tar.gz) = e/SPmmk74dWPSfevfgrp/in9ZxzeilXm7co1gcTvV5Y=
> :-SIZE (pip-9.0.3.tar.gz) = 1343076
> :+SHA256 (pip-19.0.3.tar.gz) = bm8Zehq/tFEY27h4tchZoO290z/SUBALwBW2f97UufI=
> :+SIZE (pip-19.0.3.tar.gz) = 1324617
> :Index: patches/patch-docs_conf_py
> :===
> :RCS file: patches/patch-docs_conf_py
> :diff -N patches/patch-docs_conf_py
> :--- patches/patch-docs_conf_py 16 Apr 2016 19:06:26 - 1.1
> :+++ /dev/null1 Jan 1970 00:00:00 -
> :@@ -1,15 +0,0 @@
> :-$OpenBSD: patch-docs_conf_py,v 1.1 2016/04/16 19:06:26 shadchin Exp $
> :-
> :-Prevent build from calling out to the internet.
> :-
> : docs/conf.py.orig Fri Apr 15 21:02:46 2016
> :-+++ docs/conf.pyFri Apr 15 21:02:54 2016
> :-@@ -27,7 +27,7 @@ sys.path.insert(0, os.path.abspath(os.pardir))
> :- # Add any Sphinx extension module names here, as strings. They can be
> :- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
> :- # extensions = ['sphinx.ext.autodoc']
> :--extensions = ['sphinx.ext.extlinks', 'docs.pipext',
> 'sphinx.ext.intersphinx']
> :-+extensions = ['sphinx.ext.extlinks', 'docs.pipext']
> :-
> :- # intersphinx
> :- intersphinx_cache_limit = 0
> :Index: patches/patch-docs_html_conf_py
> :===
> :RCS file: patches/patch-docs_html_conf_py
> :diff -N patches/patch-docs_html_conf_py
> :--- /dev/null1 Jan 1970 00:00:00 -
> :+++ patches/patch-docs_html_conf_py 20 Mar 2019 00:57:10 -
> :@@ -0,0 +1,16 @@
> :+$OpenBSD$
> :+
> :+Prevent build from calling out to the internet.
> :+
> :+Index:
[hppa] FIX: misc/zzuf (affects all archs)
Hi ports --
zzuf is one of those ports that uses the __sync functions, meaning that
hppa can't build it.
This diff does the follow:
* Convert __sync to __atomic
* Set COMPILER=base-clang ports-gcc
As I understand it, all archs with gcc-4.2.1 as its base compiler has
access to ports-gcc too. m88k can't build this anyway as gcc-3 doesn't
have the __sync functions either.
Test output is exactly the same on amd64 with the __sync to __atomic
conversion.
hppa is happy with this.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/misc/zzuf/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 3 May 2018 11:02:57 - 1.19
+++ Makefile 15 Apr 2019 21:34:50 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.19 2018/05/03 11:02:57 solene Exp $
-BROKEN-hppa= __sync_lock_test_and_set_4 in zzuf_mutex_lock
-
COMMENT= transparent application input fuzzer
VERSION= 0.15
DISTNAME= zzuf-${VERSION}
+REVISION= 0
CATEGORIES= misc security
@@ -15,6 +14,8 @@ MASTER_SITES= https://github.com/samhoc
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c m
+
+COMPILER= base-clang ports-gcc
CONFIGURE_STYLE= gnu
# Necessary?
Index: patches/patch-src_util_mutex_h
===
RCS file: patches/patch-src_util_mutex_h
diff -N patches/patch-src_util_mutex_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_util_mutex_h 15 Apr 2019 21:34:50 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Replace nonstandard __sync_* with standard __atomic_* for hppa.
+
+Index: src/util/mutex.h
+--- src/util/mutex.h.orig
src/util/mutex.h
+@@ -35,7 +35,7 @@ static inline void zzuf_mutex_lock(zzuf_mutex_t *l)
+ while (InterlockedExchange(l, 1));
+ #elif __GNUC__ || __clang__
+ do {}
+-while (__sync_lock_test_and_set(l, 1));
++while (__atomic_test_and_set(l, __ATOMIC_SEQ_CST));
+ #endif
+ }
+
+@@ -44,8 +44,7 @@ static inline void zzuf_mutex_unlock(zzuf_mutex_t *l)
+ #if _WIN32
+ InterlockedExchange(l, 0);
+ #elif __GNUC__ || __clang__
+-*l = 0;
+-__sync_synchronize();
++__atomic_clear(l, __ATOMIC_SEQ_CST);
+ #endif
+ }
+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/04/15 15:20:06 Modified files: devel/ti-msp430gcc: Makefile Added files: devel/ti-msp430gcc/patches: patch-sources_tools_gcc_bitmap_c patch-sources_tools_gcc_cgraph_c patch-sources_tools_gcc_config_elfos_h patch-sources_tools_gcc_config_msp430_msp430_c patch-sources_tools_gcc_cppbuiltin_c patch-sources_tools_gcc_dwarf2cfi_c patch-sources_tools_gcc_dwarf2out_c patch-sources_tools_gcc_ipa-devirt_c patch-sources_tools_gcc_ipa-inline_c patch-sources_tools_gcc_ipa-profile_c patch-sources_tools_gcc_ipa-prop_c patch-sources_tools_gcc_loop-iv_c patch-sources_tools_gcc_profile_c patch-sources_tools_gcc_stor-layout_c patch-sources_tools_gcc_system_h patch-sources_tools_gcc_toplev_c patch-sources_tools_gcc_tree-ssa-reassoc_c patch-sources_tools_gcc_value-prof_c Log message: unbreak clang builds of ti-msp430gcc: - add spaces around BAR in "foo"BAR"foo" - #include in a higher-up header, avoiding namespace issue with fancy_abort (sort-of borrowed from FreeBSD gcc ports)
[hppa] FIX: x11/worker
Hi ports --
hppa needs -latomic to build x11/worker.
Fixes the build here.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/x11/worker/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 30 Jan 2019 03:16:02 - 1.37
+++ Makefile 15 Apr 2019 21:12:14 -
@@ -1,6 +1,5 @@
# $OpenBSD: Makefile,v 1.37 2019/01/30 03:16:02 bcallah Exp $
-BROKEN-hppa = no atomic ops
COMMENT = Midnight Commander-like file manager for X
DISTNAME = worker-3.15.4
CATEGORIES = x11
@@ -17,7 +16,7 @@ WANTLIB += fontconfig freetype m pthread
MASTER_SITES = http://www.boomerangsworld.de/cms/worker/downloads/
# C++11
-COMPILER = base-clang ports-clang ports-gcc
+COMPILER = base-clang ports-gcc
RUN_DEPENDS = devel/desktop-file-utils
@@ -28,6 +27,11 @@ CONFIGURE_ARGS = --without-avfs \
--without-libmagic \
--disable-inotify \
--disable-lua
+
+.if ${MACHINE_ARCH:Mhppa}
+WANTLIB += atomic
+MAKE_FLAGS = LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -latomic"
+.endif
TEST_DEPENDS = devel/check
TEST_FLAGS = CXXFLAGS="${CXXFLAGS} -std=c++11 -I${LOCALBASE}/include"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/04/15 15:10:09 Modified files: mail/postfix/stable: Makefile distinfo mail/postfix/stable/patches: patch-conf_main_cf patch-conf_master_cf patch-src_tls_tls_server_c patch-src_util_sys_defs_h mail/postfix/stable/pkg: PLIST Added files: mail/postfix/stable/patches: patch-src_tls_tls_certkey_c Log message: update to postfix-3.4.5, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/04/15 15:10:01 Modified files: mail/postfix/snapshot: Makefile distinfo mail/postfix/snapshot/patches: patch-conf_main_cf patch-conf_master_cf patch-src_tls_tls_server_c mail/postfix/snapshot/pkg: PLIST Added files: mail/postfix/snapshot/patches: patch-src_tls_tls_certkey_c Log message: update to postfix-3.5-20190330, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 15:09:05 Modified files: lang/gravity : Makefile distinfo Log message: Update to gravity-0.6.5 Changelog: https://github.com/marcobambini/gravity/compare/0.6.3...0.6.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 15:04:14 Modified files: sysutils/bfs : Makefile Log message: Build with -DBFS_HAS_SYS_ACL=0 to ensure that bfs builds on all archs. Noticed on hppa, also fixes macppc. ok cwen@
Re: FIX: sysutils/bfs build on some archs
On Mon, 15 Apr 2019 22:37:59 +0200 Landry Breuil wrote: > On Mon, Apr 15, 2019 at 03:48:26PM -0400, Brian Callahan wrote: > > Hi ports -- > > > > bfs I discovered might not build on all archs. We need to be > > explicit with the BFS_HAS_SYS_ACL preprocessor variable. We don't > > have a /usr/include/sys/acl.h, so set it to 0 to not try to pick it > > up. > > > > Noticed when building bfs on hppa. > > > Will probably fix macppc too :) > > posix1e.c:27:22: error: sys/acl.h: No such file or directory > Yup :) It builds fine on macppc and amd64 here. I tried some features without any problems. OK cwen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/04/15 14:44:28 Modified files: mail/rspamd: Makefile distinfo mail/rspamd/pkg: PLIST Log message: update to rspamd-1.9.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/04/15 14:44:16 Modified files: net/wireshark : Makefile distinfo net/wireshark/patches: patch-CMakeLists_txt Log message: update to wireshark-3.0.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 14:40:55 Modified files: lang/kona : Makefile distinfo Log message: Update to kona-3.2.0.20190407
Re: FIX: sysutils/bfs build on some archs
On Mon, Apr 15, 2019 at 03:48:26PM -0400, Brian Callahan wrote: > Hi ports -- > > bfs I discovered might not build on all archs. We need to be explicit with > the BFS_HAS_SYS_ACL preprocessor variable. We don't have a > /usr/include/sys/acl.h, so set it to 0 to not try to pick it up. > > Noticed when building bfs on hppa. Will probably fix macppc too :) posix1e.c:27:22: error: sys/acl.h: No such file or directory
Re: [new] mail/opendmarc
On 26/03/2019 07:07, Renaud Allard wrote:
On 3/25/19 8:59 PM, Stuart Henderson wrote:
Getting there; couple of small things
- don't hardcode _opendmarc in the rc script, use ${daemon_user}
OK, done, note that in opendkim, the user is also hardcoded, this might
be worth changing there too.
- missing $OpenBSD$ line in rc script
Added
I haven't tried building it yet.
This is the part I tried the most.
Friendly ping after port unlocking :)
smime.p7s
Description: S/MIME Cryptographic Signature
UPDATE: multimedia/mkvtoolnix (multimedia/libmatroska, textproc/libebml)
Please find attached update diffs for the following ports:
- multimedia/libmatroska
- textproc/libebml
Simple updates to the latest stable versions. Both projects switched to
cmake as build-system.
- multimedia/mkvtoolnix
As always nothing special but depends on the new libmatroska and libebml
versions.
Comments? OK?
RS
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile8 Mar 2019 20:00:50 - 1.88
+++ Makefile15 Apr 2019 19:53:36 -
@@ -2,8 +2,7 @@
COMMENT= create, alter and inspect Matroska files
-DISTNAME= mkvtoolnix-31.0.0
-REVISION= 0
+DISTNAME= mkvtoolnix-33.0.0
CATEGORIES=multimedia x11
@@ -14,9 +13,9 @@ MAINTAINER = Rafael Sadowski https://www.bunkus.org/videotools/mkvtoolnix/sources/
@@ -42,8 +41,8 @@ LIB_DEPENDS= audio/flac \
textproc/cmark \
devel/gettext \
devel/libmagic \
- multimedia/libmatroska>=1.4.5 \
- textproc/libebml>=1.3.4
+ multimedia/libmatroska>=1.5.0 \
+ textproc/libebml>=1.3.7
MAKE_ENV+= V=1
Index: distinfo
===
RCS file: /cvs/ports/multimedia/mkvtoolnix/distinfo,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 distinfo
--- distinfo3 Mar 2019 08:51:19 - 1.46
+++ distinfo15 Apr 2019 19:53:36 -
@@ -1,2 +1,2 @@
-SHA256 (mkvtoolnix-31.0.0.tar.xz) =
+YqMOgDkjOuaVuxcsfibdmO7xazohxP58If9qqJQGzU=
-SIZE (mkvtoolnix-31.0.0.tar.xz) = 7282492
+SHA256 (mkvtoolnix-33.0.0.tar.xz) =
krgrGD0U4dTvHdd50A33A/lzWVxq5gsyyfqpzyHiZ4E=
+SIZE (mkvtoolnix-33.0.0.tar.xz) = 7285816
Index:
patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
===
RCS file:
/cvs/ports/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1
patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
--- patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
18 Aug 2018 06:47:58 - 1.1
+++ patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
15 Apr 2019 19:53:36 -
@@ -18,7 +18,7 @@ Index: src/mkvtoolnix-gui/jobs/program_r
-class LinuxProgramRunner: public ProgramRunner {
+class UnixProgramRunner: public ProgramRunner {
- Q_OBJECT;
+ Q_OBJECT
public:
- explicit LinuxProgramRunner();
Index: Makefile
===
RCS file: /cvs/ports/textproc/libebml/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile24 Oct 2018 14:28:11 - 1.22
+++ Makefile15 Apr 2019 18:58:11 -
@@ -2,13 +2,12 @@
COMMENT= Extensible Binary Meta Language library
-DISTNAME= libebml-1.3.5
+DISTNAME= libebml-1.3.7
CATEGORIES=textproc
MASTER_SITES= https://dl.matroska.org/downloads/libebml/
EXTRACT_SUFX= .tar.xz
-REVISION= 0
-SHARED_LIBS= ebml3.1
+SHARED_LIBS= ebml3.2
HOMEPAGE= http://www.matroska.org/
@@ -17,10 +16,14 @@ MAINTAINER= Brad Smith
Index: distinfo
===
RCS file: /cvs/ports/textproc/libebml/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo4 Sep 2017 08:01:05 - 1.12
+++ distinfo15 Apr 2019 18:58:11 -
@@ -1,2 +1,2 @@
-SHA256 (libebml-1.3.5.tar.xz) = 2BhBP2B0LC8Da6b1gsXgMg0Sv/7BsPwPwXo5i28EqgA=
-SIZE (libebml-1.3.5.tar.xz) = 274184
+SHA256 (libebml-1.3.7.tar.xz) = 4yRMh/WE1/yMNxiBprewZYPMBB+I4uP66aIV2cpY6fQ=
+SIZE (libebml-1.3.7.tar.xz) = 69460
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/libebml/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 27 May 2015 21:16:51 - 1.3
+++ pkg/PLIST 15 Apr 2019 18:58:11 -
@@ -29,7 +29,11 @@ include/ebml/SafeReadIOCallback.h
include/ebml/StdIOCallback.h
include/ebml/c/
include/ebml/c/libebml_t.h
-lib/libebml.a
-lib/libebml.la
+lib/cmake/
+lib/cmake/ebml/
+lib/cmake/ebml/EbmlConfig.cmake
+lib/cmake/ebml/EbmlConfigVersion.cmake
+lib/cmake/ebml/EbmlTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/ebml/EbmlTargets.cmake
@lib lib/libebml.so.${LIBebml_VERSION}
lib/pkgconfig/libebml.pc
Index: Makefile
===
RCS file: /cvs/ports/multimedia/libmatroska/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile24 Oct 2018 14:28:08 - 1.25
+++ Makefile15 Apr 2019 19:00:32 -
@@ -2,13 +2,12 @@
COMMENT= extensible open standard audio/video container library
FIX: sysutils/bfs build on some archs
Hi ports --
bfs I discovered might not build on all archs. We need to be explicit
with the BFS_HAS_SYS_ACL preprocessor variable. We don't have a
/usr/include/sys/acl.h, so set it to 0 to not try to pick it up.
Noticed when building bfs on hppa.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/sysutils/bfs/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 12 Feb 2019 21:47:11 - 1.4
+++ Makefile 15 Apr 2019 19:45:34 -
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.4 2019/02/12 21:47:11 bcallah Exp $
COMMENT = breadth-first version of the UNIX find command
+REVISION = 0
CATEGORIES = sysutils
GH_ACCOUNT = tavianator
@@ -15,6 +16,7 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c
USE_GMAKE = Yes
+MAKE_FLAGS = CFLAGS="${CFLAGS} -DBFS_HAS_SYS_ACL=0"
FAKE_FLAGS = DESTDIR=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 13:42:05 Added files: security/rhash/patches: patch-librhash_byte_order_h Log message: Add hppa to the list of big endian archs to allow it to build. ok phessler@
archivers/zstd: Enable on hppa
Hi ports --
hppa needs -latomic from ports-gcc in order to successfully build. The
attached patch does this.
This allows libarchive to build successfully on hppa.
Built on hppa with gcc-8.3.0.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/archivers/zstd/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 28 Dec 2018 19:28:37 - 1.22
+++ Makefile 15 Apr 2019 19:21:13 -
@@ -30,8 +30,14 @@ MAKE_ENV = CC="${CC}" \
CPPFLAGS="-I${WRKSRC}/lib -I${WRKSRC}/lib/dictBuilder -I${LOCALBASE}/include" \
CXX="${CXX}" \
CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
LIBzstd_VERSION="${LIBzstd_VERSION}"
+
+.if ${MACHINE_ARCH:Mhppa}
+WANTLIB += atomic
+LDFLAGS += -latomic
+.endif
+
FAKE_FLAGS = PREFIX="${PREFIX}"
USE_GMAKE = Yes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/04/15 13:17:59 Modified files: www/chromium : Makefile distinfo Log message: update to 73.0.3683.103
devel/libuv: Enable on hppa (touches most archs)
Hi ports --
Some context: gcc and clang both support two different atomic builtin
function families. The first are the __sync functions, which as far as I
can tell appeared in gcc-4.1. The second is the __atomic functions,
which appeared in gcc-4.7.
Not all architectures and OSes have support for the __sync function.
hppa is one such architecture. However, all architectures have support
for the __atomic functions, as those are the builtins that the C11 and
C++11 stdatomic functions are implemented in. The __sync functions are
considered obsolete and may be removed from gcc at some point. So all
new code should be __atomic only.
The gcc documentation says "It is*always*safe to replace a __sync call
with an __atomic call using the __ATOMIC_SEQ_CST memory model. This is
in fact what happens internally right now. (__sync calls are processed
by the new __atomic routines)" [0]. Therefore, we can replace the __sync
calls in libuv with the equivalent __atomic calls and it will build on hppa.
This change affects all archs except amd64 and i386, as those two have
hand-written assembly functions that the libuv team wrote. The __atomic
routines are used on all other archs do.
Tested on amd64 (no change) and hppa with gcc-8.3.0 (works now). With
this change, CMake works again on hppa.
In the long run, I think I would like to change all references of __sync
to __atomic. But that's a conversation for another email.
Tests on sparc64 and macppc and mips64* would be nice as a layer of safety.
OK for libuv?
~Brian
[0] https://gcc.gnu.org/wiki/Atomic/GCCMM
Index: Makefile
===
RCS file: /cvs/ports/devel/libuv/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 4 Jan 2019 08:53:54 - 1.9
+++ Makefile 15 Apr 2019 19:01:20 -
@@ -7,6 +7,7 @@ COMMENT = multi-platform library for asy
VER = 1.24.1
DISTNAME = libuv-v${VER}
PKGNAME = libuv-${VER}
+REVISION = 0
CATEGORIES = devel
SHARED_LIBS = uv 2.0 # 1.0
@@ -19,6 +20,8 @@ MASTER_SITES = https://dist.libuv.org/di
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += pthread
+
+COMPILER = base-clang ports-gcc
BUILD_DEPENDS = devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
Index: patches/patch-src_unix_atomic-ops_h
===
RCS file: patches/patch-src_unix_atomic-ops_h
diff -N patches/patch-src_unix_atomic-ops_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_unix_atomic-ops_h 15 Apr 2019 19:01:20 -
@@ -0,0 +1,34 @@
+$OpenBSD$
+
+Replace obsolete __sync functions with standard __atomic functions.
+
+Index: src/unix/atomic-ops.h
+--- src/unix/atomic-ops.h.orig
src/unix/atomic-ops.h
+@@ -22,6 +22,8 @@
+ #include
+ #endif
+
++#include
++
+ UV_UNUSED(static int cmpxchgi(int* ptr, int oldval, int newval));
+ UV_UNUSED(static long cmpxchgl(long* ptr, long oldval, long newval));
+ UV_UNUSED(static void cpu_relax(void));
+@@ -51,7 +53,7 @@ UV_UNUSED(static int cmpxchgi(int* ptr, int oldval, in
+ #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ return atomic_cas_uint(ptr, oldval, newval);
+ #else
+- return __sync_val_compare_and_swap(ptr, oldval, newval);
++ return __atomic_compare_exchange_n(ptr, , newval, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+ #endif
+ }
+
+@@ -87,7 +89,7 @@ UV_UNUSED(static long cmpxchgl(long* ptr, long oldval,
+ #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ return atomic_cas_ulong(ptr, oldval, newval);
+ #else
+- return __sync_val_compare_and_swap(ptr, oldval, newval);
++ return __atomic_compare_exchange_n(ptr, , newval, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+ #endif
+ }
+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/04/15 12:43:35 Modified files: meta/kde4 : Makefile x11/kde-applications: Makefile x11/kde4 : Makefile Log message: Disable missing KDE4 and enable more KDE5 ports
Re: [ports-gcc-8] Unbreak net/{lib,r}torrent
On Mon, 15 Apr 2019 15:52:28 +0100
Stuart Henderson wrote:
> On 2019/04/15 16:48, Charlene Wendling wrote:
> >
> > Take 2, as i've already worked on it when ports-gcc-6 was out.
> >
> > > error: struct std::tr1::array has no member
> > > named fill
> >
> > There is already a set of patches to fix these issues. It was
> > limited to clang so far, i removed this limitation. I've also
> > removed the sparc64 workarounds as they are not needed anymore
> > nowadays [0], it uses ports-gcc.
>
> > -.if ${PROPERTIES:Mclang}
> > +CXXFLAGS +=-std=c++11
> > +# some patches involve the tr1 stuff
> > +PATCH_LIST = patch-* clangpatch-*
> > +
>
> As this is now unconditional, please merge the clangpatch-* files into
> the main patch-* and get rid of PATCH_LIST.
Thanks! It makes sense indeed. I'm attaching the updated diffs.
I've tested again, it builds and i have been able to download an ISO
with it on macppc and amd64.
Charlène.
rtorrent.diff
Description: Binary data
libtorrent.diff
Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/04/15 12:22:51 Modified files: geo/qgis : Makefile distinfo Removed files: geo/qgis/patches: patch-src_app_qgisapp_cpp patch-src_server_qgsserverplugins_cpp Log message: Update to QGIS 3.6.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/04/15 11:39:43 Modified files: net/psi: Makefile Added files: net/psi/patches: patch-iris_src_xmpp_base64_base64_cpp Log message: psi: fix narrowing conversion error on archs where char is unsigned by default (ppc, arm). Tested on macppc. Also move HOMEPAGE to https. OK sthen@ phessler@
Maintainer update: gitsh 0.14
gitsh 0.14[1] brings a lot more tab completion improvements.
Part of this is that it installs an `/etc/completions` with
user-overridable tab completions, useful for adding your own git
subcommands. Thanks to afresh1@ for advice on how to do that[2]. Did I
do it right?
As usual, long PLIST diff because they bumped some vendored ruby
libraries.
[1]: https://github.com/thoughtbot/gitsh/releases/tag/v0.14
[2]: https://bsd.network/@AFresh1/101837346684902378
---
Index: Makefile
===
RCS file: /cvs/ports/devel/gitsh/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile13 Jan 2019 14:00:56 - 1.10
+++ Makefile5 Apr 2019 21:37:35 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.10 2019/01/13 14:00:56 rsadowski Exp $
-VERSION = 0.13
+VERSION = 0.14
COMMENT = interactive shell for git
@@ -24,6 +24,7 @@ RUN_DEPENDS = devel/git
LIB_DEPENDS = devel/readline
CONFIGURE_STYLE = gnu
+FAKE_FLAGS = pkgsysconfdir="${PREFIX}/share/examples/gitsh"
CONFIGURE_ENV =READLINE_LIB="ereadline" \
CPPFLAGS="-I${LOCALBASE}/include/ereadline" \
LDFLAGS="-L${LOCALBASE}/lib" \
Index: distinfo
===
RCS file: /cvs/ports/devel/gitsh/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo13 Jan 2019 14:00:56 - 1.6
+++ distinfo5 Apr 2019 21:37:35 -
@@ -1,2 +1,2 @@
-SHA256 (gitsh-0.13.tar.gz) = bDjbU4d/LESEAg8GgaRPEaKc5NHh2ssGK65JwvLDoqA=
-SIZE (gitsh-0.13.tar.gz) = 1180908
+SHA256 (gitsh-0.14.tar.gz) = S4m20AYyantXxMjkQFlOR322G30/4mM6iq0Xa7GdASU=
+SIZE (gitsh-0.14.tar.gz) = 1171693
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/gitsh/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 13 Jan 2019 14:00:56 - 1.7
+++ pkg/PLIST 5 Apr 2019 21:37:35 -
@@ -2,6 +2,10 @@
@bin bin/gitsh
@man man/man1/gitsh.1
@man man/man5/gitsh_completions.5
+share/examples/gitsh/
+@sample ${SYSCONFDIR}/gitsh/
+share/examples/gitsh/completions
+@sample ${SYSCONFDIR}/gitsh/completions
share/gitsh/
share/gitsh/ruby/
share/gitsh/ruby/gitsh.rb
@@ -52,6 +56,7 @@ share/gitsh/ruby/lib/gitsh/prompter.rb
share/gitsh/ruby/lib/gitsh/quote_detector.rb
share/gitsh/ruby/lib/gitsh/shell_command_runner.rb
share/gitsh/ruby/lib/gitsh/tab_completion/
+share/gitsh/ruby/lib/gitsh/tab_completion/alias_expander.rb
share/gitsh/ruby/lib/gitsh/tab_completion/automaton.rb
share/gitsh/ruby/lib/gitsh/tab_completion/automaton_factory.rb
share/gitsh/ruby/lib/gitsh/tab_completion/command_completer.rb
@@ -60,10 +65,12 @@ share/gitsh/ruby/lib/gitsh/tab_completio
share/gitsh/ruby/lib/gitsh/tab_completion/dsl.rb
share/gitsh/ruby/lib/gitsh/tab_completion/dsl/choice_factory.rb
share/gitsh/ruby/lib/gitsh/tab_completion/dsl/concatenation_factory.rb
+share/gitsh/ruby/lib/gitsh/tab_completion/dsl/fallback_transition_factory.rb
share/gitsh/ruby/lib/gitsh/tab_completion/dsl/lexer.rb
share/gitsh/ruby/lib/gitsh/tab_completion/dsl/maybe_operation_factory.rb
share/gitsh/ruby/lib/gitsh/tab_completion/dsl/null_factory.rb
share/gitsh/ruby/lib/gitsh/tab_completion/dsl/option_transition_factory.rb
+share/gitsh/ruby/lib/gitsh/tab_completion/dsl/parse_error.rb
share/gitsh/ruby/lib/gitsh/tab_completion/dsl/parser.rb
share/gitsh/ruby/lib/gitsh/tab_completion/dsl/plus_operation_factory.rb
share/gitsh/ruby/lib/gitsh/tab_completion/dsl/rule_factory.rb
@@ -76,551 +83,659 @@ share/gitsh/ruby/lib/gitsh/tab_completio
share/gitsh/ruby/lib/gitsh/tab_completion/matchers/
share/gitsh/ruby/lib/gitsh/tab_completion/matchers/anything_matcher.rb
share/gitsh/ruby/lib/gitsh/tab_completion/matchers/base_matcher.rb
+share/gitsh/ruby/lib/gitsh/tab_completion/matchers/branch_matcher.rb
share/gitsh/ruby/lib/gitsh/tab_completion/matchers/command_matcher.rb
share/gitsh/ruby/lib/gitsh/tab_completion/matchers/path_matcher.rb
share/gitsh/ruby/lib/gitsh/tab_completion/matchers/remote_matcher.rb
share/gitsh/ruby/lib/gitsh/tab_completion/matchers/revision_matcher.rb
+share/gitsh/ruby/lib/gitsh/tab_completion/matchers/tag_matcher.rb
share/gitsh/ruby/lib/gitsh/tab_completion/matchers/text_matcher.rb
share/gitsh/ruby/lib/gitsh/tab_completion/matchers/unknown_option_matcher.rb
+share/gitsh/ruby/lib/gitsh/tab_completion/tokens_to_words.rb
share/gitsh/ruby/lib/gitsh/tab_completion/variable_completer.rb
share/gitsh/ruby/lib/gitsh/tab_completion/visualization.rb
share/gitsh/ruby/lib/gitsh/terminal.rb
share/gitsh/ruby/lib/gitsh/version.rb
share/gitsh/vendor/
share/gitsh/vendor/gems/
-share/gitsh/vendor/gems/ffi-1.9.17/
-share/gitsh/vendor/gems/ffi-1.9.17/COPYING
-share/gitsh/vendor/gems/ffi-1.9.17/LICENSE
-share/gitsh/vendor/gems/ffi-1.9.17/README.md
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/04/15 11:32:47 Modified files: net/synergy: Makefile Log message: synergy: build with -std=c++03 for all compilers This unbreaks the build with gcc-8. Also move HOMEPAGE to https. OK sthen@ phessler@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/04/15 11:26:22 Modified files: devel/catch2 : Makefile distinfo Log message: Update catch2 2.7.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/04/15 11:24:49 Modified files: games/spacehulk: Makefile Added files: games/spacehulk/patches: patch-src_smtp_cpp Log message: spacehulk: fix narrowing conversion error on archs where char is unsigned by default (ppc, arm). While here fix spacing in the Makefile. OK jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/04/15 11:14:46 Modified files: databases/strigi: Makefile Log message: strigi: build with -std=c++03 for all compilers This unbreaks the build with gcc-8. OK sthen@ jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: js...@cvs.openbsd.org 2019/04/15 11:14:14 Modified files: lang/go: Makefile distinfo lang/go/pkg: PLIST Log message: Update lang/go to 1.12.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/04/15 11:09:18 Modified files: x11/kde-applications/kollision: Makefile x11/kde-applications/kollision/pkg: DESCR x11/kde-applications/okular: Makefile x11/kde-applications/okular/pkg: DESCR Log message: s/KDE 4/KDE/ OK sthen@ Hint by kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 11:07:43 Modified files: lang/gpc : Makefile Added files: lang/gpc/patches: patch-gcc_config_gcc patch-gcc_config_pa_openbsd_h Log message: Add hppa support to gpc ok phessler@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/04/15 11:06:25 Modified files: sysutils/rclone: Makefile distinfo sysutils/rclone/files: rclone.bash rclone.zsh Log message: update to rclone-1.47.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/04/15 11:04:36 Modified files: security/wesng : Makefile security/wesng/patches: patch-wes_py Log message: fix output when a single vulnerability is found
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/04/15 11:02:12 Modified files: productivity/projectlibre: Makefile distinfo Log message: update to projectlibre-1.9.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/04/15 11:02:05 Modified files: graphics/ttfautohint: Makefile distinfo Log message: update to ttfautohint-1.8.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/04/15 11:00:09 Modified files: x11/lxrandr: Makefile distinfo x11/lxrandr/pkg: PLIST Log message: update to lxrandr-0.3.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/04/15 10:59:51 Modified files: net/py-paho-mqtt: Makefile distinfo net/py-paho-mqtt/pkg: PLIST Log message: update to paho-mqtt-1.4.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/04/15 10:59:19 Modified files: net/xmlrpc-c : Makefile distinfo Log message: update to xmlrpc-c-1.39.13
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/04/15 10:58:55 Modified files: devel/apache-ant: Makefile distinfo devel/apache-ant/pkg: PLIST Log message: update to apache-ant-1.10.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/04/15 10:58:32 Modified files: devel/iso-codes: Makefile distinfo devel/iso-codes/pkg: PLIST Log message: update to iso-codes-4.2
security/rhash: Enable hppa support
Hi ports --
security/rhash doesn't build on hppa. Because it is missing __hppa__ on
its list of big endian archs. Add it, and rhash builds just fine on hppa.
OK?
~Brian
Index: patches/patch-librhash_byte_order_h
===
RCS file: patches/patch-librhash_byte_order_h
diff -N patches/patch-librhash_byte_order_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-librhash_byte_order_h 15 Apr 2019 16:54:42 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+hppa is big endian.
+
+Index: librhash/byte_order.h
+--- librhash/byte_order.h.orig
librhash/byte_order.h
+@@ -55,7 +55,7 @@ extern "C" {
+ defined(__POWERPC__) || defined(POWERPC) || defined(__powerpc) || \
+ defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || \
+ defined(__hpux) || defined(_MIPSEB) || defined(mc68000) || \
+- defined(__s390__) || defined(__s390x__) || defined(sel)
++ defined(__s390__) || defined(__s390x__) || defined(sel) || defined(__hppa__)
+ # define CPU_BIG_ENDIAN
+ # define IS_BIG_ENDIAN 1
+ # define IS_LITTLE_ENDIAN 0
lang/gpc: Add hppa support
Hi ports --
The attached diff enables hppa support for gpc. For context, gpc is
implemented on top of our old gcc-4.2.4 port, which never had hppa
support. I gleaned support from gcc-4.2.1 in base.
With this patch, gpc builds and passes Scott A. Moore's publicly
available Standard Pascal test suite.
OK?
~Brian
? gpc-hppa.diff
Index: Makefile
===
RCS file: /cvs/ports/lang/gpc/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 28 Feb 2019 01:52:37 - 1.3
+++ Makefile 15 Apr 2019 16:48:19 -
@@ -5,7 +5,7 @@ NOT_FOR_ARCHS = aarch64 m88k
COMMENT = GNU Pascal compiler
DISTNAME = gpc-20070904
-REVISION = 1
+REVISION = 2
CATEGORIES = lang
HOMEPAGE = https://www.gnu-pascal.de/gpc/h-index.html
Index: patches/patch-gcc_config_gcc
===
RCS file: patches/patch-gcc_config_gcc
diff -N patches/patch-gcc_config_gcc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_config_gcc 15 Apr 2019 16:48:19 -
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+Add hppa support.
+
+Index: gcc/config.gcc
+--- gcc/config.gcc.orig
gcc/config.gcc
+@@ -901,10 +901,21 @@ hppa*-*-linux* | parisc*-*-linux*)
+ tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
+ fi
+ ;;
+-# port not yet contributed.
+-#hppa*-*-openbsd*)
+-# target_cpu_default="MASK_PA_11"
+-# ;;
++hppa*-*-openbsd*)
++ target_cpu_default="MASK_PA_11"
++ tm_defines="${tm_defines} PIE_DEFAULT=1"
++ tm_file="${tm_file} dbxelf.h elfos.h openbsd.h openbsd-libpthread.h pa/openbsd.h \
++ pa/pa32-regs.h"
++ tmake_file="${tmake_file} pa/t-linux"
++ # Set the libgcc version number
++ if test x$sjlj = x1; then
++ tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
++ else
++ tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
++ fi
++ gas=yes
++ gnu_ld=yes
++ ;;
+ hppa1.1-*-pro*)
+ target_cpu_default="MASK_PORTABLE_RUNTIME|MASK_NO_SPACE_REGS|MASK_SOFT_FLOAT"
+ tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h \
Index: patches/patch-gcc_config_pa_openbsd_h
===
RCS file: patches/patch-gcc_config_pa_openbsd_h
diff -N patches/patch-gcc_config_pa_openbsd_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_config_pa_openbsd_h 15 Apr 2019 16:48:19 -
@@ -0,0 +1,202 @@
+$OpenBSD$
+
+Add hppa support.
+
+Index: gcc/config/pa/openbsd.h
+--- gcc/config/pa/openbsd.h.orig
gcc/config/pa/openbsd.h
+@@ -0,0 +1,194 @@
++/* Configuration file for an hppa risc OpenBSD target.
++
++ Copyright (C) 1999 Free Software Foundation, Inc.
++
++This file is part of GNU CC.
++
++GNU CC is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 2, or (at your option)
++any later version.
++
++GNU CC is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with GNU CC; see the file COPYING. If not, write to
++the Free Software Foundation, 59 Temple Place - Suite 330,
++Boston, MA 02111-1307, USA. */
++
++
++#define OBSD_HAS_DECLARE_FUNCTION_NAME
++#define OBSD_HAS_DECLARE_FUNCTION_SIZE
++#define OBSD_HAS_DECLARE_OBJECT
++
++/* Turn off various SOM crap we don't want. */
++#undef TARGET_ELF32
++#define TARGET_ELF32 1
++
++#undef MAX_OFILE_ALIGNMENT
++#define MAX_OFILE_ALIGNMENT 0x8000
++
++/* Run-time target specifications. */
++#undef TARGET_OS_CPP_BUILTINS
++#define TARGET_OS_CPP_BUILTINS() \
++ do \
++{ \
++ OPENBSD_OS_CPP_BUILTINS_ELF(); \
++} \
++ while (0)
++
++/* We don't use profile counters. */
++#define NO_DEFERRED_PROFILE_COUNTERS 1
++
++/* Define the strings used for the special svr4 .type and .size directives.
++ These strings generally do not vary from one system running svr4 to
++ another, but if a given system (e.g. m88k running svr) needs to use
++ different pseudo-op names for these, they may be overridden in the
++ file which includes this one. */
++
++#undef STRING_ASM_OP
++#define STRING_ASM_OP "\t.stringz\t"
++
++#define TEXT_SECTION_ASM_OP "\t.text"
++#define DATA_SECTION_ASM_OP "\t.data"
++#define BSS_SECTION_ASM_OP "\t.section\t.bss"
++
++/* We want local labels to start with period if made with asm_fprintf. */
++#undef LOCAL_LABEL_PREFIX
++#define LOCAL_LABEL_PREFIX "."
++
++/* Define these to generate the Linux/ELF/SysV style of internal
++ labels all the time - i.e. to be compatible with
++ ASM_GENERATE_INTERNAL_LABEL in . Compare these with the
++ ones in pa.h and note the lack of dollar signs in these. FIXME:
++ shouldn't we fix pa.h to use ASM_GENERATE_INTERNAL_LABEL instead? */
++
++#undef
Re: Update: devel/py-pip 9.0.3 -> 19.0.3
On 2019 Mar 31 (Sun) at 15:10:47 -0400 (-0400), Kurt Mosiejczuk wrote:
:On Tue, Mar 19, 2019 at 09:01:53PM -0400, Kurt Mosiejczuk wrote:
:> This updates devel/py-pip from 9.0.3 all the way up to the current
:> 19.0.3.
:
:> I saw on a previous attempt it was suggested by danj@ to skip bundling
:> the documentation, so I did that. The decision was helped by the fact
:> that making the documentation as it was meant needing a pip more
:> current than we had to build the new pip. This also means the py-sphinx
:> BUILD_DEPENDS can go away.
:
:> I did a couple installs and uninstalls and it seems to behave fine.
:> I worked through building devel/py-wbem (both 2 and 3 flavors) and
:> net/napalm/py-napalm. All built fine.
:
:> I ran tests for devel/py-setuptools_scm (both flavors). There is one
:> additional failure test for py-setuptools_scm that seems to be due to
:> our ancient version of py-setuptools_scm calling pip in an obsolete way.
:> (a newer version changes how the test is done. Doing the newer version
:> of the test by hand works. I'd patch it, but I'll probably try tackling
:> the new version of py-setuptools_SCM soon).
:
:> I tried repeatedly to run tests for sysutils/salt. It kept trying to
:> build things rather than install the packages. I finally got it to
:> try and run the tests, and they don't work. But, those tests don't
:> work with the old version of pip either.
:
:ping
:
:--Kurt
:
OK
:Index: Makefile
:===
:RCS file: /cvs/ports/devel/py-pip/Makefile,v
:retrieving revision 1.31
:diff -u -p -r1.31 Makefile
:--- Makefile 4 Apr 2018 20:04:56 - 1.31
:+++ Makefile 20 Mar 2019 00:57:10 -
:@@ -1,8 +1,8 @@
: # $OpenBSD: Makefile,v 1.31 2018/04/04 20:04:56 danj Exp $
:
:-COMMENT = Python easy_install replacement
:+COMMENT = Tool for installing Python packages
:
:-MODPY_EGG_VERSION = 9.0.3
:+MODPY_EGG_VERSION = 19.0.3
: DISTNAME =pip-${MODPY_EGG_VERSION}
: PKGNAME = py-${DISTNAME}
: CATEGORIES = devel
:@@ -17,23 +17,10 @@ MODULES = lang/python
: MODPY_PI =Yes
: MODPY_SETUPTOOLS =Yes
:
:-BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
:-
: FLAVORS = python3
: FLAVOR ?=
:
: # No test suites in pypi tarball
: NO_TEST = Yes
:-
:-DOCSRC = ${WRKSRC}/docs
:-post-build:
:- cd ${DOCSRC} && PYTHONPATH=${WRKSRC} \
:- ${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N .
_build/html
:-
:-DOCS =${PREFIX}/share/doc/${MODPY_PY_PREFIX}pip
:-
:-post-install:
:- ${INSTALL_DATA_DIR} ${DOCS}
:- cd ${DOCSRC}/_build/html && pax -rw * ${DOCS}
:
: .include
:Index: distinfo
:===
:RCS file: /cvs/ports/devel/py-pip/distinfo,v
:retrieving revision 1.16
:diff -u -p -r1.16 distinfo
:--- distinfo 4 Apr 2018 20:04:56 - 1.16
:+++ distinfo 20 Mar 2019 00:57:10 -
:@@ -1,2 +1,2 @@
:-SHA256 (pip-9.0.3.tar.gz) = e/SPmmk74dWPSfevfgrp/in9ZxzeilXm7co1gcTvV5Y=
:-SIZE (pip-9.0.3.tar.gz) = 1343076
:+SHA256 (pip-19.0.3.tar.gz) = bm8Zehq/tFEY27h4tchZoO290z/SUBALwBW2f97UufI=
:+SIZE (pip-19.0.3.tar.gz) = 1324617
:Index: patches/patch-docs_conf_py
:===
:RCS file: patches/patch-docs_conf_py
:diff -N patches/patch-docs_conf_py
:--- patches/patch-docs_conf_py 16 Apr 2016 19:06:26 - 1.1
:+++ /dev/null 1 Jan 1970 00:00:00 -
:@@ -1,15 +0,0 @@
:-$OpenBSD: patch-docs_conf_py,v 1.1 2016/04/16 19:06:26 shadchin Exp $
:-
:-Prevent build from calling out to the internet.
:-
: docs/conf.py.orig Fri Apr 15 21:02:46 2016
:-+++ docs/conf.py Fri Apr 15 21:02:54 2016
:-@@ -27,7 +27,7 @@ sys.path.insert(0, os.path.abspath(os.pardir))
:- # Add any Sphinx extension module names here, as strings. They can be
:- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
:- # extensions = ['sphinx.ext.autodoc']
:--extensions = ['sphinx.ext.extlinks', 'docs.pipext', 'sphinx.ext.intersphinx']
:-+extensions = ['sphinx.ext.extlinks', 'docs.pipext']
:-
:- # intersphinx
:- intersphinx_cache_limit = 0
:Index: patches/patch-docs_html_conf_py
:===
:RCS file: patches/patch-docs_html_conf_py
:diff -N patches/patch-docs_html_conf_py
:--- /dev/null 1 Jan 1970 00:00:00 -
:+++ patches/patch-docs_html_conf_py20 Mar 2019 00:57:10 -
:@@ -0,0 +1,16 @@
:+$OpenBSD$
:+
:+Prevent build from calling out to the internet.
:+
:+Index: docs/html/conf.py
:+--- docs/html/conf.py.orig
: docs/html/conf.py
:+@@ -30,7 +30,7 @@ sys.path.insert(0, docs_dir)
:+ # Add any Sphinx extension module names here, as strings. They can be
:+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
:+ # extensions = ['sphinx.ext.autodoc']
:+-extensions =
Re: Update: devel/py-setuptools_scm 2.0.0 -> 3.2.0
On 2019 Mar 31 (Sun) at 15:04:43 -0400 (-0400), Kurt Mosiejczuk wrote:
:On Wed, Mar 20, 2019 at 07:56:09PM -0400, Kurt Mosiejczuk wrote:
:> Update for py-setuptools_scm. I pulled the rm since it breaks the
:> tests with this new version. While here, I converted this to use
:> MODPY_PYTEST so got rid of the py-test TEST_DEPENDS and the do-test
:> target redefinition.
:
:> I ran through builds of all of the consumers that list it in .
:> BUILD_DEPENDS No issues.
:
:Ping.
:
:--Kurt
OK
:
:Index: Makefile
:===
:RCS file: /cvs/ports/devel/py-setuptools_scm/Makefile,v
:retrieving revision 1.9
:diff -u -p -r1.9 Makefile
:--- Makefile 28 Apr 2018 10:45:08 - 1.9
:+++ Makefile 20 Mar 2019 02:32:16 -
:@@ -2,7 +2,7 @@
:
: COMMENT = plugin to manage your versions by scm tags
:
:-MODPY_EGG_VERSION = 2.0.0
:+MODPY_EGG_VERSION = 3.2.0
: DISTNAME =setuptools_scm-${MODPY_EGG_VERSION}
: PKGNAME = py-${DISTNAME}
: CATEGORIES = devel
:@@ -16,17 +16,15 @@ MODULES = lang/python
:
: TEST_DEPENDS =devel/git \
: devel/mercurial \
:- devel/py-pip${MODPY_FLAVOR} \
:- devel/py-test${MODPY_FLAVOR}
:+ devel/py-pip${MODPY_FLAVOR}
:
: MODPY_PI =Yes
: MODPY_SETUPTOOLS =Yes
:+MODPY_PYTEST =Yes
:
: FLAVORS = python3
: FLAVOR ?=
:
:-do-test:
:- @rm ${WRKSRC}/testing/test_setuptools_support.py
:- cd ${WRKSRC} && ${MODPY_BIN} -m pytest
:+TEST_DEPENDS =${FULLPKGNAME}:${FULLPKGPATH}
:
: .include
:Index: distinfo
:===
:RCS file: /cvs/ports/devel/py-setuptools_scm/distinfo,v
:retrieving revision 1.8
:diff -u -p -r1.8 distinfo
:--- distinfo 28 Apr 2018 10:45:08 - 1.8
:+++ distinfo 20 Mar 2019 02:32:16 -
:@@ -1,2 +1,2 @@
:-SHA256 (setuptools_scm-2.0.0.tar.gz) =
Y4YnZV7EYlt6BVpbZfROiBIfzgWigaFZer1qn4wEE5s=
:-SIZE (setuptools_scm-2.0.0.tar.gz) = 30286
:+SHA256 (setuptools_scm-3.2.0.tar.gz) =
UqtHcV+g/H2ObNFRaNGmm6mV/rFQUTHD6BTrcIe1c1g=
:+SIZE (setuptools_scm-3.2.0.tar.gz) = 39646
:Index: pkg/PLIST
:===
:RCS file: /cvs/ports/devel/py-setuptools_scm/pkg/PLIST,v
:retrieving revision 1.2
:diff -u -p -r1.2 PLIST
:--- pkg/PLIST 28 Apr 2018 10:45:08 - 1.2
:+++ pkg/PLIST 20 Mar 2019 02:32:16 -
:@@ -14,14 +14,22 @@ lib/python${MODPY_VERSION}/site-packages
:
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}/
:
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
:+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}discover.${MODPY_PYC_MAGIC_TAG}pyc
:+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}file_finder.${MODPY_PYC_MAGIC_TAG}pyc
:+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}file_finder_git.${MODPY_PYC_MAGIC_TAG}pyc
:+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}file_finder_hg.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}hacks.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}hg.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}integration.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
:+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/config.py
: lib/python${MODPY_VERSION}/site-packages/setuptools_scm/discover.py
:+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/file_finder.py
:+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/file_finder_git.py
:+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/file_finder_hg.py
: lib/python${MODPY_VERSION}/site-packages/setuptools_scm/git.py
: lib/python${MODPY_VERSION}/site-packages/setuptools_scm/hacks.py
: lib/python${MODPY_VERSION}/site-packages/setuptools_scm/hg.py
:
--
Serving coffee on aircraft causes turbulence.
Re: Update: devel/py-setuptools 40.0.0v0 -> 41.0.0v0
OK
On 2019 Apr 08 (Mon) at 00:11:59 -0400 (-0400), Kurt Mosiejczuk wrote:
:Obviously, this is for after unlock, but I figured i'd continue my
:work updating py-test and supporting infrastructure.
:
:I cleaned up the S/c/./ in PKGNAME that hasn't been needed since really
:early days. Sure, it didn't hurt, but it didn't do anything and is confusing.
:
:setuptools actually has support for pytest, so I added MODPY_PYTEST.
:It errors out on a number of tests but passes most. This was also true
:of the existing 40.0.0 if you ran the tests by hand. So, I have pulled
:out the NO_TEST.
:
:I've tried about a dozen or so python ports and found no issues. The
:CHANGES.rst doesn't really cover anything that would hurt us either.
:I'd love to see other folks hammer on this a bit to be sure.
:
:While I'm here, I figure I'll take maintainer unless someone has an
:objection.
:
:--Kurt
:
:Index: Makefile
:===
:RCS file: /cvs/ports/devel/py-setuptools/Makefile,v
:retrieving revision 1.32
:diff -u -p -r1.32 Makefile
:--- Makefile 30 Jul 2018 08:15:30 - 1.32
:+++ Makefile 8 Apr 2019 04:10:33 -
:@@ -2,9 +2,9 @@
:
: COMMENT= simplified packaging system for Python modules
:
:-MODPY_EGG_VERSION=40.0.0
:+MODPY_EGG_VERSION=41.0.0
: DISTNAME= setuptools-${MODPY_EGG_VERSION}
:-PKGNAME= py-${DISTNAME:S/c/./}
:+PKGNAME= py-${DISTNAME}
: EPOCH=0
: CATEGORIES= devel
: PKG_ARCH= *
:@@ -12,6 +12,8 @@ EXTRACT_SUFX=.zip
:
: HOMEPAGE= https://setuptools.readthedocs.io/en/latest/
:
:+MAINTAINER= Kurt Mosiejczuk
:+
: # MIT
: PERMIT_PACKAGE_CDROM= Yes
:
:@@ -19,13 +21,12 @@ MODULES= lang/python
:
: MODPY_PI= Yes
: MODPY_SETUPTOOLS= Yes
:+MODPY_PYTEST= Yes
:
: FLAVORS = python3
: FLAVOR ?=
:
: # Override automatic py-setuptools depend to avoid recursion
: MODPY_SETUPUTILS_DEPEND=
:-
:-NO_TEST = Yes
:
: .include
:Index: distinfo
:===
:RCS file: /cvs/ports/devel/py-setuptools/distinfo,v
:retrieving revision 1.13
:diff -u -p -r1.13 distinfo
:--- distinfo 30 Jul 2018 08:15:30 - 1.13
:+++ distinfo 8 Apr 2019 04:10:33 -
:@@ -1,2 +1,2 @@
:-SHA256 (setuptools-40.0.0.zip) = ASrbjiX7/WTGUumee6tYeZo6rwXTmrOFYfaRkKkJAV8=
:-SIZE (setuptools-40.0.0.zip) = 849857
:+SHA256 (setuptools-41.0.0.zip) = edMCVLb+eo5nLkPNhfE6nz8qUAgLyB2FEUPiIZ7w3LE=
:+SIZE (setuptools-41.0.0.zip) = 848208
:Index: patches/patch-setup_py
:===
:RCS file: /cvs/ports/devel/py-setuptools/patches/patch-setup_py,v
:retrieving revision 1.6
:diff -u -p -r1.6 patch-setup_py
:--- patches/patch-setup_py 24 Apr 2018 09:40:26 - 1.6
:+++ patches/patch-setup_py 8 Apr 2019 04:10:33 -
:@@ -11,7 +11,7 @@ Index: setup.py
: not in ("", "0", "false", "no")
: )
:
:-@@ -107,7 +107,7 @@ setup_params = dict(
:+@@ -106,7 +106,7 @@ setup_params = dict(
: packages=setuptools.find_packages(exclude=['*.tests']),
: package_data=package_data,
: py_modules=['easy_install'],
:Index: pkg/PLIST
:===
:RCS file: /cvs/ports/devel/py-setuptools/pkg/PLIST,v
:retrieving revision 1.12
:diff -u -p -r1.12 PLIST
:--- pkg/PLIST 24 Apr 2018 09:40:26 - 1.12
:+++ pkg/PLIST 8 Apr 2019 04:10:33 -
:@@ -58,6 +58,7 @@ lib/python${MODPY_VERSION}/site-packages
: lib/python${MODPY_VERSION}/site-packages/setuptools/__init__.py
:
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}/
:
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
:+lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}_deprecation_warning.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}archive_util.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}build_meta.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
:@@ -77,7 +78,6 @@ lib/python${MODPY_VERSION}/site-packages
:
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}py27compat.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}py31compat.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}py33compat.${MODPY_PYC_MAGIC_TAG}pyc
:-lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}py36compat.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}sandbox.${MODPY_PYC_MAGIC_TAG}pyc
:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 10:43:54 Modified files: lang/seed7 : Makefile Log message: Remove BROKEN-hppa; it builds fine
Re: Update: py-test 3.5.0 -> 4.4.0 - py-hypothesis 3.55.1 -> 4.15.0 - py-pluggy 0.6.0 -> 0.9.0
OK for all three.
On 2019 Apr 11 (Thu) at 00:46:16 -0400 (-0400), Kurt Mosiejczuk wrote:
:I'm including 3 updates at once because each of these ends up depending
:on one or both of the other updates for testing or other purposes.
:
:devel/py-test 3.5.0 -> 4.4.0
:devel/py-hypothesis3.55.1 -> 4.15.0
:devel/py-pluggy0.6.0 -> 0.9.0
:
:I've found that having py-test-benchmark installed will make a number
:of the tests for py-test fail. Presumably once py-test-benchmark gets
:updated that will go away. That will be later though.
:
:I've run tests on a number of ports with flying colors so far. I'm sure
:we can find one or two that don't pass as many tests since some of the
:py-test plugins still need updating.
:
:It should be easier updating the others with this base of 3 in place.
:
:Obviously, this is all for post-unlock.
:
:cc shadchin
:
:--Kurt
:Index: Makefile
:===
:RCS file: /cvs/ports/devel/py-test/Makefile,v
:retrieving revision 1.30
:diff -u -p -r1.30 Makefile
:--- Makefile 28 Apr 2018 10:47:05 - 1.30
:+++ Makefile 8 Apr 2019 06:02:27 -
:@@ -2,13 +2,13 @@
:
: COMMENT= cross-project testing tool for Python
:
:-MODPY_EGG_VERSION=3.5.0
:+MODPY_EGG_VERSION = 4.4.0
: DISTNAME= pytest-${MODPY_EGG_VERSION}
: PKGNAME= py-test-${MODPY_EGG_VERSION}
:
: CATEGORIES= devel
:
:-HOMEPAGE= http://pytest.org/latest/
:+HOMEPAGE =https://docs.pytest.org/en/latest/
:
: MAINTAINER= Alexandr Shadchin
:
:@@ -18,29 +18,38 @@ PERMIT_PACKAGE_CDROM= Yes
: MODULES= lang/python
:
: MODPY_PI =Yes
:-MODPY_SETUPTOOLS= Yes
:+MODPY_SETUPTOOLS =Yes
:+MODPY_PYTEST =Yes
:+MODPY_PYTEST_ARGS = testing
:
: FLAVORS= python3
: FLAVOR?=
:
:-BUILD_DEPENDS=devel/py-setuptools_scm${MODPY_FLAVOR}
:+BUILD_DEPENDS = devel/py-setuptools_scm${MODPY_FLAVOR}
:
:-RUN_DEPENDS= devel/py-attrs${MODPY_FLAVOR}>=17.4.0 \
:+RUN_DEPENDS = devel/py-attrs${MODPY_FLAVOR}>=17.4.0 \
: devel/py-more-itertools${MODPY_FLAVOR} \
:- devel/py-pluggy${MODPY_FLAVOR}>=0.6 \
:- devel/py-py${MODPY_FLAVOR}>=1.5.0 \
:+ devel/py-pluggy${MODPY_FLAVOR}>=0.9 \
:+ devel/py-py${MODPY_FLAVOR} \
: devel/py-setuptools${MODPY_FLAVOR} \
:- devel/py-six${MODPY_FLAVOR}>=1.10.0
:+ devel/py-six${MODPY_FLAVOR}
: .if !${FLAVOR:Mpython3}
: RUN_DEPENDS +=devel/py-funcsigs
: .endif
:
:-TEST_DEPENDS= ${RUN_DEPENDS} \
:+TEST_DEPENDS =${FULLPKGNAME}:${FULLPKGPATH} \
:+ ${RUN_DEPENDS} \
: devel/py-hypothesis${MODPY_FLAVOR} \
: devel/py-mock${MODPY_FLAVOR} \
: devel/py-nose${MODPY_FLAVOR} \
: shells/bash \
: www/py-requests${MODPY_FLAVOR}
:+.if !${FLAVOR:Mpython3}
:+TEST_DEPENDS += devel/py-pathlib2 \
:+ sysutils/py-scandir
:+.endif
:+
:+
:
: post-install:
: mv ${PREFIX}/bin/py.test{,${MODPY_BIN_SUFFIX}}
:Index: distinfo
:===
:RCS file: /cvs/ports/devel/py-test/distinfo,v
:retrieving revision 1.17
:diff -u -p -r1.17 distinfo
:--- distinfo 28 Apr 2018 10:47:05 - 1.17
:+++ distinfo 8 Apr 2019 06:02:27 -
:@@ -1,2 +1,2 @@
:-SHA256 (pytest-3.5.0.tar.gz) = +uSR0YdPGZU3/VhyteHw50oAm5ed+dU9FVP9A9oXA+E=
:-SIZE (pytest-3.5.0.tar.gz) = 830816
:+SHA256 (pytest-4.4.0.tar.gz) = 8h0vH7ggCDDcu12OxGapyRIOINi1PHWF0YASXM4dKXo=
:+SIZE (pytest-4.4.0.tar.gz) = 931197
:Index: pkg/PLIST
:===
:RCS file: /cvs/ports/devel/py-test/pkg/PLIST,v
:retrieving revision 1.9
:diff -u -p -r1.9 PLIST
:--- pkg/PLIST 28 Apr 2018 10:47:05 - 1.9
:+++ pkg/PLIST 8 Apr 2019 06:02:27 -
:@@ -11,7 +11,6 @@ lib/python${MODPY_VERSION}/site-packages
:
lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}cacheprovider.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
:-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}debugging.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}deprecated.${MODPY_PYC_MAGIC_TAG}pyc
:
lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}doctest.${MODPY_PYC_MAGIC_TAG}pyc
:@@ -27,18 +26,22 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 10:40:59 Modified files: devel/libowfat : Makefile Log message: Remove BROKEN-hppa; it builds fine there ok gsoares@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2019/04/15 10:38:37 Modified files: audio/tracker : Makefile audio/tracker/patches: patch-Modules_Pro_effects_c Log message: while playing with my code, I found an obvious thinko. Modules that use arpeggio should sound much better
Re: update: games/stone-soup to 0.23.2
Post-unlock bump. Thanks in advance for guidance/critique of my choices
Evan Silberman wrote:
> I took a stab at updating the port for Dungeon Crawl Stone Soup
> (games/stone-soup). A couple things worth mentioning about my attached
> attempt:
>
> The existing patch to upstream's Makefile to replace hardocded "5.1"s with
> MODLUA_DEP_VERSION didn't seem necessary; the build system tries its best to
> find an installed lua 5.1 and OpenBSD's is picked up. Lua 5.2 and 5.3 are
> evidently not supported so I don't think finagling the port module into
> upstream's build tool buys flexibility or safety.
>
> The build now requires python and py-yaml to generate a header from some data
> files; I've added lang/python to MODULES and textproc/py-yaml to the build
> deps, and taken advantage of the shebang-adjustment hook. python2.7 and
> python3.6, with matching textproc/py-yaml, both run the script in question
> just fine, so the port builds with either supported MODPY_VERSION.
>
> The default (tiles) flavor and the no_x11 flavor both build on amd64, are
> playable, can read one another's saves, etc. I'll have to leave it to a
> better roguelike player to test that the whole game is playable.
>
Index: Makefile
===
RCS file: /cvs/ports/games/stone-soup/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile27 Jun 2018 21:03:49 - 1.34
+++ Makefile4 Apr 2019 06:18:38 -
@@ -7,11 +7,10 @@ CATEGORIES = games
HOMEPAGE = http://crawl.develz.org/
MASTER_SITES = https://crawl.develz.org/release/${VERSION:R}/
-VERSION = 0.18.1
+VERSION = 0.23.2
DISTNAME= stone_soup-${VERSION}-nodeps
EXTRACT_SUFX= .tar.xz
PKGNAME= stone-soup-${VERSION}
-REVISION= 1
WRKDIST = ${WRKDIR}/stone_soup-${VERSION}
WRKSRC = ${WRKDIST}/source
@@ -29,13 +28,19 @@ MAKE_FLAGS =CC="${CC}" GCC="${GCC}" GX
SAVEDIR="~/.crawl" \
NO_YACC=1 V=1
-MAKE_ENV +=MODLUA_DEP_VERSION=${MODLUA_DEP_VERSION}
COMPILER = base-clang ports-gcc
-MODULES = lang/lua
+MODULES = lang/python \
+ lang/lua
MODLUA_VERSION = 5.1
WANTLIB = c m ${MODLUA_WANTLIB} sqlite3 ${COMPILER_LIBCXX}
-BUILD_DEPENDS = graphics/pngcrush
+MODPY_RUN_DEPENDS =No
+CONFIGURE_STYLE = none
+MODPY_ADJ_FILES = util/species-gen.py
+
+BUILD_DEPENDS = graphics/pngcrush \
+ textproc/py-yaml${MODPY_FLAVOR}
+
LIB_DEPENDS = databases/sqlite3
# License GPLv2+
Index: distinfo
===
RCS file: /cvs/ports/games/stone-soup/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo1 Oct 2016 12:56:54 - 1.5
+++ distinfo4 Apr 2019 06:18:38 -
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.18.1-nodeps.tar.xz) =
S9rXd4+IqZRwxyX/dKgUW91gAy+a5Izll/dLiueE2FA=
-SIZE (stone_soup-0.18.1-nodeps.tar.xz) = 9716104
+SHA256 (stone_soup-0.23.2-nodeps.tar.xz) =
KgCWIZX1t6TC+9H8XvWX7rfgT6C576RxrggZCDEEgcM=
+SIZE (stone_soup-0.23.2-nodeps.tar.xz) = 11046032
Index: patches/patch-source_Makefile
===
RCS file: /cvs/ports/games/stone-soup/patches/patch-source_Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-source_Makefile
--- patches/patch-source_Makefile 27 May 2017 16:41:41 - 1.4
+++ patches/patch-source_Makefile 4 Apr 2019 06:18:38 -
@@ -14,10 +14,10 @@ Index: source/Makefile
STRIP := strip -x
@@ -325,11 +322,8 @@ endif
#
- ifndef NO_APPLE_GCC
+ ifndef NO_APPLE_PLATFORM
ifeq ($(uname_S),Darwin)
-ifneq ($(shell gcc -v 2>&1 | grep Apple),)
--APPLE_GCC = YesPlease
+-APPLE_PLATFORM = YesPlease
endif
endif
-endif
@@ -40,39 +40,6 @@ Index: source/Makefile
ifneq ($(FORCE_CC),)
GCC := $(FORCE_CC)
-@@ -639,9 +625,9 @@ ifndef BUILD_LUA
- BUILD_LUA = yes
- endif
- else
--ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),)
-- ifneq ($(shell $(PKGCONFIG) lua-5.1 --exists || echo no),)
--ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),)
-+ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),)
-+ ifneq ($(shell $(PKGCONFIG) lua${MODLUA_DEP_VERSION} --exists || echo
no),)
-+ifneq ($(shell $(PKGCONFIG) lua${MODLUA_DEP_VERSION} --exists || echo
no),)
- BUILD_LUA = yes
- else
- ifeq ($(shell $(PKGCONFIG) lua --modversion | head -c 3),5.1)
-@@ -651,16 +637,16 @@ ifndef BUILD_LUA
- endif
- endif
- else
--LUA_PACKAGE = lua-5.1
-+LUA_PACKAGE = lua${MODLUA_DEP_VERSION}
- endif
- else
-- LUA_PACKAGE = lua5.1
-+ LUA_PACKAGE = lua${MODLUA_DEP_VERSION}
- endif
- endif
- endif
- ifndef BUILD_LUA
- ifndef LUA_PACKAGE
--LUA_PACKAGE = lua5.1
-+LUA_PACKAGE = lua${MODLUA_DEP_VERSION}
- endif
- INCLUDES_L += $(shell
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 10:34:21 Modified files: devel/sdl2 : Makefile Log message: Add CONFIGURE_ARGS+=--disable-atomic just for hppa to unbreak there. ok thfr@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2019/04/15 10:30:52 Modified files: graphics/drawpile: Makefile distinfo graphics/drawpile/pkg: PLIST Log message: Update to drawpile-2.1.7 Changelog: https://drawpile.net/news/release-2.1.6/ Changelog: https://drawpile.net/news/release-2.1.7/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2019/04/15 10:18:54 Modified files: converters/p5-Sereal-Decoder: Makefile distinfo Log message: Update p5-Sereal-Decoder to 4.007.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2019/04/15 10:17:16 Modified files: converters/p5-Sereal-Encoder: Makefile distinfo Log message: Update p5-Sereal-Encoder to 4.007.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2019/04/15 10:10:22 Modified files: devel/jd-gui : Makefile distinfo Log message: update jd-gui to 1.4.2.
Ports tree unlocked
The 6.5 release package builds are running; the fast architectures have already finished. Time to move on. The ports tree is UNLOCKED again. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: [ports-gcc-8] Unbreak net/{lib,r}torrent
On 2019/04/15 16:48, Charlene Wendling wrote:
>
> Take 2, as i've already worked on it when ports-gcc-6 was out.
>
> > error: struct std::tr1::array has no member
> > named fill
>
> There is already a set of patches to fix these issues. It was limited
> to clang so far, i removed this limitation. I've also removed the
> sparc64 workarounds as they are not needed anymore nowadays [0],
> it uses ports-gcc.
> -.if ${PROPERTIES:Mclang}
> +CXXFLAGS += -std=c++11
> +# some patches involve the tr1 stuff
> +PATCH_LIST = patch-* clangpatch-*
> +
As this is now unconditional, please merge the clangpatch-* files into
the main patch-* and get rid of PATCH_LIST.
[ports-gcc-8] Unbreak net/{lib,r}torrent
Take 2, as i've already worked on it when ports-gcc-6 was out.
> error: struct std::tr1::array has no member
> named fill
There is already a set of patches to fix these issues. It was limited
to clang so far, i removed this limitation. I've also removed the
sparc64 workarounds as they are not needed anymore nowadays [0],
it uses ports-gcc.
This allows building libtorrent and rtorrent on macppc with ports-gcc-8.
I'm not sure it would work with ports-gcc-4.9 and will wait until
gcc-8 becomes officially the new ports-gcc to commit it if i
have no feedback on this.
Charlène.
[0] https://github.com/rakshasa/rtorrent/issues/28#issuecomment-3754215
Index: Makefile
===
RCS file: /cvs/ports/net/rtorrent/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile24 Oct 2018 14:28:09 - 1.63
+++ Makefile15 Apr 2019 14:02:19 -
@@ -3,7 +3,7 @@
COMMENT= ncurses BitTorrent client based on libTorrent
DISTNAME= rtorrent-0.9.6
-REVISION= 5
+REVISION= 6
EPOCH= 0
CATEGORIES=net
@@ -21,13 +21,6 @@ COMPILER = base-clang ports-gcc base-gc
MASTER_SITES= https://rtorrent.net/downloads/
-MODULES= gcc4
-
-# SIGBUS during startup on sparc64 when built using gcc 4.2.1
-# https://github.com/rakshasa/rtorrent/issues/28
-MODGCC4_ARCHS= sparc64
-MODGCC4_LANGS= c++
-
BUILD_DEPENDS= devel/cppunit
LIB_DEPENDS= net/libtorrent>=0.13.4 \
net/curl
@@ -37,18 +30,17 @@ AUTOCONF_VERSION= 2.69
CONFIGURE_ENV += LDFLAGS=-pthread
CONFIGURE_ARGS=--disable-debug
+CXXFLAGS +=-std=c++11
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rtorrent
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rtorrent
${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc \
${PREFIX}/share/examples/rtorrent/rtorrent.rc
-.include
-.if ${PROPERTIES:Mclang}
# this patches *only* files containing tr1 to no longer refer to tr1
# we do it pre-patch, because autoconf passes right after us
pre-patch:
find ${WRKDIST} -type f|xargs fgrep -lw tr1|xargs sed -i.bak -e
's,
Index: Makefile
===
RCS file: /cvs/ports/net/libtorrent/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile11 Jan 2019 18:04:21 - 1.57
+++ Makefile15 Apr 2019 14:02:05 -
@@ -10,7 +10,7 @@ NOT_FOR_ARCHS=${GCC3_ARCHS}
DISTNAME= libtorrent-0.13.6
EPOCH= 0
-REVISION= 5
+REVISION= 6
SHARED_LIBS += torrent 22.1# .18.0
CATEGORIES=net devel
@@ -37,14 +37,12 @@ CONFIGURE_ARGS= --enable-static \
--disable-mincore \
--disable-debug
-.include
-.if ${PROPERTIES:Mclang}
+CXXFLAGS +=-std=c++11
+# some patches involve the tr1 stuff
+PATCH_LIST = patch-* clangpatch-*
+
# this patches *only* files containing tr1 to no longer refer to tr1
# we do it pre-patch, because autoconf passes right after us
pre-patch:
find ${WRKDIST} -type f|xargs fgrep -lw tr1|xargs sed -i.bak -e
's,
[ports-gcc-8 macppc / arm] Fix net/psi
> base64/base64.cpp:65:2: error: narrowing conversion of '-1' from
> "'int' to 'char' inside { } [-Wnarrowing]"
Really gcc-8 is better at finding narrowing errors. It looks like
clang hasn't spotted it as it packages on aarch64. It's similar to the
games/spacehulk issue i had earlier.
I've fixed the code, and moved HOMEPAGE to https while here. It works
fine on macppc.
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/net/psi/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile21 Jan 2019 20:55:38 - 1.31
+++ Makefile15 Apr 2019 14:19:18 -
@@ -3,10 +3,10 @@
COMMENT= multiplatform Jabber client
DISTNAME= psi-0.15
-REVISION= 10
+REVISION= 11
CATEGORIES=net
-HOMEPAGE= http://psi-im.org/
+HOMEPAGE= https://psi-im.org/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/}
EXTRACT_SUFX= .tar.bz2
Index: patches/patch-iris_src_xmpp_base64_base64_cpp
===
RCS file: patches/patch-iris_src_xmpp_base64_base64_cpp
diff -N patches/patch-iris_src_xmpp_base64_base64_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-iris_src_xmpp_base64_base64_cpp 15 Apr 2019 14:19:18
-
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+ppc, arm: char is unsigned by default, fix narrowing on these platforms
+
+Index: iris/src/xmpp/base64/base64.cpp
+--- iris/src/xmpp/base64/base64.cpp.orig
iris/src/xmpp/base64/base64.cpp
+@@ -45,7 +45,7 @@ QByteArray Base64::decode(const QString& input)
+ // 64 specifies eof
+ // everything else specifies data
+
+- char tbl[] = {
++ signed char tbl[] = {
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
build ti-msp430gcc with clang [Re: base-gcc only ports need to be fixed]
On 2019/04/14 22:26, Christian Weisgerber wrote:
> By my count there remain five ports than can ONLY be built with
> base-gcc:
>
> audio/festival/core
> devel/ti-msp430gcc
> editors/TeXmacs
> multimedia/avidemux
> sysutils/firmware/vmm
>
> These ports are living on borrowed time. base-gcc WILL go away,
> and possibly sooner than you think, so they will need to move to
> clang or ports-gcc or they will die.
>
> --
> Christian "naddy" Weisgerber na...@mips.inka.de
>
This unbreaks ti-msp430gcc.
Index: Makefile
===
RCS file: /cvs/ports/devel/ti-msp430gcc/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile29 Sep 2017 16:48:50 - 1.13
+++ Makefile15 Apr 2019 14:23:41 -
@@ -1,13 +1,11 @@
# $OpenBSD: Makefile,v 1.13 2017/09/29 16:48:50 jca Exp $
BROKEN-alpha = relocation truncated to fit: GPRELHIGH against symbol
default_target_hard_regs
-# XXX base clang says: /usr/include/c++/v1/exception:267:5: error: no member
named 'fancy_abort' in namespace 'std::__1'; did you mean simply 'fancy_abort'?
-COMPILER = base-gcc
COMMENT = TI's open source compiler for MSP430 microcontrollers#'
V =3_03_04_00
-REVISION = 3
+REVISION = 4
PKGNAME = ti-msp430gcc-${V:S/_/./g}
GCC_V =4.9.1
CATEGORIES = devel
Index: patches/patch-sources_tools_gcc_bitmap_c
===
RCS file: patches/patch-sources_tools_gcc_bitmap_c
diff -N patches/patch-sources_tools_gcc_bitmap_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sources_tools_gcc_bitmap_c15 Apr 2019 14:23:41 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+clang fix
+
+Index: sources/tools/gcc/bitmap.c
+--- sources/tools/gcc/bitmap.c.orig
sources/tools/gcc/bitmap.c
+@@ -2166,9 +2166,9 @@ print_statistics (bitmap_descriptor_d **slot, output_i
+ s[41] = 0;
+ fprintf (stderr,
+ "%-41s %9u"
+- " %15"HOST_WIDEST_INT_PRINT"d %15"HOST_WIDEST_INT_PRINT"d"
+- " %15"HOST_WIDEST_INT_PRINT"d"
+- " %10"HOST_WIDEST_INT_PRINT"d %10"HOST_WIDEST_INT_PRINT"d\n",
++ " %15" HOST_WIDEST_INT_PRINT "d %15" HOST_WIDEST_INT_PRINT "d"
++ " %15" HOST_WIDEST_INT_PRINT "d"
++ " %10" HOST_WIDEST_INT_PRINT "d %10" HOST_WIDEST_INT_PRINT "d\n",
+ s, d->created,
+ d->allocated, d->peak, d->current,
+ d->nsearches, d->search_iter);
+@@ -2201,7 +2201,7 @@ dump_bitmap_statistics (void)
+ bitmap_desc_hash.traverse ();
+ fprintf (stderr,
"-\n");
+ fprintf (stderr,
+- "%-41s %9"HOST_WIDEST_INT_PRINT"d %15"HOST_WIDEST_INT_PRINT"d\n",
++ "%-41s %9" HOST_WIDEST_INT_PRINT "d %15" HOST_WIDEST_INT_PRINT "d\n",
+ "Total", info.count, info.size);
+ fprintf (stderr,
"-\n");
+ }
Index: patches/patch-sources_tools_gcc_cgraph_c
===
RCS file: patches/patch-sources_tools_gcc_cgraph_c
diff -N patches/patch-sources_tools_gcc_cgraph_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sources_tools_gcc_cgraph_c15 Apr 2019 14:23:41 -
@@ -0,0 +1,34 @@
+$OpenBSD$
+
+clang fix
+
+Index: sources/tools/gcc/cgraph.c
+--- sources/tools/gcc/cgraph.c.orig
sources/tools/gcc/cgraph.c
+@@ -1976,7 +1976,7 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node)
+ fprintf (f, " First run: %i\n", node->tp_first_run);
+ fprintf (f, " Function flags:");
+ if (node->count)
+-fprintf (f, " executed "HOST_WIDEST_INT_PRINT_DEC"x",
++fprintf (f, " executed " HOST_WIDEST_INT_PRINT_DEC "x",
+(HOST_WIDEST_INT)node->count);
+ if (node->origin)
+ fprintf (f, " nested in: %s", node->origin->asm_name ());
+@@ -2028,7 +2028,7 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node)
+ fprintf (f, "%s/%i ", edge->caller->asm_name (),
+ edge->caller->order);
+ if (edge->count)
+- fprintf (f, "("HOST_WIDEST_INT_PRINT_DEC"x) ",
++ fprintf (f, "(" HOST_WIDEST_INT_PRINT_DEC "x) ",
+(HOST_WIDEST_INT)edge->count);
+ if (edge->frequency)
+ fprintf (f, "(%.2f per call) ",
+@@ -2055,7 +2055,7 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node)
+ if (edge->indirect_inlining_edge)
+ fprintf (f, "(indirect_inlining) ");
+ if (edge->count)
+- fprintf (f, "("HOST_WIDEST_INT_PRINT_DEC"x) ",
++ fprintf (f, "(" HOST_WIDEST_INT_PRINT_DEC "x) ",
+(HOST_WIDEST_INT)edge->count);
+ if (edge->frequency)
+ fprintf (f, "(%.2f per call) ",
Index: patches/patch-sources_tools_gcc_config_elfos_h
Re: [ports-gcc-8] Unbreak lang/erlang/*
On 2019/04/15 00:54, Charlene Wendling wrote:
>
> Erlang (all versions) doesn't package with ports-gcc-8, because:
>
> - WxWidgets is built with headers made for ports-gcc-8, with
> C++14 as the standard C++ version.
>
> - Erlang requires WxWidgets but uses base-gcc, and during
> configuration, it indeed outputs in $WRKSRC/lib/wx/config.log:
>
> "/usr/local/include/wx-3.0/wx/strvararg.h:25:27: error:"
> "type_traits: No such file or directory"
>
> AFAIK base-gcc wants
>
> - Meanwhile, it just builds without Wx, the issue appears when
> packaging, because the Wx related files are not present.
>
>
> It should have been easy if CHOSEN_COMPILER wasn't "irrelevant",
> and if we were able to define it, but it would break the build on
> clang archs.
>
> What i'm proposing here is to bypass CHOSEN_COMPILER for !clang
> arches. It unbreaks the packaging and ensures that WANTLIB is
> proper, calling egcc/++ directly seems a bit too rough though.
>
> It has been tested against Erlang 16 and 18, as my partial bulk
> is still ongoing, i don't have resources to try them all.
This mess is due to a conflict between the variable name COMPILER in
infrastructure, and the mechanism used in the Erlang ports Makefile
to substitute e.g. "compiler-7.3" with "${COMPILER}" in the plists.
It isn't passed to the erlang build, it's just done for the port.
The "COMPILER=irrelevant" thing in Makefile.inc was done as a quick
fix in the gcc/clang transition but it's confusing and gets in the way.
And with wxWidgets we *do* want to use COMPILER the way it was intended.
Rather than stacking another hack on top of the existing
"CHOSEN_COMPILER=irrelevant" one, let's just get rid of it.
There are two approaches -
- either we can just get rid of the mechanism completely (it isn't
used consistently; compare 19/pkg/PLIST-main with the others). Upside:
simple. Downside: bigger PLIST diffs between Erlang updates.
- or we can rename the variables used (prefix with E_ or something),
either just COMPILER to reduce PLIST churn, or all of them.
I'm leaning towards the first one. Builds ongoing ...
Re: base-gcc only ports need to be fixed
On 2019/04/14 22:26, Christian Weisgerber wrote: > By my count there remain five ports than can ONLY be built with > base-gcc: > > audio/festival/core I had a look at this before and I propose removing it for now. If someone wants to port a newer version it seems better to start from scratch. > devel/ti-msp430gcc I don't imagine this is particularly hard to fix. > editors/TeXmacs See rsadowski/Nam Nguyen updates. > multimedia/avidemux Like Festival it's seriously outdated. Main challenge for updating this is probably forward porting the sndio changes as things were moved around. > sysutils/firmware/vmm This is just waiting for the switch to gcc 8 in ports (I don't want to introduce a build dep conflict between this and things using gcc 4.9). This is the only one of the five that is actually built on base-clang arches, the others are knocked out already.
Re: [update] emacs-26.2
On Mon, Apr 15 2019, li...@wrant.com wrote: > Hi Jérémie, ports@, > > Please see Emacs 26.2 has been released on Apr 12th: > > https://lists.gnu.org/archive/html/emacs-devel/2019-04/msg00503.html > > The changelog features a doas method for tramp mode: > > https://www.gnu.org/software/emacs/news/NEWS.26.2 > > I don't have a build environment here no attachment. I use a wip diff on my build machines, but there's no hurry: the ports tree is locked. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: editors/TeXmacs Makefile and DESC WYSIWYG correction
On 2019/04/15 07:40, Eddie Thieda wrote:
> Hello everyone!
>
> On the TeXmacs website FAQ "question 1" states it's a
> "(what-you-see-is-what-you-get)" editor, below is the small correction.
Right on the homepage where this text was copied from, it says "GNU
TeXmacs is a free wysiwyw (what you see is what you want) editing
platform with special features for scientists"...
>
> cvs server: Diffing .
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/TeXmacs/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- Makefile1 Jul 2018 18:33:35 - 1.11
> +++ Makefile15 Apr 2019 11:36:33 -
> @@ -3,7 +3,7 @@
> # XXX base clang: lots of undefined references to Qt functions
> COMPILER= base-gcc
>
> -COMMENT= wysiwyw (what you see is what you want) editing platform
> +COMMENT= wysiwyg (what you see is what you get) editing platform
>
> DISTNAME= TeXmacs-1.99.4-src
> PKGNAME= ${DISTNAME:S/-src//}
> cvs server: Diffing patches
> cvs server: Diffing pkg
> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/editors/TeXmacs/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 DESCR
> --- pkg/DESCR 5 Apr 2016 23:30:46 - 1.1.1.1
> +++ pkg/DESCR 15 Apr 2019 11:36:33 -
> @@ -1,4 +1,4 @@
> -GNU TeXmacs is a free wysiwyw (what you see is what you want) editing
> +GNU TeXmacs is a free wysiwyg (what you see is what you get) editing
> platform with special features for scientists. The software aims
> to provide a unified and user friendly framework for editing
> structured documents with different types of content (text, graphics,
editors/TeXmacs Makefile and DESC WYSIWYG correction
Hello everyone!
On the TeXmacs website FAQ "question 1" states it's a
"(what-you-see-is-what-you-get)" editor, below is the small correction.
cvs server: Diffing .
Index: Makefile
===
RCS file: /cvs/ports/editors/TeXmacs/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile1 Jul 2018 18:33:35 - 1.11
+++ Makefile15 Apr 2019 11:36:33 -
@@ -3,7 +3,7 @@
# XXX base clang: lots of undefined references to Qt functions
COMPILER= base-gcc
-COMMENT= wysiwyw (what you see is what you want) editing platform
+COMMENT= wysiwyg (what you see is what you get) editing platform
DISTNAME= TeXmacs-1.99.4-src
PKGNAME= ${DISTNAME:S/-src//}
cvs server: Diffing patches
cvs server: Diffing pkg
Index: pkg/DESCR
===
RCS file: /cvs/ports/editors/TeXmacs/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 5 Apr 2016 23:30:46 - 1.1.1.1
+++ pkg/DESCR 15 Apr 2019 11:36:33 -
@@ -1,4 +1,4 @@
-GNU TeXmacs is a free wysiwyw (what you see is what you want) editing
+GNU TeXmacs is a free wysiwyg (what you see is what you get) editing
platform with special features for scientists. The software aims
to provide a unified and user friendly framework for editing
structured documents with different types of content (text, graphics,
[ports-gcc-8] Unbreak net/synergy
Hi ports,
Synergy's build is broken with ports-gcc-8 simply because it cannot be
built with C++14, it uses nullptr as it used to be before C++11:
>lib/common/common.h:141:18: error: 'NULL' was not declared in this
>scope
Using C++03 like clang already does in this port fixes the build on
macppc with ports-gcc-8.
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/net/synergy/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile24 Oct 2018 14:28:09 - 1.34
+++ Makefile15 Apr 2019 11:03:53 -
@@ -5,7 +5,7 @@ COMMENT=mouse and keyboard sharing uti
VERSION= 1.7.6
DISTNAME= synergy-${VERSION}
CATEGORIES=net x11
-REVISION= 0
+REVISION= 1
GH_ACCOUNT=symless
GH_PROJECT=synergy-core
@@ -27,10 +27,7 @@ MODULES= devel/cmake
NO_TEST= Yes
-.include
-.if ${PROPERTIES:Mclang}
CXXFLAGS +=-std=c++03
-.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/synergy[cds] ${PREFIX}/bin/
Re: UPDATE: editors/TeXmacs
Nam Nguyen writes: >> Rafael Sadowski writes: >>> Please find below an update diff for TeXmacs 1.99.9. I stared to get rid >>> of COMPILER=base-gcc. Upstream switched form Qt4 to Qt5 and from >>> autotools to CMake. > > I do not know cmake, so I did not review your cmake additions. It > builds, and I successfully followed the tutorial video. Thank you. > > Here is some feedback: > 1. Remove `patch-src_System_Link_pipe_link_cpp'. It still builds without > this patch. > 2. Add iconv to WANTLIB. Otherwise, I get errors of the form: Ignore #2. I think this was caused by an older plist from a previous build and iconv was revealed as an unused lib with `port-lib-depends-check.' In any case, I successfully used your original patches. Sorry for the noise.
Re: UPDATE: editors/TeXmacs
> Rafael Sadowski writes: >> Please find below an update diff for TeXmacs 1.99.9. I stared to get rid >> of COMPILER=base-gcc. Upstream switched form Qt4 to Qt5 and from >> autotools to CMake. I do not know cmake, so I did not review your cmake additions. It builds, and I successfully followed the tutorial video. Thank you. Here is some feedback: 1. Remove `patch-src_System_Link_pipe_link_cpp'. It still builds without this patch. 2. Add iconv to WANTLIB. Otherwise, I get errors of the form: --8<---cut here---start->8--- [593/610] : && /usr/ports/pobj/TeXmacs-1.99.9/bin/c++ -O2 -pipe -include /mnt/playground/ports/pobj/TeXmacs-1.99.9/build-amd64/src/System/config.h -DNDEBUG tests/CMakeFiles/analyze_test.dir/Data/String/analyze_test.cpp.o tests/CMakeFiles/analyze_test.dir/analyze_test_autogen/mocs_compilation.cpp.o -o tests/analyze_test -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/qt5/. -L/usr/ports/pobj/TeXmacs-1.99.9/bin -L/usr/local/lib/gcc/x86_64-unknown-openbsd6.5/4.9.4 -Wl,-rpath,/usr/local/lib/qt5/.:/usr/X11R6/lib 3rdparty/benchmark/googletest/googletest/libgtest.a 3rdparty/benchmark/googletest/googletest/libgtest_main.a src/libtexmacs_body.a -lguile -lltdl -lgmp -lm -lltdl -lz -ljpeg -lpng -lz -lpthread -lsqlite3 -lfreetype -lQt5PrintSupport 3rdparty/benchmark/googletest/googletest/libgtest.a -lgmp -lm -lz -ljpeg -lpng -lz -ljpeg -lpng -lpthread -lsqlite3 -lfreetype -lQt5Widgets -lQt5Gui -lQt5Core -Wl,-rpath-link,/usr/X11R6/lib && : FAILED: tests/analyze_test : && /usr/ports/pobj/TeXmacs-1.99.9/bin/c++ -O2 -pipe -include /mnt/playground/ports/pobj/TeXmacs-1.99.9/build-amd64/src/System/config.h -DNDEBUG tests/CMakeFiles/analyze_test.dir/Data/String/analyze_test.cpp.o tests/CMakeFiles/analyze_test.dir/analyze_test_autogen/mocs_compilation.cpp.o -o tests/analyze_test -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/qt5/. -L/usr/ports/pobj/TeXmacs-1.99.9/bin -L/usr/local/lib/gcc/x86_64-unknown-openbsd6.5/4.9.4 -Wl,-rpath,/usr/local/lib/qt5/.:/usr/X11R6/lib 3rdparty/benchmark/googletest/googletest/libgtest.a 3rdparty/benchmark/googletest/googletest/libgtest_main.a src/libtexmacs_body.a -lguile -lltdl -lgmp -lm -lltdl -lz -ljpeg -lpng -lz -lpthread -lsqlite3 -lfreetype -lQt5PrintSupport 3rdparty/benchmark/googletest/googletest/libgtest.a -lgmp -lm -lz -ljpeg -lpng -lz -ljpeg -lpng -lpthread -lsqlite3 -lfreetype -lQt5Widgets -lQt5Gui -lQt5Core -Wl,-rpath-link,/usr/X11R6/lib && : ld: error: undefined symbol: libiconv_open >>> referenced by converter.cpp >>> converter.cpp.o:(iconv_converter::iconv_converter(string, >>> string, bool)) in archive src/libtexmacs_body.a ld: error: undefined symbol: libiconv_close >>> referenced by converter.cpp >>> converter.cpp.o:(iconv_converter::~iconv_converter()) in >>> archive src/libtexmacs_body.a ld: error: undefined symbol: libiconv >>> referenced by converter.cpp >>> converter.cpp.o:(apply(iconv_converter&, string)) in archive >>> src/libtexmacs_body.a ld: error: undefined symbol: backtrace >>> referenced by stack_trace.cpp >>> stack_trace.cpp.o:(get_stacktrace(unsigned int)) in archive >>> src/libtexmacs_body.a ld: error: undefined symbol: backtrace_symbols >>> referenced by stack_trace.cpp >>> stack_trace.cpp.o:(get_stacktrace(unsigned int)) in archive >>> src/libtexmacs_body.a collect2: error: ld returned 1 exit status --8<---cut here---end--->8---
[update] emacs-26.2
Hi Jérémie, ports@, Please see Emacs 26.2 has been released on Apr 12th: https://lists.gnu.org/archive/html/emacs-devel/2019-04/msg00503.html The changelog features a doas method for tramp mode: https://www.gnu.org/software/emacs/news/NEWS.26.2 I don't have a build environment here no attachment. Kind regards, Anton Lazarov
Re: UPDATE: editors/TeXmacs
Rafael Sadowski writes: > Please find below an update diff for TeXmacs 1.99.9. I stared to get rid > of COMPILER=base-gcc. Upstream switched form Qt4 to Qt5 and from > autotools to CMake. > > Build with base clang and runs without notable issues in > a quick teston and64 . All regression tests are also passed. Sorry for the duplication of effort. https://marc.info/?l=openbsd-ports=155530924530334=2 Ignore my post since it uses ports-gcc, and I did not see the usage Qt5 and CMake. > > Best regards, > > Rafael Sadowski
