CVS: cvs.openbsd.org: ports

2016-11-05 Thread Jonathan Gray
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/11/05 23:44:21

Modified files:
lang/luajit: Makefile 

Log message:
Remove the lua52 FLAVOR of luajit which build with LUAJIT_ENABLE_LUA52COMPAT
defined and wrongly patched luajit to set the abi to lua 5.2.
luajit can not load lua modules built against the lua 5.2 headers even
when build with LUAJIT_ENABLE_LUA52COMPAT.

Even without LUAJIT_ENABLE_LUA52COMPAT luajit has some 5.2 semantics,
the define enables a few other things such making unpack() available
as table.unpack().

No system vendors seem to ship a version of luajit with the define set
and the consensus is to just remove the FLAVOR.

Remove abieber@ as MAINTAINER at his request.

ok jca@ abieber@ juanfra@



Re: Update: devel/gmp 6.1.1

2016-11-05 Thread Jeremie Courreges-Anglas
Christian Weisgerber  writes:

> This is a long overdue update of devel/gmp to the latest release
> (6.1.1).  The regression tests are fine on amd64 and i386.  Since
> this uses assembly optimizations just about everywhere, testing on
> other archs would be appreciated, although I'm not sure what we're
> going to do about failures.

Tests pass on sparc64 and alpha.  The update looks fine, I think gmpxx
could be fine with only a minor bump, but I doubt it gains us much.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/11/05 19:39:54

Modified files:
security/dante : Makefile 
Added files:
security/dante/patches: patch-lib_hostcache_c 

Log message:
Stop accessing free'd memory; fixes programs running under socksify.

Discussed with upstream.



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/11/05 19:32:32

Modified files:
devel/elftoolchain: Makefile 
Added files:
devel/elftoolchain/patches: patch-common_elfdefinitions_h 

Log message:
Fix build on alpha.

On alpha,  defines ELF_TARG_MACH to EM_ALPHA_EXP,
unknown to elftoolchain.  Add a define, value from .

ok phessler@



Re: Fix devel/elftoolchain on alpha

2016-11-05 Thread Peter Hessler
On 2016 Nov 05 (Sat) at 22:45:48 +0100 (+0100), Jeremie Courreges-Anglas wrote:
:
:  http://build-failures.rhaalovely.net//alpha/2016-10-18/devel/elftoolchain.log
:
:says
:
:  elf.c:34: error: 'EM_ALPHA_EXP' undeclared here (not in a function)
:
:EM_ALPHA_EXP comes from 
:
:  #define ELF_TARG_MACH EM_ALPHA_EXP
:
:and elftoolchain on OpenBSD uses ELF_TARG_MACH to find out the
:architecture.  elftoolchain doesn't define anything for EM_ALPHA_EXP,
:only for EM_ALPHA, with a different value.
:
:The ecosystem seems to use a mix of EM_ALPHA_STD==41,
:EM_ALPHA_EXP=0x9026, and EM_ALPHA==41 or EM_ALPHA=0x9026, so it's not
:very consistent.
:
:This patch adds a definition for EM_ALPHA_EXP 0x9026 (as defined in
:sys/exec_elf.h) and allows building elftoolchain on alpha (I didn't test
:packaging on that architecture).  The REVISION bump is needed since
:elfdefinitions.h is shipped by the package.
:

With this patch, it packages.  Other than that, no idea how to use it.


:ok?
:

OK


:
:Index: Makefile
:===
:RCS file: /d/cvs/ports/devel/elftoolchain/Makefile,v
:retrieving revision 1.2
:diff -u -p -r1.2 Makefile
:--- Makefile   1 Sep 2016 11:13:12 -   1.2
:+++ Makefile   5 Nov 2016 20:34:09 -
:@@ -3,7 +3,7 @@
: COMMENT = BSD-licensed implementation of compilation tools
: 
: DISTNAME =elftoolchain-0.7.1
:-REVISION =0
:+REVISION =1
: CATEGORIES =  devel
: 
: # BSD
:Index: patches/patch-common_elfdefinitions_h
:===
:RCS file: patches/patch-common_elfdefinitions_h
:diff -N patches/patch-common_elfdefinitions_h
:--- /dev/null  1 Jan 1970 00:00:00 -
:+++ patches/patch-common_elfdefinitions_h  5 Nov 2016 19:56:32 -
:@@ -0,0 +1,11 @@
:+$OpenBSD$
:+--- common/elfdefinitions.h.orig  Sat Nov  5 20:55:50 2016
: common/elfdefinitions.h   Sat Nov  5 20:55:52 2016
:+@@ -585,6 +585,7 @@ _ELF_DEFINE_EM(EM_RH32, 38, "TRW RH-32")  

:+ _ELF_DEFINE_EM(EM_RCE,  39, "Motorola RCE")  
\
:+ _ELF_DEFINE_EM(EM_ARM,  40, "Advanced RISC Machines ARM")
\
:+ _ELF_DEFINE_EM(EM_ALPHA,41, "Digital Alpha") \
:++_ELF_DEFINE_EM(EM_ALPHA_EXP,0x9026, "Digital Alpha") \
:+ _ELF_DEFINE_EM(EM_SH,   42, "Hitachi SH")
\
:+ _ELF_DEFINE_EM(EM_SPARCV9,  43, "SPARC Version 9")   \
:+ _ELF_DEFINE_EM(EM_TRICORE,  44,  
\
:
:
:-- 
:jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

-- 
Economists can certainly disappoint you.  One said that the economy
would turn up by the last quarter.  Well, I'm down to mine and it
hasn't.
-- Robert Orben



meta/haskell-platform -- full or minimal?

2016-11-05 Thread Matthias Kilian
Hi,

it looks like the concept of a haskell platform has been stripped
down do a "minimal" and a "full" flavor:

https://www.haskell.org/platform/contents.html

I prefer the "minimal" version, because it's less work for me (less
constraints on library versions, maybe even less hs-ports).

If anyone prefers the "full" version, please let me know why.

Ciao,
Kili



Re: remove devel/eclipse ?

2016-11-05 Thread Matthias Kilian
Hi,

On Fri, Nov 04, 2016 at 11:12:46PM +0100, Landry Breuil wrote:
> while looking at horrible things in the portstree, i was remembered that
> we still had eclipse 3.2.2, which is from february 2007. There were
> attempts around 2013 to have eclipse 4.2, but that wasnt finished.
> 
> Are people really using that old cruft to build meaningful stuff on
> OpenBSD ? Does it cope with the versions of java we have ? I don't have
> answers to these questions, but im not sure we're doing a great service
> to our users to keep that old junk in the tree, so it might be a good
> candidate for removal... opinions ?

I think I mentioned (friday evening, on icb), that the eclipse
version we have in our tree may not play well with newer java
features, and I had generics in mind. On the other hand, generics
have been introduced in 2004, so i guess our eclipse at least
supports generics.

Not sure about other language features introduced since then. But
I'm not doing much Java stuff these days, and when I do, I'm using
vi(1).

And there are some alternatives (netbeans, intellij), but I don't
know how good or bad they are compared to eclipse. I think they
both have features like showing call-graphs, doing several kinds
of mechanical refactoring etc.

So: *shrug* I probably wouldn't miss it much.

Ciao,
Kili



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2016/11/05 16:33:49

Modified files:
lang   : Makefile 

Log message:
Hookup mruby



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2016/11/05 16:31:28

Log message:
Import mruby 1.2.0

mruby is a lightweight, easy to embed version of ruby.

Help from juanfra@ and pirofti@
OK juanfra@

Status:

Vendor Tag: jeremy
Release Tags:   jeremy_2016-Nov-05

N ports/lang/mruby/Makefile
N ports/lang/mruby/distinfo
N ports/lang/mruby/pkg/DESCR
N ports/lang/mruby/pkg/PLIST
N ports/lang/mruby/patches/patch-tasks_mruby_build_rake

No conflicts created by this import



Re: Make portbump actually bump even if REVISION is not set

2016-11-05 Thread Jeremy Evans
On 11/05 11:48, Stuart Henderson wrote:
> On 2016/11/04 14:06, Jeremy Evans wrote:
> > Currently if you call portbump and the Makefile does not have REVISION
> > set, it does nothing.  That definitely was not what I expect, since a
> > bump if REVISION is not set involves setting REVISION = 0. Other b2k16
> > attendees also agree.
> 
> er, that does work for me already, check @_REV_NEIGHBORS
> 

