Re: MODPY_TESTDEP diff for python.port.mk
On 2019/03/17 20:52, Kurt Mosiejczuk wrote:
> On Sun, Mar 17, 2019 at 07:35:52PM -0400, Kurt Mosiejczuk wrote:
>
> > So here is the first part adding MODPY_TESTDEP.
>
> Here's a version that has a comment as to why MODPY_TEST_DEPENDS is
> empty
Great, this is OK with me.
> --Kurt
>
> Index: python.port.mk
> ===
> RCS file: /cvs/ports/lang/python/python.port.mk,v
> retrieving revision 1.100
> diff -u -p -r1.100 python.port.mk
> --- python.port.mk4 Dec 2018 05:57:31 - 1.100
> +++ python.port.mk17 Mar 2019 23:23:11 -
> @@ -68,6 +68,7 @@ MODPY_WANTLIB = python${MODPY_VERSION}${
> MODPY_RUN_DEPENDS = lang/python/${MODPY_VERSION}
> MODPY_LIB_DEPENDS = lang/python/${MODPY_VERSION}
> _MODPY_BUILD_DEPENDS = lang/python/${MODPY_VERSION}
> +MODPY_TEST_DEPENDS = # empty, appended by MODPY_PYTEST
>
> .if ${NO_BUILD:L} == "no"
> MODPY_BUILDDEP ?=Yes
> @@ -75,6 +76,7 @@ MODPY_BUILDDEP ?= Yes
> MODPY_BUILDDEP ?=No
> .endif
> MODPY_RUNDEP ?= Yes
> +MODPY_TESTDEP ?= Yes
>
> .if ${MODPY_BUILDDEP:L} == "yes"
> BUILD_DEPENDS += ${_MODPY_BUILD_DEPENDS}
> @@ -82,6 +84,10 @@ BUILD_DEPENDS += ${_MODPY_BUILD_DEPENDS}
>
> .if ${MODPY_RUNDEP:L} == "yes"
> RUN_DEPENDS += ${MODPY_RUN_DEPENDS}
> +.endif
> +
> +.if ${MODPY_TESTDEP:L} == "yes"
> +TEST_DEPENDS += ${MODPY_TEST_DEPENDS}
> .endif
>
> _MODPY_PRE_BUILD_STEPS = :
>
Re: Adding MODPY_PYTEST to python.port.mk
On 2019/03/17 20:41, Kurt Mosiejczuk wrote:
> On Sun, Mar 17, 2019 at 08:24:07PM -0400, Kurt Mosiejczuk wrote:
>
> > In the default case with pytest we *don't* want a TEST_TARGET to
> > happen but if we leave it empty it gets filled in. We don't want to
> > override it to empty it if it has been set. So we'd be back at some
> > sort of dance with MODPY_PYTEST_ARGS. I may be missing something
> > though.
>
> Got it. If it is empty, we set it to "./". That makes pytest happy since
> it can be fed a directory and it keeps it from getting filled in with
> test.
>
> --Kurt
>
> --- python.port.mk.phase2 Sun Mar 17 19:59:34 2019
> +++ python.port.mkSun Mar 17 20:38:54 2019
> @@ -63,12 +63,18 @@ MODPY_PYOEXTENSION = pyo
> MODPY_PYOEXTENSION ?=opt-1.pyc
> .endif
>
> -MODPY_WANTLIB = python${MODPY_VERSION}${MODPY_LIB_SUFFIX}
> +MODPY_WANTLIB = python${MODPY_VERSION}${MODPY_LIB_SUFFIX}
>
> +MODPY_PYTEST ?= no
> +
> MODPY_RUN_DEPENDS = lang/python/${MODPY_VERSION}
> MODPY_LIB_DEPENDS = lang/python/${MODPY_VERSION}
> _MODPY_BUILD_DEPENDS = lang/python/${MODPY_VERSION}
> +.if ${MODPY_PYTEST:L} == "yes"
> +MODPY_TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
> +.else
> MODPY_TEST_DEPENDS =
> +.endif
>
> .if ${NO_BUILD:L} == "no"
> MODPY_BUILDDEP ?=Yes
> @@ -91,6 +97,14 @@ TEST_DEPENDS +=${MODPY_TEST_DEPENDS}
> .endif
>
> _MODPY_PRE_BUILD_STEPS = :
> +.if ${MODPY_PYTEST:L} == "yes"
> +# pytest doesn't need a target, but empty will get filled in
> +TEST_TARGET ?= ./
I'm about to zzz now so haven't tested... but I suppose the effective
default setting could come from a previously loaded mk file from another
MODULES entry if there are more than one.. These empty variables are
awkward! So this may indeed need a specific variable.
> +.elif defined(MODPY_SETUPTOOLS) && ${MODPY_PYTEST:L} == "no"
> +# The setuptools uses test target while pytest does not
> +TEST_TARGET ?= test
> +.endif
> +
> .if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:L} == "yes"
> # The setuptools module provides a package locator (site.py) that is
> # required at runtime for the pkg_resources stuff to work
> @@ -99,8 +113,6 @@ MODPY_SETUPUTILS_DEPEND ?= devel/py-setuptools${MODPY_
> MODPY_RUN_DEPENDS += ${MODPY_SETUPUTILS_DEPEND}
> BUILD_DEPENDS += ${MODPY_SETUPUTILS_DEPEND}
> MODPY_SETUPUTILS = Yes
> -# The setuptools uses test target
> -TEST_TARGET ?= test
> _MODPY_USERBASE =
> _MODPY_PRE_BUILD_STEPS += ;${MODPY_CMD} egg_info || true
> .else
> @@ -161,9 +173,14 @@ MODPY_CMD = cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
> ${MODPY_BIN} ./${MODPY_SETUP} \
> ${MODPY_SETUP_ARGS}
>
> +.if ${MODPY_PYTEST:L} == "yes"
> MODPY_TEST_CMD = cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} \
> + ${MODPY_BIN} -m pytest
> +.else
> +MODPY_TEST_CMD = cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} \
> ${MODPY_BIN} ./${MODPY_SETUP} \
> ${MODPY_SETUP_ARGS}
> +.endif
>
> MODPY_TEST_LOCALE ?= LC_CTYPE=en_US.UTF-8
>
> @@ -209,7 +226,8 @@ do-install:
> . endif
>
> # setuptools supports regress testing from setup.py using a standard target
> -. if !target(do-test) && ${MODPY_SETUPUTILS:L} == "yes"
> +. if !target(do-test) && (${MODPY_SETUPUTILS:L} == "yes" || \
> + ${MODPY_PYTEST:L} == "yes" )
> do-test:
> @${MODPY_TEST_TARGET}
> . endif
>
Re: Adding TEST_ENV/UTF-8 to various ports
On 2019/03/17 20:24, Kurt Mosiejczuk wrote:
> On Sun, Mar 17, 2019 at 11:12:29PM +, Stuart Henderson wrote:
>
> > Instead of making "do-test" conditional, just make MODPY_TEST_CMD
> > conditional instead. It's then carried into MODPY_TEST_TARGET which can
> > stay the same in both cases. No need for a special MODPY_PYTEST_ARGS
> > either; the existing TEST_TARGET does the job nicely. And extend the
> > conditional around do-test, rather than adding a second branch.
> > Untested but I think something like this should do the trick:
>
> > .if ${MODPY_PYTEST:L} == "yes"
> > MODPY_TEST_CMD = cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} \
> > ${MODPY_BIN} -m pytest
> > .else
> > MODPY_TEST_CMD = cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} \
> > ${MODPY_BIN} ./${MODPY_SETUP} \
> > ${MODPY_SETUP_ARGS}
> > .endif
>
> > ...
>
> > . if !target(do-test) && (${MODPY_SETUPUTILS:L} == "yes" ||
> > ${MODPY_PYTEST:L} == "yes")
> > do-test:
> > @${MODPY_TEST_TARGET}
> > . endif
>
> The problem I'm having right now is TEST_TARGETS gets defined as test if it
> is empty. pytest does not use this as a default. I'm testing with an
> adapted devel/py-dateutil and tests just fail with:
>
> = no tests ran in 0.01 seconds
> =
> ERROR: file not found: test
>
> I've included my current diff for our final third. It is a diff after the
> first two parts have been applied. I'm also including a diff for py-dateutil.
>
> In the default case with pytest we *don't* want a TEST_TARGET to happen but
> if we leave it empty it gets filled in. We don't want to override it to
> empty it if it has been set. So we'd be back at some sort of dance with
> MODPY_PYTEST_ARGS. I may be missing something though.
Ah OK. In that case, MODPY_PYTEST_ARGS (empty by default, with ?=) makes sense.
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/py-dateutil/Makefile,v
> retrieving revision 1.28
> diff -u -p -r1.28 Makefile
> --- Makefile 3 Mar 2019 08:28:31 - 1.28
> +++ Makefile 18 Mar 2019 00:17:11 -
> @@ -18,21 +18,15 @@ MODULES = lang/python
>
> MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
> +MODPY_PYTEST = Yes
>
> BUILD_DEPENDS = devel/py-setuptools_scm${MODPY_FLAVOR}
> RUN_DEPENDS =devel/py-six${MODPY_FLAVOR}
> TEST_DEPENDS = devel/py-freezegun${MODPY_FLAVOR} \
> devel/py-hypothesis${MODPY_FLAVOR} \
> - devel/py-six${MODPY_FLAVOR} \
> - devel/py-test${MODPY_FLAVOR}
> + devel/py-six${MODPY_FLAVOR}
>
> FLAVORS =python3
> FLAVOR ?=
> -
> -TEST_ENV += LC_CTYPE=C.UTF-8
> -
> -do-test:
> - cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
> - ${MODPY_BIN} -m pytest
>
> .include
> --- python.port.mk.phase2 Sun Mar 17 19:59:34 2019
> +++ python.port.mkSun Mar 17 19:59:56 2019
> @@ -63,12 +63,18 @@ MODPY_PYOEXTENSION = pyo
> MODPY_PYOEXTENSION ?=opt-1.pyc
> .endif
>
> -MODPY_WANTLIB = python${MODPY_VERSION}${MODPY_LIB_SUFFIX}
> +MODPY_WANTLIB = python${MODPY_VERSION}${MODPY_LIB_SUFFIX}
>
> +MODPY_PYTEST ?= no
> +
> MODPY_RUN_DEPENDS = lang/python/${MODPY_VERSION}
> MODPY_LIB_DEPENDS = lang/python/${MODPY_VERSION}
> _MODPY_BUILD_DEPENDS = lang/python/${MODPY_VERSION}
> +.if ${MODPY_PYTEST:L} == "yes"
> +MODPY_TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
> +.else
> MODPY_TEST_DEPENDS =
> +.endif
>
> .if ${NO_BUILD:L} == "no"
> MODPY_BUILDDEP ?=Yes
> @@ -161,9 +167,14 @@ MODPY_CMD = cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
> ${MODPY_BIN} ./${MODPY_SETUP} \
> ${MODPY_SETUP_ARGS}
>
> +.if ${MODPY_PYTEST:L} == "yes"
> MODPY_TEST_CMD = cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} \
> + ${MODPY_BIN} -m pytest
> +.else
> +MODPY_TEST_CMD = cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} \
> ${MODPY_BIN} ./${MODPY_SETUP} \
> ${MODPY_SETUP_ARGS}
> +.endif
>
> MODPY_TEST_LOCALE ?= LC_CTYPE=en_US.UTF-8
>
> @@ -209,7 +220,8 @@ do-install:
> . endif
>
> # setuptools supports regress testing from setup.py using a standard target
> -. if !target(do-test) && ${MODPY_SETUPUTILS:L} == "yes"
> +. if !target(do-test) && (${MODPY_SETUPUTILS:L} == "yes" || \
> + ${MODPY_PYTEST:L} == "yes" )
> do-test:
> @${MODPY_TEST_TARGET}
> . endif
Re: x11/gnome seems to fail to start with new user
On Tue, Mar 05, 2019 at 10:40:48AM -0800, Ryan Freeman wrote:
> Hello!
>
> In testing my way around a www/chromium-related crash, I created
> a brand new test user. I was surprised to see that this fresh
> user, logging in from gdm, never makes it to gnome desktop.
I've been checking this after every snapshot update, clean new user,
try and log in with this user from GDM, gnome-shell never makes it
to life. As of snapshot 2019/03/15 and matching packages, and
today (2019/03/17) snap.
> The welome dialogs display to let me choose language, keyboard
> input, etc, but gnome-shell never loads. After you're finished
> with the welcome dialogs, the help window appears, and nothing
> else. If you close help, the window stays black and gnome-shell
> never comes. ctrl-alt-backspace required.
>
> Tested removing everything for test user and trying again over
> the last several snapshots. Always same result.
>
> My existing user which has used gnome since I got this laptop
> remains able to start gnome without issue.
>
> pkg_check and mtree on base has been tried, as well as
> pkg_delete -a of any leftover old library versions to make sure
> there wasn't some weird issue there.
>
> Core was generated by `gnome-shell'.
> Program terminated with signal SIGTRAP, Trace/breakpoint trap.
> #0 g_log_structured_array (log_level=, fields=0x7f7d4f00,
> n_fields=) at ../glib-2.58.3/glib/gmessages.c:1930
> 1930../glib-2.58.3/glib/gmessages.c: No such file or directory.
> (gdb)
> (gdb) bt full
> #0 g_log_structured_array (log_level=, fields=0x7f7d4f00,
> n_fields=) at ../glib-2.58.3/glib/gmessages.c:1930
> depth =
> writer_func =
> writer_user_data =
> #1 0x1b77f3818c7d in g_log_default_handler (log_domain=,
> log_level=, message=,
> unused_data=) at ../glib-2.58.3/glib/gmessages.c:3111
> fields = {{key = 0x1b77f3762b85 "GLIB_OLD_LOG_API",
> value = 0x1b77f375dc98, length = -1}, {
> key = 0x1b77f375dee0 "MESSAGE", value = 0x1b779576d080,
> length = -1}, {key = 0x1b77f375bb9f "PRIORITY",
> value = 0x1b77f37512a3, length = -1}, {
> key = 0x1b77f375bba8 "GLIB_DOMAIN", value = 0x1b7785375a6b,
> ---Type to continue, or q to quit---
> length = -1}}
> n_fields = address 0x4)>
> #2 0x1b77f38187ca in g_logv (log_domain=,
> log_level=, format=, args=)
> at ../glib-2.58.3/glib/gmessages.c:1350
> depth =
> domain =
> data = 0x0
> masquerade_fatal = access memory at address 0x0)>
> domain_fatal_mask =
> log_func = 0x1b77f3818ba0
> test_level =
> ---Type to continue, or q to quit---
> msg =
> msg_alloc =
> i = 2
> #3 0x1b77f381838f in g_log (
> log_domain=0x2 , log_level=0,
> format=0x0) at ../glib-2.58.3/glib/gmessages.c:1413
> args = {{gp_offset = 24, fp_offset = 48,
> overflow_arg_area = 0x7f7d51a0,
> reg_save_area = 0x7f7d50b0}}
> #4 0x1b77853fd86a in _GLOBAL__sub_I_engine.cpp ()
>from /usr/local/lib/libgjs.so.5.0
> No symbol table info available.
> #5 0x1b77853c40e9 in _do_init () from /usr/local/lib/libgjs.so.5.0
> No symbol table info available.
> ---Type to continue, or q to quit---
> #6 0x1b7785428f29 in _init () from /usr/local/lib/libgjs.so.5.0
> No symbol table info available.
> #7 0x1b7785428f20 in ?? () from /usr/local/lib/libgjs.so.5.0
> No symbol table info available.
> #8 0x1b7849a3f679 in _dl_call_init_recurse (object=0x1b78171e6c00,
> initfirst=0) at /usr/src/libexec/ld.so/loader.c:771
> n = 0x0
> #9 0x1b7849a3f606 in _dl_call_init_recurse (object=0x1b782fb3f400,
> initfirst=0) at /usr/src/libexec/ld.so/loader.c:757
> n = 0x1b77b9b77840
> #10 0x1b7849a3f606 in _dl_call_init_recurse (object=0x1b78054c3000,
> initfirst=0) at /usr/src/libexec/ld.so/loader.c:757
> n = 0x1b77eb384940
> #11 0x1b7849a3f07d in _dl_call_init (object=0x1b78054c3000)
> ---Type to continue, or q to quit---
> at /usr/src/libexec/ld.so/loader.c:744
> No locals.
> #12 _dl_boot (argv=0x7f7d53a8, envp=,
> dyn_loff=30203445469184, dl_data=0x7f7d5310)
> at /usr/src/libexec/ld.so/loader.c:639
> us = 0x1b75579002e0 "/usr/libexec/ld.so"
> align =
> maxva =
> exe_loff = 30190794178560
> minva =
> loop =
> phdp =
> load_list = 0x1b77a8988140
> ptls = 0x0
> ---Type to continue, or q to quit---
> exe_obj = 0x1b78054c3000
> next_load = 0x1b77a8988140
> n =
> ehdr =
> dyn_obj =
> dynp =
> debug_map =
> failed =
> #13 0x1b7849a40806 in _dl_start ()
> at /usr/src/libexec/ld.so/amd64/ldasm.S:61
> No locals.
> #14 0x in ?? ()
> No symbol table info available.
> (gdb)
>
Re: Adding MODPY_TEST_LOCALE to python.port.mk
On 2019/03/17 19:37, Kurt Mosiejczuk wrote:
> On Sun, Mar 17, 2019 at 11:12:29PM +, Stuart Henderson wrote:
>
> > I like the direction this is taking, but it's missing use of a standard
> > MODULES mechanism, and a comment on style for commit -
>
> > There are several logically separate pieces here which would be
> > better to commit independently to keep the history clear.
>
> > I think MODPY_TEST_LOCALE also stands alone.
>
> Here's the second part adding MODPY_TEST_LOCALE.
>
> --Kurt
>
> Index: python.port.mk
> ===
> RCS file: /cvs/ports/lang/python/python.port.mk,v
> retrieving revision 1.100
> diff -u -p -r1.100 python.port.mk
> --- python.port.mk4 Dec 2018 05:57:31 - 1.100
> +++ python.port.mk17 Mar 2019 23:26:29 -
> @@ -159,6 +159,10 @@ MODPY_TEST_CMD = cd ${WRKSRC} && ${SETEN
> ${MODPY_BIN} ./${MODPY_SETUP} \
> ${MODPY_SETUP_ARGS}
>
> +MODPY_TEST_LOCALE ?= LC_CTYPE=en_US.UTF-8
> +
> +TEST_ENV += ${MODPY_TEST_LOCALE}
> +
> SUBST_VARS :=MODPY_PYCACHE MODPY_COMMENT MODPY_ABI3SO
> MODPY_PYC_MAGIC_TAG \
> MODPY_BIN MODPY_EGG_VERSION MODPY_VERSION MODPY_BIN_SUFFIX \
> MODPY_PY_PREFIX MODPY_PYOEXTENSION ${SUBST_VARS}
>
This one's OK with me.
Re: [UPDATE] games/cataclysm-dda 2019.02.08 -> 0.D release
On 2019/03/17 19:03, Brian Callahan wrote: > > > On 3/17/19 6:29 PM, trondd wrote: > > The release of version 0.D is out! > > > > I do need help because pkg_add won't install 0.D over 2019.02.08, I guess > > it doesn't know it's a newer version. Do I need a quirk for that or use > > EPOCH? Haven't run into this situation before. > > Number went backwards. Set EPOCH=0. What a horrible numbering scheme.. Make sure you are familiar with packages-specs(7) for future updates (or just stick with the date, for an easy life..)
Re: Adding TEST_ENV/UTF-8 to various ports
On 2019/03/17 16:22, Kurt Mosiejczuk wrote:
> On Sun, Mar 17, 2019 at 02:10:47PM -0400, Kurt Mosiejczuk wrote:
>
> > Here are diffs for python.port.mk and port-modules.5.
>
> > I changed Remi's diff a bit. With the discussion about C.UTF-8 being
> > an alias for en_US.UTF-8, I changed the default locale we add to that.
> > Additionally, I changed it so it is MODPY_TEST_LOCALE (that defaults to
> > en_US.UTF-8) that gets added to TEST_ENV.
>
> > Similar to MODPY_SETUPTOOLS, I have MODPY_PYTEST adding devel/py-test
> > to TEST_DEPENDS. I added code to do that and added a MODPY_TEST_DEPENDS
> > that is similar to MODPY_*_DEPENDS that will keep us from adding
> > anything to TEST_DEPENDS if it is set to No.
>
> > I added all these new environment variables to port-modules.5, which is
> > the second diff included here.
>
> Here is a fixed diff for python.port.mk
>
> I need to not make tweaks after tests.
I like the direction this is taking, but it's missing use of a standard
MODULES mechanism, and a comment on style for commit -
> --Kurt
>
> Index: python.port.mk
> ===
> RCS file: /cvs/ports/lang/python/python.port.mk,v
> retrieving revision 1.100
> diff -u -p -r1.100 python.port.mk
> --- python.port.mk4 Dec 2018 05:57:31 - 1.100
> +++ python.port.mk17 Mar 2019 20:21:45 -
> @@ -68,6 +68,9 @@ MODPY_WANTLIB = python${MODPY_VERSION}${
> MODPY_RUN_DEPENDS = lang/python/${MODPY_VERSION}
> MODPY_LIB_DEPENDS = lang/python/${MODPY_VERSION}
> _MODPY_BUILD_DEPENDS = lang/python/${MODPY_VERSION}
> +.if defined(MODPY_TEST) && ${MODPY_PYTEST:L} == "yes"
> +MODPY_TEST_DEPENDS = devel/py-test
> +.endif
>
> .if ${NO_BUILD:L} == "no"
> MODPY_BUILDDEP ?=Yes
> @@ -75,6 +78,7 @@ MODPY_BUILDDEP ?= Yes
> MODPY_BUILDDEP ?=No
> .endif
> MODPY_RUNDEP ?= Yes
> +MODPY_TESTDEP ?= Yes
>
> .if ${MODPY_BUILDDEP:L} == "yes"
> BUILD_DEPENDS += ${_MODPY_BUILD_DEPENDS}
> @@ -84,6 +88,10 @@ BUILD_DEPENDS += ${_MODPY_BUILD_DEPENDS}
> RUN_DEPENDS += ${MODPY_RUN_DEPENDS}
> .endif
>
> +.if ${MODPY_TESTDEP:L} == "yes'
> +TEST_DEPENDS += ${MODPY_TEST_DEPENDS}
> +.endif
There are several logically separate pieces here which would be
better to commit independently to keep the history clear.
Adding MODPY_TESTDEP is one part which definitely stands by itself.
I think MODPY_TEST_LOCALE also stands alone.
And the pytest parts are a third piece.
> +
> _MODPY_PRE_BUILD_STEPS = :
> .if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:L} == "yes"
> # The setuptools module provides a package locator (site.py) that is
> @@ -159,6 +167,13 @@ MODPY_TEST_CMD = cd ${WRKSRC} && ${SETEN
> ${MODPY_BIN} ./${MODPY_SETUP} \
> ${MODPY_SETUP_ARGS}
>
> +MODPY_PYTEST_CMD = cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} \
> + ${MODPY_BIN} -m pytest
> +
> +MODPY_TEST_LOCALE ?= LC_CTYPE=en_US.UTF-8
> +
> +TEST_ENV += ${MODPY_TEST_LOCALE}
> +
> SUBST_VARS :=MODPY_PYCACHE MODPY_COMMENT MODPY_ABI3SO
> MODPY_PYC_MAGIC_TAG \
> MODPY_BIN MODPY_EGG_VERSION MODPY_VERSION MODPY_BIN_SUFFIX \
> MODPY_PY_PREFIX MODPY_PYOEXTENSION ${SUBST_VARS}
> @@ -184,6 +199,8 @@ MODPY_INSTALL_TARGET = \
> ${MODPY_DISTUTILS_INSTALL} ${MODPY_DISTUTILS_INSTALLARGS}
> MODPY_TEST_TARGET = \
> ${MODPY_TEST_CMD} ${TEST_TARGET}
> +MODPY_PYTEST ?= no
> +MODPY_PYTEST_ARGS ?=
>
> # dirty way to do it with no modifications in bsd.port.mk
> .if empty(CONFIGURE_STYLE)
> @@ -198,8 +215,11 @@ do-install:
> @${MODPY_INSTALL_TARGET}
> . endif
>
> +. if !target(do-test) && ${MODPY_PYTEST:L} == "yes"
> +do-test:
> + ${MODPY_PYTEST_CMD} ${MODPY_PYTEST_ARGS}
> # setuptools supports regress testing from setup.py using a standard target
> -. if !target(do-test) && ${MODPY_SETUPUTILS:L} == "yes"
> +. elif !target(do-test) && ${MODPY_SETUPUTILS:L} == "yes"
> do-test:
> @${MODPY_TEST_TARGET}
> . endif
MODxxx_TEST_TARGET is a standard mechanism used in various modules.
Sometimes a port has a special do-test target but still wants to use the
standard one as part of it, or uses multiple MODULES and wants to pick
a test target from just one of them. So it would be better to continue
making this mechanism available in the pytest case too.
Instead of making "do-test" conditional, just make MODPY_TEST_CMD
conditional instead. It's then carried into MODPY_TEST_TARGET which can
stay the same in both cases. No need for a special MODPY_PYTEST_ARGS
either; the existing TEST_TARGET does the job nicely. And extend the
conditional around do-test, rather than adding a second branch.
Untested but I think something like this should do the trick:
.if ${MODPY_PYTEST:L} == "yes"
MODPY_TEST_CMD = cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} \
${MODPY_BIN} -m pytest
.else
MODPY_TEST_CM
[ports-gcc] Unbreak geo/qlandkartegt
> http://build-failures.rhaalovely.net/powerpc/last/geo/qlandkartegt.log
> http://build-failures.rhaalovely.net/sparc64/2019-02-03/geo/qlandkartegt.log
So this one needs -std=c++11. Once provided there is the usual
/ fight later during the build. I tried to be
conservative here, but anyway upstream moved to a remake of its own
software called QMapShack.
It builds fine on macppc [1] and amd64 [2]. I don't have the
hardware to fully test it, but geotiff maps are fine.
Any comment?
Charlène.
[1] http://0x0.st/z8ai.txt
[2] http://0x0.st/z8az.txt
Index: Makefile
===
RCS file: /cvs/ports/geo/qlandkartegt/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- Makefile24 Oct 2018 14:28:04 - 1.29
+++ Makefile17 Mar 2019 22:43:44 -
@@ -4,7 +4,7 @@ COMMENT = garmin GPS map management tool
DISTNAME = qlandkartegt-1.8.1
CATEGORIES = geo x11
-REVISION = 2
+REVISION = 3
HOMEPAGE = http://www.qlandkarte.org/
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
@@ -39,3 +39,9 @@ post-extract:
@rm ${WRKSRC}/cmake/Modules/FindJPEG.cmake
.include
+
+# fix error: #error Must have C++11 or newer.
+# XXX this should be retried once moving to ports-gcc>=8
+.if ${CHOSEN_COMPILER} == "ports-gcc"
+CONFIGURE_ENV += CXXFLAGS="${CXXFLAGS} -std=c++11"
+.endif
Index: patches/patch-src_GeoMath_cpp
===
RCS file: patches/patch-src_GeoMath_cpp
diff -N patches/patch-src_GeoMath_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_GeoMath_cpp 17 Mar 2019 22:43:44 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+ports-gcc fix for "error: 'isnan' was not declared in this scope"
+
+Index: src/GeoMath.cpp
+--- src/GeoMath.cpp.orig
src/GeoMath.cpp
+@@ -26,7 +26,12 @@
+ #include
+ #endif
+
++#if defined(__OpenBSD__) && !defined(__clang__)
++#include
++#define isnan std::isnan
++#else
+ #include
++#endif
+
+ #if WIN32
+ #include
Re: [UPDATE] games/cataclysm-dda 2019.02.08 -> 0.D release
On 3/17/19 6:29 PM, trondd wrote: The release of version 0.D is out! I do need help because pkg_add won't install 0.D over 2019.02.08, I guess it doesn't know it's a newer version. Do I need a quirk for that or use EPOCH? Haven't run into this situation before. Number went backwards. Set EPOCH=0. ~Brian Tim. Index: Makefile === RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile13 Feb 2019 12:24:44 - 1.8 +++ Makefile17 Mar 2019 19:57:29 - @@ -1,12 +1,12 @@ # $OpenBSD: Makefile,v 1.8 2019/02/13 12:24:44 kirby Exp $ COMMENT= rogue-like zombie survival game -DISTNAME= cataclysm-dda-2019.02.08 +DISTNAME= cataclysm-dda-0.D CATEGORIES= games GH_ACCOUNT= CleverRaven GH_PROJECT= Cataclysm-DDA -GH_COMMIT= 4fd9499fed5caf477fb9abe0eaf0e76ba0323487 +GH_TAGNAME=0.D HOMEPAGE= http://en.cataclysmdda.com MAINTAINER= Tim Meunier Index: distinfo === RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo13 Feb 2019 12:24:44 - 1.7 +++ distinfo17 Mar 2019 19:57:29 - @@ -1,2 +1,2 @@ -SHA256 (cataclysm-dda-2019.02.08-4fd9499f.tar.gz) = b+CNCSP2wLKgsUWX9FvNzDl2Jn1J1+96ra9LfthApPo= -SIZE (cataclysm-dda-2019.02.08-4fd9499f.tar.gz) = 83424764 +SHA256 (cataclysm-dda-0.D.tar.gz) = bMl7Ph5Ga4WF6EM6bWAQkx6aBz9uwGARMWGzgFLYKII= +SIZE (cataclysm-dda-0.D.tar.gz) = 93423203 Index: pkg/PFRAG.no-no_x11 === RCS file: /cvs/ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11,v retrieving revision 1.4 diff -u -p -r1.4 PFRAG.no-no_x11 --- pkg/PFRAG.no-no_x11 13 Feb 2019 12:24:44 - 1.4 +++ pkg/PFRAG.no-no_x11 17 Mar 2019 19:57:29 - @@ -44,6 +44,8 @@ share/cataclysm-dda/gfx/HitButton_iso/ti share/cataclysm-dda/gfx/HitButton_iso/tileset.txt share/cataclysm-dda/gfx/HoderTileset/ share/cataclysm-dda/gfx/HoderTileset/hodertiles.png +share/cataclysm-dda/gfx/HoderTileset/hodertiles_fallback.png +share/cataclysm-dda/gfx/HoderTileset/hodertiles_oversized.png share/cataclysm-dda/gfx/HoderTileset/tile_config.json share/cataclysm-dda/gfx/HoderTileset/tileset.txt share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/ @@ -53,8 +55,8 @@ share/cataclysm-dda/gfx/MSX++DeadPeopleE share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/13_tiles_kawaiimaidmod_64x48-22340-22364.png share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/14_tiles2_32x32_22365-27564.png share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/15_tiles-connected_variants_32x32_27565-32764.png -share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/16_tiles_trees_64x80_32765-33165.png -share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/17_top_hats_32x32.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/16_tiles_trees_64x80_32765-33164.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/17_top_hats_32x32-33165-35756.png share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/1_tiles_32x32_0-5199.png share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/2_expan_32x32_5200-5391.png share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/3_tree_64x80_5392-5471.png Index: pkg/PLIST === RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 13 Feb 2019 12:24:44 - 1.7 +++ pkg/PLIST 17 Mar 2019 19:57:30 - @@ -498,6 +498,7 @@ share/cataclysm-dda/json/mapgen/pawn_sho share/cataclysm-dda/json/mapgen/petstore.json share/cataclysm-dda/json/mapgen/pharmacy.json share/cataclysm-dda/json/mapgen/pizza_parlor.json +share/cataclysm-dda/json/mapgen/police_station.json share/cataclysm-dda/json/mapgen/pond_fishing.json share/cataclysm-dda/json/mapgen/pond_public.json share/cataclysm-dda/json/mapgen/ponds.json @@ -731,10 +732,12 @@ share/cataclysm-dda/json/npcs/talk_tags. share/cataclysm-dda/json/overmap/ share/cataclysm-dda/json/overmap/multitile_buildings_terrain.json share/cataclysm-dda/json/overmap/multitile_city_buildings.json +share/cataclysm-dda/json/overmap/overmap_land_use_codes.json share/cataclysm-dda/json/overmap/special_locations.json share/cataclysm-dda/json/overmap/specials.json share/cataclysm-dda/json/overmap_connections.json share/cataclysm-dda/json/overmap_terrain.json +share/cataclysm-dda/json/overmap_terrain_abstract.json share/cataclysm-dda/json/player_activities.json share/cataclysm-dda/json/professions.json share/cataclysm-dda/json/recipes/ @@ -2436,7 +2439,12 @@ share/cataclysm-dda/title/en.halloween share/cataclysm-dda/title/en.title share/cataclysm-dda/title/ru.title share/cataclysm-dda/title/zh_CN.title +share/locale/ar/ +share/locale/ar/LC_MESSAGES/ +share/locale/ar/LC_ME
Re: Chrome in snapshots - crash on launch
On Sun, Mar 17, 2019 at 02:09:08PM -0700, Ryan Freeman wrote: > On Fri, Mar 15, 2019 at 07:52:50PM +, Bryan Everly wrote: > > Hi Ports@, > > > > Below is the terminal output I get when I try to launch the chromium build > > (latest & greatest package from snapshots) on the latest snapshot: > > > > $ chrome > > [40668:1870462320:0315/155107.446613:ERROR:process_metrics_openbsd.cc(126)] > > Not implemented reached in bool > > base::GetSystemMemoryInfo(base::SystemMemoryInfoKB *) > > [40668:1870462320:0315/155107.464615:ERROR:process_posix.cc(388)] Not > > implemented reached in base::Time base::Process::CreationTime() const > > Abort trap (core dumped) > > > > Any suggestions? > > > > Thanks! > > I still haven't been able to figure out what is causing this, my post here: > https://marc.info/?l=openbsd-ports&m=155181090804746&w=2 > > Since iridium had unveil/pledge patches synced with chromium a few days ago, > I can no-longer fall back on iridium either as it now crashes similarily: One more datapoint: if i just disable gdm and enable xenodm, and start with a .xsession that launches cwm, chrome does indeed launch: ryan@insomniac ~ $ chrome libGL error: MESA-LOADER: failed to retrieve device information libGL error: Version 4 or later of flush extension not found libGL error: failed to load driver: i915 libGL error: failed to open drm device: No such file or directory libGL error: failed to load driver: i965 libGL error: unable to load driver: swrast_dri.so libGL error: failed to load driver: swrast [26631:-1666849928:0317/154723.888117:ERROR:process_metrics_openbsd.cc(126)] Not implemented reached in bool base::GetSystemMemoryInfo(base::SystemMemoryInfoKB *) [26631:-1666849928:0317/154723.889965:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:1816873024:0317/154724.138608:ERROR:bus.cc(396)] Failed to connect to the bus: Could not parse server address: Unknown address type (examples of valid types are "tcp" and on UNIX "unix") [26631:-1666849928:0317/154724.179239:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154724.181297:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154724.440994:ERROR:process_metrics_openbsd.cc(126)] Not implemented reached in bool base::GetSystemMemoryInfo(base::SystemMemoryInfoKB *) [26631:-1666849928:0317/154724.703262:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154724.714426:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154724.869231:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154724.909121:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154724.970124:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154727.648659:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.130078:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.135081:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.138799:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.141584:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.148690:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.152911:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.160600:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.162926:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.178123:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.181157:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const [26631:-1666849928:0317/154730.183964:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const >From here it seems to work just fine, and all tabs I previously had open months ago reopen.
[UPDATE] games/cataclysm-dda 2019.02.08 -> 0.D release
The release of version 0.D is out! I do need help because pkg_add won't install 0.D over 2019.02.08, I guess it doesn't know it's a newer version. Do I need a quirk for that or use EPOCH? Haven't run into this situation before. Tim. Index: Makefile === RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile13 Feb 2019 12:24:44 - 1.8 +++ Makefile17 Mar 2019 19:57:29 - @@ -1,12 +1,12 @@ # $OpenBSD: Makefile,v 1.8 2019/02/13 12:24:44 kirby Exp $ COMMENT= rogue-like zombie survival game -DISTNAME= cataclysm-dda-2019.02.08 +DISTNAME= cataclysm-dda-0.D CATEGORIES=games GH_ACCOUNT=CleverRaven GH_PROJECT=Cataclysm-DDA -GH_COMMIT= 4fd9499fed5caf477fb9abe0eaf0e76ba0323487 +GH_TAGNAME=0.D HOMEPAGE= http://en.cataclysmdda.com MAINTAINER=Tim Meunier Index: distinfo === RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo13 Feb 2019 12:24:44 - 1.7 +++ distinfo17 Mar 2019 19:57:29 - @@ -1,2 +1,2 @@ -SHA256 (cataclysm-dda-2019.02.08-4fd9499f.tar.gz) = b+CNCSP2wLKgsUWX9FvNzDl2Jn1J1+96ra9LfthApPo= -SIZE (cataclysm-dda-2019.02.08-4fd9499f.tar.gz) = 83424764 +SHA256 (cataclysm-dda-0.D.tar.gz) = bMl7Ph5Ga4WF6EM6bWAQkx6aBz9uwGARMWGzgFLYKII= +SIZE (cataclysm-dda-0.D.tar.gz) = 93423203 Index: pkg/PFRAG.no-no_x11 === RCS file: /cvs/ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11,v retrieving revision 1.4 diff -u -p -r1.4 PFRAG.no-no_x11 --- pkg/PFRAG.no-no_x11 13 Feb 2019 12:24:44 - 1.4 +++ pkg/PFRAG.no-no_x11 17 Mar 2019 19:57:29 - @@ -44,6 +44,8 @@ share/cataclysm-dda/gfx/HitButton_iso/ti share/cataclysm-dda/gfx/HitButton_iso/tileset.txt share/cataclysm-dda/gfx/HoderTileset/ share/cataclysm-dda/gfx/HoderTileset/hodertiles.png +share/cataclysm-dda/gfx/HoderTileset/hodertiles_fallback.png +share/cataclysm-dda/gfx/HoderTileset/hodertiles_oversized.png share/cataclysm-dda/gfx/HoderTileset/tile_config.json share/cataclysm-dda/gfx/HoderTileset/tileset.txt share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/ @@ -53,8 +55,8 @@ share/cataclysm-dda/gfx/MSX++DeadPeopleE share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/13_tiles_kawaiimaidmod_64x48-22340-22364.png share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/14_tiles2_32x32_22365-27564.png share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/15_tiles-connected_variants_32x32_27565-32764.png -share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/16_tiles_trees_64x80_32765-33165.png -share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/17_top_hats_32x32.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/16_tiles_trees_64x80_32765-33164.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/17_top_hats_32x32-33165-35756.png share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/1_tiles_32x32_0-5199.png share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/2_expan_32x32_5200-5391.png share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/3_tree_64x80_5392-5471.png Index: pkg/PLIST === RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 13 Feb 2019 12:24:44 - 1.7 +++ pkg/PLIST 17 Mar 2019 19:57:30 - @@ -498,6 +498,7 @@ share/cataclysm-dda/json/mapgen/pawn_sho share/cataclysm-dda/json/mapgen/petstore.json share/cataclysm-dda/json/mapgen/pharmacy.json share/cataclysm-dda/json/mapgen/pizza_parlor.json +share/cataclysm-dda/json/mapgen/police_station.json share/cataclysm-dda/json/mapgen/pond_fishing.json share/cataclysm-dda/json/mapgen/pond_public.json share/cataclysm-dda/json/mapgen/ponds.json @@ -731,10 +732,12 @@ share/cataclysm-dda/json/npcs/talk_tags. share/cataclysm-dda/json/overmap/ share/cataclysm-dda/json/overmap/multitile_buildings_terrain.json share/cataclysm-dda/json/overmap/multitile_city_buildings.json +share/cataclysm-dda/json/overmap/overmap_land_use_codes.json share/cataclysm-dda/json/overmap/special_locations.json share/cataclysm-dda/json/overmap/specials.json share/cataclysm-dda/json/overmap_connections.json share/cataclysm-dda/json/overmap_terrain.json +share/cataclysm-dda/json/overmap_terrain_abstract.json share/cataclysm-dda/json/player_activities.json share/cataclysm-dda/json/professions.json share/cataclysm-dda/json/recipes/ @@ -2436,7 +2439,12 @@ share/cataclysm-dda/title/en.halloween share/cataclysm-dda/title/en.title share/cataclysm-dda/title/ru.title share/cataclysm-dda/title/zh_CN.title +share/locale/ar/ +share/locale/ar/LC_MESSAGES/ +share/locale/ar/LC_MESSAGES/cataclysm-dda.mo +share/locale/da/LC_MESSAGES/cataclysm-dda.mo share/locale/de/LC_ME
Re: Chrome in snapshots - crash on launch
On Fri, Mar 15, 2019 at 07:52:50PM +, Bryan Everly wrote: > Hi Ports@, > > Below is the terminal output I get when I try to launch the chromium build > (latest & greatest package from snapshots) on the latest snapshot: > > $ chrome > [40668:1870462320:0315/155107.446613:ERROR:process_metrics_openbsd.cc(126)] > Not implemented reached in bool > base::GetSystemMemoryInfo(base::SystemMemoryInfoKB *) > [40668:1870462320:0315/155107.464615:ERROR:process_posix.cc(388)] Not > implemented reached in base::Time base::Process::CreationTime() const > Abort trap (core dumped) > > Any suggestions? > > Thanks! I still haven't been able to figure out what is causing this, my post here: https://marc.info/?l=openbsd-ports&m=155181090804746&w=2 Since iridium had unveil/pledge patches synced with chromium a few days ago, I can no-longer fall back on iridium either as it now crashes similarily: ryan@insomniac ~ 390 $ chrome [71406:523860800:0317/140337.483161:ERROR:process_metrics_openbsd.cc(126)] Not implemented reached in bool base::GetSystemMemoryInfo(base::SystemMemoryInfoKB *) [71406:523860800:0317/140337.485690:ERROR:process_posix.cc(388)] Not implemented reached in base::Time base::Process::CreationTime() const The process was killed by SIGABRT: Abort trap ryan@insomniac ~ 390 $ iridium [77657:521386816:0317/140326.520304:ERROR:process_metrics_openbsd.cc(126)] Not implemented reached in bool base::GetSystemMemoryInfo(base::SystemMemoryInfoKB *) *** autoupdate was enabled, overriding with false The process was killed by SIGABRT: Abort trap My linked post has more data points, including running from a separate user does seem to work, but it doesn't get to talk to system dbus or use DRM stuff when run as test user. I am starting to think this is tied to running chromium/iridium within gnome desktop, as most other folks I've talked to without this problem aren't running gnome. I've run pkg_check -f and used mtree to verify every file in the base system and make sure there aren't some weird symlink issues causing this as some have suggested in other channels. Cheers, -Ryan
Re: Adding TEST_ENV/UTF-8 to various ports
On Sun, Mar 17, 2019 at 04:22:51PM -0400, Kurt Mosiejczuk wrote:
> On Sun, Mar 17, 2019 at 02:10:47PM -0400, Kurt Mosiejczuk wrote:
>
> > Here are diffs for python.port.mk and port-modules.5.
>
> > I changed Remi's diff a bit. With the discussion about C.UTF-8 being
> > an alias for en_US.UTF-8, I changed the default locale we add to that.
> > Additionally, I changed it so it is MODPY_TEST_LOCALE (that defaults to
> > en_US.UTF-8) that gets added to TEST_ENV.
>
> > Similar to MODPY_SETUPTOOLS, I have MODPY_PYTEST adding devel/py-test
> > to TEST_DEPENDS. I added code to do that and added a MODPY_TEST_DEPENDS
> > that is similar to MODPY_*_DEPENDS that will keep us from adding
> > anything to TEST_DEPENDS if it is set to No.
>
I think adding devel/py-test to TEST_DEPENDS is useful.
Some comments below.
> > I added all these new environment variables to port-modules.5, which is
> > the second diff included here.
>
> Here is a fixed diff for python.port.mk
>
> I need to not make tweaks after tests.
>
> --Kurt
>
> Index: python.port.mk
> ===
> RCS file: /cvs/ports/lang/python/python.port.mk,v
> retrieving revision 1.100
> diff -u -p -r1.100 python.port.mk
> --- python.port.mk4 Dec 2018 05:57:31 - 1.100
> +++ python.port.mk17 Mar 2019 20:21:45 -
> @@ -68,6 +68,9 @@ MODPY_WANTLIB = python${MODPY_VERSION}${
> MODPY_RUN_DEPENDS = lang/python/${MODPY_VERSION}
> MODPY_LIB_DEPENDS = lang/python/${MODPY_VERSION}
> _MODPY_BUILD_DEPENDS = lang/python/${MODPY_VERSION}
> +.if defined(MODPY_TEST) && ${MODPY_PYTEST:L} == "yes"
Should this be "defined(MODPY_*PY*TEST)"? Why not move "MODPY_PYTEST ?= no"
up and get rid of the "defined" test?
> +MODPY_TEST_DEPENDS = devel/py-test
Does this also work for python3 ports? I think you need to append
${MODPY_FLAVOR}.
> +.endif
>
> .if ${NO_BUILD:L} == "no"
> MODPY_BUILDDEP ?=Yes
> @@ -75,6 +78,7 @@ MODPY_BUILDDEP ?= Yes
> MODPY_BUILDDEP ?=No
> .endif
> MODPY_RUNDEP ?= Yes
> +MODPY_TESTDEP ?= Yes
>
> .if ${MODPY_BUILDDEP:L} == "yes"
> BUILD_DEPENDS += ${_MODPY_BUILD_DEPENDS}
> @@ -84,6 +88,10 @@ BUILD_DEPENDS += ${_MODPY_BUILD_DEPENDS}
> RUN_DEPENDS += ${MODPY_RUN_DEPENDS}
> .endif
>
> +.if ${MODPY_TESTDEP:L} == "yes'
> +TEST_DEPENDS += ${MODPY_TEST_DEPENDS}
> +.endif
> +
> _MODPY_PRE_BUILD_STEPS = :
> .if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:L} == "yes"
> # The setuptools module provides a package locator (site.py) that is
> @@ -159,6 +167,13 @@ MODPY_TEST_CMD = cd ${WRKSRC} && ${SETEN
> ${MODPY_BIN} ./${MODPY_SETUP} \
> ${MODPY_SETUP_ARGS}
>
> +MODPY_PYTEST_CMD = cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} \
> + ${MODPY_BIN} -m pytest
> +
> +MODPY_TEST_LOCALE ?= LC_CTYPE=en_US.UTF-8
> +
> +TEST_ENV += ${MODPY_TEST_LOCALE}
> +
> SUBST_VARS :=MODPY_PYCACHE MODPY_COMMENT MODPY_ABI3SO
> MODPY_PYC_MAGIC_TAG \
> MODPY_BIN MODPY_EGG_VERSION MODPY_VERSION MODPY_BIN_SUFFIX \
> MODPY_PY_PREFIX MODPY_PYOEXTENSION ${SUBST_VARS}
> @@ -184,6 +199,8 @@ MODPY_INSTALL_TARGET = \
> ${MODPY_DISTUTILS_INSTALL} ${MODPY_DISTUTILS_INSTALLARGS}
> MODPY_TEST_TARGET = \
> ${MODPY_TEST_CMD} ${TEST_TARGET}
> +MODPY_PYTEST ?= no
> +MODPY_PYTEST_ARGS ?=
>
> # dirty way to do it with no modifications in bsd.port.mk
> .if empty(CONFIGURE_STYLE)
> @@ -198,8 +215,11 @@ do-install:
> @${MODPY_INSTALL_TARGET}
> . endif
>
> +. if !target(do-test) && ${MODPY_PYTEST:L} == "yes"
> +do-test:
> + ${MODPY_PYTEST_CMD} ${MODPY_PYTEST_ARGS}
> # setuptools supports regress testing from setup.py using a standard target
> -. if !target(do-test) && ${MODPY_SETUPUTILS:L} == "yes"
> +. elif !target(do-test) && ${MODPY_SETUPUTILS:L} == "yes"
> do-test:
> @${MODPY_TEST_TARGET}
> . endif
>
Re: devel/py-coveralls: use python 3
hello,
On 2019-03-17 16:45, Klemens Nanni wrote:
On Sun, Mar 17, 2019 at 04:30:13PM -0400, Kurt Mosiejczuk wrote:
Is there a reason there is no python3 flavor? I checked and it
supports
Python 2.7 and 3.4-3.7.
I was wondering the same and just started on moving this port to
Python 3 all together.
to answer the first part I ported this back when it was a dependency
for py-discogs-client, at some point it stopped being, and I've not
had real world tests for this since. So just didn't occur to me.
If this port has value, someone who uses (or depends on) it should
perhaps grab maintainership to ensure greater care and feeding.
Minimal dependencies are taken from setup.py.
@Johan: The release tarball (from PyPi) does not include tests/, but
they're present in the upstream git repo. Would you mind tackling this
so downstreams like us can run tests with future releases?
I assume we use PyPi instead of github because github only provides the
auto generated tarballs and not proper ones?
Feedback? Objections?
Reads fine, as noted above I don't have any uses for this so no real
world tests.
.jh
Index: Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile17 Mar 2019 20:22:46 - 1.9
+++ Makefile17 Mar 2019 20:41:04 -
@@ -3,6 +3,7 @@
COMMENT = display coverage stats online via coveralls.io
MODPY_EGG_VERSION =1.6.0
+REVISION = 0
DISTNAME = coveralls-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
@@ -14,13 +15,13 @@ HOMEPAGE = https://github.com/coagulant/
PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
-
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-RUN_DEPENDS = devel/py-docopt \
- devel/py-coverage \
- www/py-requests
+RUN_DEPENDS = devel/py-coverage${MODPY_FLAVOR}>=3.6 \
+ devel/py-docopt${MODPY_FLAVOR}>=0.6.1 \
+ www/py-requests${MODPY_FLAVOR}>=1.0.0
NO_TEST = Yes
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 17 Mar 2019 20:22:46 - 1.5
+++ pkg/PLIST 17 Mar 2019 20:41:04 -
@@ -9,18 +9,19 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}reporter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/api.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/api.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/cli.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/cli.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/exception.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/exception.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/git.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/git.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/version.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/version.pyc
Re: new: sysutils/login_duress
On Sun, 17 Mar 2019 at 15:28:04 -0500, joshua stein wrote: > A BSD authentication module for duress passwords. Oops, the PLIST sample stuff got lost. login_duress.tar.gz Description: application/tar-gz
devel/py-coveralls: use python 3
On Sun, Mar 17, 2019 at 04:30:13PM -0400, Kurt Mosiejczuk wrote:
> Is there a reason there is no python3 flavor? I checked and it supports
> Python 2.7 and 3.4-3.7.
I was wondering the same and just started on moving this port to
Python 3 all together.
Minimal dependencies are taken from setup.py.
@Johan: The release tarball (from PyPi) does not include tests/, but
they're present in the upstream git repo. Would you mind tackling this
so downstreams like us can run tests with future releases?
Feedback? Objections?
Index: Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile17 Mar 2019 20:22:46 - 1.9
+++ Makefile17 Mar 2019 20:41:04 -
@@ -3,6 +3,7 @@
COMMENT = display coverage stats online via coveralls.io
MODPY_EGG_VERSION =1.6.0
+REVISION = 0
DISTNAME = coveralls-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
@@ -14,13 +15,13 @@ HOMEPAGE = https://github.com/coagulant/
PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
-
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-RUN_DEPENDS = devel/py-docopt \
- devel/py-coverage \
- www/py-requests
+RUN_DEPENDS = devel/py-coverage${MODPY_FLAVOR}>=3.6 \
+ devel/py-docopt${MODPY_FLAVOR}>=0.6.1 \
+ www/py-requests${MODPY_FLAVOR}>=1.0.0
NO_TEST = Yes
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 17 Mar 2019 20:22:46 - 1.5
+++ pkg/PLIST 17 Mar 2019 20:41:04 -
@@ -9,18 +9,19 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}reporter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/api.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/api.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/cli.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/cli.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/exception.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/exception.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/git.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/git.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/version.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/version.pyc
new: sysutils/login_duress
A BSD authentication module for duress passwords. login_duress.tar.gz Description: application/tar-gz
Re: [maintainer update] devel/py-coveralls
Committed, thanks. And sorry for the long period without response.
Re: [maintainer update] devel/py-coveralls
On 2019-01-20 16:06, Johan Huldtgren wrote:
minor update of py-coveralls from 1.3.0 to 1.5.0, built
and packaged on amd64. This used to be a dependency for
py-dicogs-client, but as it no longer is I have no real
world tests.
updated to 1.5.1, only big difference since 1.5.0 is
that py-test-runner has been removed as a dependency.
and update to 1.6.0, only change since 1.5.1 is added support
for semaphoreCI.
as previously built and packaged on amd64 without issues.
thanks,
.jh
Index: py-coveralls/Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- py-coveralls/Makefile 24 Apr 2018 16:59:43 - 1.8
+++ py-coveralls/Makefile 17 Mar 2019 19:57:17 -
@@ -2,7 +2,7 @@
COMMENT = display coverage stats online via coveralls.io
-MODPY_EGG_VERSION = 1.3.0
+MODPY_EGG_VERSION = 1.6.0
DISTNAME = coveralls-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
@@ -18,7 +18,6 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-BUILD_DEPENDS = devel/py-test-runner
RUN_DEPENDS = devel/py-docopt \
devel/py-coverage \
www/py-requests
Index: py-coveralls/distinfo
===
RCS file: /cvs/ports/devel/py-coveralls/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- py-coveralls/distinfo 24 Apr 2018 16:59:43 - 1.5
+++ py-coveralls/distinfo 17 Mar 2019 19:57:17 -
@@ -1,2 +1,2 @@
-SHA256 (coveralls-1.3.0.tar.gz) = ZkeUdI0uVnPjR+xHYVmp2H9D4NLUSVDpjtDie5jag0Y=
-SIZE (coveralls-1.3.0.tar.gz) = 11790
+SHA256 (coveralls-1.6.0.tar.gz) = byE+RhOQlz9Kl/uenU69SVavKW/wpNho5iIQgUWDXLc=
+SIZE (coveralls-1.6.0.tar.gz) = 11024
Index: py-coveralls/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- py-coveralls/pkg/PLIST 24 Apr 2018 16:59:43 - 1.4
+++ py-coveralls/pkg/PLIST 17 Mar 2019 19:57:17 -
@@ -10,12 +10,16 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py
lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.py
+lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/api.py
lib/python${MODPY_VERSION}/site-packages/coveralls/api.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/cli.py
lib/python${MODPY_VERSION}/site-packages/coveralls/cli.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/exception.py
lib/python${MODPY_VERSION}/site-packages/coveralls/exception.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/git.py
+lib/python${MODPY_VERSION}/site-packages/coveralls/git.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.py
lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.pyc
lib/python${MODPY_VERSION}/site-packages/coveralls/version.py
Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?
On Sun, Mar 17, 2019 at 08:02:38PM +0100, Christopher Zimmermann wrote: > On Thu, 14 Mar 2019 23:23:10 +0100 > Marc Espie wrote: > > > Not okay. > > > > You also want an entry in quirks explaining about them, and what to > > do. > > I added the removed packages to quirks with reason 7. Reason 5 would > also apply. is this ok (espie@ ?) > I'd like to wait for another week and then commit if no one objects. Works for me. Ken > > Christopher > > > > -- > http://gmerlin.de > OpenPGP: http://gmerlin.de/christopher.pub > CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1
Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?
On Thu, 14 Mar 2019 23:23:10 +0100 Marc Espie wrote: > Not okay. > > You also want an entry in quirks explaining about them, and what to > do. I added the removed packages to quirks with reason 7. Reason 5 would also apply. is this ok (espie@ ?) I'd like to wait for another week and then commit if no one objects. Christopher -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1 pgpEvcORl9Bjd.pgp Description: OpenPGP digital signature
NEW: security/wpscan
Hi, attached a port of wpscan: WPScan is a black box WordPress vulnerability scanner. I deliberately didn't named the port ruby-wpscan, since it's just a tool, and it's known as just wpscan. If ruby-wpscan would be preferred, I can for sure rename it. needs all of those just sent new gems. comments, concerns, or even test or OKs welcome. cheers, Sebastian wpscan.tar.gz Description: application/gzip
NEW: security/ruby-cms_scanner
Hi, attached port of the cms_scanner gem: Framework to provide an easy way to implement CMS Scanners. needed for the wpscan scanner, and need all of the just posted dependencies. comments, concerns, or even tests or OKs welcome. cheers, Sebastian ruby-cms_scanner.tar.gz Description: application/gzip
NEW: devel/ruby-activesupport
Hi, attached a port of the activesupport gem: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing. comments, concerns, or even tests or OKs welcome. cheers, Sebastian ruby-activesupport.tar.gz Description: application/gzip
NEW: devel/ruby-progressbar
Hi, attached a port of the progressbar gem: Ruby/ProgressBar is an extremely flexible text progress bar library for Ruby. The output can be customized with a flexible formatting system including: percentage, bars of various formats, elapsed time and estimated time remaining. comments, concerns, or even tests or OKs welcome. cheers, Sebastian ruby-progressbar.tar.gz Description: application/gzip
NEW: devel/ruby-opt_parse_validator
Hi, attached a port of the opt_parse_validator gem: Implementation of validators for the Ruby OptionParser lib. Mainly used in the CMSScanner gem to define the cli options available. comments, concerns, or even tests or OKs welcome. Cheers, Sebastian ruby-opt_parse_validator.tar.gz Description: application/gzip
NEW: sysutils/ruby-tzinfo
Hi, attached a port for the tzinfo ruby gem: TZInfo provides access to time zone data and allows times to be converted using time zone rules. comments, concerns, or even test or OKs welcome. Cheers, Sebastian ruby-tzinfo.tar.gz Description: application/gzip
NEW: devel/ruby-thread_safe
Hi, attached a port of the thread_safe gem: A collection of data structures and utilities to make thread-safe programming in Ruby easier. concerns, comments, or even tests or OKs welcome. cheers, Sebastian ruby-thread_safe.tar.gz Description: application/gzip
NEW: www/ruby-typhoeus
Hi, attached a port of the typhoeus ruby gem: Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic. requires the just sent www/ruby-ethon. concerns, comments, or even tests or OK welcome. cheers, Sebastian ruby-typhoeus.tar.gz Description: application/gzip
NEW: www/ruby-ethon
Hi, attached a port of the ruby-ethon gem, a Very lightweight libcurl wrapper. Patch to the Gemfile is just to let the tests run. tests, comments, concers, or even OKs welcome. cheers, Sebastian ruby-ethon.tar.gz Description: application/gzip
NEW: www/ruby-xmlrpc
Hi, attached a port of the ruby-xmlrpc gem, needed as a dependency for wpscan, I want to package. XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP. any concerns, comments, tests or even OK welcome. cheers, Sebastian ruby-xmlrpc.tar.gz Description: application/gzip
Re: Update: productivity/khal 0.9.9* -> 0.9.10
On Wed, Mar 13, 2019 at 09:56:23PM -0400, Kurt Mosiejczuk wrote:
> While looking into another port update, I came across productivity/khal
> that was temporarily not using PyPi until a new version had a fix for
> using py-dateutil >= 2.7. I checked, and such an update is out.
Thanks.
> So I converted the port back to using PyPi. While here, I fixed all the
> tests that would fail if/because LC_CTYPE=C.UTF-8 was not defined for
> the test environment. With that in place, only 4 of the tests fail and
> they are all the ones expecting us to print out different days of
> the week.
Looks good to me; OK kn. Two unrelated nits inline if you care to fix
them along the way.
FWIW, I see five not four tests failing: see my test.log below.
> cc maintainer jung@
Either you put him on Bcc or actually forgot the Cc, so I just added him
to the loop.
> MODPY_SETUPTOOLS = Yes
> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
Replace these ^ spaces with tabs.
> @@ -46,7 +39,10 @@ TEST_DEPENDS = ${RUN_DEPENDS} \
> devel/py-test-cov${MODPY_FLAVOR} \
> devel/py-freezegun${MODPY_FLAVOR}
Sort dependencies alphabetically.
cd /usr/ports/pobj/khal-0.9.10/khal-0.9.10 && exec /usr/bin/env -i CC=cc
PYTHONUSERBASE= PORTSDIR="/usr/ports" LIBTOOL="/usr/bin/libtool"
PATH='/usr/ports/pobj/khal-0.9.10/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin'
PREFIX='/usr/local' LOCALBASE='/usr/local' X11BASE='/usr/X11R6' CFLAGS='-O2
-pipe' TRUEPREFIX='/usr/local' DESTDIR='' HOME='/khal-0.9.10_writes_to_HOME'
COMPILER_VERSION=clang PICFLAG="-fpic" BINGRP=bin BINOWN=root BINMODE=755
NONBINMODE=644 DIRMODE=755 INSTALL_COPY=-c INSTALL_STRIP=-s MANGRP=bin
MANOWN=root MANMODE=644
BSD_INSTALL_PROGRAM="/usr/ports/pobj/khal-0.9.10/bin/install -c -s -m 755"
BSD_INSTALL_SCRIPT="/usr/ports/pobj/khal-0.9.10/bin/install -c -m 755"
BSD_INSTALL_DATA="/usr/ports/pobj/khal-0.9.10/bin/install -c -m 644"
BSD_INSTALL_MAN="/usr/ports/pobj/khal-0.9.10/bin/install -c -m 644"
BSD_INSTALL_PROGRAM_DIR="/usr/ports/pobj/khal-0.9.10/bin/install -d -m 755"
BSD_INSTALL_SCRIPT_DIR="/usr/ports/pobj/khal-0.9.10/bin/install -d -m 755"
BSD_INSTALL_DATA_DIR="/usr/ports/pobj/khal-0.9.10/bin/install -d -m 755"
BSD_INSTALL_MAN_DIR="/usr/ports/pobj/khal-0.9.10/bin/install -d -m 755"
LC_CTYPE=C.UTF-8 /usr/local/bin/python3.6 -m pytest
= test session starts ==
platform openbsd6 -- Python 3.6.8, pytest-3.5.0, py-1.8.0, pluggy-0.6.0
rootdir: /usr/ports/pobj/khal-0.9.10/khal-0.9.10, inifile:
plugins: cov-2.5.1, hypothesis-3.55.1
collected 275 items
tests/backend_test.py .. [ 10%]
tests/cal_display_test.py ...[ 13%]
tests/cli_test.py ..x... [ 27%]
tests/configwizard_test.py . [ 27%]
tests/controller_test.py [ 32%]
tests/event_test.py ... [ 47%]
tests/khalendar_test.py ... [ 56%]
tests/khalendar_utils_test.py ...[ 70%]
tests/settings_test.py ... [ 74%]
tests/terminal_test.py ... [ 75%]
tests/utils_test.py ..F. [ 94%]
[ 95%]
tests/vdir_test.py x.. [ 96%]
tests/vtimezone_test.py ... [ 97%]
tests/ui/test_calendarwidget.py ... [ 98%]
tests/ui/test_editor.py .. [ 99%]
tests/ui/test_widgets.py . [100%]
=== FAILURES ===
_ test_vertical_month_unicode __
def test_vertical_month_unicode():
try:
locale.setlocale(locale.LC_ALL, 'de_DE.UTF-8')
vert_str = vertical_month(month=12, year=2011,
today=datetime.date(2011, 12, 12))
# de_DE locale on at least Net and FreeBSD is different from the one
# commonly used on linux systems
if platform.system() == 'FreeBSD':
assert vert_str == example_de_freebsd
elif platform.system() == 'NetBSD':
assert vert_str == example_de_netbsd
else:
> assert vert_str == example_de
E AssertionError: assert ['\x1b[1m... 31 1 ', ...] ==
['\x1b[1mM... 31 1 ', ...]
E At index 0 diff: '\x1b
Re: devel/intellij: use pax for install, drop unneeded chmod
On 2019/03/17 12:54, Klemens Nanni wrote:
> When testing an update, I noticed how the fake target took quite long
> on my X230 with POBJDIR sitting on MFS; this is due to needless
> compression and decompression. Using simpler pax(1) is much faster:
>
> time { tar -czf - -C /usr/ports/pobj/intellij-2018.3.5/idea-IC-183.5912.21 .
> | tar xzf - -C
> /usr/ports/pobj/intellij-2018.3.5/fake-amd64/usr/local/intellij; }
> 1m01.83s real 1m09.53s user 0m11.72s system
>
> time { cd /usr/ports/pobj/intellij-2018.3.5/idea-IC-183.5912.21 && pax -rw .
> /usr/ports/pobj/intellij-2018.3.5/fake-amd64/usr/local/intellij ; }
> 0m05.92s real 0m00.14s user 0m05.71s system
>
>
> While here, stop setting the same mode twice:
>
> $ make -p | grep ^SUBST_PROGRAM
> SUBST_PROGRAM= ${SUBST_CMD} -c -m ${BINMODE}
>
> OK?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/intellij/Makefile,v
> retrieving revision 1.58
> diff -u -p -r1.58 Makefile
> --- Makefile 9 Mar 2019 09:55:50 - 1.58
> +++ Makefile 17 Mar 2019 11:47:29 -
> @@ -36,14 +36,13 @@ do-build:
>
> do-install:
> ${INSTALL_DATA_DIR} ${IJ}
> - @tar -czf - -C ${WRKDIST} . | tar xzf - -C ${IJ}
> + cd ${WRKDIST} && pax -rw . ${IJ}
> @rm -rf ${IJ}/bin/libdbm64.so
> @rm -rf ${IJ}/jre
> @rm -rf ${IJ}/jre64
> @rm -rf ${IJ}/plugins/android
> @rm -rf
> ${IJ}/plugins/gradle/lib/native-platform-{freebsd,linux,osx,windows}*.jar
> @${SUBST_PROGRAM} ${FILESDIR}/idea ${PREFIX}/bin/idea
> - @chmod ${BINMODE} ${PREFIX}/bin/idea
> @ln -s ${TRUEPREFIX}/bin/idea ${PREFIX}/bin/intellij
> ${INSTALL_MAN} ${FILESDIR}/idea.1 ${PREFIX}/man/man1
> ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
>
OK (or you could just remove the 'z').
netbeans does the same.
Re: Adding TEST_ENV/UTF-8 to various ports
Hi,
Remi Locherer wrote on Sat, Mar 16, 2019 at 11:26:54PM +0100:
> On Sat, Mar 16, 2019 at 09:48:21PM +, Stuart Henderson wrote:
>> On 2019/03/16 22:12, Remi Locherer wrote:
>>> Index: lang/python/python.port.mk
>>> ===
>>> RCS file: /cvs/ports/lang/python/python.port.mk,v
>>> retrieving revision 1.100
>>> diff -u -p -r1.100 python.port.mk
>>> --- lang/python/python.port.mk 4 Dec 2018 05:57:31 - 1.100
>>> +++ lang/python/python.port.mk 16 Mar 2019 20:40:34 -
>>> @@ -150,6 +150,7 @@ CONFIGURE_ENV +=PYTHON="${MODPY_BIN}"
>>> CONFIGURE_ENV += ac_cv_prog_PYTHON="${MODPY_BIN}" \
>>> ac_cv_path_PYTHON="${MODPY_BIN}"
>>> .endif
>>> +TEST_ENV +=LC_CTYPE=C.UTF-8
>> Do we actually support LC_CTYPE=C.UTF-8?
We do not recommend it; the locale(1) manual page only recommends
either leaving LC_* unset or setting LC_CTYPE=en_US.UTF-8.
But we do support it, just like we support LC_CTYPE=FooBar.UTF-8.
The locale(1) manual page says:
If the value of LC_CTYPE ends in ".UTF-8", programs in the OpenBSD
base system ignore the beginning of it, treating for example
zh_CN.UTF-8 exactly like en_US.UTF-8. Programs from packages(7)
may however make a difference.
Theoretically, it could happen that at some point in the future,
we might stop supporting LC_CTYPE=FooBar.UTF-8, though i do not
expect that. But i don't think we could ever stop supporting
LC_CTYPE=C.UTF-8. It seems too widespread in practice, and removing
support for it would no doubt break more than one thing in ports.
> According to "locale -a" we do.
The -a option of locale(1) is a scam. It should never be used as
an argument for or against anything. Its only purpose is to appease
ports who insist in inspecting it, but even for that purpose, it
is far from perfect.
> I proposed C.UTF-8 because I think this is what python prefers
> after skimming over https://www.python.org/dev/peps/pep-0538/ .
If that's what Python folks like, i think there is nothing wrong with
using it; on OpenBSD, it's just an alias for LC_CTYPE=en_US.UTF-8.
On other operating systems, it may or may not work, exactly like
LC_CTYPE=en_US.UTF-8 may or may not work elsewehere. I have seen
systems where LC_CTYPE=en_US.UTF-8 works and LC_CTYPE=C.UTF-8 does
not and vice versa; i think i have even seen systems where neither
work. Locale names are simply not standardized - except for "C"
and "POSIX".
I didn't speak up earlier because the last time i did a substantial
programming project in Python was about a decade ago, so i'm no
longer qualified to OK or to object to Python patches...
Yours,
Ingo
Re: Adding TEST_ENV/UTF-8 to various ports
On Sat, Mar 16, 2019 at 11:26:54PM +0100, Remi Locherer wrote: > > Do we actually support LC_CTYPE=C.UTF-8? > > > > According to "locale -a" we do. > > I proposed C.UTF-8 because I think this is what python prefers after skimming > over https://www.python.org/dev/peps/pep-0538/ . This; the following ports already use it: devel/py-click-log devel/py-dateutil devel/py-ipython_genutils devel/py-lazy-object-proxy devel/py-path.py devel/py-py net/toot sysutils/py-scandir telephony/py-phonenumbers textproc/py-prettytable textproc/py-unidecode www/jupyter-notebook www/py-flask www/weboob I'm OK with your bsd.port.mk diff, but please update port-modules(5) accordingly.
Re: [ports-gcc] Unbreak games/grhino
On Sun, 17 Mar 2019 08:06:42 +0100
Remi Pointel wrote:
> On 3/16/19 11:28 PM, Charlene Wendling wrote:
> > Hi Remi, ports,
> >
> >> http://build-failures.rhaalovely.net/powerpc/2019-02-04/games/grhino.log
> >> http://build-failures.rhaalovely.net/sparc64/2019-02-03/games/grhino.log
> >
> > There are missing headers. And while here i've fixed some warnings
> > because execlp(3) wants null terminated arguments list anyway.
> >
> > Once these headers are added, it builds [1] and runs [2] fine.
> > I've tested back on amd64 - it still builds [3], runtime is good
> > as well.
> >
> > Any comment?
>
> Hi,
>
> thanks for your work.
>
> The patch seems good, you also can remove me as the maintainer
> because I don't use this port anymore.
You're welcome! It's done. Any objection to commit it?
> Cheers,
>
> Remi.
>
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/games/grhino/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile24 Oct 2018 14:28:03 - 1.21
+++ Makefile17 Mar 2019 14:17:13 -
@@ -3,12 +3,10 @@
COMMENT = Othello/Reversi-like game
DISTNAME = grhino-${V}
V =0.16.1
-REVISION= 7
+REVISION= 8
CATEGORIES = games
HOMEPAGE = http://rhino.sourceforge.net/
FIX_EXTRACT_PERMISSIONS=Yes
-
-MAINTAINER = Remi Pointel
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
Index: patches/patch-aiai_cc
===
RCS file: patches/patch-aiai_cc
diff -N patches/patch-aiai_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-aiai_cc 17 Mar 2019 14:17:13 -
@@ -0,0 +1,33 @@
+$OpenBSD$
+Hunk 1: ports-gcc fix for:
+aiai.cc:111:18: error: 'srand' was not declared in this scope
+Hunk 2 & 3: suppress warnings
+Index: aiai.cc
+--- aiai.cc.orig
aiai.cc
+@@ -29,6 +29,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+ #include
+@@ -209,7 +210,7 @@ void connect_clients()
+ close(fifo_white_to_client[1]);
+ close(fifo_white_to_server[0]);
+ close(fifo_white_to_server[1]);
+- if (execlp("/bin/sh", "sh", "-c", cmd_black, 0) == -1)
++ if (execlp("/bin/sh", "sh", "-c", cmd_black, NULL) == -1)
+ throw std::runtime_error(_("cannot run black GTP
client"));
+ }
+
+@@ -229,7 +230,7 @@ void connect_clients()
+ close(fifo_white_to_client[1]);
+ close(fifo_white_to_server[0]);
+ close(fifo_white_to_server[1]);
+- if (execlp("/bin/sh", "sh", "-c", cmd_white, 0) == -1)
++ if (execlp("/bin/sh", "sh", "-c", cmd_white, NULL) == -1)
+ throw std::runtime_error(_("cannot run white GTP
client"));
+ }
+
Index: patches/patch-gen_book_cc
===
RCS file: patches/patch-gen_book_cc
diff -N patches/patch-gen_book_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-gen_book_cc 17 Mar 2019 14:17:13 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+ports-gcc fix for:
+gen_book.cc:519:29: error: 'strcmp' was not declared in this scope
+Index: gen_book.cc
+--- gen_book.cc.orig
gen_book.cc
+@@ -25,6 +25,8 @@
+
+ #include
+
++#include
++
+ #include "book.h"
+ #include "hash.h"
+ #include "log_proc.h"
Index: patches/patch-gen_pattern_cc
===
RCS file: patches/patch-gen_pattern_cc
diff -N patches/patch-gen_pattern_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-gen_pattern_cc17 Mar 2019 14:17:13 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+ports-gcc fix for:
+gen_pattern.cc:622:28: error: 'strcmp' was not declared in this scope
+Index: gen_pattern.cc
+--- gen_pattern.cc.orig
gen_pattern.cc
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
[ports-gcc] Unbreak audio/qsynth
Hi Sebastian, ports,
> http://build-failures.rhaalovely.net/powerpc/last/audio/qsynth.log
(Qt5 doesn't build on sparc64)
What happens behind the scenes (may it be clang or gcc):
- Cmake search for math libs [1], and can't find them, setting
CONFIG_ROUND not defined
- Later, lroundf() is declared as a bundled, static function [2]
The problem (to me) is that it seems that Qt headers pull , so
there is a clash when using gcc. That doesn't occur with clang.
There are several way to fix it, but in any case, would cause
an out of scope error with ports-gcc, similarily to what you can find in
math/{veusz,kst} in powerpc build failures.
So i'm explicitly including when not using clang on OpenBSD,
to point the problem out (but alternatives are welcome).
It then builds fine on macppc [3] and amd64 [4].
Charlène.
[1] https://github.com/rncbc/qsynth/blob/master/CMakeLists.txt#L58
[2]
https://github.com/rncbc/qsynth/blob/master/src/qsynthMainForm.cpp#L103
[3] http://0x0.st/z8qH.txt
[4] http://0x0.st/z8qX.txt
Index: Makefile
===
RCS file: /cvs/ports/audio/qsynth/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile8 Mar 2019 20:00:40 - 1.6
+++ Makefile17 Mar 2019 13:45:26 -
@@ -3,7 +3,7 @@
COMMENT = Qt GUI Interface for FluidSynth
DISTNAME = qsynth-0.5.4
-REVISION = 0
+REVISION = 1
CATEGORIES = audio
Index: patches/patch-src_qsynthMainForm_cpp
===
RCS file: patches/patch-src_qsynthMainForm_cpp
diff -N patches/patch-src_qsynthMainForm_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_qsynthMainForm_cpp17 Mar 2019 13:45:26 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+ports-gcc fix. lroundf() is not detected during configuration, so CONFIG_ROUND
+is undefined. But is pulled by Qt headers already, creating a conflict
+between 's lroundf() and the bundled lroundf().
+
+Using would cause an out of scope error.
+
+Index: src/qsynthMainForm.cpp
+--- src/qsynthMainForm.cpp.orig
src/qsynthMainForm.cpp
+@@ -103,6 +103,8 @@ static int g_fdStdout[2] = { QSYNTH_FDNIL, QSYNTH_FDNI
+ // Needed for lroundf()
+ #ifdef CONFIG_ROUND
+ #include
++#elif defined(__OpenBSD__) && !defined(__clang__)
++#include
+ #else
+ static inline long lroundf ( float x )
+ {
Re: i3: drop unneeded builddir, set debug conditionally
On Sat, Mar 16, 2019 at 11:02:04PM +0100, Klemens Nanni wrote:
> CONFIGURE_STYLE=gnu and the port already handle SEPARATE_BUILD
> gracefully, there's not need to pass the directory explicitly.
>
> Also, when passing DEBUG, I'd like to enable the debug switch for
> obvious reasons; that's how we do it for other ports already such as
> mail/mutt for example.
>
committed with i3 update, thanks
Giovanni
> OK?
>
> Index: x11/i3/Makefile
> ===
> RCS file: /cvs/ports/x11/i3/Makefile,v
> retrieving revision 1.115
> diff -u -p -r1.115 Makefile
> --- x11/i3/Makefile 18 Jan 2019 11:34:20 - 1.115
> +++ x11/i3/Makefile 16 Mar 2019 21:52:23 -
> @@ -46,12 +46,14 @@ FAKE_FLAGS = i3confdir="${PREFIX}/share/
> SEPARATE_BUILD =Yes
> USE_GMAKE = Yes
> CONFIGURE_STYLE =gnu
> -CONFIGURE_ARGS =--enable-builddir=${WRKBUILD} \
> - --enable-debug=no
> CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include \
> -I${LOCALBASE}/include" \
> LDFLAGS="-L${X11BASE}/lib \
>-L${LOCALBASE}/lib"
> +
> +.if defined(DEBUG)
> +CONFIGURE_ARGS +=--enable-debug
> +.endif
>
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/etc/config \
>
signature.asc
Description: PGP signature
Re: erminus-font: update and build raw fonts for wscons(4)
Stuart Henderson @ 2019-03-15T22:33:31 +0100: [...] > What do you think Daniel, is this ok with you? Yes, thank you for taking care of this! Daniel
Re: opencv3: graphics/nomacs
OK
devel/intellij: use pax for install, drop unneeded chmod
When testing an update, I noticed how the fake target took quite long
on my X230 with POBJDIR sitting on MFS; this is due to needless
compression and decompression. Using simpler pax(1) is much faster:
time { tar -czf - -C /usr/ports/pobj/intellij-2018.3.5/idea-IC-183.5912.21 . |
tar xzf - -C /usr/ports/pobj/intellij-2018.3.5/fake-amd64/usr/local/intellij; }
1m01.83s real 1m09.53s user 0m11.72s system
time { cd /usr/ports/pobj/intellij-2018.3.5/idea-IC-183.5912.21 && pax -rw .
/usr/ports/pobj/intellij-2018.3.5/fake-amd64/usr/local/intellij ; }
0m05.92s real 0m00.14s user 0m05.71s system
While here, stop setting the same mode twice:
$ make -p | grep ^SUBST_PROGRAM
SUBST_PROGRAM= ${SUBST_CMD} -c -m ${BINMODE}
OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile9 Mar 2019 09:55:50 - 1.58
+++ Makefile17 Mar 2019 11:47:29 -
@@ -36,14 +36,13 @@ do-build:
do-install:
${INSTALL_DATA_DIR} ${IJ}
- @tar -czf - -C ${WRKDIST} . | tar xzf - -C ${IJ}
+ cd ${WRKDIST} && pax -rw . ${IJ}
@rm -rf ${IJ}/bin/libdbm64.so
@rm -rf ${IJ}/jre
@rm -rf ${IJ}/jre64
@rm -rf ${IJ}/plugins/android
@rm -rf
${IJ}/plugins/gradle/lib/native-platform-{freebsd,linux,osx,windows}*.jar
@${SUBST_PROGRAM} ${FILESDIR}/idea ${PREFIX}/bin/idea
- @chmod ${BINMODE} ${PREFIX}/bin/idea
@ln -s ${TRUEPREFIX}/bin/idea ${PREFIX}/bin/intellij
${INSTALL_MAN} ${FILESDIR}/idea.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
[UPDATE] security/aide 0.16 -> 0.16.1
Greetings ports,
I have included a diff for aide. Upgrade to latest release.
The project is now hosted on github and the lists have moved.
Changes to currently ported release 0.16 to 0.16.1:
https://github.com/aide/aide/compare/543c3f9...62cf11b
Build tested and validated basic functionality.
The option '-l' now works as expected.
OK?
Regards,
Marcos Madeira
Index: Makefile
===
RCS file: /cvs/ports/security/aide/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile 30 Aug 2016 06:21:31 - 1.24
+++ Makefile 17 Mar 2019 07:11:10 -
@@ -2,16 +2,16 @@
COMMENT= Advanced Intrusion Detection Environment
-DISTNAME= aide-0.16
+V= 0.16.1
+DISTNAME= aide-${V}
CATEGORIES= security
-REVISION = 0
-HOMEPAGE= http://sourceforge.net/projects/aide
+HOMEPAGE= https://github.com/aide/aide
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aide/}
+MASTER_SITES= https://github.com/aide/aide/releases/download/v${V}/
BUILD_DEPENDS= devel/bison \
devel/pcre \
Index: distinfo
===
RCS file: /cvs/ports/security/aide/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 3 Aug 2016 06:38:47 - 1.10
+++ distinfo 17 Mar 2019 07:11:10 -
@@ -1,2 +1,2 @@
-SHA256 (aide-0.16.tar.gz) = qBxToTHE/RMLFps6Jqw1OGovbh4BTxKAdSTMJz7Zc0U=
-SIZE (aide-0.16.tar.gz) = 391009
+SHA256 (aide-0.16.1.tar.gz) = Dyt87McMGifTXAbJiAT8258yZjDeXQNa/ERxIhhgELc=
+SIZE (aide-0.16.1.tar.gz) = 391531
Re: [ports-gcc] Unbreak games/grhino
On 3/16/19 11:28 PM, Charlene Wendling wrote: Hi Remi, ports, http://build-failures.rhaalovely.net/powerpc/2019-02-04/games/grhino.log http://build-failures.rhaalovely.net/sparc64/2019-02-03/games/grhino.log There are missing headers. And while here i've fixed some warnings because execlp(3) wants null terminated arguments list anyway. Once these headers are added, it builds [1] and runs [2] fine. I've tested back on amd64 - it still builds [3], runtime is good as well. Any comment? Hi, thanks for your work. The patch seems good, you also can remove me as the maintainer because I don't use this port anymore. Cheers, Remi.
