Re: p7zip: add support for more archs

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/11/11 22:19, Josh Grosse wrote:
>> On Wed, Nov 11, 2015 at 09:45:22PM -0500, Josh Grosse wrote:
>> > Fixing the code may be the correct solution, but it is beyond me, as 
>> > I don't have the technical skills to deal with the portability issues 
>> > that were raised and to my understanding still exist.
>> 
>> I've had an out-of-band discussion with Theo.  Fixing the code is the
>> correct solution.  So I will invest the effort to obtain the skills 
>> and knowledge needed to fix the code.
>
> It seems that upstream would like to be portable - it's in the project
> name, and their list of unofficial packages includes Amiga and BeOS -
> it might well need little more work than reporting it upstream.
>
> And indeed they may have even already fixed it in the time since it
> was previously tested.
>
> Is there anyone with an alpha that can try regress tests with jca's
> diff and send a backtrace if it still segfaults?

Three successful regress tests runs on sparc64.  I doubt that we'll get
many alpha test reports, these days.

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

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 14:28:55

Modified files:
x11/gtk+3  : Makefile distinfo 

Log message:
Update to gtk+3-3.18.4.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 14:53:56

Modified files:
security/py-acme: Makefile distinfo 

Log message:
update to py-acme 20151108

go 1.5.1 update draft

[Ted Unangst]

Update to go 1.5.1. There are some oddities because of bootstrapping, but it
generally seems to work ok. Needs some polish, but it's a start.

The bootstrap requires an existing go install, but the file layout we use
for the package doesn't seem to work. So it bootstraps from an existing
*build* of 1.4.2 in the ports directory. Maybe this can be fixed up somehow.
Certainly, bootstrapping 1.5 to 1.5 won't work this way, but I'm not sure what
to do here.

(Also, delete all the patches in the patches dir.)


? oldpatches
? patches
Index: Makefile
===
RCS file: /cvs/ports/lang/go/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile19 Aug 2015 06:57:20 -  1.26
+++ Makefile12 Nov 2015 20:44:19 -
@@ -4,8 +4,8 @@ ONLY_FOR_ARCHS =${GO_ARCHS}
 
 COMMENT =  Go programming language
 
-VERSION =  1.4.2
-REVISION = 0
+VERSION =  1.5.1
+#REVISION =0
 EXTRACT_SUFX = .src.tar.gz
 DISTNAME = go${VERSION}
 PKGNAME =  go-${VERSION}
@@ -64,6 +64,7 @@ do-build:
CC="${CC}" \
CXX="${CXX}" \
GOROOT=${WRKDIST} \
+   GOROOT_BOOTSTRAP=${WRKDIST}/../../go-1.4.2/go \
GOBIN=${WRKDIST}/bin \
GOROOT_FINAL=${GOROOT} ./make.bash --no-banner
 
@@ -82,7 +83,7 @@ do-install:
-exec ${INSTALL_DATA} -p {} \
${GOROOT} \;
 
-.  for dir in doc include lib misc src pkg
+.  for dir in doc lib misc src pkg
@cd ${WRKDIST} && \
find ${dir} -type d \
-exec ${INSTALL_DATA_DIR} \
Index: distinfo
===
RCS file: /cvs/ports/lang/go/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo6 May 2015 08:28:26 -   1.13
+++ distinfo12 Nov 2015 20:44:19 -
@@ -1,2 +1,2 @@
-SHA256 (go1.4.2.src.tar.gz) = KZpv2Pit/c4VvAa96SbnslKujiTdWxa32Hke1557Xps=
-SIZE (go1.4.2.src.tar.gz) = 10921896
+SHA256 (go1.5.1.src.tar.gz) = qImHPpjZpyrjlqm33Vl8KdzXCcr6kJfZxLoEz/DsQ2s=
+SIZE (go1.5.1.src.tar.gz) = 12049701
Index: pkg/PFRAG.amd64
===
RCS file: /cvs/ports/lang/go/pkg/PFRAG.amd64,v
retrieving revision 1.5
diff -u -p -r1.5 PFRAG.amd64
--- pkg/PFRAG.amd64 23 Dec 2014 12:21:37 -  1.5
+++ pkg/PFRAG.amd64 12 Nov 2015 20:44:20 -
@@ -1,5 +1,2 @@
 @comment $OpenBSD: PFRAG.amd64,v 1.5 2014/12/23 12:21:37 jsing Exp $
-go/src/runtime/zasm_openbsd_amd64.h
-go/src/runtime/zgoarch_amd64.go
-go/src/runtime/zruntime_defs_openbsd_amd64.go
-go/src/runtime/zsys_openbsd_amd64.s
+go/src/runtime/zgoarch_${MACHINE_ARCH}.go
Index: pkg/PFRAG.i386
===
RCS file: /cvs/ports/lang/go/pkg/PFRAG.i386,v
retrieving revision 1.5
diff -u -p -r1.5 PFRAG.i386
--- pkg/PFRAG.i386  23 Dec 2014 12:21:37 -  1.5
+++ pkg/PFRAG.i386  12 Nov 2015 20:44:20 -
@@ -1,5 +1,2 @@
 @comment $OpenBSD: PFRAG.i386,v 1.5 2014/12/23 12:21:37 jsing Exp $
-go/src/runtime/zasm_openbsd_386.h
 go/src/runtime/zgoarch_386.go
-go/src/runtime/zruntime_defs_openbsd_386.go
-go/src/runtime/zsys_openbsd_386.s
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/go/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST   23 Dec 2014 12:21:37 -  1.12
+++ pkg/PLIST   12 Nov 2015 20:44:21 -
@@ -5,10 +5,11 @@
 @bin bin/gofmt
 go/
 go/AUTHORS
+go/CONTRIBUTING.md
 go/CONTRIBUTORS
 go/LICENSE
 go/PATENTS
-go/README
+go/README.md
 go/VERSION
 go/doc/
 go/doc/articles/
@@ -21,6 +22,7 @@ go/doc/articles/wiki/final-noclosure.go
 go/doc/articles/wiki/final-noerror.go
 go/doc/articles/wiki/final-parsetemplate.go
 go/doc/articles/wiki/final-template.go
+go/doc/articles/wiki/final-test.patch
 go/doc/articles/wiki/final.go
 go/doc/articles/wiki/get.go
 go/doc/articles/wiki/http-sample.go
@@ -55,6 +57,7 @@ go/doc/contrib.html
 go/doc/contribute.html
 go/doc/debugging_with_gdb.html
 go/doc/devel/
+go/doc/devel/pre_go1.html
 go/doc/devel/release.html
 go/doc/devel/weekly.html
 go/doc/docs.html
@@ -68,6 +71,7 @@ go/doc/go1.1.html
 go/doc/go1.2.html
 go/doc/go1.3.html
 go/doc/go1.4.html
+go/doc/go1.5.html
 go/doc/go1.html
 go/doc/go1compat.html
 go/doc/go_faq.html
@@ -107,7 +111,6 @@ go/doc/help.html
 go/doc/ie.css
 go/doc/install-source.html
 go/doc/install.html
-go/doc/logo-153x55.png
 go/doc/play/
 go/doc/play/fib.go
 go/doc/play/hello.go
@@ -123,14 +126,10 @@ go/doc/progs/cgo2.go
 go/doc/progs/cgo3.go
 go/doc/progs/cgo4.go
 go/doc/progs/defer.go
-go/doc/progs/defer.out
 go/doc/progs/defer2.go
-go/doc/progs/defer2.out
 go/doc/progs/eff_bytesize.go
-go/doc/progs/eff_bytesize.out
 

Re: update: devel/llvm

[Stuart Henderson]

Here's the first i386 failure, in devel/xulrunner/24:

[...]
INPUT("../../media/webvtt/error.o")
INPUT("../../media/webvtt/lexer.o")
INPUT("../../media/webvtt/node.o")
INPUT("../../media/webvtt/parser.o")
INPUT("../../media/webvtt/string.o")

/usr/obj/ports/xulrunner-24.8.0/mozilla-esr24/config/rules.mk:1023: recipe for 
target 'libxul.so.0.0' failed
gmake[3]: Leaving directory 
'/usr/obj/ports/xulrunner-24.8.0/build-i386/toolkit/library'
/usr/obj/ports/xulrunner-24.8.0/mozilla-esr24/config/makefiles/target_libs.mk:16:
 recipe for target 'libs_tier_platform' failed