Well, it doesn't work for me.  Example with databases/ruby-sequel
(which currently has no REVISION):

cd /usr/ports
infrastructure/bin/portbump databases/ruby-sequel
cvs diff databases/ruby-sequel/Makefile
# Without Patch: No Output
# With Patch:
Index: databases/ruby-sequel/Makefile
===
RCS file: /cvs/ports/databases/ruby-sequel/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- databases/ruby-sequel/Makefile  4 Nov 2016 21:30:02 - 1.38
+++ databases/ruby-sequel/Makefile  5 Nov 2016 22:15:42 -
@@ -3,6 +3,7 @@
 COMMENT =  lightweight database library and ORM for Ruby

 DISTNAME = sequel-4.40.0
+REVISION = 0
 CATEGORIES =   databases

 HOMEPAGE = http://sequel.jeremyevans.net/


Maybe the existing code works in some cases but not others, but it
definitely doesn't handle all cases.  It's likely there is a better
fix than my approach.  CCing zhuk@, maybe he could come up with a
better solution.

Thanks,
Jeremy



Fix devel/elftoolchain on alpha

2016-11-05 Thread Jeremie Courreges-Anglas

  http://build-failures.rhaalovely.net//alpha/2016-10-18/devel/elftoolchain.log

says

  elf.c:34: error: 'EM_ALPHA_EXP' undeclared here (not in a function)

EM_ALPHA_EXP comes from 

  #define ELF_TARG_MACH EM_ALPHA_EXP

and elftoolchain on OpenBSD uses ELF_TARG_MACH to find out the
architecture.  elftoolchain doesn't define anything for EM_ALPHA_EXP,
only for EM_ALPHA, with a different value.

The ecosystem seems to use a mix of EM_ALPHA_STD==41,
EM_ALPHA_EXP=0x9026, and EM_ALPHA==41 or EM_ALPHA=0x9026, so it's not
very consistent.

This patch adds a definition for EM_ALPHA_EXP 0x9026 (as defined in
sys/exec_elf.h) and allows building elftoolchain on alpha (I didn't test
packaging on that architecture).  The REVISION bump is needed since
elfdefinitions.h is shipped by the package.

ok?


Index: Makefile
===
RCS file: /d/cvs/ports/devel/elftoolchain/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile1 Sep 2016 11:13:12 -   1.2
+++ Makefile5 Nov 2016 20:34:09 -
@@ -3,7 +3,7 @@
 COMMENT =  BSD-licensed implementation of compilation tools
 
 DISTNAME = elftoolchain-0.7.1
-REVISION = 0
+REVISION = 1
 CATEGORIES =   devel
 
 # BSD
Index: patches/patch-common_elfdefinitions_h
===
RCS file: patches/patch-common_elfdefinitions_h
diff -N patches/patch-common_elfdefinitions_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-common_elfdefinitions_h   5 Nov 2016 19:56:32 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- common/elfdefinitions.h.orig   Sat Nov  5 20:55:50 2016
 common/elfdefinitions.hSat Nov  5 20:55:52 2016
+@@ -585,6 +585,7 @@ _ELF_DEFINE_EM(EM_RH32, 38, "TRW RH-32")   

+ _ELF_DEFINE_EM(EM_RCE,  39, "Motorola RCE")   
\
+ _ELF_DEFINE_EM(EM_ARM,  40, "Advanced RISC Machines ARM") \
+ _ELF_DEFINE_EM(EM_ALPHA,41, "Digital Alpha")  \
++_ELF_DEFINE_EM(EM_ALPHA_EXP,0x9026, "Digital Alpha")  \
+ _ELF_DEFINE_EM(EM_SH,   42, "Hitachi SH") \
+ _ELF_DEFINE_EM(EM_SPARCV9,  43, "SPARC Version 9")\
+ _ELF_DEFINE_EM(EM_TRICORE,  44,   
\


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Re: update lang/ghc

2016-11-05 Thread Karel Gardas
On Sat, Nov 5, 2016 at 6:11 PM, Stuart Henderson  wrote:
> On 2016/11/05 14:00, Karel Gardas wrote:
>> and if I'm on the same like you, then its clear that I got garbled
>> patch from gmail.com...
>
> gmail is useless for patches, you can fetch it raw from marc.info.
>

Thanks for confirmation.

BTW, after moving /usr/ports to wxallowed mount location I've been
able to build ghc-8.0.1 package well.



CVS: cvs.openbsd.org: ports

2016-11-05 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/11/05 15:27:26

Modified files:
audio/pianobar : Makefile 
Added files:
audio/pianobar/patches: patch-src_player_c 

Log message:
Turn off ffmpeg's non-fatal error messages.

"Skipping 0 bytes of junk" is useless to the user, and essentially
indicates a NOP.

upstream git commit 7c2d9ebb7f61cf04d75e28ca5cd6932002c4357b



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/05 11:42:53

Modified files:
x11/gnome/builder: Makefile 
x11/gnome/builder/patches: 
   patch-plugins_terminal_gb-terminal-view_c 

Log message:
Sync with BZ.



Re: UPDATE: textproc/py-sphinx 1.4.8

2016-11-05 Thread frantisek holop
ok

Alexandr Shadchin, 05 Nov 2016 19:02:
> Hi,
> 
> This diff updates py-sphinx to the latest release.
> Tested on amd64.
> 
> Comments ? OK ?
> 
> -- 
> Alexandr Shadchin
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/py-sphinx/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- Makefile  1 Sep 2016 05:49:57 -   1.19
> +++ Makefile  5 Nov 2016 12:14:25 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =python documentation generator
>  
> -MODPY_EGG_VERSION =  1.4.6
> +MODPY_EGG_VERSION =  1.4.8
>  DISTNAME =   Sphinx-${MODPY_EGG_VERSION}
>  PKGNAME =py-sphinx-${MODPY_EGG_VERSION}
>  
> @@ -26,8 +26,7 @@ RUN_DEPENDS =   devel/py-babel${MODPY_FLA
>   textproc/py-pygments${MODPY_FLAVOR} \
>   textproc/py-sphinx_rtd_theme${MODPY_FLAVOR} \
>   textproc/py-snowballstemmer${MODPY_FLAVOR} \
> - www/py-jinja2${MODPY_FLAVOR} \
> - www/py-requests${MODPY_FLAVOR}
> + www/py-jinja2${MODPY_FLAVOR}
>  BUILD_DEPENDS =  ${RUN_DEPENDS}
>  TEST_DEPENDS =   devel/py-mock${MODPY_FLAVOR} \
>   devel/py-nose${MODPY_FLAVOR} \
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/py-sphinx/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo  1 Sep 2016 05:49:57 -   1.7
> +++ distinfo  5 Nov 2016 12:14:25 -
> @@ -1,2 +1,2 @@
> -SHA256 (Sphinx-1.4.6.tar.gz) = nkNDCqm0kezYYwKhMg7biXfaYk9jQi1JQlfqslQaedM=
> -SIZE (Sphinx-1.4.6.tar.gz) = 4489982
> +SHA256 (Sphinx-1.4.8.tar.gz) = Qa+Xj2U++GLrS7N3bavY/xOv7RfkMZBzEP6ZCjlHcH8=
> +SIZE (Sphinx-1.4.8.tar.gz) = 4494940
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/textproc/py-sphinx/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST
> --- pkg/PLIST 1 Sep 2016 05:49:57 -   1.6
> +++ pkg/PLIST 5 Nov 2016 12:14:26 -
> @@ -389,6 +389,8 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/sphinx/make_mode.py
>  lib/python${MODPY_VERSION}/site-packages/sphinx/parsers.py
>  lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/
> +lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/Grammar-py2-sphinx1.2.pickle
> +lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/Grammar-py2-sphinx1.4.pickle
>  lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/Grammar-py2.pickle
>  lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/Grammar-py2.txt
>  lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/Grammar-py3.pickle
> @@ -637,6 +639,7 @@ lib/python${MODPY_VERSION}/site-packages
>  
> lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}parallel.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}png.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}pycompat.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}rst.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}smartypants.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}stemmer.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}tags.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -658,6 +661,7 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/sphinx/util/parallel.py
>  lib/python${MODPY_VERSION}/site-packages/sphinx/util/png.py
>  lib/python${MODPY_VERSION}/site-packages/sphinx/util/pycompat.py
> +lib/python${MODPY_VERSION}/site-packages/sphinx/util/rst.py
>  lib/python${MODPY_VERSION}/site-packages/sphinx/util/smartypants.py
>  lib/python${MODPY_VERSION}/site-packages/sphinx/util/stemmer.py
>  lib/python${MODPY_VERSION}/site-packages/sphinx/util/tags.py

-- 
if you do nothing, how do you know when you're finished?



Re: UPDATE: www/py-beautifulsoup4 4.5.1

2016-11-05 Thread frantisek holop
ok

Alexandr Shadchin, 05 Nov 2016 16:22:
> Hi,
> 
> This diff updates py-beautifulsoup4 to the latest release.
> Tested on amd64.
> 
> Comments ? OK ?
> 
> -- 
> Alexandr Shadchin
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/py-beautifulsoup4/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile  2 Jan 2016 13:27:22 -   1.4
> +++ Makefile  5 Nov 2016 11:18:55 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =HTML/XML parser that supports invalid markup
>  
> -MODPY_EGG_VERSION =  4.4.1
> +MODPY_EGG_VERSION =  4.5.1
>  DISTNAME =   beautifulsoup4-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
>  
> @@ -14,9 +14,8 @@ MAINTAINER =frantisek holop   # MIT
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -MASTER_SITES =   ${HOMEPAGE}bs4/download/4.4/
> +MASTER_SITES =   ${HOMEPAGE}bs4/download/4.5/
>  
> -PKG_ARCH =   *
>  MODULES =lang/python
>  
>  TEST_DEPENDS =   devel/py-html5lib${MODPY_FLAVOR} \
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/py-beautifulsoup4/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  2 Jan 2016 13:27:22 -   1.3
> +++ distinfo  5 Nov 2016 11:18:55 -
> @@ -1,2 +1,2 @@
> -SHA256 (beautifulsoup4-4.4.1.tar.gz) = 
> h9QBPQYl1HiaT1a415oE1c5tsRUrtl8dOXRPdwmjZrQ=
> -SIZE (beautifulsoup4-4.4.1.tar.gz) = 152140
> +SHA256 (beautifulsoup4-4.5.1.tar.gz) = 
> PJR0A2r9qRNqrGRj3vcz+BAXv57zUQ0lY08zWwyH9eE=
> +SIZE (beautifulsoup4-4.5.1.tar.gz) = 158039

-- 
always remember that you are unique.  just like everyone else.



Re: update lang/ghc

2016-11-05 Thread Stuart Henderson
On 2016/11/05 14:00, Karel Gardas wrote:
> and if I'm on the same like you, then its clear that I got garbled
> patch from gmail.com...

gmail is useless for patches, you can fetch it raw from marc.info.



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/05 10:46:44

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Register gnash removal.



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/05 10:45:43

Modified files:
www: Makefile 
Removed files:
www/gnash  : Makefile distinfo 
www/gnash/patches: patch-configure_ac 
   patch-libbase_GnashImageGif_cpp 
   patch-libmedia_ffmpeg_AudioDecoderFfmpeg_cpp 
   patch-libmedia_ffmpeg_AudioResamplerFfmpeg_cpp 
   patch-libmedia_ffmpeg_AudioResamplerFfmpeg_h 
   patch-libmedia_ffmpeg_MediaParserFfmpeg_cpp 
   patch-libmedia_ffmpeg_MediaParserFfmpeg_h 
   patch-libmedia_ffmpeg_VideoDecoderFfmpegVaapi_cpp 
   patch-libmedia_ffmpeg_VideoDecoderFfmpegVaapi_h 
   patch-libmedia_ffmpeg_VideoDecoderFfmpeg_cpp 
   patch-libmedia_ffmpeg_VideoDecoderFfmpeg_h 
   patch-libmedia_ffmpeg_ffmpegHeaders_h 
   patch-macros_ffmpeg_m4 patch-macros_pango_m4 
www/gnash/pkg  : DESCR PLIST 

Log message:
Remove www/gnash because... well :-)
General agreement from the b2k16 hackroom a couple days ago and Brad is ok
to remove it as well.



Re: NEW: sass

2016-11-05 Thread frantisek holop
frantisek holop, 05 Nov 2016 17:08:
> ping?

sorry for the noise, was behind a bit.

-f
-- 
computers run on smoke. if it leaks out they won't work.



Re: NEW: sass

2016-11-05 Thread frantisek holop
ping?

-- 
there are 3 kinds of people: those who can count & those who can't.



Re: UPDATE: archivers/libtar

2016-11-05 Thread Jeremie Courreges-Anglas

Committed, thanks.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Re: update lang/ghc

2016-11-05 Thread Karel Gardas
Thanks to Daniel who provided me with ungarbled version of the patch
(instead of gmail.com's garbled version) I've been able to test and
found that it fails with:

===>   Ignoring patchfile patch-utils_ghc-pkg_Main_hs.orig
cd /usr/ports/pobj/ghc-8.0.1/ghc-7.10.3.20161101 &&
LD_LIBRARY_PATH=/usr/ports/pobj/ghc-8.0.1/ghc-7.10.3.20161101-shlibs-amd64
 ./configure --prefix=/usr/ports/pobj/ghc-8.0.1/bootstrap &&
LD_LIBRARY_PATH=/usr/ports/pobj/ghc-8.0.1/ghc-7.10.3.20161101-shlibs-amd64
 gmake install
checking for path to top of build tree...
utils/ghc-pwd/dist-install/build/tmp/ghc-pwd-bindist[2]:
utils/ghc-pwd/dist-install/build/tmp/ghc-pwd: Permission denied
configure: error: cannot determine current directory
*** Error 1 in . (Makefile:143 'post-patch')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2608
'/usr/ports/pobj/ghc-8.0.1/.patch_done')
*** Error 1 in /usr/ports/lang/ghc
(/usr/ports/infrastructure/mk/bsd.port.mk:2389 'all')


the problem here is probably location of
utils/ghc-pwd/dist-install/build/tmp/ghc-pwd on non-wxalloed mout. --
at least I guess.

# pwd
/usr/ports/lang/ghc

# mount
/dev/sd1a on / type ffs (local)
/dev/sd1d on /usr/local type ffs (local, nodev, wxallowed)


On Fri, Nov 4, 2016 at 11:27 PM, Matthias Kilian  wrote:
> On Fri, Nov 04, 2016 at 10:48:11PM +0100, Karel Gardas wrote:
>> Simple patch < your message (after stripping headers) failed on me
>> with a lot of rejected hunks and files. This is current CVS of ports.
>> Probably doing something wrong.
>
> The diff I sent was against the latest current lang/ghc, with
>
> Makefile,v 1.143 (that was the latest commit dealing with wxneeded).
>
>> Anyway, rejected files are:
>> $ find . -name '*.rej'
>> ./patches/patch-configure.rej
>> ./patches/patch-ghc_mk.rej
>
> [...]
>
> Strange.  Was your tree clean, or did you already have some other
> diff applied?
>
> In any case, try cvs -qR up -dPAC to override any changes, then try to
> reapply my diff.
>
>> As haskell platform is on 8.0.1 version I would expect this is built
>> on top of GHC 8.0.1 too so at least some parts built into the platform
>> should be ready and compatible with GHC 8.0.1. At least that would be
>> my expectation on this...
>
> Well, haskell platform 8.0.1 in the "minimal" flavor basically is
> ghc with the libraries bundled with it, some additional tools
> (cabal-install, stack), but much less additional libraries as former
> versions of haskell platform.
>
> I'll work on the necessary updates for meta/haskell-platform and
> all the hs-ports during the next days (already have fixed (in my
> tree) a few dozens of ports which only require a bump and a new
> package-key).
>
> Ciao,
> Kili



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/11/05 09:13:54

Modified files:
archivers/libtar: Makefile distinfo 
Removed files:
archivers/libtar/patches: patch-lib_Makefile_in 
  patch-lib_block_c 
  patch-libtar_Makefile_in 

Log message:
Update to libtar-1.2.20, new upstream.

Tweaked diff from Rafael Sadowski.



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/05 08:50:19

Modified files:
x11/gnome/photos: Makefile distinfo 

Log message:
Update to gnome-photos-3.22.2.



UPDATE: textproc/py-sphinx 1.4.8

2016-11-05 Thread Alexandr Shadchin
Hi,