gmake[2]: Leaving directory '/usr/obj/ports/xulrunner-24.8.0/build-i386'
/usr/obj/ports/xulrunner-24.8.0/mozilla-esr24/config/rules.mk:737: recipe for 
target 'tier_platform' failed
gmake[1]: Leaving directory '/usr/obj/ports/xulrunner-24.8.0/build-i386'
/usr/obj/ports/xulrunner-24.8.0/mozilla-esr24/config/rules.mk:670: recipe for 
target 'all' failed
===> Exiting devel/xulrunner/24 with an error
../../layout/svg/nsSVGFilterFrame.o: In function 
`nsSVGFilterFrame::GetFilterContent(nsIContent*)':
/usr/obj/ports/xulrunner-24.8.0/mozilla-esr24/layout/svg/nsSVGFilterFrame.cpp:(.text._ZN16nsSVGFilterFrame16GetFilterContentEP10nsIContent+0x31):
 undefined reference to `nsSVGFE::COMTypeInfo::kIID'
../../layout/svg/nsSVGFilterInstance.o: In function 
`nsSVGFilterInstance::BuildPrimitives()':
/usr/obj/ports/xulrunner-24.8.0/mozilla-esr24/layout/svg/nsSVGFilterInstance.cpp:(.text._ZN19nsSVGFilterInstance15BuildPrimitivesEv+0x48):
 undefined reference to `nsSVGFE::COMTypeInfo::kIID'