This diff updates py-sphinx to the latest release.
Tested on amd64.

Comments ? OK ?

-- 
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/textproc/py-sphinx/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile1 Sep 2016 05:49:57 -   1.19
+++ Makefile5 Nov 2016 12:14:25 -
@@ -2,7 +2,7 @@
 
 COMMENT =  python documentation generator
 
-MODPY_EGG_VERSION =1.4.6
+MODPY_EGG_VERSION =1.4.8
 DISTNAME = Sphinx-${MODPY_EGG_VERSION}
 PKGNAME =  py-sphinx-${MODPY_EGG_VERSION}
 
@@ -26,8 +26,7 @@ RUN_DEPENDS = devel/py-babel${MODPY_FLA
textproc/py-pygments${MODPY_FLAVOR} \
textproc/py-sphinx_rtd_theme${MODPY_FLAVOR} \
textproc/py-snowballstemmer${MODPY_FLAVOR} \
-   www/py-jinja2${MODPY_FLAVOR} \
-   www/py-requests${MODPY_FLAVOR}
+   www/py-jinja2${MODPY_FLAVOR}
 BUILD_DEPENDS =${RUN_DEPENDS}
 TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
devel/py-nose${MODPY_FLAVOR} \
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-sphinx/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo1 Sep 2016 05:49:57 -   1.7
+++ distinfo5 Nov 2016 12:14:25 -
@@ -1,2 +1,2 @@
-SHA256 (Sphinx-1.4.6.tar.gz) = nkNDCqm0kezYYwKhMg7biXfaYk9jQi1JQlfqslQaedM=
-SIZE (Sphinx-1.4.6.tar.gz) = 4489982
+SHA256 (Sphinx-1.4.8.tar.gz) = Qa+Xj2U++GLrS7N3bavY/xOv7RfkMZBzEP6ZCjlHcH8=
+SIZE (Sphinx-1.4.8.tar.gz) = 4494940
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-sphinx/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   1 Sep 2016 05:49:57 -   1.6
+++ pkg/PLIST   5 Nov 2016 12:14:26 -
@@ -389,6 +389,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sphinx/make_mode.py
 lib/python${MODPY_VERSION}/site-packages/sphinx/parsers.py
 lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/
+lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/Grammar-py2-sphinx1.2.pickle
+lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/Grammar-py2-sphinx1.4.pickle
 lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/Grammar-py2.pickle
 lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/Grammar-py2.txt
 lib/python${MODPY_VERSION}/site-packages/sphinx/pycode/Grammar-py3.pickle
@@ -637,6 +639,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}parallel.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}png.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}pycompat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}rst.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}smartypants.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}stemmer.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/sphinx/util/${MODPY_PYCACHE}tags.${MODPY_PYC_MAGIC_TAG}pyc
@@ -658,6 +661,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/sphinx/util/parallel.py
 lib/python${MODPY_VERSION}/site-packages/sphinx/util/png.py
 lib/python${MODPY_VERSION}/site-packages/sphinx/util/pycompat.py
+lib/python${MODPY_VERSION}/site-packages/sphinx/util/rst.py
 lib/python${MODPY_VERSION}/site-packages/sphinx/util/smartypants.py
 lib/python${MODPY_VERSION}/site-packages/sphinx/util/stemmer.py
 lib/python${MODPY_VERSION}/site-packages/sphinx/util/tags.py



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Steven Mestdagh
CVSROOT:/cvs
Module name:ports
Changes by: ste...@cvs.openbsd.org  2016/11/05 07:49:29

Modified files:
x11: Makefile 

Log message:
+p5-X11-Protocol-Other



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/05 07:46:21

Modified files:
devel/ruby-yajl: Makefile 

Log message:
Bump:
+lib/ruby/gems/2.2/extensions/x86_64-openbsd/2.2/yajl-ruby-1.2.1/



Re: UPDATE: archivers/libtar

2016-11-05 Thread Rafael Sadowski
On Wed Nov 02, 2016 at 02:15:05AM +0100, Jeremie Courreges-Anglas wrote:
> Rafael Sadowski  writes:
> 
> > Hi @ports,
> >
> > I found this port because the HOMEPAGE is unreachable. The diff fix
> > MASTER_SITES and update to last stable release.
> >
> > Okay? Comments?
> 
> Comments and updated diff below,

Thanks, looks good. Tested (build, package and update package) on
amd64. No problems noticed the last days.

Kind regards,

Rafael



llvm port fails to build on arm

2016-11-05 Thread Jonathan Gray
I ran into a port that used clang and added arm to LLVM_ARCHS.  The build
errors out after a day or so of building with the below.  I've previously
built the version under src/gnu without problem.  That didn't invoke
whatever binutils horrors are implicated in the below.

[2695/2736] : && /usr/pobj/llvm-3.9.0/bin/c++   -O2 -pipe-fPIC 
-fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter -Wwrite-strings 
-Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long 
-Wno-maybe-uninitialized -Wdelete-non-virtual-dtor -Wno-comment 
-Werror=date-time -std=c++11 -ffunction-sections -fdata-sections -fno-common 
-Woverloaded-virtual -fno-strict-aliasing -DNDEBUG  -Wl,-allow-shlib-undefined  
  -Wl,-O3 
tools/clang/tools/clang-check/CMakeFiles/clang-check.dir/ClangCheck.cpp.o  -o 
bin/clang-check  lib/libLLVMAArch64CodeGen.a lib/libLLVMAArch64AsmPrinter.a 
lib/libLLVMAArch64AsmParser.a lib/libLLVMAArch64Desc.a lib/libLLVMAArch64Info.a 
lib/libLLVMAArch64Disassembler.a lib/libLLVMAMDGPUCodeGen.a 
lib/libLLVMAMDGPUAsmPrinter.a lib/libLLVMAMDGPUAsmParser.a 
lib/libLLVMAMDGPUDesc.a lib/libLLVMAMDGPUInfo.a lib/libLLVMAMDGPUDisassembler.a 
lib/libLLVMARMCodeGen.a lib/libLLVMARMAsmPrinter.a lib/libLLVMARMAsmParser.a 
lib/libLLVMARMDesc.a lib/libLLVMARMInfo.a lib/libLLVMARMDisassembler.a 
lib/libLLVMBPFCodeGen.a lib/libLLVMBPFAsmPrinter.a lib/libLLVMBPFDesc.a 
lib/libLLVMBPFInfo.a lib/libLLVMHexagonCodeGen.a lib/libLLVMHexagonAsmParser.a 
lib/libLLVMHexagonDesc.a lib/libLLVMHexagonInfo.a 
lib/libLLVMHexagonDisassembler.a lib/libLLVMMipsCodeGen.a 
lib/libLLVMMipsAsmPrinter.a lib/libLLVMMipsAsmParser.a lib/libLLVMMipsDesc.a 
lib/libLLVMMipsInfo.a lib/libLLVMMipsDisassembler.a lib/libLLVMMSP430CodeGen.a 
lib/libLLVMMSP430AsmPrinter.a lib/libLLVMMSP430Desc.a lib/libLLVMMSP430Info.a 
lib/libLLVMNVPTXCodeGen.a lib/libLLVMNVPTXAsmPrinter.a lib/libLLVMNVPTXDesc.a 
lib/libLLVMNVPTXInfo.a lib/libLLVMPowerPCCodeGen.a 
lib/libLLVMPowerPCAsmPrinter.a lib/libLLVMPowerPCAsmParser.a 
lib/libLLVMPowerPCDesc.a lib/libLLVMPowerPCInfo.a 
lib/libLLVMPowerPCDisassembler.a lib/libLLVMSparcCodeGen.a 
lib/libLLVMSparcAsmPrinter.a lib/libLLVMSparcAsmParser.a lib/libLLVMSparcDesc.a 
lib/libLLVMSparcInfo.a lib/libLLVMSparcDisassembler.a 
lib/libLLVMSystemZCodeGen.a lib/libLLVMSystemZAsmPrinter.a 
lib/libLLVMSystemZAsmParser.a lib/libLLVMSystemZDesc.a lib/libLLVMSystemZInfo.a 
lib/libLLVMSystemZDisassembler.a lib/libLLVMX86CodeGen.a 
lib/libLLVMX86AsmPrinter.a lib/libLLVMX86AsmParser.a lib/libLLVMX86Desc.a 
lib/libLLVMX86Info.a lib/libLLVMX86Disassembler.a lib/libLLVMXCoreCodeGen.a 
lib/libLLVMXCoreAsmPrinter.a lib/libLLVMXCoreDesc.a lib/libLLVMXCoreInfo.a 
lib/libLLVMXCoreDisassembler.a lib/libLLVMOption.a lib/libLLVMSupport.a 
-lpthread lib/libclangAST.a lib/libclangBasic.a lib/libclangDriver.a 
lib/libclangFrontend.a lib/libclangRewriteFrontend.a 
lib/libclangStaticAnalyzerFrontend.a lib/libclangTooling.a 
lib/libLLVMGlobalISel.a lib/libLLVMAArch64Desc.a lib/libLLVMAArch64AsmPrinter.a 
lib/libLLVMAArch64Info.a lib/libLLVMAArch64Utils.a lib/libLLVMipo.a 
lib/libLLVMVectorize.a lib/libLLVMIRReader.a lib/libLLVMAsmParser.a 
lib/libLLVMLinker.a lib/libLLVMAMDGPUDesc.a lib/libLLVMAMDGPUAsmPrinter.a 
lib/libLLVMAMDGPUInfo.a lib/libLLVMAMDGPUUtils.a lib/libLLVMARMDesc.a 
lib/libLLVMARMAsmPrinter.a lib/libLLVMARMInfo.a lib/libLLVMBPFAsmPrinter.a 
lib/libLLVMHexagonDesc.a lib/libLLVMHexagonInfo.a lib/libLLVMMipsAsmPrinter.a 
lib/libLLVMMipsInfo.a lib/libLLVMMSP430AsmPrinter.a 
lib/libLLVMNVPTXAsmPrinter.a lib/libLLVMPowerPCAsmPrinter.a 
lib/libLLVMPowerPCInfo.a lib/libLLVMSparcAsmPrinter.a lib/libLLVMSparcInfo.a 
lib/libLLVMSystemZDesc.a lib/libLLVMSystemZAsmPrinter.a 
lib/libLLVMSystemZInfo.a lib/libLLVMX86AsmPrinter.a lib/libLLVMX86Utils.a 
lib/libLLVMObject.a lib/libLLVMX86Info.a lib/libLLVMXCoreAsmPrinter.a 
lib/libLLVMAsmPrinter.a lib/libLLVMDebugInfoCodeView.a 
lib/libLLVMSelectionDAG.a lib/libLLVMCodeGen.a lib/libLLVMScalarOpts.a 
lib/libLLVMInstCombine.a lib/libLLVMBitWriter.a lib/libLLVMInstrumentation.a 
lib/libLLVMTarget.a lib/libLLVMTransformUtils.a lib/libLLVMAnalysis.a 
lib/libLLVMXCoreInfo.a lib/libLLVMMCDisassembler.a 
lib/libclangStaticAnalyzerCheckers.a lib/libclangStaticAnalyzerCore.a 
lib/libclangFrontend.a lib/libclangDriver.a lib/libLLVMOption.a 
lib/libclangParse.a lib/libLLVMMCParser.a lib/libclangSerialization.a 
lib/libclangSema.a lib/libclangEdit.a lib/libclangAnalysis.a 
lib/libLLVMBitReader.a lib/libLLVMProfileData.a lib/libclangASTMatchers.a 
lib/libclangFormat.a lib/libclangToolingCore.a lib/libclangAST.a 
lib/libclangRewrite.a lib/libclangLex.a lib/libclangBasic.a lib/libLLVMCore.a 
lib/libLLVMMC.a lib/libLLVMSupport.a -lpthread -lz -lm 
-Wl,-rpath,"\$ORIGIN/../lib" -Wl,-rpath-link,/usr/X11R6/lib && :
FAILED: bin/clang-check 
: && /usr/pobj/llvm-3.9.0/bin/c++   -O2 -pipe-fPIC 
-fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter -Wwrite-strings 
-Wcast-qual -Wno-missing-field-initializers 

Re: update lang/ghc

2016-11-05 Thread Karel Gardas
On Sat, Nov 5, 2016 at 1:34 PM, Daniel Jakots  wrote:
>> The question is: is my patch command line OK?
>
> It works fine for me. I took advantage of this situation to have a
> reason to test asciinema:
> https://asciinema.org/a/1lxc91o7jnqo7btsvwip7f8d4 :)

Wonderful! By any chance, could you be so kind and test your tree with
following MD5 output *before* applying patches?

$ find . -type f|xargs md5
MD5 (./CVS/Repository) = 5b953ce6e2413984a2858a9b182d2fc6
MD5 (./CVS/Entries) = 22863466de14495278861daf151067b5
MD5 (./CVS/Root) = 5ffd2a192aa48720652a8fddc66b5331
MD5 (./files/CVS/Repository) = 303c644e219f5ef8d76e8ad5275b9ebb
MD5 (./files/CVS/Entries) = ac5c00f02c373ccdad077d83f49c1f4a
MD5 (./files/CVS/Root) = 5ffd2a192aa48720652a8fddc66b5331
MD5 (./files/fixup-hs-plist) = 29cc0136a6646c3466611a4fff23bb38
MD5 (./files/Process.hsc) = dcd0c0271d8ab5a4c1b6f154503df5cb
MD5 (./patches/CVS/Repository) = 4dc776ab05380bbbc9dbfda191f16728
MD5 (./patches/CVS/Entries) = 38228750ebcaf322d31a8575ebefea5a
MD5 (./patches/CVS/Root) = 5ffd2a192aa48720652a8fddc66b5331
MD5 (./patches/patch-libffi_ghc_mk) = 8e5b7883d2cc2932a2cb5d2085582953
MD5 (./patches/patch-configure) = 284a9711f0cdecd54bdf20b8ce178263
MD5 (./patches/patch-ghc_mk) = 705fbc3a4a03281be3c98d1e9ab6348a
MD5 (./patches/patch-testsuite_mk_test_mk) = f34b020518340491c5623a0c0c1a82dc
MD5 (./patches/patch-mk_config_mk_in) = d43d5764499647890a1517b7e58e880a
MD5 (./patches/patch-libraries_Cabal_Cabal_Distribution_Simple_Program_Strip_hs)
= 0e732c83ecd832e1c84a7a05eceb5218
MD5 (./patches/patch-libraries_Cabal_Cabal_Distribution_Simple_Utils_hs)
= 0a4e49a084d142913670abbdfc25cc7b
MD5 (./patches/patch-libraries_base_GHC_IO_Encoding_hs) =
d538672915a377c3df2d8037f71b600a
MD5 (./patches/patch-libraries_base_System_IO_hs) =
d0d4bb031a8d132cd893033391999b99
MD5 (./patches/patch-libraries_base_cbits_PrelIOUtils_c) =
18952b6513bcc52bf00223aec68b7007
MD5 (./patches/patch-libraries_process_include_runProcess_h) =
2c86ed557be1af0b816ba1b9a50d70ea
MD5 (./patches/patch-mk_install_mk_in) = 7376309782760ad599683fd9a1344d75
MD5 (./patches/patch-rts_Linker_c) = d39933bd9266adef58ad251f9d3840c8
MD5 (./patches/patch-testsuite_tests_cabal_ghcpkg01_stdout) =
45c681419f4110a2a5d84d935bee0bcd
MD5 (./patches/patch-testsuite_driver_testlib_py) =
2a1a73d9b1073579b0e708bda98f70f0
MD5 (./patches/patch-libraries_unix_unix_cabal) =
1f85add1d7e482b15f637f4d5b0e9c0a
MD5 (./patches/patch-testsuite_tests_codeGen_should_run_all_T) =
c1c18e2ea8df75036f9a7c82460fdd28
MD5 (./patches/patch-utils_ghc-pkg_Main_hs) = d3ea66cea9cc4ddd86b36a464616a026
MD5 (./pkg/CVS/Repository) = cdd407a36b60072353bd1681efc5bbe9
MD5 (./pkg/CVS/Entries) = f92116db3af096dfa1f3a1c8263669d9
MD5 (./pkg/CVS/Root) = 5ffd2a192aa48720652a8fddc66b5331
MD5 (./pkg/PLIST) = b4ecdaef3827a2f01ec268944c15ae83
MD5 (./pkg/DESCR) = a73a599ae1e32cd83413385c06363153
MD5 (./Makefile) = 4176fdf75166b4b0de76875d4d36461b
MD5 (./distinfo) = 7228935732572443fe4ef8b8d1399a59
MD5 (./ghc.port.mk) = faf2987a313ee1316f24602126587a69