../../content/svg/content/src/SVGFEComponentTransferElement.o: In function 
`mozilla::dom::SVGFEComponentTransferElement::Filter(nsSVGFilterInstance*, 
nsTArray const&, nsSVGFE::Image const*, nsIntRect 
const&)':
/usr/obj/ports/xulrunner-24.8.0/mozilla-esr24/content/svg/content/src/SVGFEComponentTransferElement.cpp:(.text._ZN7mozilla3dom29SVGFEComponentTransferElement6FilterEP19nsSVGFilterInstanceRK8nsTArrayIPKN7nsSVGFE5ImageEES8_RK9nsIntRect+0xbc):
 undefined reference to 
`mozilla::dom::SVGComponentTransferFunctionElement::COMTypeInfo::kIID'
/usr/bin/ld: libxul.so.0.0: hidden symbol `_ZN7nsSVGFE11COMTypeInfoIiE4kIIDE' 
isn't defined
/usr/bin/ld: final link failed: Nonrepresentable section on output
clang-3.7: error: linker command failed with exit code 1 (use -v to see 
invocation)

I won't include the whole log here as uncompressed it's just about big
enough to fill a CD...

CVS: cvs.openbsd.org: ports

[James Turner]

CVSROOT:/cvs
Module name:ports
Changes by: jtur...@cvs.openbsd.org 2015/11/12 13:51:10

Modified files:
www/kcgi   : Makefile distinfo 
Removed files:
www/kcgi/patches: patch-sandbox-systrace_c 

Log message:
Update kcgi to 0.7.4

Remove upstreamed patch. kcgi has also switched to the new pledge(2) api.

Re: p7zip: add support for more archs

[Stuart Henderson]

On 2015/11/11 22:19, Josh Grosse wrote:
> On Wed, Nov 11, 2015 at 09:45:22PM -0500, Josh Grosse wrote:
> > Fixing the code may be the correct solution, but it is beyond me, as 
> > I don't have the technical skills to deal with the portability issues 
> > that were raised and to my understanding still exist.
> 
> I've had an out-of-band discussion with Theo.  Fixing the code is the
> correct solution.  So I will invest the effort to obtain the skills 
> and knowledge needed to fix the code.

It seems that upstream would like to be portable - it's in the project
name, and their list of unofficial packages includes Amiga and BeOS -
it might well need little more work than reporting it upstream.

And indeed they may have even already fixed it in the time since it
was previously tested.

Is there anyone with an alpha that can try regress tests with jca's
diff and send a backtrace if it still segfaults?

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 02:59:41

Modified files:
x11/wmii   : Makefile 
Added files:
x11/wmii/patches: patch-rc_rc_wmii_rc patch-rc_sh_wmii 
  patch-rc_wmiirc_sh 

Log message:
Adapt x11/wmii to font changes in dmenu. From trondd at kagu-tsuchi com

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/12 01:50:35

Modified files:
math/ntl   : Makefile distinfo 
math/ntl/pkg   : PLIST 

Log message:
Update to ntl-9.6.1.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/12 02:21:33

Modified files:
devel/p5-B-Keywords: Makefile distinfo 

Log message:
Update to p5-B-Keywords-1.15.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/12 02:36:24

Modified files:
mail/p5-MIME-Types: Makefile distinfo 

Log message:
Update to p5-MIME-Types-2.12.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 03:11:50

Added files:
x11/golem/patches: patch-src_rclex_l 

Log message:
workaround for newer flex, from pkgsrc

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/12 02:27:28

Modified files:
devel/p5-DateTime-Event-Recurrence: Makefile distinfo 

Log message:
Update to p5-DateTime-Event-Recurrence-0.18.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/12 02:04:08

Modified files:
converters/p5-Unicode-LineBreak: Makefile distinfo 

Log message:
Update to p5-Unicode-LineBreak-2015.11.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/12 02:11:54

Modified files:
databases/p5-Rose-Object: Makefile distinfo 

Log message:
Update to p5-Rose-Object-0.860.

cairo-1.14.4

[David Coppa]

Hi!

Bugfixing update to cairo-1.14.4, no API changes.

http://www.cairographics.org/news/cairo-1.14.4/

Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.57
diff -u -p -u -p -r1.57 Makefile
--- Makefile30 Mar 2015 07:12:15 -  1.57
+++ Makefile12 Nov 2015 19:58:33 -
@@ -2,7 +2,7 @@
 
 COMMENT=   vector graphics library
 
-DISTNAME=  cairo-1.14.2
+DISTNAME=  cairo-1.14.4
 SHARED_LIBS+=  cairo 12.3
 SHARED_LIBS+=  cairo-gobject 1.1
 SHARED_LIBS+=  cairo-script-interpreter 1.1
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 distinfo
--- distinfo30 Mar 2015 07:12:15 -  1.24
+++ distinfo12 Nov 2015 19:58:33 -
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.14.2.tar.xz) = yRnZmd2xu77NS75lKZyiq9IHnH4T0iRXeJWvpwBezOs=
-SIZE (cairo-1.14.2.tar.xz) = 35376404
+SHA256 (cairo-1.14.4.tar.xz) = 9uycfIRNuewBHw1mtX71kMRa31U5PR/CSQA1ElIu5xY=
+SIZE (cairo-1.14.4.tar.xz) = 36040204
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/cairo/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 PLIST
--- pkg/PLIST   30 Mar 2015 07:12:15 -  1.18
+++ pkg/PLIST   12 Nov 2015 19:58:33 -
@@ -93,6 +93,7 @@ share/gtk-doc/html/cairo/cairo.devhelp2
 share/gtk-doc/html/cairo/home.png
 share/gtk-doc/html/cairo/index-1.10.html
 share/gtk-doc/html/cairo/index-1.12.html
+share/gtk-doc/html/cairo/index-1.14.html
 share/gtk-doc/html/cairo/index-1.2.html
 share/gtk-doc/html/cairo/index-1.4.html
 share/gtk-doc/html/cairo/index-1.6.html

Re: cairo-1.14.4

[Antoine Jacoutot]

On Thu, Nov 12, 2015 at 11:24:28PM +0100, David Coppa wrote:
> 
> Hi!
> 
> Bugfixing update to cairo-1.14.4, no API changes.

Overlapping work, next time ask maintainer first...

> http://www.cairographics.org/news/cairo-1.14.4/

This diff has already been in 10 of my bulks.
I've been pinging eric@ for the last 2 weeks to commit it.


> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/cairo/Makefile,v
> retrieving revision 1.57
> diff -u -p -u -p -r1.57 Makefile
> --- Makefile  30 Mar 2015 07:12:15 -  1.57
> +++ Makefile  12 Nov 2015 19:58:33 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= vector graphics library
>  
> -DISTNAME=cairo-1.14.2
> +DISTNAME=cairo-1.14.4
>  SHARED_LIBS+=cairo 12.3
>  SHARED_LIBS+=cairo-gobject 1.1
>  SHARED_LIBS+=cairo-script-interpreter 1.1
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/cairo/distinfo,v
> retrieving revision 1.24
> diff -u -p -u -p -r1.24 distinfo
> --- distinfo  30 Mar 2015 07:12:15 -  1.24
> +++ distinfo  12 Nov 2015 19:58:33 -
> @@ -1,2 +1,2 @@
> -SHA256 (cairo-1.14.2.tar.xz) = yRnZmd2xu77NS75lKZyiq9IHnH4T0iRXeJWvpwBezOs=
> -SIZE (cairo-1.14.2.tar.xz) = 35376404
> +SHA256 (cairo-1.14.4.tar.xz) = 9uycfIRNuewBHw1mtX71kMRa31U5PR/CSQA1ElIu5xY=
> +SIZE (cairo-1.14.4.tar.xz) = 36040204
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/cairo/pkg/PLIST,v
> retrieving revision 1.18
> diff -u -p -u -p -r1.18 PLIST
> --- pkg/PLIST 30 Mar 2015 07:12:15 -  1.18
> +++ pkg/PLIST 12 Nov 2015 19:58:33 -
> @@ -93,6 +93,7 @@ share/gtk-doc/html/cairo/cairo.devhelp2
>  share/gtk-doc/html/cairo/home.png
>  share/gtk-doc/html/cairo/index-1.10.html
>  share/gtk-doc/html/cairo/index-1.12.html
> +share/gtk-doc/html/cairo/index-1.14.html
>  share/gtk-doc/html/cairo/index-1.2.html
>  share/gtk-doc/html/cairo/index-1.4.html
>  share/gtk-doc/html/cairo/index-1.6.html
> 

-- 
Antoine

Re: cairo-1.14.4

[David Coppa]

Il 12/nov/2015 23:26, "Antoine Jacoutot"  ha scritto:
>
> On Thu, Nov 12, 2015 at 11:24:28PM +0100, David Coppa wrote:
> >
> > Hi!
> >
> > Bugfixing update to cairo-1.14.4, no API changes.
>
> Overlapping work, next time ask maintainer first...
>
> > http://www.cairographics.org/news/cairo-1.14.4/
>
> This diff has already been in 10 of my bulks.
> I've been pinging eric@ for the last 2 weeks to commit it.

Please go for it, ok with me too.

Ciao!
David

Re: p7zip: add support for more archs

[Christian Weisgerber]

On 2015-11-11, Jérémie Courrèges-Anglas  wrote:

> Right now p7zip fails to build on several archs, because of the rather
> lame approach to endianness taken by this port.  This patch should allow
> to build p7zip on all archs supported by OpenBSD.

Have you considered getting the information from endian.h?

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

more deps for letsencrypt

[Stuart Henderson]

Here are 3 more of the deps needed for letsencrypt, attached tgz
unpacks in dump^H^H^H^Hdevel/.

py-configargparse - argparse replacement, allows options to be set via files/env
py-parsedatetime - parse human-readable date/time text
py-python2-pythondialog - Python interface to the UNIX dialog utility

OK to import?

It will also need some more py-zope* ports which I have but need
cleaning up and need updating the existing ones in devel/, and
py-psutil *waves at landry :)*.

Why did they need to pull in so many crazy deps?!



le-deps.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 04:02:25

Modified files:
x11/gnome/vinagre: Makefile distinfo 
x11/gnome/vinagre/pkg: PLIST 

Log message:
Update to vinagre-3.18.2.

Re: MODGNU_GEN, simpler support for running autogen.sh

[Stuart Henderson]

> > I considered something like this too, but it didn't overall feel quite
> > right - we need a way to set the script name anyway (even without
> > autoreconf -fi the names vary), and I'm trying to avoid too much use
> > of the word "autogen" to avoid confusion with devel/autogen.
> 
> Now that you mention it, I don't think this is such a bad idea actually.
> We could have:
> CONFIGURE_STYLE = autogen (runs ./autogen.sh)
> CONFIGURE_STYLE = autoreconf (run autoreconf -fi)
> 
> But I'm not opposed to your way.
> 
> I am really happy someone actually moved on that :-)

hmm, let's look at a sample of what's in tree already (not all of them).

archivers/par2cmdline/Makefile:37-  aclocal; automake --add-missing; 
autoconf
audio/faad/Makefile:71- sh bootstrap
audio/timidity/Makefile:71- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} 
aclocal -I autoconf
audio/swh-plugins/Makefile:47-  cd ${WRKSRC}; ${AUTO_ENV} aclocal -I . -I m4
audio/mp3blaster/Makefile:38-   @cd ${WRKSRC}; ${AUTO_ENV} aclocal
audio/jack/Makefile:63- cd ${WRKSRC}; ${AUTO_ENV} aclocal
audio/jack/Makefile:66- cd ${WRKSRC}; ${AUTO_ENV} automake --add-missing 
--foreign
comms/tlf/Makefile:36-  autoreconf --install
devel/hyena/Makefile:39-AUTOMAKE_VERSION=${AUTOMAKE_VERSION} 
aclocal -I build/m4/shamrock
devel/ois/Makefile:45-  AUTOMAKE_VERSION=${AUTOMAKE_VERSION} sh 
./bootstrap
games/numptyphysics/Makefile:57-
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal
geo/osm-gps-map/Makefile:56-NOCONFIGURE=yes ./autogen.sh
graphics/libpgf/Makefile:39-sh autogen.sh
lang/fsharp/Makefile:38-AUTOMAKE_VERSION=${AUTOMAKE_VERSION} 
./autogen.sh --prefix=${LOCALBASE}
multimedia/transcode/Makefile:129-  
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -if
security/yara/main/Makefile:20- AUTOCONF_VERSION=${AUTOCONF_VERSION} 
./bootstrap.sh

so some different filenames, various direct auto* / aclocal invocations,
some aren't executable (or maybe use bash) and need sh ..

Perhaps match on something like 'CONFIGURE_STYLE= gnu gen' and set
'MODGNU_GEN?=sh autogen.sh' but still allow it to be overridden?
(Or s/gen/generate/ for a more self-explanatory string but more to
type).

Other input definitely welcome.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2015/11/12 05:52:39

Removed files:
devel/ocaml-menhir/patches: patch-Makefile patch-src_Makefile 
net/mosh/patches: patch-src_network_transportfragment_cc 
www/otter-browser/patches: patch-CMakeLists_txt 

Log message:
remove empty patch files

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 03:25:52

Modified files:
www/webkitgtk4 : Makefile distinfo 
www/webkitgtk4/patches: patch-Source_WTF_wtf_Platform_h 

patch-Source_WebKit2_Shared_Plugins_unix_PluginSearchPath_cpp 

Log message:
Update to webkitgtk4-2.10.4.

Re: Bison 3, again

[Jérémie Courrèges-Anglas]

j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> Nigel Taylor  writes:
>
>> On 11/10/15 13:00, Jérémie Courrèges-Anglas wrote:
>>> 
>>> Hi,
>>> 
>>> it's been a few years that our bison port hasn't been updated, the main
>>> reason being that our m4 doesn't groke some of the constructs used by
>>> newer bison releases.  More and more packages out there require a recent
>>> bison version.  As an OpenBSD developer, I don't think that building
>>> parsers using a recent bison on another OS is a valid answer to that
>>> problem.
>>> 
>>> Yet, nobody found the time and motivation to implement the features /
>>> fix the bugs in m4.
>>> 
>>> Here's my proposal: update bison to the latest version and make it use
>>> devel/m4 (GNU m4).  *Then* *if* someone wants to make the efforts
>>> required for bison to use base m4, that would be awesome.
>>> 
>>> Sorry if this sounds blunt, but this is the only way forward I can see.
>>> 
>>> I'll be available later today to discuss this further if needed.
>>> 
>>> Diff below,
>>> 
>>
>> Failed to build for me...
>>
>> devel/help2man needs adding to BDEP.
>
> Thanks for spotting this!  Here's an updated patch, fixing the BDEP and
> incorporating sthen's comment for the CONFIGURE_ENV tweak.
>
> I got only positive feedback so far, I'm now asking for oks. ;)

I forgot to mention a "small" detail: the ports that needed a fix were
discovered by a bulk build, the diff below went into a second bulk with
no breakage.  Thanks Antoine for those bulks. :)

> Index: devel/bison/Makefile
> ===
> RCS file: /cvs/ports/devel/bison/Makefile,v
> retrieving revision 1.51
> diff -u -p -r1.51 Makefile
> --- devel/bison/Makefile  19 May 2015 09:54:53 -  1.51
> +++ devel/bison/Makefile  11 Nov 2015 17:41:46 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT= GNU parser generator
>  
> -DISTNAME=bison-2.3
> -REVISION=2
> +DISTNAME=bison-3.0.4
>  CATEGORIES=  devel
>  MASTER_SITES=${MASTER_SITE_GNU:=bison/}
>  
> @@ -14,10 +13,17 @@ PERMIT_PACKAGE_CDROM= Yes
>  
>  WANTLIB= c
>  MODULES= devel/gettext
> -BUILD_DEPENDS=   devel/m4
> +BUILD_DEPENDS=   devel/help2man \
> + devel/m4
> +RUN_DEPENDS= devel/m4
>  
>  CONFIGURE_STYLE=gnu
>  CONFIGURE_ARGS=  --disable-yacc
> +# Set bison to use "m4 -g" instead of "m4 --gnu" to permit use with m4
> +# from the base OS by setting M4=/usr/bin/m4 in the environment. This is
> +# for development purposes; bison currently uses GNU regular expressions
> +# which are not compatible with base m4.
> +CONFIGURE_ENV+=  ac_cv_prog_gnu_m4_gnu="-g"
>  MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
>  
>  .include 
> Index: devel/bison/distinfo
> ===
> RCS file: /cvs/ports/devel/bison/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- devel/bison/distinfo  18 Jan 2015 03:13:08 -  1.9
> +++ devel/bison/distinfo  11 Nov 2015 17:41:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (bison-2.3.tar.gz) = UveKpHYadM63/fdw81VN2EMIw7k8QlXjpcF1WOzaKT4=
> -SIZE (bison-2.3.tar.gz) = 1386694
> +SHA256 (bison-3.0.4.tar.gz) = tn/S2q56ZLW6hixmwHwa3bnmsbBcXyBJOSz9iiFylS4=
> +SIZE (bison-3.0.4.tar.gz) = 3354179
> Index: devel/bison/patches/patch-configure
> ===
> RCS file: devel/bison/patches/patch-configure
> diff -N devel/bison/patches/patch-configure
> --- devel/bison/patches/patch-configure   8 Jul 2008 00:24:17 -   
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-configure,v 1.3 2008/07/08 00:24:17 brad Exp $
>  configure.orig   Mon Jun  5 03:32:01 2006
> -+++ configureSun Jun 29 22:09:16 2008
> -@@ -16768,10 +16768,10 @@ s,@host_cpu@,$host_cpu,;t t
> - s,@host_vendor@,$host_vendor,;t t
> - s,@host_os@,$host_os,;t t
> - s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
> --s,@LIBICONV@,$LIBICONV,;t t
> -+s,@LIBICONV@,$LTLIBICONV,;t t
> - s,@LTLIBICONV@,$LTLIBICONV,;t t
> - s,@INTLLIBS@,$INTLLIBS,;t t
> --s,@LIBINTL@,$LIBINTL,;t t
> -+s,@LIBINTL@,$LTLIBINTL,;t t
> - s,@LTLIBINTL@,$LTLIBINTL,;t t
> - s,@POSUB@,$POSUB,;t t
> - s,@UNISTD_H@,$UNISTD_H,;t t
> Index: devel/bison/patches/patch-data_m4sugar_m4sugar_m4
> ===
> RCS file: /cvs/ports/devel/bison/patches/patch-data_m4sugar_m4sugar_m4,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-data_m4sugar_m4sugar_m4
> --- devel/bison/patches/patch-data_m4sugar_m4sugar_m4 8 Jul 2008 00:24:17 
> -   1.2
> +++ devel/bison/patches/patch-data_m4sugar_m4sugar_m4 11 Nov 2015 17:41:46 
> -
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-data_m4sugar_m4sugar_m4,v 1.2 2008/07/08 00:24:17 brad Exp $
>  data/m4sugar/m4sugar.m4.orig Mon Nov 14 03:13:07 2005
> -+++ data/m4sugar/m4sugar.m4  Sun Jun 29 22:09:16 2008
> 

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2015/11/12 04:12:01

Modified files:
games/wesnoth  : Makefile distinfo 
games/wesnoth/patches: 
   patch-src_campaign_server_campaign_server_cpp 
games/wesnoth/pkg: PLIST 

Log message:
update to wesnoth-1.12.5

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2015/11/12 05:28:11

Modified files:
www/libwebsockets: Makefile 

Log message:
As noticed by sthen@, SEPARATE_BUILD=Yes is already set by cmake.port.mk

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2015/11/12 05:27:09

Modified files:
www: Makefile 

Log message:
+libwebsockets, ok sthen@

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2015/11/12 03:56:39

Modified files:
www/iridium: Makefile distinfo 

Log message:
update to 46.0-final

Re: MODGNU_GEN, simpler support for running autogen.sh

[Antoine Jacoutot]

On Thu, Nov 12, 2015 at 10:49:19AM +, Stuart Henderson wrote:
> On 2015/11/11 11:43, Antoine Jacoutot wrote:
> > On Wed, Nov 11, 2015 at 09:51:55AM +, Stuart Henderson wrote:
> > > After getting annoyed at typing this manually for the Nth time, I thought
> > > it would be a good idea to add support for running "autogen.sh" type 
> > > scripts
> > > to gnu.port.mk. The diff includes a conversion for audio/tremor as an
> > > example, I'll write up a bit for bsd.port.mk(5) if it's ok to add.
> > 
> > Oh I would welcome something like that very much!
> > Considering devel/libtool is required in 90% of the cases, would it
> > make sense to add it as a BUILD_DEPENDS as well?
> 
> I did consider that but couldn't make up my mind, it probably does
> make sense to add it somewhere - though perhaps it would be better in
> MODGNU_AUTOMAKE_DEPENDS?

The problem with that is that is you set CONFIGURE_STYLE=automake, then you add 
a BUILD_DEPENDS on libtool.
On the other end, I never quite understood what CONFIGURE_STYLE=automake is 
used for...

> > I am also wondering if we couldn't factorize something so that we
> > can either run autogen.sh or autoreconf -fi -- since the rest of the
> > construct it the same and not all ports that need regeneration come
> > with an autogen.sh script.
> 
> How about the diff below? It now sets PATH=${WRKSRC}:${PORTPATH} so that
> MODGNU_GEN=autogen.sh still works without using "./" that I previously
> had in the shell command, and allows use of "MODGNU_GEN=autoreconf -fi".
> There's a bsd.port.mk(5) diff at the bottom as well.
> 
> czarkoff@ suggested using a different CONFIGURE_STYLE for this, e.g.
> 
> >   CONFIGURE_STYLE = autogen.sh
> 
> I considered something like this too, but it didn't overall feel quite
> right - we need a way to set the script name anyway (even without
> autoreconf -fi the names vary), and I'm trying to avoid too much use
> of the word "autogen" to avoid confusion with devel/autogen.

Now that you mention it, I don't think this is such a bad idea actually.
We could have:
CONFIGURE_STYLE = autogen (runs ./autogen.sh)
CONFIGURE_STYLE = autoreconf (run autoreconf -fi)

But I'm not opposed to your way.

I am really happy someone actually moved on that :-)


> Index: gnu.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/gnu.port.mk,v
> retrieving revision 1.54
> diff -u -p -r1.54 gnu.port.mk
> --- gnu.port.mk   13 Sep 2014 16:28:47 -  1.54
> +++ gnu.port.mk   12 Nov 2015 10:33:24 -
> @@ -7,6 +7,7 @@
>  MODGNU_AUTOCONF_DEPENDS = devel/metaauto \
>   devel/autoconf/${AUTOCONF_VERSION}
>  MODGNU_AUTOMAKE_DEPENDS = devel/metaauto \
> + devel/libtool \
>   devel/automake/${AUTOMAKE_VERSION}
>  
>  AUTOMAKE_VERSION ?= 1.4
> @@ -74,7 +75,7 @@ MODGNU_configure += ; mkdir -p ${MODGNU_
>  CONFIGURE_ENV += MKDIR_P='mkdir -p'
>  # XXX Older versions of glib-gettext.m4 and intltool.m4 used to set
>  # DATADIRNAME to "lib" which resulted in locale files being installed
> -# under the wrong directory.  
> +# under the wrong directory.
>  CONFIGURE_ENV += DATADIRNAME=share
>  .  if ${MODGNU_SAVE_CACHE:L} == "yes"
>  CONFIGURE_ARGS += --cache-file=${WRKBUILD}/config.cache
> @@ -105,7 +106,7 @@ CONFIGURE_ARGS += --disable-silent-rules
>  # If one of these tools is found at configure stage, it might be used,
>  # no matter whether we use --disable-gtk-doc or not.
>  CONFIGURE_ARGS += --disable-gtk-doc
> -CONFIGURE_ENV += ac_cv_path_GTKDOC_CHECK=""  
> +CONFIGURE_ENV += ac_cv_path_GTKDOC_CHECK=""
>  CONFIGURE_ENV += ac_cv_path_GTKDOC_REBASE=""
>  CONFIGURE_ENV += ac_cv_path_GTKDOC_MKPDF=""
>  .  endif
> @@ -113,8 +114,17 @@ CONFIGURE_ENV += ac_cv_path_GTKDOC_MKPDF
>  
>  TEST_TARGET ?= check
>  
> +.if defined(MODGNU_GEN)
> +BUILD_DEPENDS += ${MODGNU_AUTOMAKE_DEPENDS}
> +BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS}
> +MODGNU_post-patch += cd ${WRKSRC}; ${_SYSTRACE_CMD} ${SETENV} \
> + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
> + AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> + PATH=.:${PORTPATH} ${MODGNU_GEN};
> +.endif
> +
>  # internal stuff to run on each directory.
> -MODGNU_post-patch = for d in ${AUTOCONF_DIR}; do cd $$d; ${_MODGNU_loop} 
> done;
> +MODGNU_post-patch += for d in ${AUTOCONF_DIR}; do cd $$d; ${_MODGNU_loop} 
> done;
>  _MODGNU_loop =
>  
>  PATCH_CHECK_ONLY ?= No
> 
> 
> 
> Index: bsd.port.mk.5
> ===
> RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
> retrieving revision 1.427
> diff -u -p -r1.427 bsd.port.mk.5
> --- bsd.port.mk.5 12 Oct 2015 10:27:22 -  1.427
> +++ bsd.port.mk.5 12 Nov 2015 10:47:43 -
> @@ -1962,6 +1962,17 @@ tedious.
>  .It Ev MODGNU_CONFIG_GUESS_DIRS
>  If a port uses config.guess outside WRKSRC, the directories
>  containing the other copies must be set here.
> +.It Ev MODGNU_GEN
> +Command used to generate files needed to configure the port.
> 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 03:56:30

Modified files:
x11/gnome/vino : Makefile distinfo 

Log message:
Update to vino-3.18.1.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2015/11/12 05:25:51

Log message:
Import libwebsockets; from maintainer Adam Wolk, ok sthen@

cat pkg/DESCR:
Libwebsockets is a lightweight pure C library built to use minimal CPU and
memory resources, and provide fast throughput in both directions.

Status:

Vendor Tag: jca
Release Tags:   jca_2015-Nov-12

N ports/www/libwebsockets/distinfo
N ports/www/libwebsockets/Makefile
N ports/www/libwebsockets/pkg/PLIST
N ports/www/libwebsockets/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 06:00:28

Modified files:
net: Makefile 
net/freeradius : Makefile 
net/freeradius/pkg: PLIST-iodbc PLIST-ldap PLIST-main 
PLIST-mysql PLIST-pgsql 

Log message:
+net/freeradius3 and register conflict with net/freeradius, ok jca@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/12 06:01:27

Modified files:
x11/gnome/online-accounts: Makefile distinfo 

Log message:
update to gnome-online-accounts-3.18.2.1

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/12 06:01:28

Modified files:
graphics/evince: Makefile distinfo 

Log message:
update to evince-3.18.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 05:59:38

Log message:
Import ports/net/freeradius3, in parallel with net/freeradius (configuration
has changed and isn't directly compatible, additionally future 3.x releases
might well restrict arch support). Feedback gsoares, feedback/ok jca@.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20151112

N ports/net/freeradius3/Makefile
N ports/net/freeradius3/distinfo
N ports/net/freeradius3/patches/patch-scripts_jlibtool_c
N ports/net/freeradius3/patches/patch-raddb_radiusd_conf_in
N ports/net/freeradius3/patches/patch-src_lib_net_c
N ports/net/freeradius3/patches/patch-src_main_detail_c
N ports/net/freeradius3/patches/patch-configure
N ports/net/freeradius3/patches/patch-src_tests_runtests_sh
N ports/net/freeradius3/patches/patch-doc_README
N ports/net/freeradius3/patches/patch-src_main_radsniff_c
N ports/net/freeradius3/patches/patch-raddb_certs_Makefile
N ports/net/freeradius3/patches/patch-scripts_libtool_mk
N ports/net/freeradius3/pkg/DESCR-iodbc
N ports/net/freeradius3/pkg/DESCR-ldap
N ports/net/freeradius3/pkg/DESCR-main
N ports/net/freeradius3/pkg/DESCR-mysql
N ports/net/freeradius3/pkg/DESCR-pgsql
N ports/net/freeradius3/pkg/PLIST-iodbc
N ports/net/freeradius3/pkg/PLIST-ldap
N ports/net/freeradius3/pkg/PLIST-main
N ports/net/freeradius3/pkg/freeradius.rc
N ports/net/freeradius3/pkg/PLIST-mysql
N ports/net/freeradius3/pkg/PLIST-pgsql
N ports/net/freeradius3/pkg/PLIST-python
N ports/net/freeradius3/pkg/DESCR-python

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/12 06:01:30

Modified files:
x11/gnome/contacts: Makefile distinfo 

Log message:
update to gnome-contacts-3.18.1

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/12 06:01:33

Modified files:
x11/gnome/gedit: Makefile distinfo 
x11/gnome/gedit/pkg: PLIST 

Log message:
update to gedit-3.18.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 03:14:09

Added files:
x11/amiwm/patches: patch-lex_l 

Log message:
patch for newer flex; yywrap() is not allowed to be a macro. from pkgsrc.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 03:13:24

Modified files:
x11/amiwm/patches: patch-Makefile_in 

Log message:
regen

Re: MODGNU_GEN, simpler support for running autogen.sh

[Antoine Jacoutot]

On Thu, Nov 12, 2015 at 11:24:20AM +, Stuart Henderson wrote:
> > > I considered something like this too, but it didn't overall feel quite
> > > right - we need a way to set the script name anyway (even without
> > > autoreconf -fi the names vary), and I'm trying to avoid too much use
> > > of the word "autogen" to avoid confusion with devel/autogen.
> > 
> > Now that you mention it, I don't think this is such a bad idea actually.
> > We could have:
> > CONFIGURE_STYLE = autogen (runs ./autogen.sh)
> > CONFIGURE_STYLE = autoreconf (run autoreconf -fi)
> > 
> > But I'm not opposed to your way.
> > 
> > I am really happy someone actually moved on that :-)
> 
> hmm, let's look at a sample of what's in tree already (not all of them).

Well there will always be exceptions of course :-)
I am pretty sure some of these could be converted to autoreconf -fi and some 
may actually bundle an autogen.sh script which was missed/unused at the time of 
porting.

> archivers/par2cmdline/Makefile:37-  aclocal; automake --add-missing; 
> autoconf
> audio/faad/Makefile:71- sh bootstrap
> audio/timidity/Makefile:71- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} 
> aclocal -I autoconf
> audio/swh-plugins/Makefile:47-  cd ${WRKSRC}; ${AUTO_ENV} aclocal -I . -I m4
> audio/mp3blaster/Makefile:38-   @cd ${WRKSRC}; ${AUTO_ENV} aclocal
> audio/jack/Makefile:63- cd ${WRKSRC}; ${AUTO_ENV} aclocal
> audio/jack/Makefile:66- cd ${WRKSRC}; ${AUTO_ENV} automake --add-missing 
> --foreign
> comms/tlf/Makefile:36-  autoreconf --install
> devel/hyena/Makefile:39-AUTOMAKE_VERSION=${AUTOMAKE_VERSION} 
> aclocal -I build/m4/shamrock
> devel/ois/Makefile:45-  AUTOMAKE_VERSION=${AUTOMAKE_VERSION} sh 
> ./bootstrap
> games/numptyphysics/Makefile:57-
> AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal
> geo/osm-gps-map/Makefile:56-NOCONFIGURE=yes ./autogen.sh

I think you want to add 'NOCONFIGURE=yes' by default in your diff.

> graphics/libpgf/Makefile:39-sh autogen.sh
> lang/fsharp/Makefile:38-AUTOMAKE_VERSION=${AUTOMAKE_VERSION} 
> ./autogen.sh --prefix=${LOCALBASE}
> multimedia/transcode/Makefile:129-  
> AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -if
> security/yara/main/Makefile:20- AUTOCONF_VERSION=${AUTOCONF_VERSION} 
> ./bootstrap.sh
> 
> so some different filenames, various direct auto* / aclocal invocations,
> some aren't executable (or maybe use bash) and need sh ..
> 
> Perhaps match on something like 'CONFIGURE_STYLE= gnu gen' and set
> 'MODGNU_GEN?=sh autogen.sh' but still allow it to be overridden?
> (Or s/gen/generate/ for a more self-explanatory string but more to
> type).
> 
> Other input definitely welcome.

How is FreeBSD coping with this?

-- 
Antoine

Re: Bison 3, again

[Antoine Jacoutot]

> I forgot to mention a "small" detail: the ports that needed a fix were
> discovered by a bulk build, the diff below went into a second bulk with
> no breakage.  Thanks Antoine for those bulks. :)

One thing about it. lang/mono always fail in my bulks, so there may be a couple 
of dragons still lurking but that's not big deal.

Re: NEW: net/freeradius3

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/11/12 02:17, Jérémie Courrèges-Anglas wrote:
>> Stuart Henderson  writes:
>> 
>> > Here (after rather a lot of pain) is a port for FreeRADIUS 3.0.10.
>> > The config isn't directly compatible with 2.x (at least the files have
>> > moved around), and in addition future 3.x versions are going to require
>> > c++11 features *INCLUDING TLS* so I'd like to import it in parallel to
>> > the existing version as net/freeradius3, keeping 2.x around for those
>> > who want to continue using it, and in case there are arch issues.
>> >
>> > Are others alright with this approach? Any comments or OKs to import?
>> > Thanks!
>> 
>> I'm fine with this approach.  The port looks fine, except for two minor
>> nits:
>> - patch-doc_README hardcodes /usr/local
>
> It's subst'ed in post-configure - I hate it when I do 'make; make
> update-patches' and it changes the ${TRUEPREFIX} back to /usr/local,
> and given the PLISTs there is already enough work to do when updating
> this beast ;)

Oops, indeed. :-]

> (As req'd by gsoares I have changed this from perl to sed -i).
>
>> - patch-src_main_detail_c should use %lld, not %llu
>
> Fixed, thanks.
>
>> Wouldn't a FR2/FR3 conflict marker be needed?
>
> Correct - there are markers in this port already, diff for FR2 below.

ok jca@ for the import and the diff below.

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/freeradius/Makefile,v
> retrieving revision 1.65
> diff -u -p -r1.65 Makefile
> --- Makefile  7 Nov 2015 14:51:08 -   1.65
> +++ Makefile  12 Nov 2015 09:55:23 -
> @@ -11,8 +11,7 @@ COMMENT-pgsql=  freeradius pgsql rlm addo
>  COMMENT-ldap=freeradius ldap rlm addon
>  
>  V=   2.2.9
> -REVISION-main=   1
> -REVISION-mysql=  0
> +REVISION=2
>  DISTNAME=freeradius-server-$V
>  EXTRACT_SUFX=.tar.bz2
>  
> Index: pkg/PLIST-iodbc
> ===
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-iodbc,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-iodbc
> --- pkg/PLIST-iodbc   17 Jul 2014 00:20:51 -  1.4
> +++ pkg/PLIST-iodbc   12 Nov 2015 09:55:23 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-iodbc,v 1.4 2014/07/17 00:20:51 sthen Exp $
> +@conflict freeradius-iodbc-*
>  lib/freeradius/rlm_sql_iodbc.so
>  share/doc/freeradius/mssql
>  share/examples/freeradius/sql/mssql/
> Index: pkg/PLIST-ldap
> ===
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-ldap,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST-ldap
> --- pkg/PLIST-ldap17 Jul 2014 00:20:51 -  1.5
> +++ pkg/PLIST-ldap12 Nov 2015 09:55:23 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-ldap,v 1.5 2014/07/17 00:20:51 sthen Exp $
> +@conflict freeradius-ldap-*
>  @conflict freeradius-server-<2.1.8
>  lib/freeradius/rlm_ldap.so
>  share/doc/freeradius/examples/iplanet.ldif
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-main,v
> retrieving revision 1.30
> diff -u -p -r1.30 PLIST-main
> --- pkg/PLIST-main7 Nov 2015 14:51:08 -   1.30
> +++ pkg/PLIST-main12 Nov 2015 09:55:23 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-main,v 1.30 2015/11/07 14:51:08 sthen Exp $
> +@conflict freeradius-*
>  @conflict radiusd-cistron-*
>  @conflict radiusd-lucent-*
>  @pkgpath net/freeradius
> Index: pkg/PLIST-mysql
> ===
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-mysql,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST-mysql
> --- pkg/PLIST-mysql   8 Nov 2015 11:04:48 -   1.8
> +++ pkg/PLIST-mysql   12 Nov 2015 09:55:23 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-mysql,v 1.8 2015/11/08 11:04:48 sthen Exp $
> +@conflict freeradius-mysql-*
>  @conflict freeradius-server-<2.2.9p1
>  lib/freeradius/rlm_sql_mysql.so
>  @mode 640
> Index: pkg/PLIST-pgsql
> ===
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-pgsql,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST-pgsql
> --- pkg/PLIST-pgsql   17 Jul 2014 00:20:51 -  1.5
> +++ pkg/PLIST-pgsql   12 Nov 2015 09:55:23 -
> @@ -1,4 +1,5 @@
>  @comment $OpenBSD: PLIST-pgsql,v 1.5 2014/07/17 00:20:51 sthen Exp $
> +@conflict freeradius-pgsql-*
>  @conflict freeradius-<2.1.8
>  lib/freeradius/rlm_sql_postgresql.so
>  share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql


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

Re: MODGNU_GEN, simpler support for running autogen.sh

[Stuart Henderson]

On 2015/11/11 11:43, Antoine Jacoutot wrote:
> On Wed, Nov 11, 2015 at 09:51:55AM +, Stuart Henderson wrote:
> > After getting annoyed at typing this manually for the Nth time, I thought
> > it would be a good idea to add support for running "autogen.sh" type scripts
> > to gnu.port.mk. The diff includes a conversion for audio/tremor as an
> > example, I'll write up a bit for bsd.port.mk(5) if it's ok to add.
> 
> Oh I would welcome something like that very much!
> Considering devel/libtool is required in 90% of the cases, would it
> make sense to add it as a BUILD_DEPENDS as well?

I did consider that but couldn't make up my mind, it probably does
make sense to add it somewhere - though perhaps it would be better in
MODGNU_AUTOMAKE_DEPENDS?

> I am also wondering if we couldn't factorize something so that we
> can either run autogen.sh or autoreconf -fi -- since the rest of the
> construct it the same and not all ports that need regeneration come
> with an autogen.sh script.

How about the diff below? It now sets PATH=${WRKSRC}:${PORTPATH} so that
MODGNU_GEN=autogen.sh still works without using "./" that I previously
had in the shell command, and allows use of "MODGNU_GEN=autoreconf -fi".
There's a bsd.port.mk(5) diff at the bottom as well.

czarkoff@ suggested using a different CONFIGURE_STYLE for this, e.g.

>   CONFIGURE_STYLE = autogen.sh

I considered something like this too, but it didn't overall feel quite
right - we need a way to set the script name anyway (even without
autoreconf -fi the names vary), and I'm trying to avoid too much use
of the word "autogen" to avoid confusion with devel/autogen.

Index: gnu.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/gnu.port.mk,v
retrieving revision 1.54
diff -u -p -r1.54 gnu.port.mk
--- gnu.port.mk 13 Sep 2014 16:28:47 -  1.54
+++ gnu.port.mk 12 Nov 2015 10:33:24 -
@@ -7,6 +7,7 @@
 MODGNU_AUTOCONF_DEPENDS = devel/metaauto \
devel/autoconf/${AUTOCONF_VERSION}
 MODGNU_AUTOMAKE_DEPENDS = devel/metaauto \
+   devel/libtool \
devel/automake/${AUTOMAKE_VERSION}
 
 AUTOMAKE_VERSION ?= 1.4
@@ -74,7 +75,7 @@ MODGNU_configure += ; mkdir -p ${MODGNU_
 CONFIGURE_ENV += MKDIR_P='mkdir -p'
 # XXX Older versions of glib-gettext.m4 and intltool.m4 used to set
 # DATADIRNAME to "lib" which resulted in locale files being installed
-# under the wrong directory.
+# under the wrong directory.
 CONFIGURE_ENV += DATADIRNAME=share
 .  if ${MODGNU_SAVE_CACHE:L} == "yes"
 CONFIGURE_ARGS += --cache-file=${WRKBUILD}/config.cache
@@ -105,7 +106,7 @@ CONFIGURE_ARGS += --disable-silent-rules
 # If one of these tools is found at configure stage, it might be used,
 # no matter whether we use --disable-gtk-doc or not.
 CONFIGURE_ARGS += --disable-gtk-doc
-CONFIGURE_ENV += ac_cv_path_GTKDOC_CHECK=""  
+CONFIGURE_ENV += ac_cv_path_GTKDOC_CHECK=""
 CONFIGURE_ENV += ac_cv_path_GTKDOC_REBASE=""
 CONFIGURE_ENV += ac_cv_path_GTKDOC_MKPDF=""
 .  endif
@@ -113,8 +114,17 @@ CONFIGURE_ENV += ac_cv_path_GTKDOC_MKPDF
 
 TEST_TARGET ?= check
 
+.if defined(MODGNU_GEN)
+BUILD_DEPENDS += ${MODGNU_AUTOMAKE_DEPENDS}
+BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS}
+MODGNU_post-patch += cd ${WRKSRC}; ${_SYSTRACE_CMD} ${SETENV} \
+   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+   AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+   PATH=.:${PORTPATH} ${MODGNU_GEN};
+.endif
+
 # internal stuff to run on each directory.
-MODGNU_post-patch = for d in ${AUTOCONF_DIR}; do cd $$d; ${_MODGNU_loop} done;
+MODGNU_post-patch += for d in ${AUTOCONF_DIR}; do cd $$d; ${_MODGNU_loop} done;
 _MODGNU_loop =
 
 PATCH_CHECK_ONLY ?= No



Index: bsd.port.mk.5
===
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.427
diff -u -p -r1.427 bsd.port.mk.5
--- bsd.port.mk.5   12 Oct 2015 10:27:22 -  1.427
+++ bsd.port.mk.5   12 Nov 2015 10:47:43 -
@@ -1962,6 +1962,17 @@ tedious.
 .It Ev MODGNU_CONFIG_GUESS_DIRS
 If a port uses config.guess outside WRKSRC, the directories
 containing the other copies must be set here.
+.It Ev MODGNU_GEN
+Command used to generate files needed to configure the port.
+For use with ports that provide a script (often named
+.Dq autogen.sh )
+or where
+.Dq autoreconf -fi
+must be run before
+.Cm configure .
+.Ev PATH
+is set to include
+.Ev WRKSRC .
 .It Ev MODPERL_ADJ_FILES
 If any files have a Perl shebang line, which needs to be replaced
 with

Re: UPDATE: graphics/opencv

[Rafael Sadowski]

On Wed Nov 11, 2015 at 02:49:09AM -0800, Vadim Zhukov wrote:
> 2015-11-10 22:01 GMT-08:00 Rafael Sadowski :
> > Hello @ports,
> >
> > update to the last stable 2.X branch before I'm ready with opencv 3.0.0
> > and doxygen update. Tested on amd64
> >
> >
> > Comments ? OK ?
> >
> > Best regards, Rafael
> >
> > [...]
> >
> >  @lib lib/libopencv_video.so.${LIBopencv_video_VERSION}
> >  @lib lib/libopencv_videostab.so.${LIBopencv_videostab_VERSION}
> >  lib/pkgconfig/opencv.pc
> > -lib/python${MODPY_VERSION}/site-packages/cv.py
> > -lib/python${MODPY_VERSION}/site-packages/cv.pyc
> > -lib/python${MODPY_VERSION}/site-packages/cv2.so
> >  share/OpenCV/
> >  share/OpenCV/OpenCVConfig-version.cmake
> >  share/OpenCV/OpenCVConfig.cmake
> 
> This hunk looks like suscipious. The Python support was removed?
> Couldn't that break ports depending on opencv in ports tree?
> 
> --
>   WBR,
>   Vadim Zhukov

Thanks Vadim!

Hmm, confusing. I don't know why, maybe a python or my clock problem
(dual boot with win -- too busy to fix). But now it build the python2
stuff on my build machine and my T400s.

Could somebody build and check `make update-plist` for me?

apart of that ok?


Best regards, Rafael

Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile30 Jan 2015 21:38:37 -  1.34
+++ Makefile12 Nov 2015 23:37:20 -
@@ -9,13 +9,11 @@ COMMENT-docs =OpenCV documentation and
 COMMENT-main = library of programming functions for real time cv
 COMMENT-java = Java bindings for OpenCV
 
-V =2.4.10
+V =2.4.12.3
 DISTNAME = opencv-$V
 PKGNAME-main = ${PKGNAME}
 PKGNAME-docs = opencv-docs-$V
 PKGNAME-java = opencv-java-$V
-REVISION-main =1
-REVISION-java =0
 
 HOMEPAGE = http://www.opencv.org/
 MAINTAINER =   Rafael Sadowski 
@@ -40,8 +38,9 @@ SHARED_LIBS +=opencv_video
1.0 #1.1
 SHARED_LIBS += opencv_videostab0.0 #0.1
 SHARED_LIBS += opencv_ocl  0.0 #2.4
 
-EXTRACT_SUFX = .zip
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
+GH_ACCOUNT =   Itseez
+GH_PROJECT =   opencv
+GH_COMMIT =8e40becab12c642e7bbafb9fe87698e8b6bf28da
 
 WANTLIB-main =  Half Iex IlmImf IlmThread Imath X11 Xcomposite Xcursor
 WANTLIB-main += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
@@ -82,7 +81,8 @@ MODULES = devel/cmake \
lang/python
 
 BUILD_DEPENDS =devel/doxygen \
-   math/py-numpy
+   math/py-numpy \
+   math/eigen3
 
 RUN_DEPENDS-main = math/py-numpy
 RUN_DEPENDS-docs = ${BUILD_PKGPATH},-main
@@ -111,6 +111,7 @@ CONFIGURE_ENV = CFLAGS="${CFLAGS} -fPIC
 # ATM opencv requires V4L1 compat, ask them to change it,
 # then see WITH_V4L below.
 CONFIGURE_ARGS =   -DBUILD_opencv_nonfree:Bool=On \
+   -DBUILD_opencv_python:Bool=On \
-DWITH_1394:Bool=Off \
-DWITH_CUDA:Bool=Off \
-DWITH_EIGEN:Bool=Off \
@@ -120,7 +121,8 @@ CONFIGURE_ARGS =-DBUILD_opencv_nonfree:
-DWITH_JPEG:Bool=On \
-DWITH_PNG:Bool=On \
-DWITH_TIFF:Bool=On \
-   -DWITH_V4L:Bool=Off
+   -DWITH_V4L:Bool=Off \
+   -DPYTHON_EXECUTABLE:FILEPATH=${MODPY_BIN}
 
 .if ${BUILD_PACKAGES:M-java}
 MODULES += java
Index: distinfo
===
RCS file: /cvs/ports/graphics/opencv/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo24 Jan 2015 10:56:43 -  1.4
+++ distinfo12 Nov 2015 23:37:20 -
@@ -1,2 +1,2 @@
-SHA256 (opencv-2.4.10.zip) = G/TLhyg3l/2RZp1PkLYipnepA8ILSld7eViiFk91lsY=
-SIZE (opencv-2.4.10.zip) = 91692581
+SHA256 (opencv-2.4.12.3.tar.gz) = 7RAcJF+0UkxJ2cuLZ5SnAbTjphL29plAh8guhcazcTE=
+SIZE (opencv-2.4.12.3.tar.gz) = 90643425
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/graphics/opencv/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt24 Jan 2015 10:56:43 -  1.5
+++ patches/patch-CMakeLists_txt12 Nov 2015 23:37:20 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.5 2015/01/24 10:56:43 zhuk Exp $
 CMakeLists.txt.origWed Oct  1 09:33:36 2014
-+++ CMakeLists.txt Sun Dec 21 20:16:55 2014
-@@ -438,7 +438,7 @@ 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/13 00:05:45

Modified files:
graphics/cairo : Makefile distinfo 
graphics/cairo/pkg: PLIST 

Log message:
Update to cairo-1.14.4.

from eric@ (maintainer) who timed out to commit it
ok dcoppa@ who had the same diff

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/13 00:14:26

Modified files:
multimedia/libvpx: Makefile distinfo 
multimedia/libvpx/patches: patch-build_make_Makefile 
   patch-configure patch-examples_mk 
   patch-libs_mk 
Removed files:
multimedia/libvpx/patches: patch-vp8_common_reconinter_c 
   patch-vp8_common_sad_c_c 

Log message:
Update to libvpx-1.5.0.

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/13 00:55:36

Modified files:
graphics/pngcrush: Makefile distinfo 

Log message:
Update to pngcrush-1.7.88.

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2015/11/12 19:53:48

Modified files:
plan9/plan9port/patches: patch-INSTALL 

Log message:
merged upstream

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/13 00:03:00

Modified files:
graphics/ffmpeg: Makefile 
graphics/ffmpeg/patches: patch-tests_fate_aac_mak 
Added files:
graphics/ffmpeg/patches: patch-libavcodec_aacsbr_template_c 
 patch-libavcodec_libvpxenc_c 

Log message:
Backport some AAC and VPX commits.

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 07:01:49

Modified files:
cad/gtkwave: Makefile distinfo 

Log message:
Update to gtkwave-3.3.67.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 07:27:17

Modified files:
net/p5-PlRPC   : Makefile distinfo 

Log message:
Update to p5-PlRPC-0.2020.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 07:10:55

Modified files:
devel/libyubikey: Makefile 

Log message:
update COMMENT

Re: yubikey ports

[Stuart Henderson]

As usual I remembered something just after sending. Updated tgz attached
for paths in LIB_DEPENDS.

On 2015/11/12 14:37, Stuart Henderson wrote:
> Currently these are scattered all over the place. I'd like to move
> them all to subdirs of security/yubico:
> 
> devel/libyubikey
> sysutils/ykpers
> security/yubikey-personalization-gui
> 
> and add a new one, ykclient (for validating against web API servers).
> 
> Each of these has two "names", the DISTNAME and a longer name used
> in URLs etc:
> 
> libyubikeyyubico-c
> ykclient  yubico-c-client
> ykpersyubikey-personalization
> 
> etc. I've retained the DISTNAME as-was (and continue to use this
> for the PKGNAME, so updates will work without quirks - the required
> @pkgpath annotation is there) but I've structured the directories
> according to the longer names so it's easier to see which ones we
> have and which are still left to port.
> 
> Any OKs to (re-)import these (and kill the existing 3 ports)?
> Only ykclient (aka yubico-c-client) is new.
> 
> (note: there is also security/yubiserve which I have not moved as
> part of this as it's a third party program).



yubico.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/12 06:06:48

Modified files:
graphics/jasper: Tag: OPENBSD_5_8 Makefile 
graphics/jasper/patches: Tag: OPENBSD_5_8 
 patch-src_libjasper_base_jas_icc_c 
 patch-src_libjasper_jp2_jp2_dec_c 
 patch-src_libjasper_jpc_jpc_dec_c 
 patch-src_libjasper_jpc_jpc_qmfb_c 

Log message:
add security fixes to graphics/jasper, from Slackware via patrick keshishian

CVE-2014-8137: double-free
CVE-2014-8138: heap-based buffer overflow
CVE-2014-8157: off-by-one
CVE-2014-8158: multiple stack-based buffer overflows
CVE-2014-9029: multiple off-by-one

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 07:13:35

Modified files:
security/py-gnupg: Makefile distinfo 

Log message:
Update to py-gnupg-0.3.8.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/12 07:23:23

Modified files:
sysutils/p5-Sys-Virt: Makefile distinfo 

Log message:
update to p5-Sys-Virt-1.2.21

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/12 07:23:21

Modified files:
devel/ruby-rspec/serverspec: Makefile distinfo 
devel/ruby-rspec/serverspec/pkg: PLIST 

Log message:
update to serverspec-2.24.2

yubikey ports

[Stuart Henderson]

Currently these are scattered all over the place. I'd like to move
them all to subdirs of security/yubico:

devel/libyubikey
sysutils/ykpers
security/yubikey-personalization-gui

and add a new one, ykclient (for validating against web API servers).

Each of these has two "names", the DISTNAME and a longer name used
in URLs etc:

libyubikey  yubico-c
ykclientyubico-c-client
ykpers  yubikey-personalization

etc. I've retained the DISTNAME as-was (and continue to use this
for the PKGNAME, so updates will work without quirks - the required
@pkgpath annotation is there) but I've structured the directories
according to the longer names so it's easier to see which ones we
have and which are still left to port.

Any OKs to (re-)import these (and kill the existing 3 ports)?
Only ykclient (aka yubico-c-client) is new.

(note: there is also security/yubiserve which I have not moved as
part of this as it's a third party program).


yubico.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 07:08:49

Modified files:
devel/libyubikey: Makefile 
security/yubikey-personalization-gui: Makefile 
sysutils/ykpers: Makefile 

Log message:
update HOMEPAGE/MASTER_SITES

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 07:35:35

Modified files:
mail/p5-MIME-Lite-HTML: Makefile distinfo 

Log message:
Update to p5-MIME-Lite-HTML-1.24.

Re: yubikey ports

[Brandon Mercer]

Yes, I like this as well. I'll test soon too! Thanks sthen.

On Thu, Nov 12, 2015 at 12:36 PM Michael McConville 
wrote:

> Stuart Henderson wrote:
> > Currently these are scattered all over the place. I'd like to move
> > them all to subdirs of security/yubico:
>
> Sounds like a good idea to me. I remember this being annoying when I got
> my YubiKey.
>
> Will test build soon.
>
>

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2015/11/12 19:48:29

Modified files:
security/luasec/patches: patch-src_context_c 

Log message:
merged upstream (PR #55)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 08:06:37

Modified files:
databases/repmgr: Makefile distinfo 
databases/repmgr/patches: patch-repmgr_h 

Log message:
Update to repmgr-3.0.2.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 08:18:29

Modified files:
devel  : Makefile 
security   : Makefile 
sysutils   : Makefile 
Removed files:
devel/libyubikey: Makefile distinfo 
devel/libyubikey/patches: patch-tests_selftest_c 
devel/libyubikey/pkg: DESCR PLIST 
sysutils/ykpers: Makefile distinfo 
sysutils/ykpers/pkg: DESCR PLIST 
security/yubikey-personalization-gui: Makefile distinfo 
security/yubikey-personalization-gui/pkg: DESCR PLIST 

Log message:
remove the ports for yubico programs, to be reimported under a common subdir

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 08:18:47

Log message:
reimport the ports for Yubico software (devel/libyubikey, sysutils/ykpers,
security/yubikey-personalization-gui) under a common subdir, and add a new
one for ykclient (aka yubico-c-client).

fix/ok ajacoutot@

Status:

Vendor Tag: sthen
Release Tags:   sthen_20151112

N ports/security/yubico/Makefile
N ports/security/yubico/Makefile.inc
N ports/security/yubico/yubikey-personalization-gui/Makefile
N ports/security/yubico/yubikey-personalization-gui/distinfo
N ports/security/yubico/yubikey-personalization-gui/pkg/DESCR
N ports/security/yubico/yubikey-personalization-gui/pkg/PLIST
N ports/security/yubico/yubico-c/Makefile
N ports/security/yubico/yubico-c/distinfo
N ports/security/yubico/yubico-c/patches/patch-tests_selftest_c
N ports/security/yubico/yubico-c/pkg/DESCR
N ports/security/yubico/yubico-c/pkg/PLIST
N ports/security/yubico/yubikey-personalization/Makefile
N ports/security/yubico/yubikey-personalization/distinfo
N ports/security/yubico/yubikey-personalization/pkg/DESCR
N ports/security/yubico/yubikey-personalization/pkg/PLIST
N ports/security/yubico/yubico-c-client/Makefile
N ports/security/yubico/yubico-c-client/distinfo
N ports/security/yubico/yubico-c-client/pkg/PLIST
N ports/security/yubico/yubico-c-client/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 08:18:56

Modified files:
security   : Makefile 

Log message:
+yubico

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 08:17:29

Modified files:
graphics/p5-Cairo: Makefile distinfo 

Log message:
Update to p5-Cairo-1.106.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2015/11/12 08:36:06

Modified files:
audio/ncmpcpp  : Makefile distinfo 
Removed files:
audio/ncmpcpp/patches: patch-configure 

Log message:
Update to ncmpcpp-0.6.8

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 08:27:11

Modified files:
net/freeradius3: Makefile 
net/freeradius3/pkg: PLIST-main 

Log message:
Adapt freeradius3 to the yubico reorg, and depend on yubico-c-client.
Other minor tweaks while there (PLIST shuffle, rm .orig file).

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 08:27:46

Modified files:
net/freeradius3: Makefile 

Log message:
bump

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 08:13:51

Modified files:
devel/libmtp   : Makefile distinfo 

Log message:
Update to libmtp-1.1.10.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 08:43:03

Modified files:
graphics/p5-GD : Makefile distinfo 
graphics/p5-GD/pkg: PLIST 

Log message:
Update to p5-GD-2.56.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/12 11:00:27

Modified files:
x11/gnome/shell: Makefile distinfo 
x11/gnome/shell/pkg: PLIST 

Log message:
update to gnome-shell-3.18.2

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/12 11:00:59

Modified files:
x11/gnome/shell-extensions: Makefile distinfo 

Log message:
update to gnome-shell-extensions-3.18.2

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/12 11:00:42

Modified files:
x11/gnome/mutter: Makefile distinfo 

Log message:
update to mutter-3.18.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 10:27:11

Modified files:
textproc   : Makefile 

Log message:
+mupdf,js

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 10:26:54

Modified files:
textproc/mupdf : Makefile distinfo 
textproc/mupdf/patches: patch-Makefile patch-Makerules 
patch-platform_x11_pdfapp_c 
textproc/mupdf/pkg: DESCR PLIST 
Added files:
textproc/mupdf/patches: patch-Makethird 

Log message:
update to MuPDF-1.8
- many fixes and improvements to EPUB support
- mudraw moves to the multi-purpose mutool binary
- add new OpenGL-based viewer, mupdf-gl
- add an optional flavour to enable the javascript support (wasn't
on by default before in our package, and still isn't)

Re: yubikey ports

[Michael McConville]

Stuart Henderson wrote:
> Currently these are scattered all over the place. I'd like to move
> them all to subdirs of security/yubico:

Sounds like a good idea to me. I remember this being annoying when I got
my YubiKey.

Will test build soon.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/12 09:41:04

Modified files:
security/pcsc-tools: Makefile distinfo 
security/pcsc-tools/patches: patch-Makefile 
Added files:
security/pcsc-tools/patches: patch-ATR_analysis 

Log message:
update to pcsc-tools 1.4.25

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/12 09:34:23

Modified files:
devel/libplist : Makefile distinfo 
devel/libplist/pkg: PLIST-main PLIST-python 

Log message:
Update to libplist-1.12.

Re: yubikey ports

[Stuart Henderson]

On 2015/11/12 12:33, Michael McConville wrote:
> Stuart Henderson wrote:
> > Currently these are scattered all over the place. I'd like to move
> > them all to subdirs of security/yubico:
> 
> Sounds like a good idea to me. I remember this being annoying when I got
> my YubiKey.
> 
> Will test build soon.
> 

Thanks but Antoine got there first :)

I've been looking at some of the other ports as well, but nothing
working yet:

libykneomr - needs pcscd, but pcscd crashes in ccid as soon as a
yubikey neo is connected.

libu2f-host - needs hidapi which isn't ported yet

libu2f-server - json errors in regression tests

(there are a couple of either ports that use PySide which also
isn't ported yet).