My patch is:

$ patch --version
Patch version 2.0-12u8-OpenBSD

running on few days old current snapshot.

and if I'm on the same like you, then its clear that I got garbled
patch from gmail.com...

Thanks,
Karel



Re: new: sysutils/htop

2016-11-05 Thread Juan Francisco Cantero Hurtado
On Sat, Nov 05, 2016 at 06:09:43AM -0400, Ian Sutton wrote:
> On Sat, Nov 05, 2016 at 10:24:23AM +0100, Landry Breuil wrote:
> > given that it runs for example on macppc.. ok to import with that line
> > zapped.
> 
> zapped
> 
> On Sat, Nov 05, 2016 at 10:24:27AM +0100, Daniel Jakots wrote:
> > You probably want to look at what juanfra@ already did: 
> > https://github.com/jasperla/openbsd-wip/tree/master/sysutils/htop
> 
> hmm -- what's causing the commit hesitation?

Random crashes and double frees. Run the program with MALLOC_OPTIONS=F.

If you take the maintainership, I will import the port.

A few comments:

- Remove the extra space at the end of DESCR.
- Change "This is htop, an interactive" to "htop is an interactive" in
  DESCR.
- Remove the second phrase in DESCR. Users don't need to know what are
  the dependencies of the packages.
- Look the Makefile in my old port and copy the ALL_TARGET and
  INSTALL_STRIP lines to your Makefile, with the comment included.


-- 
Juan Francisco Cantero Hurtado http://juanfra.info



Re: x11/qt5 update-patches

2016-11-05 Thread Daniel Jakots
On Sat, 5 Nov 2016 13:10:35 +0100, Rafael Sadowski
 wrote:

> I'm working with x11/qt5 port and I realized outdated patches.

As it doesn't change the package, REVISION bumps are not needed. See
for instance:

https://marc.info/?l=openbsd-ports-cvs=147762719016515=2
https://marc.info/?l=openbsd-ports-cvs=147816228901453=2



alpha-1.ports.openbsd.org bulk build report

2016-11-05 Thread phessler
bulk build on alpha-1.ports.openbsd.org
started on  Tue Oct 18 14:10:28 MDT 2016
finished at Thu Nov 3 22:23:04 MDT 2016
lasted 17D01h12m
done with kern.version=OpenBSD 6.0-current (GENERIC.MP) #0: Tue Oct 18 02:34:50 
MDT 2016

built packages:7528
Oct 18:421
Oct 19:327
Oct 20:392
Oct 21:175
Oct 22:531
Oct 23:301
Oct 24:257
Oct 25:172
Oct 26:268
Oct 27:209
Oct 28:231
Oct 29:257
Oct 30:304
Oct 31:308
Nov 1:377
Nov 2:437
Nov 3:2560

build failures: 19
http://build-failures.rhaalovely.net//alpha/2016-10-18/audio/moc.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/audio/ocp.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/cad/openscad.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/devel/ctftools.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/devel/elftoolchain.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/devel/reposurgeon.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/devel/ti-msp430gcc.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/games/brumbrumrally.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/graphics/freeimage.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/lang/gcc/4.6.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/lang/php/5.5.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/lang/php/5.6.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/lang/php/7.0.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/math/octave.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/multimedia/gstreamer1/plugins-bad.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/net/icinga/core2,-main.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/net/rtorrent.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/print/lyx.log
http://build-failures.rhaalovely.net//alpha/2016-10-18/x11/wmii.log
Base libs:
c.89.2 c.89.2.a crypto.38.1 curses.14.0 edit.5.2 event.4.1 expat.11.0
form.6.0 formw.6.0 fuse.1.1 iberty.12.0 m.10.0 menu.6.0 menuw.6.0
ncurses.14.0 ncursesw.14.0 objc.6.0 ossaudio.4.0 panel.6.0 panelw.6.0
pcap.8.1 perl.17.1 pthread.23.0 radius.1.0 readline.4.0 rpcsvc.2.0
skey.6.0 sndio.6.1 ssl.39.1 stdc++.57.0 termcap.14.0 .14.0 tls.11.4
usbhid.7.0 util.12.1 z.5.0 kvm.16.2

X libs:
FS.10.0 ICE.10.0 SM.9.0 X11-xcb.2.0 X11.16.1 XRes.5.0 Xau.10.0 Xaw.15.0
Xaw7.15.0 Xcomposite.4.0 Xcursor.5.0 Xdamage.4.0 Xdmcp.11.0 Xext.13.0
Xfixes.6.0 EGL.1.0 Xfontcache.5.0 GL.17.0 Xi.12.1 Xinerama.6.0 Xmu.11.0
Xmuu.6.0 Xpm.9.0 GLESv1_CM.1.0 Xrender.6.0 Xss.6.0 Xt.11.0 Xtst.11.0
Xv.6.0 XvMC.6.0 XvMCW.2.0 Xxf86dga.6.0 Xxf86misc.6.0 Xxf86vm.6.0 dmx.2.0
GLESv2.1.1 fontenc.4.0 GLU.9.0 pciaccess.2.0 pixman-1.32.6
pthread-stubs.2.0 xcb-composite.1.0 xcb-cursor.0.0 xcb-damage.1.0
xcb-dpms.1.0 xcb-dri2.1.1 xcb-dri3.0.0 xcb-ewmh.2.0 xcb-icccm.4.0
xcb-image.2.0 xcb-keysyms.3.0 xcb-render-util.2.0 xcb-res.1.1
xcb-shm.1.1 xcb-util.0.0 xcb-xevie.1.0 xcb-xf86dri.2.0 xcb-xinerama.1.0
xcb-xtest.1.0 xcb-xvmc.1.0 xkbfile.6.0 xkbui.5.0 GLw.6.0 OSMesa.10.0
drm_radeon.4.0 Xfont.13.0 Xft.10.0 Xrandr.7.1 epoxy.2.0 gbm.0.0
glapi.0.2 drm_amdgpu.1.1 drm_nouveau.3.0 txc_dxtn.0.0 fontconfig.11.0
freetype.26.0 xcb-glx.1.1 xcb-present.0.1 xcb-randr.2.2 xcb-record.1.1
xcb-render.1.1 xcb-screensaver.1.1 xcb-shape.1.1 xcb-sync.1.2
xcb-xfixes.1.2 xcb-xkb.0.1 xcb-xv.1.1 xcb-xprint.3.0 xcb.4.0 drm.7.2



Re: update lang/ghc

2016-11-05 Thread Daniel Jakots
On Sat, 5 Nov 2016 13:20:56 +0100, Karel Gardas 
wrote:

> and I saved whole your email to /home/karel/src/original_msg.txt from
> which I tripped headers and your text to have:

You don't really need to do this (but removing them shouldn't create any
harm either).
 
> So everything on my end so far should be clean, isn't it? Now, I try
> to apply with:
> 
> $ pwd
> /usr/ports/lang/ghc
> $ patch < /home/karel/src/original_msg.txt
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --
> |Index: Makefile
> |===
> |RCS file: /cvs/ports/lang/ghc/Makefile,v
> |retrieving revision 1.143
> |diff -u -p -r1.143 Makefile
> |--- Makefile   1 Nov 2016 18:14:05 -   1.143
> |+++ Makefile   3 Nov 2016 14:27:06 -
> --
> Patching file Makefile using Plan A...
> Hunk #1 failed at 12.
> Hunk #2 failed at 30.
> Hunk #3 failed at 48.
> Hunk #4 failed at 58.
> Hunk #5 failed at 120.
> Hunk #6 failed at 191.
> Hunk #7 failed at 216.
> 7 out of 7 hunks failed--saving rejects to Makefile.rej
> 
> etc. a lot of hunk failures and a lot of rejected files.
> 
> The question is: is my patch command line OK?

It works fine for me. I took advantage of this situation to have a
reason to test asciinema:
https://asciinema.org/a/1lxc91o7jnqo7btsvwip7f8d4 :)

Cheers,
Daniel



Re: New: lang/mruby

2016-11-05 Thread Paul Irofti
> OKs to import?

I like the port but I don't think it is ready for import yet. It needs
at least a build dependency on bison first ;)

---
CCsrc/vm.c -> build/host/src/vm.o
CCmrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c ->
build/host/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.o
CCmrbgems/mruby-compiler/core/codegen.c ->
build/host/mrbgems/mruby-compiler/core/codegen.o
YACC  mrbgems/mruby-compiler/core/parse.y ->
build/host/mrbgems/mruby-compiler/core/y.tab.c
sh: bison: not found
sh: bison: not found
rake aborted!
Command Failed: [bison -o
"/usr/ports/pobj/mruby-1.2.0/mruby-1.2.0/build/host/mrbgems/mruby-compiler/core/y.tab.c"
"/usr/ports/pobj/mruby-1.2.0/mruby-1.2.0/mrbgems/mruby-compiler/core/parse.y"]
---



Re: update lang/ghc

2016-11-05 Thread Karel Gardas
On Fri, Nov 4, 2016 at 11:27 PM, Matthias Kilian  wrote:
> On Fri, Nov 04, 2016 at 10:48:11PM +0100, Karel Gardas wrote:
>> Simple patch < your message (after stripping headers) failed on me
>> with a lot of rejected hunks and files. This is current CVS of ports.
>> Probably doing something wrong.
>
> The diff I sent was against the latest current lang/ghc, with
>
> Makefile,v 1.143 (that was the latest commit dealing with wxneeded).
>
>> Anyway, rejected files are:
>> $ find . -name '*.rej'
>> ./patches/patch-configure.rej
>> ./patches/patch-ghc_mk.rej
>
> [...]
>
> Strange.  Was your tree clean, or did you already have some other
> diff applied?
>
> In any case, try cvs -qR up -dPAC to override any changes, then try to
> reapply my diff.

It still does not work for me. Look my tree should be clean:

$ pwd
/usr/ports/lang/ghc
$ cvs -q up -Pd
$


it's also on Makefile 1.143:

$ cat CVS/Entries
D/patches
D/pkg
D/files
/Makefile/1.143/Sat Nov  5 12:16:03 2016//
/distinfo/1.47/Sat Nov  5 12:16:03 2016//
/ghc.port.mk/1.38/Sat Nov  5 12:16:03 2016//
$ cat CVS/Root
anon...@ftp.hostserver.de:/cvs
$

and I saved whole your email to /home/karel/src/original_msg.txt from
which I tripped headers and your text to have:

$ head /home/karel/src/original_msg.txt
Index: Makefile
===
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.143
diff -u -p -r1.143 Makefile
--- Makefile1 Nov 2016 18:14:05 -   1.143
+++ Makefile3 Nov 2016 14:27:06 -
@@ -12,12 +12,11 @@ COMMENT =   compiler for the functional l
 NO_CCACHE =Yes

$


So everything on my end so far should be clean, isn't it? Now, I try
to apply with:

$ pwd
/usr/ports/lang/ghc
$ patch < /home/karel/src/original_msg.txt
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|Index: Makefile
|===
|RCS file: /cvs/ports/lang/ghc/Makefile,v
|retrieving revision 1.143
|diff -u -p -r1.143 Makefile
|--- Makefile   1 Nov 2016 18:14:05 -   1.143
|+++ Makefile   3 Nov 2016 14:27:06 -
--
Patching file Makefile using Plan A...
Hunk #1 failed at 12.
Hunk #2 failed at 30.
Hunk #3 failed at 48.
Hunk #4 failed at 58.
Hunk #5 failed at 120.
Hunk #6 failed at 191.
Hunk #7 failed at 216.
7 out of 7 hunks failed--saving rejects to Makefile.rej

etc. a lot of hunk failures and a lot of rejected files.

The question is: is my patch command line OK?

Thanks,
Karel



x11/qt5 update-patches

2016-11-05 Thread Rafael Sadowski
Hi ports@,

I'm working with x11/qt5 port and I realized outdated patches.

Kind regards,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/Makefile,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 Makefile
--- Makefile23 Sep 2016 15:22:49 -  1.54
+++ Makefile5 Nov 2016 12:09:28 -
@@ -19,19 +19,21 @@ COMMENT-sqlite2 =   SQLite 2.x plugin for 
 COMMENT-tds =  TDS plugin for Qt5
 
 PKGNAME-main = qt5-${VERSION}
-REVISION-main =3
+REVISION-main =4
 PKGNAME-examples = qt5-examples-${VERSION}
-REVISION-examples =0
+REVISION-examples =1
 PKGNAME-html = qt5-html-${VERSION}
 PKGNAME-mysql =qt5-mysql-${VERSION}
-REVISION-mysql =   0
+REVISION-mysql =   1
 PKGNAME-psql = qt5-postgresql-${VERSION}
-REVISION-psql =0
+REVISION-psql =1
 PKGNAME-qch =  qt5-qch-${VERSION}
 PKGNAME-sqlite2 =  qt5-sqlite2-${VERSION}
-REVISION-sqlite2 = 0
+REVISION-sqlite2 = 1
 PKGNAME-tds =  qt5-tds-${VERSION}
-REVISION-tds = 0
+REVISION-tds = 1
+REVISION-html =0
+REVISION-qch = 0
 
 PKG_ARCH-html =*
 PKG_ARCH-qch = *
Index: patches/patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp
===
RCS file: 
/cvs/ports/x11/qt5/patches/patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 
patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp
--- patches/patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp
22 Feb 2016 20:38:08 -  1.3
+++ patches/patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp
5 Nov 2016 12:09:28 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp,v 1.3 
2016/02/22 20:38:08 zhuk Exp $
 1. Fix for cases of >1024 open files: 
https://bugreports.qt.io/browse/QTBUG-51274
 2. Unbreak compilation (EPROTO).
 qtbase/src/network/socket/qnativesocketengine_unix.cpp.ports.orig  Tue Feb 
17 07:56:38 2015
-+++ qtbase/src/network/socket/qnativesocketengine_unix.cpp Sun Feb 21 
23:42:16 2016
-@@ -42,6 +42,7 @@
+--- qtbase/src/network/socket/qnativesocketengine_unix.cpp.ports.orig  Tue Oct 
13 06:35:28 2015
 qtbase/src/network/socket/qnativesocketengine_unix.cpp Sat Nov  5 
13:05:16 2016
+@@ -43,6 +43,7 @@
  #include 
  #include 
  #include 
@@ -11,7 +11,7 @@ $OpenBSD: patch-qtbase_src_network_socke
  #ifndef QT_NO_IPV6IFNAME
  #include 
  #endif
-@@ -622,7 +623,9 @@ int QNativeSocketEnginePrivate::nativeAccept()
+@@ -589,7 +590,9 @@ int QNativeSocketEnginePrivate::nativeAccept()
  setError(QAbstractSocket::SocketResourceError, 
NotSocketErrorString);
  break;
  case EPROTONOSUPPORT:
@@ -21,7 +21,7 @@ $OpenBSD: patch-qtbase_src_network_socke
  case EAFNOSUPPORT:
  case EINVAL:
  setError(QAbstractSocket::UnsupportedSocketOperationError, 
ProtocolUnsupportedErrorString);
-@@ -1192,48 +1195,31 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeo
+@@ -1150,48 +1153,31 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeo
  
  int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) 
const
  {



databases/openldap23 removal ?

2016-11-05 Thread Landry Breuil
Hi,

it's this time of the year were you remove the dying leaves from the
trees... is anyone *still* using databases/openldap23 ? 2.3.43 is from
2008 (ie... EOL upstream, i'd say) and the only reason we had it was
(from vague recollections) that "we don't have unified buffer cache on
OpenBSD, and bdb/hdb backends sucks/are unreliable" - well, i'm not sure
this stance is still valid, i've been running 2.4 with bdb on production
for a while without running into specific issues, but the setup isnt a
*huge* one. And after all, people had 5 years since 2.3 reimport to try
to migrate to 2.4.

so, is someone (poke henning@) still using openldap 2.3 for *valid
reasons* and wants to keep it, or it can go to the attic ?

Landry



Re: Make portbump actually bump even if REVISION is not set

2016-11-05 Thread Stuart Henderson
On 2016/11/05 11:48, Stuart Henderson wrote:
> On 2016/11/04 14:06, Jeremy Evans wrote:
> > Currently if you call portbump and the Makefile does not have REVISION
> > set, it does nothing.  That definitely was not what I expect, since a
> > bump if REVISION is not set involves setting REVISION = 0. Other b2k16
> > attendees also agree.
> 
> er, that does work for me already, check @_REV_NEIGHBORS

[...]

We should probably add a few to the list though, at least:

MODPY_EGG_VERSION
GH_COMMIT
GH_TAGNAME



Re: Make portbump actually bump even if REVISION is not set

2016-11-05 Thread Stuart Henderson
On 2016/11/04 14:06, Jeremy Evans wrote:
> Currently if you call portbump and the Makefile does not have REVISION
> set, it does nothing.  That definitely was not what I expect, since a
> bump if REVISION is not set involves setting REVISION = 0. Other b2k16
> attendees also agree.

er, that does work for me already, check @_REV_NEIGHBORS



UPDATE: www/py-beautifulsoup4 4.5.1

2016-11-05 Thread Alexandr Shadchin
Hi,

This diff updates py-beautifulsoup4 to the latest release.
Tested on amd64.

Comments ? OK ?

-- 
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/www/py-beautifulsoup4/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile2 Jan 2016 13:27:22 -   1.4
+++ Makefile5 Nov 2016 11:18:55 -
@@ -2,7 +2,7 @@
 
 COMMENT =  HTML/XML parser that supports invalid markup
 
-MODPY_EGG_VERSION =4.4.1
+MODPY_EGG_VERSION =4.5.1
 DISTNAME = beautifulsoup4-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
@@ -14,9 +14,8 @@ MAINTAINER =  frantisek holop 

CVS: cvs.openbsd.org: ports

2016-11-05 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/11/05 05:12:58

Modified files:
sysutils/gitolite: Makefile distinfo 

Log message:
update to gitolite-3.6.6



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Daniel Jakots
CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2016/11/05 04:29:38

Modified files:
lang/cython: Makefile distinfo 
lang/cython/pkg: PLIST 

Log message:
Update to cython-0.25.1

bulk by and ok aja@



Re: new: sysutils/htop

2016-11-05 Thread Daniel Jakots
On Sat, 5 Nov 2016 06:09:43 -0400, Ian Sutton  wrote:

> On Sat, Nov 05, 2016 at 10:24:27AM +0100, Daniel Jakots wrote:
> > You probably want to look at what juanfra@ already did: 
> > https://github.com/jasperla/openbsd-wip/tree/master/sysutils/htop  
> 
> hmm -- what's causing the commit hesitation?

See the discussion:
https://marc.info/?l=openbsd-ports=146283061630445=2



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2016/11/05 04:14:44

Modified files:
www: Makefile 

Log message:
Remove nginx flavors



Re: new: sysutils/htop

2016-11-05 Thread Ian Sutton
On Sat, Nov 05, 2016 at 10:24:23AM +0100, Landry Breuil wrote:
> given that it runs for example on macppc.. ok to import with that line
> zapped.

zapped

On Sat, Nov 05, 2016 at 10:24:27AM +0100, Daniel Jakots wrote:
> You probably want to look at what juanfra@ already did: 
> https://github.com/jasperla/openbsd-wip/tree/master/sysutils/htop

hmm -- what's causing the commit hesitation?

ian


htop-2.0.2.tgz
Description: application/tar-gz


Re: new: sysutils/htop

2016-11-05 Thread Landry Breuil
On Sat, Nov 05, 2016 at 10:24:27AM +0100, Daniel Jakots wrote:
> On Sat, 5 Nov 2016 03:01:20 -0400, Ian Sutton  wrote:
> 
> > htop is an enhanced version of the venerable top(1).
> > 
> > could a porter please add this? i am more than happy to maintain.
> > 
> > ian
> 
> You probably want to look at what juanfra@ already did: 
> https://github.com/jasperla/openbsd-wip/tree/master/sysutils/htop

Yeah but his work is older - crashes still happen (i had one but
non-reproducible upon F2). That stuff can still be fixed in-tree..

Landry



Re: new: sysutils/htop

2016-11-05 Thread Daniel Jakots
On Sat, 5 Nov 2016 03:01:20 -0400, Ian Sutton  wrote:

> htop is an enhanced version of the venerable top(1).
> 
> could a porter please add this? i am more than happy to maintain.
> 
> ian

You probably want to look at what juanfra@ already did: 
https://github.com/jasperla/openbsd-wip/tree/master/sysutils/htop

Cheers,
Daniel



Re: new: sysutils/htop

2016-11-05 Thread Landry Breuil
On Sat, Nov 05, 2016 at 03:01:20AM -0400, Ian Sutton wrote:
> htop is an enhanced version of the venerable top(1).
> 
> could a porter please add this? i am more than happy to maintain.

works fine, and i see absolutely no reason for the ONLY_FOR_ARCHS line,
given that it runs for example on macppc.. ok to import with that line
zapped.

Landry



CVS: cvs.openbsd.org: ports

2016-11-05 Thread Steven Mestdagh
CVSROOT:/cvs
Module name:ports
Changes by: ste...@cvs.openbsd.org  2016/11/05 03:04:05

Log message:
import X11::Protocol::Other, some extensions to X11::Protocol

feedback and ok jca@

Status:

Vendor Tag: steven
Release Tags:   steven-20161105

N ports/x11/p5-X11-Protocol-Other/Makefile
N ports/x11/p5-X11-Protocol-Other/distinfo
N ports/x11/p5-X11-Protocol-Other/pkg/DESCR
N ports/x11/p5-X11-Protocol-Other/pkg/PLIST

No conflicts created by this import



new: sysutils/htop

2016-11-05 Thread Ian Sutton
htop is an enhanced version of the venerable top(1).

could a porter please add this? i am more than happy to maintain.

ian


htop-2.0.2.tgz
Description: application/tar-gz


Re: hedgewars failed in last bulk

2016-11-05 Thread Nigel Taylor
On 11/04/16 08:38, Antoine Jacoutot wrote:
> On Thu, Nov 03, 2016 at 10:17:33PM +, Nigel Taylor wrote:
>> On 11/03/16 18:30, Nigel Taylor wrote:
>>> On 11/03/16 08:27, Antoine Jacoutot wrote:
>>
>> Just retried and built...
>>
>> dpb is building
>>
>> make SUBDIR="games/hedgewars,-main" 
>>
>> It's make SUBDIR="games/hedgewars,-main" that requires hs-dataenc as 
>> NOSERVER is not set
>> in CONFIGURE_ARGS
>>
>> but junk is using
>>
>> make SUBDIR="games/hedgewars,no_server,-main" 
>>
>> So doesn't keep hs-dataenc as NOSERVER is set.
>>
>> should be building 
>> games/hedgewars,no_server,-main
>> games/hedgewars,-server
>>
>> games/Makefile has
>> SUBDIR += hedgewars
>>
>> builds ,-main ,-server doesn't ask to build no_server,-main ,-server
>>
>> Not sure the PSEUDO_FLAVOR is required. Most bulks built ,-main ,-server and 
>> not 
>> building using no_server FLAVOR, and build as long as dpb junk hasn't 
>> removed hs-dataenc.
> 
> This is very fragile indeed.
> I would be in favor to just remove the PSEUDO_FLAVOR. Would anyone object?
> 
There appears to be another issue, which causes dataenc not to be found
during configure.

devel/hs-dataenc and devel/hs-sandi appear to conflict with each other.

$ pkg_info -L hs-sandi | grep Binary/Base64
/usr/local/lib/ghc/sandi-0.3.5/Codec/Binary/Base64.hi
/usr/local/lib/ghc/sandi-0.3.5/Codec/Binary/Base64.p_hi
/usr/local/lib/ghc/sandi-0.3.5/Codec/Binary/Base64Url.hi
/usr/local/lib/ghc/sandi-0.3.5/Codec/Binary/Base64Url.p_hi
$ pkg_info -L hs-dataenc | grep Binary/Base64
/usr/local/lib/ghc/dataenc-0.14.0.7/Codec/Binary/Base64.hi
/usr/local/lib/ghc/dataenc-0.14.0.7/Codec/Binary/Base64.p_hi
/usr/local/lib/ghc/dataenc-0.14.0.7/Codec/Binary/Base64Url.hi
/usr/local/lib/ghc/dataenc-0.14.0.7/Codec/Binary/Base64Url.p_hi

These two packages cannot be installed together..

hs-sandi is only used in devel/darcs build and hs-dataenc is only used
in games/hedgewares. Either will fail if junk hasn't removed the other
package.